From ed5f6573ba29ca197ac5a2f5251eaffb7251f15f Mon Sep 17 00:00:00 2001 From: Till Maas Date: Jun 21 2016 16:51:29 +0000 Subject: 2016-06-21: Retired orphaned package, because it was orphaned for more than six weeks. --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 1e42281..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -bandwidthd-2.0.1.tgz diff --git a/0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch b/0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch deleted file mode 100644 index 2d3629d..0000000 --- a/0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0abd4986f9d0b41cea18453e60fe2947e6eae047 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Wed, 9 Dec 2009 08:54:41 +0100 -Subject: [PATCH] Gracefuly exit upon pcap_findalldevs() error - ---- - bandwidthd.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/bandwidthd.c b/bandwidthd.c -index a0d18d0..d69737f 100644 ---- a/bandwidthd.c -+++ b/bandwidthd.c -@@ -320,6 +320,11 @@ int main(int argc, char **argv) - - #ifdef HAVE_PCAP_FINDALLDEVS - pcap_findalldevs(&Devices, Error); -+ if (Devices == NULL) -+ { -+ printf("Can't find network devices: %s", Error); -+ exit(1); -+ } - if (config.dev == NULL && Devices->name) - config.dev = strdup(Devices->name); - if (ListDevices) --- -1.6.5.3 - diff --git a/bandwidthd b/bandwidthd deleted file mode 100644 index 0de4c63..0000000 --- a/bandwidthd +++ /dev/null @@ -1,76 +0,0 @@ -#! /bin/bash -# -# bandwidthd -# -# chkconfig: - 90 26 -# description: Activates/Deactivates bandwidthd network traffic monitor -PROGNAME=/usr/sbin/bandwidthd - -# Source function library. -. /etc/init.d/functions - -if [ ! -f /etc/sysconfig/network ]; then - exit 0 -fi - -. /etc/sysconfig/network - -if [ -f /etc/sysconfig/bandwidthd ]; then - . /etc/sysconfig/bandwidthd -fi - - - -# Check that networking is up. -[ "${NETWORKING}" = "no" ] && exit 0 - - - -# See how we were called. -case "$1" in - start) - - #Register to dns - echo -n $"Starting Bandwidthd network traffic monitor: " - daemon $PROGNAME $OPTIONS - RETVAL=$? - echo - - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bandwidthd - exit $RETVAL - ;; - - stop) - echo -n $"Shuting down Bandwidthd network traffic monitor: " - killproc `basename $PROGNAME` - RETVAL=$? - echo - - [ $RETVAL -eq 0 ] && success || failure - echo - - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bandwidthd - exit $RETVAL - ;; - - status) - status $PROGNAME - ;; - - condrestart) - if [ -f /var/lock/subsys/bandwidthd ]; then - $0 stop - $0 start - fi - ;; - - restart|reload) - $0 stop - $0 start - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload|status}" - exit 1 -esac - -exit 0 diff --git a/bandwidthd-destdir.patch b/bandwidthd-destdir.patch deleted file mode 100644 index 344f517..0000000 --- a/bandwidthd-destdir.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -ru bandwidthd-2.0.1/bandwidthd.c bandwidthd-2.0.1.new/bandwidthd.c ---- bandwidthd-2.0.1/bandwidthd.c 2005-01-11 22:27:26.000000000 +0100 -+++ bandwidthd-2.0.1.new/bandwidthd.c 2005-06-19 03:23:49.000000000 +0200 -@@ -255,22 +255,29 @@ - - openlog("bandwidthd", LOG_CONS, LOG_DAEMON); - -- if (stat("./etc/bandwidthd.conf", &StatBuf)) -+ if (stat("/etc/bandwidthd.conf", &StatBuf)) - { - chdir(INSTALL_DIR); - if (stat("./etc/bandwidthd.conf", &StatBuf)) - { -- printf("Cannot find ./etc/bandwidthd.conf or %s/etc/bandwidthd.conf\n", INSTALL_DIR); -- syslog(LOG_ERR, "Cannot find ./etc/bandwidthd.conf or %s/etc/bandwidthd.conf", INSTALL_DIR); -+ printf("Cannot find /etc/bandwidthd.conf or %s/etc/bandwidthd.conf\n", INSTALL_DIR); -+ syslog(LOG_ERR, "Cannot find /etc/bandwidthd.conf or %s/etc/bandwidthd.conf", INSTALL_DIR); - exit(1); - } -+ else -+ { -+ bdconfig_in = fopen("./etc/bandwidthd.conf", "rt"); -+ } - } -- -- bdconfig_in = fopen("./etc/bandwidthd.conf", "rt"); -+ else -+ { -+ bdconfig_in = fopen("/etc/bandwidthd.conf", "rt"); -+ } -+ - if (!bdconfig_in) - { - syslog(LOG_ERR, "Cannot open bandwidthd.conf"); -- printf("Cannot open ./etc/bandwidthd.conf\n"); -+ printf("Cannot open bandwidthd.conf\n"); - exit(1); - } - bdconfig_parse(); -@@ -290,6 +297,7 @@ - (unsigned long) (0-1), (unsigned long long) (0-1)); - exit(1); - */ -+ chdir(INSTALL_DIR); - - for(Counter = 1; Counter < argc; Counter++) - { -diff -ru bandwidthd-2.0.1/bandwidthd.h bandwidthd-2.0.1.new/bandwidthd.h ---- bandwidthd-2.0.1/bandwidthd.h 2005-01-11 22:15:49.000000000 +0100 -+++ bandwidthd-2.0.1.new/bandwidthd.h 2005-06-19 03:22:21.000000000 +0200 -@@ -100,6 +100,7 @@ - - #define DB_PGSQL 1 - -+ - struct config - { - char *dev; -Only in bandwidthd-2.0.1.new/etc: bandwidthd.conf.orig -Only in bandwidthd-2.0.1.new/etc: bandwidthd.conf.rej -diff -ru bandwidthd-2.0.1/Makefile.in bandwidthd-2.0.1.new/Makefile.in ---- bandwidthd-2.0.1/Makefile.in 2005-01-11 22:15:49.000000000 +0100 -+++ bandwidthd-2.0.1.new/Makefile.in 2005-06-19 03:32:37.000000000 +0200 -@@ -1,10 +1,13 @@ - exec_prefix = @exec_prefix@ - prefix = @prefix@ -+datadir = @datadir@ -+sbindir = @sbindir@ -+ - CC = @CC@ - LDFLAGS = @LDFLAGS@ @LIBS@ - OBS= bandwidthd.o graph.o conf.tab.o conf.l.o - --CFLAGS= -Wall @CFLAGS@ @CPPFLAGS@ @DEFS@ -DINSTALL_DIR="\"$(exec_prefix)/bandwidthd\"" -+CFLAGS= -Wall @CFLAGS@ @CPPFLAGS@ @DEFS@ -DINSTALL_DIR="\"$(datadir)/bandwidthd\"" - NONWALLCFLAGS= @CFLAGS@ @CPPFLAGS@ @DEFS@ - - # Debugging stuff -@@ -38,12 +41,13 @@ - rm -f conf.tab.c conf.tab.h conf.l.c config.h.in configure - - install: all -- @INSTALL@ -d $(DESTDIR)$(exec_prefix)/bandwidthd/etc -- @INSTALL@ -d $(DESTDIR)$(exec_prefix)/bandwidthd/htdocs -- @INSTALL@ -m755 -s bandwidthd $(DESTDIR)$(exec_prefix)/bandwidthd -- if [ ! -f $(DESTDIR)$(exec_prefix)/bandwidthd/etc/bandwidthd.conf ] ; then @INSTALL@ -m644 etc/bandwidthd.conf $(DESTDIR)$(exec_prefix)/bandwidthd/etc/ ; fi -- @INSTALL@ -m644 htdocs/legend.gif $(DESTDIR)$(exec_prefix)/bandwidthd/htdocs -- @INSTALL@ -m644 htdocs/logo.gif $(DESTDIR)$(exec_prefix)/bandwidthd/htdocs -+ @INSTALL@ -d $(DESTDIR)/etc -+ @INSTALL@ -d $(DESTDIR)$(datadir)/bandwidthd/htdocs -+ @INSTALL@ -d $(DESTDIR)$(sbindir) -+ @INSTALL@ -m755 bandwidthd $(DESTDIR)$(sbindir)/bandwidthd -+ if [ ! -f $(DESTDIR)/etc/bandwidthd.conf ] ; then @INSTALL@ -m644 etc/bandwidthd.conf $(DESTDIR)/etc/ ; fi -+ @INSTALL@ -m644 htdocs/legend.gif $(DESTDIR)$(datadir)/bandwidthd/htdocs -+ @INSTALL@ -m644 htdocs/logo.gif $(DESTDIR)$(datadir)/bandwidthd/htdocs - - #**** Stuff where -WALL is turned off to reduce the noise in a compile so I can see my own errors ******************* - conf.l.o: conf.l.c diff --git a/bandwidthd-gcc5.patch b/bandwidthd-gcc5.patch deleted file mode 100644 index 5a5379e..0000000 --- a/bandwidthd-gcc5.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ur bandwidthd-2.0.1/bandwidthd.c bandwidthd-2.0.1.sal/bandwidthd.c ---- bandwidthd-2.0.1/bandwidthd.c 2015-06-17 08:32:09.107759233 +0200 -+++ bandwidthd-2.0.1.sal/bandwidthd.c 2015-06-17 08:32:28.097495172 +0200 -@@ -1255,7 +1255,7 @@ - - size_t ICGrandTotalDataPoints = 0; - --char inline *HostIp2CharIp(unsigned long ipaddr, char *buffer) -+__attribute__ ((gnu_inline)) char inline *HostIp2CharIp(unsigned long ipaddr, char *buffer) - { - struct in_addr in_addr; - char *s; -diff -ur bandwidthd-2.0.1/bandwidthd.c.dest bandwidthd-2.0.1.sal/bandwidthd.c.dest ---- bandwidthd-2.0.1/bandwidthd.c.dest 2005-01-11 22:27:26.000000000 +0100 -+++ bandwidthd-2.0.1.sal/bandwidthd.c.dest 2015-06-17 08:52:20.346954108 +0200 -@@ -1242,7 +1242,7 @@ - - size_t ICGrandTotalDataPoints = 0; - --char inline *HostIp2CharIp(unsigned long ipaddr, char *buffer) -+__attribute__ ((gnu_inline)) char inline *HostIp2CharIp(unsigned long ipaddr, char *buffer) - { - struct in_addr in_addr; - char *s; -diff -ur bandwidthd-2.0.1/bandwidthd.c.nodevs bandwidthd-2.0.1.sal/bandwidthd.c.nodevs ---- bandwidthd-2.0.1/bandwidthd.c.nodevs 2015-06-17 08:32:09.105759261 +0200 -+++ bandwidthd-2.0.1.sal/bandwidthd.c.nodevs 2015-06-17 08:52:30.107817845 +0200 -@@ -1250,7 +1250,7 @@ - - size_t ICGrandTotalDataPoints = 0; - --char inline *HostIp2CharIp(unsigned long ipaddr, char *buffer) -+__attribute__ ((gnu_inline)) char inline *HostIp2CharIp(unsigned long ipaddr, char *buffer) - { - struct in_addr in_addr; - char *s; -diff -ur bandwidthd-2.0.1/bandwidthd.h bandwidthd-2.0.1.sal/bandwidthd.h ---- bandwidthd-2.0.1/bandwidthd.h 2015-06-17 08:32:09.105759261 +0200 -+++ bandwidthd-2.0.1.sal/bandwidthd.h 2015-06-17 08:52:00.842226393 +0200 -@@ -194,7 +194,7 @@ - void RecoverDataFromCDF(void); - - // ************ This function converts and IP to a char string --char inline *HostIp2CharIp(unsigned long ipaddr, char *buffer); -+__attribute__ ((gnu_inline)) char inline *HostIp2CharIp(unsigned long ipaddr, char *buffer); - - // ************ This function converts the numbers for each quad into an IP - inline uint32_t IpAddr(unsigned char q1, unsigned char q2, unsigned char q3, unsigned char q4); diff --git a/bandwidthd-pgsql.patch b/bandwidthd-pgsql.patch deleted file mode 100644 index 2b5e82c..0000000 --- a/bandwidthd-pgsql.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- bandwidthd-2.0.1/configure.in 2005-01-11 22:15:49.000000000 +0100 -+++ configure.in 2008-12-08 17:35:42.000000000 +0100 -@@ -55,8 +55,8 @@ - [AC_CHECK_LIB(wpcap, pcap_open_live, ,[AC_MSG_ERROR([Bandwidthd requires but cannot find libpcap])])]) - - # Optional Library --AC_CHECK_FILE(/usr/local/pgsql/lib, LDFLAGS="$LDFLAGS -L/usr/local/pgsql/lib") --AC_CHECK_FILE(/usr/local/pgsql/include, CPPFLAGS="$CPPFLAGS -I/usr/local/pgsql/include") -+AC_CHECK_FILE(/usr/lib, LDFLAGS="$LDFLAGS -L/usr/lib") -+AC_CHECK_FILE(/usr/include/pgsql, CPPFLAGS="$CPPFLAGS -I/usr/include/pgsql") - AC_CHECK_LIB(pq, PQconnectdb, - [AC_CHECK_LIB(pq,PQexecParams, ,AC_MSG_WARN([libpq exists but is too old... bandwidthd requires support for PQexecParams]))]) - diff --git a/bandwidthd.service b/bandwidthd.service deleted file mode 100644 index bdbf0b7..0000000 --- a/bandwidthd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Bandwidthd Network Traffic Monitor -After=network.target - -[Service] -Type=forking -PIDFile=/run/bandwidthd.pid -ExecStart=/usr/sbin/bandwidthd - -[Install] -WantedBy=multi-user.target diff --git a/bandwidthd.spec b/bandwidthd.spec deleted file mode 100644 index 11e56ac..0000000 --- a/bandwidthd.spec +++ /dev/null @@ -1,211 +0,0 @@ -# You can compile this without postgresql support by running: -# rpmbuild -ba bandwidthd.spec --without pgsql - -Name: bandwidthd -Version: 2.0.1 -Release: 31%{?dist} -Summary: Tracks network usage and builds html and graphs - -Group: System Environment/Daemons -License: GPL+ -URL: http://bandwidthd.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz -Source1: %{name} -Source2: %{name}.service -Patch0: bandwidthd-destdir.patch -Patch1: bandwidthd-pgsql.patch -Patch2: 0001-Gracefuly-exit-upon-pcap_findalldevs-error.patch -Patch3: bandwidthd-gcc5.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf, gd-devel, libpng-devel -%{?!_without_pgsql:BuildRequires: postgresql-devel} -%if "0%{?dist}" == "0.el4" -BuildRequires: libpcap -%else -BuildRequires: libpcap-devel -%endif -%if 0%{?fedora} || 0%{?rhel} > 6 -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -BuildRequires: systemd-units -%else -Requires(post): /sbin/chkconfig -Requires(preun):/sbin/chkconfig -Requires(preun):/sbin/service -%endif - -%description -Bandwidthd is a UNIX daemon/Windows service for graphing the traffic -generated by each machine on several configurable subnets. It is much -easier to configure than MRTG, and provides significantly more useful -information. MRTG only tells you how much bandwidth you are using, -Bandwidthd tells you that, and who is using it. - -Each IP address that has moved any significant volume of traffic has its -own graph. The graphs are color coded to help you figure out at a glance -if your user is surfing the web, or surfing Kazaa. - -Bandwidthd is targeted to run on my routing platforms. It is very low -overhead. Easily graphing small business traffic on a 133Mhz Elan 486 -every 2.5 minutes. My entire ISP (2000-3000 IP addresses across 4 states) -is graphed on a Celeron 450 every 10 minutes. - - -%prep -%setup -q -%patch0 -p1 -b .dest -%patch1 -p0 -b .pgsql -%patch2 -p1 -b .nodevs -%patch3 -p1 -b .gcc5 - -%build -cp -af /usr/lib/rpm/config.{sub,guess} . -autoconf -%configure --prefix=%{_prefix} \ - --exec-prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir} \ - --bindir=%{_bindir} \ - --datadir=%{_var}/www -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -# start script -%if 0%{?fedora} || 0%{?rhel} > 6 -mkdir -p $RPM_BUILD_ROOT%{_unitdir} -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/ -%else -install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ -%endif -# install apache configuration -install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d -echo "Alias /%{name} %{_var}/www/%{name}/htdocs" \ - > $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf -# remove execute bit for gif and sh script without #! -chmod -x phphtdocs/* - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -%systemd_post %{name}.service - -%preun -%systemd_preun %{name}.service - -%postun -%systemd_postun_with_restart %{name}.service - -%files -%defattr(-,root,root,-) -%doc README CHANGELOG TODO -%{?!_without_pgsql:%doc phphtdocs} -%config(noreplace) %{_sysconfdir}/%{name}.conf -%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf -%if 0%{?fedora} || 0%{?rhel} > 6 -%{_unitdir}/%{name}.service -%else -%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/%{name} -%endif -%{_sbindir}/%{name} -%dir %{_var}/www/%{name} -%{_var}/www/%{name}/* - - -%changelog -* Wed Feb 03 2016 Ján ONDREJ (SAL) - 2.0.1-31 -- Fix bandwidthd.service file permissions and patch URL. - -* Wed Feb 03 2016 Fedora Release Engineering - 2.0.1-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Ján ONDREJ (SAL) - 2.0.1-29 -- GCC5 inline compatibility. - -* Wed Jun 17 2015 Fedora Release Engineering - 2.0.1-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Aug 15 2014 Fedora Release Engineering - 2.0.1-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2.0.1-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Jan 10 2014 Ján ONDREJ (SAL) - 2.0.1-25 -- Scriptlets replaced with new systemd macros (#850042) - Thanks to Václav Pavlín. - -* Sat Aug 03 2013 Fedora Release Engineering - 2.0.1-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jun 11 2013 Remi Collet - 2.0.1-23 -- rebuild for new GD 2.1.0 - -* Sat Mar 23 2013 Ján ONDREJ (SAL) - 2.0.1-22 -- added autoreconf to prep section (bz#925079) - -* Wed Feb 13 2013 Fedora Release Engineering - 2.0.1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 2.0.1-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 2.0.1-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Nov 17 2011 Ján ONDREJ (SAL) - 2.0.1-18 -- systemd pre/post scripts - -* Wed Nov 16 2011 Ján ONDREJ (SAL) - 2.0.1-17 -- added native systemd service (bz#754478) - -* Mon Feb 07 2011 Fedora Release Engineering - 2.0.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Dec 09 2009 Ján ONDREJ (SAL) - 2.0.1-15 -- Applied patch from lkundrak to do not hang when no devices found. bz#537073 - -* Fri Jul 24 2009 Fedora Release Engineering - 2.0.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 2.0.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Dec 13 2008 Jan ONDREJ (SAL) - 2.0.1-11 -- updated config.sub and config.guess to build on ppc64 -- added libpng-devel again (required for EPEL-4) - -* Sat Dec 13 2008 Jan ONDREJ (SAL) - 2.0.1-8 -- removed dependency on gd -- removed one line of autoconf -- removed dependency on libpng-devel -- phphtdocs added for pgsql build, execute bit for gif and sh removed - -* Mon Dec 8 2008 Jan ONDREJ (SAL) - 2.0.1-7 -- changed License to GPL+ - -* Mon Dec 8 2008 Jan ONDREJ (SAL) - 2.0.1-6 -- buildroot macro replaced by RPM_BUILD_ROOT variable -- added autoconf into build-requires -- by default compiled with postgresql support -- conditional build without postgresql (--without pgsql) -- libpng removed from requires - -* Mon Dec 8 2008 Jan ONDREJ (SAL) - 2.0.1-5 -- conditional build for el4 - -* Sun Sep 9 2007 Jan ONDREJ (SAL) - 2.0.1-4 -- updated license and summary -- changed init script permissions - -* Tue Mar 13 2007 Jan ONDREJ (SAL) -- updated from version by Michal Ambroz -- added apache configuration script -- moved into /var/www/bandwidthd -- spec file name typo fixed diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..d861b3d --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2016-06-21: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/sources b/sources deleted file mode 100644 index 97f64f8..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -aa79aad7bd489fd2cae1f7dc086ca8b6 bandwidthd-2.0.1.tgz