| 1 |
mrness 08/10/05 13:08:45 |
| 2 |
|
| 3 |
Modified: ntop-initd |
| 4 |
Added: ntop-3.3.8-gentoo.patch |
| 5 |
Removed: ntop-3.3-build.patch |
| 6 |
Log: |
| 7 |
Version bump. |
| 8 |
Fix QA warnings (#237812). |
| 9 |
Add corefonts run-time dependency (#231705). |
| 10 |
(Portage version: 2.1.4.4) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.3 net-analyzer/ntop/files/ntop-initd |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-initd?rev=1.3&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-initd?rev=1.3&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-initd?r1=1.2&r2=1.3 |
| 18 |
|
| 19 |
Index: ntop-initd |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/ntop/files/ntop-initd,v |
| 22 |
retrieving revision 1.2 |
| 23 |
retrieving revision 1.3 |
| 24 |
diff -u -r1.2 -r1.3 |
| 25 |
--- ntop-initd 4 Jul 2008 23:44:21 -0000 1.2 |
| 26 |
+++ ntop-initd 5 Oct 2008 13:08:45 -0000 1.3 |
| 27 |
@@ -17,7 +17,8 @@ |
| 28 |
start() { |
| 29 |
checkconfig || return 1 |
| 30 |
ebegin "Starting ntop" |
| 31 |
- LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382) |
| 32 |
+ export LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382) |
| 33 |
+ export GDFONTPATH=/usr/share/fonts/corefonts # apparently the only font that works (#231705) |
| 34 |
start-stop-daemon --start --exec /usr/bin/ntop -- -d -L ${NTOP_OPTS} |
| 35 |
eend $? |
| 36 |
} |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.1 net-analyzer/ntop/files/ntop-3.3.8-gentoo.patch |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-3.3.8-gentoo.patch?rev=1.1&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/ntop/files/ntop-3.3.8-gentoo.patch?rev=1.1&content-type=text/plain |
| 44 |
|
| 45 |
Index: ntop-3.3.8-gentoo.patch |
| 46 |
=================================================================== |
| 47 |
diff -ur ntop-3.3.8.orig/configure.in ntop-3.3.8/configure.in |
| 48 |
--- ntop-3.3.8.orig/configure.in 2008-10-02 10:54:15.000000000 +0000 |
| 49 |
+++ ntop-3.3.8/configure.in 2008-10-05 10:39:47.000000000 +0000 |
| 50 |
@@ -504,13 +504,6 @@ |
| 51 |
LOCALEDIR="/usr/lib/locale" |
| 52 |
fi |
| 53 |
|
| 54 |
-dnl> Add /usr/local/ |
| 55 |
-CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include" |
| 56 |
-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include" |
| 57 |
-LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib" |
| 58 |
- |
| 59 |
- |
| 60 |
- |
| 61 |
echo |
| 62 |
echo "Test the compiler and setup CFLAGS..." |
| 63 |
echo |
| 64 |
diff -ur ntop-3.3.8.orig/globals-core.c ntop-3.3.8/globals-core.c |
| 65 |
--- ntop-3.3.8.orig/globals-core.c 2008-10-01 21:03:36.000000000 +0000 |
| 66 |
+++ ntop-3.3.8/globals-core.c 2008-10-05 10:39:47.000000000 +0000 |
| 67 |
@@ -424,7 +424,7 @@ |
| 68 |
_mtuSize[DLT_ATM_RFC1483] = 9180 /* LLC/SNAP encapsulated atm */; |
| 69 |
_headerSize[DLT_ATM_RFC1483] = 0; |
| 70 |
|
| 71 |
- /* _mtuSize[DLT_RAW] = ? raw IP */ |
| 72 |
+ _mtuSize[DLT_RAW] = 1500 /* raw IP */; |
| 73 |
_headerSize[DLT_RAW] = 0; |
| 74 |
|
| 75 |
/* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE |
| 76 |
diff -ur ntop-3.3.8.orig/report.c ntop-3.3.8/report.c |
| 77 |
--- ntop-3.3.8.orig/report.c 2008-08-17 21:06:33.000000000 +0000 |
| 78 |
+++ ntop-3.3.8/report.c 2008-10-05 10:39:47.000000000 +0000 |
| 79 |
@@ -2301,7 +2301,7 @@ |
| 80 |
if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) { |
| 81 |
snprintf(dotPath, sizeof(dotPath), "%s", buf); |
| 82 |
} else { |
| 83 |
- snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot"); |
| 84 |
+ snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot"); |
| 85 |
storePrefsValue("dot.path", dotPath); /* Set the default */ |
| 86 |
} |
Archives