Version bump to 1.9.0 (bug #443558). Configuration database moved to /var/lib/openvswitch (which is a solution for bug #438862). initscript-rewrite to follow new declarative style and fixed bug #447630. Moved PKI to /etc/ssl/openvswitch and make sure the directory has sane permissions (Bug #431744). Added modules USE flag to build the openvswitch and brcompat kernel modules.

Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
Manifest-Sign-Key: 0x1E0CA85F!

6 files changed, 255 insertions, 7 deletions

diff --git a/net-misc/openvswitch/ChangeLog b/net-misc/openvswitch/ChangeLog
index 6ac7345aa1cb..f7fd79fee146 100644
--- a/net-misc/openvswitch/ChangeLog
+++ b/net-misc/openvswitch/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/openvswitch
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.4 2012/07/18 08:41:29 dev-zero Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.5 2013/04/08 19:37:58 dev-zero Exp $
+
+*openvswitch-1.9.0 (08 Apr 2013)
+
+  08 Apr 2013; Tiziano Müller <dev-zero@gentoo.org> +files/ovs-controller-r1,
+  +files/ovs-vswitchd-r1, +files/ovsdb-server-r1, +openvswitch-1.9.0.ebuild:
+  Version bump to 1.9.0 (bug #443558). Configuration database moved to
+  /var/lib/openvswitch (which is a solution for bug #438862). initscript-rewrite
+  to follow new declarative style and fixed bug #447630. Moved PKI to
+  /etc/ssl/openvswitch and make sure the directory has sane permissions (Bug
+  #431744). Added modules USE flag to build the openvswitch and brcompat kernel
+  modules.
 
 *openvswitch-1.6.1-r2 (18 Jul 2012)
 
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index b65ca77014a6..db368454df20 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,20 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX ovs-controller 728 SHA256 4e83dd7990ae17752ebc45e6e1648258827fd7cbe900b68d2867860e30641b2c SHA512 b8f44f0ccbbafb5183acdebefb12b5fac3e3bd40a83fa70b7be2298ce95c58bd3eca38d7168785143a62730703bdde21adb4e56d330abfe3281d9118f4146c2e WHIRLPOOL b0dfad6616773f60fae25d126e41a18af9246406ae969f08c9fe18d351da6d52e7f5eb28c9a0fa4818bd940adfbf8bbc1d98ff6c507132861d54385410ac5ab0
+AUX ovs-controller-r1 566 SHA256 62eeaa3a5d53c2048201d894d5cd97df3b728a4e7cb5beb168a190c6cad111e0 SHA512 b48b9405c16dc117213071a32000f155c08cf7c4d28333090f7f5ba8871f7b4dddeec6908b34a97101a9d973dff69da773f0b941c92d330fd7cc3f282dfb0744 WHIRLPOOL 77e1ddd5f5a088a5639e950b4182b33a6de4d62d5030728c2fababc255185ef6a4baf5eaa1265a84a49ff18370bb8297b518f5fdebdc56d3e1ff31efec5d0566
 AUX ovs-controller_conf 231 SHA256 0820053251cd28baea8b145d996222b6ffa5bdada78bdf9ce0b1632c358848b4 SHA512 fb58a5be5d899d2548d5575b4b9d191e6159982bd5c4d44fc3279d6679d622a4343d2b1d90bbc7e140d05613a1e4af8bfeab85cd18c15547c807db69fe5aa336 WHIRLPOOL 7964c161a04f4fc9b8ba9316eaacd71177b803272dad47fcd9959de36f37b96b82b3b35a6e99d4d757ef7acfa19cce5c54c25705cc2a3bb295794818d89a7cf0
 AUX ovs-vswitchd 702 SHA256 14219de96680153d681254228ab47bfc00b0f8a2b79d7690a2d3bede7b64932b SHA512 aa37a7d6510399b90341673ea55ed0322a68d201ea722a508de1715559818abdeee4fa7983ff03487bba1ee7e54a195591f51be0b5df5fba89762fb9db2e94eb WHIRLPOOL c256bda7424de71450c1279fe6afaacc89562cbc72c0a9c9f121328d16be478fa92a6e184525c02fa93dea3dd2995de89f2f862b7555df5d473e9878e37d79d8
+AUX ovs-vswitchd-r1 554 SHA256 ca809e55e4540b905aa2a1afea9624cd0a52c31d833db9ed2b57eb5a905f6058 SHA512 d160ac8bf80e3b0e7cb7d434842950381b248e96bfdd00d9b6d0ae6c762dbbcd0f351739adf54e6b3f677e84a800ad62355d7f7771ff0a4965824744ea853f8f WHIRLPOOL 18e8bfecf2848609249f4517e6a2c848775652f5a12127485cc1eaea3278b11d136b9c44d890b41c7efb3292d19949e6a692e2dc7dd927f6a141c6e010cf90ce
 AUX ovs-vswitchd_conf 164 SHA256 438c58741562af201c816f0a72101b5abb0e75788369bb04ed57be28425e5f81 SHA512 2e65f8658b6120e30849a8b3b0268d7776635c36bdd77920537355fc1883f306d3df5c78d2a5fefffdcf76b093b126f9d315c1595cd0ab643ac5f000c8b4f439 WHIRLPOOL 3cf05adfa5f1bfecdf022442c26b100ae3e63db7a1837b441fcef46e8864103eb3e761735ad1d81ad5d105cbc978d12e96449edf70aef3eb7d310080ce50ce9a
 AUX ovsdb-server 1134 SHA256 432a74a748c18eeb0f78102bc6812673e852c4335d42815629b91fb4407ce3d8 SHA512 86026a194fe6e78fc47071e6b52001fa32d2e15bf9486c7a0ec94c1f2416a0a160a84cb4d6f73b7a75c87c0725b4cf45a5a4ee35242d47339e7d48702253a0d3 WHIRLPOOL d6d10a32037fab47785315a26922cfcf1bd906e14152a73d54e39979030b0ef7c4dae5a139b785c1db8562a8eae90811961199430eb4b11a23606ef90fe774f2
+AUX ovsdb-server-r1 973 SHA256 2a9a3bd0277362fcdab62b7ea86ae2e488e099d9ed724dc27648136e5f5ed93c SHA512 4d031347b146cf82812cb0fc1ead944d6e29a9a8bd2afe603c4003b6f8c9d2f9d0c5f7e2ebdad456e7f5af4b01c756203cd96cc44db7be266bf94ac9bba188ff WHIRLPOOL fbda59478d40a3ad91f5e370217b1bb83577e670ea061b3554dbf2719982f56905730dea65626bda3b6601ab31926222bca4ea657480468d3db6037fbf7058a6
 AUX ovsdb-server_conf 492 SHA256 15c508d134fed8cda13e2d394fc7c20b9868294a30e73a952ebffd31df129251 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa WHIRLPOOL 076bbaf28d36bc6a748ee38c5b574946e938a78de4ac2948894cb41f9b639d04d3427019d227fcd559252869794004c1f467f6dfb23f0ab60450450d2cd7973f
 DIST openvswitch-1.6.1.tar.gz 2088054 SHA256 b2451cc8ae5d800e474f2a7d627ef9ea7cebf7f632c7ea09b2976529a9f5b507 SHA512 dabbd8d250434f108868f683a40e79f10855ab6033cab1d28be0b4eba09b40b9770e2e16c33ca7ebbb25e80062eec9d6fb1b75cc4f6d8413ca7db1cc1bf5d909 WHIRLPOOL 108c5bf8f89738834e949953082999538f5011fac2ab22a6d30cea8b2de9ab97e52f7b4d2c7e6e78c17663ec46bbb588aece7d543e10876d80f29fec664f8fd2
+DIST openvswitch-1.9.0.tar.gz 2351740 SHA256 825730db82c7b46a142f057a43345590c299e66704ef7a88d9ed4ffd0c3d6b64 SHA512 6368852aafa81f003a09108e973a37281a938ad36948aef96b0699c85a754c33fdb274e998ca804c8102a8cf0839e023633510d43a975cf355b10575bc024587 WHIRLPOOL d4c88aadfe8676d5aef24673051c34864dcc9b6bbc624e6396389fae7ffbb0518f213334ede034fe1c4894187fb001b8e389a11cd8d0bc253f5237696ab0b405
 EBUILD openvswitch-1.6.1-r2.ebuild 3495 SHA256 ccc35a807c3c96ebb1652a51cb4d8721b10aef418a33e13fe869d7c9aba01539 SHA512 7a9d8d97bcd9c60816b319239eba631b13cbc2bc315a00607b57bd06a644d36e1972d63d04fafd7f7f129e58bedf19427fe0060c48dc11f3abea5a9cefe8bf64 WHIRLPOOL f92ed6e2507328d27e78c3db396bcf2d73f3d8e4051675b6c8bd6554f4ff7f630652c757067b7ab215f535aa33103f22bca8354bc07114ef668227f2f347c40c
-MISC ChangeLog 1309 SHA256 1326c65ef458d3408958fd955604fdb2058295e633a886d073f59c638aceaa1b SHA512 fe73ed7c6737689fe4b74f69e73390a3630213016af80a61cd892802647b525367d1ca2e25f876417bc3c450f98f5d90710fe319920ce6de06390e0badd4ca15 WHIRLPOOL 7fe6918f0ad3610694934490964c43e65123cf5024a7ca07ac51216cd760362663a3e041e369714d0bda302b8c97f2108df7f135b1713e46236d079ca0a0d8db
+EBUILD openvswitch-1.9.0.ebuild 4577 SHA256 6eb6a9316b0f466f774b2f0182b1ea0fb0bc2a79ccf736151493a03c36db56e6 SHA512 cb6fafa3ea299816e50df6946d99ca9f8410e2ba5b1fca959e932da223c782f6fe41ee53cbdcf0d8d1b516e0adf0f777e14501039c8f8022d0babc24376408f0 WHIRLPOOL 411de57e2a25e114a9808cdeab9ba60043bed381a19982855f0a4076a0ab7358656af87a1a03000e900d59ae25d1ec98dba09dcce9636fa31e54a98493c5d35f
+MISC ChangeLog 1890 SHA256 fc803949a6f7cc1dcef7e46d47aa55364eb333917d2c601a663200d879301cbc SHA512 e4ea9d9e2b0d428703f7a94caa972cc896ba8b2c59433d62402a3028c2e7f4b66b3bd57461cfb1f7e7ef2d1675c06f1513128e505d3f631d6b4ab6e414953fd7 WHIRLPOOL 4c5697087267c37a86ad7bc994a0e25d09c12a1f92c7b174ee4fba459567576c2ee998f94579d2e210fe1be1a7d8f7ca5216c29e7f9987bf561aea8a19ff3834
 MISC metadata.xml 482 SHA256 e5f849ca599bb7ceada5ea0a66160b0bb9ff5ade3a8b00ea73db17b18675417a SHA512 6312ec26573f2439dae81ab69112534f03862f6d22d595c2d0eda9000f60280f0f14593d63287c289006c61805ff5058ac1460660401ad5d386cfde674098e4f WHIRLPOOL 16459036dbff9f36efc8a740da9638a3b03820f8eb4baf4d616e5d505ee37a527d104cf75f2565a16dc365db8a515dda5d3818477ad0dde42f69b53eaf2df3c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAGdr0ACgkQGwVqY66cHjCsJACfZDUTbdToctsheAidi40xzJLV
-UCAAn2lvvdx0njkHTp6DDV2UjXTZ4QiC
-=hCWB
+iQF8BAEBCABmBQJRYxybXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RjI0QTQ0MjI1OURBNzI4MEIyREExRkQx
+RTdDRkM3NzFFMENBODVGAAoJEB58/HceDKhfhBoH/3SNNUYLMeE5wFA1HYh6Z76R
+rPnpH+OCor70sfb7NHkVih2t0Iy8cIxPrB1WMEd6KT0brqOoWtaezQCdGkhnxzbN
+sZrzHz3qUXubGDfSuQF7OxpCDMk7UB5gD239RB7xhAFa/orULrSPukB2Du+wyP7x
+7DDBolyqastzoETj4lOjAHc/xBWxoQRjEnLOvDYlBUPFle9hGfqu860RAFsuQyh7
+JIZ3bySF5leH2BPx8cxWuxkylGiXdPLCGfNVoyesHx5yFZKKPYkOrRx47SArIVmB
+3GuQ9JHa3PZ/slIhd3WwQG0sTMIlFAmMe9x/iEjWkyMGbZT8VEyVFcI1PsmC+Pw=
+=yfKo
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvswitch/files/ovs-controller-r1 b/net-misc/openvswitch/files/ovs-controller-r1
new file mode 100644
index 000000000000..dea1f670b919
--- /dev/null
+++ b/net-misc/openvswitch/files/ovs-controller-r1
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/files/ovs-controller-r1,v 1.1 2013/04/08 19:37:58 dev-zero Exp $
+
+description="Open vSwitch OpenFlow controller"
+
+command="/usr/bin/ovs-controller"
+command_args="
+    --pidfile
+    --detach
+    --monitor
+    ${OPTIONS} ${METHODS}"
+pidfile="/var/run/openvswitch/ovs-controller.pid"
+
+depend() {
+    need net
+    use logger
+}
+
+start_pre() {
+	checkpath -d "/var/run/openvswitch" -m 0750
+}
diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r1 b/net-misc/openvswitch/files/ovs-vswitchd-r1
new file mode 100644
index 000000000000..6bf8bfc53c18
--- /dev/null
+++ b/net-misc/openvswitch/files/ovs-vswitchd-r1
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/files/ovs-vswitchd-r1,v 1.1 2013/04/08 19:37:58 dev-zero Exp $
+
+description="Open vSwitch virtual switch"
+
+command="/usr/sbin/ovs-vswitchd"
+command_args="
+    --pidfile
+    --detach
+    --monitor
+    ${OPTIONS} ${DATABASE}"
+pidfile="/var/run/openvswitch/ovs-vswitchd.pid"
+
+depend() {
+	use ovsdb-server logger
+}
+
+start_pre() {
+	checkpath -d "/var/run/openvswitch" -m 0750
+}
diff --git a/net-misc/openvswitch/files/ovsdb-server-r1 b/net-misc/openvswitch/files/ovsdb-server-r1
new file mode 100644
index 000000000000..53c27445396e
--- /dev/null
+++ b/net-misc/openvswitch/files/ovsdb-server-r1
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/files/ovsdb-server-r1,v 1.1 2013/04/08 19:37:58 dev-zero Exp $
+
+description="Open vSwitch database server"
+
+remote_punix=${DB_SOCKET:+"--remote=punix:${DB_SOCKET}"}
+remote_db=${REMOTE_DB:+"--remote=${REMOTE_DB}"}
+private_key=${PRIVATE_KEY:+"--private-key=${PRIVATE_KEY}"}
+certificate=${CERTIFICATE:+"--certificate=${CERTIFICATE}"}
+bootstrap_ca_cert=${BOOTSTRAP_CA_CERT:+"--bootstrap-ca-cert=${BOOTSTRAP_CA_CERT}"}
+
+command="/usr/sbin/ovsdb-server"
+command_args="
+    --pidfile
+    --detach
+    --monitor
+    ${remote_punix}
+    ${remote_db}
+    ${private_key}
+    ${certificate}
+    ${bootstrap_ca_cert}
+    ${DATABASE}
+    ${OPTIONS}"
+pidfile="/var/run/openvswitch/ovsdb-server.pid"
+
+depend() {
+	need localmount
+    use logger
+}
+
+start_pre() {
+	checkpath -d "/var/run/openvswitch" -m 0750
+}
diff --git a/net-misc/openvswitch/openvswitch-1.9.0.ebuild b/net-misc/openvswitch/openvswitch-1.9.0.ebuild
new file mode 100644
index 000000000000..d538d3d9a83b
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-1.9.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-1.9.0.ebuild,v 1.1 2013/04/08 19:37:58 dev-zero Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils linux-info linux-mod python-single-r1
+
+DESCRIPTION="Production quality, multilayer virtual switch."
+HOMEPAGE="http://openvswitch.org"
+SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug modules monitor +pyside +ssl"
+
+RDEPEND=">=sys-apps/openrc-0.10.5
+	ssl? ( dev-libs/openssl )
+	monitor? (
+        ${PYTHON_DEPS}
+        dev-python/twisted
+		dev-python/twisted-conch
+		dev-python/twisted-web
+		pyside? ( dev-python/pyside[${PYTHON_USEDEP}] )
+		!pyside? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
+		net-zope/zope-interface[${PYTHON_USEDEP}] )
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="brcompat(net:${S}/datapath/linux) openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+	use monitor && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+}
+src_configure() {
+	set_arch_to_kernel
+	use monitor || export ovs_cv_python="no"
+	use pyside || export ovs_cv_pyuic4="no"
+	
+	local linux_config
+	use modules && linux_config="--with-linux=${KERNEL_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use monitor && python_fix_shebang \
+		utilities/ovs-{pcap,tcpundump,test,vlan-test} \
+		utilities/bugtool/ovs-bugtool \
+		ovsdb/ovsdbmonitor/ovsdbmonitor
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	if use monitor ; then
+		python_domodule "${ED}"/usr/share/openvswitch/python/*
+		rm -r "${ED}/usr/share/openvswitch/python"
+        python_optimize "${ED}/usr/share/ovsdbmonitor"
+	fi
+	# not working without the brcompat_mod kernel module which did not get
+	# included in the kernel and we can't build it anymore
+	rm "${D}/usr/sbin/ovs-brcompatd" "${D}/usr/share/man/man8/ovs-brcompatd.8"
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED}/var/run"
+	use monitor || rmdir "${ED}/usr/share/ovsdbmonitor"
+	use debug || rm "${ED}/usr/bin/ovs-parse-leaks"
+
+	newconfd "${FILESDIR}/ovsdb-server_conf" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+	newconfd "${FILESDIR}/ovs-controller_conf" ovs-controller
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+	newinitd "${FILESDIR}/ovs-controller-r1" ovs-controller
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.9.0 ${pv} ; then
+			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
+			ewarn "    /etc/openvswitch"
+			ewarn "to"
+			ewarn "    /var/lib/openvswitch"
+			ewarn "Please copy/move the database manually before running the schema upgrade."
+            ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
+		fi
+	done
+
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EPREFIX}/var/lib/openvswitch/conf.db"
+	if [ -e "${db}" ] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		"${EPREFIX}/usr/bin/ovsdb-tool" convert "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		"${EPREFIX}/usr/bin/ovsdb-tool" create "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "creating database failed"
+	fi
+}