From 62a2ecdbb34a6f4ea7511e4f7e371d7f13e7593b Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 24 Oct 2016 21:02:38 +0200 Subject: [PATCH] - new Source URL, updated to 1.6 - updated debian,man patches - removed obsolete fail_on_error patch --- bridge-utils.spec | 14 +++++++------- debian.patch | 42 ------------------------------------------ fail_on_error.patch | 23 ----------------------- man.patch | 23 +++-------------------- 4 files changed, 10 insertions(+), 92 deletions(-) delete mode 100644 fail_on_error.patch diff --git a/bridge-utils.spec b/bridge-utils.spec index 0813492..80a43a6 100644 --- a/bridge-utils.spec +++ b/bridge-utils.spec @@ -1,21 +1,22 @@ Summary: Utilities for configuring the Linux ethernet bridge Summary(pl.UTF-8): Narzędzia przeznaczone do konfiguracji linuksowego ethernet bridge Name: bridge-utils -Version: 1.5 -Release: 3 +Version: 1.6 +Release: 1 License: GPL v2+ Group: Networking/Admin -Source0: http://downloads.sourceforge.net/bridge/%{name}-%{version}.tar.gz -# Source0-md5: ec7b381160b340648dede58c31bb2238 +Source0: https://www.kernel.org/pub/linux/utils/net/bridge-utils/%{name}-%{version}.tar.xz +# Source0-md5: 541ae1c50cc268056693608920e6c908 Patch0: debian.patch Patch1: man.patch -Patch2: fail_on_error.patch -Patch3: build_fix.patch +Patch2: build_fix.patch URL: http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge BuildRequires: autoconf BuildRequires: automake BuildRequires: linux-libc-headers >= 7:2.6.7 BuildRequires: sed >= 4.0 +BuildRequires: tar >= 1:1.22 +BuildRequires: xz Obsoletes: brcfg BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -56,7 +57,6 @@ bridge. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build cp -f /usr/share/automake/{config.*,missing} . diff --git a/debian.patch b/debian.patch index ef8a5f1..7c5a77c 100644 --- a/debian.patch +++ b/debian.patch @@ -9,18 +9,6 @@ clean: rm -f *.o brctl core ---- bridge-utils-1.5.orig/brctl/brctl.c -+++ bridge-utils-1.5/brctl/brctl.c -@@ -69,7 +69,8 @@ - argc -= optind; - argv += optind; - if ((cmd = command_lookup(*argv)) == NULL) { -- fprintf(stderr, "never heard of command [%s]\n", argv[1]); -+/* Debian bug #406907 */ -+ fprintf(stderr, "never heard of command [%s]\n", argv[0]); - goto help; - } - --- bridge-utils-1.5.orig/libbridge/Makefile.in +++ bridge-utils-1.5/libbridge/Makefile.in @@ -5,8 +5,7 @@ @@ -44,33 +32,3 @@ - $(CC) $(CFLAGS) -c libbridge_compat.c + $(CC) $(CFLAGS) $(CPPFLAGS) -c libbridge_compat.c ---- bridge-utils-1.5.orig/libbridge/libbridge_devif.c -+++ bridge-utils-1.5/libbridge/libbridge_devif.c -@@ -288,12 +288,16 @@ - char path[SYSFS_PATH_MAX]; - FILE *f; - -- snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/%s", bridge, name); -+/* Debian bug #496491 */ -+ snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/%s", bridge, name); - - f = fopen(path, "w"); - if (f) { - ret = fprintf(f, "%ld\n", value); - fclose(f); -+/* Debian bug #574363 */ -+ if (errno) -+ ret=-1; - } else { - /* fallback to old ioctl */ - struct ifreq ifr; -@@ -355,6 +359,9 @@ - if (f) { - ret = fprintf(f, "%ld\n", value); - fclose(f); -+/* Debian bug #574363 */ -+ if (errno) -+ ret=-1; - } else { - int index = get_portno(bridge, ifname); - diff --git a/fail_on_error.patch b/fail_on_error.patch deleted file mode 100644 index 1ce1dfe..0000000 --- a/fail_on_error.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur bridge-utils-1.5.orig/Makefile.in bridge-utils-1.5/Makefile.in ---- bridge-utils-1.5.orig/Makefile.in 2011-03-29 00:52:54.000000000 +0000 -+++ bridge-utils-1.5/Makefile.in 2014-07-18 16:22:35.920000000 +0000 -@@ -14,10 +14,10 @@ - SUBDIRS=libbridge brctl doc - - all: -- for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x ; done -+ for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x || exit 1 ; done - - clean: -- for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x clean ; done -+ for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x clean || exit 1 ; done - - distclean: clean - rm -f config.log -@@ -31,5 +31,5 @@ - rm -f doc/Makefile - - install: -- for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x install; done -+ for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x install || exit 1 ; done - diff --git a/man.patch b/man.patch index 99af62e..5fb2664 100644 --- a/man.patch +++ b/man.patch @@ -1,14 +1,6 @@ -diff -ur bridge-utils-1.5.orig/doc/brctl.8 bridge-utils-1.5/doc/brctl.8 ---- bridge-utils-1.5.orig/doc/brctl.8 2011-03-29 00:52:54.000000000 +0000 -+++ bridge-utils-1.5/doc/brctl.8 2014-07-18 15:58:06.318000000 +0000 -@@ -89,17 +89,12 @@ - .B brctl showmacs - shows a list of learned MAC addresses for this bridge. - --.B brctl setageingtime