From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- net-analyzer/ntopng/Manifest | 20 ++--- net-analyzer/ntopng/files/ntopng-2.4-cxx.patch | 42 --------- .../ntopng/files/ntopng-2.4-dont-build-ndpi.patch | 16 ---- .../ntopng/files/ntopng-2.4-mysqltool.patch | 17 ---- net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch | 60 ------------- .../ntopng/files/ntopng-3.0-mysqltool.patch | 17 ---- .../ntopng/files/ntopng-3.0-pointer-cmp.patch | 11 --- .../ntopng/files/ntopng-3.8-ndpi-includes.patch | 4 +- .../ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch | 95 +++++++++++++++++++++ .../ntopng/files/ntopng-3.8.1-parallel-make.patch | 15 ++++ net-analyzer/ntopng/metadata.xml | 6 +- net-analyzer/ntopng/ntopng-2.4-r1.ebuild | 86 ------------------- net-analyzer/ntopng/ntopng-3.0-r4.ebuild | 75 ---------------- net-analyzer/ntopng/ntopng-3.8-r1.ebuild | 76 +++++++++++++++++ net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild | 99 ++++++++++++++++++++++ net-analyzer/ntopng/ntopng-3.8.ebuild | 76 ----------------- 16 files changed, 297 insertions(+), 418 deletions(-) delete mode 100644 net-analyzer/ntopng/files/ntopng-2.4-cxx.patch delete mode 100644 net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch delete mode 100644 net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch delete mode 100644 net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch delete mode 100644 net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch delete mode 100644 net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch create mode 100644 net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch create mode 100644 net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch delete mode 100644 net-analyzer/ntopng/ntopng-2.4-r1.ebuild delete mode 100644 net-analyzer/ntopng/ntopng-3.0-r4.ebuild create mode 100644 net-analyzer/ntopng/ntopng-3.8-r1.ebuild create mode 100644 net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild delete mode 100644 net-analyzer/ntopng/ntopng-3.8.ebuild (limited to 'net-analyzer/ntopng') diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest index a71221525b18..f71c1090b477 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -1,19 +1,13 @@ -AUX ntopng-2.4-cxx.patch 809 BLAKE2B b142cddf5a76e6683c1220aaed4293d0a90cb2d67b2d446600faec2881c4d8b2ec4d41c247f9301b29ef2e94cedb9f12722cc5442f1e2b139b949143c2944fa1 SHA512 04345262208bc0a6043b83ae94a1fa83a08889f19e5d36e68cca5d11c93f12b026e6179c37aa27fb800a6f019b9eba58055920fcc555f2f9627dc8ee6c0e39ee -AUX ntopng-2.4-dont-build-ndpi.patch 387 BLAKE2B a429abdf9acf6111aa44c5cd26818f1f3f86abd37323113a828d83772b81e42ccda9fe32491c005fddb04f7effc77371812e8a76465f9a3c343c05f3956aa12e SHA512 5e16fc3dcaa7e69802bf94dfd4f63903d07d1cdbd119fde483b01134af4542ef84ba3a14cfa61921f7e924b64d7bb191a8818d7bece21c726c8f5e3876ccc98d -AUX ntopng-2.4-mysqltool.patch 430 BLAKE2B 052163786435b54d527e01a9e13fc385795f6c9895310bd084d3906307fe36247a549128284a6249dd1034f87a7f138370567fb64b16ae4c1d8b624ca08da204 SHA512 9ade5fb4e8a9f9b205327d482670b87fa249ab375be3414801e46ac34f1204605be4530326836b1ded48e9a63f38d0fecaf047cde09650e380495257a0e0832a -AUX ntopng-3.0-gentoo.patch 1596 BLAKE2B 36349887ae8f418a0db67d8a96d33785fe5ec4875a987fa9b837857b1cbbdcaa802d2c5b2524b6edeb8cda5aaeec69102f4facd177d43bc321ed50de62135728 SHA512 fcab6670255d7c756694091d6b53a7880a74e8840fa8f77ec81b072dbe7c7a5ec5b4550892dc78c45304ee437a309fe8c79293f6205c570685b8f13178c1c306 -AUX ntopng-3.0-mysqltool.patch 430 BLAKE2B 94410cdac37f6d35b4c6b0f90c3391f79d36242932af2ab520a8db3057b37b3d059fd708e0af930bf8321babadade61621f79f77ac55581ebe46555e6cd9e6c6 SHA512 82b06a14f471bd037743a7563a80d6460e63ff262252d0318e40ba25bf8da849bc0394a5fa4d54befd5df6bd4b645b86711708198f8971d54eb15e8f32c83cd5 -AUX ntopng-3.0-pointer-cmp.patch 340 BLAKE2B 2b361ac6fc25857125b192fab11cb1c060bef6fb220386ffaf5b3df68ee5f52e173fc63e3a70175d746df52ae258bb2fd01ab6b3888ccfd320700083540ab0e7 SHA512 30e0137046c5612d627c3efb7a17b303a04144e63dc14e3ffd393cd87444b623af6430a6520181e5cf3fef5e89e51594c9700306bba1ffea2a9e6795e7c5e861 AUX ntopng-3.8-missing-min.patch 567 BLAKE2B 06cff6608d9d8d2fb2312aef0075d53f2e1c19f6294bc47f2b26b6aa27d078edfc78b16142ea13c3e6a679ba541dcb2185b82af4969e621454fa97566a68e6e5 SHA512 567cea5b632b9a2d405cfb8058ef1ec204506084286ba4d7e86b64939a0ab7b3bd1204473a194ab7cf16195e76abcd4b77a05c20b1516cdbc59f431feb5cec16 AUX ntopng-3.8-mysqltool.patch 437 BLAKE2B 13df7c163168b59917843a2c7dee13f41c6d3b95e16a0967c849771dbb552c72f1d5e8d16dd76ed6b51c149a1143707d432761abd907bec3d7b6257a099debca SHA512 f13a6d529e2e2d659763c2ec013ebdb61f3b741d242f375345e60e66d7cf4adeefdff6876d3a15497fc9b2f1966268665e550719f7bd86ca1b44252f459c9029 AUX ntopng-3.8-ndpi-call.patch 507 BLAKE2B b08c95e8a35c7372b1fc56bf59a50a8ba22091e86051ea2843f6833b41faaa0022d79e462f9755c3234bd3641facbec7a6a2689eb5ee66ee3b4b3df6abcaf29c SHA512 88c3fc0b3f82fda730e614c85a3366392a557140122d98d21e9dc24b2e43123d557636206e18f09117dccb9c1da8a1ccce49293d2261f00f78e3b1523f70ba0e -AUX ntopng-3.8-ndpi-includes.patch 528 BLAKE2B c8a874f83aae75b0691ea9c9eeaaaeaac021de9f2e1d7a1bc1024acf927c36449d13df022ea6df5c2f09af68628aee5adef9039db5f7a3d6aa36da6c9d7924fa SHA512 593923665752322207bde864850bdfca7d1f75ea1270f1abd514b648f0fe6a539f4925837bebf433a3ffc82ae60edaafeaeaca2e19a58e87459e6caea245e59b +AUX ntopng-3.8-ndpi-includes.patch 456 BLAKE2B 517864615e89088aafdd21c50d550e8991387120252126a9bde7531bc0ac6f9691e69e8ae38db4a623e0f6d6161b2f780dd304be377c90c2cf8a1caf20100e0e SHA512 5033c87fdf3fc32539db886a9675bf69dd71aab22ee8d3357f8f700198ba15a69bf4d4f633941b2c806dcf7ad866b9d18373d02a76ffcfea56b6ebe6e22a82ee +AUX ntopng-3.8.1-PKG_CONFIG.patch 3059 BLAKE2B e11205bf3e6dcfa5fd00860b42f6f55046b160f3f607952a510a462966e52f878a8e7cbafbb684dbf1a7a715e2fa2cabd22dc51f90332de5404a724e97c9ecbc SHA512 e5498a81edf664269a44e5f9d776938ae12f2ff8a611570d5923ba23fbfb69e23cfead2311357e4528996c189853cf7fdb307d9c307bff0f9f4309fd4591ee3a +AUX ntopng-3.8.1-parallel-make.patch 267 BLAKE2B f68ab75b32b3275b5513039f947f1dc8ca1f4b3642730cba5ff461ebaa6c9114fe238574087bf4a4f1be91b31954e1d17dcaf535709714c2fc5a04ef10bfd0b1 SHA512 ade7e22747cb750bc5f7d4a3480c003414f99d39401e0bcfe1c3d0b58cb2c409f962d58becc3c6c40a5b95d057fe5b4dfeb9cfd0855a30b4c5be1d26ba3c0e62 AUX ntopng.conf.d 117 BLAKE2B 67e2962fcb0303ab465b3d8def04192992e3e7306c5e76084a58cca5bdf1a797b08193f2a3512f876ff9c5300b0f3504055e7166afcbb4cbc527658c74b0616b SHA512 bb66d11245ce099f9e09f97d830da60df910682242db0c5c7d17bcd800e84cf3bce6288fb75fc3a8f3e214a580dc0d076f7f69aa924d9ad3e4c8bff093252061 AUX ntopng.init.d 549 BLAKE2B de561950f001e35a26b522728affa5971d8a0fdd1d855746509c0e6861df7ed9c356abe6bc066df65524c340d05c072e7c4de0864c250164b8a1509b34d508c0 SHA512 1fbcc46fe10dcef82a1310d74c4351c72752cdd2a9b9908705c8c645698430e456f1ba14b77fd7c1f374a237a508c2d33324de61f5f1f8255ed75a384e874d84 -DIST ntopng-2.4.tar.gz 134074662 BLAKE2B dbf654e5cd1f9eddb5ae325bdf0ac2e7ce22c08f55363b10723bde2cb5fd86cf3b0c7fef0f55dc7fcce0341f5fbb9a7132f26e29649bcf66020b640975c0e6da SHA512 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a -DIST ntopng-3.0.tar.gz 23017655 BLAKE2B f791690118a5ecfb1be5ad791229f2438354a0c2271350aa1a2f0fee05886c54d181a669e6e1b27657c5bfe4b68db24b06d91adfb89e803a154a7a4bbff146b7 SHA512 d5e310d5dba7fe696d38d9d8251ffa4077182200e41c3f0b6034e68cf6623220ec47ba9d9fd5d2392a7b65a6de770e330821169c7ec06b4952f68c3f5f738eb1 +DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742 SHA512 4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970 DIST ntopng-3.8.tar.gz 33910329 BLAKE2B a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2 SHA512 2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f -EBUILD ntopng-2.4-r1.ebuild 1713 BLAKE2B 412ffa5d8596bf4f2d5701864cc12a542c13442c99c3652d8df3790f0aec24b2d8f3d151c7b560d492c2f74ba6dc1b1b24358cb7e9b22ee26d89ca14032108b5 SHA512 a5a42e0f4de1feefd5cfc8c407b375ce9b5587568de90f5fbc2e4c3f53c08df6f645e5abd95eddd6edb136f519bf3b56b8107298e0fb6e126d0f9bc286946a15 -EBUILD ntopng-3.0-r4.ebuild 1622 BLAKE2B 1db14760398455995b4584065665032b2304d0e5699001e9ee7727bb0cf31272422e8de56b9aa5ec1778d27419f60ad38008b248114fbd49781229de38ac546e SHA512 e2591cd2c833021f08e45c5ae24843deef9ca7d745e68462618592a2205df3e341c76361bc9046d8d0797d515b099f2139e889bc4caa5a1f42996ed6154dffa2 -EBUILD ntopng-3.8.ebuild 1727 BLAKE2B c95da883fdd8b8e9828345248d8dea86f7a326e799e1ec413e06f32eeb620efc45a20ab93a7c005307c5877ef5285a368db4dc1fa9b15c7c480e5775c15ea3f6 SHA512 3a04bfdf57bec06b39a470692a319f38d9204a0e88e63b4a02b16c2da5caf16a0639a8ced42a4f1de42e3651ea657a5b22eb4674180049c3cafcae89eb56fb39 -MISC metadata.xml 299 BLAKE2B 466c255eb9dd221bc91a9308a7ad2d4032c96072f96220d56f78f8c2e9f79392a83603e7bd3a78e4bfa32bd61b04351261ccc86dc82ca9d834c2afc73724ed19 SHA512 5c8e5b8f97b306a059913e2adc9e02137502ec35da1a753a2b9af4d4c67c0af0f0266c14acdd488c89bb96da3cc0464512de05ce389055d35bc6a0feab7ac996 +EBUILD ntopng-3.8-r1.ebuild 1729 BLAKE2B da6fc2d159813ca2505dae2bc82038fcc7831768adf03d2cbce74ef7ee9fc8268953819641015e0a98550b3ef19e7f42cb63da7c19e6e0f1edf6139f0326165c SHA512 3d71d06d03a0bb2c67be93701cb5a13058d50b029bc1a9f80d630fc687742dbfc7054be34a73c9c4f2f457c44692cec076b4d627a8f6d8b02d06352a4921d39e +EBUILD ntopng-3.8.1-r2.ebuild 1912 BLAKE2B 9e073878fe2fcea73878b783abe608c899733975463d3e277cffae2abc285ba296c733a055ea7076ac1c09f57c0a5a9f725dc690d0ad0d810f0fa5571a83d028 SHA512 47d0bf663096213abda2f19ec71f730551ded735321cf8c7bde23949128a62c58f99e4e1fefcc3db63906f0b8390fb81c5850db8392cc350e0ee9d2e7fd36bf4 +MISC metadata.xml 294 BLAKE2B 8576bdc8fbbdbeb8502b8d8fb59b71b02d8e99c67d1262ce17ff3cd711ef4c7a7c9234c02503401aa861103ed136c397bf585e94902e13902db490fe55e9e5a4 SHA512 67820c7c2d32de9c79854059df9bad9444a6ef70cca8c718b5469035ce2dd1bf2242b332482b5a12d8f1eaba37ae905f483daf5ba929219c9e6ac3f108c3bc73 diff --git a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch b/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch deleted file mode 100644 index 6de1a43f9b8e..000000000000 --- a/net-analyzer/ntopng/files/ntopng-2.4-cxx.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -341,14 +341,6 @@ - GMAKE="make" - fi - --GPP=`which clang++` --if test x$GPP = x --then -- GPP="g++" --else -- GPP="$GPP -O0" --fi -- - GIT=`which git` - if test x$GIT = x - then ---- a/Makefile.in -+++ b/Makefile.in -@@ -4,7 +4,6 @@ - SHELL=/bin/sh - OS := $(shell uname -s) - PWD=@PWD@ --GPP=@GPP@ - INSTALL_DIR=$(DESTDIR)$(prefix) - MAN_DIR=$(DESTDIR)@MAN_DIR@ - -@@ -126,12 +125,12 @@ - $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ - - %.o: %.cpp $(HEADERS) Makefile -- $(GPP) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ - - .PRECIOUS: $(TARGET) $(OBJECTS) - - $(TARGET): $(OBJECTS) $(LIBRRDTOOL) Makefile -- $(GPP) $(OBJECTS) -Wall $(LIBS) -o $@ -+ $(CXX) $(OBJECTS) $(CXXFLAGS) $(CPPFLAGS) -Wall $(LIBS) -o $@ - - $(LUAJIT_LIB): - cd $(LUAJIT_HOME); @GMAKE@ diff --git a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch deleted file mode 100644 index ef40c72d5896..000000000000 --- a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -62,13 +62,6 @@ - fi - - NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a --AC_MSG_CHECKING(for $NDPI_LIB) --if test -f "$NDPI_LIB" ; then : -- AC_MSG_RESULT(found $NDPI_LIB) --else -- AC_MSG_RESULT(not found $NDPI_LIB: compiling) -- cd $NDPI_HOME; ./autogen.sh; make; cd - --fi - - AC_MSG_CHECKING(for ntopng professional edition) - if test -d "pro"; then : diff --git a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch deleted file mode 100644 index a80e966b85de..000000000000 --- a/net-analyzer/ntopng/files/ntopng-2.4-mysqltool.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -302,13 +302,7 @@ - if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then - MYSQLTOOL="mariadb_config" - else -- PATH=$PATH:/usr/local/mysql/bin -- AC_CHECK_TOOL(MYSQL, mysql_config) -- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then -- MYSQLTOOL="mysql_config" -- else -- MYSQLTOOL="" -- fi -+ MYSQLTOOL="mysql_config" - fi - - if test -n "$MYSQLTOOL"; then diff --git a/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch b/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch deleted file mode 100644 index 90d7aace545c..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.0-gentoo.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -19,7 +19,6 @@ - # On CentOS 6 `git rev-list HEAD --count` does not work - # - # --REVISION=`git log --pretty=oneline | wc -l` - - if test -d "/usr/local/include"; then - CFLAGS="${CFLAGS} -I/usr/local/include" -@@ -48,33 +47,6 @@ - - SHORT_MACHINE=`uname -m | cut -b1-3` - --GIT_RELEASE="@GIT_RELEASE@" --GIT_DATE="@GIT_DATE@" --GIT_BRANCH="@GIT_BRANCH@" --PRO_GIT_RELEASE="@PRO_GIT_RELEASE@" --PRO_GIT_DATE="@PRO_GIT_DATE@" -- --AC_MSG_CHECKING(for nDPI) --NDPI_HOME=./nDPI --if test -d "$NDPI_HOME" ; then : -- AC_MSG_RESULT(found in $NDPI_HOME) --else -- NDPI_HOME=../nDPI -- if test -d "$NDPI_HOME"; then : -- AC_MSG_RESULT(found in $NDPI_HOME) -- else -- NDPI_HOME=$HOME/nDPI -- if test -d "$NDPI_HOME"; then : -- AC_MSG_RESULT(found in $NDPI_HOME) -- else -- AC_MSG_RESULT(not found) -- echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; make; cd ../ntopng" -- echo " and try again" -- exit -- fi -- fi --fi -- - if test -d "/usr/include/openssl"; then : - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) - SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" -@@ -53,15 +53,6 @@ - SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" - fi - --NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a --AC_MSG_CHECKING(for $NDPI_LIB) --if test -f "$NDPI_LIB" ; then : -- AC_MSG_RESULT(found $NDPI_LIB) --else -- AC_MSG_RESULT(not found $NDPI_LIB: compiling) -- cd $NDPI_HOME; ./autogen.sh; make; cd - --fi -- - AC_MSG_CHECKING(for ntopng professional edition) - PRO_MAKEFILE_INC= - PRO_INC= diff --git a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch deleted file mode 100644 index 4d2244b582b9..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -335,13 +335,7 @@ - if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then - MYSQLTOOL="mariadb_config" - else -- PATH=$PATH:/usr/local/mysql/bin -- AC_CHECK_TOOL(MYSQL, mysql_config) -- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then -- MYSQLTOOL="mysql_config" -- else -- MYSQLTOOL="" -- fi -+ MYSQLTOOL="mysql_config" - fi - - if test -n "$MYSQLTOOL"; then diff --git a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch deleted file mode 100644 index 171bee36e897..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/AddressResolution.cpp -+++ b/src/AddressResolution.cpp -@@ -52,7 +52,7 @@ - u_int numeric_ip_len; - - snprintf(query, sizeof(query), "%s", _numeric_ip); -- if((at = strchr(query, '@')) != '\0') at[0] = '\0'; -+ if((at = strchr(query, '@')) != NULL) at[0] = '\0'; - numeric_ip = query; - numeric_ip_len = strlen(numeric_ip)-1; - diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch index 068f1e9fa9b9..cdd5e827147c 100644 --- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch +++ b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch @@ -1,5 +1,5 @@ ---- a/configure.seed 2018-10-08 21:33:09.403001834 -0600 -+++ b/configure.seed 2018-10-08 21:35:47.404002203 -0600 +--- a/configure.seed ++++ b/configure.seed @@ -129,9 +129,9 @@ fi diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch new file mode 100644 index 000000000000..91811d66bbd4 --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch @@ -0,0 +1,95 @@ +--- a/configure.seed ++++ b/configure.seed +@@ -6,6 +6,8 @@ + + AC_PROG_CXX + ++PKG_PROG_PKG_CONFIG ++ + dnl> Add /usr/local/ /opt/local + CFLAGS="-I${PWD} -I${PWD}/include" + CPPFLAGS="${CPPFLAGS} -I${PWD} -I${PWD}/include" +@@ -179,10 +179,10 @@ + fi + dnl finish: nDPI handling + +-if test -z `pkg-config --exists libssl`; then ++if ${PKG_CONFIG} --exists libssl; then + AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" +- SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" ++ SSL_INC="`${PKG_CONFIG} --cflags libssl` -I/usr/include/openssl" ++ SSL_LIB="`${PKG_CONFIG} --libs libssl` -lssl -lcrypto" + fi + + AC_MSG_CHECKING(for ntopng professional edition) +--- a/Makefile.in ++++ b/Makefile.in +@@ -44,10 +44,10 @@ + + ###### + LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8 +-HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd; echo $$?) ++HAS_LIBRRDTOOL=$(shell $(PKG_CONFIG) --atleast-version=1.4.8 librrd; echo $$?) + ifeq ($(HAS_LIBRRDTOOL), 0) +- LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd) +- LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd) # -lrrd_th ++ LIBRRDTOOL_INC = $(shell $(PKG_CONFIG) --cflags librrd) ++ LIBRRDTOOL_LIB = $(shell $(PKG_CONFIG) --libs librrd) # -lrrd_th + else + LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/ + ifeq ($(OS), $(filter $(OS), OpenBSD FreeBSD)) +@@ -70,10 +70,10 @@ + + ###### + +-HAS_JSON=$(shell pkg-config --exists json-c; echo $$?) ++HAS_JSON=$(shell $(PKG_CONFIG) --exists json-c; echo $$?) + ifeq ($(HAS_JSON), 0) +- JSON_INC = $(shell pkg-config --cflags json-c) +- JSON_LIB = $(shell pkg-config --libs json-c) ++ JSON_INC = $(shell $(PKG_CONFIG) --cflags json-c) ++ JSON_LIB = $(shell $(PKG_CONFIG) --libs json-c) + else + JSON_HOME=${PWD}/third-party/json-c + JSON_INC=-I$(JSON_HOME) +@@ -83,21 +83,21 @@ + ###### + + ifeq (@NEDGE@, 0) +- HAS_SODIUM=$(shell pkg-config --exists libsodium; echo $$?) ++ HAS_SODIUM=$(shell $(PKG_CONFIG) --exists libsodium; echo $$?) + ifeq ($(HAS_SODIUM), 0) +- SODIUM_INC = $(shell pkg-config --cflags libsodium) +- SODIUM_LIB = $(shell pkg-config --libs libsodium) ++ SODIUM_INC = $(shell $(PKG_CONFIG) --cflags libsodium) ++ SODIUM_LIB = $(shell $(PKG_CONFIG) --libs libsodium) + else + SODIUM_INC= + SODIUM_LIB= + endif + +- HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?) ++ HAS_ZEROMQ=$(shell $(PKG_CONFIG) --exists libzmq; echo $$?) + ifeq ($(HAS_ZEROMQ), 0) +- ZEROMQ_INC = $(shell pkg-config --cflags libzmq) ++ ZEROMQ_INC = $(shell $(PKG_CONFIG) --cflags libzmq) + ZMQ_STATIC=/usr/local/lib/libzmq.a + ifeq ($(wildcard $(ZMQ_STATIC)),) +- ZEROMQ_LIB = $(shell pkg-config --libs libzmq) ++ ZEROMQ_LIB = $(shell $(PKG_CONFIG) --libs libzmq) + else + ZEROMQ_LIB = $(ZMQ_STATIC) + endif +@@ -107,9 +107,9 @@ + ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a + endif + +- HAS_ZSTD=$(shell pkg-config --exists libzstd; echo $$?) ++ HAS_ZSTD=$(shell $(PKG_CONFIG) --exists libzstd; echo $$?) + ifeq ($(HAS_ZSTD), 0) +- ZSTD_LIB = $(shell pkg-config --libs libzstd) ++ ZSTD_LIB = $(shell $(PKG_CONFIG) --libs libzstd) + endif + endif + diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch new file mode 100644 index 000000000000..9089c0a9b04d --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch @@ -0,0 +1,15 @@ +--- a/configure.seed ++++ b/configure.seed +@@ -526,11 +520,7 @@ + + AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows]) + +-GMAKE=`which gmake` +-if test x$GMAKE = x +-then +- GMAKE="make" +-fi ++GMAKE='$(MAKE)' + + GIT=`which git` + if test x$GIT = x diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml index 334443b640d6..f31113c67cca 100644 --- a/net-analyzer/ntopng/metadata.xml +++ b/net-analyzer/ntopng/metadata.xml @@ -1,9 +1,9 @@ - - slis@gentoo.org - + +netmon@gentoo.org + ntop/ntopng diff --git a/net-analyzer/ntopng/ntopng-2.4-r1.ebuild b/net-analyzer/ntopng/ntopng-2.4-r1.ebuild deleted file mode 100644 index 3e53ff545180..000000000000 --- a/net-analyzer/ntopng/ntopng-2.4-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils user toolchain-funcs - -DESCRIPTION="Network traffic analyzer with web interface" -HOMEPAGE="https://www.ntop.org/" -SRC_URI="mirror://sourceforge/ntop/${PN}/${P}-stable.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-db/sqlite:3 - dev-python/pyzmq - dev-lang/luajit:2 - dev-libs/json-c:= - dev-libs/geoip - dev-libs/glib:2 - dev-libs/hiredis - dev-libs/libxml2 - net-analyzer/rrdtool - net-libs/libpcap - net-misc/curl - dev-db/mysql-connector-c - !net-libs/nDPI" -RDEPEND="${DEPEND} - dev-db/redis" - -S="${WORKDIR}/${P}-stable" - -src_prepare() { - cat "${S}/configure.seed" | sed "s/@VERSION@/${PV}/g" | sed "s/@SHORT_VERSION@/${PV}/g" > "${S}/configure.ac" - epatch "${FILESDIR}/${P}-dont-build-ndpi.patch" - epatch "${FILESDIR}/${P}-mysqltool.patch" - epatch "${FILESDIR}/${P}-cxx.patch" - sed -i 's/exit$/exit 1/g' "${S}/configure.ac" "${S}/nDPI/configure.ac" - eautoreconf - - cd "${S}/nDPI" - eautoreconf -} - -src_configure() { - tc-export CC CXX LD NM OBJDUMP PKG_CONFIG - cd "${S}/nDPI" - econf - cd "${S}" - econf -} - -src_compile() { - cd "${S}/nDPI" - emake - - cd "${S}" - emake -} - -src_install() { - SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} - doins -r httpdocs - doins -r scripts - - exeinto /usr/bin - doexe ${PN} - doman ${PN}.8 - - newinitd "${FILESDIR}/ntopng.init.d" ntopng - newconfd "${FILESDIR}/ntopng.conf.d" ntopng - - dodir "/var/lib/ntopng" - fowners ntopng "/var/lib/ntopng" -} - -pkg_setup() { - enewuser ntopng -} - -pkg_postinst() { - elog "ntopng default creadential are user='admin' password='admin'" -} diff --git a/net-analyzer/ntopng/ntopng-3.0-r4.ebuild b/net-analyzer/ntopng/ntopng-3.0-r4.ebuild deleted file mode 100644 index 2a126bff0473..000000000000 --- a/net-analyzer/ntopng/ntopng-3.0-r4.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools user toolchain-funcs - -DESCRIPTION="Network traffic analyzer with web interface" -HOMEPAGE="https://www.ntop.org/" -SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-db/sqlite:3 - dev-python/pyzmq - dev-lang/luajit:2 - dev-libs/json-c:= - dev-libs/geoip - dev-libs/glib:2 - dev-libs/hiredis - dev-libs/libsodium:= - dev-libs/libxml2 - net-analyzer/rrdtool - net-libs/libpcap - =net-libs/nDPI-2.0 - net-misc/curl - sys-libs/binutils-libs:= - dev-db/mysql-connector-c:=" -RDEPEND="${DEPEND} - dev-db/redis" -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-mysqltool.patch - "${FILESDIR}"/${P}-pointer-cmp.patch -) - -src_prepare() { - sed -e "s/@VERSION@/${PV}/g;s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" || die - - default - - eautoreconf -} - -src_install() { - SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} - doins -r httpdocs - doins -r scripts - - dodir ${SHARE_NTOPNG_DIR}/third-party - insinto ${SHARE_NTOPNG_DIR}/third-party - doins -r third-party/i18n.lua-master - doins -r third-party/lua-resty-template-master - - exeinto /usr/bin - doexe ${PN} - doman ${PN}.8 - - newinitd "${FILESDIR}/ntopng.init.d" ntopng - newconfd "${FILESDIR}/ntopng.conf.d" ntopng - - dodir "/var/lib/ntopng" - fowners ntopng "/var/lib/ntopng" -} - -pkg_setup() { - enewuser ntopng -} - -pkg_postinst() { - elog "ntopng default credentials are user='admin' password='admin'" -} diff --git a/net-analyzer/ntopng/ntopng-3.8-r1.ebuild b/net-analyzer/ntopng/ntopng-3.8-r1.ebuild new file mode 100644 index 000000000000..37e007de41ea --- /dev/null +++ b/net-analyzer/ntopng/ntopng-3.8-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools user toolchain-funcs + +DESCRIPTION="Network traffic analyzer with web interface" +HOMEPAGE="https://www.ntop.org/" +SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="dev-db/sqlite:3 + dev-python/pyzmq + dev-lang/luajit:2 + dev-libs/json-c:= + dev-libs/geoip + dev-libs/glib:2 + dev-libs/hiredis + dev-libs/libsodium:= + dev-libs/libxml2 + dev-libs/libmaxminddb + net-analyzer/rrdtool + net-libs/libpcap + >=net-libs/nDPI-2.4:= + net-misc/curl + sys-libs/binutils-libs + dev-db/mysql-connector-c:=" +RDEPEND="${DEPEND} + dev-db/redis" +PATCHES=( + "${FILESDIR}"/${P}-mysqltool.patch + "${FILESDIR}"/${P}-ndpi-includes.patch + "${FILESDIR}"/${P}-missing-min.patch + "${FILESDIR}"/${P}-ndpi-call.patch +) + +src_prepare() { + default + sed -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" -e "s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" > configure.ac + eapply_user + eautoreconf +} + +src_install() { + SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" + dodir ${SHARE_NTOPNG_DIR} + insinto ${SHARE_NTOPNG_DIR} + doins -r httpdocs + doins -r scripts + + dodir ${SHARE_NTOPNG_DIR}/third-party + insinto ${SHARE_NTOPNG_DIR}/third-party + doins -r third-party/i18n.lua-master + doins -r third-party/lua-resty-template-master + + exeinto /usr/bin + doexe ${PN} + doman ${PN}.8 + + newinitd "${FILESDIR}/ntopng.init.d" ntopng + newconfd "${FILESDIR}/ntopng.conf.d" ntopng + + dodir "/var/lib/ntopng" + fowners ntopng "/var/lib/ntopng" +} + +pkg_setup() { + enewuser ntopng +} + +pkg_postinst() { + elog "ntopng default credentials are user='admin' password='admin'" +} diff --git a/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild b/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild new file mode 100644 index 000000000000..fb5e82a01945 --- /dev/null +++ b/net-analyzer/ntopng/ntopng-3.8.1-r2.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools user toolchain-funcs + +DESCRIPTION="Network traffic analyzer with web interface" +HOMEPAGE="https://www.ntop.org/" +SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + >=net-libs/nDPI-3.0:= + dev-db/mysql-connector-c:= + dev-db/sqlite:3 + dev-libs/hiredis + dev-libs/json-c:= + dev-libs/libmaxminddb + dev-libs/libsodium:= + dev-libs/openssl + net-analyzer/rrdtool + net-libs/libpcap + net-libs/zeromq:= + net-misc/curl + sys-libs/libcap + sys-libs/zlib +" +RDEPEND=" + ${DEPEND} + dev-db/redis +" +BDEPEND=" + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-3.8-mysqltool.patch + "${FILESDIR}"/${PN}-3.8-ndpi-includes.patch + "${FILESDIR}"/${PN}-3.8.1-PKG_CONFIG.patch + "${FILESDIR}"/${PN}-3.8.1-parallel-make.patch +) +RESTRICT="test" + +pkg_setup() { + enewuser ntopng +} + +src_prepare() { + default + + sed \ + -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \ + -e "s/@SHORT_VERSION@/${PV}/g" \ + < "${S}/configure.seed" \ + > "${S}/configure.ac" || die + + eautoreconf +} + +src_configure() { + tc-export PKG_CONFIG + default +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + MYCFLAGS="${CFLAGS}" \ + MYLDFLAGS="${LDFLAGS}" +} + +src_install() { + SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" + dodir ${SHARE_NTOPNG_DIR} + insinto ${SHARE_NTOPNG_DIR} + doins -r httpdocs + doins -r scripts + + dodir ${SHARE_NTOPNG_DIR}/third-party + insinto ${SHARE_NTOPNG_DIR}/third-party + doins -r third-party/i18n.lua-master + doins -r third-party/lua-resty-template-master + + exeinto /usr/bin + doexe ${PN} + doman ${PN}.8 + + newinitd "${FILESDIR}"/ntopng.init.d ntopng + newconfd "${FILESDIR}"/ntopng.conf.d ntopng + + keepdir /var/lib/ntopng + fowners ntopng /var/lib/ntopng +} + +pkg_postinst() { + elog "ntopng default credentials are user='admin' password='admin'" +} diff --git a/net-analyzer/ntopng/ntopng-3.8.ebuild b/net-analyzer/ntopng/ntopng-3.8.ebuild deleted file mode 100644 index adb578b7ff8b..000000000000 --- a/net-analyzer/ntopng/ntopng-3.8.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools user toolchain-funcs - -DESCRIPTION="Network traffic analyzer with web interface" -HOMEPAGE="https://www.ntop.org/" -SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-db/sqlite:3 - dev-python/pyzmq - dev-lang/luajit:2 - dev-libs/json-c:= - dev-libs/geoip - dev-libs/glib:2 - dev-libs/hiredis - dev-libs/libsodium:= - dev-libs/libxml2 - dev-libs/libmaxminddb - net-analyzer/rrdtool - net-libs/libpcap - >=net-libs/nDPI-2.4 - net-misc/curl - sys-libs/binutils-libs - dev-db/mysql-connector-c:=" -RDEPEND="${DEPEND} - dev-db/redis" -PATCHES=( - "${FILESDIR}"/${P}-mysqltool.patch - "${FILESDIR}"/${P}-ndpi-includes.patch - "${FILESDIR}"/${P}-missing-min.patch - "${FILESDIR}"/${P}-ndpi-call.patch -) - -src_prepare() { - default - sed -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" -e "s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" > configure.ac - eapply_user - eautoreconf -} - -src_install() { - SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} - doins -r httpdocs - doins -r scripts - - dodir ${SHARE_NTOPNG_DIR}/third-party - insinto ${SHARE_NTOPNG_DIR}/third-party - doins -r third-party/i18n.lua-master - doins -r third-party/lua-resty-template-master - - exeinto /usr/bin - doexe ${PN} - doman ${PN}.8 - - newinitd "${FILESDIR}/ntopng.init.d" ntopng - newconfd "${FILESDIR}/ntopng.conf.d" ntopng - - dodir "/var/lib/ntopng" - fowners ntopng "/var/lib/ntopng" -} - -pkg_setup() { - enewuser ntopng -} - -pkg_postinst() { - elog "ntopng default credentials are user='admin' password='admin'" -} -- cgit v1.2.3