rpms/p0f/devel p0f-include.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 p0f.spec, 1.2, 1.3 sources, 1.2, 1.3 p0f-2.0.2.patch, 1.1, NONE

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

Update of /cvs/extras/rpms/p0f/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv2609

Modified Files:
	.cvsignore p0f.spec sources 
Added Files:
	p0f-include.patch 
Removed Files:
	p0f-2.0.2.patch 
Log Message:
Sync with fedora.us update, bug 1699, from Adrian

p0f-include.patch:

--- NEW FILE p0f-include.patch ---
--- p0f.c.orig	2004-10-26 07:30:55.456699941 +0200
+++ p0f.c	2004-10-26 07:31:21.926643795 +0200
@@ -36,7 +36,7 @@
 #include <pcap.h>
 #include <signal.h>
 
-#include <net/bpf.h>
+#include <pcap-bpf.h>
 #include <time.h>
 #include <ctype.h>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:56:34 -0000	1.2
+++ .cvsignore	2 Dec 2004 01:10:15 -0000	1.3
@@ -1 +1 @@
-p0f-2.0.2.tgz
+p0f-2.0.5.tgz


Index: p0f.spec
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/p0f.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- p0f.spec	8 Nov 2004 04:56:50 -0000	1.2
+++ p0f.spec	2 Dec 2004 01:10:15 -0000	1.3
@@ -1,16 +1,14 @@
 Name: p0f
-Version: 2.0.2
-Release: 0.fdr.1.1
+Version: 2.0.5
+Release: 1
 Epoch:	0
 Summary: A versatile passive OS fingerprinting tool.
-
 Group: Applications/Internet
 License: GPL
-URL:	http://lcamtuf.coredump.cx/p0f.shtml
-Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.2.tgz
-Patch: %{name}-%{version}.patch
+URL: http://lcamtuf.coredump.cx/p0f.shtml
+Source: http://lcamtuf.coredump.cx/p0f/p0f-2.0.5.tgz
+Patch: p0f-include.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires: libpcap
 
 %description
@@ -19,30 +17,27 @@
 masquerading and firewall presence, the distance to the remote system and its
 uptime, other guy's network hookup (DSL, OC3, avian carriers) and his ISP.
 
-#---------------------------------------------------------------------
 
 %prep
 %setup -q -n p0f
-%patch -p1
-
-#---------------------------------------------------------------------
+%patch
 
 %build
-CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
-make -f mk/Linux %{?_smp_mflags}
+make -f mk/Linux %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
-#---------------------------------------------------------------------
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-#---------------------------------------------------------------------
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir}
+%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/p0f
+%{__cp} p0f p0frep $RPM_BUILD_ROOT%{_sbindir}
+%{__cp} p0f.fp p0fa.fp p0fr.fp p0fo.fp $RPM_BUILD_ROOT%{_sysconfdir}/p0f
+%{__cp} p0f.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#---------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
@@ -53,9 +48,15 @@
 %config %{_sysconfdir}/p0f/p0f.fp
 %config %{_sysconfdir}/p0f/p0fa.fp
 %config %{_sysconfdir}/p0f/p0fr.fp
+%config %{_sysconfdir}/p0f/p0fo.fp
 %{_mandir}/man1/p0f.1.gz
 
 %changelog
+* Tue Oct 26 2004 Adrian Reber <adrian at lisas.de> - 0:2.0.5-1
+- updated to 2.0.5
+- fixed build on FC2
+- bring specfile up to date with current spec templates
+
 * Mon Oct 27 2003 Darryl Luff <darryl at snakegully.nu> - 0:2.0.2-0.fdr.0.1
 - Update for version 2.0.2 and Fedora comments.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p0f/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:56:34 -0000	1.2
+++ sources	2 Dec 2004 01:10:15 -0000	1.3
@@ -1 +1 @@
-40d54b9e72cd85a791d1ef633a804743  p0f-2.0.2.tgz
+78235749e8ada6ad2b16b40fe15081f6  p0f-2.0.5.tgz


--- p0f-2.0.2.patch DELETED ---