rpms/bridge-utils/devel bridge-utils-1.2-foreach.patch, NONE, 1.1 bridge-utils.spec, 1.27, 1.28

David Woodhouse (dwmw2) fedora-extras-commits at redhat.com
Wed Mar 5 15:45:02 UTC 2008


Author: dwmw2

Update of /cvs/pkgs/rpms/bridge-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8976

Modified Files:
	bridge-utils.spec 
Added Files:
	bridge-utils-1.2-foreach.patch 
Log Message:
fix 436120

bridge-utils-1.2-foreach.patch:

--- NEW FILE bridge-utils-1.2-foreach.patch ---
--- 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);
 }
 
 /*


Index: bridge-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bridge-utils/devel/bridge-utils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- bridge-utils.spec	19 Feb 2008 01:56:48 -0000	1.27
+++ bridge-utils.spec	5 Mar 2008 15:44:20 -0000	1.28
@@ -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 @@
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 autoconf
@@ -47,6 +49,9 @@
 %{_mandir}/man8/brctl.8*
 
 %changelog
+* Wed Mar 05 2008 David Woodhouse <dwmw2 at redhat.com> 1.2-5
+- Fix handling of bridge named 'bridge' (#436120)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2-4
 - Autorebuild for GCC 4.3
 




More information about the fedora-extras-commits mailing list