diff --git a/bridge-utils-1.2-foreach.patch b/bridge-utils-1.2-foreach.patch new file mode 100644 index 0000000..9d3ab1a --- /dev/null +++ b/bridge-utils-1.2-foreach.patch @@ -0,0 +1,13 @@ +--- bridge-utils-1.2/libbridge/libbridge_init.c~ 2007-08-22 14:22:49.000000000 +0100 ++++ bridge-utils-1.2/libbridge/libbridge_init.c 2008-03-05 15:40:42.000000000 +0000 +@@ -49,8 +49,8 @@ static int isbridge(const struct dirent + char path[SYSFS_PATH_MAX]; + struct stat st; + +- snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge", entry->d_name); +- return stat(path, &st) == 0 && S_ISDIR(st.st_mode); ++ snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/bridge_id", entry->d_name); ++ return stat(path, &st) == 0 && S_ISREG(st.st_mode); + } + + /* diff --git a/bridge-utils.spec b/bridge-utils.spec index 7bf5136..f251929 100644 --- a/bridge-utils.spec +++ b/bridge-utils.spec @@ -1,13 +1,14 @@ Summary: Utilities for configuring the linux ethernet bridge Name: bridge-utils Version: 1.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://bridge.sourceforge.net/ Group: System Environment/Base Source: http://dl.sf.net/bridge/bridge-utils-%{version}.tar.gz Patch0: bridge-utils-1.0.4-inc.patch Patch1: bridge-utils-1.2-show-ports.patch +Patch2: bridge-utils-1.2-foreach.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: libsysfs-devel autoconf @@ -27,6 +28,7 @@ Install bridge-utils if you want to use the linux ethernet bridge. %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build autoconf @@ -47,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/brctl.8* %changelog +* Wed Mar 05 2008 David Woodhouse 1.2-5 +- Fix handling of bridge named 'bridge' (#436120) + * Mon Feb 18 2008 Fedora Release Engineering - 1.2-4 - Autorebuild for GCC 4.3