diff options
| author | Tim Orling <TicoTimo@gmail.com> | 2016-03-24 13:55:07 -0700 |
|---|---|---|
| committer | Tim Orling <TicoTimo@gmail.com> | 2016-03-24 13:56:26 -0700 |
| commit | 3aacbb82caa93c016f08bbefda9860e42d11c8b2 (patch) | |
| tree | 602638f62ec21f806bdfb538a68b0b0200f7a089 | |
| parent | 3bfe6c737caca25ab2a5449922309350f7e975c8 (diff) | |
| download | bwm-ng-3aacbb82caa93c016f08bbefda9860e42d11c8b2.tar.gz bwm-ng-3aacbb82caa93c016f08bbefda9860e42d11c8b2.tar.xz bwm-ng-3aacbb82caa93c016f08bbefda9860e42d11c8b2.zip | |
Drop unused security patch.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | bwm-ng-0.6-format-security.patch | 22 | ||||
| -rw-r--r-- | bwm-ng.spec | 29 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 22 insertions, 32 deletions
@@ -0,0 +1 @@ +/bwm-ng-0.6.1.tar.gz diff --git a/bwm-ng-0.6-format-security.patch b/bwm-ng-0.6-format-security.patch deleted file mode 100644 index 89a67bb..0000000 --- a/bwm-ng-0.6-format-security.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/output.c -+++ a/src/output.c -@@ -223,8 +223,8 @@ int print_header(int option) { - fprintf(tmp_out_file,"<title>bwm-ng stats</title>\n</head>\n<body>\n"); - } - fprintf(tmp_out_file,"<div class=\"bwm-ng-header\">bwm-ng bwm-ng v" VERSION " (refresh %is); input: ",html_refresh); -- fprintf(tmp_out_file,input2str()); -- fprintf(tmp_out_file,show_all_if2str()); -+ fprintf(tmp_out_file,"%s",input2str()); -+ fprintf(tmp_out_file,"%s",show_all_if2str()); - fprintf(tmp_out_file,"</div><table class=\"bwm-ng-output\">"); - fprintf(tmp_out_file,"<tr class=\"bwm-ng-head\"><td class=\"bwm-ng-name\">Interface</td><td>Rx</td><td>Tx</td><td>Total</td></tr>"); - break; -@@ -234,7 +234,7 @@ int print_header(int option) { - if (output_method==PLAIN_OUT && ansi_output) printf("\033[1;2H"); - printf("bwm-ng v" VERSION " (delay %2.3fs); ",(float)delay/1000); - if (output_method==PLAIN_OUT) printf("press 'ctrl-c' to end this%s",(ansi_output ? "\033[2;2H" : "")); else printf("input: "); -- printf(input2str()); -+ printf("%s", input2str()); - printf("%s\n",show_all_if2str()); - if (output_method==PLAIN_OUT) { - if (ansi_output) diff --git a/bwm-ng.spec b/bwm-ng.spec index 4005f9a..3eb465f 100644 --- a/bwm-ng.spec +++ b/bwm-ng.spec @@ -1,13 +1,12 @@ Name: bwm-ng -Version: 0.6 -Release: 18%{?dist} +Version: 0.6.1 +Release: 3%{?dist} Summary: Bandwidth Monitor NG License: GPLv2+ URL: http://www.volker-gropp.de/?id=projects&sub=bwm-ng Source0: http://www.volker-gropp.de/bwm-ng/%{name}-%{version}.tar.gz Source1: bwm-ng.conf -Patch0: bwm-ng-0.6-format-security.patch -BuildRequires: libstatgrab-devel +BuildRequires: libstatgrab-devel > 0.90 BuildRequires: ncurses-devel Requires: hostname Requires: procps @@ -27,13 +26,8 @@ Features: %prep %setup -q -%patch0 -p1 %build -# FIXME: Package suffers from c11/inline issues -# Workaround by appending --std=gnu89 to CFLAGS -# Proper fix would be to fix the source-code -CFLAGS="${RPM_OPT_FLAGS} -std=gnu89" %configure --enable-64bit \ --enable-netstatbyte \ --enable-netstatlink \ @@ -60,6 +54,23 @@ install -pDm644 bwm-ng.1 %{buildroot}%{_mandir}/man1/bwm-ng.1 %{_mandir}/man1/bwm-ng.1* %changelog +* Wed Mar 23 2016 Tim Orling <ticotimo@gmail.com> - 0.6.1-3 +- re-instate dependency on libstatgrab + +* Tue Feb 16 2016 Sven Lankes <sven@lank.es> - 0.6.1-2 +- update conf to reflect default input change + +* Tue Feb 16 2016 Sven Lankes <sven@lank.es> - 0.6.1-1 +- new upstream release +- remove upstreamed patch +- remove dependency on libstatgrab (no longer default upstream) + +* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.6-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Oct 17 2015 Kalev Lember <klember@redhat.com> - 0.6-19 +- Rebuilt for libstatgrab soname bump + * Fri Jun 19 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.6-18 - Append --stdc=gnu89 to CFLAGS (Work-around to c11/inline compatibility issues. Fix FTBFS). @@ -1 +1 @@ -d3a02484fb7946371bfb4e10927cebfb bwm-ng-0.6.tar.gz +ef0c7669508e95f56250ad4f8db98b7f bwm-ng-0.6.1.tar.gz |