rpms/bridge-utils/devel bridge-utils-1.2-show-ports.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 bridge-utils.spec, 1.23, 1.24 sources, 1.6, 1.7 bridge-utils-1.1-itsits.patch, 1.1, NONE bridge-utils-1.1-message-2.patch, 1.1, NONE bridge-utils-1.1-message.patch, 1.1, NONE bridge-utils-1.1-setportprio.patch, 1.1, NONE bridge-utils-1.1-sysfs-close.patch, 1.1, NONE

[David Woodhouse (dwmw2)]

Author: dwmw2

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

Modified Files:
	.cvsignore bridge-utils.spec sources 
Added Files:
	bridge-utils-1.2-show-ports.patch 
Removed Files:
	bridge-utils-1.1-itsits.patch bridge-utils-1.1-message-2.patch 
	bridge-utils-1.1-message.patch 
	bridge-utils-1.1-setportprio.patch 
	bridge-utils-1.1-sysfs-close.patch 
Log Message:
1.2

bridge-utils-1.2-show-ports.patch:

--- NEW FILE bridge-utils-1.2-show-ports.patch ---
diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c
diff --git a/libbridge/libbridge_init.c b/libbridge/libbridge_init.c
index e2eab77..38b8a18 100644
--- a/libbridge/libbridge_init.c
+++ b/libbridge/libbridge_init.c
@@ -186,12 +186,15 @@ int br_foreach_port(const char *brname,
 	struct dirent **namelist;
 	char path[SYSFS_PATH_MAX];
 
-	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/brport", brname);
+	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/brif", brname);
 	count = scandir(path, &namelist, 0, alphasort);
 	if (count < 0)
 		return old_foreach_port(brname, iterator, arg);
 
 	for (i = 0; i < count; i++) {
+		if (!strcmp(namelist[i]->d_name, ".") ||
+		    !strcmp(namelist[i]->d_name, ".."))
+			continue;
 		if (iterator(brname, namelist[i]->d_name, arg))
 			break;
 	}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bridge-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Jul 2006 17:07:11 -0000	1.6
+++ .cvsignore	22 Aug 2007 13:25:12 -0000	1.7
@@ -1 +1 @@
-bridge-utils-1.1.tar.gz
+bridge-utils-1.2.tar.gz


Index: bridge-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bridge-utils/devel/bridge-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bridge-utils.spec	9 Sep 2006 08:53:41 -0000	1.23
+++ bridge-utils.spec	22 Aug 2007 13:25:12 -0000	1.24
@@ -1,20 +1,16 @@
 Summary: Utilities for configuring the linux ethernet bridge
 Name: bridge-utils
-Version: 1.1
-Release: 2%{?dist}
+Version: 1.2
+Release: 1%{?dist}
 License: GPL
 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.1-setportprio.patch
-Patch2: bridge-utils-1.1-itsits.patch
-Patch3: bridge-utils-1.1-message.patch
-Patch4: bridge-utils-1.1-sysfs-close.patch
-Patch5: bridge-utils-1.1-message-2.patch
+Patch1: bridge-utils-1.2-show-ports.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libsysfs-devel
+BuildRequires: libsysfs-devel autoconf
 BuildRequires: kernel-headers >= 2.6.16
 
 %description
@@ -31,12 +27,9 @@
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
+autoconf
 %configure
 make
 
@@ -53,6 +46,9 @@
 %{_mandir}/man8/brctl.8*
 
 %changelog
+* Wed Aug 22 2007 David Woodhouse <dwmw2 at redhat.com> 1.2-1
+- Update to 1.2
+
 * Sat Sep 09 2006 David Woodhouse <dwmw2 at redhat.com> 1.1-2
 - Fix setportprio command (#205810)
 - Other updates from bridge-utils git tree


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bridge-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Jul 2006 17:07:11 -0000	1.6
+++ sources	22 Aug 2007 13:25:12 -0000	1.7
@@ -1 +1 @@
-43bbd2a67b59cac3e15d545f8b51df68  bridge-utils-1.1.tar.gz
+1e6cff57ac90d7ab984d9512fdd9f2dd  bridge-utils-1.2.tar.gz


--- bridge-utils-1.1-itsits.patch DELETED ---


--- bridge-utils-1.1-message-2.patch DELETED ---


--- bridge-utils-1.1-message.patch DELETED ---


--- bridge-utils-1.1-setportprio.patch DELETED ---


--- bridge-utils-1.1-sysfs-close.patch DELETED ---