From 34650ac00f0aa7b39250b2d8bcf9e5e24d0de38c Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 3 Jan 2023 14:54:06 +0000
Subject: [PATCH] update to pmacct-1.7.8

---
 net/pmacct/Makefile                      |  6 +-----
 net/pmacct/distinfo                      |  4 ++--
 net/pmacct/patches/patch-configure_ac    | 18 +++---------------
 net/pmacct/patches/patch-src_isis_isis_c |  2 +-
 net/pmacct/pkg/PLIST                     |  2 --
 5 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/net/pmacct/Makefile b/net/pmacct/Makefile
index cb3a26a39cd..3f4b8c076bd 100644
--- a/net/pmacct/Makefile
+++ b/net/pmacct/Makefile
@@ -1,6 +1,6 @@
 COMMENT=	passive IP network monitoring tools: traffic accounting, etc
 
-DISTNAME=	pmacct-1.7.7
+DISTNAME=	pmacct-1.7.8
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.pmacct.net/
@@ -54,10 +54,6 @@ CONFIGURE_ARGS+= --enable-mysql
 CONFIGURE_ARGS+= --disable-mysql
 .endif
 
-.ifdef DEBUG
-MAKE_ARGS+=	DEBUG=1
-.endif
-
 post-install:
 	mv ${PREFIX}/share/pmacct/docs ${PREFIX}/share/doc/pmacct
 	mv ${PREFIX}/share/pmacct/examples ${PREFIX}/share/examples/pmacct
diff --git a/net/pmacct/distinfo b/net/pmacct/distinfo
index 4f99fc2abfe..8a93962b831 100644
--- a/net/pmacct/distinfo
+++ b/net/pmacct/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pmacct-1.7.7.tar.gz) = jHgfOFZbuJmjH+sJYmdqPJznEs8YD+DcqRIL+xXd+4w=
-SIZE (pmacct-1.7.7.tar.gz) = 2149629
+SHA256 (pmacct-1.7.8.tar.gz) = TfUKPGx72s4zRbvzvU9vp6ZyLsH7Rd/SZq2VazJ9qYo=
+SIZE (pmacct-1.7.8.tar.gz) = 2175335
diff --git a/net/pmacct/patches/patch-configure_ac b/net/pmacct/patches/patch-configure_ac
index 2cdda2651bc..6535a2448d4 100644
--- a/net/pmacct/patches/patch-configure_ac
+++ b/net/pmacct/patches/patch-configure_ac
@@ -1,5 +1,4 @@
 - Drop forced -O2
-- Only Linux requires libnuma for MySQL
 - Use C++ compiler for linking test
 
 Index: configure.ac
@@ -15,21 +14,10 @@ Index: configure.ac
 -  CFLAGS="-O2 ${CFLAGS}"
 -fi
 -
- AC_CHECK_FUNCS([strlcpy])
- 
  dnl: shared object handling
-@@ -403,10 +397,6 @@ AC_ARG_ENABLE(mysql,
-     CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-     AC_CHECK_HEADERS([mysql.h mysql/mysql.h])
-     CFLAGS="$_save_CFLAGS"
--
--    AC_CHECK_LIB([numa], [numa_bind], [], [AC_MSG_ERROR([
--      ERROR: missing libnuma. Requirement for building MySQL.
--    ])])
-     ;;
-   no)
-     AC_MSG_RESULT(no)
-@@ -1176,10 +1166,9 @@ AC_LANG_PUSH([C++])
+ AC_MSG_CHECKING([whether to disable linking against shared objects])
+ AC_ARG_ENABLE(so,
+@@ -1217,10 +1211,9 @@ AC_LANG_PUSH([C++])
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[AC_MSG_RESULT(yes)],[AC_MSG_ERROR([No C++ compiler found])])
  AC_LANG_POP([C++])
  
diff --git a/net/pmacct/patches/patch-src_isis_isis_c b/net/pmacct/patches/patch-src_isis_isis_c
index 3c8c0cdecdc..a315071009f 100644
--- a/net/pmacct/patches/patch-src_isis_isis_c
+++ b/net/pmacct/patches/patch-src_isis_isis_c
@@ -1,7 +1,7 @@
 Index: src/isis/isis.c
 --- src/isis/isis.c.orig
 +++ src/isis/isis.c
-@@ -808,7 +808,7 @@ void igp_daemon_map_initialize(char *filename, struct 
+@@ -807,7 +807,7 @@ void igp_daemon_map_initialize(char *filename, struct 
    pcap_t *p;
  
    if (config.debug && config.igp_daemon_map_msglog) {
diff --git a/net/pmacct/pkg/PLIST b/net/pmacct/pkg/PLIST
index 9cba2a4ba1a..ca5a8ae5683 100644
--- a/net/pmacct/pkg/PLIST
+++ b/net/pmacct/pkg/PLIST
@@ -56,9 +56,7 @@ share/pmacct/FAQS
 share/pmacct/QUICKSTART
 share/pmacct/UPGRADE
 share/pmacct/sql/
-share/pmacct/sql/README.64bit
 share/pmacct/sql/README.GeoIP
-share/pmacct/sql/README.IPv6
 share/pmacct/sql/README.cos
 share/pmacct/sql/README.custom_primitives
 share/pmacct/sql/README.etype