Changes of Revision 67
| [-] [+] | Changed | ntop.spec |
| [-] [+] | Deleted | ntop-4.0.diff ^ |
| @@ -1,94 +0,0 @@ ---- 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; i<MAX_SSL_CONNECTIONS; i++) { - if((myGlobals.ssl[i].ctx != NULL) ---- fcReport.c 2006/03/20 13:55:38 1.1 -+++ fcReport.c 2006/03/20 13:59:50 -@@ -4066,7 +4066,7 @@ - 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; ---- Makefile.am 2006/04/03 09:09:17 1.1 -+++ Makefile.am 2006/04/03 09:09:40 -@@ -134,8 +134,7 @@ - ntop.c pbuf.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 = myrrd/libmyrrd.la config.h - libntop_la_LIBADD = ---- plugins/Makefile.am.orig 2007-07-31 09:05:01.000000000 +0000 -+++ plugins/Makefile.am 2007-07-31 09:07:36.000000000 +0000 -@@ -95,7 +95,7 @@ - # - - --.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 \ -@@ -119,7 +119,7 @@ - - ############### - --.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 \ -@@ -155,7 +155,7 @@ - - ############### - --.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 \ -@@ -167,7 +167,7 @@ - - ############### - --.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 \ -@@ -179,7 +179,7 @@ - - ############### - --.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 \ ---- globals-core.h.orig 2008-01-04 00:32:46.000000000 +0100 -+++ globals-core.h 2008-06-12 09:40:14.000000000 +0200 -@@ -256,10 +256,6 @@ - - #ifdef MAKE_WITH_SAFER_ROUTINES - --/* Fix to the free prototype courtesy of Tanner Lovelace <lovelace@opennms.org> */ --/* Fix free() courtesy of Benoit Dolez <bdolez@exosec.fr> */ --#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__) | ||
| Deleted | GeoIP.tar.bz2 ^ | |
| [-] [+] | Deleted | ntop.spec-34rc1 ^ |
| @@ -1,449 +0,0 @@ -# -# spec file for package ntop (Version 3.3.99.1) -# -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. -# -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild -%define _pkgversion 3.4-RC1 - -Name: ntop -BuildRequires: dos2unix freetype2-devel gcc-c++ gd-devel gdbm-devel libart_lgpl-devel libjpeg-devel libpng-devel -BuildRequires: lsof mysql-devel net-snmp-devel openssl-devel readline-devel wget -BuildRequires: libGeoIP-devel lua-devel -%if 0%{?suse_version} -BuildRequires: tcpd-devel xorg-x11-devel libevent python-devel -PreReq: /bin/cat %fillup_prereq %insserv_prereq sysconfig - -%if 0%{?suse_version} > 1020 -BuildRequires: fdupes libpcap-devel rrdtool-devel -%else -BuildRequires: libpcap rrdtool-devel -%endif - -%if 0%{?suse_version} >= 1110 -BuildRequires: libevent-devel -%endif - -%else - -%if 0%{?fedora_version} -PreReq: /bin/cat /sbin/insserv /bin/fillup sysconfig -BuildRequires: libpcap-devel rrdtool-devel xorg-x11-devel libevent-devel -%else - -%if 0%{?mandriva_version} -BuildRequires: libpcap-devel librrdtool-devel rrdtool -PreReq: /bin/cat /sbin/insserv /bin/fillup sysconfig -%endif - -%endif - -%endif -License: GPL v2 or later -Group: Productivity/Networking/Diagnostic -AutoReqProv: on -Version: 3.3.99.1 -Release: 678 -Summary: Web-Based Network Traffic Monitor -Source: %{name}-%{_pkgversion}.tar.bz2 -Source2: rcntop -Source3: rc.config.ntop -Source4: passcheck.c -Source5: README.SuSE - -Source21: GeoLiteCity.dat.gz -Source22: GeoIPASNum.dat.gz -Patch: ntop-%{version}.diff -#Patch1: ntop-%{version}-geoip.patch -Patch2: rrdPlugin.diff -Patch4: dotpath-%{version}.diff -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: --------- - Luca Deri <deri@ntop.org> - -%prep -%setup -q -n %{name}-%{_pkgversion} -%patch -##%patch1 -%patch2 -%patch4 -# copy geoip files to source directory - disables download when running configure -zcat %{S:21} > GeoLiteCity.dat -zcat %{S:22} > GeoIPASNum.dat - -%build -%{?suse_update_config:%{suse_update_config -f gdchart* ntop . }} -# ntop wants to setup the files for the newer autoconf itself: -aclocal -%if 0%{?suse_version} <= 1020 -mkdir -p m4 -%endif -./autogen.sh -# NTOP_AUTOREBUILD=yes ./configure || echo "new autoconf prepared" -# now we are ready for the real configure... -%if "%(xft-config --prefix)" == "/usr" -LIBDIR=%{_libdir} 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 \ - --disable-static \ - --enable-sslv3 \ - --enable-i18n -%else -LIBDIR=%{_libdir} 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 -%__make DESTDIR=%{buildroot} install -# use the relinked librrdPlugin.so instead of the copied plugin -cp -v $RPM_BUILD_ROOT%{_libdir}/librrdPlugin.so \ - $RPM_BUILD_ROOT%{_libdir}/ntop/plugins/rrdPlugin.so -# rm $RPM_BUILD_ROOT%{_libdir}/ntop/plugins/rrdPlugin.so -%__make DESTDIR=%{buildroot} install-man -##%__make DESTDIR=%{buildroot} install-data-as -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/var/lib/ntop -cp ntop-cert.pem docs/ -cp %SOURCE5 . -find $RPM_BUILD_ROOT/usr/share/ntop/html -type f -print0 | xargs -0 chmod 644 -%if 0%{?suse_version} > 1020 -%fdupes $RPM_BUILD_ROOT/usr/share/ntop/html/ -%fdupes $RPM_BUILD_ROOT%{_libdir}/ntop/plugins/ -%endif -find $RPM_BUILD_ROOT -name "*.la" | xargs rm -rm docs/ntop-autotools.vsd -dos2unix docs/RedHat-rpmbuild-HOWTO.txt - -# strip bins -strip %{buildroot}%{_bindir}/ntop -strip %{buildroot}%{_libdir}/libcpacketPlugin-%{version}.so -strip %{buildroot}%{_libdir}/libicmpPlugin-%{version}.so -strip %{buildroot}%{_libdir}/liblastSeenPlugin-%{version}.so -strip %{buildroot}%{_libdir}/libnetflowPlugin-%{version}.so -strip %{buildroot}%{_libdir}/libntop-%{version}.so -strip %{buildroot}%{_libdir}/libntopreport-%{version}.so -strip %{buildroot}%{_libdir}/librrdPlugin-%{version}.so -strip %{buildroot}%{_libdir}/libsflowPlugin-%{version}.so -strip %{buildroot}%{_libdir}/ntop/plugins/cpacketPlugin.so -strip %{buildroot}%{_libdir}/ntop/plugins/icmpPlugin.so -strip %{buildroot}%{_libdir}/ntop/plugins/lastSeenPlugin.so -strip %{buildroot}%{_libdir}/ntop/plugins/netflowPlugin.so -strip %{buildroot}%{_libdir}/ntop/plugins/rrdPlugin.so -strip %{buildroot}%{_libdir}/ntop/plugins/sflowPlugin.so -strip %{buildroot}%{_sbindir}/passcheck - - -%post -# Are we in update mode? -if [ ${1:-0} -gt 1 ]; then - if [ -f etc/sysconfig/ntopd -a ! -L etc/sysconfig/ntopd ]; then - echo "Renaming config file ntopd to ntop" - mv etc/sysconfig/ntopd etc/sysconfig/ntop - fi -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 } - -%postun -/sbin/ldconfig -%{insserv_cleanup} - -%preun -%stop_on_removal | ||