From 7b6246bc315c471a3ac2a259dd51bf7c793ea46f Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Jan 24 2013 15:49:34 +0000 Subject: Update to openvswitch 1.7.3 (#903599) --- diff --git a/.gitignore b/.gitignore index 97f48c9..3526060 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /openvswitch-1.4.0.tar.gz /openvswitch-1.7.0.tar.gz /openvswitch-1.7.1.tar.gz +/openvswitch-1.7.3.tar.gz diff --git a/openvswitch-ovs-ctl-ulimit.patch b/openvswitch-ovs-ctl-ulimit.patch deleted file mode 100644 index a4d8966..0000000 --- a/openvswitch-ovs-ctl-ulimit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openvswitch-1.7.1.orig/utilities/ovs-ctl.in 2012-11-20 13:36:38.782614801 +0800 -+++ openvswitch-1.7.1.orig/utilities/ovs-ctl.in 2012-11-20 13:37:20.466628024 +0800 -@@ -212,7 +212,7 @@ start () { - # Increase the limit on the number of open file descriptors. - # ovs-vswitchd needs 16 per datapath, plus a few extra, so this - # should allow for 256 (or more) bridges. -- ulimit -n 5000 -+ ulimit -n 6000 - - # Start ovs-vswitchd. - set ovs-vswitchd unix:"$DB_SOCK" diff --git a/openvswitch.spec b/openvswitch.spec index 8fc12d3..2837fcf 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -1,5 +1,5 @@ Name: openvswitch -Version: 1.7.1 +Version: 1.7.3 Release: 6%{?dist} Summary: Open vSwitch daemon/database/utilities @@ -21,7 +21,6 @@ Source7: openvswitch-configure-ovskmod-var.patch # Source7 is not applied, it's used to generate patch0 Patch0: openvswitch-configure-ovskmod-var-autoconfd.patch Patch1: openvswitch-ovs-pki-perm.patch -Patch2: openvswitch-ovs-ctl-ulimit.patch BuildRequires: systemd-units openssl openssl-devel BuildRequires: python python-twisted-core python-twisted-conch python-zope-interface PyQt4 @@ -86,7 +85,6 @@ causing them to function as L2 MAC-learning switches or hub. %setup -q %patch0 -p1 -b .ovskmod %patch1 -p1 -b .openvswitch-ovs-pki-perm -%patch2 -p1 -b .openvswitch-ovs-ctl-ulimit %build %configure --enable-ssl --with-pkidir=%{_sharedstatedir}/openvswitch/pki OVSKMOD=openvswitch @@ -207,6 +205,9 @@ desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE6} %changelog +* Thu Jan 24 2013 Thomas Graf - 1.7.3-1 +- Update to Open vSwitch 1.7.3 + * Tue Nov 20 2012 Thomas Graf - 1.7.1-6 - Increase max fd limit to support 256 bridges (#873072) diff --git a/sources b/sources index d37b383..e06f2af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70a7076f84cdb4c0ee86c380e7f7aa78 openvswitch-1.7.1.tar.gz +aa0d4fefb587469b4cc70f657da58b7d openvswitch-1.7.3.tar.gz