rpms/fwknop/devel fwknop-1.9.6-hostname.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 fwknop.logrotate, 1.1, 1.2 fwknop.spec, 1.1, 1.2 sources, 1.2, 1.3 fwknop-1.9.6-initscript.patch, 1.1, NONE fwknop-1.9.6-no-NetPacket.patch, 1.1, NONE fwknop-1.9.6-optflags.patch, 1.1, NONE fwknop-1.9.6-pcap-api.patch, 1.1, NONE fwknop-1.9.6-serv-config.patch, 1.1, NONE

[Miloslav Trmac]

Author: mitr

Update of /cvs/pkgs/rpms/fwknop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29123

Modified Files:
	.cvsignore fwknop.logrotate fwknop.spec sources 
Added Files:
	fwknop-1.9.6-hostname.patch 
Removed Files:
	fwknop-1.9.6-initscript.patch fwknop-1.9.6-no-NetPacket.patch 
	fwknop-1.9.6-optflags.patch fwknop-1.9.6-pcap-api.patch 
	fwknop-1.9.6-serv-config.patch 
Log Message:
* Sun Aug 24 2008 Miloslav Trmač <mitr at redhat.com> - 1.9.7-1
- Update to fwknop-1.9.7
- License specified to be GPLv2


fwknop-1.9.6-hostname.patch:

--- NEW FILE fwknop-1.9.6-hostname.patch ---
diff -up fwknop-1.9.6/fwknop.conf.hostname fwknop-1.9.6/fwknop.conf
--- fwknop-1.9.6/fwknop.conf.hostname	2008-08-24 21:48:35.000000000 +0200
+++ fwknop-1.9.6/fwknop.conf	2008-08-24 21:48:50.000000000 +0200
@@ -23,7 +23,7 @@
 EMAIL_ADDRESSES             root at localhost;
 
 ### Machine hostname
-HOSTNAME                    _CHANGEME_;
+HOSTNAME                    localhost;
 
 ### Define the firewall type.  The default is "iptables" for Linux systems,
 ### but this can be set to "ipfw" for *BSD systems.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fwknop/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2008 09:17:20 -0000	1.2
+++ .cvsignore	24 Aug 2008 21:26:57 -0000	1.3
@@ -1 +1 @@
-fwknop-1.9.6.tar.bz2
+fwknop-1.9.7.tar.bz2


Index: fwknop.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/fwknop/devel/fwknop.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fwknop.logrotate	14 Aug 2008 09:17:20 -0000	1.1
+++ fwknop.logrotate	24 Aug 2008 21:26:57 -0000	1.2
@@ -1,4 +1,6 @@
-/var/log/fwknop {
+# /var/log/fwknop/digest.cache is not rotated because emptying the file would
+# allow packet replay
+/var/log/fwknop/errs/* /var/log/fwknop/fwdata {
     missingok
     notifempty
     sharedscripts
@@ -6,4 +8,3 @@
         /bin/kill -HUP `cat  /var/run/fwknop/knopmd.pid 2>/dev/null` 2> /dev/null || true
     endscript
 }
-


Index: fwknop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fwknop/devel/fwknop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fwknop.spec	14 Aug 2008 09:17:20 -0000	1.1
+++ fwknop.spec	24 Aug 2008 21:26:57 -0000	1.2
@@ -1,20 +1,19 @@
 Summary: A Single Packet Authorization (SPA) implementation
 Name: fwknop
-Version: 1.9.6
-Release: 3%{?dist}
-License: GPL+
+Version: 1.9.7
+Release: 1%{?dist}
+License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cipherdyne.org/fwknop/
 Source0: http://www.cipherdyne.org/fwknop/download/fwknop-%{version}.tar.bz2
 Source1: fwknop.logrotate
-Patch0: fwknop-1.9.6-initscript.patch
-Patch1: fwknop-1.9.6-optflags.patch
-Patch2: fwknop-1.9.6-no-NetPacket.patch
-Patch3: fwknop-1.9.6-serv-config.patch
-Patch4: fwknop-1.9.6-pcap-api.patch
+Patch0: fwknop-1.9.6-hostname.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# The automatic dependency generator doesn't find this
-Requires: perl(Digest::SHA)
+Requires: logrotate
+# The automatic dependency generator doesn't find the Perl dependencies
+Requires: perl(Crypt::CBC), perl(Digest::SHA), perl(Net::IPv4Addr)
+Requires: perl(Net::Pcap), perl(Net::Ping::External), perl(Term::ReadKey)
+Requires: perl(Unix::Syslog)
 Requires(post): chkconfig
 Requires(preun): chkconfig, initscripts
 Requires(postun): initscripts
@@ -45,12 +44,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .initscript
-%patch1 -p1 -b .optflags
-%patch2 -p1 -b .no-NetPacket
-%patch3 -p1 -b .serv-config
-%patch4 -p1 -b .pcap-api
-sed -i 's,_CHANGEME_,localhost,' fwknop.conf
+%patch0 -p1 -b .hostname
 
 %build
 make %{?_smp_mflags} OPTS="$RPM_OPT_FLAGS"
@@ -112,6 +106,14 @@
 %dir %{_localstatedir}/run/fwknop
 
 %changelog
+* Sun Aug 24 2008 Miloslav Trmač <mitr at redhat.com> - 1.9.7-1
+- Update to fwknop-1.9.7
+- License specified to be GPLv2
+
+* Sun Aug 24 2008 Miloslav Trmač <mitr at redhat.com> - 1.9.6-4
+- Don't change SNAT_TRANSLATE_IP to "localhost" in the default config.
+- Add Requires: logrotate.
+
 * Wed Aug 13 2008 Peter Vrabec <pvrabec at redhat.com> - 1.9.6-3
 - fix sed cmd in spec file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fwknop/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2008 09:17:20 -0000	1.2
+++ sources	24 Aug 2008 21:26:57 -0000	1.3
@@ -1 +1 @@
-b55a0a4eb5212ac17ca780536c71017e  fwknop-1.9.6.tar.bz2
+d5bef8f2e807eb79d2ee0d1ce9c5d000  fwknop-1.9.7.tar.bz2


--- fwknop-1.9.6-initscript.patch DELETED ---


--- fwknop-1.9.6-no-NetPacket.patch DELETED ---


--- fwknop-1.9.6-optflags.patch DELETED ---


--- fwknop-1.9.6-pcap-api.patch DELETED ---


--- fwknop-1.9.6-serv-config.patch DELETED ---