Hello Stuart,Thank you for your answer.Could you explain me how should I apply
these changes, I suppose that there is an automated way to do it rather than
changing the changes by hand.Also I will do the tests on OpenBSD 5.8Regards
Le Samedi 21 mai 2016 12h40, Stuart Henderson <[email protected]> a
écrit :
On 2016/05/21 07:17, Mik J wrote:
> Hello,I would like to know who is the maintainer of the pmacct port.The last
> version dates from the end of 2013 and I would like to make a new
> version.Regards
There's no maintainer.
Please try this. It builds - does it work OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/pmacct/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 13 Sep 2014 18:09:21 -0000 1.20
+++ Makefile 21 May 2016 10:39:02 -0000
@@ -2,8 +2,7 @@
COMMENT= IP accounting software
-DISTNAME= pmacct-1.5.0rc2
-REVISION= 0
+DISTNAME= pmacct-1.5.3
CATEGORIES= net
HOMEPAGE= http://www.pmacct.net/
@@ -18,6 +17,7 @@ MASTER_SITES= ${HOMEPAGE}
NO_TEST= Yes
CONFIGURE_STYLE= autoconf no-autoheader
AUTOCONF_VERSION= 2.13
+USE_GMAKE= Yes
CONFIGURE_ARGS= --enable-ipv6 \
--enable-sqlite3 \
--with-sqlite3-includes="/usr/include"
@@ -25,7 +25,6 @@ CONFIGURE_ARGS= --enable-ipv6 \
MAKE_ARGS+= DEBUG=1
.endif
-CONFIGURE_ENV += ac_cv_prog_MAKE="/usr/bin/make"
FLAVORS= mysql postgresql
FLAVOR?=
@@ -40,7 +39,7 @@ CONFIGURE_ARGS+= --disable-pgsql
.if ${FLAVOR:Mmysql}
LIB_DEPENDS+= databases/mariadb
-WANTLIB += lib/mysql/mysqlclient
+WANTLIB += lib/mysql/mysqlclient stdc++
CONFIGURE_ARGS+= --enable-mysql
.else
CONFIGURE_ARGS+= --disable-mysql
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/pmacct/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 22 Mar 2014 23:05:43 -0000 1.8
+++ distinfo 21 May 2016 10:39:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (pmacct-1.5.0rc2.tar.gz) = 62ttUPpCibKTeRJuMwfIHaEchrglb5Ljwq4oRPSUoTU=
-SIZE (pmacct-1.5.0rc2.tar.gz) = 807952
+SHA256 (pmacct-1.5.3.tar.gz) = LvdkaCgWjrXlzBxct20guajKBergvzT8Jr6++/ksM6Q=
+SIZE (pmacct-1.5.3.tar.gz) = 920563
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/net/pmacct/patches/patch-configure_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure_in
--- patches/patch-configure_in 22 Mar 2014 23:05:43 -0000 1.1
+++ patches/patch-configure_in 21 May 2016 10:39:02 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.1 2014/03/22 23:05:43 sthen Exp $
---- configure.in.orig Sat Mar 22 22:39:17 2014
-+++ configure.in Sat Mar 22 22:39:21 2014
+--- configure.in.orig Thu Jan 14 11:55:01 2016
++++ configure.in Sat May 21 11:35:39 2016
@@ -25,7 +25,6 @@ AC_PROG_RANLIB
dnl initial checks; tweakings to CFLAGS and LDFLAGS
dnl see final checks for tweakings to LIBS
@@ -9,3 +9,13 @@ $OpenBSD: patch-configure_in,v 1.1 2014/
case "$host_os" in
IRIX*)
CFLAGS="-mabi=n32 -fno-builtins"
+@@ -542,9 +541,6 @@ AC_ARG_ENABLE(mysql,
+ # Adding these as prerequisite for MySQL 5.6
+ AC_CHECK_LIB([stdc++], [main], [LIBS="${LIBS} -lstdc++"], [AC_MSG_ERROR([
+ ERROR: missing libstdc++ devel. Requirement for building MySQL.
+- ])])
+- AC_CHECK_LIB([rt], [clock_gettime], [LIBS="${LIBS} -lrt"], [AC_MSG_ERROR([
+- ERROR: missing librt devel. Requirement for building MySQL.
+ ])])
+
+ AC_ARG_WITH(mysql-includes,
Index: patches/patch-src_isis_isis_c
===================================================================
RCS file: /cvs/ports/net/pmacct/patches/patch-src_isis_isis_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_isis_isis_c
--- patches/patch-src_isis_isis_c 22 Mar 2014 23:05:43 -0000 1.1
+++ patches/patch-src_isis_isis_c 21 May 2016 10:39:02 -0000
@@ -1,16 +1,7 @@
$OpenBSD: patch-src_isis_isis_c,v 1.1 2014/03/22 23:05:43 sthen Exp $
---- src/isis/isis.c.orig Sun Mar 16 01:29:27 2014
-+++ src/isis/isis.c Sun Mar 16 01:32:53 2014
-@@ -645,7 +645,7 @@ void igp_daemon_map_validate(char *filename, struct pl
-
- memset(isis_dgram, 0, sizeof(isis_dgram));
-
-- /* can't use DLT_RAW for IS-IS, let's use DLT_CHDLC */
-+ /* can't use DLT_RAW for IS-IS, let's use DLT_C_HDLC */
- chdlc_hdr = (struct chdlc_header *) isis_dgram_ptr;
- chdlc_hdr->address = CHDLC_MCAST_ADDR;
- chdlc_hdr->control = CHDLC_FIXED_CONTROL;
-@@ -819,7 +819,7 @@ void igp_daemon_map_initialize(char *filename, struct
+--- src/isis/isis.c.orig Tue Jan 12 14:59:07 2016
++++ src/isis/isis.c Sat May 21 11:34:49 2016
+@@ -820,7 +820,7 @@ void igp_daemon_map_initialize(char *filename, struct
pcap_t *p;
if (config.debug && config.igp_daemon_map_msglog) {
@@ -18,4 +9,4 @@ $OpenBSD: patch-src_isis_isis_c,v 1.1 20
+ p = pcap_open_dead(DLT_C_HDLC, RECEIVE_LSP_BUFFER_SIZE+sizeof(struct
chdlc_header)+sizeof(struct isis_fixed_hdr));
if ((idmm_fd = pcap_dump_open(p, config.igp_daemon_map_msglog)) == NULL) {
- Log(LOG_ERR, "ERROR ( default/core/ISIS ): Can not open
igp_daemon_map_msglog '%s' (%s).\n",
+ Log(LOG_ERR, "ERROR ( %s/core/ISIS ): Can not open igp_daemon_map_msglog
'%s' (%s).\n",
Index: pkg/PFRAG.mysql
===================================================================
RCS file: /cvs/ports/net/pmacct/pkg/PFRAG.mysql,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.mysql
--- pkg/PFRAG.mysql 22 Mar 2014 23:05:43 -0000 1.3
+++ pkg/PFRAG.mysql 21 May 2016 10:39:02 -0000
@@ -9,4 +9,6 @@ share/examples/pmacct/sql/pmacct-create-
share/examples/pmacct/sql/pmacct-create-db_v5.mysql
share/examples/pmacct/sql/pmacct-create-db_v6.mysql
share/examples/pmacct/sql/pmacct-create-db_v7.mysql
+share/examples/pmacct/sql/pmacct-create-db_v8.mysql
+share/examples/pmacct/sql/pmacct-create-db_v9.mysql
share/examples/pmacct/sql/pmacct-grant-db.mysql
Index: pkg/PFRAG.postgresql
===================================================================
RCS file: /cvs/ports/net/pmacct/pkg/PFRAG.postgresql,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.postgresql
--- pkg/PFRAG.postgresql 22 Mar 2014 23:05:43 -0000 1.3
+++ pkg/PFRAG.postgresql 21 May 2016 10:39:02 -0000
@@ -10,3 +10,4 @@ share/examples/pmacct/sql/pmacct-create-
share/examples/pmacct/sql/pmacct-create-table_v5.pgsql
share/examples/pmacct/sql/pmacct-create-table_v6.pgsql
share/examples/pmacct/sql/pmacct-create-table_v7.pgsql
+share/examples/pmacct/sql/pmacct-create-table_v9.pgsql
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/pmacct/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 22 Mar 2014 23:05:43 -0000 1.6
+++ pkg/PLIST 21 May 2016 10:39:02 -0000
@@ -11,22 +11,24 @@ share/doc/pmacct/
share/doc/pmacct/CONFIG-KEYS
share/doc/pmacct/FAQS
share/doc/pmacct/INTERNALS
+share/doc/pmacct/IPFIX
share/doc/pmacct/PLUGINS
share/doc/pmacct/QUICKSTART
share/doc/pmacct/README.64bit
share/doc/pmacct/README.IPv6
-share/doc/pmacct/README.agent_id2
share/doc/pmacct/README.cos
share/doc/pmacct/README.country
share/doc/pmacct/README.custom_primitives
share/doc/pmacct/README.etype
share/doc/pmacct/README.iface
+share/doc/pmacct/README.label
share/doc/pmacct/README.mask
share/doc/pmacct/README.mpls
share/doc/pmacct/README.nat
share/doc/pmacct/README.pkt_len_distrib
share/doc/pmacct/README.sampling_rate
share/doc/pmacct/README.sqlite3
+share/doc/pmacct/README.tag2
share/doc/pmacct/README.timestamp
share/doc/pmacct/SIGNALS
share/doc/pmacct/TOOLS
@@ -41,6 +43,8 @@ share/examples/pmacct/bgp_md5.lst.exampl
share/examples/pmacct/flow_to_rd.map.example
share/examples/pmacct/gnuplot-example.sh
share/examples/pmacct/gnuplot.script.example
+share/examples/pmacct/kafka/
+share/examples/pmacct/kafka/kafka_consumer.py
share/examples/pmacct/lpref.map.example
share/examples/pmacct/med.map.example
share/examples/pmacct/mrtg-example.sh
@@ -57,13 +61,12 @@ share/examples/pmacct/pmacctd-sql_v2.con
share/examples/pmacct/pmacctd-sqlite3_v4.conf.example
share/examples/pmacct/ports.lst.example
share/examples/pmacct/pretag.map.example
-share/examples/pmacct/primitives.lst
+share/examples/pmacct/primitives.lst.example
share/examples/pmacct/probe_netflow.conf.example
share/examples/pmacct/probe_sflow.conf.example
share/examples/pmacct/rrdtool-example.sh
share/examples/pmacct/sampling.map.example
share/examples/pmacct/sql/
-share/examples/pmacct/sql/pmacct-create-db_v8.mysql
share/examples/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3
share/examples/pmacct/sql/pmacct-create-table_v1.sqlite3
share/examples/pmacct/sql/pmacct-create-table_v2.sqlite3
@@ -73,4 +76,5 @@ share/examples/pmacct/sql/pmacct-create-
share/examples/pmacct/sql/pmacct-create-table_v6.sqlite3
share/examples/pmacct/sql/pmacct-create-table_v7.sqlite3
share/examples/pmacct/sql/pmacct-create-table_v8.sqlite3
+share/examples/pmacct/sql/pmacct-create-table_v9.sqlite3
share/examples/pmacct/tee_receivers.lst.example
