summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlawomir Lis <slis@gentoo.org>2017-06-20 08:16:20 +0200
committerSlawomir Lis <slis@gentoo.org>2017-06-20 08:16:20 +0200
commit95791999df7cec9742de97dd87e0ecb3afeb1d94 (patch)
treeff25d008705a7925aee2e9fc69483619c08fc59a
parentdev-ruby/listen: add ruby24 (diff)
downloadgentoo-95791999df7cec9742de97dd87e0ecb3afeb1d94.tar.gz
gentoo-95791999df7cec9742de97dd87e0ecb3afeb1d94.tar.bz2
gentoo-95791999df7cec9742de97dd87e0ecb3afeb1d94.zip
net-analyzer/ntopng: added missing files
Reported in 581256 Package-Manager: Portage-2.3.6, Repoman-2.3.2
-rw-r--r--net-analyzer/ntopng/files/configure-3.0.patch62
-rw-r--r--net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch17
2 files changed, 79 insertions, 0 deletions
diff --git a/net-analyzer/ntopng/files/configure-3.0.patch b/net-analyzer/ntopng/files/configure-3.0.patch
new file mode 100644
index 00000000000..a2476f5b407
--- /dev/null
+++ b/net-analyzer/ntopng/files/configure-3.0.patch
@@ -0,0 +1,62 @@
+--- configure.ac.orig 2017-06-09 06:47:34.214516588 +0200
++++ configure.ac 2017-06-09 06:48:01.547849759 +0200
+@@ -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"
+--- configure.ac.orig 2017-06-09 09:58:17.021114895 +0200
++++ configure.ac 2017-06-09 09:58:24.227781519 +0200
+@@ -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
new file mode 100644
index 00000000000..e433f4e9559
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-3.0-mysqltool.patch
@@ -0,0 +1,17 @@
+--- configure.ac.orig 2017-06-09 09:52:26.387783657 +0200
++++ configure.ac 2017-06-09 09:54:53.361116113 +0200
+@@ -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