update to pmacct-1.7.8
This commit is contained in:
parent
52fa5f0a49
commit
34650ac00f
|
@ -1,6 +1,6 @@
|
||||||
COMMENT= passive IP network monitoring tools: traffic accounting, etc
|
COMMENT= passive IP network monitoring tools: traffic accounting, etc
|
||||||
|
|
||||||
DISTNAME= pmacct-1.7.7
|
DISTNAME= pmacct-1.7.8
|
||||||
CATEGORIES= net
|
CATEGORIES= net
|
||||||
|
|
||||||
HOMEPAGE= http://www.pmacct.net/
|
HOMEPAGE= http://www.pmacct.net/
|
||||||
|
@ -54,10 +54,6 @@ CONFIGURE_ARGS+= --enable-mysql
|
||||||
CONFIGURE_ARGS+= --disable-mysql
|
CONFIGURE_ARGS+= --disable-mysql
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.ifdef DEBUG
|
|
||||||
MAKE_ARGS+= DEBUG=1
|
|
||||||
.endif
|
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
mv ${PREFIX}/share/pmacct/docs ${PREFIX}/share/doc/pmacct
|
mv ${PREFIX}/share/pmacct/docs ${PREFIX}/share/doc/pmacct
|
||||||
mv ${PREFIX}/share/pmacct/examples ${PREFIX}/share/examples/pmacct
|
mv ${PREFIX}/share/pmacct/examples ${PREFIX}/share/examples/pmacct
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
SHA256 (pmacct-1.7.7.tar.gz) = jHgfOFZbuJmjH+sJYmdqPJznEs8YD+DcqRIL+xXd+4w=
|
SHA256 (pmacct-1.7.8.tar.gz) = TfUKPGx72s4zRbvzvU9vp6ZyLsH7Rd/SZq2VazJ9qYo=
|
||||||
SIZE (pmacct-1.7.7.tar.gz) = 2149629
|
SIZE (pmacct-1.7.8.tar.gz) = 2175335
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
- Drop forced -O2
|
- Drop forced -O2
|
||||||
- Only Linux requires libnuma for MySQL
|
|
||||||
- Use C++ compiler for linking test
|
- Use C++ compiler for linking test
|
||||||
|
|
||||||
Index: configure.ac
|
Index: configure.ac
|
||||||
|
@ -15,21 +14,10 @@ Index: configure.ac
|
||||||
- CFLAGS="-O2 ${CFLAGS}"
|
- CFLAGS="-O2 ${CFLAGS}"
|
||||||
-fi
|
-fi
|
||||||
-
|
-
|
||||||
AC_CHECK_FUNCS([strlcpy])
|
|
||||||
|
|
||||||
dnl: shared object handling
|
dnl: shared object handling
|
||||||
@@ -403,10 +397,6 @@ AC_ARG_ENABLE(mysql,
|
AC_MSG_CHECKING([whether to disable linking against shared objects])
|
||||||
CFLAGS="$CFLAGS $MYSQL_CFLAGS"
|
AC_ARG_ENABLE(so,
|
||||||
AC_CHECK_HEADERS([mysql.h mysql/mysql.h])
|
@@ -1217,10 +1211,9 @@ AC_LANG_PUSH([C++])
|
||||||
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_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[AC_MSG_RESULT(yes)],[AC_MSG_ERROR([No C++ compiler found])])
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[AC_MSG_RESULT(yes)],[AC_MSG_ERROR([No C++ compiler found])])
|
||||||
AC_LANG_POP([C++])
|
AC_LANG_POP([C++])
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
Index: src/isis/isis.c
|
Index: src/isis/isis.c
|
||||||
--- src/isis/isis.c.orig
|
--- src/isis/isis.c.orig
|
||||||
+++ src/isis/isis.c
|
+++ 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;
|
pcap_t *p;
|
||||||
|
|
||||||
if (config.debug && config.igp_daemon_map_msglog) {
|
if (config.debug && config.igp_daemon_map_msglog) {
|
||||||
|
|
|
@ -56,9 +56,7 @@ share/pmacct/FAQS
|
||||||
share/pmacct/QUICKSTART
|
share/pmacct/QUICKSTART
|
||||||
share/pmacct/UPGRADE
|
share/pmacct/UPGRADE
|
||||||
share/pmacct/sql/
|
share/pmacct/sql/
|
||||||
share/pmacct/sql/README.64bit
|
|
||||||
share/pmacct/sql/README.GeoIP
|
share/pmacct/sql/README.GeoIP
|
||||||
share/pmacct/sql/README.IPv6
|
|
||||||
share/pmacct/sql/README.cos
|
share/pmacct/sql/README.cos
|
||||||
share/pmacct/sql/README.custom_primitives
|
share/pmacct/sql/README.custom_primitives
|
||||||
share/pmacct/sql/README.etype
|
share/pmacct/sql/README.etype
|
||||||
|
|
Loading…
Reference in New Issue