[fwknop] upgrade

Thu Jan 12 15:28:40 UTC 2012

commit d3c7b7b6ac118373d8de29e1c01055eb379904ae
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Thu Jan 12 16:28:16 2012 +0100

    upgrade

 .gitignore                  |    2 +
 fwknop-1.9.9-hostname.patch |   12 ------
 fwknop.logrotate            |   10 -----
 fwknop.spec                 |   90 +++++++++++++++++++------------------------
 sources                     |    4 +-
 5 files changed, 44 insertions(+), 74 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index f33428b..feb8dc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 fwknop-nodeps-1.9.12.tar.gz
 fwknop-nodeps-1.9.12.tar_gz.asc
+/fwknop-2.0.tar.gz.asc
+/fwknop-2.0.tar.gz
diff --git a/fwknop.spec b/fwknop.spec
index 1838a93..e9863a2 100644
--- a/fwknop.spec
+++ b/fwknop.spec
@@ -1,24 +1,17 @@
 Summary: A Single Packet Authorization (SPA) implementation
 Name: fwknop
-Version: 1.9.12
-Release: 2
+Version: 2.0
+Release: 1
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cipherdyne.org/fwknop/
-Source0: http://www.cipherdyne.org/fwknop/download/fwknop-nodeps-%{version}.tar.gz
-Source1: http://www.cipherdyne.org/fwknop/download/fwknop-nodeps-%{version}.tar_gz.asc
-Source2: fwknop.logrotate
-Patch0: fwknop-1.9.9-hostname.patch
+Source0: http://cipherdyne.org/fwknop/download/fwknop-%{version}.tar.gz
+Source1: http://cipherdyne.org/fwknop/download/fwknop-%{version}.tar.gz.asc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: libpcap-devel
 Requires: logrotate
-# The automatic dependency generator doesn't find the Perl dependencies
-Requires: perl(Crypt::CBC), perl(Crypt::Rijndael), perl(Digest::SHA)
-Requires: perl(GnuPG::Interface), perl(IPTables::ChainMgr)
-Requires: perl(IPTables::Parse), perl(Net::IPv4Addr), perl(Net::Pcap)
-Requires: perl(Net::Ping::External), perl(Net::RawIP), perl(Term::ReadKey)
-Requires: perl(Unix::Syslog)
-Requires(post): chkconfig
-Requires(preun): chkconfig, initscripts
+Requires(post): chkconfig /sbin/ldconfig
+Requires(preun): chkconfig, initscripts, /sbin/ldconfig
 Requires(postun): initscripts
 
 %description
@@ -47,70 +40,67 @@ iptables ulogd pcap writer or by a separate sniffer process.
 
 %prep
 %setup -q
-%patch0 -p1 -b .hostname
 
 %build
+%configure
+# remove Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags} OPTS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/fwknop \
-      $RPM_BUILD_ROOT%{_initrddir} \
-      $RPM_BUILD_ROOT%{_bindir} \
-      $RPM_BUILD_ROOT%{_mandir}/man8 \
-      $RPM_BUILD_ROOT%{_sbindir} \
-      $RPM_BUILD_ROOT%{_localstatedir}/lib/fwknop \
-      $RPM_BUILD_ROOT%{_localstatedir}/log/fwknop \
-      $RPM_BUILD_ROOT%{_localstatedir}/log/fwknop/errs \
-      $RPM_BUILD_ROOT%{_localstatedir}/run/fwknop
-
-install -p -m 644 access.conf fwknop.conf pf.os $RPM_BUILD_ROOT%_sysconfdir/fwknop
-install -p -m 755 init-scripts/fwknop-init.redhat \
-        $RPM_BUILD_ROOT%{_initrddir}/fwknop
-install -p -m 755 fwknop $RPM_BUILD_ROOT%{_bindir}
-install -p -m 644 *.8 $RPM_BUILD_ROOT%{_mandir}/man8/
-install -p -m 755 fwknopd fwknop_serv knopmd knoptm knopwatchd \
-        $RPM_BUILD_ROOT%{_sbindir}
-#install logrotate stuff
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/fwknop
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# init script
+install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
+install -p -m 755 extras/fwknop.init.redhat $RPM_BUILD_ROOT%{_initrddir}/fwknopd
+
+# devel stuff
+rm $RPM_BUILD_ROOT/%{_libdir}/libfko.a
+rm $RPM_BUILD_ROOT/%{_libdir}/libfko.la
+rm $RPM_BUILD_ROOT/%{_libdir}/libfko.so
+rm $RPM_BUILD_ROOT/%{_includedir}/fko.h
+rm $RPM_BUILD_ROOT/%{_datadir}/info/dir
+rm $RPM_BUILD_ROOT/%{_datadir}/info/libfko.info
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add fwknop
+/sbin/ldconfig
+/sbin/chkconfig --add fwknopd
 
 %preun
 if [ $1 = 0 ]; then
-   /sbin/service fwknop stop >/dev/null 2>&1
-   /sbin/chkconfig --del fwknop
+   /sbin/service fwknopd stop >/dev/null 2>&1
+   /sbin/chkconfig --del fwknopd
 fi
 
+
 %postun
+/sbin/ldconfig
 if [ $1 -ge 1 ]; then
-   /sbin/service fwknop condrestart >/dev/null 2>&1 || :
+   /sbin/service fwknopd condrestart >/dev/null 2>&1 || :
 fi
 
 %files
 %defattr(-,root,root)
-%doc CREDITS ChangeLog ChangeLog.svn LICENSE README README.ACCESS README.GPG
-%doc README.PK TODO
+%doc CREDITS ChangeLog COPYING README TODO
 %dir %{_sysconfdir}/fwknop
-%config(noreplace) %{_sysconfdir}/fwknop/*.conf
-%config(noreplace) %{_sysconfdir}/fwknop/pf.os
-%config(noreplace) %{_sysconfdir}/logrotate.d/fwknop
-%{_initrddir}/fwknop
+%config(noreplace) %{_sysconfdir}/fwknop/fwknopd.conf
+%config(noreplace) %{_sysconfdir}/fwknop/access.conf
+%{_initrddir}/fwknopd
 %{_bindir}/fwknop
-%{_sbindir}/*kno*
+%{_sbindir}/fwknopd
 %{_mandir}/man8/*
-%dir %{_localstatedir}/lib/fwknop
-%dir %{_localstatedir}/log/fwknop
-%dir %{_localstatedir}/log/fwknop/errs
-%dir %{_localstatedir}/run/fwknop
+%{_libdir}/*.so.*
 
 %changelog
+* Thu Jan 12 2012 Peter Vrabec <pvrabec at redhat.com> - 2.0-1
+- upgrade
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index ca384a1..73b2c5e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-11d87a3590e695227390596c4695e6e0  fwknop-nodeps-1.9.12.tar.gz
-755757126ed0f76add5daaf27c88d869  fwknop-nodeps-1.9.12.tar_gz.asc
+7a6e0d6f042402645bbb827b652f62f7  fwknop-2.0.tar.gz.asc
+b2ee477140d9e92466c9c6f267442625  fwknop-2.0.tar.gz
