* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/
@ 2016-04-26 11:56 Slawek Lis
0 siblings, 0 replies; 6+ messages in thread
From: Slawek Lis @ 2016-04-26 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 112d5999d85b36db4a7443df08e21df5f2e579f7
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 11:56:43 2016 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 11:56:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=112d5999
added missing patch (#581256)
Package-Manager: portage-2.2.28
.../ntopng/files/ntopng-2.0-dont-build-ndpi.patch | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/net-analyzer/ntopng/files/ntopng-2.0-dont-build-ndpi.patch b/net-analyzer/ntopng/files/ntopng-2.0-dont-build-ndpi.patch
new file mode 100644
index 0000000..b189cba
--- /dev/null
+++ b/net-analyzer/ntopng/files/ntopng-2.0-dont-build-ndpi.patch
@@ -0,0 +1,16 @@
+--- configure.ac.old 2016-04-25 21:29:36.452888380 +0200
++++ configure.ac 2016-04-25 21:30:04.679554971 +0200
+@@ -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 :
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/
@ 2017-01-15 9:50 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-01-15 9:50 UTC (permalink / raw
To: gentoo-commits
commit: 470c92bbd3101545ce507f4f125e22b74b4a1b72
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jan 15 09:10:20 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 09:49:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=470c92bb
net-analyzer/ntopng: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3487
.../ntopng/files/ntopng-2.0-dont-build-ndpi.patch | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/net-analyzer/ntopng/files/ntopng-2.0-dont-build-ndpi.patch b/net-analyzer/ntopng/files/ntopng-2.0-dont-build-ndpi.patch
deleted file mode 100644
index b189cba..00000000
--- a/net-analyzer/ntopng/files/ntopng-2.0-dont-build-ndpi.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.ac.old 2016-04-25 21:29:36.452888380 +0200
-+++ configure.ac 2016-04-25 21:30:04.679554971 +0200
-@@ -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 :
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/
@ 2017-06-20 6:16 Slawek Lis
0 siblings, 0 replies; 6+ messages in thread
From: Slawek Lis @ 2017-06-20 6:16 UTC (permalink / raw
To: gentoo-commits
commit: 95791999df7cec9742de97dd87e0ecb3afeb1d94
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 20 06:16:20 2017 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 06:16:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95791999
net-analyzer/ntopng: added missing files
Reported in 581256
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-analyzer/ntopng/files/configure-3.0.patch | 62 ++++++++++++++++++++++
.../ntopng/files/ntopng-3.0-mysqltool.patch | 17 ++++++
2 files changed, 79 insertions(+)
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/
@ 2017-12-11 9:26 Slawek Lis
0 siblings, 0 replies; 6+ messages in thread
From: Slawek Lis @ 2017-12-11 9:26 UTC (permalink / raw
To: gentoo-commits
commit: 4b9aefe0775d3f55aa7f7adb453aa3d5d839e0db
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 09:26:13 2017 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 09:26:13 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b9aefe0
net-analyzer/ntopng: fixed wrong patch filename
Package-Manager: Portage-2.3.16, Repoman-2.3.6
.../ntopng/files/{pointer-cmp.patch => ntopng-3.0-pointer-cmp.patch} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-analyzer/ntopng/files/pointer-cmp.patch b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
similarity index 100%
rename from net-analyzer/ntopng/files/pointer-cmp.patch
rename to net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/
@ 2018-10-05 14:25 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2018-10-05 14:25 UTC (permalink / raw
To: gentoo-commits
commit: e85a03b53d10d92169fc7c8ead73fba1acade498
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 5 12:48:38 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Oct 5 14:25:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e85a03b5
net-analyzer/ntopng: Clean up patches.
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch | 2 +-
net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
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
index ec628cd3224..ef40c72d589 100644
--- a/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
+++ b/net-analyzer/ntopng/files/ntopng-2.4-dont-build-ndpi.patch
@@ -1,4 +1,4 @@
---- a/configure.ac.old
+--- a/configure.ac
+++ b/configure.ac
@@ -62,13 +62,6 @@
fi
diff --git a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
index 11fb47ca385..171bee36e89 100644
--- a/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
+++ b/net-analyzer/ntopng/files/ntopng-3.0-pointer-cmp.patch
@@ -1,6 +1,5 @@
-diff -Naur ntopng-3.0-orig/src/AddressResolution.cpp ntopng-3.0/src/AddressResolution.cpp
---- ntopng-3.0-orig/src/AddressResolution.cpp 2017-06-01 00:18:57.000000000 -0700
-+++ ntopng-3.0/src/AddressResolution.cpp 2017-11-27 23:13:50.158163187 -0800
+--- a/src/AddressResolution.cpp
++++ b/src/AddressResolution.cpp
@@ -52,7 +52,7 @@
u_int numeric_ip_len;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/
@ 2019-12-28 12:12 Jeroen Roovers
0 siblings, 0 replies; 6+ messages in thread
From: Jeroen Roovers @ 2019-12-28 12:12 UTC (permalink / raw
To: gentoo-commits
commit: fe1f58ff9b07d7d7792a7b2786b5a97eb500b3bd
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 12:11:40 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 12:12:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe1f58ff
net-analyzer/ntopng: Clean up patch
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 068f1e9fa9b..cdd5e827147 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-12-28 12:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-05 14:25 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ntopng/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2019-12-28 12:12 Jeroen Roovers
2017-12-11 9:26 Slawek Lis
2017-06-20 6:16 Slawek Lis
2017-01-15 9:50 David Seifert
2016-04-26 11:56 Slawek Lis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox