Hello community, here is the log from the commit of package knock for openSUSE:Factory checked in at 2015-12-09 19:50:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knock (Old) and /work/SRC/openSUSE:Factory/.knock.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knock" Changes: -------- --- /work/SRC/openSUSE:Factory/knock/knock.changes 2011-09-23 02:06:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.knock.new/knock.changes 2015-12-09 22:21:06.000000000 +0100 @@ -1,0 +2,22 @@ +Tue Dec 1 14:49:38 UTC 2015 - [email protected] + +- Update to version 0.7 + * Document the 'target' configuration directive. + * Merging OS-specific networking code to reduce LOCs and the + sea of #ifdefs. + * Added 50ms timeout to pcap_open_live() to reduce CPU usage + on network-heavy hosts. Pcap recommends we not use zero. +- Changes from version 0.6 + * Cleanup: Don't null-check before free + * Cleanup: Consolidate flag-check logic + * Accept single-knock sequences + * Introduce a 'target' configuration directive, enabling knockd to + react to connect attempts to a target host. Useful in cases where + knockd is on a router and you want to send a target a wakeup packet. +- Add systemd support for openSUSE > 12.1 +- Update knock-include.patch > knock-0.5-include.patch +- Remove obsolete AUTHORS section +- Use download Url as source +- Perform a spec-cleaner + +------------------------------------------------------------------- Old: ---- knock-0.5-include.patch knock-0.5.tar.bz2 New: ---- knock-0.7.tar.gz knock-include.patch knockd.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knock.spec ++++++ --- /var/tmp/diff_new_pack.R4Bd3w/_old 2015-12-09 22:21:07.000000000 +0100 +++ /var/tmp/diff_new_pack.R4Bd3w/_new 2015-12-09 22:21:07.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package knock (Version 0.5) +# spec file for package spec # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,23 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - +%if 0%{?suse_version} > 1210 +%define with_systemd 1 +%else +%define with_systemd 0 +%endif Name: knock -BuildRequires: libpcap-devel +Version: 0.7 +Release: 0 Summary: A Port-Knocking Client -Version: 0.5 -Release: 139 License: GPL-2.0+ Group: Productivity/Networking/Security Url: http://www.zeroflux.org/knock/ -Source0: %{name}-%{version}.tar.bz2 +Source0: http://www.zeroflux.org/proj/knock/files/%{name}-%{version}.tar.gz Source1: %{name}d.sysconfig Source2: %{name}d.init Source3: %{name}d.conf -Patch: %{name}-%{version}.patch -Patch1: %{name}-%{version}-include.patch +Source4: %{name}d.service +Patch0: %{name}-0.5.patch +Patch1: %{name}-include.patch +BuildRequires: libpcap-devel +%if %{with_systemd} +BuildRequires: systemd-rpm-macros +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,17 +51,15 @@ of port hits, it runs a command defined in its configuration file. This can be used to open up holes in a firewall for quick access. - - -Authors: --------- - Judd Vinet <[email protected]> - %package -n knockd +Summary: A port-knocking server License: GPL-2.0+ Group: Productivity/Networking/Security -Summary: A port-knocking server -PreReq: %fillup_prereq +%if %{with_systemd} +%{?systemd_requires} +%else +Requires(pre): %insserv_prereq %fillup_prereq +%endif %description -n knockd It listens to all traffic on an ethernet (or PPP) interface, looking @@ -66,40 +71,54 @@ it runs a command defined in its configuration file. This can be used to open up holes in a firewall for quick access. - - -Authors: --------- - Judd Vinet <[email protected]> - %prep %setup -q -%patch +%patch0 %patch1 %build -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%_libdir --mandir=%_mandir -make +%configure +make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install -install -m 644 -D %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name}d -install -m 755 -D %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}d -sed -i -e "s:iptables:%{_sbindir}/iptables:" %{S:3} -install -m 600 -D %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}d.conf -ln -sf ../../etc/init.d/%{name}d $RPM_BUILD_ROOT/usr/sbin/rc%{name}d - -%clean -rm -rf $RPM_BUILD_ROOT +make DESTDIR=%{buildroot} install %{?_smp_mflags} +sed -i -e "s:iptables:%{_sbindir}/iptables:" %{SOURCE3} +install -m 600 -D %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}d.conf +%if %{with_systemd} +install -D -m 644 %{SOURCE4} %{buildroot}/%{_unitdir}/%{name}d.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}d +%else +install -m 644 -D %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}d +install -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/%{name}d +ln -sf ../..%{_initddir}/%{name}d %{buildroot}%{_sbindir}/rc%{name}d +%endif +rm -rf %{buildroot}%{_datadir}/doc + +%if %{with_systemd} +%pre -n knockd +%service_add_pre %{name}d.service +%endif %post -n knockd +%if %{with_systemd} +%service_add_post %{name}d.service +%else %fillup_only -n %{name}d +%endif %preun -n knockd +%if %{with_systemd} +%service_del_preun %{name}d.service +%else %stop_on_removal %{name}d +%endif %postun -n knockd +%if %{with_systemd} +%service_del_postun %{name}d.service +%else %insserv_cleanup +%endif %files %defattr(-,root,root) @@ -108,12 +127,16 @@ %files -n knockd %defattr(-,root,root) -%doc README COPYING ChangeLog TODO -%_sbindir/%{name}d -%_sbindir/rc%{name}d -%_sysconfdir/init.d/%{name}d +%doc README.md COPYING ChangeLog TODO +%{_sbindir}/%{name}d +%if %{with_systemd} +%{_unitdir}/%{name}d.service +%else +%{_sysconfdir}/init.d/%{name}d +%config %{_localstatedir}/adm/fillup-templates/* +%endif +%{_sbindir}/rc%{name}d %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/%{name}d.conf %{_mandir}/man?/%{name}d.* -%config /var/adm/fillup-templates/* %changelog ++++++ knock-include.patch ++++++ --- src/knockd.c +++ src/knockd.c @@ -41,6 +41,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <sys/ioctl.h> +#include <sys/param.h> #include <arpa/inet.h> #include <netdb.h> #include <getopt.h> ++++++ knockd.service ++++++ [Unit] Description=Port-Knocking Daemon After=network.target [Service] ExecStart=/usr/sbin/knockd [Install] WantedBy=multi-user.target
