| |
@@ -1,15 +1,3 @@
|
| |
- ###############################################################################
|
| |
- ###############################################################################
|
| |
- ##
|
| |
- ## Copyright (C) 2012-2018 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
|
| |
- ## of the GNU General Public License v.2 or higher
|
| |
- ##
|
| |
- ###############################################################################
|
| |
- ###############################################################################
|
| |
-
|
| |
# set defaults from ./configure invokation
|
| |
%bcond_without sctp
|
| |
%bcond_without nss
|
| |
@@ -20,7 +8,7 @@
|
| |
%bcond_without lzma
|
| |
%bcond_without bzip2
|
| |
%bcond_with kronosnetd
|
| |
- %bcond_with libtap
|
| |
+ %bcond_without libnozzle
|
| |
%bcond_with runautogen
|
| |
%bcond_with rpmdebuginfo
|
| |
%bcond_with overriderpmdebuginfo
|
| |
@@ -54,11 +42,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}
|
| |
@@ -73,8 +61,8 @@
|
| |
|
| |
Name: kronosnet
|
| |
Summary: Multipoint-to-Multipoint VPN daemon
|
| |
- Version: 1.5
|
| |
- Release: 1%{?dist}
|
| |
+ Version: 1.7
|
| |
+ Release: 3%{?dist}
|
| |
License: GPLv2+ and LGPLv2+
|
| |
URL: http://www.kronosnet.org
|
| |
Source0: http://www.kronosnet.org/releases/kronosnet-%{version}.tar.gz
|
| |
@@ -90,7 +78,7 @@
|
| |
BuildRequires: lksctp-tools-devel
|
| |
%endif
|
| |
%if %{defined buildcryptonss}
|
| |
- BuildRequires: nss-devel
|
| |
+ BuildRequires: nss-devel
|
| |
%endif
|
| |
%if %{defined buildcryptoopenssl}
|
| |
BuildRequires: openssl-devel
|
| |
@@ -113,6 +101,9 @@
|
| |
%if %{defined buildkronosnetd}
|
| |
BuildRequires: pam-devel
|
| |
%endif
|
| |
+ %if %{defined buildlibnozzle}
|
| |
+ BuildRequires: libnl3-devel
|
| |
+ %endif
|
| |
%if %{defined buildautogen}
|
| |
BuildRequires: autoconf
|
| |
BuildRequires: automake
|
| |
@@ -176,10 +167,15 @@
|
| |
%if %{defined buildkronosnetd}
|
| |
--enable-kronosnetd \
|
| |
%endif
|
| |
- %if %{defined buildlibtap}
|
| |
- --enable-libtap \
|
| |
+ %if %{defined buildlibnozzle}
|
| |
+ --enable-libnozzle \
|
| |
%endif
|
| |
+ --with-initdefaultdir=%{_sysconfdir}/sysconfig/ \
|
| |
+ %if %{defined _unitdir}
|
| |
--with-systemddir=%{_unitdir}
|
| |
+ %else
|
| |
+ --with-initddir=%{_sysconfdir}/rc.d/init.d/
|
| |
+ %endif
|
| |
|
| |
make %{_smp_mflags}
|
| |
|
| |
@@ -193,19 +189,18 @@
|
| |
# 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
|
| |
@@ -215,12 +210,12 @@
|
| |
%package -n kronosnetd
|
| |
Summary: Multipoint-to-Multipoint VPN daemon
|
| |
# Needed for systemd unit
|
| |
- Requires(post): systemd-sysv
|
| |
- Requires(post): systemd-units
|
| |
- Requires(preun): systemd-units
|
| |
+ Requires(post): systemd-sysv
|
| |
+ Requires(post): systemd-units
|
| |
+ Requires(preun): systemd-units
|
| |
Requires(postun): systemd-units
|
| |
- Requires(post): shadow-utils
|
| |
- Requires(preun): shadow-utils
|
| |
+ Requires(post): shadow-utils
|
| |
+ Requires(preun): shadow-utils
|
| |
Requires: pam, /etc/pam.d/passwd
|
| |
|
| |
%description -n kronosnetd
|
| |
@@ -234,22 +229,11 @@
|
| |
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,40 +247,39 @@
|
| |
%{_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.*
|
| |
-
|
| |
- %post -n libtap1 -p /sbin/ldconfig
|
| |
+ %{_libdir}/libnozzle.so.*
|
| |
|
| |
- %postun -n libtap1 -p /sbin/ldconfig
|
| |
+ %ldconfig_scriptlets -n libnozzle1
|
| |
|
| |
- %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
|
| |
@@ -313,9 +296,7 @@
|
| |
%{_libdir}/libknet.so.*
|
| |
%dir %{_libdir}/kronosnet
|
| |
|
| |
- %post -n libknet1 -p /sbin/ldconfig
|
| |
-
|
| |
- %postun -n libknet1 -p /sbin/ldconfig
|
| |
+ %ldconfig_scriptlets -n libknet1
|
| |
|
| |
%package -n libknet1-devel
|
| |
Summary: Kronosnet core switching implementation (developer files)
|
| |
@@ -329,6 +310,7 @@
|
| |
information.
|
| |
|
| |
%files -n libknet1-devel
|
| |
+ %license COPYING.* COPYRIGHT
|
| |
%{_libdir}/libknet.so
|
| |
%{_includedir}/libknet.h
|
| |
%{_libdir}/pkgconfig/libknet.pc
|
| |
@@ -478,11 +460,63 @@
|
| |
%files -n libknet1-plugins-all
|
| |
|
| |
%if %{with rpmdebuginfo}
|
| |
- # This is left over from upstream.
|
| |
%debug_package
|
| |
%endif
|
| |
|
| |
%changelog
|
| |
+ * Sat Mar 23 2019 Phil Wyett <philwyett@kathenas.org> - 1.7-3
|
| |
+ - Update ldconfig scriptlets
|
| |
+
|
| |
+ * Sat Mar 23 2019 Phil Wyett <philwyett@kathenas.org> - 1.7-2
|
| |
+ - Remove release tarballs
|
| |
+ - Remove not needed copyright notice
|
| |
+ - Restore changelog
|
| |
+ - Fix tabs vs spaces in spec file
|
| |
+ - Begin general cleanup of spec file
|
| |
+
|
| |
+ * Thu Jan 31 2019 Madison Kelly <mkelly@alteeve.ca> - 1.7-1
|
| |
+ - Updated to upstream release v1.7.
|
| |
+
|
| |
* Mon Nov 26 2018 Madison Kelly <mkelly@alteeve.ca> - 1.5-1
|
| |
- Updated to upstream release v1.5.
|
| |
|
| |
+ * Tue Aug 14 2018 Madison Kelly <mkelly@alteeve.ca> - 1.4-1
|
| |
+ - Updated to upstream release v1.4.
|
| |
+
|
| |
+ * Mon Apr 23 2018 Madison Kelly <mkelly@alteeve.ca> - 1.3-1
|
| |
+ - Updated to upstream release v1.3.
|
| |
+
|
| |
+ * Fri Mar 09 2018 Madison Kelly <mkelly@alteeve.ca> - 1.1-8
|
| |
+ - Change pkgconfig() to normal package names to help avoid the wrong
|
| |
+ package being pulled in to satisfy dependencies.
|
| |
+
|
| |
+ * Wed Mar 07 2018 Madison Kelly <mkelly@alteeve.ca> - 1.1-7
|
| |
+ - Moved the comment back above '%%files -n libknet1-devel'.
|
| |
+ - Added comment to '%%debug_package'.
|
| |
+
|
| |
+ * Wed Mar 07 2018 Madison Kelly <mkelly@alteeve.ca> - 1.1-6
|
| |
+ - Add version requirement to lz4 to deal with koji pulling in the wrong package.
|
| |
+
|
| |
+ * Tue Mar 06 2018 Madison Kelly <mkelly@alteeve.ca> - 1.1-5
|
| |
+ - Updated ldconfig scriptlet calls.
|
| |
+ - Moved the debug_package leading comment.
|
| |
+
|
| |
+ * Sun Mar 04 2018 Madison Kelly <mkelly@alteeve.ca> - 1.1-4
|
| |
+ - Removed leading spaces from descriptions.
|
| |
+ - Added the (commented out) %%check tests.
|
| |
+ - Updated the changelog macro references to have two percent signs.
|
| |
+ - Dropped the redundant libknet1-devel license files.
|
| |
+ - Changed 'GPLv2+ + LGPLv2+' to 'GPLv2+ and LGPLv2+'.
|
| |
+ - Updated %%ldconfig_scriptlets call.
|
| |
+ - Clarified the kronosnet protocol version in the summary.
|
| |
+
|
| |
+ * Mon Feb 26 2018 Madison Kelly <mkelly@alteeve.ca> - 1.1-3
|
| |
+ - Fixed the changelog to not have the full macro names.
|
| |
+
|
| |
+ * Sun Feb 25 2018 Madison Kelly <mkelly@alteeve.ca> - 1.1-2
|
| |
+ - Moved the 'BuildRequires: systemd' to be conditional with kronostnetd.
|
| |
+
|
| |
+ * Sun Feb 25 2018 Madison Kelly <mkelly@alteeve.ca> - 1.1-1
|
| |
+ - Rerolled for 1.1 upstream release.
|
| |
+ - Removed the (no longer needed) gcc8-fixes.patch
|
| |
+ - Added the new doxygen and libqb-devel buildrequires for libknetd.
|
| |
kathenas
commented 5 years ago
This also updates newer branches to 1.7 that appears in f29