<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8779c0cd673b823f1b7d96952c0bf9fd49454b0e">https://github.com/macports/macports-ports/commit/8779c0cd673b823f1b7d96952c0bf9fd49454b0e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8779c0cd673 p0f: build fixes and cleanup
</span>8779c0cd673 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8779c0cd673b823f1b7d96952c0bf9fd49454b0e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri May 27 07:39:36 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> p0f: build fixes and cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix implicit declaration error.
</span><span style='display:block; white-space:pre;color:#404040;'> * Use correct -I and -L flags (especially with a custom prefix).
</span><span style='display:block; white-space:pre;color:#404040;'> * Log compiler command.
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove unused dependency.
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove unused patchfiles.
</span>---
net/p0f/Portfile | 15 +++++------
net/p0f/files/build.sh.patch | 54 ++++++++++++++++++++++++++++++++++++++
net/p0f/files/p0f.c.patch | 37 --------------------------
net/p0f/files/p0fq.c.patch | 13 ---------
net/p0f/files/tools_Makefile.patch | 14 ++++++++++
5 files changed, 75 insertions(+), 58 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/p0f/Portfile b/net/p0f/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 45e2ab7f020..b5fa9be3ce9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/p0f/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/p0f/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,12 +24,13 @@ extract.suffix .tgz
</span> checksums rmd160 802ec272b5447a6a551de4fe191b409e79612cc6 \
sha256 543b68638e739be5c3e818c3958c3b124ac0ccb8be62ba274b4241dbdec00e7f
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:gmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib port:libpcap
set datadir ${prefix}/share/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles build.sh.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools_Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|\"p0f.fp\"|\"${datadir}/p0f.fp\"|g" ${worksrcpath}/config.h
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,12 +39,10 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC="${configure.cc} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build tools not handled by the build.sh script separately
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/tools "${build.cmd} [join ${build.args}]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKE=${build.cmd}
</span>
destroot {
xinstall -m 755 -s -W ${worksrcpath} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/p0f/files/build.sh.patch b/net/p0f/files/build.sh.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9b272ed4168
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/p0f/files/build.sh.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build.sh.orig 2016-04-19 03:03:18.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build.sh 2022-05-27 07:29:08.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,11 +12,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERSION="3.09b"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$CC" = "" && CC="gcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++test "$MAKE" = "" && MAKE="make"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BASIC_CFLAGS="-Wall -Wno-format -I/usr/local/include/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -I/opt/local/include/ -DVERSION=\"$VERSION\" $CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BASIC_CFLAGS="-Wall -Wno-format \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -DVERSION=\"$VERSION\" $CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BASIC_LDFLAGS="-L/usr/local/lib/ -L/opt/local/lib $LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BASIC_LDFLAGS="$LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_CFLAGS="-fstack-protector-all -fPIE -D_FORTIFY_SOURCE=2 -g -ggdb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $BASIC_CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "[*] Cleaning up build environment..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f -- "$PROGNAME" *.exe *.o a.out *~ core core.[1-9][0-9]* *.stackdump COMPILER-WARNINGS 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ( cd tools && make clean ) &>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ( cd tools && $MAKE clean ) &>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$1" = "publish" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,7 +198,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f "$TMP" "$TMP.c" "$TMP.log" || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo -e "#include \"types.h\"\nvolatile u8 tmp[6]; int main() { printf(\"%d\x5cn\", *(u32*)(tmp+1)); return 0; }" >"$TMP.c" || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $CC $USE_CFLAGS $USE_LDFLAGS "$TMP.c" -o "$TMP" &>"$TMP.log"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ ! -x "$TMP" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -318,6 +319,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f "$PROGNAME" || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo "$CC $USE_CFLAGS $USE_LDFLAGS \"$PROGNAME.c\" $OBJFILES -o \"$PROGNAME\" $USE_LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $CC $USE_CFLAGS $USE_LDFLAGS "$PROGNAME.c" $OBJFILES -o "$PROGNAME" $USE_LIBS &>"$TMP.log"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ ! -x "$PROGNAME" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -349,6 +351,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo "[*] Compiling tools: "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cd tools && CFLAGS="$USE_CFLAGS" LDFLAGS="$USE_LDFLAGS" $MAKE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Well, that's it. Be sure to review README. If you run into any problems, you"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "can reach the author at <lcamtuf@coredump.cx>."
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/p0f/files/p0f.c.patch b/net/p0f/files/p0f.c.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 373facf8104..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/p0f/files/p0f.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur p0f.c.orig p0f.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- p0f.c.orig 2006-08-22 00:16:00.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ p0f.c 2006-11-05 21:36:45.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1813,12 +1813,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (use_cache) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char errbuf[PCAP_ERRBUF_SIZE];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(pcap_setnonblock(pt, 1, errbuf) == -1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ debug("[!] Failed to set non blocking mode on device: %s", errbuf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _s32 mfd,max;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mfd = pcap_fileno(pt);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- max = 1 + (mfd > lsock ? mfd : lsock);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct timeval timeout;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd_set f,e;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1835,9 +1842,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raw socket, even with no SA_RESTART, it's a mess... select()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- is rather neutral. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- select(max,&f,0,&e,0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timeout.tv_sec = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ timeout.tv_usec = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ select(max,&f,0,&e,&timeout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (FD_ISSET(mfd, &f) || FD_ISSET(mfd,&e))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // if (FD_ISSET(mfd, &f) || FD_ISSET(mfd,&e))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (pcap_dispatch(pt,-1,(pcap_handler)&parse,0) < 0) break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (FD_ISSET(lsock,&f)) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/p0f/files/p0fq.c.patch b/net/p0f/files/p0fq.c.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9f04405c1c9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/p0f/files/p0fq.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur test/p0fq.c.orig test/p0fq.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/p0fq.c.orig 2006-08-21 22:29:49.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/p0fq.c 2006-11-04 10:40:01.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +52,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = inet_addr(argv[4]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dp = atoi(argv[5]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!sp || !dp || s == INADDR_NONE || d == INADDR_NONE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!dp || s == INADDR_NONE || d == INADDR_NONE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fatal("Bad IP/port values.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sock = socket(PF_UNIX,SOCK_STREAM,0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/p0f/files/tools_Makefile.patch b/net/p0f/files/tools_Makefile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ca4de841a87
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/p0f/files/tools_Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/Makefile.orig 2012-01-04 20:34:28.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/Makefile 2022-05-27 07:26:41.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,9 +7,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Distributed under the terms and conditions of GNU LGPL.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC = gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS = -g -ggdb -Wall -Wno-format -funsigned-char
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CC ?= gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -Wall -Wno-format -funsigned-char
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGETS = p0f-client p0f-sendsyn p0f-sendsyn6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: $(TARGETS)
</span></pre><pre style='margin:0'>
</pre>