Hello community,
here is the log from the commit of package ntop for openSUSE:Factory checked in
at 2013-08-30 11:45:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ntop (Old)
and /work/SRC/openSUSE:Factory/.ntop.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ntop"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ntop/ntop.changes 2012-10-25
12:11:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ntop.new/ntop.changes 2013-08-30
11:45:10.000000000 +0200
@@ -1,0 +2,21 @@
+Wed Aug 28 13:05:01 UTC 2013 - l...@linux-schulserver.de
+
+- really remove the following patches as requested by review team:
+ + ntop-compile-fix.patch
+ + ntop-remove_ntop_safefree.patch
+
+-------------------------------------------------------------------
+Thu Jun 13 05:43:38 UTC 2013 - alexan...@exatati.com.br
+
+- Removed extra configure run and unrecognized options (--enable-sslv3
+ and --enable-i18n).
+
+-------------------------------------------------------------------
+Wed Oct 17 04:57:40 UTC 2012 - alexan...@exatati.com.br
+
+- Update to 5.0.1:
+ - Sorry, no changelog atm.
+- Refresh patches 0 to 5, 8, 10 and 11 and remove patches 6, 7 and
+ 9.
+
+-------------------------------------------------------------------
Old:
----
ntop-4.1.0.tar.bz2
ntop-python_fix.patch
New:
----
ntop-5.0.1.tar.bz2
ntop-disable_svn_check.patch
ntop-no-return-in-nonvoid-function.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ntop.spec ++++++
--- /var/tmp/diff_new_pack.dT7Vpp/_old 2013-08-30 11:45:17.000000000 +0200
+++ /var/tmp/diff_new_pack.dT7Vpp/_new 2013-08-30 11:45:17.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ntop
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: ntop
-Version: 4.1.0
+Version: 5.0.1
Release: 0
Summary: Web-Based Network Traffic Monitor
License: GPL-2.0+
@@ -26,6 +26,7 @@
%define pkg_user ntop
%define pkg_home /var/lib/%{name}
%define xorg_libdir %{_libdir}
+Requires: graphviz
Requires: logrotate
# TODO: Use the files from the GeoIP package to avoid duplicate work
# and wasting space
@@ -45,6 +46,7 @@
BuildRequires: mysql-devel
BuildRequires: net-snmp-devel
BuildRequires: openssl-devel
+BuildRequires: python-devel
BuildRequires: readline-devel
#
# openSUSE
@@ -100,7 +102,7 @@
Source3: rc.config.ntop
Source4: passcheck.c
Source5: README.SuSE
-Source6: etter.finger.os.gz
+#Source6: etter.finger.os.gz
Source10: ntop-rpmlintrc
Patch0: ntop-disable_ethernet_fingerprint_database_download.patch
Patch1: ntop-disable_darwin.patch
@@ -108,10 +110,9 @@
Patch3: ntop-dot-path.patch
Patch4: ntop-fix-netflow-plugin-links.patch
Patch5: ntop-default_user.patch
-Patch6: ntop-compile-fix.patch
-Patch7: ntop-python_fix.patch
Patch8: ntop-fix-timestamp.patch
-Patch9: ntop-remove_ntop_safefree.patch
+Patch10: ntop-disable_svn_check.patch
+Patch11: ntop-no-return-in-nonvoid-function.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -122,25 +123,24 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p0
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-cp %{SOURCE6} .
+%patch0
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch8
+%patch10
+%patch11
+#cp %%{SOURCE6} .
# fix/remove files with wrong encoding
-rm docs/RedHat-rpmbuild-HOWTO.txt
-rm docs/ntop-autotools.vsd docs/INSTALL
+#rm docs/RedHat-rpmbuild-HOWTO.txt
+#rm docs/ntop-autotools.vsd docs/INSTALL
rm -f docs/README.Suse
cp %{SOURCE5} docs/README.Suse
-sed -i "s|^M||g" python/templates/rrdAlarmStart.tmpl
-chmod -x python/templates/rrdAlarmStart.tmpl
+sed -i "s|
||g" python/templates/rrdAlarmStart.tmpl
+chmod -x python/templates/rrdAlarmStart.tmpl docs/ntop-autotools.vsd
# Remove build time references so build-compare can do its work
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
@@ -150,36 +150,32 @@
%build
# ntop wants to setup the files for the newer autoconf itself:
-./autogen.sh \
+CFLAGS="%{optflags}" ./autogen.sh \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
--sysconfdir=%{_sysconfdir} \
- --localstatedir=%{_localstatedir}/lib
-
-# now we are ready for the real configure...
-CFLAGS="%{optflags} -DHAVE_NCURSES_H %{?xorg_cflags} -fno-strict-aliasing" \
-%configure \
+ --localstatedir=%{_localstatedir}/lib \
--x-libraries=%{xorg_libdir} \
--disable-static \
- --enable-sslv3 \
--enable-jumbo-frames \
- --enable-snmp \
- --enable-i18n
+ --enable-snmp
+
make %{?_smp_mflags}
gcc -o passcheck %{optflags} %{SOURCE4} -lgdbm
%install
-%makeinstall install-man
-chmod 644 %{buildroot}%{_sysconfdir}/ntop/oui.txt.gz
-chmod 644 %{buildroot}%{_sysconfdir}/ntop/specialMAC.txt.gz
+%makeinstall
+#%%makeinstall install-man
+#chmod 644 %%{buildroot}%%{_sysconfdir}/ntop/oui.txt.gz
+#chmod 644 %%{buildroot}%%{_sysconfdir}/ntop/specialMAC.txt.gz
# install init file and symlink
-mkdir -p %{buildroot}%{_sbindir}
+%{__mkdir_p} %{buildroot}%{_sbindir}
install -Dm 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/%{name}
ln -sf ../../%{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
# install fillup template for /etc/sysconfig
install -Dm 644 %{SOURCE3}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
install -m 755 passcheck %{buildroot}%{_sbindir}/passcheck
-mkdir -p %{buildroot}%{pkg_home}/rrd
+#mkdir -p %%{buildroot}%%{pkg_home}/rrd
find %{buildroot}%{_datadir}/ntop/html -type f -print0 | xargs -0 chmod 644
%if 0%{?suse_version} > 1020
%fdupes %{buildroot}%{_datadir}/ntop/html/
@@ -187,9 +183,10 @@
find %{buildroot} -name "*.la" -delete
find %{buildroot}%{_libdir} -name "*.a" -delete
# install /var/lib/ntop, so ntop can store it's databases
-mkdir -p
%{buildroot}%{_localstatedir}/lib/%{name}/rrd/{flows,graphics,interfaces}
+#mkdir -p
%%{buildroot}%%{_localstatedir}/lib/%%{name}/rrd/{flows,graphics,interfaces}
# install logrotate script
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d
+%{__mkdir_p} %{buildroot}%{_localstatedir}/log/%{name}
cat >> %{buildroot}%{_sysconfdir}/logrotate.d/%{name} << EOF
/var/log/ntop/*.log {
weekly
@@ -205,9 +202,10 @@
%endif
}
EOF
+
# TODO: link to GeoIP databases
# extract the files in %%{_sysconfdir}/%%{name} as ntop expects them
uncompressed
-gunzip %{buildroot}%{_sysconfdir}/%{name}/*.gz
+#gunzip %%{buildroot}%%{_sysconfdir}/%%{name}/*.gz
%pre
/usr/sbin/groupadd -r %{pkg_user} &>/dev/null ||:
@@ -259,9 +257,10 @@
%dir %{_sysconfdir}/ntop
%config(noreplace) %{_sysconfdir}/%{name}/*
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%dir %attr(750,%{pkg_user},%{pkg_user}) %{_localstatedir}/log/%{name}
%config %{_sysconfdir}/init.d/ntop
-%%attr(-,%{pkg_user},%{pkg_user}) %dir %{_localstatedir}/lib/%{name}
-%%attr(-,%{pkg_user},%{pkg_user}) %dir %{_localstatedir}/lib/%{name}/rrd
-%%attr(-,%{pkg_user},%{pkg_user}) %dir %{_localstatedir}/lib/%{name}/rrd/*
+#%%attr(-,%%{pkg_user},%%{pkg_user}) %%dir %%{_localstatedir}/lib/%%{name}
+#%%attr(-,%%{pkg_user},%%{pkg_user}) %%dir %%{_localstatedir}/lib/%%{name}/rrd
+#%%attr(-,%%{pkg_user},%%{pkg_user}) %%dir
%%{_localstatedir}/lib/%%{name}/rrd/*
%changelog
++++++ ntop-4.1.0.tar.bz2 -> ntop-5.0.1.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/ntop/ntop-4.1.0.tar.bz2
/work/SRC/openSUSE:Factory/.ntop.new/ntop-5.0.1.tar.bz2 differ: char 11, line 1
++++++ ntop-default_user.patch ++++++
--- /var/tmp/diff_new_pack.dT7Vpp/_old 2013-08-30 11:45:17.000000000 +0200
+++ /var/tmp/diff_new_pack.dT7Vpp/_new 2013-08-30 11:45:17.000000000 +0200
@@ -1,8 +1,8 @@
-Index: ntop-4.1.0/prefs.c
+Index: prefs.c
===================================================================
---- ntop-4.1.0.orig/prefs.c
-+++ ntop-4.1.0/prefs.c
-@@ -818,8 +818,8 @@ int parseOptions(int argc, char* argv[])
+--- prefs.c.orig
++++ prefs.c
+@@ -813,8 +813,8 @@ int parseOptions(int argc, char* argv[])
/* We're root */
char *user;
++++++ ntop-disable_darwin.patch ++++++
--- /var/tmp/diff_new_pack.dT7Vpp/_old 2013-08-30 11:45:17.000000000 +0200
+++ /var/tmp/diff_new_pack.dT7Vpp/_new 2013-08-30 11:45:17.000000000 +0200
@@ -1,14 +1,12 @@
-Index: ntop-4.1.0/Makefile.am
+Index: Makefile.am
===================================================================
---- ntop-4.1.0.orig/Makefile.am
-+++ ntop-4.1.0/Makefile.am
-@@ -125,8 +125,7 @@ libntop_la_SOURCES = address.c argv.c
- ntop.c pbuf.c \
+--- Makefile.am.orig
++++ Makefile.am
+@@ -128,7 +128,6 @@ libntop_la_SOURCES = address.c argv.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
+ traffic.c vendor.c version.c \
+- ntop_darwin.c \
+ prng.c countmin.c
libntop_la_DEPENDENCIES = config.h
- libntop_la_LIBADD = $(BASE_LIBS)
++++++ ntop-disable_ethernet_fingerprint_database_download.patch ++++++
--- /var/tmp/diff_new_pack.dT7Vpp/_old 2013-08-30 11:45:17.000000000 +0200
+++ /var/tmp/diff_new_pack.dT7Vpp/_new 2013-08-30 11:45:17.000000000 +0200
@@ -1,7 +1,7 @@
-Index: ntop-4.1.0/Makefile.am
+Index: Makefile.am
===================================================================
---- ntop-4.1.0.orig/Makefile.am
-+++ ntop-4.1.0/Makefile.am
+--- Makefile.am.orig
++++ Makefile.am
@@ -64,7 +64,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"
@@ -11,16 +11,7 @@
$(ETTER_PASSIVE) \
oui.txt.gz \
specialMAC.txt.gz \
-@@ -328,7 +328,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; \
-@@ -391,48 +391,6 @@ dnvt:
+@@ -396,48 +396,6 @@ dnvt:
#dnsapt:
# @(cd Internet; wget -c
http://www.iana.org/assignments/novell-sap-numbers)
@@ -69,10 +60,10 @@
# ntop census
census-fail:
@echo "This option is no longer available... thanks for trying"
-Index: ntop-4.1.0/autogen.sh
+Index: autogen.sh
===================================================================
---- ntop-4.1.0.orig/autogen.sh
-+++ ntop-4.1.0/autogen.sh
+--- autogen.sh.orig
++++ autogen.sh
@@ -202,16 +202,6 @@ AUTOCONF=`find_command 'autoconf*'`
GNU_OR_DIE=0
}
++++++ ntop-disable_svn_check.patch ++++++
Index: autogen.sh
===================================================================
--- autogen.sh.orig
+++ autogen.sh
@@ -206,20 +206,6 @@ if test "$GNU_OR_DIE" -eq 0; then
exit 1
fi
-SVN=`find_command 'svn'`
-($SVN --version) < /dev/null > /dev/null 2>&1 ||
-{
- echo
- echo "You must have svn/subversion installed to compile $progname."
- echo "Download the appropriate package for your distribution, or get the"
- echo "source from http://subversion.tigris.org";
- GNU_OR_DIE=0
-}
-
-if test "$GNU_OR_DIE" -eq 0; then
- exit 1
-fi
-
# Check versions...
libtoolversion=`$LIBTOOL --version < /dev/null 2>&1 | grep libtool | cut -d "
" -f 4`
echo " libtool ..... ${libtoolversion}"
++++++ ntop-dot-path.patch ++++++
--- /var/tmp/diff_new_pack.dT7Vpp/_old 2013-08-30 11:45:17.000000000 +0200
+++ /var/tmp/diff_new_pack.dT7Vpp/_new 2013-08-30 11:45:17.000000000 +0200
@@ -1,8 +1,8 @@
-Index: ntop-4.1.0/report.c
+Index: report.c
===================================================================
---- ntop-4.1.0.orig/report.c
-+++ ntop-4.1.0/report.c
-@@ -2091,7 +2091,7 @@ void makeDot() {
+--- report.c.orig
++++ report.c
+@@ -2299,7 +2299,7 @@ void makeDot() {
if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
snprintf(dotPath, sizeof(dotPath), "%s", buf);
} else {
++++++ ntop-fix-manpage-errors.patch ++++++
--- /var/tmp/diff_new_pack.dT7Vpp/_old 2013-08-30 11:45:17.000000000 +0200
+++ /var/tmp/diff_new_pack.dT7Vpp/_new 2013-08-30 11:45:17.000000000 +0200
@@ -1,11 +1,8 @@
-# Description: fix typos and syntax errors in ntop.8 manpage.
-# Author: A. Costa <agco...@gis.net>, Ola Lundqvist <o...@debian.org>,
-# Jordan Metzmeier <jor...@linuxgen.com>, Ludovico Cavedon <cave...@debian.org>
Index: ntop.8
===================================================================
---- ntop.8.orig 2010-12-09 23:24:13.178708050 -0800
-+++ ntop.8 2010-12-09 23:28:55.282772180 -0800
-@@ -148,10 +148,10 @@
+--- ntop.8.orig
++++ ntop.8
+@@ -145,10 +145,10 @@ behavior. However, options that set a va
given: --trace-level 2 --trace-level 3 will run as --trace-level 3.
Beginning with
@@ -18,22 +15,7 @@
and on each subsequent run until changed.
-@@ -323,11 +323,11 @@
- This parameter causes
- .B ntop
- to create a dump file of the 'other' network traffic captured.
--One file is created for each network interface where
--'other' packets are found. The file is in tcpdump (pcap) format and is named
-+One file is created for each network interface where 'other'
-+packets are found. The file is in tcpdump (pcap) format and is named
- <path>/ntop-other-pkts.<device>.pcap, where <path> is defined by the
- -O | --output-packet-path parameter.
--This file is useful for understanding these unclassifed packets.
-+This file is useful for understanding these unclassified packets.
-
- .It2 -l --pcap-log
- This parameter causes a dump file to be created of the network traffic
captured by
-@@ -336,7 +336,7 @@
+@@ -323,7 +323,7 @@ in tcpdump (pcap) format. This file is
.B ntop
by the -f | --traffic-dump-file parameter. The dump is made after processing
any
filter expression (
@@ -42,7 +24,7 @@
never even sees filtered packets).
The output file will be named
-@@ -523,7 +523,7 @@
+@@ -476,7 +476,7 @@ might not be able to process all of the
.It2 -s --no-promiscuous
Use this parameter to prevent
@@ -51,7 +33,7 @@
from setting the interface(s) into promiscuous mode.
An interface in promiscuous mode will accept ALL Ethernet frames, regardless
of
-@@ -788,7 +788,7 @@
+@@ -741,7 +741,7 @@ By default,
merges the data collected from all of the interfaces (NICs) it is monitoring
into a
single set of counters.
@@ -60,7 +42,7 @@
merging data is good as it gives you a better picture of the whole network.
For larger, more complex networks, this may not be desirable.
You may also have other reasons for wishing to monitor each interface
separately,
-@@ -912,7 +912,7 @@
+@@ -865,7 +865,7 @@ uses.
stores extra information about the locks and unlocks of the protective
mutexes it uses. Since
.B ntop
uses fine-grained locking, this information is updated frequently. On some
OSes, the system
@@ -69,7 +51,7 @@
disables the extra information. It should have no processing impact on
.B ntop
- however should
-@@ -948,7 +948,7 @@
+@@ -906,7 +906,7 @@ LD_LIBRARY_PATH=/devel/lib/ntop/:... /de
If present, a file of the form <instance>_ntop_logo.gif will be used instead
of the normal
ntop_logo.gif. This is tested for ONLY once, at the beginning of the
@@ -78,16 +60,16 @@
run. The EXACT word(s) of the --instance flag are used, without testing if
they make a
proper file name. If - for any reason - the file is not found, an
informational message
is logged and the normal logo file is used. To construct your own logo, make
it a 300x40
-@@ -959,7 +959,7 @@
+@@ -917,7 +917,7 @@ NOTE: On the web pages,
uses the dladdr() function. The original Solaris routine had a bug,
replicated in
FreeBSD (and possibly other places) where it uses the ARGV[0] value - which
might be
erroneous - instead of the actual file name. If the 'running from' value
looks bogus but
-the 'libaries in' value looks ok, go with the libarary.
-+the 'libraries in' value looks OK, go with the library.
-
- .It --no-fc
++the 'libraries in' value looks ok, go with the libarary.
-@@ -975,7 +975,7 @@
+ .It --p3p-cp
+ .It --p3p-uri
+@@ -925,7 +925,7 @@ the 'libaries in' value looks ok, go wit
P3P is a W3C recommendation - http://www.w3.org/TR/P3P/ - for specifying
personal information a site collects and what it does with the information.
These parameters allow
@@ -96,14 +78,14 @@
to return P3P information. We do not supply samples.
.It --pcap_setnonblock
-@@ -989,12 +989,12 @@
+@@ -939,12 +939,12 @@ runs just fine. This is known to be an i
This option sets the non-blocking
option (assuming it's available in the version of libpcap that is installed).
-While this works around the problem (by turing an interupt driven process
into
-a poll), it also MAY signifcantly increases the cpu usage of
-+While this works around the problem (by turning an interrupt driven process
into
-+a poll), it also MAY significantly increase the CPU usage of
++While this works around the problem (by turning an interupt driven process
into
++a poll), it also MAY significantly increases the cpu usage of
.B ntop.
Although it does not actually interfere with other work, seeing
.B ntop
@@ -112,16 +94,16 @@
.B THIS OPTION IS OFFICIALLY UNSUPPORTED
and used at your own risk. Read the docs/FAQ write-up.
-@@ -1018,7 +1018,7 @@
+@@ -968,7 +968,7 @@ NOTE: At present, the recheck does not w
.It --ssl-watchdog
Enable a watchdog for
-.b ntop
-+.B ntop
++.B ntop
webserver hangs. These usually happen when connecting with older browsers.
The user
gets nothing back and other users can't connect. Internally, packet
processing continues
but there is no way to access the data through the web server or shutdown
ntop cleanly.
-@@ -1248,7 +1248,7 @@
+@@ -1198,7 +1198,7 @@ Similarly, the run time parameters are s
which flags are being used.
The libpcap, gdbm, openssl and zlib versions come from the strings returned
by the various
++++++ ntop-fix-netflow-plugin-links.patch ++++++
--- /var/tmp/diff_new_pack.dT7Vpp/_old 2013-08-30 11:45:17.000000000 +0200
+++ /var/tmp/diff_new_pack.dT7Vpp/_new 2013-08-30 11:45:17.000000000 +0200
@@ -2,11 +2,11 @@
Author: Ludovico Cavedon <cave...@debian.org>
Bug-Debian: http://bugs.debian.org/530334
-Index: ntop/plugins/netflowPlugin.c
+Index: plugins/netflowPlugin.c
===================================================================
---- ntop.orig/plugins/netflowPlugin.c 2011-08-19 21:37:23.912189768 -0700
-+++ ntop/plugins/netflowPlugin.c 2011-08-19 21:41:18.420189769 -0700
-@@ -115,8 +115,8 @@
+--- plugins/netflowPlugin.c.orig
++++ plugins/netflowPlugin.c
+@@ -122,8 +122,8 @@ static PluginInfo netflowPluginInfo[] =
"NetFlow",
"This plugin is used to setup, activate and deactivate NetFlow
support.<br>"
"<b>ntop</b> can both collect and receive "
++++++ ntop-fix-timestamp.patch ++++++
--- /var/tmp/diff_new_pack.dT7Vpp/_old 2013-08-30 11:45:17.000000000 +0200
+++ /var/tmp/diff_new_pack.dT7Vpp/_new 2013-08-30 11:45:17.000000000 +0200
@@ -1,10 +1,10 @@
-Index: ntop-4.1.0/configure.in
+Index: configure.in
===================================================================
---- ntop-4.1.0.orig/configure.in
-+++ ntop-4.1.0/configure.in
-@@ -1932,8 +1932,8 @@ osName=`./config.guess | sed -e "s/unkno
+--- configure.in.orig
++++ configure.in
+@@ -1957,8 +1957,8 @@ osName=`./config.guess | sed -e "s/unkno
echo "${osName}" | sed -e 's/.*/char * osName = "&";/' >> version.c
- echo "char * author = \"Luca Deri <d...@ntop.org>\";" >> version.c
+ echo "char * ntop_author = \"Luca Deri <d...@ntop.org>\";" >> version.c
dnl> This is an odd format, but it matches cpp's __DATE__ and __TIME__
macros...
-date +"%b %e %Y %k:%M:%S" | sed -e 's/.*/char * configureDate = "&";/' >>
version.c
-echo "#define buildDateIs __DATE__ \" \" __TIME__" >> version.c
++++++ ntop-no-return-in-nonvoid-function.patch ++++++
Index: plugins/netflowPlugin.c
===================================================================
--- plugins/netflowPlugin.c.orig
+++ plugins/netflowPlugin.c
@@ -25,7 +25,7 @@
static void* netflowMainLoop(void* _deviceId);
#ifdef HAVE_SNMP
-static void* netflowUtilsLoop(void* _deviceId);
+static void netflowUtilsLoop(void* _deviceId);
#endif
//#define DEBUG_FLOWS
@@ -2126,7 +2126,7 @@ RETSIGTYPE netflowcleanup(int signo) {
/* ****************************** */
#ifdef HAVE_SNMP
-static void* netflowUtilsLoop(void* _deviceId) {
+static void netflowUtilsLoop(void* _deviceId) {
int deviceId = (int)_deviceId;
while(1) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
