Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
b292009543 | ||
|
57aea7adf6 | ||
|
db571f96a5 |
6 changed files with 139 additions and 181 deletions
71
bwbar
Normal file
71
bwbar
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Starting bwbar as daemon
|
||||
# Author: Adrian Reber <adrian@lisas.de>
|
||||
#
|
||||
# chkconfig: - 50 01
|
||||
#
|
||||
# description: start bwbar as daemon
|
||||
# processname: bwbar
|
||||
|
||||
# source function library
|
||||
. /etc/rc.d/init.d/functions
|
||||
|
||||
# Source networking configuration.
|
||||
[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network
|
||||
|
||||
# Check that networking is up.
|
||||
[ "${NETWORKING}" = "no" ] && exit 0
|
||||
|
||||
|
||||
if [ -f /etc/sysconfig/bwbar ]; then
|
||||
. /etc/sysconfig/bwbar
|
||||
fi
|
||||
|
||||
if [ -z $BWBAR_USER ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
RETVAL=0
|
||||
|
||||
start() {
|
||||
echo -n "Starting bwbar: "
|
||||
daemon --user $BWBAR_USER bwbar $OPTIONS
|
||||
RETVAL=$?
|
||||
echo
|
||||
}
|
||||
|
||||
stop() {
|
||||
echo -n "Stopping bwbar: "
|
||||
killproc bwbar
|
||||
RETVAL=$?
|
||||
echo
|
||||
}
|
||||
|
||||
restart() {
|
||||
stop
|
||||
start
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart)
|
||||
restart
|
||||
;;
|
||||
reload)
|
||||
restart
|
||||
;;
|
||||
status)
|
||||
status bwbar
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|status|restart}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
|
@ -1,7 +1,26 @@
|
|||
diff -u bwbar-1.2.3/bwbar.c bwbar-1.2.3.new/bwbar.c
|
||||
--- bwbar-1.2.3/bwbar.c 2006-08-26 18:31:26.000000000 +0200
|
||||
+++ bwbar-1.2.3.new/bwbar.c 2008-09-01 11:30:41.000000000 +0200
|
||||
@@ -214,7 +216,7 @@
|
||||
--- bwbar.c.orig 2004-07-16 15:05:08.000000000 +0200
|
||||
+++ bwbar.c 2004-07-16 15:11:03.000000000 +0200
|
||||
@@ -156,6 +156,7 @@
|
||||
{ "kbps", 0, 0, 'k' },
|
||||
{ "Mbps", 0, 0, 'M' },
|
||||
{ "Gbps", 0, 0, 'G' },
|
||||
+ { "Daemon", 0, 0, 'D' },
|
||||
{ "help", 0, 0, 'h' },
|
||||
{ 0, 0, 0, 0 }
|
||||
};
|
||||
@@ -178,6 +179,7 @@
|
||||
" --kbps -k Bandwidth is measured in kbit/s\n"
|
||||
" --Mbps -M Bandwidth is measured in Mbit/s (default)\n"
|
||||
" --Gbps -G Bandwidth is measured in Gbit/s\n"
|
||||
+ " --Daemon -D Run as daemon\n"
|
||||
" --help -h Display this text\n",
|
||||
program);
|
||||
exit(err);
|
||||
@@ -211,10 +213,11 @@
|
||||
int width = 600; /* Bar width */
|
||||
int height = 4; /* Bar height */
|
||||
int border = 1; /* Bar border */
|
||||
+ int daemon_mode = 0; /* run as daemon */
|
||||
|
||||
program = argv[0];
|
||||
|
||||
|
|
@ -10,12 +29,29 @@ diff -u bwbar-1.2.3/bwbar.c bwbar-1.2.3.new/bwbar.c
|
|||
switch ( opt ) {
|
||||
case 'i':
|
||||
measure_input = 1;
|
||||
@@ -260,6 +260,8 @@
|
||||
@@ -252,6 +255,9 @@
|
||||
unit = 1.0e+9;
|
||||
unit_name = "Gbit/s";
|
||||
break;
|
||||
+ case 'D':
|
||||
+ daemon_mode = 1;
|
||||
+ break;
|
||||
case 'h':
|
||||
usage(0);
|
||||
break;
|
||||
@@ -278,7 +284,12 @@
|
||||
|
||||
first = 1;
|
||||
lbin = 0; lbout = 0;
|
||||
-
|
||||
+
|
||||
+ if ( daemon_mode == 1) {
|
||||
+ if ( fork() != 0)
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
gettimeofday(&t_last, NULL);
|
||||
|
||||
while ( 1 ) {
|
||||
|
||||
/**** Begin code that obtains bandwidth data ****/
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- bwbar.c.org 2004-06-01 14:54:12.000000000 -0500
|
||||
+++ bwbar.c 2004-05-12 00:58:50.000000000 -0500
|
||||
--- bwbar.c 2004-06-01 14:54:12.000000000 -0500
|
||||
+++ ../tmp/bwbar-1.2/bwbar.c 2004-05-12 00:58:50.000000000 -0500
|
||||
@@ -315,7 +315,7 @@
|
||||
|
||||
/* Get interface info */
|
||||
|
|
|
|||
169
bwbar.spec
169
bwbar.spec
|
|
@ -1,23 +1,20 @@
|
|||
Summary: Generate a readout of the current bandwidth use
|
||||
Name: bwbar
|
||||
Version: 1.2.3
|
||||
Release: 40%{?dist}
|
||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later
|
||||
Release: 2
|
||||
License: GPLv2+
|
||||
Group: System Environment/Base
|
||||
Source0: http://www.kernel.org/pub/software/web/bwbar/bwbar-1.2.3.tar.bz2
|
||||
Source1: bwbar.systemd
|
||||
Source1: bwbar
|
||||
Source2: bwbar.8
|
||||
Patch0: bwbar.daemon.patch
|
||||
Patch1: bwbar.debian-010_directory_option.patch
|
||||
Patch2: bwbar.debian-020_proc_net_2.6.x_fix.patch
|
||||
Patch3: bwbar.zlib.h.patch
|
||||
URL: http://www.kernel.org/pub/software/web/bwbar/
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libpng-devel systemd-units
|
||||
BuildRequires: make
|
||||
Requires(post): systemd-units, systemd-sysv
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: libpng-devel
|
||||
Requires(post): chkconfig
|
||||
Requires(preun): chkconfig /sbin/service
|
||||
|
||||
%description
|
||||
bwbar is a small program that generates a text and a graphical readout
|
||||
|
|
@ -25,10 +22,9 @@ of the current bandwidth use. It is currently for Linux only.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P0 -p1
|
||||
%patch -P1 -p0
|
||||
%patch -P2 -p0
|
||||
%patch -P3 -p1
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
|
@ -41,153 +37,38 @@ of the current bandwidth use. It is currently for Linux only.
|
|||
%{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
|
||||
%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
|
||||
%{__install} -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
|
||||
%{__install} -m 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
|
||||
%{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}
|
||||
%{__install} -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8
|
||||
|
||||
%{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/bwbar << END
|
||||
#OPTIONS="eth0 100 -d /path/to/outdir"
|
||||
#OPTIONS="-D eth0 100 -d /path/to/outdir"
|
||||
#BWBAR_USER="please_define_a_user"
|
||||
END
|
||||
|
||||
%post
|
||||
%systemd_post %{name}.service
|
||||
if [ "$1" -eq "1" ]; then
|
||||
/sbin/chkconfig --add %{name}
|
||||
fi
|
||||
|
||||
%preun
|
||||
%systemd_preun %{name}.service
|
||||
if [ "$1" -eq "0" ]; then
|
||||
/sbin/service %{name} stop > /dev/null 2>&1
|
||||
/sbin/chkconfig --del %{name}
|
||||
fi
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart %{name}.service
|
||||
|
||||
%triggerun -- %{name} < 1.2.3-11
|
||||
/usr/bin/systemd-sysv-convert --save %{name} >/dev/null 2>&1 ||:
|
||||
/bin/systemctl --no-reload enable %{name}.service >/dev/null 2>&1 ||:
|
||||
/sbin/chkconfig --del %{name} >/dev/null 2>&1 || :
|
||||
/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
|
||||
|
||||
%clean
|
||||
%{__rm} -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-, root, root, 0755)
|
||||
%doc README
|
||||
%{_bindir}/%{name}
|
||||
%{_mandir}/man8/*
|
||||
%{_unitdir}/%{name}.service
|
||||
%{_initrddir}/%{name}
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
|
||||
|
||||
%changelog
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-40
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-39
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 1.2.3-38
|
||||
- convert license to SPDX
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-37
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-36
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-35
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-34
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-33
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-32
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-31
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.2.3-30
|
||||
- Rebuilt for updated systemd-rpm-macros
|
||||
See https://pagure.io/fesco/issue/2583.
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-29
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Tue Aug 21 2012 Adrian Reber <adrian@lisas.de> - 1.2.3-13
|
||||
- fix for "Introduce new systemd-rpm macros in bwbar spec file" (#850052)
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Wed Jan 25 2012 Adrian Reber <adrian@lisas.de> - 1.2.3-11
|
||||
- added systemd files
|
||||
- almost remove '-D' daemon feature (not needed with systemd)
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Dec 06 2011 Adrian Reber <adrian@lisas.de> - 1.2.3-9
|
||||
- fix build failure with new libpng
|
||||
|
||||
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1.2.3-8
|
||||
- Rebuild for new libpng
|
||||
|
||||
* Thu Mar 31 2011 Adrian Reber <adrian@lisas.de> - 1.2.3-7
|
||||
- fix patch (**** rejecting target file name with ".." component)
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Mon Sep 01 2008 Adrian Reber <adrian@lisas.de> - 1.2.3-3
|
||||
- recreated bwbar.daemon.patch to apply cleanly
|
||||
|
||||
* Fri Feb 15 2008 Adrian Reber <adrian@lisas.de> - 1.2.3-2
|
||||
- rebuilt for gcc43
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
[Unit]
|
||||
Description=Bandwith Usage Monitor
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=-/etc/sysconfig/bwbar
|
||||
ExecStart=/usr/bin/bwbar $OPTIONS
|
||||
#User=BWBAR_USER
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
--- a/bwbar.c 2011-12-06 10:00:01.352136282 +0100
|
||||
+++ b/bwbar.c 2011-12-06 09:59:56.283150202 +0100
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <alloca.h>
|
||||
#include <getopt.h>
|
||||
#include <png.h>
|
||||
+#include <zlib.h>
|
||||
|
||||
void skipline(FILE *f)
|
||||
{
|
||||
@@ -79,7 +80,7 @@
|
||||
if ( !info_ptr )
|
||||
goto barf;
|
||||
|
||||
- if ( setjmp(png_ptr->jmpbuf) ) {
|
||||
+ if ( setjmp(png_jmpbuf((png_ptr))) ) {
|
||||
status = 1;
|
||||
goto barf; /* libpng abort */
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue