>Number:         19896
>Category:       pkg
>Synopsis:       p0f 1.7 -> 1.8.2 update
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Fri Jan 17 14:12:01 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Dawid Szymański
>Release:        NetBSD 1.6
>Organization:


-- 
Dawid Szymański -> http://people.arhea.net/dawszy/ -> a.k.a DawS

Bóg nie ma głupcom za złe, że się nie uczą, lecz ma za złe mądrym,
że nie uczą głupców. - Ali Ibn Abi Talib
>Environment:
	
	
System: NetBSD foo.arhea.net 1.6 NetBSD 1.6 (FOO) #0: Thu Nov 28 20:44:46 CET 2002 dawszy@foo.arhea.net:/usr/src/sys/arch/i386/compile/FOO i386
Architecture: i386
Machine: i386
>Description:
	It does fix pkg/19886 by Robert Elz (thx for reminding me!)

	List of changes:
	1. Developer changed s/Michał Zalewski/William Stearns/
	2. A lot of new finger prints.
	3. GPL -> LGPL license change
	Full list (not so big) in ChangeLog
>How-To-Repeat:

	1. Remove patches/patch-ab
	2. Apply following patch.
	3. test
	4. commit && enjoy :)

>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/p0f/Makefile,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Makefile
--- Makefile	2001/03/26 11:59:15	1.1.1.2
+++ Makefile	2003/01/17 22:03:11
@@ -1,17 +1,24 @@
 # $NetBSD: Makefile,v 1.1.1.2 2001/03/26 11:59:15 hubertf Exp $
 #
 
-DISTNAME=	p0f-1.7
+DISTNAME=	p0f-1.8.2
 CATEGORIES=	security net
-MASTER_SITES=	http://lcamtuf.hack.pl/
+MASTER_SITES=	http://www.stearns.org/p0f/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	DawS@irc.pl
+MAINTAINER=	dawszy@arhea.net
 COMMENT=	passive OS fingerprinting tool
 
+pre-build:
+	${SED} \
+		-e 's,@PREFIX@,${LOCALBASE},'\
+		<${WRKSRC}/p0f.c > ${WRKSRC}/p0f.c.tmp
+	${MV}	${WRKSRC}/p0f.c.tmp ${WRKSRC}/p0f.c
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/p0f ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/p0f.fp ${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/p0f.README
+	${INSTALL_DATA} ${WRKSRC}/p0frep ${PREFIX}/share/doc/p0frep
 
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/security/p0f/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- PLIST	2001/11/01 01:17:07	1.1
+++ PLIST	2003/01/17 22:03:11
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:17:07 zuntum Exp $
+@comment $NetBSD$
 bin/p0f
 etc/p0f.fp
 share/doc/p0f.README
+share/doc/p0frep
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/p0f/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	2001/04/19 15:40:35	1.2
+++ distinfo	2003/01/17 22:03:11
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:35 agc Exp $
+$NetBSD$
 
-SHA1 (p0f-1.7.tgz) = ac2ff4b2fc78c023ffe6a4d135385a0cef4a10c6
-Size (p0f-1.7.tgz) = 14694 bytes
-SHA1 (patch-aa) = 067e95fa6074248712fd05047d540708d80b86ac
-SHA1 (patch-ab) = 8be455cbaeddf152604c97c5e136de487838f298
+SHA1 (p0f-1.8.2.tgz) = e0c6cb93f9251a3c9e588290a5426c26c9a9af07
+Size (p0f-1.8.2.tgz) = 23969 bytes
+SHA1 (patch-aa) = 21d484a2fa8de86fcd33727b4056787bdc6099d5
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/security/p0f/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa	2001/03/26 05:12:56	1.1.1.1
+++ patches/patch-aa	2003/01/17 22:03:11
@@ -1,13 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/26 05:12:56 zuntum Exp $
+$NetBSD$
 
---- p0f.c.orig	Tue Jun 13 20:45:06 2000
+--- p0f.c.orig	Sat Feb  2 08:00:40 2002
 +++ p0f.c
-@@ -260,7 +260,7 @@
+@@ -369,11 +369,8 @@ int main(int argc, char *argv[]) {
  
    /* set a reasonable default fingerprint file */
    if (!filename || !*filename)
+-#ifdef SYSCONFDIR
+-    filename = SYSCONFDIR "/p0f.fp";
+-#else
 -    filename = "/etc/p0f.fp";
-+    filename = PREFIX "/etc/p0f.fp";
+-#endif
++
++  filename = "@PREFIX@/etc/p0f.fp";
  
    /* anything left after getopt'ing is a rule */
    if (argv[optind] && *(argv[optind]))
>Release-Note:
>Audit-Trail:
>Unformatted: