[openvswitch/f19] updated to 2.1.0
Flavio Leitner
fbl at fedoraproject.org
Thu Apr 17 00:35:19 UTC 2014
commit 081681ceffec4024ec473b5f6efd03ce893709cd
Author: Flavio Leitner <fbl at redhat.com>
Date: Tue Mar 25 20:17:50 2014 -0300
updated to 2.1.0
Resolves: #1080680
Signed-off-by: Flavio Leitner <fbl at redhat.com>
.gitignore | 1 +
openvswitch-initscripts-add-tunnel-support.patch | 29 -----
...ow-non-root-users-to-check-service-status.patch | 38 +++++++
...hel-Add-Patch-Port-support-to-initscripts.patch | 114 ++++++++++++++++++++
...-gcc-builtins-to-better-check-array-sizes.patch | 62 -----------
openvswitch.spec | 43 ++++----
sources | 2 +-
7 files changed, 173 insertions(+), 116 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 768ed7b..5e26750 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/openvswitch-1.11.0.tar.gz
/openvswitch-2.0.0.tar.gz
/openvswitch-2.0.1.tar.gz
+/openvswitch-2.1.0.tar.gz
diff --git a/openvswitch-ovs-lib-allow-non-root-users-to-check-service-status.patch b/openvswitch-ovs-lib-allow-non-root-users-to-check-service-status.patch
new file mode 100644
index 0000000..3b91229
--- /dev/null
+++ b/openvswitch-ovs-lib-allow-non-root-users-to-check-service-status.patch
@@ -0,0 +1,38 @@
+From 691e47554dd03dd6492e00bab5bd6d215f5cbd4f Mon Sep 17 00:00:00 2001
+From: Flavio Leitner <fbl at redhat.com>
+Date: Thu, 27 Feb 2014 09:16:34 -0300
+Subject: [PATCH] ovs-lib: allow non-root users to check service status
+
+It tries to log the status operation, so although non-root
+users can see the current status, the lack of permission
+to write to the log results in an error message.
+
+This changes to log only if the user has the permission to
+write to the log file.
+
+Signed-off-by: Flavio Leitner <fbl at redhat.com>
+Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
+---
+ utilities/ovs-lib.in | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
+index 029ed3b..48d0c36 100644
+--- a/utilities/ovs-lib.in
++++ b/utilities/ovs-lib.in
+@@ -54,7 +54,11 @@ ovs_ctl () {
+ # of ovs-ctl. It is also useful to document the o/p in ovs-ctl.log.
+ display=`"${datadir}/scripts/ovs-ctl" "$@" 2>&1`
+ rc=$?
+- echo "${display}" | tee -a "${logdir}/ovs-ctl.log"
++ if test -w "${logdir}/ovs-ctl.log"; then
++ echo "${display}" | tee -a "${logdir}/ovs-ctl.log"
++ else
++ echo "${display}"
++ fi
+ return ${rc}
+ ;;
+ *)
+--
+1.8.5.3
+
diff --git a/openvswitch-rhel-Add-Patch-Port-support-to-initscripts.patch b/openvswitch-rhel-Add-Patch-Port-support-to-initscripts.patch
new file mode 100644
index 0000000..06c202f
--- /dev/null
+++ b/openvswitch-rhel-Add-Patch-Port-support-to-initscripts.patch
@@ -0,0 +1,114 @@
+From e2bcc8ef49f5e51f48983b87ab1010f0f9ab1454 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jason=20K=C3=B6lker?= <jason at koelker.net>
+Date: Mon, 31 Mar 2014 23:34:14 +0000
+Subject: [PATCH] rhel: Add Patch Port support to initscripts
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Allows setting up type=patch ports through sysconfig ifcfg-* files.
+
+Signed-off-by: Jason Kölker <jason at koelker.net>
+Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
+Acked-by: Flavio Leitner <fbl at redhat.com>
+---
+ AUTHORS | 1 +
+ rhel/README.RHEL | 25 +++++++++++++++++++++++++
+ rhel/etc_sysconfig_network-scripts_ifdown-ovs | 3 +++
+ rhel/etc_sysconfig_network-scripts_ifup-ovs | 4 ++++
+ 4 files changed, 33 insertions(+)
+
+diff --git a/AUTHORS b/AUTHORS
+index 977753b..c5402cf 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -57,6 +57,7 @@ Isaku Yamahata yamahata at valinux.co.jp
+ James P. roampune at gmail.com
+ James Page james.page at ubuntu.com
+ Jarno Rajahalme jrajahalme at nicira.com
++Jason Kölker jason at koelker.net
+ Jean Tourrilhes jt at hpl.hp.com
+ Jeremy Stribling strib at nicira.com
+ Jesse Gross jesse at nicira.com
+diff --git a/rhel/README.RHEL b/rhel/README.RHEL
+index cb6ab88..2620674 100644
+--- a/rhel/README.RHEL
++++ b/rhel/README.RHEL
+@@ -25,6 +25,8 @@ assignments. The following OVS-specific variable names are supported:
+
+ * "OVSTunnel", if <name> is an OVS tunnel.
+
++ * "OVSPatchPort", if <name> is a patch port
++
+ - OVS_BRIDGE: If TYPE is anything other than "OVSBridge", set to
+ the name of the OVS bridge to which the port should be attached.
+
+@@ -47,6 +49,9 @@ assignments. The following OVS-specific variable names are supported:
+ - OVS_TUNNEL_OPTIONS: For "OVSTunnel" interfaces, this field should be
+ used to specify the tunnel options like remote_ip, key, etc.
+
++ - OVS_PATCH_PEER: For "OVSPatchPort" devices, this field specifies
++ the patch's peer on the other bridge.
++
+ Note
+ ----
+
+@@ -182,6 +187,26 @@ OVS_BRIDGE=ovsbridge0
+ OVS_TUNNEL_TYPE=gre
+ OVS_TUNNEL_OPTIONS="options:remote_ip=A.B.C.D"
+
++
++Patch Ports:
++
++==> ifcfg-patch-ovs-0 <==
++DEVICE=patch-ovs-0
++ONBOOT=yes
++DEVICETYPE=ovs
++TYPE=OVSPatchPort
++OVS_BRIDGE=ovsbridge0
++OVS_PATCH_PEER=patch-ovs-1
++
++==> ifcfg-patch-ovs-1 <==
++DEVICE=patch-ovs-1
++ONBOOT=yes
++DEVICETYPE=ovs
++TYPE=OVSPatchPort
++OVS_BRIDGE=ovsbridge1
++OVS_PATCH_PEER=patch-ovs-0
++
++
+ Reporting Bugs
+ --------------
+
+diff --git a/rhel/etc_sysconfig_network-scripts_ifdown-ovs b/rhel/etc_sysconfig_network-scripts_ifdown-ovs
+index 8e768c8..1371a30 100755
+--- a/rhel/etc_sysconfig_network-scripts_ifdown-ovs
++++ b/rhel/etc_sysconfig_network-scripts_ifdown-ovs
+@@ -47,6 +47,9 @@ case "$TYPE" in
+ retval=$?
+ ovs-vsctl -t ${TIMEOUT} -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE"
+ ;;
++ OVSPatchPort)
++ ovs-vsctl -t ${TIMEOUT} -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE"
++ ;;
+ *)
+ echo $"Invalid OVS interface type $TYPE"
+ exit 1
+diff --git a/rhel/etc_sysconfig_network-scripts_ifup-ovs b/rhel/etc_sysconfig_network-scripts_ifup-ovs
+index a50c72f..f5641d2 100755
+--- a/rhel/etc_sysconfig_network-scripts_ifup-ovs
++++ b/rhel/etc_sysconfig_network-scripts_ifup-ovs
+@@ -127,6 +127,10 @@ case "$TYPE" in
+ ovs-vsctl -t ${TIMEOUT} -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS -- set Interface "$DEVICE" type=$OVS_TUNNEL_TYPE $OVS_TUNNEL_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
+ ${OTHERSCRIPT} ${CONFIG} ${2}
+ ;;
++ OVSPatchPort)
++ ifup_ovs_bridge
++ ovs-vsctl -t ${TIMEOUT} -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS -- set Interface "$DEVICE" type=patch options:peer="${OVS_PATCH_PEER}" ${OVS_EXTRA+-- $OVS_EXTRA}
++ ;;
+ *)
+ echo $"Invalid OVS interface type $TYPE"
+ exit 1
+--
+1.8.5.3
+
diff --git a/openvswitch.spec b/openvswitch.spec
index 67ffdf2..fc6285a 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -14,7 +14,7 @@
%endif
Name: openvswitch
-Version: 2.0.1
+Version: 2.1.0
Release: 1%{?dist}
Summary: Open vSwitch daemon/database/utilities
@@ -29,10 +29,10 @@ Source3: openvswitch.logrotate
Source6: ovsdbmonitor.desktop
Source9: README.RHEL
-Patch1: openvswitch-util-use-gcc-builtins-to-better-check-array-sizes.patch
-Patch2: openvswitch-fedora-package-fix-systemd-ordering-and-deps.patch
-Patch3: openvswitch-initscripts-add-tunnel-support.patch
-Patch4: openvswitch-rhel-Enable-DHCP-support-for-internal-ports.patch
+Patch1: openvswitch-fedora-package-fix-systemd-ordering-and-deps.patch
+Patch2: openvswitch-rhel-Enable-DHCP-support-for-internal-ports.patch
+Patch3: openvswitch-ovs-lib-allow-non-root-users-to-check-service-status.patch
+Patch4: openvswitch-rhel-Add-Patch-Port-support-to-initscripts.patch
BuildRequires: systemd-units openssl openssl-devel
BuildRequires: python python-twisted-core python-zope-interface PyQt4
@@ -47,6 +47,7 @@ Requires: openssl iproute module-init-tools
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
+Obsoletes: openvswitch-controller <= 0:2.1.0-1
%description
Open vSwitch provides standard network bridging functions and
@@ -88,16 +89,6 @@ Requires: python python-twisted-core python-twisted-web
Utilities that are useful to diagnose performance and connectivity
issues in Open vSwitch setup.
-%package controller
-Summary: Open vSwitch OpenFlow controller
-License: ASL 2.0
-Requires: openvswitch = %{version}-%{release}
-
-%description controller
-Simple reference implementation of an OpenFlow controller for Open
-vSwitch. Manages any number of remote switches over OpenFlow protocol,
-causing them to function as L2 MAC-learning switches or hub.
-
%package devel
Summary: Open vSwitch OpenFlow development package (library, headers)
License: ASL 2.0
@@ -171,10 +162,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/applications/ovsdbmonitor.desktop
rm -rf $RPM_BUILD_ROOT%{_docdir}/ovsdbmonitor
%endif
-# devel files
-install -p -D -m 0644 lib/libopenvswitch.a \
- $RPM_BUILD_ROOT%{_libdir}/openvswitch/libopenvswitch.a
-
install -d -m 0755 $RPM_BUILD_ROOT%{_includedir}/openvswitch
install -p -D -m 0644 include/openvswitch/*.h \
-t $RPM_BUILD_ROOT%{_includedir}/openvswitch
@@ -251,6 +238,7 @@ install -p -D -m 0644 include/openflow/*.h \
%{_bindir}/ovsdb-client
%{_bindir}/ovsdb-tool
%{_bindir}/ovs-parse-backtrace
+%{_bindir}/vtep-ctl
# ovs-bugtool is LGPLv2+
%{_sbindir}/ovs-bugtool
%{_sbindir}/ovs-vswitchd
@@ -262,6 +250,8 @@ install -p -D -m 0644 include/openflow/*.h \
%{_mandir}/man1/ovsdb-server.1*
%{_mandir}/man1/ovsdb-tool.1*
%{_mandir}/man5/ovs-vswitchd.conf.db.5*
+%{_mandir}/man5/vtep.5*
+%{_mandir}/man8/vtep-ctl.8*
%{_mandir}/man8/ovs-appctl.8*
%{_mandir}/man8/ovs-bugtool.8*
%{_mandir}/man8/ovs-ctl.8*
@@ -302,16 +292,21 @@ install -p -D -m 0644 include/openflow/*.h \
%{_mandir}/man8/ovs-l3ping.8*
%{python_sitelib}/ovstest
-%files controller
-%{_bindir}/ovs-controller
-%{_mandir}/man8/ovs-controller.8*
-
%files devel
-%{_libdir}/openvswitch/libopenvswitch.a
+%{_libdir}/*.a
+%{_libdir}/*.la
%{_includedir}/openvswitch/*
%{_includedir}/openflow/*
%changelog
+* Tue Mar 25 2014 Flavio Leitner - 2.1.0-1
+- updated to 2.1.0
+- obsoleted openvswitch-controller package
+- ovs-lib: allow non-root users to check service status
+ (upstream commit 691e47554dd03dd6492e00bab5bd6d215f5cbd4f)
+- rhel: Add Patch Port support to initscripts
+ (upstream commit e2bcc8ef49f5e51f48983b87ab1010f0f9ab1454)
+
* Mon Jan 27 2014 Flavio Leitner - 2.0.1-1
- updated to 2.0.1
diff --git a/sources b/sources
index 3f587c9..387296d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2122b1c293c8d05dc0c673d42a9da08 openvswitch-2.0.1.tar.gz
+7c5861b0ef7f3002c15c61be6f5066f2 openvswitch-2.1.0.tar.gz
More information about the scm-commits
mailing list