pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

p0f: Update to 3.09b



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Wed Jul 29 22:03:20 2026 +0200
Changeset:	56dc95211c2e51900b31aac5334b2db41c085d97

Modified Files:
	p0f/Makefile
	p0f/distinfo
Added Files:
	p0f/patches/patch-build.sh
Removed Files:
	p0f/patches/patch-aa
	p0f/patches/patch-ad
	p0f/patches/patch-ae
	p0f/patches/patch-p0f-query.c

Log Message:
p0f: Update to 3.09b

Update to the latest release 3.09b.

Still not building, there is a bit of work to do because the build
system is completely changed!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=56dc95211c2e51900b31aac5334b2db41c085d97

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 p0f/Makefile                  | 12 +++++-------
 p0f/distinfo                  | 11 ++++-------
 p0f/patches/patch-aa          | 31 -------------------------------
 p0f/patches/patch-ad          | 21 ---------------------
 p0f/patches/patch-ae          | 22 ----------------------
 p0f/patches/patch-build.sh    | 15 +++++++++++++++
 p0f/patches/patch-p0f-query.c | 14 --------------
 7 files changed, 24 insertions(+), 102 deletions(-)

diffs:
diff --git a/p0f/Makefile b/p0f/Makefile
index 866c6afd90..1f1e564cca 100644
--- a/p0f/Makefile
+++ b/p0f/Makefile
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.30 2013/02/06 19:31:04 jperkin Exp $
 #
 
-DISTNAME=	p0f-2.0.8
-PKGREVISION=	1
+DISTNAME=	p0f-3.09b
 CATEGORIES=	security net
-MASTER_SITES=	http://lcamtuf.coredump.cx/p0f/
+MASTER_SITES=	https://lcamtuf.coredump.cx/p0f3/releases/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -12,12 +11,14 @@ HOMEPAGE=	http://lcamtuf.coredump.cx/p0f.shtml
 COMMENT=	Passive OS fingerprinting tool
 LICENSE=	gnu-lgpl-v2.1
 
-WRKSRC=		${WRKDIR}/p0f
+USE_TOOLS+=	bash
 
 PKG_SYSCONFSUBDIR=	p0f
 
 MAKE_ENV+=	LIBPCAP_PREFIX=${BUILDLINK_PREFIX.libpcap}
 
+REPLACE_BASH+=	build.sh
+
 CONF_FILES=	${PREFIX}/share/examples/p0f/p0f.fp ${PKG_SYSCONFDIR}/p0f.fp
 CONF_FILES+=	${PREFIX}/share/examples/p0f/p0fa.fp ${PKG_SYSCONFDIR}/p0fa.fp
 CONF_FILES+=	${PREFIX}/share/examples/p0f/p0fr.fp ${PKG_SYSCONFDIR}/p0fr.fp
@@ -30,9 +31,6 @@ SUBST_MESSAGE.paths=	Fixing paths.
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/p0f share/examples/p0f
 
-post-patch:
-	${LN} -s NetBSD ${WRKSRC}/mk/DragonFly
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/p0f ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/doc/README ${DESTDIR}${PREFIX}/share/doc/p0f/p0f.README
diff --git a/p0f/distinfo b/p0f/distinfo
index 8f9f1a97a3..d5c69e44d4 100644
--- a/p0f/distinfo
+++ b/p0f/distinfo
@@ -1,9 +1,6 @@
 $NetBSD: distinfo,v 1.23 2026/03/17 07:28:17 nia Exp $
 
-BLAKE2s (p0f-2.0.8.tgz) = e7ddbe4c96cb0edd4dcde49400e82bc39119c1d53b5e24cf810598abcd3553c6
-SHA512 (p0f-2.0.8.tgz) = ccfc512a79df7acfad007c6d67398c5c0745be165095adc9dc4ba62cf165c962f98d92e038b3be4eb23cd13e3a9231827c4bd8a0a3bf0cdf68a38286188cde4f
-Size (p0f-2.0.8.tgz) = 136877 bytes
-SHA1 (patch-aa) = 0e79fc52b7711a8cb31565f2da8a52761947853d
-SHA1 (patch-ad) = 378d9480c88d9a447684323c4a59f3c2f6f10d74
-SHA1 (patch-ae) = ffe38288367a63585be71ee45b4a4859f171523b
-SHA1 (patch-p0f-query.c) = 3d9c6c7f64c3af110399005bf4958dda28c2b059
+BLAKE2s (p0f-3.09b.tgz) = 1b9750a33bf553e1f434d3f81480c8703d5b643b2e82c8357b1f25c60085323e
+SHA512 (p0f-3.09b.tgz) = 2a688baa865f27c91c023a7c53e530649f56a681e6ca2533152ab07b42883857b20c378b636e87dda8d1d5dfac17e426d09ee032b363d0b7d98e57a9ff6164d0
+Size (p0f-3.09b.tgz) = 92896 bytes
+SHA1 (patch-build.sh) = 6945d182bbe1f52985bd05fad6249e4e7c34249c
diff --git a/p0f/patches/patch-aa b/p0f/patches/patch-aa
deleted file mode 100644
index 62fd7c332f..0000000000
--- a/p0f/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2011/10/02 05:04:03 dholland Exp $
-
---- mk/Linux.orig	2006-08-21 12:37:00.000000000 +0000
-+++ mk/Linux
-@@ -7,23 +7,20 @@
- # (C) Copyright 2000-2006 by Michal Zalewski <lcamtuf%coredump.cx@localhost>
- #
- 
--CC      = gcc
- LIBS	= -lpcap
- STRIP   = strip
--CFLAGS  = -O3 -Wall -fomit-frame-pointer -funroll-loops \
--          -DUSE_BPF=\"${USE_BPF}\" \
--	  -I/usr/include/pcap -I/usr/local/include/pcap -I/usr/local/include
-+CFLAGS  += -DUSE_BPF=\"${USE_BPF}\"
- FILE	= p0f
- TOOLS   = test/sendack test/sendack2 test/sendsyn
- 
--all: $(FILE) strip	
-+all: $(FILE) .WAIT strip
- 	@echo ">> You can also try 'make p0fq' to compile a sample query"
- 	@echo ">> client (see README for more information)."
- 
- static: $(FILE)-static
- 
- $(FILE): $(FILE).c
--	$(CC) $(CFLAGS) -o $@ $(FILE).c $(FILE)-query.c crc32.c $(LIBS)
-+	$(CC) $(CFLAGS) -o $@ $(FILE).c $(FILE)-query.c crc32.c $(LDFLAGS) $(LIBS)
- 
- $(FILE)-static: $(FILE).c 
- 	$(CC) -static $(CFLAGS) -o $@ $(FILE).c $(FILE)-query.c crc32.c $(LIBS)
diff --git a/p0f/patches/patch-ad b/p0f/patches/patch-ad
deleted file mode 100644
index 7fa0c5dcd2..0000000000
--- a/p0f/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2007/03/05 20:31:53 adrianp Exp $
-
---- mk/SunOS.orig	2006-03-09 20:21:39.000000000 +0100
-+++ mk/SunOS
-@@ -5,13 +5,9 @@
- # (C) Copyright 2000-2006 by Michal Zalewski <lcamtuf%coredump.cx@localhost>
- #
- 
--CC      = gcc
--LIBS    = -lpcap -L/opt/local/lib \
--          -L/usr/local/lib -lsocket -lnsl 
--CFLAGS  = -O3 -Wall -fomit-frame-pointer -funroll-loops \
--          -DBYTE_ORDER=1234 -DBIG_ENDIAN=1234 \
--	  -DUSE_BPF=\"${USE_BPF}\" \
--	  -I/opt/local/include  -I/usr/local/include
-+#CC      = gcc
-+LIBS    = $(LDFLAGS) -lpcap -lsocket -lnsl 
-+CFLAGS  = -DBYTE_ORDER=1234 -DBIG_ENDIAN=1234 -DUSE_BPF=\"${USE_BPF}\"
- FILE    = p0f
- TOOLS   = test/sendack test/sendack2 test/sendsyn
- 
diff --git a/p0f/patches/patch-ae b/p0f/patches/patch-ae
deleted file mode 100644
index 47f8becf84..0000000000
--- a/p0f/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2011/12/21 15:52:17 dholland Exp $
-
- - use preferred libpcap.
- - don't use gmake.
-
---- Build.orig	2006-03-16 07:44:34.000000000 +0000
-+++ Build
-@@ -32,11 +32,12 @@ if [ ! -f mk/$SYSTEM ]; then
-   exit 1
- fi
- 
--GMAKE_OK=`which gmake 2>/dev/null`
-+GMAKE_OK=/nonexistent
- 
-+test "$LIBPCAP_PREFIX" = "" && LIBPCAP_PREFIX="/usr"
- USE_BPF="pcap-bpf.h"
- 
--if [ ! -f "/usr/include/$USE_BPF" -a ! -f "/usr/local/include/$USE_BPF" ]; then
-+if [ ! -f "$LIBPCAP_PREFIX/include/$USE_BPF" ]; then
-   USE_BPF="net/bpf.h"
- fi
- 
diff --git a/p0f/patches/patch-build.sh b/p0f/patches/patch-build.sh
new file mode 100644
index 0000000000..2f0c68aeae
--- /dev/null
+++ b/p0f/patches/patch-build.sh
@@ -0,0 +1,15 @@
+$NetBSD$
+
+printf(3) needs <stdio.h>
+
+--- build.sh.orig	2026-07-29 19:43:27.754532812 +0000
++++ build.sh
+@@ -197,7 +197,7 @@ echo -n "[*] Checking if memory alignmen
+ 
+ rm -f "$TMP" "$TMP.c" "$TMP.log" || exit 1
+ 
+-echo -e "#include \"types.h\"\nvolatile u8 tmp[6]; int main() { printf(\"%d\x5cn\", *(u32*)(tmp+1)); return 0; }" >"$TMP.c" || exit 1
++echo -e "#include <stdio.h>\n#include \"types.h\"\nvolatile u8 tmp[6]; int main() { printf(\"%d\x5cn\", *(u32*)(tmp+1)); return 0; }" >"$TMP.c" || exit 1
+ $CC $USE_CFLAGS $USE_LDFLAGS "$TMP.c" -o "$TMP" &>"$TMP.log"
+ 
+ if [ ! -x "$TMP" ]; then
diff --git a/p0f/patches/patch-p0f-query.c b/p0f/patches/patch-p0f-query.c
deleted file mode 100644
index 052f2a4ec1..0000000000
--- a/p0f/patches/patch-p0f-query.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-p0f-query.c,v 1.1 2026/03/17 07:28:17 nia Exp $
-
-Fix implicit declaration of bzero.
-
---- p0f-query.c.orig	2026-03-17 07:18:24.008587188 +0000
-+++ p0f-query.c
-@@ -21,6 +21,7 @@
- #include <sys/socket.h>
- #endif
- #include <string.h>
-+#include <strings.h>
- 
- #include <time.h>
- #include <sys/types.h>


Home | Main Index | Thread Index | Old Index