commit ntop for openSUSE:Factory
Hello community,
here is the log from the commit of package ntop for openSUSE:Factory checked in
at 2014-10-14 07:12:19
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.changes2014-06-24
15:16:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.ntop.new/ntop.changes 2014-10-14
07:13:11.0 +0200
@@ -1,0 +2,5 @@
+Fri Oct 3 23:14:47 UTC 2014 - crrodrig...@opensuse.org
+
+- Remove all unused buildRequires.
+
+---
Other differences:
--
++ ntop.spec ++
--- /var/tmp/diff_new_pack.NkG7cJ/_old 2014-10-14 07:13:13.0 +0200
+++ /var/tmp/diff_new_pack.NkG7cJ/_new 2014-10-14 07:13:13.0 +0200
@@ -32,47 +32,29 @@
# and wasting space
#TODO: Requires: GeoIP
#TODO: BuildRequires: GeoIP
-BuildRequires: freetype2-devel
BuildRequires: gcc-c++
-BuildRequires: gd-devel
BuildRequires: gdbm-devel
BuildRequires: groff-full
BuildRequires: gzip
-BuildRequires: libart_lgpl-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
BuildRequires: libtool
BuildRequires: lsof
-BuildRequires: lua-devel
-BuildRequires: mysql-devel
BuildRequires: net-snmp-devel
BuildRequires: openssl-devel
+BuildRequires: pkgconfig
BuildRequires: python-devel
-BuildRequires: readline-devel
+BuildRequires: zlib-devel
#
# openSUSE
#
%if 0%{?suse_version}
-BuildRequires: tcpd-devel
-BuildRequires: xorg-x11-devel
PreReq: %fillup_prereq
PreReq: %insserv_prereq
PreReq: /bin/cat
PreReq: sysconfig
-%if 0%{?suse_version} 1100
-BuildRequires: libGeoIP-devel
-BuildRequires: libevent-devel
-%else
-BuildRequires: libevent
-%endif
-%if 0%{?suse_version} 1020
BuildRequires: fdupes
+BuildRequires: libGeoIP-devel
BuildRequires: libpcap-devel
BuildRequires: rrdtool-devel
-%else
-BuildRequires: libpcap
-BuildRequires: rrdtool
-%endif
%endif
#
# Fedora
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntop for openSUSE:Factory
Hello community,
here is the log from the commit of package ntop for openSUSE:Factory checked in
at 2014-06-24 15:16:09
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.changes2013-08-30
11:45:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.ntop.new/ntop.changes 2014-06-24
15:16:24.0 +0200
@@ -1,0 +2,27 @@
+Mon Jun 23 14:29:38 UTC 2014 - tchva...@suse.com
+
+- Remove unused patch:
+ * ntop-remove_ntop_safefree.patch
+ * ntop-compile-fix.patch
+- Remove unused tarball:
+ * etter.finger.os.gz
+
+---
+Tue Jun 17 10:18:00 UTC 2014 - b...@suse.com
+
+- rename README.SuSE to README.SUSE
+- remove bogus util.c
+- remove old sources ntop-5.01.tar.bz2
+
+---
+Tue May 20 09:24:21 UTC 2014 - b...@suse.com
+
+- Update to 5.0.2, probably last available version. Development
+ changed to ntopng
+- Readded nDPI from svn to project
+- added fix POS36-C.patch
+
https://www.securecoding.cert.org/confluence/spaces/flyingpdf/pdfpageexport.action?pageId=16450166
+- readded packagedir bnc#865243
+- Updated first startup information in README.SuSE and rcntop bnc#848276
+
+---
Old:
README.SuSE
etter.finger.os.gz
ntop-5.0.1.tar.bz2
ntop-compile-fix.patch
ntop-remove_ntop_safefree.patch
New:
POS36-C.patch
README.SUSE
nDPI.tar.bz2
ntop-5.0.2.tar.bz2
Other differences:
--
++ ntop.spec ++
--- /var/tmp/diff_new_pack.KsLiqT/_old 2014-06-24 15:16:26.0 +0200
+++ /var/tmp/diff_new_pack.KsLiqT/_new 2014-06-24 15:16:26.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ntop
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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:5.0.1
+Version:5.0.2
Release:0
Summary:Web-Based Network Traffic Monitor
License:GPL-2.0+
@@ -36,6 +36,7 @@
BuildRequires: gcc-c++
BuildRequires: gd-devel
BuildRequires: gdbm-devel
+BuildRequires: groff-full
BuildRequires: gzip
BuildRequires: libart_lgpl-devel
BuildRequires: libjpeg-devel
@@ -101,8 +102,8 @@
Source2:rcntop
Source3:rc.config.ntop
Source4:passcheck.c
-Source5:README.SuSE
-#Source6:etter.finger.os.gz
+Source5:README.SUSE
+Source7:nDPI.tar.bz2
Source10: ntop-rpmlintrc
Patch0: ntop-disable_ethernet_fingerprint_database_download.patch
Patch1: ntop-disable_darwin.patch
@@ -113,6 +114,7 @@
Patch8: ntop-fix-timestamp.patch
Patch10:ntop-disable_svn_check.patch
Patch11:ntop-no-return-in-nonvoid-function.patch
+Patch12:POS36-C.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -122,7 +124,7 @@
%prep
-%setup -q
+%setup -q -a 7
%patch0
%patch1
%patch2
@@ -132,13 +134,13 @@
%patch8
%patch10
%patch11
-#cp %%{SOURCE6} .
+%patch12 -p1
# fix/remove files with wrong encoding
#rm docs/RedHat-rpmbuild-HOWTO.txt
#rm docs/ntop-autotools.vsd docs/INSTALL
rm -f docs/README.Suse
-cp %{SOURCE5} docs/README.Suse
+cp %{SOURCE5} docs/README.SUSE
sed -i s|
||g python/templates/rrdAlarmStart.tmpl
chmod -x python/templates/rrdAlarmStart.tmpl docs/ntop-autotools.vsd
@@ -175,7 +177,7 @@
# 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/
@@ -252,6 +254,8 @@
# do not switch until you really know that you need it:
#%%dir %%attr(-,%%{pkg_user},%%{pkg_user}) %%{_datadir}/%%{name}
%dir %{_datadir}/%{name}
+%dir %{pkg_home}
+%dir %{pkg_home}/rrd
%{_datadir}/ntop/html
%{_datadir}/ntop/python
%dir %{_sysconfdir}/ntop
++ POS36-C.patch ++
Index: ntop-5.0.2/util.c
===
--- ntop-5.0.2.orig/util.c
+++ ntop-5.0.2/util.c
@@ -3998,7 +3998,11 @@ void checkUserIdentity(int userSpecified
#ifndef WIN32
if((getuid() != geteuid()) || (getgid() != getegid())) {
commit ntop for openSUSE:Factory
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.changes2012-10-25
12:11:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.ntop.new/ntop.changes 2013-08-30
11:45:10.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.dT7Vpp/_new 2013-08-30 11:45:17.0 +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 \
commit ntop for openSUSE:Factory
Hello community,
here is the log from the commit of package ntop for openSUSE:Factory checked in
at 2012-10-25 12:11:11
Comparing /work/SRC/openSUSE:Factory/ntop (Old)
and /work/SRC/openSUSE:Factory/.ntop.new (New)
Package is ntop, Maintainer is b...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ntop/ntop.changes2012-01-25
15:02:29.0 +0100
+++ /work/SRC/openSUSE:Factory/.ntop.new/ntop.changes 2012-10-25
12:11:14.0 +0200
@@ -1,0 +2,8 @@
+Mon Oct 8 08:38:22 UTC 2012 - l...@linux-schulserver.de
+
+- create logrotate script dynamically during build to have the
+ correct pkg_user and pkg_group assigned - and also the 'su'
+ option for younger logrotate packages
+- added restart_on_update snipplet in postun
+
+---
Old:
ntop.logrotate
Other differences:
--
++ ntop.spec ++
--- /var/tmp/diff_new_pack.7DU4Ag/_old 2012-10-25 12:11:16.0 +0200
+++ /var/tmp/diff_new_pack.7DU4Ag/_new 2012-10-25 12:11:16.0 +0200
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: ntop
Version:4.1.0
Release:0
@@ -56,8 +57,8 @@
PreReq: /bin/cat
PreReq: sysconfig
%if 0%{?suse_version} 1100
-BuildRequires: libevent-devel
BuildRequires: libGeoIP-devel
+BuildRequires: libevent-devel
%else
BuildRequires: libevent
%endif
@@ -95,7 +96,6 @@
PreReq: sysconfig
%endif
Source: %{name}-%{version}.tar.bz2
-Source1:ntop.logrotate
Source2:rcntop
Source3:rc.config.ntop
Source4:passcheck.c
@@ -139,7 +139,7 @@
rm docs/ntop-autotools.vsd docs/INSTALL
rm -f docs/README.Suse
cp %{SOURCE5} docs/README.Suse
-sed -i s|
||g python/templates/rrdAlarmStart.tmpl
+sed -i s|^M||g python/templates/rrdAlarmStart.tmpl
chmod -x python/templates/rrdAlarmStart.tmpl
# Remove build time references so build-compare can do its work
@@ -189,7 +189,22 @@
# install /var/lib/ntop, so ntop can store it's databases
mkdir -p
%{buildroot}%{_localstatedir}/lib/%{name}/rrd/{flows,graphics,interfaces}
# install logrotate script
-install -Dm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+cat %{buildroot}%{_sysconfdir}/logrotate.d/%{name} EOF
+/var/log/ntop/*.log {
+weekly
+missingok
+rotate 4
+# ntop doesn't handle SIGHUP
+copytruncate
+compress
+notifempty
+create 640 %{pkg_user} %{pkg_user}
+%if 0%{?suse_version} 1200
+su %{pkg_user} %{pkg_user}
+%endif
+}
+EOF
# TODO: link to GeoIP databases
# extract the files in %%{_sysconfdir}/%%{name} as ntop expects them
uncompressed
gunzip %{buildroot}%{_sysconfdir}/%{name}/*.gz
@@ -219,7 +234,8 @@
%postun
%{insserv_cleanup}
- /sbin/ldconfig
+%{restart_on_update}
+/sbin/ldconfig
%files
%defattr(-,root,root)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ntop for openSUSE:Factory
Hello community,
here is the log from the commit of package ntop for openSUSE:Factory
checked in at Thu Apr 7 10:41:09 CEST 2011.
--- ntop/ntop.changes 2010-11-10 16:13:29.0 +0100
+++ /mounts/work_src_done/STABLE/ntop/ntop.changes 2011-04-06
19:20:13.0 +0200
@@ -1,0 +2,14 @@
+Wed Mar 16 14:12:19 UTC 2011 - alexan...@exatati.com.br
+
+- Update etter.finger.os.gz file.
+
+---
+Wed Mar 16 13:36:08 UTC 2011 - alexan...@exatati.com.br
+
+- Update to 4.0.3:
+ * Sorry no news or changelogs about recent fixes or improvements
+on ntop's source or website.
+- Refreshed ntop-%{version} patch;
+- Minor spec file improvement.
+
+---
calling whatdependson for head-i586
Old:
ntop-4.0.diff
ntop-4.0.tar.bz2
New:
ntop-4.0.3.diff
ntop-4.0.3.tar.bz2
Other differences:
--
++ ntop.spec ++
--- /var/tmp/diff_new_pack.VxnLpK/_old 2011-04-07 10:39:52.0 +0200
+++ /var/tmp/diff_new_pack.VxnLpK/_new 2011-04-07 10:39:52.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package ntop (Version 4.0)
+# spec file for package ntop
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -74,10 +74,9 @@
%endif
%endif
%endif
-Version:4.0
-Release:3
+Version:4.0.3
+Release:1
License:GPLv2+
-Group: Productivity/Networking/Diagnostic
#
%define pkg_name ntop
%define pkg_user ntop
@@ -88,6 +87,7 @@
%define xorg_libdir %{_libdir}
Summary:Web-Based Network Traffic Monitor
Url:http://www.ntop.org
+Group: Productivity/Networking/Diagnostic
Source: %{name}-%{version}.tar.bz2
Source2:rcntop
Source3:rc.config.ntop
@@ -95,7 +95,7 @@
Source5:README.SuSE
Source6:etter.finger.os.gz
# PATCH-FIX-UPSTREAM ntop-%{version}.diff
-Patch: ntop-%{version}.diff
+Patch0: ntop-%{version}.diff
# PATCH-FIX-UPSTREAM rrdPlugin.diff
Patch2: rrdPlugin.diff
# PATCH-FIX-OPENSUSE dotpath.diff
@@ -110,7 +110,7 @@
%prep
%setup -q
-%patch
+%patch0
%patch2
%patch4
%patch6
@@ -128,12 +128,13 @@
--disable-static\
--enable-sslv3 \
--enable-i18n
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
gcc -o passcheck %{optflags} %{SOURCE4} -lgdbm
%install
# remove old (pre SuSE Linux 7.0) README.Suse provided by ntop
rm -f docs/README.Suse
+dos2unix python/templates/rrdAlarmStart.tmpl
make DESTDIR=%{buildroot} install install-man
chmod 644 %{buildroot}%{_sysconfdir}/ntop/oui.txt.gz
chmod 644 %{buildroot}%{_sysconfdir}/ntop/specialMAC.txt.gz
++ etter.finger.os.gz ++
1552 lines (skipped)
between etter.finger.os.gz
and /mounts/work_src_done/STABLE/ntop/etter.finger.os.gz
++ ntop-4.0.diff - ntop-4.0.3.diff ++
--- ntop/ntop-4.0.diff 2010-08-25 21:45:40.0 +0200
+++ /mounts/work_src_done/STABLE/ntop/ntop-4.0.3.diff 2011-03-16
15:07:40.0 +0100
@@ -169,7 +169,7 @@
===
--- plugins/rrdPlugin.c.orig
+++ plugins/rrdPlugin.c
-@@ -5130,7 +5130,7 @@ static void* rrdTrafficThreadLoop(void*
+@@ -5127,7 +5127,7 @@ static void* rrdTrafficThreadLoop(void*
traceEvent(CONST_TRACE_INFO,
THREADMGMT[t%lu]: RRD: Throughput data collection: Thread
terminated [p%d],
(long unsigned int)pthread_self(), getpid());
++ ntop-4.0.tar.bz2 - ntop-4.0.3.tar.bz2 ++
ntop/ntop-4.0.tar.bz2 /mounts/work_src_done/STABLE/ntop/ntop-4.0.3.tar.bz2
differ: char 11, line 1
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
