From 028bfce25fc4ab0a10bba1d04ed6df393a0cc54e Mon Sep 17 00:00:00 2001 From: Digimer Date: Apr 09 2019 03:20:47 +0000 Subject: Updated to upstream release v1.8. --- diff --git a/.gitignore b/.gitignore index 4fb71a0..3e1b130 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /kronosnet-1.3.tar.gz /kronosnet-1.4.tar.gz /kronosnet-1.5.tar.gz +/kronosnet-1.8.tar.gz diff --git a/kronosnet.spec b/kronosnet.spec index a883644..2ce9e5b 100644 --- a/kronosnet.spec +++ b/kronosnet.spec @@ -1,7 +1,7 @@ ############################################################################### ############################################################################### ## -## Copyright (C) 2012-2018 Red Hat, Inc. All rights reserved. +## Copyright (C) 2012-2019 Red Hat, Inc. All rights reserved. ## ## This copyrighted material is made available to anyone wishing to use, ## modify, copy, or redistribute it subject to the terms and conditions @@ -10,7 +10,7 @@ ############################################################################### ############################################################################### -# set defaults from ./configure invokation +# set defaults from ./configure invocation %bcond_without sctp %bcond_without nss %bcond_without openssl @@ -20,11 +20,12 @@ %bcond_without lzma %bcond_without bzip2 %bcond_with kronosnetd -%bcond_with libtap +%bcond_without libnozzle %bcond_with runautogen %bcond_with rpmdebuginfo %bcond_with overriderpmdebuginfo %bcond_without buildman +%bcond_with installtests %if %{with overriderpmdebuginfo} %undefine _enable_debug_packages @@ -54,11 +55,11 @@ %if %{with bzip2} %global buildcompressbzip2 1 %endif -%if %{with libtap} -%global buildlibtap 1 +%if %{with libnozzle} +%global buildlibnozzle 1 %endif %if %{with kronosnetd} -%global buildlibtap 1 +%global buildlibnozzle 1 %global buildkronosnetd 1 %endif %if %{with runautogen} @@ -67,14 +68,17 @@ %if %{with buildman} %global buildmanpages 1 %endif +%if %{with installtests} +%global installtestsuite 1 +%endif # main (empty) package # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html Name: kronosnet Summary: Multipoint-to-Multipoint VPN daemon -Version: 1.5 -Release: 2%{?dist} +Version: 1.8 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.kronosnet.org Source0: http://www.kronosnet.org/releases/kronosnet-%{version}.tar.gz @@ -90,7 +94,7 @@ BuildRequires: libqb-devel libxml2-devel doxygen BuildRequires: lksctp-tools-devel %endif %if %{defined buildcryptonss} -BuildRequires: nss-devel +BuildRequires: nss-devel %endif %if %{defined buildcryptoopenssl} BuildRequires: openssl-devel @@ -113,6 +117,9 @@ BuildRequires: bzip2-devel %if %{defined buildkronosnetd} BuildRequires: pam-devel %endif +%if %{defined buildlibnozzle} +BuildRequires: libnl3-devel +%endif %if %{defined buildautogen} BuildRequires: autoconf BuildRequires: automake @@ -128,58 +135,68 @@ BuildRequires: libtool %endif %{configure} \ +%if %{defined installtestsuite} + --enable-install-tests \ +%else + --disable-install-tests \ +%endif %if %{defined buildmanpages} - --enable-man \ + --enable-man \ %else - --disable-man \ + --disable-man \ %endif %if %{defined buildsctp} - --enable-libknet-sctp \ + --enable-libknet-sctp \ %else - --disable-libknet-sctp \ + --disable-libknet-sctp \ %endif %if %{defined buildcryptonss} - --enable-crypto-nss \ + --enable-crypto-nss \ %else - --disable-crypto-nss \ + --disable-crypto-nss \ %endif %if %{defined buildcryptoopenssl} - --enable-crypto-openssl \ + --enable-crypto-openssl \ %else - --disable-crypto-openssl \ + --disable-crypto-openssl \ %endif %if %{defined buildcompresszlib} - --enable-compress-zlib \ + --enable-compress-zlib \ %else - --disable-compress-zlib \ + --disable-compress-zlib \ %endif %if %{defined buildcompresslz4} - --enable-compress-lz4 \ + --enable-compress-lz4 \ %else - --disable-compress-lz4 \ + --disable-compress-lz4 \ %endif %if %{defined buildcompresslzo2} - --enable-compress-lzo2 \ + --enable-compress-lzo2 \ %else - --disable-compress-lzo2 \ + --disable-compress-lzo2 \ %endif %if %{defined buildcompresslzma} - --enable-compress-lzma \ + --enable-compress-lzma \ %else - --disable-compress-lzma \ + --disable-compress-lzma \ %endif %if %{defined buildcompressbzip2} - --enable-compress-bzip2 \ + --enable-compress-bzip2 \ %else - --disable-compress-bzip2 \ + --disable-compress-bzip2 \ %endif %if %{defined buildkronosnetd} - --enable-kronosnetd \ + --enable-kronosnetd \ +%endif +%if %{defined buildlibnozzle} + --enable-libnozzle \ %endif -%if %{defined buildlibtap} - --enable-libtap \ + --with-initdefaultdir=%{_sysconfdir}/sysconfig/ \ +%if %{defined _unitdir} + --with-systemddir=%{_unitdir} +%else + --with-initddir=%{_sysconfdir}/rc.d/init.d/ %endif - --with-systemddir=%{_unitdir} make %{_smp_mflags} @@ -193,22 +210,21 @@ find %{buildroot} -name "*.a" -exec rm {} \; # remove libtools leftovers find %{buildroot} -name "*.la" -exec rm {} \; +# handle systemd vs init script +%if %{defined _unitdir} +# remove init scripts +rm -rf %{buildroot}/etc/init.d +%else # remove systemd specific bits find %{buildroot} -name "*.service" -exec rm {} \; +%endif # remove docs rm -rf %{buildroot}/usr/share/doc/kronosnet -# Disabled because of concern that the testsuite does not play nice with the -# network loopback interface. Upstream has a comprehensive CI/CD system which -# tests different versions of Fedora and should be very safe. In the unlikely -# event of bugs, we should probably avoid DoS´ing the fedora builders by -# generating unwanted traffic. -#%check - # main empty package %description -kronosnet source + The kronosnet source %if %{defined buildkronosnetd} ## Runtime and subpackages section @@ -234,22 +250,11 @@ Requires: pam, /etc/pam.d/passwd or service disruption. %post -n kronosnetd -%if 0%{?systemd_post:1} - %systemd_post kronosnetd.service -%else - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -%endif -/usr/sbin/groupadd --force --system kronosnetadm +%systemd_post kronosnetd.service +getent group kronosnetadm >/dev/null || groupadd --force kronosnetadm %preun -n kronosnetd -%if 0%{?systemd_preun:1} - %systemd_preun kronosnetd.service -%else -if [ "$1" -eq 0 ]; then - /bin/systemctl --no-reload disable kronosnetd.service - /bin/systemctl stop kronosnetd.service >/dev/null 2>&1 -fi -%endif +%systemd_preun kronosnetd.service %files -n kronosnetd %license COPYING.* COPYRIGHT @@ -263,38 +268,41 @@ fi %{_mandir}/man8/* %endif -%if %{defined buildlibtap} -%package -n libtap1 +%if %{defined buildlibnozzle} +%package -n libnozzle1 Summary: Simple userland wrapper around kernel tap devices License: LGPLv2+ -%description -n libtap1 +%description -n libnozzle1 This is an over-engineered commodity library to manage a pool of tap devices and provides the basic pre-up.d/up.d/down.d/post-down.d infrastructure. -%files -n libtap1 +%files -n libnozzle1 %license COPYING.* COPYRIGHT -%{_libdir}/libtap.so.* +%{_libdir}/libnozzle.so.* + +%post -n libnozzle1 -p /sbin/ldconfig -%ldconfig_scriptlets -n libtap1 +%postun -n libnozzle1 -p /sbin/ldconfig -%package -n libtap1-devel +%package -n libnozzle1-devel Summary: Simple userland wrapper around kernel tap devices (developer files) License: LGPLv2+ -Requires: libtap1%{_isa} = %{version}-%{release} +Requires: libnozzle1 = %{version}-%{release} Requires: pkgconfig -%description -n libtap1-devel +%description -n libnozzle1-devel This is an over-engineered commodity library to manage a pool of tap devices and provides the basic pre-up.d/up.d/down.d/post-down.d infrastructure. -%files -n libtap1-devel +%files -n libnozzle1-devel %license COPYING.* COPYRIGHT -%{_libdir}/libtap.so -%{_includedir}/libtap.h -%{_libdir}/pkgconfig/libtap.pc +%{_libdir}/libnozzle.so +%{_includedir}/libnozzle.h +%{_libdir}/pkgconfig/libnozzle.pc +%{_mandir}/man3/nozzle*.3.gz %endif %package -n libknet1 @@ -311,7 +319,9 @@ License: LGPLv2+ %{_libdir}/libknet.so.* %dir %{_libdir}/kronosnet -%ldconfig_scriptlets -n libknet1 +%post -n libknet1 -p /sbin/ldconfig + +%postun -n libknet1 -p /sbin/ldconfig %package -n libknet1-devel Summary: Kronosnet core switching implementation (developer files) @@ -325,6 +335,7 @@ Requires: pkgconfig information. %files -n libknet1-devel +%license COPYING.* COPYRIGHT %{_libdir}/libknet.so %{_includedir}/libknet.h %{_libdir}/pkgconfig/libknet.pc @@ -334,12 +345,12 @@ Requires: pkgconfig %if %{defined buildcryptonss} %package -n libknet1-crypto-nss-plugin -Summary: libknet1 nss support +Summary: Provides libknet1 nss support License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-crypto-nss-plugin - NSS crypto support for libknet1. + Provides NSS crypto support for libknet1. %files -n libknet1-crypto-nss-plugin %{_libdir}/kronosnet/crypto_nss.so @@ -347,12 +358,12 @@ Requires: libknet1%{_isa} = %{version}-%{release} %if %{defined buildcryptoopenssl} %package -n libknet1-crypto-openssl-plugin -Summary: libknet1 openssl support +Summary: Provides libknet1 openssl support License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-crypto-openssl-plugin - OpenSSL crypto support for libknet1. + Provides OpenSSL crypto support for libknet1. %files -n libknet1-crypto-openssl-plugin %{_libdir}/kronosnet/crypto_openssl.so @@ -360,24 +371,24 @@ Requires: libknet1%{_isa} = %{version}-%{release} %if %{defined buildcompresszlib} %package -n libknet1-compress-zlib-plugin -Summary: libknet1 zlib support +Summary: Provides libknet1 zlib support License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-zlib-plugin - zlib compression support for libknet1. + Provides zlib compression support for libknet1. %files -n libknet1-compress-zlib-plugin %{_libdir}/kronosnet/compress_zlib.so %endif %if %{defined buildcompresslz4} %package -n libknet1-compress-lz4-plugin -Summary: libknet1 lz4 and lz4hc support +Summary: Provides libknet1 lz4 and lz4hc support License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-lz4-plugin - lz4 and lz4hc compression support for libknet1. + Provides lz4 and lz4hc compression support for libknet1. %files -n libknet1-compress-lz4-plugin %{_libdir}/kronosnet/compress_lz4.so @@ -386,12 +397,12 @@ Requires: libknet1%{_isa} = %{version}-%{release} %if %{defined buildcompresslzo2} %package -n libknet1-compress-lzo2-plugin -Summary: libknet1 lzo2 support +Summary: Provides libknet1 lzo2 support License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-lzo2-plugin - lzo2 compression support for libknet1. + Provides lzo2 compression support for libknet1. %files -n libknet1-compress-lzo2-plugin %{_libdir}/kronosnet/compress_lzo2.so @@ -399,12 +410,12 @@ Requires: libknet1%{_isa} = %{version}-%{release} %if %{defined buildcompresslzma} %package -n libknet1-compress-lzma-plugin -Summary: libknet1 lzma support +Summary: Provides libknet1 lzma support License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-lzma-plugin - lzma compression support for libknet1. + Provides lzma compression support for libknet1. %files -n libknet1-compress-lzma-plugin %{_libdir}/kronosnet/compress_lzma.so @@ -412,19 +423,19 @@ Requires: libknet1%{_isa} = %{version}-%{release} %if %{defined buildcompressbzip2} %package -n libknet1-compress-bzip2-plugin -Summary: libknet1 bzip2 support +Summary: Provides libknet1 bzip2 support License: LGPLv2+ Requires: libknet1%{_isa} = %{version}-%{release} %description -n libknet1-compress-bzip2-plugin - bzip2 compression support for libknet1. + Provides bzip2 compression support for libknet1. %files -n libknet1-compress-bzip2-plugin %{_libdir}/kronosnet/compress_bzip2.so %endif %package -n libknet1-crypto-plugins-all -Summary: libknet1 crypto plugins meta package +Summary: Provides libknet1 crypto plugins meta package License: LGPLv2+ %if %{defined buildcryptonss} Requires: libknet1-crypto-nss-plugin%{_isa} = %{version}-%{release} @@ -434,12 +445,12 @@ Requires: libknet1-crypto-openssl-plugin%{_isa} = %{version}-%{release} %endif %description -n libknet1-crypto-plugins-all - meta package to install all of libknet1 crypto plugins + Provides meta package to install all of libknet1 crypto plugins %files -n libknet1-crypto-plugins-all %package -n libknet1-compress-plugins-all -Summary: libknet1 compress plugins meta package +Summary: Provides libknet1 compress plugins meta package License: LGPLv2+ %if %{defined buildcompresszlib} Requires: libknet1-compress-zlib-plugin%{_isa} = %{version}-%{release} @@ -458,30 +469,40 @@ Requires: libknet1-compress-bzip2-plugin%{_isa} = %{version}-%{release} %endif %description -n libknet1-compress-plugins-all - meta package to install all of libknet1 compress plugins + Meta package to install all of libknet1 compress plugins %files -n libknet1-compress-plugins-all %package -n libknet1-plugins-all -Summary: libknet1 plugins meta package +Summary: Provides libknet1 plugins meta package License: LGPLv2+ Requires: libknet1-compress-plugins-all%{_isa} = %{version}-%{release} Requires: libknet1-crypto-plugins-all%{_isa} = %{version}-%{release} %description -n libknet1-plugins-all - meta package to install all of libknet1 plugins + Meta package to install all of libknet1 plugins %files -n libknet1-plugins-all +%if %{with installtests} +%package -n kronosnet-tests +Group: System Environment/Libraries +Summary: Provides kronosnet test suite +Requires: libknet1 = %{version}-%{release} + +%description -n kronosnet-tests + This package contains all the libknet and libnozzle test suite + +%files -n kronosnet-tests +%defattr(-,root,root,-) +%{_libdir}/kronosnet/tests/* +%endif + %if %{with rpmdebuginfo} -# This is left over from upstream. %debug_package %endif %changelog -* Fri Feb 01 2019 Fedora Release Engineering - 1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Nov 26 2018 Madison Kelly - 1.5-1 -- Updated to upstream release v1.5. +* Wed Apr 03 2019 Madison Kelly - 1.8-1 +- Updated to upstream release v1.8. diff --git a/sources b/sources index 7c78e9d..8f4fcea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kronosnet-1.5.tar.gz) = 27cb525acc5daed0610967d62af764208461dcfb600d1f0c552639a76945552aef5235d8b950e4d3629b26082c3a722d399e09388939541a245b0de97ed87a60 +SHA512 (kronosnet-1.8.tar.gz) = 4af49dcedd29c3536c19c0417367e7f3a47585a8600242b06709ec43eab0f5e8d0e808214cfca0956d3bdc829565eab0692c22de162dc7579c6521aa26fc9110