fixing bug 525144

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

3 files changed, 173 insertions, 15 deletions

diff --git a/net-misc/openvswitch/ChangeLog b/net-misc/openvswitch/ChangeLog
index ffe27c4c196f..93720545c043 100644
--- a/net-misc/openvswitch/ChangeLog
+++ b/net-misc/openvswitch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openvswitch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.25 2014/09/22 20:10:51 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/ChangeLog,v 1.26 2014/10/17 02:24:57 prometheanfire Exp $
+
+*openvswitch-2.3.0-r1 (17 Oct 2014)
+
+  17 Oct 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +openvswitch-2.3.0-r1.ebuild:
+  fixing bug 525144
 
   22 Sep 2014; Matthew Thode <prometheanfire@gentoo.org>
   openvswitch-2.3.0.ebuild:
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index c63395b2010b..bb3729ceb070 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -25,23 +25,24 @@ DIST openvswitch-2.3.0.tar.gz 3259225 SHA256 011052645cd4c7afee2732e87d45e589a05
 EBUILD openvswitch-1.11.0.ebuild 4500 SHA256 4d3bb47ce829fbc64b52bfd6ac92770b379f691579a3e196800687cca7cc804d SHA512 df694c33f9f6ddbaa9d18c3908040babca8666eb8534b979da0522ea2919d018f56709f0df1570e6da30ea57f94aa11e78fd4f5f45e4729cc66a1f5e1c398a7e WHIRLPOOL a8e230fddc39d15101d8fe68ab4139e51cd8adebe6f03fc1d4f852e009ae93a7a61fcfe3c6af778b67a5bf6b995a4ddb226f1045b7d9a05d99fcb38805643c1c
 EBUILD openvswitch-2.0.0-r3.ebuild 5143 SHA256 8ad27a901505e8abf6e672cdf4380ed6d97885be97a6c8d5178aa754928e3fdb SHA512 d62553c7a92efa9119e4f3f8421aee33386e50280eeae53f12acc9c3520101ca471dd7081097baaf58a80a6859f9e5e9589845f7368542fb9cdf1db15602f81e WHIRLPOOL ce4c988ee9fed53cd8d9839460214e5eb2d0d313f16c4b8297af2da120ecf85375618dfd2ac1db3f14d3c6e79e28ae0b7c7b683877dea179ce011385c518fd20
 EBUILD openvswitch-2.1.3.ebuild 4812 SHA256 1ba7ddf2dffe2a1d95db5d86fa8983b975edddfd9d74014348002b1a003d68c9 SHA512 61df2b5830a7a1a92884d8597b1d1186461f8ecb99fcfedd04ccfe633b932b19327f6fa432904206558ed15ed37531c0cb97590f2efbff43baad7911eb270e56 WHIRLPOOL c1441ccaa50b66950e977ea2edd1a23f48f9a64fa456405216c0d8c676e12df0c8f5776588453ad65024848d0b29308a442cef967c8d9e12ad330b2fbe0140c9
+EBUILD openvswitch-2.3.0-r1.ebuild 4784 SHA256 377633bd8e78fc5cff8447f758f61c161b20e6f5e6038a8c44a76aa3bb7f3b68 SHA512 eeb357ace780e9e2145db43b6fded499244f3012834f9d46d33706de22e28840b82a74554b430b8ba09293c854869c897c568e44142ce4f9a313ee33b437c65d WHIRLPOOL 510c9cbda84886eedca473956686f44502e23d5e5dbbe7c028bd0f80e3a56a013602947a442673b0ffe673f055d564b92d735d5886297d20c91330fd982f0cca
 EBUILD openvswitch-2.3.0.ebuild 4781 SHA256 3713364484c8ee301122bc382b7b8f323378ba2c8c1942ffc7748806aed74360 SHA512 477ce47557e65317fad4bbaa77cb556d97ee3ccf2642003f436ce08d65c1f38887e0ad320a212af51f65feaf863125d4dd6c4b4006d0e744d03a89be7ef8b594 WHIRLPOOL a6d7636f7d19888e8ecd260471fd45cd92f491f107ec26add80f740290024037e34d1a6bca36e4bb52d21b3859a2d72004c1c81dc4eadfd883452d369b48c413
-MISC ChangeLog 5301 SHA256 37b586d275b3e57c62829e4882376d4183830d52d59b70eec25130ed03b09f4d SHA512 51a51f66ce32fcc9796bc79d8749d331fe07f0f1b2528e0b96fea9660d35fcb726d84df9b8b5a4e7dfc029518150a07d5e495a955135f596637e1939f032d34a WHIRLPOOL f2a23de9f7710a476a1d737275d10eb06c5ba673dbdbf9be70f119960b76d9fc71120b2898b520b9c68a723cef504cfd2d3e0f53314a6eae2164b054b4a35146
+MISC ChangeLog 5448 SHA256 94d34da335d4bf3e06158e478937f68e33a42c7c4f20ff107c9cf7003cc62136 SHA512 f083151da766e0b380c34587cbe924210a68df5f00520199f83c73cb954ddbb70e6f5a626d384b79fc9dd9c725508f423bb3c720b4a7fe58dcf4dbcd36fa3d42 WHIRLPOOL b759685b1a6622a158a90c008601ddffeb755ddf3e26e7f868ae76396a118e0566b8d684462b746ed0f83c2afbc35e5dcb72639e054adcb1106cce0c83b61c43
 MISC metadata.xml 550 SHA256 73d17e0623524a9e95d3c4c2c34a29559d29a9dd0786ff4f98969b34949bc440 SHA512 c76de2feb5eac06781f42d74654e107200d5fd8f5377fd3af71559826c7263e837e42ca923811931cd9f86f68279085dd9e15796ee99033edd3ba0ccec2618f5 WHIRLPOOL 6919b71b9691b6659dd3b319d162cfb973cf25a15c3bbd01233c0842c6cd3e54c043f14f8b5da92a455a718f0dc25daa393e6f172266d66d1af2a15fa45c4df4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUIIJrAAoJECRx6z5ArFrDVjAP/iAtKawlvyNPxV6+5Z0jHH1A
-l3IRyw7+eV9jDeVOTZF9nLfnqEu7J/teuUKM1jeYuHHEsbKYvdAC3OF5KZ0i2TGc
-twOLokYqb7zyJs75m0GlfhRXpvJjlcyitq0my8ac3TQj9DiuEfhg5ph753BPa+Q2
-66PX0z/1QiRk+SnBaYQScUA576JqB3/83IkCp0iGHLfUalHD3vq6NKh2KzaHxTJi
-vKfzkyHw7RMDAe/2dZYyEwrLrxm+jmtURrqCeUoy7HAOlnLIuPOA4j5zEQufO3jv
-YoGc23sjJlRiSctNkm6rv6Acwsf+n1kVgjBHHsPwtzU3Fn64Xn+RS1tBkThDB0WG
-gVEQIXy06xRFwxsQ8ruBK+WU1gbfCl4nuYXWERIrlRregHQMUS1LM23ZpHovjORl
-Cmpm/1WijkGj0T0fo0GfvmFkGUcwgeV3wNUSHUYn3Xf0iEjXL4/jwEd0c7VP3Duy
-YyruCZ2DFudcGebgDpDX1qLjuim0g5q3PQ0B9cvaSHwvU5TWaeD1HX3GkLRuUc1E
-mvPhAsJRobW6wxw0Ca59VYbj8aiW61CXd4jTLqAUgSG1E6weI0exYOv1J/R1VvrQ
-SuUFg5bUXoxj0E8htWAqUfYTjn9YfTQbvTRd3F20TdEYd1sFzYIWs887J9dAexOm
-H/jCciyQQC3yBS+2yXpg
-=SPdZ
+iQIcBAEBCAAGBQJUQH4RAAoJECRx6z5ArFrD2hMQAIXPZ3twnS1gO/jjgQlHQi/S
+h17iL1Lt4eIQvyPY38JY4ctjU+Cq/x/lqQiPg+n5Ah9RG00/zqZMbizf3dYny7oG
+T9u7gMg1dBZhXTnKHnyHhyH5Ep3CWMY9WvHeFClBdVb7JSVcJyHpVEdBcP6ZNFKL
+o0BWw2cNtCjauNwTqufOWRZ1Pn5nJRMPts6Q1KX+2EdWvaX7dqlOOzE1teCtJ4yZ
+iDRB49Q7DMJfjgAfKWvF7UHIbUif/uiluWlsSTSDna52uy3RDuPGZZVhWRWaF6ZZ
+vC6tm6dUl8NJtntnh4mURoL0mWtjIDZEuuaHCOl/9P2P5VSEXZo8N2+iz8T8e38j
+49s69mndvrBIstUAcK4r+4/MOPSd503QsG5UCIlD412FfmBjAjG3lKkiVFlRXEAs
+2EJVrJTq2ANWgyaeMUYgZhq04I2MPlV6BfGnhTzU1Kp2Bj9/bL24nZcoQQ6otv9P
+frWWKvtLi8eOtMhPfAhw85s2YM3C2Zrv3Yr68TmfOEwQVK5IzYND5hQ+N4qSluUN
+PS6Y6uy5Wq2l0kVU9EeIwyHu0KKka50WQWf5RICuNgW22D/0+vuFv4wgHYNEIY9A
+Abk+EP3nvMsdlDx08k6uG/oRvdw1JsOi8f4u7stzpLXtlamKiSvPo/SC1jLADCsn
+VqtNq50NKC1yMaPVqSfH
+=Wnx5
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvswitch/openvswitch-2.3.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..8c3227534c3f
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.3.0-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/openvswitch-2.3.0-r1.ebuild,v 1.1 2014/10/17 02:24:57 prometheanfire Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils linux-info linux-mod python-single-r1 systemd autotools
+
+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 ~x86"
+IUSE="debug modules monitor +ssl"
+
+RDEPEND=">=sys-apps/openrc-0.10.5
+	ssl? ( dev-libs/openssl )
+	monitor? (
+		${PYTHON_DEPS}
+		dev-python/twisted-core
+		dev-python/twisted-conch
+		dev-python/twisted-web
+		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="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 2 6 32 || die "Linux >= 2.6.32 and <= 3.14 required for userspace modules"
+		kernel_is le 3 14 || die "Linux >= 2.6.32 and <= 3.14 required for userspace modules"
+		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"
+	epatch "${FILESDIR}/xcp-interface-reconfigure.patch"
+	eautoreconf
+}
+src_configure() {
+	set_arch_to_kernel
+	use monitor || export ovs_cv_python="no"
+	#pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	PYTHON=python2.7 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
+
+	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_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_dounit "${FILESDIR}/ovsdb-server.service"
+	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	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
+}