Hello community,
here is the log from the commit of package ntop for openSUSE:Factory
checked in at Thu Aug 13 18:45:50 CEST 2009.
--------
--- ntop/ntop.changes 2008-05-09 16:07:54.000000000 +0200
+++ ntop/ntop.changes 2009-08-13 15:08:38.000000000 +0200
@@ -1,0 +2,19 @@
+Thu Aug 13 15:03:17 CEST 2009 - bg@suse.de
+
+- use %configure
+- fix two warnings about array subscript is above array bounds
+
+-------------------------------------------------------------------
+Fri Aug 7 10:03:14 CEST 2009 - bg@suse.de
+
+- change BuildRequires for 11.0 and 10.3
+
+-------------------------------------------------------------------
+Thu Aug 6 15:30:58 CEST 2009 - bg@suse.de
+
+- Update to version 3.3.10
+- Fixes for bugs #333436 (does not show up in new version), #375967,
+ #422006, #432617 (does not show up in new version), #477996,
+ #477997 and 528585
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ntop-3.3.diff
ntop-3.3.tar.bz2
New:
----
etter.finger.os.gz
ntop-3.3.10.diff
ntop-3.3.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ntop.spec ++++++
--- /var/tmp/diff_new_pack.bspf0A/_old 2009-08-13 18:44:27.000000000 +0200
+++ /var/tmp/diff_new_pack.bspf0A/_new 2009-08-13 18:44:27.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ntop (Version 3.3)
+# spec file for package ntop (Version 3.3.10)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,15 @@
Name: ntop
-BuildRequires: dos2unix freetype2-devel gcc-c++ gd-devel gdbm-devel libart_lgpl-devel libjpeg-devel libpng-devel lsof mysql-devel net-snmp-devel openssl-devel readline-devel
+BuildRequires: dos2unix freetype2-devel gcc-c++ gd-devel gdbm-devel libGeoIP-devel libart_lgpl-devel libjpeg-devel libpng-devel lsof lua-devel mysql-devel net-snmp-devel openssl-devel readline-devel
%if 0%{?suse_version}
BuildRequires: tcpd-devel xorg-x11-devel
PreReq: /bin/cat %fillup_prereq %insserv_prereq sysconfig
+%if 0%{?suse_version} > 1100
+BuildRequires: libevent-devel
+%else
+BuildRequires: libevent
+%endif
%if 0%{?suse_version} > 1020
BuildRequires: fdupes libpcap-devel rrdtool-devel
%else
@@ -42,14 +47,28 @@
License: GPL v2 or later
Group: Productivity/Networking/Diagnostic
AutoReqProv: on
-Version: 3.3
-Release: 122
+Version: 3.3.10
+Release: 1
+#
+%define pkg_name ntop
+%define pkg_user ntop
+%define pkg_home /var/lib/%{pkg_name}
+#
+%define _localstatedir /var/lib
+#
+%if "%(xft-config --prefix)" == "/usr"
+%define xorg_libdir %{_libdir}
+%else
+%define xorg_cflags -L/usr/X11R6/%_lib -I/usr/X11R6/include
+%define xorg_libdir /usr/X11R6/%_lib
+%endif
Summary: Web-Based Network Traffic Monitor
Source: %{name}-%{version}.tar.bz2
Source2: rcntop
Source3: rc.config.ntop
Source4: passcheck.c
Source5: README.SuSE
+Source6: etter.finger.os.gz
Patch: ntop-%{version}.diff
Patch2: rrdPlugin.diff
Patch4: dotpath.diff
@@ -73,6 +92,7 @@
%patch2
%patch4
%patch5
+cp %SOURCE6 .
%build
%{?suse_update_config:%{suse_update_config -f gdchart* ntop . }}
@@ -80,47 +100,19 @@
./autogen.sh
# NTOP_AUTOREBUILD=yes ./configure || echo "new autoconf prepared"
# now we are ready for the real configure...
-%if "%(xft-config --prefix)" == "/usr"
-CFLAGS="$RPM_OPT_FLAGS -DHAVE_NCURSES_H" \
-./configure \
- --sysconfdir=/etc \
- --prefix=/usr \
- --mandir=%{_mandir} \
- --localstatedir=/var/lib \
- --libdir=%{_libdir} \
- --datadir=%{_datadir} \
- --x-libraries=/usr/%_lib \
+CFLAGS="$RPM_OPT_FLAGS -DHAVE_NCURSES_H %{?xorg_cflags}" \
+%configure \
+ --x-libraries=%{xorg_libdir} \
--disable-static \
--enable-sslv3 \
--enable-i18n
-%else
-CFLAGS="$RPM_OPT_FLAGS -DHAVE_NCURSES_H -L/usr/X11R6/%_lib -I/usr/X11R6/include" \
-./configure \
- --sysconfdir=/etc \
- --prefix=/usr \
- --mandir=%{_mandir} \
- --localstatedir=/var/lib \
- --libdir=%{_libdir} \
- --datadir=%{_datadir} \
- --x-libraries=/usr/X11R6/%_lib \
- --disable-static \
- --enable-sslv3 \
- --enable-i18n
-%endif
make %{?jobs:-j%jobs}
gcc -o passcheck $RPM_OPT_FLAGS %{SOURCE4} -lgdbm
%install
# remove old (pre SuSE Linux 7.0) README.Suse provided by ntop
rm -f docs/README.Suse
-mkdir -p $RPM_BUILD_ROOT/etc
-DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
-# use the relinked librrdPlugin.so instead of the copied plugin
-cp $RPM_BUILD_ROOT%{_libdir}/librrdPlugin.so \
- $RPM_BUILD_ROOT%{_libdir}/ntop/plugins/rrdPlugin.so
-# rm $RPM_BUILD_ROOT%{_libdir}/ntop/plugins/rrdPlugin.so
-make install-man DESTDIR=$RPM_BUILD_ROOT
-make install-data-as DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install install-man
chmod 644 $RPM_BUILD_ROOT/etc/ntop/oui.txt.gz
chmod 644 $RPM_BUILD_ROOT/etc/ntop/specialMAC.txt.gz
install -d $RPM_BUILD_ROOT/etc/init.d/
@@ -130,8 +122,8 @@
ln -sf ../../etc/init.d/ntop $RPM_BUILD_ROOT/usr/sbin/rcntop
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.ntop
install -m 755 passcheck $RPM_BUILD_ROOT/usr/sbin/passcheck
-mkdir -p $RPM_BUILD_ROOT/var/lib/ntop
-cp ntop-cert.pem docs/
+mkdir -p $RPM_BUILD_ROOT%{pkg_home}/rrd
+# Get README.SuSE
cp %SOURCE5 .
find $RPM_BUILD_ROOT/usr/share/ntop/html -type f -print0 | xargs -0 chmod 644
%if 0%{?suse_version} > 1020
@@ -141,6 +133,15 @@
rm docs/ntop-autotools.vsd
dos2unix docs/RedHat-rpmbuild-HOWTO.txt
+%pre
+/usr/sbin/groupadd -r %{pkg_user} &>/dev/null ||:
+/usr/sbin/useradd -g %{pkg_user} -s /bin/false -r -c "user for %{pkg_user}" -d %{pkg_home} %{pkg_user} &>/dev/null ||:
+
+%preun
+%if 0%{?suse_version} > 1020
+%stop_on_removal
+%endif
+
%post
# Are we in update mode?
if [ ${1:-0} -gt 1 ]; then
@@ -148,11 +149,10 @@
echo "Renaming config file ntopd to ntop"
mv etc/sysconfig/ntopd etc/sysconfig/ntop
fi
+# change user wwwrun to user ntop
+ sed -i -e 's/^[[:space:]]*NTOP_USER=\"wwwrun\"/NTOP_USER=\"ntop\"/' /etc/sysconfig/ntop
+ chown -R %{pkg_user}:%{pkg_user} %{pkg_home}/rrd
fi
-chown wwwrun:www /usr/share/ntop /var/lib/ntop
-%if 0%{?suse_version} > 1010
-etc/sysconfig/network/scripts/hwdesc2iface etc/sysconfig/ntop NTOPD_IFACE
-%endif
/sbin/ldconfig
%{fillup_and_insserv -n ntop ntop }
@@ -168,23 +168,22 @@
%doc docs/* AUTHORS CONTENTS COPYING ChangeLog MANIFESTO NEWS PORTING
%doc SUPPORT_NTOP.txt THANKS README.SuSE
%config /etc/init.d/ntop
-/usr/bin/ntop
+%{_bindir}/ntop
%{_libdir}/lib*.so
-/usr/sbin/rcntop
-/usr/sbin/passcheck
-%dir %attr(-,wwwrun,www) /usr/share/ntop
-/usr/share/ntop/html
+%{_sbindir}/rcntop
+%{_sbindir}/passcheck
+%dir %attr(-,%{pkg_user},%{pkg_user}) %{_datadir}/ntop
+%{_datadir}/ntop/html
+%{_datadir}/ntop/perl
%dir %{_libdir}/ntop
%{_libdir}/ntop/plugins
%{_mandir}/man8/ntop.8.*
/var/adm/fillup-templates/sysconfig.ntop
-%dir %attr(-,wwwrun,www) /var/lib/ntop
+%dir %attr(-,%{pkg_user},%{pkg_user}) %{pkg_home}
+%dir %attr(-,%{pkg_user},%{pkg_user}) %{pkg_home}/rrd
%dir /etc/ntop
-/etc/ntop/ntop-cert.pem
-/etc/ntop/AS-list.txt.gz
-/etc/ntop/etter.finger.os.gz
-/etc/ntop/oui.txt.gz
-/etc/ntop/p2c.opt.table.gz
-/etc/ntop/specialMAC.txt.gz
+%config /etc/ntop/oui.txt.gz
+%config /etc/ntop/specialMAC.txt.gz
+%config /etc/ntop/etter.finger.os.gz
%changelog
++++++ dotpath.diff ++++++
--- /var/tmp/diff_new_pack.bspf0A/_old 2009-08-13 18:44:27.000000000 +0200
+++ /var/tmp/diff_new_pack.bspf0A/_new 2009-08-13 18:44:27.000000000 +0200
@@ -1,11 +1,10 @@
---- report.c
-+++ report.c
-@@ -2302,7 +2302,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 */
- }
-
+--- report.c.orig 2009-05-21 21:55:11.000000000 +0000
++++ report.c 2009-07-21 07:52:20.000000000 +0000
+@@ -2305,7 +2305,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 */
+ }
++++++ ntop-3.3.diff -> ntop-3.3.10.diff ++++++
--- ntop/ntop-3.3.diff 2007-08-07 09:36:10.000000000 +0200
+++ ntop/ntop-3.3.10.diff 2009-08-13 15:08:37.000000000 +0200
@@ -1,14 +1,3 @@
---- ssl.c 2006/01/26 12:55:30 1.1
-+++ ssl.c 2006/01/26 12:55:59
-@@ -304,7 +304,7 @@
- int term_ssl_connection(int fd) {
- int i, rc;
-
-- if(!myGlobals.sslInitialized) return;
-+ if(!myGlobals.sslInitialized) return 0;
-
- for(i=0; ialias[MAX_LEN_SYM_HOST_NAME-1] = '\0';
}
}
---- graph.c 2006/01/26 12:47:15 1.1
-+++ graph.c 2006/01/26 12:47:54
-@@ -2635,7 +2635,7 @@
+--- graph.c 2009/08/13 11:51:16 1.1
++++ graph.c 2009/08/13 11:51:54
+@@ -1508,13 +1508,11 @@
+ void drawVsanDomainTrafficDistribution(u_short vsanId, u_char dataSent) {
+ int i, idx=0, numEntries = 0;
+ FcFabricElementHash *hash;
+- float p[MAX_VSANS_GRAPHED+1];
++ float p[MAX_VSANS_GRAPHED+1] = {0};
+ char *lbl[MAX_VSANS_GRAPHED+1], labels[MAX_VSANS_GRAPHED+1][8];
Counter total;
SortedFcDomainStatsEntry *fcDomainStats;
- p[MAX_FC_DOMAINS+1] = 0;
-+ p[MAX_FC_DOMAINS] = 0;
-
+-
hash = getFcFabricElementHash (vsanId, myGlobals.actualReportDeviceId);
---- pbuf.c 2006/01/26 12:47:57 1.1
-+++ pbuf.c 2006/01/26 12:55:21
-@@ -3232,15 +3232,15 @@
+ if (hash == NULL) {
+--- pbuf.c.orig 2009-05-06 14:55:22.000000000 +0000
++++ pbuf.c 2009-08-05 09:06:35.000000000 +0000
+@@ -3447,14 +3447,14 @@
&& (ipxBuffer[30] == 0x0) /* SAP Response (byte 0) */
&& (ipxBuffer[31] == 0x02) /* SAP Response (byte 1) */) {
u_int16_t serverType;
@@ -41,7 +36,6 @@
int i, found;
memcpy(&serverType, &ipxBuffer[32], 2);
-
serverType = ntohs(serverType);
- memcpy(serverName, &ipxBuffer[34], 56); serverName[56] = '\0';
@@ -51,17 +45,15 @@
if(serverName[i] == '!') {
serverName[i] = '\0';
break;
---- traffic.c 2005/11/04 13:01:06 1.1
-+++ traffic.c 2005/11/04 13:05:28
-@@ -548,7 +548,7 @@
- /* ******************************* */
-
- unsigned int matrixHostHash(HostTraffic *host, int actualDeviceId, int rehash) {
-- unsigned long hash;
-+ unsigned long hash=0;
- char tmpBuf[80], *str;
- int c;
-
+@@ -3622,7 +3622,7 @@
+ memcpy(nodeName, &p1[7+p1[5+displ]+displ], p1[6+p1[5+displ]+displ]);
+ nodeName[p1[6+p1[5+displ]]] = '\0';
+
+- for(i=0; inonIPTraffic->atNodeType[i] == NULL)
+ || (strcmp(srcHost->nonIPTraffic->atNodeType[i], nodeName) == 0))
+ break;
--- fcReport.c 2006/03/20 13:55:38 1.1
+++ fcReport.c 2006/03/20 13:59:50
@@ -4066,7 +4066,7 @@
@@ -114,24 +106,6 @@
@if test -f libnetflowPlugin_la-netflowPlugin.o; then \
$(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ libnetflowPlugin_la-netflowPlugin.o; \
else \
-@@ -131,7 +131,7 @@
-
- ###############
-
--.libs/libpdaPlugin.so@SO_VERSION_PATCH@:
-+.libs/libpdaPlugin.so@SO_VERSION_PATCH@: pdaPlugin.o
- @if test -f libpdaPlugin_la-pdaPlugin.o; then \
- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libpdaPlugin.so@SO_VERSION_PATCH@ libpdaPlugin_la-pdaPlugin.o; \
- else \
-@@ -143,7 +143,7 @@
-
- ###############
-
--.libs/libremotePlugin.so@SO_VERSION_PATCH@:
-+.libs/libremotePlugin.so@SO_VERSION_PATCH@: remotePlugin.o
- @if test -f libremotePlugin_la-remotePlugin.o; then \
- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libremotePlugin.so@SO_VERSION_PATCH@ libremotePlugin_la-remotePlugin.o; \
- else \
@@ -155,7 +155,7 @@
###############
@@ -159,27 +133,200 @@
@if test -f libxmldumpPlugin_la-xmldumpPlugin.o; then \
$(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libxmldumpPlugin.so@SO_VERSION_PATCH@ libxmldumpPlugin_la-xmldumpPlugin.o; \
else \
---- report.c.orig 2007-06-09 20:23:00.000000000 +0000
-+++ report.c 2007-07-31 11:50:30.000000000 +0000
-@@ -6712,7 +6712,7 @@
-
- if((el == myGlobals.broadcastEntry) || (el->hostNumIpAddress == NULL)) continue;
-
-- if((key == NULL) || (key == "")) do_add = 1;
-+ if((key == NULL) || (key[0] == 0)) do_add = 1;
- else if(strstr(el->hostNumIpAddress, key)) do_add = 1;
- else if(strstr(el->ethAddressString, key)) do_add = 1;
- else if(strstr(el->hostResolvedName, key)) do_add = 1;
---- globals-core.h 2007/08/07 07:35:21 1.1
-+++ globals-core.h 2007/08/07 07:35:44
-@@ -256,10 +256,6 @@
+--- plugins/rrdPlugin.c 2009/08/06 12:24:07 1.1
++++ plugins/rrdPlugin.c 2009/08/06 12:24:15
+@@ -5035,7 +5035,7 @@
+ traceEvent(CONST_TRACE_INFO,
+ "THREADMGMT[t%lu]: RRD: Throughput data collection: Thread terminated [p%d]",
+ pthread_self(), getpid());
+- return(NULL);
++ return;
+ }
+
+ /* ****************************** */
+--- globals-core.h.orig 2009-04-17 11:58:52.000000000 +0000
++++ globals-core.h 2009-08-05 09:11:45.000000000 +0000
+@@ -254,10 +254,6 @@
#ifdef MAKE_WITH_SAFER_ROUTINES
-/* Fix to the free prototype courtesy of Tanner Lovelace */
-/* Fix free() courtesy of Benoit Dolez */
--#define free(a) { void *__t = (a); ntop_safefree((void**)&(__t), __FILE__, __LINE__); a = __t; }
+-#define free(a) { void *__t = (a); ntop_safefree((void**)&(__t), (char*)__FILE__, (int)__LINE__); a = __t; }
-extern void ntop_safefree(void **ptr, char* file, int line);
- #define malloc(sz) ntop_safemalloc(sz, __FILE__, __LINE__)
+ #define malloc(sz) ntop_safemalloc((unsigned int)sz, (char*)__FILE__, (int)__LINE__)
extern void* ntop_safemalloc(unsigned int sz, char* file, int line);
- #define calloc(c,sz) ntop_safecalloc(c, sz, __FILE__, __LINE__)
+ #define calloc(c,sz) ntop_safecalloc(c, sz, (char*)__FILE__, (int)__LINE__)
+--- configure.in 2009-05-06 14:55:22.000000000 +0000
++++ configure.in.new 2009-07-21 08:17:33.000000000 +0000
+@@ -1652,22 +1652,22 @@
+ dnl>
+ dnl> Lua - http://www.lua.org
+ dnl>
+-LUA_VERSION=lua-5.1.4
+-if test -f "$LUA_VERSION.tar.gz"; then
+- echo "Lua already present on this machine"
+-else
+- wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz
+-fi
+-
+-tar xvfz $LUA_VERSION.tar.gz
+-cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp
+-cat /tmp/lua.temp > $LUA_VERSION/src/Makefile
+-#rm -f /tmp/lua.temp
+-cd $LUA_VERSION; make posix; cd ..
+-
+-LUA_LIB_DIR=$PWD/$LUA_VERSION"/src"
+-LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} "
+-INCS="${INCS} -I${LUA_LIB_DIR}"
++dnl> LUA_VERSION=lua-5.1.4
++dnl> if test -f "$LUA_VERSION.tar.gz"; then
++dnl> echo "Lua already present on this machine"
++dnl> else
++dnl> wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz
++dnl> fi
++dnl>
++dnl> tar xvfz $LUA_VERSION.tar.gz
++dnl> cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp
++dnl> cat /tmp/lua.temp > $LUA_VERSION/src/Makefile
++dnl> #rm -f /tmp/lua.temp
++dnl> cd $LUA_VERSION; make posix; cd ..
++dnl>
++dnl> LUA_LIB_DIR=$PWD/$LUA_VERSION"/src"
++LIBS="-L$libdir -llua ${LIBS} "
++INCS="${INCS} -I/usr/include"
+ AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
+
+ dnl>
+@@ -1963,39 +1963,39 @@
+ fi
+
+ dnl> GeoIP (http://www.maxmind.com/)
+-if test -f "GeoIP.tar.gz"; then
+- echo "GeoIP already present on this machine"
+-else
+- wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
+-fi
+-tar xvfz GeoIP.tar.gz
+-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
+-cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
+-# OSX Fix
+-GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
+-if test -f $GEO_DYLIB; then
+- ln -s $GEO_DYLIB .
+-fi
+-
+-if test -f "GeoLiteCity.dat"; then
+- echo "GeoLiteCity.dat already present"
+-else
+- wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+- gunzip GeoLiteCity.dat.gz
+-fi
+-
+-if test -f "GeoIPASNum.dat"; then
+- echo "GeoIPASNum.dat already present"
+-else
+- wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+- gunzip GeoIPASNum.dat.gz
+-fi
+-
+-
++dnl> if test -f "GeoIP.tar.gz"; then
++dnl> echo "GeoIP already present on this machine"
++dnl> else
++dnl> wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
++dnl> fi
++dnl> tar xvfz GeoIP.tar.gz
++dnl> GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
++dnl> cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
++dnl> # OSX Fix
++dnl> GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
++dnl> if test -f $GEO_DYLIB; then
++dnl> ln -s $GEO_DYLIB .
++dnl> fi
++dnl>
++dnl> if test -f "GeoLiteCity.dat"; then
++dnl> echo "GeoLiteCity.dat already present"
++dnl> else
++dnl> wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
++dnl> gunzip GeoLiteCity.dat.gz
++dnl> fi
++dnl>
++dnl> if test -f "GeoIPASNum.dat"; then
++dnl> echo "GeoIPASNum.dat already present"
++dnl> else
++dnl> wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
++dnl> gunzip GeoIPASNum.dat.gz
++dnl> fi
++dnl>
++dnl>
+ GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
+-GEO_IP="$GEO_DIR/libGeoIP/"
++GEO_IP="/usr/include/"
+ CFLAGS="$CFLAGS -I$GEO_IP"
+-LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS"
++LDFLAGS="-L$libdir -lGeoIP $LDFLAGS"
+
+ dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
+
+--- autogen.sh 2009/08/05 08:56:13 1.1
++++ autogen.sh 2009/08/05 08:56:34
+@@ -247,15 +247,15 @@
+ GNU_OR_DIE=0
+ }
+
+-WGET=`find_command 'wget*'`
+-($WGET --version) < /dev/null > /dev/null 2>&1 ||
+-{
+- echo
+- echo "You must have wget installed to compile $progname."
+- echo "Download the appropriate package for your distribution, or get the"
+- echo "source tarball from ftp://ftp.gnu.org/pub/gnu/wget"
+- GNU_OR_DIE=0
+-}
++# WGET=`find_command 'wget*'`
++# ($WGET --version) < /dev/null > /dev/null 2>&1 ||
++# {
++# echo
++# echo "You must have wget installed to compile $progname."
++# echo "Download the appropriate package for your distribution, or get the"
++# echo "source tarball from ftp://ftp.gnu.org/pub/gnu/wget"
++# GNU_OR_DIE=0
++# }
+
+ if test "$GNU_OR_DIE" -eq 0; then
+ exit 1
+--- Makefile.am.orig 2009-04-17 20:27:57.000000000 +0000
++++ Makefile.am 2009-08-05 14:07:49.000000000 +0000
+@@ -73,12 +73,9 @@
+ ETTER_PASSIVE_DOWNLOAD_FROM = "http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share"
+ ETTER_PASSIVE_DOWNLOAD_PARMS = "rev=HEAD"
+
+-NTOPDATA = ntop-cert.pem \
+- $(ETTER_PASSIVE) \
++NTOPDATA = $(ETTER_PASSIVE) \
+ oui.txt.gz \
+- specialMAC.txt.gz \
+- GeoIPASNum.dat \
+- GeoLiteCity.dat
++ specialMAC.txt.gz
+
+ NTOPHTML = html html/*.js html/*.html html/*.gif html/*.jpg html/*.ico html/*.png \
+ html/*.css html/*.dtd \
+@@ -270,8 +266,6 @@
+
+ install: install-recursive
+
+- cd @GEO_DIR@; make install
+-
+ @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
+
+ @echo ""
+--- fcUtils.c 2009/08/06 13:13:40 1.1
++++ fcUtils.c 2009/08/06 13:13:51
+@@ -659,4 +659,5 @@
+ strncpy (&entry->alias[0], alias, MAX_LEN_SYM_HOST_NAME);
+ entry->alias[MAX_LEN_SYM_HOST_NAME-1] = '\0';
+ }
++ fclose(fd);
+ }
++++++ ntop-3.3.tar.bz2 -> ntop-3.3.10.tar.bz2 ++++++
++++ 98940 lines of diff (skipped)
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.bspf0A/_old 2009-08-13 18:44:29.000000000 +0200
+++ /var/tmp/diff_new_pack.bspf0A/_new 2009-08-13 18:44:29.000000000 +0200
@@ -8,7 +8,7 @@
# against files that we want to exclude.
#
-bad_files_re='dlcompat-[0-9]*/|APPLE_LICENSE|ntop_darwin.[ch]'
+bad_files_re='dlcompat-[0-9]*/|APPLE_LICENSE|ntop_darwin.[ch]|ntop-cert.pem'
for f in `ls *.tar.*`; do
case $f in
++++++ rc.config.ntop ++++++
--- /var/tmp/diff_new_pack.bspf0A/_old 2009-08-13 18:44:29.000000000 +0200
+++ /var/tmp/diff_new_pack.bspf0A/_new 2009-08-13 18:44:29.000000000 +0200
@@ -35,11 +35,11 @@
NTOPD_SSL_PORT=""
## Type: string
-## Default: "wwwrun"
+## Default: "ntop"
#
# define the user to run ntop. This should not be root!
#
-NTOP_USER="wwwrun"
+NTOP_USER="ntop"
## Type: string
## Default: ""
++++++ rcntop ++++++
--- /var/tmp/diff_new_pack.bspf0A/_old 2009-08-13 18:44:30.000000000 +0200
+++ /var/tmp/diff_new_pack.bspf0A/_new 2009-08-13 18:44:30.000000000 +0200
@@ -7,7 +7,7 @@
#
### BEGIN INIT INFO
# Provides: ntop
-# Required-Start: $network
+# Required-Start: $network $remote_fs
# Required-Stop: $network
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
@@ -80,7 +80,7 @@
## the echo return value is set appropriate.
if ! /usr/sbin/passcheck ; then
echo -e -n "\nntop admin password is not yet set. "
- echo -e -n "Run \n\t\033[1mntop -A -u $NTOP_USER\033[m\nmanually "
+ echo -e -n "Run \n\t${warn}ntop -A -u $NTOP_USER${rc_reset}\nmanually "
rc_status -u
exit
else
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org