summaryrefslogtreecommitdiff
path: root/net-analyzer/pmacct
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-02-05 18:44:56 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-02-05 18:44:56 +0000
commit29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
treeab466b4dfa7abecb401b2f8039d08af4689306bb /net-analyzer/pmacct
parentd42200bec37eef2a7478d88988ff00addd0a9202 (diff)
gentoo resync : 05.02.2020
Diffstat (limited to 'net-analyzer/pmacct')
-rw-r--r--net-analyzer/pmacct/Manifest4
-rw-r--r--net-analyzer/pmacct/pmacct-1.7.4.ebuild2
-rw-r--r--net-analyzer/pmacct/pmacct-999999.ebuild10
3 files changed, 6 insertions, 10 deletions
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 0c720fb5c032..6e97d76b7bec 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -11,6 +11,6 @@ EBUILD pmacct-1.6.2.ebuild 1790 BLAKE2B be2fe64588677200a54a4866e2946cb5516fb65d
EBUILD pmacct-1.7.1-r1.ebuild 2131 BLAKE2B 93f73d535296d1c3634968a262a1d4aea8b7e27150310ed051a5e7a0bd42c95f09452b7bd0116521763b8acf890a71742ce0772c0468eadfb5dd17717ff5750c SHA512 e2cb9688373c62963391d989f99b909ae246d5b890333d7352871abe9f8feda20bcc046e29777bf0002fee5e6952f1ec49b6ea0decd927b240c919d8c4b2f5cf
EBUILD pmacct-1.7.2-r1.ebuild 2125 BLAKE2B 8a2d62e19cf7e5c6f2de12956cbdda845825648b18c19c4d37190e1cbdd4cc0dd926e8c2330b5bc5acbaee2c989cbbb8f928d31fbe1566fa049549972a9f5828 SHA512 55d6e8b369a0f734e81175829472b2312cf7e24a23acfb3609a76adcbe3f72e2df4ff6460b87fc4c381ea78cd95f446ce26f956b35e4a46d9ebce8ec1ac597e1
EBUILD pmacct-1.7.3-r2.ebuild 2220 BLAKE2B 15f3fab589baa6544681cfff7f5d0a7c8582eacc4ad880764b9dc8702bc56fc19c7e128304f555e1695173c8a98b25550a4c8d439cc2e254bb86071cc0e468e8 SHA512 54ffea328edcc50c4cc4212ca044db234defa0287db3fad4e07f9e3ac103af96bf6d3c2c2322b321e6bae59cc92ec87f8d81a3144ca43aad8c2e699565c7672c
-EBUILD pmacct-1.7.4.ebuild 2261 BLAKE2B 905115a9a89b599dca598d388828b32ea3806fffb7754aa137822a712d444895f0a9f213fdc2885a258b42e60c806b4a253d4f1aa7f5622fe20e21b37eccb717 SHA512 89766a9ba588580b41a8292f41391e7c721c3af59ee299731eb041975b227f4d68bdaafa78062a47ea28e910703de6523660597545c6de119bc5c0c506d22978
-EBUILD pmacct-999999.ebuild 2268 BLAKE2B dd835c166e6f16ce4e86a9aece0b181bd6814d8bafd5bb36201ea350b38ac8612afca39af2cabf19f06f41d6e0faac3e3538fde792ab58b0f8a7ce16d3282a76 SHA512 f9f3aec4aad756675440e4936c5b01442159ed8da7cab5351048989124ea3e0bae42cc2a56ffd6bfe156445bf4214c5869613f954ad9d2052b09237f69d6f0a0
+EBUILD pmacct-1.7.4.ebuild 2236 BLAKE2B 3cde1024527435d97409cc455abc619398ff506f1a63f92fb6a467f92d3a408775ed9ffa67a86e5d17628cf7e763218cb2f075a0fd574b70b7ff83f48e618d8e SHA512 596821332b1ea6990945dfec619a29807a49434e9821e12472c6dd8d00638be374318956eb976478c7862b546a96e98c0f8e3ee16fcf89109f43449d6eb3427f
+EBUILD pmacct-999999.ebuild 2159 BLAKE2B 923a394086afd477ecd91e4d972ba2dcee6281d09bf97311078a1b6e63a3070a8e3363f7777489bad0e09329e1d4f26ecd2da9046e012c991ddb755b57bb5978 SHA512 57c69bd316361ec7a57388ee5718bcda93e2a758d9a364941a86622ac4dddd86c157b7d0cbecc723901c253e285ac9e7721f0594cc18fa6aac7bbc9bba43e334
MISC metadata.xml 1424 BLAKE2B 75ce1e74993587289adbef0841807d758f0a587bc5b0429cb03a86be690d49479a2cf37211006ae905473528f3f4714ec2827e5bc556a4bcaf368215f97db7b8 SHA512 ddfd0eaac09d66640660baffe80ca83911000632416602eb258b2c01e630ada343ebeff7191c53fe71e4d5e658c94eac9a95bf4527a9ba40ee674ffa9442d856
diff --git a/net-analyzer/pmacct/pmacct-1.7.4.ebuild b/net-analyzer/pmacct/pmacct-1.7.4.ebuild
index 159a6edac6d8..99560fad9a73 100644
--- a/net-analyzer/pmacct/pmacct-1.7.4.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.7.4.ebuild
@@ -60,7 +60,7 @@ src_prepare() {
src_configure() {
tc-export CC AR RANLIB
- append-cppflags -DMYSQL_SERVER_VERSION=99999999
+ append-cflags -fcommon
econf \
$(use_enable 64bit) \
diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild
index 36566e6c719e..a4410a2887e1 100644
--- a/net-analyzer/pmacct/pmacct-999999.ebuild
+++ b/net-analyzer/pmacct/pmacct-999999.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
IUSE="
- 64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
+ +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql
ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq
"
REQUIRED_USE="
@@ -32,7 +32,7 @@ RDEPEND="
<dev-libs/mongo-c-driver-0.98
)
mysql? ( dev-db/mysql-connector-c:0= )
- ndpi? ( >=net-libs/nDPI-2.4:= )
+ ndpi? ( >=net-libs/nDPI-3.0:= )
nflog? ( net-libs/libnetfilter_log )
postgres? ( dev-db/postgresql:* )
rabbitmq? ( net-libs/rabbitmq-c )
@@ -43,9 +43,6 @@ DEPEND="
${RDEPEND}
virtual/pkgconfig
"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch
-)
DOCS=(
CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE
@@ -60,10 +57,9 @@ src_prepare() {
src_configure() {
tc-export CC AR RANLIB
- append-cppflags -DMYSQL_SERVER_VERSION=99999999
+ append-cflags -fcommon
econf \
- $(use_enable 64bit) \
$(use_enable bgp-bins) \
$(use_enable bmp-bins) \
$(use_enable geoip) \