Skip to content

Commit 29dc4c5

Browse files
Upgrades kronosnet to version 1.29 (microsoft#14621)
Co-authored-by: Aninda <[email protected]>
1 parent 5faf0cb commit 29dc4c5

File tree

3 files changed

+127
-31
lines changed

3 files changed

+127
-31
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"kronosnet-1.20.tar.xz": "9eb3f77a778241d3aecb16304031eb7665d377395cd44b060ba48c9c08461fcd"
3+
"kronosnet-1.29.tar.xz": "439c18b18c69cf3758a1fc433ac4a01b94750269f9b5249a2a9d0ada98570c8e"
44
}
55
}

SPECS-EXTENDED/kronosnet/kronosnet.spec

Lines changed: 124 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Distribution: Azure Linux
33
###############################################################################
44
###############################################################################
55
##
6-
## Copyright (C) 2012-2019 Red Hat, Inc. All rights reserved.
6+
## Copyright (C) 2012-2022 Red Hat, Inc. All rights reserved.
77
##
88
## This copyrighted material is made available to anyone wishing to use,
99
## modify, copy, or redistribute it subject to the terms and conditions
@@ -38,17 +38,19 @@ Distribution: Azure Linux
3838

3939
Name: kronosnet
4040
Summary: Multipoint-to-Multipoint VPN daemon
41-
Version: 1.20
42-
Release: 2%{?dist}
43-
License: GPLv2+ and LGPLv2+
41+
Version: 1.29
42+
Release: 3%{?dist}
43+
License: GPL-2.0-or-later AND LGPL-2.1-or-later
4444
URL: https://kronosnet.org
4545
Source0: https://kronosnet.org/releases/%{name}-%{version}.tar.xz
4646

4747
# Build dependencies
48+
BuildRequires: make
4849
BuildRequires: gcc libqb-devel
4950
# required to build man pages
5051
%if %{with buildman}
51-
BuildRequires: libxml2-devel doxygen
52+
# BuildRequires: libxml2-devel doxygen
53+
BuildRequires: libxml2-devel doxygen doxygen2man
5254
%endif
5355
%if %{with sctp}
5456
BuildRequires: lksctp-tools-devel
@@ -156,21 +158,18 @@ BuildRequires: autoconf automake libtool
156158
--with-initdefaultdir=%{_sysconfdir}/sysconfig/ \
157159
--with-systemddir=%{_unitdir}
158160

159-
make %{_smp_mflags}
161+
%make_build
160162

161163
%install
162164
rm -rf %{buildroot}
163-
make install DESTDIR=%{buildroot}
165+
%make_install
164166

165167
# tree cleanup
166168
# remove static libraries
167169
find %{buildroot} -name "*.a" -exec rm {} \;
168170
# remove libtools leftovers
169171
find %{buildroot} -name "*.la" -exec rm {} \;
170172

171-
# remove init scripts
172-
rm -rf %{buildroot}/etc/init.d
173-
174173
# remove docs
175174
rm -rf %{buildroot}/usr/share/doc/kronosnet
176175

@@ -181,7 +180,7 @@ rm -rf %{buildroot}/usr/share/doc/kronosnet
181180
%if %{with libnozzle}
182181
%package -n libnozzle1
183182
Summary: Simple userland wrapper around kernel tap devices
184-
License: LGPLv2+
183+
License: LGPL-2.1-or-later
185184

186185
%description -n libnozzle1
187186
This is an over-engineered commodity library to manage a pool
@@ -201,7 +200,7 @@ License: LGPLv2+
201200

202201
%package -n libnozzle1-devel
203202
Summary: Simple userland wrapper around kernel tap devices (developer files)
204-
License: LGPLv2+
203+
License: LGPL-2.1-or-later
205204
Requires: libnozzle1%{_isa} = %{version}-%{release}
206205
Requires: pkgconfig
207206

@@ -222,7 +221,7 @@ Requires: pkgconfig
222221

223222
%package -n libknet1
224223
Summary: Kronosnet core switching implementation
225-
License: LGPLv2+
224+
License: LGPL-2.1-or-later
226225

227226
%description -n libknet1
228227
The whole kronosnet core is implemented in this library.
@@ -243,7 +242,7 @@ License: LGPLv2+
243242

244243
%package -n libknet1-devel
245244
Summary: Kronosnet core switching implementation (developer files)
246-
License: LGPLv2+
245+
License: LGPL-2.1-or-later
247246
Requires: libknet1%{_isa} = %{version}-%{release}
248247
Requires: pkgconfig
249248

@@ -264,7 +263,7 @@ Requires: pkgconfig
264263
%if %{with nss}
265264
%package -n libknet1-crypto-nss-plugin
266265
Summary: Provides libknet1 nss support
267-
License: LGPLv2+
266+
License: LGPL-2.1-or-later
268267
Requires: libknet1%{_isa} = %{version}-%{release}
269268

270269
%description -n libknet1-crypto-nss-plugin
@@ -277,7 +276,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
277276
%if %{with openssl}
278277
%package -n libknet1-crypto-openssl-plugin
279278
Summary: Provides libknet1 openssl support
280-
License: LGPLv2+
279+
License: LGPL-2.1-or-later
281280
Requires: libknet1%{_isa} = %{version}-%{release}
282281

283282
%description -n libknet1-crypto-openssl-plugin
@@ -290,7 +289,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
290289
%if %{with zlib}
291290
%package -n libknet1-compress-zlib-plugin
292291
Summary: Provides libknet1 zlib support
293-
License: LGPLv2+
292+
License: LGPL-2.1-or-later
294293
Requires: libknet1%{_isa} = %{version}-%{release}
295294

296295
%description -n libknet1-compress-zlib-plugin
@@ -303,7 +302,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
303302
%if %{with lz4}
304303
%package -n libknet1-compress-lz4-plugin
305304
Summary: Provides libknet1 lz4 and lz4hc support
306-
License: LGPLv2+
305+
License: LGPL-2.1-or-later
307306
Requires: libknet1%{_isa} = %{version}-%{release}
308307

309308
%description -n libknet1-compress-lz4-plugin
@@ -317,7 +316,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
317316
%if %{with lzo2}
318317
%package -n libknet1-compress-lzo2-plugin
319318
Summary: Provides libknet1 lzo2 support
320-
License: LGPLv2+
319+
License: LGPL-2.1-or-later
321320
Requires: libknet1%{_isa} = %{version}-%{release}
322321

323322
%description -n libknet1-compress-lzo2-plugin
@@ -330,7 +329,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
330329
%if %{with lzma}
331330
%package -n libknet1-compress-lzma-plugin
332331
Summary: Provides libknet1 lzma support
333-
License: LGPLv2+
332+
License: LGPL-2.1-or-later
334333
Requires: libknet1%{_isa} = %{version}-%{release}
335334

336335
%description -n libknet1-compress-lzma-plugin
@@ -343,7 +342,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
343342
%if %{with bzip2}
344343
%package -n libknet1-compress-bzip2-plugin
345344
Summary: Provides libknet1 bzip2 support
346-
License: LGPLv2+
345+
License: LGPL-2.1-or-later
347346
Requires: libknet1%{_isa} = %{version}-%{release}
348347

349348
%description -n libknet1-compress-bzip2-plugin
@@ -356,7 +355,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
356355
%if %{with zstd}
357356
%package -n libknet1-compress-zstd-plugin
358357
Summary: Provides libknet1 zstd support
359-
License: LGPLv2+
358+
License: LGPL-2.1-or-later
360359
Requires: libknet1%{_isa} = %{version}-%{release}
361360

362361
%description -n libknet1-compress-zstd-plugin
@@ -368,7 +367,7 @@ Requires: libknet1%{_isa} = %{version}-%{release}
368367

369368
%package -n libknet1-crypto-plugins-all
370369
Summary: Provides libknet1 crypto plugins meta package
371-
License: LGPLv2+
370+
License: LGPL-2.1-or-later
372371
%if %{with nss}
373372
Requires: libknet1-crypto-nss-plugin%{_isa} = %{version}-%{release}
374373
%endif
@@ -383,7 +382,7 @@ Requires: libknet1-crypto-openssl-plugin%{_isa} = %{version}-%{release}
383382

384383
%package -n libknet1-compress-plugins-all
385384
Summary: Provides libknet1 compress plugins meta package
386-
License: LGPLv2+
385+
License: LGPL-2.1-or-later
387386
%if %{with zlib}
388387
Requires: libknet1-compress-zlib-plugin%{_isa} = %{version}-%{release}
389388
%endif
@@ -410,7 +409,7 @@ Requires: libknet1-compress-zstd-plugin%{_isa} = %{version}-%{release}
410409

411410
%package -n libknet1-plugins-all
412411
Summary: Provides libknet1 plugins meta package
413-
License: LGPLv2+
412+
License: LGPL-2.1-or-later
414413
Requires: libknet1-compress-plugins-all%{_isa} = %{version}-%{release}
415414
Requires: libknet1-crypto-plugins-all%{_isa} = %{version}-%{release}
416415

@@ -422,8 +421,11 @@ Requires: libknet1-crypto-plugins-all%{_isa} = %{version}-%{release}
422421
%if %{with installtests}
423422
%package -n kronosnet-tests
424423
Summary: Provides kronosnet test suite
425-
License: GPLv2+
424+
License: GPL-2.0-or-later
426425
Requires: libknet1%{_isa} = %{version}-%{release}
426+
%if %{with libnozzle}
427+
Requires: libnozzle1%{_isa} = %{version}-%{release}
428+
%endif
427429

428430
%description -n kronosnet-tests
429431
This package contains all the libknet and libnozzle test suite.
@@ -437,8 +439,98 @@ Requires: libknet1%{_isa} = %{version}-%{release}
437439
%endif
438440

439441
%changelog
440-
* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 1.20-2
441-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
442+
* Thu Mar 13 2025 Aninda Pradhan <[email protected]> - 1.29-3
443+
- Initial Azure Linux import from Fedora 41 (license: MIT)
444+
- License Verified
445+
446+
* Thu Jul 18 2024 Fedora Release Engineering <[email protected]> - 1.29-2
447+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
448+
449+
* Thu Jun 06 2024 Fabio M. Di Nitto <[email protected]> - 1.29-1
450+
- New upstream release
451+
- Fix build on armhf
452+
- Update to latest doxyxml from libqb
453+
- Fix FORTIFY source detection
454+
- Fix potential overflow in the test suite
455+
456+
* Thu Jan 25 2024 Fedora Release Engineering <[email protected]> - 1.28-3
457+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
458+
459+
* Sun Jan 21 2024 Fedora Release Engineering <[email protected]> - 1.28-2
460+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
461+
462+
* Wed Sep 27 2023 Fabio M. Di Nitto <[email protected]> - 1.28-1
463+
- New upstream release
464+
- Fix build on i686 machines
465+
466+
* Tue Sep 26 2023 Fabio M. Di Nitto <[email protected]> - 1.27-1
467+
- New upstream release
468+
- Fix potential startup race condition (corosync use case)
469+
- Fix crypto config check
470+
- Minor API cleanup
471+
- Test suite fixes
472+
473+
* Thu Jul 20 2023 Fedora Release Engineering <[email protected]> - 1.26-2
474+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
475+
476+
* Mon Jul 10 2023 Fabio M. Di Nitto <[email protected]> - 1.26-1
477+
- New upstream release
478+
- Improve TX performance and use less CPU
479+
- minor other improvements
480+
- Build system update
481+
482+
* Tue Jun 06 2023 Jan Friesse <[email protected]> - 1.25-3
483+
- migrated to SPDX license
484+
485+
* Thu Jan 19 2023 Fedora Release Engineering <[email protected]> - 1.25-2
486+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
487+
488+
* Wed Jan 04 2023 Fabio M. Di Nitto <[email protected]> - 1.25-1
489+
- New upstream release
490+
- Fix PMTUd issues
491+
- Update docs and upstream URLs
492+
- Fix spec file for test suite build conditional
493+
- Build system update
494+
495+
* Thu Jul 21 2022 Fedora Release Engineering <[email protected]> - 1.24-2
496+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
497+
498+
* Mon May 30 2022 Fabio M. Di Nitto <[email protected]> - 1.24-1
499+
- New upstream release
500+
- Fix minor issues
501+
- Update docs and upstream URLs
502+
- Test suite refactoring
503+
504+
* Thu Jan 20 2022 Fedora Release Engineering <[email protected]> - 1.23-2
505+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
506+
507+
* Mon Nov 15 2021 Fabio M. Di Nitto <[email protected]> - 1.23-1
508+
- New upstream release
509+
- Fix several major issues
510+
511+
* Tue Sep 14 2021 Sahana Prasad <[email protected]> - 1.22-2
512+
- Rebuilt with OpenSSL 3.0.0
513+
514+
* Mon Aug 30 2021 Fabio M. Di Nitto <[email protected]> - 1.22-1
515+
- New upstream release
516+
- Fix several major issues
517+
518+
* Thu Jul 22 2021 Fedora Release Engineering <[email protected]> - 1.21-3
519+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
520+
521+
* Fri May 14 2021 Timm Bäder <[email protected]> - 1.21-2
522+
- Use make macros
523+
524+
* Wed Apr 28 2021 Fabio M. Di Nitto <[email protected]> - 1.21-1
525+
- New upstream release
526+
- Update to openssl 3.0alpha13
527+
- Drop -rpath usage from libknet
528+
- Various libnozzle fixes
529+
- API: validate handles for public api calls to avoid crashes
530+
- Test suite improvements to speed up testing
531+
532+
* Tue Jan 26 2021 Fedora Release Engineering <[email protected]> - 1.20-2
533+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
442534

443535
* Mon Oct 19 2020 Fabio M. Di Nitto <[email protected]> - 1.20-1
444536
- New upstream release
@@ -455,13 +547,17 @@ Requires: libknet1%{_isa} = %{version}-%{release}
455547
- Removed unused poc-code from the source tree
456548
- Make sure to initialize epoll events structures
457549

550+
* Tue Jul 28 2020 Fedora Release Engineering <[email protected]> - 1.18-2
551+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
552+
458553
* Tue Jul 14 2020 Fabio M. Di Nitto <[email protected]> - 1.18-1
459554
- New upstream release
460555
- Add ability to change crypto configuration at runtime without
461556
restarting knet and without packet drop
462557
- Add compatibility support for openssl 3.0
463558
- Add functional testing framework and new test cases
464559
- Minor build fixes
560+
- Fix BuildRequires to use libqb doxygen2man vs internal copy
465561

466562
* Thu Apr 23 2020 Fabio M. Di Nitto <[email protected]> - 1.16-1
467563
- New upstream release

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8481,8 +8481,8 @@
84818481
"type": "other",
84828482
"other": {
84838483
"name": "kronosnet",
8484-
"version": "1.20",
8485-
"downloadUrl": "https://kronosnet.org/releases/kronosnet-1.20.tar.xz"
8484+
"version": "1.29",
8485+
"downloadUrl": "https://kronosnet.org/releases/kronosnet-1.29.tar.xz"
84868486
}
84878487
}
84888488
},

0 commit comments

Comments
 (0)