[gentoo-commits] gentoo-x86 commit in net-analyzer/ntop/files: ntop-initd ntop-3.3.6-gentoo.patch

[Alin Nastac (mrness)]

mrness      08/07/04 23:44:21

  Modified:             ntop-initd
  Added:                ntop-3.3.6-gentoo.patch
  Log:
  Version bump.
  Fix init script (#191576).
  Fix broken ebuild when locales use other chars than ASCII (#205382).
  Fix libtool dependency (#221623).
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.2                  net-analyzer/ntop/files/ntop-initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-initd?r1=1.1&r2=1.2

Index: ntop-initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ntop/files/ntop-initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntop-initd	24 Jul 2007 21:13:25 -0000	1.1
+++ ntop-initd	4 Jul 2008 23:44:21 -0000	1.2
@@ -17,12 +17,13 @@
 start() {
 	checkconfig || return 1
 	ebegin "Starting ntop"
+	LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
 	start-stop-daemon --start --exec /usr/bin/ntop -- -d -L ${NTOP_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ntop"
-	start-stop-daemon --stop --retry 5 --pidfile /var/lib/ntop/ntop.pid
+	start-stop-daemon --stop --retry 30 --pidfile /var/run/ntop.pid
 	eend $?
 }



1.1                  net-analyzer/ntop/files/ntop-3.3.6-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-3.3.6-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-3.3.6-gentoo.patch?rev=1.1&content-type=text/plain

Index: ntop-3.3.6-gentoo.patch
===================================================================
diff -Nru ntop.orig/configure.in ntop/configure.in
--- ntop.orig/configure.in	2008-06-04 09:29:06.000000000 +0200
+++ ntop/configure.in	2008-07-05 00:40:53.000000000 +0200
@@ -515,13 +515,6 @@
     LOCALEDIR="/usr/lib/locale"
 fi
 
-dnl> Add /usr/local/
-CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include"
-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
-LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
-
-
-
 echo
 echo "Test the compiler and setup CFLAGS..."
 echo
diff -Nru ntop.orig/globals-core.c ntop/globals-core.c
--- ntop.orig/globals-core.c	2007-11-24 19:26:29.000000000 +0100
+++ ntop/globals-core.c	2008-07-05 00:48:09.000000000 +0200
@@ -427,7 +427,7 @@
   _mtuSize[DLT_ATM_RFC1483] = 9180                             /* LLC/SNAP encapsulated atm */;
   _headerSize[DLT_ATM_RFC1483] = 0;
 
-  /* _mtuSize[DLT_RAW] = ?                                        raw IP */
+  _mtuSize[DLT_RAW] = 1500                                     /*   raw IP */;
   _headerSize[DLT_RAW] = 0;
 
   /* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE
diff -Nru ntop.orig/report.c ntop/report.c
--- ntop.orig/report.c	2008-04-05 17:56:58.000000000 +0200
+++ ntop/report.c	2008-07-05 01:09:36.000000000 +0200
@@ -2301,7 +2301,7 @@
   if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
     snprintf(dotPath, sizeof(dotPath), "%s", buf);
   } else {
-    snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
+    snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
     storePrefsValue("dot.path", dotPath); /* Set the default */
   }
 



-- 
gentoo-commits@l.g.o mailing list