jer 14/07/15 18:37:20
Modified: ntop-4.1.0-gentoo.patch ntop-5.0.1-gentoo.patch
ntop-4.0.3-gentoo.patch
Log:
Clean up patches.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.2 net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch?r1=1.1&r2=1.2
Index: ntop-4.1.0-gentoo.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/ntop/files/ntop-4.1.0-gentoo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntop-4.1.0-gentoo.patch 8 Nov 2011 22:47:02 -0000 1.1
+++ ntop-4.1.0-gentoo.patch 15 Jul 2014 18:37:19 -0000 1.2
@@ -1,6 +1,5 @@
-diff -Nru ntop-4.1.0.orig//configure.in ntop-4.1.0/configure.in
---- ntop-4.1.0.orig//configure.in 2011-08-15 10:34:28.000000000 +0200
-+++ ntop-4.1.0/configure.in 2011-11-08 23:22:13.000000000 +0100
+--- a/configure.in
++++ b/configure.in
@@ -469,11 +469,6 @@
LOCALEDIR="/usr/lib/locale"
fi
@@ -54,9 +53,8 @@
AC_SUBST(GETOPT_H)
AC_SUBST(GETOPT_C)
-diff -Nru ntop-4.1.0.orig//globals-core.c ntop-4.1.0/globals-core.c
---- ntop-4.1.0.orig//globals-core.c 2011-03-03 22:00:04.000000000 +0100
-+++ ntop-4.1.0/globals-core.c 2011-11-08 23:22:13.000000000 +0100
+--- a/globals-core.c
++++ b/globals-core.c
@@ -367,7 +367,7 @@
_mtuSize[DLT_ATM_RFC1483] = 9180 /* LLC/SNAP
encapsulated atm */;
_headerSize[DLT_ATM_RFC1483] = 0;
@@ -111,9 +109,8 @@
}
}
}
-diff -Nru ntop-4.1.0.orig//Makefile.am ntop-4.1.0/Makefile.am
---- ntop-4.1.0.orig//Makefile.am 2011-03-03 14:44:59.000000000 +0100
-+++ ntop-4.1.0/Makefile.am 2011-11-08 23:22:42.000000000 +0100
+--- a/Makefile.am
++++ b/Makefile.am
@@ -36,7 +36,6 @@
#AM_CFLAGS =
@@ -230,9 +227,8 @@
# ntop census
census-fail:
-diff -Nru ntop-4.1.0.orig//report.c ntop-4.1.0/report.c
---- ntop-4.1.0.orig//report.c 2011-06-29 18:29:46.000000000 +0200
-+++ ntop-4.1.0/report.c 2011-11-08 23:22:13.000000000 +0100
+--- a/report.c
++++ b/report.c
@@ -2091,7 +2091,7 @@
if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
snprintf(dotPath, sizeof(dotPath), "%s", buf);
1.2 net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch?r1=1.1&r2=1.2
Index: ntop-5.0.1-gentoo.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/ntop/files/ntop-5.0.1-gentoo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntop-5.0.1-gentoo.patch 4 Jul 2013 12:47:51 -0000 1.1
+++ ntop-5.0.1-gentoo.patch 15 Jul 2014 18:37:20 -0000 1.2
@@ -1,5 +1,5 @@
---- ntop-5.0.1/configure.in
-+++ ntop-5.0.1/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -469,11 +469,6 @@
LOCALEDIR="/usr/lib/locale"
fi
@@ -53,8 +53,8 @@
AC_SUBST(GETOPT_H)
AC_SUBST(GETOPT_C)
AC_SUBST(NDPI_LIB)
---- ntop-5.0.1/globals-core.c
-+++ ntop-5.0.1/globals-core.c
+--- a/globals-core.c
++++ b/globals-core.c
@@ -369,7 +369,7 @@
_mtuSize[DLT_ATM_RFC1483] = 9180 /* LLC/SNAP
encapsulated atm */;
_headerSize[DLT_ATM_RFC1483] = 0;
@@ -109,8 +109,8 @@
}
}
}
---- ntop-5.0.1/Makefile.am
-+++ ntop-5.0.1/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -36,7 +36,6 @@
#AM_CFLAGS =
@@ -227,8 +227,8 @@
# ntop census
census-fail:
---- ntop-5.0.1/report.c
-+++ ntop-5.0.1/report.c
+--- a/report.c
++++ b/report.c
@@ -2299,7 +2299,7 @@
if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
snprintf(dotPath, sizeof(dotPath), "%s", buf);
1.3 net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch?r1=1.2&r2=1.3
Index: ntop-4.0.3-gentoo.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/ntop/files/ntop-4.0.3-gentoo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ntop-4.0.3-gentoo.patch 10 Aug 2011 07:05:34 -0000 1.2
+++ ntop-4.0.3-gentoo.patch 15 Jul 2014 18:37:20 -0000 1.3
@@ -1,5 +1,5 @@
---- ntop-4.0.3.orig/configure.in
-+++ ntop-4.0.3/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -57,6 +57,7 @@
dnl>
umask 002
@@ -63,8 +63,8 @@
AC_SUBST(GETOPT_H)
AC_SUBST(GETOPT_C)
---- ntop-4.0.3.orig/globals-core.c
-+++ ntop-4.0.3/globals-core.c
+--- a/globals-core.c
++++ b/globals-core.c
@@ -372,7 +372,7 @@
_mtuSize[DLT_ATM_RFC1483] = 9180 /* LLC/SNAP
encapsulated atm */;
_headerSize[DLT_ATM_RFC1483] = 0;
@@ -119,8 +119,8 @@
}
}
}
---- ntop-4.0.3.orig/Makefile.am
-+++ ntop-4.0.3/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -43,7 +43,6 @@
#AM_CFLAGS =
@@ -219,8 +219,8 @@
# ntop census
census-fail:
---- ntop-4.0.3.orig/report.c
-+++ ntop-4.0.3/report.c
+--- a/report.c
++++ b/report.c
@@ -2353,7 +2353,7 @@
if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
snprintf(dotPath, sizeof(dotPath), "%s", buf);