Page MenuHomeFreeBSD
Files F159500854

D23261.diff
No OneTemporary
Actions

D23261.diff
View Options

Index: net-mgmt/pmacct/Makefile
===================================================================
--- net-mgmt/pmacct/Makefile
+++ net-mgmt/pmacct/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pmacct
-DISTVERSION= 1.7.3
+DISTVERSION= 1.7.4p1
CATEGORIES= net-mgmt
MASTER_SITES= http://www.pmacct.net/
@@ -16,6 +16,8 @@
SUB_FILES= pkg-message
GNU_CONFIGURE= yes
+WRKSRC= ${WRKDIR}/pmacct-1.7.4
+
OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 LAYER2 DEBUG GEOIP2 \
DOCS PLABEL RABBITMQ KAFKA AVRO EXAMPLES
OPTIONS_DEFAULT=LAYER2
@@ -83,7 +85,7 @@
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/[A-Z]* ${STAGEDIR}${DOCSDIR}
.for i in AUTHORS CONFIG-KEYS COPYING ChangeLog FAQS INSTALL QUICKSTART UPGRADE
${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
.endfor
Index: net-mgmt/pmacct/distinfo
===================================================================
--- net-mgmt/pmacct/distinfo
+++ net-mgmt/pmacct/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559915336
-SHA256 (pmacct-1.7.3.tar.gz) = 82ca04674a0d6f1ce11dc64d5d44d49bcf923cefff99799359148abb6bfd4f1d
-SIZE (pmacct-1.7.3.tar.gz) = 1467237
+TIMESTAMP = 1582402028
+SHA256 (pmacct-1.7.4p1.tar.gz) = 8a35fdde01a2e34faf7c0d68cb3010bca56667638a6227b02384d015ee9c1335
+SIZE (pmacct-1.7.4p1.tar.gz) = 1581347
Index: net-mgmt/pmacct/files/patch-Makefile.am
===================================================================
--- net-mgmt/pmacct/files/patch-Makefile.am
+++ net-mgmt/pmacct/files/patch-Makefile.am
@@ -1,7 +1,7 @@
---- Makefile.am.orig 2019-04-19 04:06:27.000000000 +0200
-+++ Makefile.am 2019-06-16 19:58:43.298406000 +0200
-@@ -17,7 +17,7 @@
- pmacct_examples_lg_arch_dir = $(pmacct_examples_arch_dir)/lg
+--- Makefile.am.orig 2019-12-07 17:48:46 UTC
++++ Makefile.am
+@@ -22,7 +22,7 @@ pmacct_examples_lg_arch_dir = $(pmacct_examples_arch_d
+ endif
pmacct_examples_custom_dir = $(pmacct_examples_arch_dir)/custom
if USING_SQL
-pmacct_sql_dir = $(pmacct_data_dir)/sql
Index: net-mgmt/pmacct/files/patch-Makefile.in
===================================================================
--- net-mgmt/pmacct/files/patch-Makefile.in
+++ net-mgmt/pmacct/files/patch-Makefile.in
@@ -1,8 +1,8 @@
---- Makefile.in.orig 2019-06-16 20:01:08.854403000 +0200
-+++ Makefile.in 2019-06-16 20:01:32.038160000 +0200
-@@ -346,7 +346,7 @@
- pmacct_examples_lg_dir = $(pmacct_examples_dir)/lg
- pmacct_examples_lg_arch_dir = $(pmacct_examples_arch_dir)/lg
+--- Makefile.in.orig 2019-12-14 15:24:32 UTC
++++ Makefile.in
+@@ -404,7 +404,7 @@ pmacct_examples_avro_dir = $(pmacct_examples_dir)/avro
+ @USING_BGP_BINS_TRUE@pmacct_examples_lg_dir = $(pmacct_examples_dir)/lg
+ @USING_BGP_BINS_TRUE@pmacct_examples_lg_arch_dir = $(pmacct_examples_arch_dir)/lg
pmacct_examples_custom_dir = $(pmacct_examples_arch_dir)/custom
-@USING_SQL_TRUE@pmacct_sql_dir = $(pmacct_data_dir)/sql
+@USING_SQL_TRUE@pmacct_sql_dir = $(pmacct_data_dir)
Index: net-mgmt/pmacct/files/patch-src_sql__common.h
===================================================================
--- /dev/null
+++ net-mgmt/pmacct/files/patch-src_sql__common.h
@@ -0,0 +1,11 @@
+--- src/sql_common.h.orig 2020-02-22 20:28:47 UTC
++++ src/sql_common.h
+@@ -64,7 +64,7 @@
+ #define SQL_TABLE_VERSION_BGP 1000
+
+ /* macros */
+-#define SPACELEFT(x) (sizeof(x)-strlen(x))
++#define SPACELEFT(x) (sizeof(x)-strlen(x)-1)
+ #define SPACELEFT_LEN(x,y) (sizeof(x)-y)
+ #define SPACELEFT_PTR(x,y) (y-strlen(x))
+

File Metadata

Mime Type
text/plain
Expires
Mon, Jun 15, 11:46 PM (4 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33978336
Default Alt Text
D23261.diff (3 KB)

Event Timeline