commit: 7750fade80482bf075e56f4eabd52423c314fe69 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Wed Dec 19 21:06:12 2018 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Wed Dec 19 21:06:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7750fade
net-misc/openvswitch: 2.10.1 bump Closes: https://bugs.gentoo.org/673438 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> net-misc/openvswitch/Manifest | 1 + ...s-vswitchd2.service => ovs-vswitchd-r2.service} | 0 ...s-vswitchd2.service => ovs-vswitchd-r3.service} | 6 +++--- net-misc/openvswitch/files/ovs-vswitchd.confd-r2 | 7 +++++++ ...sdb-server2.service => ovsdb-server-r2.service} | 0 ...sdb-server2.service => ovsdb-server-r3.service} | 6 ++---- net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild | 4 ++-- ...-2.10.0-r1.ebuild => openvswitch-2.10.1.ebuild} | 24 ++++++---------------- 8 files changed, 21 insertions(+), 27 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index f4195ba8e11..3df07d1580f 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,2 +1,3 @@ DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1e2063333a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 SHA512 f118c1c4ab4e126c3343023b03007ca9819c3c5a5ea42eaffaabdc7c50ecddede3e258574dbe0de95ed3be2e3d101612f5bdb423a7adb679987f4e501183a216 +DIST openvswitch-2.10.1.tar.gz 7522058 BLAKE2B 0f4eef6bf376cc23de4061c04787663f31458d98ac9ffb76627d5a7bb9422ee5f1d99e5c6024ad078c1b6128fb1b9ac99ea9e7107803fd2fdf6cb09bff6b0ef3 SHA512 3634bd3e978110cb9e11191a88e4232a7af152a6ddf46e8a32e50e07de866be782b7e753d26b81183ec107816e5af4109badf8f2067a61fd9506ccf81e748e44 DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7 diff --git a/net-misc/openvswitch/files/ovs-vswitchd2.service b/net-misc/openvswitch/files/ovs-vswitchd-r2.service similarity index 100% copy from net-misc/openvswitch/files/ovs-vswitchd2.service copy to net-misc/openvswitch/files/ovs-vswitchd-r2.service diff --git a/net-misc/openvswitch/files/ovs-vswitchd2.service b/net-misc/openvswitch/files/ovs-vswitchd-r3.service similarity index 83% rename from net-misc/openvswitch/files/ovs-vswitchd2.service rename to net-misc/openvswitch/files/ovs-vswitchd-r3.service index 3092fdaaa66..165ea3bfbf8 100644 --- a/net-misc/openvswitch/files/ovs-vswitchd2.service +++ b/net-misc/openvswitch/files/ovs-vswitchd-r3.service @@ -12,14 +12,14 @@ AssertPathIsReadWrite=/var/run/openvswitch/db.sock Type=forking Restart=on-failure Environment=HOME=/var/run/openvswitch -EnvironmentFile=-/run/openvswitch/useropts EnvironmentFile=-/etc/conf.d/ovs-vswitchd ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovsdb-server --no-monitor --system-id=random \ - ${OVSUSER} start $OPTIONS + --ovs-user=${OVS_USER_ID} start $OPTIONS ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server stop ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server \ - --no-monitor --system-id=random ${OVSUSER} restart $OPTIONS + --no-monitor --system-id=random --ovs-user=${OVS_USER_ID} \ + restart $OPTIONS TimeoutSec=300 [Install] diff --git a/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 b/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 new file mode 100644 index 00000000000..eb4b6c2f283 --- /dev/null +++ b/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 @@ -0,0 +1,7 @@ +# Connection string for the configuration database (usually a unix socket) +DATABASE="unix:/var/run/openvswitch/db.sock" + +# Additional options +OPTIONS="--mlockall" + +OVS_USER_ID="root:root" diff --git a/net-misc/openvswitch/files/ovsdb-server2.service b/net-misc/openvswitch/files/ovsdb-server-r2.service similarity index 100% copy from net-misc/openvswitch/files/ovsdb-server2.service copy to net-misc/openvswitch/files/ovsdb-server-r2.service diff --git a/net-misc/openvswitch/files/ovsdb-server2.service b/net-misc/openvswitch/files/ovsdb-server-r3.service similarity index 72% rename from net-misc/openvswitch/files/ovsdb-server2.service rename to net-misc/openvswitch/files/ovsdb-server-r3.service index 5ff6f904466..a1d308478da 100644 --- a/net-misc/openvswitch/files/ovsdb-server2.service +++ b/net-misc/openvswitch/files/ovsdb-server-r3.service @@ -10,15 +10,13 @@ Type=forking Restart=on-failure EnvironmentFile=-/etc/conf.d/ovsdb-server ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch -ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch/useropts; if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVSUSER=--ovs-user=${OVS_USER_ID}" > /run/openvswitch/useropts; fi' -EnvironmentFile=-/run/openvswitch/useropts ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovs-vswitchd --no-monitor --system-id=random \ - ${OVSUSER} \ + --ovs-user=${OVS_USER_ID} \ start $OPTIONS ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \ - ${OVSUSER} \ + --ovs-user=${OVS_USER_ID} \ --no-monitor restart $OPTIONS RuntimeDirectory=openvswitch RuntimeDirectoryMode=0755 diff --git a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild index 302aafe58fe..8b7c0be030c 100644 --- a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild @@ -106,8 +106,8 @@ src_install() { newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd - systemd_newunit "${FILESDIR}/ovsdb-server2.service" ovsdb-server.service - systemd_newunit "${FILESDIR}/ovs-vswitchd2.service" ovs-vswitchd.service + systemd_newunit "${FILESDIR}/ovsdb-server-r2.service" ovsdb-server.service + systemd_newunit "${FILESDIR}/ovs-vswitchd-r2.service" ovs-vswitchd.service systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf diff --git a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1.ebuild similarity index 83% copy from net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild copy to net-misc/openvswitch/openvswitch-2.10.1.ebuild index 302aafe58fe..044f33af589 100644 --- a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.10.1.ebuild @@ -5,7 +5,7 @@ EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -inherit autotools eutils linux-info linux-mod python-r1 systemd versionator +inherit autotools eutils linux-info linux-mod python-r1 systemd DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org"; @@ -13,14 +13,14 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"; LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="debug modules monitor +ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ssl? ( dev-libs/openssl:0= ) ${PYTHON_DEPS} - ~dev-python/ovs-2.9.2[${PYTHON_USEDEP}] + ~dev-python/ovs-2.10.0[${PYTHON_USEDEP}] || ( dev-python/twisted[conch,${PYTHON_USEDEP}] dev-python/twisted-web[${PYTHON_USEDEP}] @@ -102,12 +102,12 @@ src_install() { rm -rf "${ED%/}"/var/run || die newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server - newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd + newconfd "${FILESDIR}/ovs-vswitchd.conf-r2" ovs-vswitchd newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd - systemd_newunit "${FILESDIR}/ovsdb-server2.service" ovsdb-server.service - systemd_newunit "${FILESDIR}/ovs-vswitchd2.service" ovs-vswitchd.service + systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service + systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf @@ -120,18 +120,6 @@ src_install() { pkg_postinst() { use modules && linux-mod_pkg_postinst - local pv - 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 - # only needed on non-systemd, but helps anyway elog "Use the following command to create an initial database for ovsdb-server:" elog " emerge --config =${CATEGORY}/${PF}"
