packages: openvswitch/linux-3.3.patch, openvswitch/openvswitch.spec - up to...

[baggins]

Author: baggins                      Date: Fri Jun 29 14:18:00 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.6.1

---- Files affected:
packages/openvswitch:
   linux-3.3.patch (1.1 -> 1.2) , openvswitch.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: packages/openvswitch/linux-3.3.patch
diff -u packages/openvswitch/linux-3.3.patch:1.1 packages/openvswitch/linux-3.3.patch:1.2
--- packages/openvswitch/linux-3.3.patch:1.1	Mon Mar 26 11:02:47 2012
+++ packages/openvswitch/linux-3.3.patch	Fri Jun 29 16:17:54 2012
@@ -12,7 +12,7 @@
  
      # If the bridge module is loaded, then that might be blocking
      # openvswitch_mod.  Try to unload it, if there are no bridges.
-@@ -48,11 +49,12 @@
+@@ -48,15 +49,16 @@
      action "removing bridge module" rmmod bridge || return 1
  
      # Try loading openvswitch_mod again.
@@ -21,6 +21,10 @@
  }
  
  insert_brcompat_mod_if_required () {
+     if test -e /sys/module/bridge; then
+         log_warning_msg "bridge module is loaded, not loading brcompat_mod"
+         return 1
+     fi
      test -e /sys/module/brcompat_mod && return 0
 +    test -e /sys/module/openvswitch && return 0
      action "Inserting brcompat module" modprobe brcompat_mod

================================================================
Index: packages/openvswitch/openvswitch.spec
diff -u packages/openvswitch/openvswitch.spec:1.21 packages/openvswitch/openvswitch.spec:1.22
--- packages/openvswitch/openvswitch.spec:1.21	Wed Jun 27 12:30:59 2012
+++ packages/openvswitch/openvswitch.spec	Fri Jun 29 16:17:54 2012
@@ -24,17 +24,17 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	4
+%define		rel	1
 %define		pname	openvswitch
 Summary:	Production Quality, Multilayer Open Virtual Switch
 #Summary(pl.UTF-8):	-
 Name:		%{pname}%{_alt_kernel}
-Version:	1.5.0
+Version:	1.6.1
 Release:	%{rel}
 License:	Apache v2.0
 Group:		Networking/Daemons
 Source0:	http://openvswitch.org/releases/%{pname}-%{version}.tar.gz
-# Source0-md5:	c6ca6a0f6707ae80f62a7838de1226d3
+# Source0-md5:	1e4c4ccf55096c8dbf5d35b9725447a3
 Source1:	ifdown-ovs
 Source2:	ifup-ovs
 Source3:	README.PLD
@@ -313,6 +313,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2012/06/29 14:17:54  baggins
+- up to 1.6.1
+
 Revision 1.21  2012/06/27 10:30:59  arekm
 - rebuild for kernel-longterm-3.0.36-1
 - release 4 (by relup.sh)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/openvswitch/linux-3.3.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/openvswitch/openvswitch.spec?r1=1.21&r2=1.22