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.changes 2013-08-30 11:45:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ntop.new/ntop.changes 2014-06-24 15:16:24.000000000 +0200 @@ -1,0 +2,27 @@ +Mon Jun 23 14:29:38 UTC 2014 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.KsLiqT/_new 2014-06-24 15:16:26.000000000 +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())) { /* setuid binary, drop privileges */ - if((setgid(getgid()) != 0) || (setuid(getuid()) != 0)) { + if(setgid(getgid()) != 0) { + traceEvent(CONST_TRACE_FATALERROR, "Unable to drop privileges"); + exit(33); /* Just in case */ + } + if(setuid(getuid()) != 0) { traceEvent(CONST_TRACE_FATALERROR, "Unable to drop privileges"); exit(33); /* Just in case */ } @@ -4011,7 +4015,11 @@ void checkUserIdentity(int userSpecified if(userSpecified) { /* User located */ if((myGlobals.userId != 0) || (myGlobals.groupId != 0)) { - if((setgid(myGlobals.groupId) != 0) || (setuid(myGlobals.userId) != 0)) { + if(setgid(myGlobals.groupId) != 0) { + traceEvent(CONST_TRACE_FATALERROR, "Unable to change user"); + exit(34); /* Just in case */ + } + if(setuid(myGlobals.userId) != 0) { traceEvent(CONST_TRACE_FATALERROR, "Unable to change user"); exit(34); /* Just in case */ } ++++++ README.SUSE ++++++ ntop is a tool that shows the network usage ------------------------------------------- If you have ntop listening on port 3000, the URL to access is http://hostname:3000/ Administrators can protect selected URLs with a password. All the administration is performed with ntop. The default administrator user is 'admin'. You will have to set the password for admin manually with the command ntop -P /var/lib/ntop -A -u wwwrun Please note that a HTTP server is NOT needed in order to use the program in interactive mode. By default, you may access ntop only from localhost at port 3000. ++++++ ntop-5.0.1.tar.bz2 -> ntop-5.0.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ntop/ntop-5.0.1.tar.bz2 /work/SRC/openSUSE:Factory/.ntop.new/ntop-5.0.2.tar.bz2 differ: char 11, line 1 ++++++ rcntop ++++++ --- /var/tmp/diff_new_pack.KsLiqT/_old 2014-06-24 15:16:26.000000000 +0200 +++ /var/tmp/diff_new_pack.KsLiqT/_new 2014-06-24 15:16:26.000000000 +0200 @@ -86,7 +86,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${warn}ntop -A -u $NTOP_USER${rc_reset}\nmanually " + echo -e -n "Run \n\t${warn}ntop -P /var/lib/ntop -A -u $NTOP_USER${rc_reset}\nmanually " rc_status -u exit else -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
