Skip to content

Commit b7f152e

Browse files
dreibhdreibh
committed
Version bump: netperfmeter-1.8.6~rc2.
1 parent 7d2fb80 commit b7f152e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+333
-152
lines changed

‎.travis.yml‎

Lines changed: 43 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,28 @@ cache:
1010
- /var/cache/apt/
1111
- /var/cache/pbuilder/aptcache/
1212

13+
1314
matrix:
1415
include:
1516

1617
# ###### Ubuntu Linux ####################################################
1718

19+
# ====== Ubuntu 20.04 (Focal Fossum) =====================================
20+
- name: "Ubuntu 20.04 (Focal Fossum) with GCC"
21+
os: linux
22+
dist: xenial
23+
group: travis_latest
24+
env: DOCKER="ubuntu:eoan" VARIANT="ubuntu" TOOL="compile" COMPILER_C="gcc" COMPILER_CXX="g++"
25+
- name: "Ubuntu 20.04 (Focal Fossum) with Clang"
26+
os: linux
27+
dist: xenial
28+
group: travis_latest
29+
env: DOCKER="ubuntu:eoan" VARIANT="ubuntu" TOOL="compile" COMPILER_C="clang" COMPILER_CXX="clang++"
30+
- name: "Ubuntu 20.04 (Focal Fossum) packaging with pbuilder"
31+
dist: xenial
32+
group: travis_latest
33+
env: DOCKER="ubuntu:eoan" VARIANT="ubuntu" TOOL="pbuilder"
34+
1835
# ====== Ubuntu 19.10 (Eoan Ermine) ======================================
1936
- name: "Ubuntu 19.10 (Eoan Ermine) with GCC"
2037
os: linux
@@ -188,73 +205,39 @@ matrix:
188205

189206
# ###### Fedora Linux ###################################################
190207

191-
## ====== Fedora 31 =======================================================
192-
#- name: "Fedora 31 with GCC"
193-
#os: linux
194-
#dist: bionic
195-
#group: travis_latest
196-
#env: DOCKER="fedora:31" VARIANT="fedora" TOOL="compile" COMPILER_C="gcc" COMPILER_CXX="g++"
197-
#- name: "Fedora 31 with Clang"
198-
#os: linux
199-
#dist: bionic
200-
#group: travis_latest
201-
#env: DOCKER="fedora:31" VARIANT="fedora" TOOL="compile" COMPILER_C="clang" COMPILER_CXX="clang++"
202-
#- name: "Fedora 31 packaging with mock"
203-
#os: linux
204-
#dist: bionic
205-
#group: travis_latest
206-
#env: DOCKER="fedora:31" VARIANT="fedora" TOOL="mock"
207-
208-
# ====== Fedora 30 =======================================================
209-
- name: "Fedora 30 with GCC"
208+
# ====== Fedora 31 =======================================================
209+
- name: "Fedora 31 with GCC"
210210
os: linux
211211
dist: bionic
212212
group: travis_latest
213-
env: DOCKER="fedora:30" VARIANT="fedora" TOOL="compile" COMPILER_C="gcc" COMPILER_CXX="g++"
214-
- name: "Fedora 30 with Clang"
213+
env: DOCKER="fedora:31" VARIANT="fedora" TOOL="compile" COMPILER_C="gcc" COMPILER_CXX="g++"
214+
- name: "Fedora 31 with Clang"
215215
os: linux
216216
dist: bionic
217217
group: travis_latest
218-
env: DOCKER="fedora:30" VARIANT="fedora" TOOL="compile" COMPILER_C="clang" COMPILER_CXX="clang++"
219-
- name: "Fedora 30 packaging with mock"
218+
env: DOCKER="fedora:31" VARIANT="fedora" TOOL="compile" COMPILER_C="clang" COMPILER_CXX="clang++"
219+
- name: "Fedora 31 packaging with mock"
220220
os: linux
221221
dist: bionic
222222
group: travis_latest
223-
env: DOCKER="fedora:30" VARIANT="fedora" TOOL="mock"
223+
env: DOCKER="fedora:31" VARIANT="fedora" TOOL="mock"
224224

225-
# ====== Fedora 29 =======================================================
226-
- name: "Fedora 29 with GCC"
227-
os: linux
228-
dist: bionic
229-
group: travis_latest
230-
env: DOCKER="fedora:29" VARIANT="fedora" TOOL="compile" COMPILER_C="gcc" COMPILER_CXX="g++"
231-
- name: "Fedora 29 with Clang"
232-
os: linux
233-
dist: bionic
234-
group: travis_latest
235-
env: DOCKER="fedora:29" VARIANT="fedora" TOOL="compile" COMPILER_C="clang" COMPILER_CXX="clang++"
236-
- name: "Fedora 29 packaging with mock"
237-
os: linux
238-
dist: bionic
239-
group: travis_latest
240-
env: DOCKER="fedora:29" VARIANT="fedora" TOOL="mock"
241-
242-
# ====== Fedora 28 =======================================================
243-
- name: "Fedora 28 with GCC"
225+
# ====== Fedora 30 =======================================================
226+
- name: "Fedora 30 with GCC"
244227
os: linux
245228
dist: bionic
246229
group: travis_latest
247-
env: DOCKER="fedora:28" VARIANT="fedora" TOOL="compile" COMPILER_C="gcc" COMPILER_CXX="g++"
248-
- name: "Fedora 28 with Clang"
230+
env: DOCKER="fedora:30" VARIANT="fedora" TOOL="compile" COMPILER_C="gcc" COMPILER_CXX="g++"
231+
- name: "Fedora 30 with Clang"
249232
os: linux
250233
dist: bionic
251234
group: travis_latest
252-
env: DOCKER="fedora:28" VARIANT="fedora" TOOL="compile" COMPILER_C="clang" COMPILER_CXX="clang++"
253-
- name: "Fedora 28 packaging with mock"
235+
env: DOCKER="fedora:30" VARIANT="fedora" TOOL="compile" COMPILER_C="clang" COMPILER_CXX="clang++"
236+
- name: "Fedora 30 packaging with mock"
254237
os: linux
255238
dist: bionic
256239
group: travis_latest
257-
env: DOCKER="fedora:28" VARIANT="fedora" TOOL="mock"
240+
env: DOCKER="fedora:30" VARIANT="fedora" TOOL="mock"
258241

259242
# ====== Fedora Rawhide ==================================================
260243
# - name: "Fedora Rawhide with GCC"
@@ -276,6 +259,18 @@ matrix:
276259

277260
# ###### FreeBSD #########################################################
278261

262+
# ====== FreeBSD 12.1-RELEASE ============================================
263+
- name: "FreeBSD 12.1-RELEASE with Clang"
264+
os: linux
265+
dist: bionic
266+
group: travis_latest
267+
env: QEMU="FreeBSD" VARIANT="12.1-RELEASE" TOOL="compile" COMPILER_C="clang" COMPILER_CXX="clang++"
268+
- name: "FreeBSD 12.1-RELEASE with GCC"
269+
os: linux
270+
dist: bionic
271+
group: travis_latest
272+
env: QEMU="FreeBSD" VARIANT="12.1-RELEASE" TOOL="compile" COMPILER_C="gcc" COMPILER_CXX="g++"
273+
279274
# ====== FreeBSD 12.0-RELEASE ============================================
280275
- name: "FreeBSD 12.0-RELEASE with Clang"
281276
os: linux
@@ -300,18 +295,6 @@ matrix:
300295
group: travis_latest
301296
env: QEMU="FreeBSD" VARIANT="11.3-RELEASE" TOOL="compile" COMPILER_C="gcc" COMPILER_CXX="g++"
302297

303-
# ====== FreeBSD 11.2-RELEASE ============================================
304-
- name: "FreeBSD 11.2-RELEASE with Clang"
305-
os: linux
306-
dist: bionic
307-
group: travis_latest
308-
env: QEMU="FreeBSD" VARIANT="11.2-RELEASE" TOOL="compile" COMPILER_C="clang" COMPILER_CXX="clang++"
309-
- name: "FreeBSD 11.2-RELEASE with GCC"
310-
os: linux
311-
dist: bionic
312-
group: travis_latest
313-
env: QEMU="FreeBSD" VARIANT="11.2-RELEASE" TOOL="compile" COMPILER_C="gcc" COMPILER_CXX="g++"
314-
315298

316299
# ###### Other ###########################################################
317300

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PROJECT(netperfmeter LANGUAGES C CXX)
33

44
SET(BUILD_MAJOR "1")
55
SET(BUILD_MINOR "8")
6-
SET(BUILD_PATCH "5~rc0")
6+
SET(BUILD_PATCH "6~rc2")
77
SET(BUILD_VERSION ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_PATCH})
88

99

‎ChangeLog‎

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,177 @@
1+
commit 7d2fb801e8edbdf6ab6c31349d6ef91825410625
2+
Author: Thomas Dreibholz <[email protected]>
3+
Date: Tue Sep 10 12:29:36 2019 +0300
4+
5+
Another Travis CI update.
6+
7+
commit 09da3baa9743bd4ec85815d48e518b39baa83f59
8+
Author: Thomas Dreibholz <[email protected]>
9+
Date: Tue Sep 10 12:14:25 2019 +0300
10+
11+
Trying Travis CI caching.
12+
13+
commit 18b8f2a74f54a72352964766e468dfd7f17ad5c8
14+
Author: Thomas Dreibholz <[email protected]>
15+
Date: Tue Sep 10 12:10:44 2019 +0300
16+
17+
Minor update.
18+
19+
commit a763834f6e6a317075c8858958a05eff998c31cc
20+
Author: Thomas Dreibholz <[email protected]>
21+
Date: Tue Sep 10 12:10:40 2019 +0300
22+
23+
Updated build scripts
24+
25+
commit 162d318467613e0026a879395bd24ffdd24ffaf1
26+
Author: Thomas Dreibholz <[email protected]>
27+
Date: Tue Sep 10 10:09:34 2019 +0300
28+
29+
Version bump.
30+
31+
commit 924c24399a86976e74225094e43bf8304faa6022
32+
Author: Thomas Dreibholz <[email protected]>
33+
Date: Tue Sep 10 10:06:41 2019 +0300
34+
35+
Fixed broken DCCP detection in CMakeLists.txt.
36+
37+
commit f1eb311a70699038c0b9041dd3cf94dc5dc0874b
38+
Author: Thomas Dreibholz <[email protected]>
39+
Date: Tue Sep 10 10:06:31 2019 +0300
40+
41+
Added test.
42+
43+
commit 1cc8d6bc547f258aa67b3706e649a6649b951e92
44+
Author: Thomas Dreibholz <[email protected]>
45+
Date: Thu Sep 5 17:36:45 2019 +0200
46+
47+
Updated build scripts
48+
49+
commit 08d217badd43ff6f85f87a918d042c1bef9e7d8a
50+
Author: Thomas Dreibholz <[email protected]>
51+
Date: Wed Sep 4 21:04:56 2019 +0200
52+
53+
Updated FreeBSD packaging files.
54+
55+
commit 32a41a30dfe361f09d7cc44010f54955055fa39d
56+
Author: Thomas Dreibholz <[email protected]>
57+
Date: Wed Aug 21 17:20:24 2019 +0200
58+
59+
Replaced shebang "#!/bin/bash" by "#!/usr/bin/env bash" for compatibility with FreeBSD.
60+
61+
commit 9786286563c34a4e6f8eba5fbacf59785e4f52b0
62+
Author: Thomas Dreibholz <[email protected]>
63+
Date: Wed Aug 21 17:19:06 2019 +0200
64+
65+
Minor update.
66+
67+
commit ee5833ac2d3eaae6f62b36a444f050ecd931beeb
68+
Author: Thomas Dreibholz <[email protected]>
69+
Date: Wed Aug 21 17:14:52 2019 +0200
70+
71+
Updated build scripts.
72+
73+
commit fdcbb936985b752c101b7b61a8dec836f25e8e2d
74+
Author: Thomas Dreibholz <[email protected]>
75+
Date: Wed Aug 21 17:14:50 2019 +0200
76+
77+
Updated Travis CI configuration.
78+
79+
commit 8435f6852bd761287051bb00e70fe90d28386935
80+
Author: Thomas Dreibholz <[email protected]>
81+
Date: Wed Aug 21 17:14:21 2019 +0200
82+
83+
Updated CI scripts.
84+
85+
commit 182d5906a422cf0e370a8a4a26445db786977351
86+
Author: Thomas Dreibholz <[email protected]>
87+
Date: Mon Aug 19 23:26:20 2019 +0200
88+
89+
Updated Travis CI configuration.
90+
91+
commit 004256773f9ca822e242502fa80fce3b4ed31f4f
92+
Author: Thomas Dreibholz <[email protected]>
93+
Date: Mon Aug 19 11:27:05 2019 +0200
94+
95+
Updated build helper script.
96+
97+
commit 5ca222d9f4f76cef36a1a36d29f363f881b0f500
98+
Author: Thomas Dreibholz <[email protected]>
99+
Date: Mon Aug 19 11:01:04 2019 +0200
100+
101+
Updated build helper script.
102+
103+
commit 312557492c953281f873bfce49c6a33c26d04b26
104+
Author: Thomas Dreibholz <[email protected]>
105+
Date: Mon Aug 19 10:03:54 2019 +0200
106+
107+
FreeBSD port updates.
108+
109+
commit 4f88b458668338b2b8c9567357cd5dd42b14e575
110+
Author: Thomas Dreibholz <[email protected]>
111+
Date: Mon Aug 19 09:48:46 2019 +0200
112+
113+
Updated build scripts.
114+
115+
commit 9b503cf22c0c3f5d0680a0a259a82da011ed3f0b
116+
Author: Thomas Dreibholz <[email protected]>
117+
Date: Sat Aug 17 22:50:12 2019 +0200
118+
119+
Updated Travis CI configuration.
120+
121+
commit 810678410a6000f68ad7b8be5a174058d4d0f687
122+
Author: Thomas Dreibholz <[email protected]>
123+
Date: Sat Aug 17 22:44:07 2019 +0200
124+
125+
Updated CI scripts.
126+
127+
commit f6491b076be6ea6e4fd63499ae9a095357e6764e
128+
Author: Thomas Dreibholz <[email protected]>
129+
Date: Sat Aug 17 22:43:29 2019 +0200
130+
131+
Updated Travis CI configuration.
132+
133+
commit 139716ee2c8f9ad7138fc86da61b679da89918c6
134+
Author: Thomas Dreibholz <[email protected]>
135+
Date: Wed Aug 14 11:27:33 2019 +0200
136+
137+
Removed obsolete helper scripts.
138+
139+
commit e1992d2eb89e979ffe41b85f364c9972f7bf717a
140+
Author: Thomas Dreibholz <[email protected]>
141+
Date: Mon Aug 12 10:58:42 2019 +0200
142+
143+
Updated FreeBSD port files.
144+
145+
commit e7d9f5d13b4dea0786d7e3588235005f2a2ef283
146+
Author: Thomas Dreibholz <[email protected]>
147+
Date: Mon Aug 12 09:05:37 2019 +0200
148+
149+
Improved Travis CI configuration.
150+
151+
commit 15b0e90400be0b0b34f6c99d87204674b2d5b8dd
152+
Author: Thomas Dreibholz <[email protected]>
153+
Date: Thu Aug 8 14:05:25 2019 +0200
154+
155+
Build script update.
156+
157+
commit f0dcd8f04da13b307839ec68276107fa9b592cde
158+
Author: Thomas Dreibholz <[email protected]>
159+
Date: Wed Aug 7 18:22:33 2019 +0200
160+
161+
Updated distinfo.
162+
163+
commit 5422ada3414734c072f36fe1b903f256b0974e79
164+
Author: Thomas Dreibholz <[email protected]>
165+
Date: Wed Aug 7 18:22:03 2019 +0200
166+
167+
Updated LSM entry.
168+
169+
commit 870b58d1d6d4da3a201a32215f4dab8bdcfd60e5
170+
Author: Thomas Dreibholz <[email protected]>
171+
Date: Wed Aug 7 18:14:17 2019 +0200
172+
173+
New release netperfmeter-1.8.4.
174+
1175
commit 1672b8d27afac6633fba0e985f320280da9d4d02
2176
Author: Thomas Dreibholz <[email protected]>
3177
Date: Wed Aug 7 18:14:05 2019 +0200

‎autogen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
#
33
# Build Scripts
4-
# Copyright (C) 2002-2019 by Thomas Dreibholz
4+
# Copyright (C) 2002-2020 by Thomas Dreibholz
55
#
66
# This program is free software: you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by

‎build-rpm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
#
33
# Packaging Scripts
4-
# Copyright (C) 2017-2019 by Thomas Dreibholz
4+
# Copyright (C) 2017-2020 by Thomas Dreibholz
55
#
66
# This program is free software: you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by

‎ci/before-install‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
#
33
# Travis CI Scripts
4-
# Copyright (C) 2018-2019 by Thomas Dreibholz
4+
# Copyright (C) 2018-2020 by Thomas Dreibholz
55
#
66
# This program is free software: you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by
@@ -73,7 +73,8 @@ elif [ "${TRAVIS_OS_NAME}" == "linux" -a "${QEMU}" == "FreeBSD" ] ; then
7373
# ====== Download fuse-ufs2 ========================================
7474
if [ ! -d fuse-ufs2/ ] ; then
7575
echo "Downloading fuse-ufs2 ..."
76-
git clone https://github.com/mkatiyar/fuse-ufs2
76+
git clone https://github.com/dreibh/fuse-ufs2 -b dreibh/ubuntu-disco-fix
77+
# git clone https://github.com/mkatiyar/fuse-ufs2
7778
fi
7879
fi
7980

‎ci/build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
#
33
# Travis CI Scripts
4-
# Copyright (C) 2018-2019 by Thomas Dreibholz
4+
# Copyright (C) 2018-2020 by Thomas Dreibholz
55
#
66
# This program is free software: you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by
@@ -92,7 +92,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" -a "${DOCKER}" == "" -a "${QEMU}" == "" ] ;
9292
# ###### FreeBSD via QEMU ###################################################
9393
elif [ "${TRAVIS_OS_NAME}" == "linux" -a "${QEMU}" == "FreeBSD" ] ; then
9494

95-
ssh -p 8829 -i ~/.ssh/id_rsa root@localhost <<EOF
95+
ssh -p 8829 -oStrictHostKeyChecking=no -i ~/.ssh/id_rsa root@localhost <<EOF
9696
cd /travis
9797
9898
# ====== Configure ====================================================

0 commit comments

Comments
 (0)