Hello community,
here is the log from the commit of package ntop for openSUSE:Factory
checked in at Wed Oct 6 23:25:32 CEST 2010.
--------
--- ntop/ntop.changes 2010-05-07 09:07:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/ntop/ntop.changes 2010-08-25 21:51:40.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Aug 25 19:40:07 UTC 2010 - alexandre@exatati.com.br
+
+- Update to 4.0;
+- Rewrote main diff;
+- Spec file cleaned with spec-cleaner.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libtool.diff
ntop-3.3.10.diff
ntop-3.3.10.tar.bz2
New:
----
ntop-4.0.diff
ntop-4.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ntop.spec ++++++
--- /var/tmp/diff_new_pack.Hkxyml/_old 2010-10-06 23:24:18.000000000 +0200
+++ /var/tmp/diff_new_pack.Hkxyml/_new 2010-10-06 23:24:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ntop (Version 3.3.10)
+# spec file for package ntop (Version 4.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -15,40 +15,69 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: ntop
-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
+BuildRequires: dos2unix
+BuildRequires: freetype2-devel
+BuildRequires: gcc-c++
+BuildRequires: gd-devel
+BuildRequires: gdbm-devel
+BuildRequires: libGeoIP-devel
+BuildRequires: libart_lgpl-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: lsof
+BuildRequires: lua-devel
+BuildRequires: mysql-devel
+BuildRequires: net-snmp-devel
+BuildRequires: openssl-devel
+BuildRequires: readline-devel
%if 0%{?suse_version}
-BuildRequires: tcpd-devel xorg-x11-devel
-PreReq: /bin/cat %fillup_prereq %insserv_prereq sysconfig
+BuildRequires: tcpd-devel
+BuildRequires: xorg-x11-devel
+PreReq: %fillup_prereq
+PreReq: %insserv_prereq
+PreReq: /bin/cat
+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
+BuildRequires: fdupes
+BuildRequires: libpcap-devel
+BuildRequires: rrdtool-devel
%else
-BuildRequires: libpcap rrdtool
+BuildRequires: libpcap
+BuildRequires: rrdtool
%endif
%else
%if 0%{?fedora_version}
-PreReq: /bin/cat /sbin/insserv /bin/fillup sysconfig
-BuildRequires: libpcap-devel rrdtool-devel xorg-x11-devel
+BuildRequires: libpcap-devel
+BuildRequires: rrdtool-devel
+BuildRequires: xorg-x11-devel
+PreReq: /bin/cat
+PreReq: /bin/fillup
+PreReq: /sbin/insserv
+PreReq: sysconfig
%else
%if 0%{?mandriva_version}
-BuildRequires: libpcap-devel librrdtool-devel rrdtool
-PreReq: /bin/cat /sbin/insserv /bin/fillup sysconfig
+BuildRequires: libpcap-devel
+BuildRequires: librrdtool-devel
+BuildRequires: rrdtool
+PreReq: /bin/cat
+PreReq: /bin/fillup
+PreReq: /sbin/insserv
+PreReq: sysconfig
%endif
%endif
%endif
+Version: 4.0
+Release: 1
License: GPLv2+
Group: Productivity/Networking/Diagnostic
-AutoReqProv: on
-Version: 3.3.10
-Release: 3
#
%define pkg_name ntop
%define pkg_user ntop
@@ -59,40 +88,40 @@
%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
+%define xorg_cflags -L/usr/X11R6/%{_lib} -I/usr/X11R6/include
+%define xorg_libdir /usr/X11R6/%{_lib}
%endif
Summary: Web-Based Network Traffic Monitor
+Url: http://www.ntop.org
Source: %{name}-%{version}.tar.bz2
Source2: rcntop
Source3: rc.config.ntop
Source4: passcheck.c
Source5: README.SuSE
Source6: etter.finger.os.gz
+# PATCH-FIX-UPSTREAM ntop-%{version}.diff
Patch: ntop-%{version}.diff
+# PATCH-FIX-UPSTREAM rrdPlugin.diff
Patch2: rrdPlugin.diff
+# PATCH-FIX-OPENSUSE dotpath.diff
Patch4: dotpath.diff
-Patch5: libtool.diff
+# PATCH-FIX-UPSTREAM ntop-fix-segfault-on-exit.patch
Patch6: ntop-fix-segfault-on-exit.patch
-Url: http://www.ntop.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Ntop is a Web-based traffic monitor that shows network usage. It can be
used in both interactive or Web mode using the embedded Web server.
-
-
-Authors:
---------
+Author:
+-------
Luca Deri
%prep
-%setup -q -n %{name}-%{version}
+%setup -q
%patch
%patch2
%patch4
-%patch5
%patch6
cp %SOURCE6 .
@@ -102,36 +131,36 @@
./autogen.sh
# NTOP_AUTOREBUILD=yes ./configure || echo "new autoconf prepared"
# now we are ready for the real configure...
-CFLAGS="$RPM_OPT_FLAGS -DHAVE_NCURSES_H %{?xorg_cflags}" \
+CFLAGS="%{optflags} -DHAVE_NCURSES_H %{?xorg_cflags}" \
%configure \
--x-libraries=%{xorg_libdir} \
--disable-static \
--enable-sslv3 \
--enable-i18n
make %{?jobs:-j%jobs}
-gcc -o passcheck $RPM_OPT_FLAGS %{SOURCE4} -lgdbm
+gcc -o passcheck %{optflags} %{SOURCE4} -lgdbm
%install
# remove old (pre SuSE Linux 7.0) README.Suse provided by ntop
rm -f docs/README.Suse
-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/
-install -d $RPM_BUILD_ROOT/usr/sbin/
-install -d $RPM_BUILD_ROOT/var/adm/fillup-templates/
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d/ntop
-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%{pkg_home}/rrd
+make DESTDIR=%{buildroot} install install-man
+chmod 644 %{buildroot}%{_sysconfdir}/ntop/oui.txt.gz
+chmod 644 %{buildroot}%{_sysconfdir}/ntop/specialMAC.txt.gz
+install -d %{buildroot}%{_sysconfdir}/init.d/
+install -d %{buildroot}%{_sbindir}/
+install -d %{buildroot}%{_localstatedir}/adm/fillup-templates/
+install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/ntop
+ln -sf ../../etc/init.d/ntop %{buildroot}%{_sbindir}/rcntop
+install -m 644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.ntop
+install -m 755 passcheck %{buildroot}%{_sbindir}/passcheck
+mkdir -p %{buildroot}%{pkg_home}/rrd
# Get README.SuSE
cp %SOURCE5 .
-find $RPM_BUILD_ROOT/usr/share/ntop/html -type f -print0 | xargs -0 chmod 644
+find %{buildroot}%{_datadir}/ntop/html -type f -print0 | xargs -0 chmod 644
%if 0%{?suse_version} > 1020
-%fdupes $RPM_BUILD_ROOT/usr/share/ntop/html/
+%fdupes %{buildroot}%{_datadir}/ntop/html/
%endif
-find $RPM_BUILD_ROOT -name "*.la" | xargs rm
+find %{buildroot} -name "*.la" -delete
rm docs/ntop-autotools.vsd
dos2unix docs/RedHat-rpmbuild-HOWTO.txt
@@ -145,6 +174,7 @@
%endif
%post
+%{fillup_and_insserv ntop}
# Are we in update mode?
if [ ${1:-0} -gt 1 ]; then
if [ -f etc/sysconfig/ntopd -a ! -L etc/sysconfig/ntopd ]; then
@@ -156,36 +186,37 @@
chown -R %{pkg_user}:%{pkg_user} %{pkg_home}/rrd
fi
/sbin/ldconfig
-%{fillup_and_insserv -n ntop ntop }
%postun
/sbin/ldconfig
%{insserv_cleanup}
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc docs/* AUTHORS CONTENTS COPYING ChangeLog MANIFESTO NEWS PORTING
%doc SUPPORT_NTOP.txt THANKS README.SuSE
-%config /etc/init.d/ntop
+%config %{_sysconfdir}/init.d/ntop
%{_bindir}/ntop
%{_libdir}/lib*.so
%{_sbindir}/rcntop
%{_sbindir}/passcheck
%dir %attr(-,%{pkg_user},%{pkg_user}) %{_datadir}/ntop
%{_datadir}/ntop/html
-%{_datadir}/ntop/perl
+%{_datadir}/ntop/python
%dir %{_libdir}/ntop
%{_libdir}/ntop/plugins
%{_mandir}/man8/ntop.8.*
-/var/adm/fillup-templates/sysconfig.ntop
+%{_localstatedir}/adm/fillup-templates/sysconfig.ntop
%dir %attr(-,%{pkg_user},%{pkg_user}) %{pkg_home}
%dir %attr(-,%{pkg_user},%{pkg_user}) %{pkg_home}/rrd
-%dir /etc/ntop
-%config /etc/ntop/oui.txt.gz
-%config /etc/ntop/specialMAC.txt.gz
-%config /etc/ntop/etter.finger.os.gz
+%dir %{_sysconfdir}/ntop
+%config %{_sysconfdir}/ntop/oui.txt.gz
+%config %{_sysconfdir}/ntop/specialMAC.txt.gz
+%config %{_sysconfdir}/ntop/etter.finger.os.gz
+%{_sysconfdir}/ntop/GeoIPASNum.dat
+%{_sysconfdir}/ntop/GeoLiteCity.dat
%changelog
++++++ ntop-3.3.10.diff -> ntop-4.0.diff ++++++
--- ntop/ntop-3.3.10.diff 2009-10-04 14:13:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/ntop/ntop-4.0.diff 2010-08-25 21:45:40.000000000 +0200
@@ -1,47 +1,151 @@
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
+@@ -71,8 +71,7 @@ ETTER_PASSIVE = $(ETTER_PASSIVE_FILE).gz
+ 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 \
+@@ -133,8 +132,7 @@ libntop_la_SOURCES = address.c argv.c
+ ntop.c pbuf.c database.c \
+ plugin.c prefs.c protocols.c \
+ sessions.c term.c util.c utildl.c \
+- traffic.c vendor.c version.c \
+- ntop_darwin.c
++ traffic.c vendor.c version.c
+
+ libntop_la_DEPENDENCIES = config.h
+ libntop_la_LIBADD = $(BASE_LIBS)
+@@ -336,7 +334,7 @@ install: install-recursive
+ install-selinux-policy:
+ chcon -t textrel_shlib_t $(DESTDIR)$(libdir)/*ntop*.so
+
+-install-data-local: ntop.txt ntop.html faq.html dnetter
++install-data-local: ntop.txt ntop.html faq.html
+ @$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins;
+ @if ! test -d $(DESTDIR)/$(datadir)/ntop; then \
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop; \
+@@ -399,48 +397,6 @@ dnvt:
+ #dnsapt:
+ # @(cd Internet; wget -c http://www.iana.org/assignments/novell-sap-numbers)
+
+-# download the passive ethernet fingerprint database
+-dnetter:
+- @echo ""
+- @echo ""
+- @echo "Preparing "
+- @echo ""
+-
+- @if test -f $(ETTER_PASSIVE).old; then \
+- echo "...Deleting prior file, $(ETTER_PASSIVE).old..."; \
+- rm -rf $(ETTER_PASSIVE).old; \
+- fi;
+- @if test -f $(ETTER_PASSIVE); then \
+- echo "...Moving current $(ETTER_PASSIVE) to $(ETTER_PASSIVE).old"; \
+- mv $(ETTER_PASSIVE) $(ETTER_PASSIVE).old; \
+- fi;
+- @for file in $(ETTER_PASSIVE) $(ETTER_PASSIVE).gz \
+- $(ETTER_PASSIVE_FILE) $(ETTER_PASSIVE_FILE).gz; do \
+- if test -f $$file; then \
+- echo "...Deleting prior file, $$file..."; \
+- rm -rf $$file; \
+- fi; \
+- done
+- @echo ""
+- @echo "...Downloading new file..."
+- @wget -O $(ETTER_PASSIVE_FILE) \
+- $(ETTER_PASSIVE_DOWNLOAD_FROM)/$(ETTER_PASSIVE_FILE)?$(ETTER_PASSIVE_DOWNLOAD_PARMS)
+- @echo ""
+- @echo "gziping downloaded file..."
+- @gzip $(ETTER_PASSIVE_FILE)
+- @echo ""
+- @echo ""
+- @if test -f $(ETTER_PASSIVE).old; then \
+- echo -n "Old file lines were: "; \
+- gunzip -c $(ETTER_PASSIVE).old | wc -l; \
+- fi;
+- @echo -n "New file lines are: "
+- @gunzip -c $(ETTER_PASSIVE) | wc -l
+- @echo ""
+- @echo ""
+- @echo "New file is:"
+- @ls -l $(ETTER_PASSIVE)
+-
+ # ntop census
+ census-fail:
+ @echo "This option is no longer available... thanks for trying"
Index: fcUtils.c
===================================================================
--- fcUtils.c.orig
+++ fcUtils.c
-@@ -657,6 +657,7 @@ void processFcNSCacheFile(char *filename
- memcpy (&entry->pWWN.str[0], &pWWN.str[0], LEN_WWN_ADDRESS);
- memcpy (&entry->nWWN.str[0], &nWWN.str[0], LEN_WWN_ADDRESS);
+@@ -660,6 +660,7 @@ void processFcNSCacheFile(char *filename
strncpy (&entry->alias[0], alias, MAX_LEN_SYM_HOST_NAME);
-- entry->alias[MAX_LEN_SYM_HOST_NAME] = '\0';
-+ entry->alias[MAX_LEN_SYM_HOST_NAME-1] = '\0';
+ entry->alias[MAX_LEN_SYM_HOST_NAME-1] = '\0';
}
+ fclose(fd);
}
-Index: graph.c
+
+ #endif /* ENABLE_FC */
+Index: autogen.sh
===================================================================
---- graph.c.orig
-+++ graph.c
-@@ -1508,13 +1508,11 @@ void drawVsanSwilsProtoDistribution(u_sh
- 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;
+--- autogen.sh.orig
++++ autogen.sh
+@@ -202,16 +202,6 @@ AUTOCONF=`find_command 'autoconf*'`
+ GNU_OR_DIE=0
+ }
-- p[MAX_FC_DOMAINS+1] = 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
+-}
-
- hash = getFcFabricElementHash (vsanId, myGlobals.actualReportDeviceId);
+ if test "$GNU_OR_DIE" -eq 0; then
+ exit 1
+ fi
+Index: fcReport.c
+===================================================================
+--- fcReport.c.orig
++++ fcReport.c
+@@ -4044,7 +4044,7 @@ void printFCSessions (int actualDeviceId
+ char buf[LEN_GENERAL_WORK_BUFFER], *sign;
+ char *arrowGif, *arrow[48], *theAnchor[48];
+ char htmlAnchor[64], htmlAnchor1[64];
+- char vsanBuf[LEN_MEDIUM_WORK_BUFFER], formatBuf[7][32];
++ char vsanBuf[LEN_MEDIUM_WORK_BUFFER], formatBuf[15][32];
+ char hostLinkBuf[LEN_GENERAL_WORK_BUFFER],
+ hostLinkBuf1[LEN_GENERAL_WORK_BUFFER];
+ FCSession **tmpTable, *session;
+Index: globals-core.h
+===================================================================
+--- globals-core.h.orig
++++ globals-core.h
+@@ -269,10 +269,6 @@ extern void allocDeviceMemory(int device
+
+ #ifdef MAKE_WITH_SAFER_ROUTINES
- if (hash == NULL) {
+-/* 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), (char*)__FILE__, (int)__LINE__); a = __t; }
+-extern void ntop_safefree(void **ptr, char* file, int 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, (char*)__FILE__, (int)__LINE__)
Index: pbuf.c
===================================================================
--- pbuf.c.orig
+++ pbuf.c
-@@ -3447,14 +3447,14 @@ void processPacket(u_char *_deviceId,
- && (ipxBuffer[30] == 0x0) /* SAP Response (byte 0) */
- && (ipxBuffer[31] == 0x02) /* SAP Response (byte 1) */) {
- u_int16_t serverType;
-- char serverName[57];
-+ char serverName[MAX_LEN_SYM_HOST_NAME];
- int i, found;
-
+@@ -3490,8 +3490,8 @@ void processPacket(u_char *_deviceId,
memcpy(&serverType, &ipxBuffer[32], 2);
serverType = ntohs(serverType);
@@ -52,7 +156,7 @@
if(serverName[i] == '!') {
serverName[i] = '\0';
break;
-@@ -3622,7 +3622,7 @@ void processPacket(u_char *_deviceId,
+@@ -3659,7 +3659,7 @@ void processPacket(u_char *_deviceId,
memcpy(nodeName, &p1[7+p1[5+displ]+displ], p1[6+p1[5+displ]+displ]);
nodeName[p1[6+p1[5+displ]]] = '\0';
@@ -61,283 +165,16 @@
if((srcHost->nonIPTraffic->atNodeType[i] == NULL)
|| (strcmp(srcHost->nonIPTraffic->atNodeType[i], nodeName) == 0))
break;
-Index: fcReport.c
-===================================================================
---- fcReport.c.orig
-+++ fcReport.c
-@@ -4072,7 +4072,7 @@ void printFCSessions (int actualDeviceId
- char buf[LEN_GENERAL_WORK_BUFFER], *sign;
- char *arrowGif, *arrow[48], *theAnchor[48];
- char htmlAnchor[64], htmlAnchor1[64];
-- char vsanBuf[LEN_MEDIUM_WORK_BUFFER], formatBuf[7][32];
-+ char vsanBuf[LEN_MEDIUM_WORK_BUFFER], formatBuf[15][32];
- char hostLinkBuf[LEN_GENERAL_WORK_BUFFER],
- hostLinkBuf1[LEN_GENERAL_WORK_BUFFER];
- FCSession **tmpTable, *session;
-Index: Makefile.am
-===================================================================
---- Makefile.am.orig
-+++ Makefile.am
-@@ -73,12 +73,9 @@ ETTER_PASSIVE = $(ETTER_PASSIVE_FILE).gz
- 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 \
-@@ -136,8 +133,7 @@ libntop_la_SOURCES = address.c argv.c
- ntop.c pbuf.c database.c \
- plugin.c prefs.c protocols.c \
- sessions.c term.c util.c utildl.c \
-- traffic.c vendor.c version.c \
-- ntop_darwin.c
-+ traffic.c vendor.c version.c
-
- libntop_la_DEPENDENCIES = config.h
- libntop_la_LIBADD = $(BASE_LIBS)
-@@ -270,8 +266,6 @@ libclean:
-
- install: install-recursive
-
-- cd @GEO_DIR@; make install
--
- @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
-
- @echo ""
-Index: plugins/Makefile.am
-===================================================================
---- plugins/Makefile.am.orig
-+++ plugins/Makefile.am
-@@ -89,7 +89,7 @@ libsflowPlugin_la_CFLAGS = $(AM_CFLAGS)
- #
-
-
--.libs/libicmpPlugin.so@SO_VERSION_PATCH@:
-+.libs/libicmpPlugin.so@SO_VERSION_PATCH@: icmpPlugin.o
- @if test -f libicmpPlugin_la-icmpPlugin.o; then \
- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ libicmpPlugin_la-icmpPlugin.o; \
- else \
-@@ -101,7 +101,7 @@ icmpPlugin.so$(EXEEXT): .libs/libicmpPlu
-
- ###############
-
--.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@:
-+.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@: lastSeenPlugin.o
- @if test -f liblastSeenPlugin_la-lastSeenPlugin.o; then \
- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ liblastSeenPlugin_la-lastSeenPlugin.o; \
- else \
-@@ -113,7 +113,7 @@ lastSeenPlugin.so$(EXEEXT): .libs/liblas
-
- ###############
-
--.libs/libnetflowPlugin.so@SO_VERSION_PATCH@:
-+.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: netflowPlugin.o
- @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 \
-@@ -137,7 +137,7 @@ cpacketPlugin.so$(EXEEXT): .libs/libcpac
-
- ###############
-
--.libs/librrdPlugin.so@SO_VERSION_PATCH@:
-+.libs/librrdPlugin.so@SO_VERSION_PATCH@: rrdPlugin.o
- @if test -f librrdPlugin_la-rrdPlugin.o; then \
- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ librrdPlugin_la-rrdPlugin.o; \
- else \
-@@ -149,7 +149,7 @@ rrdPlugin.so$(EXEEXT): .libs/librrdPlugi
-
- ###############
-
--.libs/libsflowPlugin.so@SO_VERSION_PATCH@:
-+.libs/libsflowPlugin.so@SO_VERSION_PATCH@: sflowPlugin.o
- @if test -f libsflowPlugin_la-sflowPlugin.o; then \
- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ libsflowPlugin_la-sflowPlugin.o; \
- else \
-@@ -161,7 +161,7 @@ sflowPlugin.so$(EXEEXT): .libs/libsflowP
-
- ###############
-
--.libs/libxmldumpPlugin.so@SO_VERSION_PATCH@:
-+.libs/libxmldumpPlugin.so@SO_VERSION_PATCH@: xmldumpPlugin.o
- @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 \
Index: plugins/rrdPlugin.c
===================================================================
--- plugins/rrdPlugin.c.orig
+++ plugins/rrdPlugin.c
-@@ -5035,7 +5035,7 @@ static void* rrdTrafficThreadLoop(void*
+@@ -5130,7 +5130,7 @@ static void* rrdTrafficThreadLoop(void*
traceEvent(CONST_TRACE_INFO,
"THREADMGMT[t%lu]: RRD: Throughput data collection: Thread terminated [p%d]",
- pthread_self(), getpid());
+ (long unsigned int)pthread_self(), getpid());
- return(NULL);
+ return;
}
/* ****************************** */
-Index: globals-core.h
-===================================================================
---- globals-core.h.orig
-+++ globals-core.h
-@@ -254,10 +254,6 @@ extern void allocDeviceMemory(int device
-
- #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), (char*)__FILE__, (int)__LINE__); a = __t; }
--extern void ntop_safefree(void **ptr, char* file, int 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, (char*)__FILE__, (int)__LINE__)
-Index: configure.in
-===================================================================
---- configure.in.orig
-+++ configure.in
-@@ -1652,22 +1652,22 @@ fi
- 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 @@ else
- 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])
-
-Index: autogen.sh
-===================================================================
---- autogen.sh.orig
-+++ autogen.sh
-@@ -244,15 +244,15 @@ AUTOCONF=`find_command 'autoconf*'`
- 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
++++++ ntop-3.3.10.tar.bz2 -> ntop-4.0.tar.bz2 ++++++
ntop/ntop-3.3.10.tar.bz2 /mounts/work_src_done/STABLE/ntop/ntop-4.0.tar.bz2 differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org