From 7750fade80482bf075e56f4eabd52423c314fe69 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Wed, 19 Dec 2018 15:06:12 -0600 Subject: 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 --- net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/files/ovs-vswitchd-r2.service | 26 ++++ net-misc/openvswitch/files/ovs-vswitchd-r3.service | 26 ++++ net-misc/openvswitch/files/ovs-vswitchd.confd-r2 | 7 + net-misc/openvswitch/files/ovs-vswitchd2.service | 26 ---- net-misc/openvswitch/files/ovsdb-server-r2.service | 24 ++++ net-misc/openvswitch/files/ovsdb-server-r3.service | 22 ++++ net-misc/openvswitch/files/ovsdb-server2.service | 24 ---- net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild | 4 +- net-misc/openvswitch/openvswitch-2.10.1.ebuild | 142 +++++++++++++++++++++ 10 files changed, 250 insertions(+), 52 deletions(-) create mode 100644 net-misc/openvswitch/files/ovs-vswitchd-r2.service create mode 100644 net-misc/openvswitch/files/ovs-vswitchd-r3.service create mode 100644 net-misc/openvswitch/files/ovs-vswitchd.confd-r2 delete mode 100644 net-misc/openvswitch/files/ovs-vswitchd2.service create mode 100644 net-misc/openvswitch/files/ovsdb-server-r2.service create mode 100644 net-misc/openvswitch/files/ovsdb-server-r3.service delete mode 100644 net-misc/openvswitch/files/ovsdb-server2.service create mode 100644 net-misc/openvswitch/openvswitch-2.10.1.ebuild diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index f4195ba8e116..3df07d1580f2 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-vswitchd-r2.service b/net-misc/openvswitch/files/ovs-vswitchd-r2.service new file mode 100644 index 000000000000..3092fdaaa669 --- /dev/null +++ b/net-misc/openvswitch/files/ovs-vswitchd-r2.service @@ -0,0 +1,26 @@ +[Unit] +Description=Open vSwitch Daemon +Documentation=man:ovs-vswitchd +Wants=network.target +Before=network.target network.service +Requires=ovsdb-server.service +After=ovsdb-server.service network-pre.target systemd-udev-settle.service +ReloadPropagatedFrom=ovsdb-server.service +AssertPathIsReadWrite=/var/run/openvswitch/db.sock + +[Service] +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 +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 +TimeoutSec=300 + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r3.service b/net-misc/openvswitch/files/ovs-vswitchd-r3.service new file mode 100644 index 000000000000..165ea3bfbf81 --- /dev/null +++ b/net-misc/openvswitch/files/ovs-vswitchd-r3.service @@ -0,0 +1,26 @@ +[Unit] +Description=Open vSwitch Daemon +Documentation=man:ovs-vswitchd +Wants=network.target +Before=network.target network.service +Requires=ovsdb-server.service +After=ovsdb-server.service network-pre.target systemd-udev-settle.service +ReloadPropagatedFrom=ovsdb-server.service +AssertPathIsReadWrite=/var/run/openvswitch/db.sock + +[Service] +Type=forking +Restart=on-failure +Environment=HOME=/var/run/openvswitch +EnvironmentFile=-/etc/conf.d/ovs-vswitchd +ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ + --no-ovsdb-server --no-monitor --system-id=random \ + --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 --ovs-user=${OVS_USER_ID} \ + restart $OPTIONS +TimeoutSec=300 + +[Install] +WantedBy=multi-user.target 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 000000000000..eb4b6c2f2831 --- /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/ovs-vswitchd2.service b/net-misc/openvswitch/files/ovs-vswitchd2.service deleted file mode 100644 index 3092fdaaa669..000000000000 --- a/net-misc/openvswitch/files/ovs-vswitchd2.service +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=Open vSwitch Daemon -Documentation=man:ovs-vswitchd -Wants=network.target -Before=network.target network.service -Requires=ovsdb-server.service -After=ovsdb-server.service network-pre.target systemd-udev-settle.service -ReloadPropagatedFrom=ovsdb-server.service -AssertPathIsReadWrite=/var/run/openvswitch/db.sock - -[Service] -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 -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 -TimeoutSec=300 - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/openvswitch/files/ovsdb-server-r2.service b/net-misc/openvswitch/files/ovsdb-server-r2.service new file mode 100644 index 000000000000..5ff6f9044660 --- /dev/null +++ b/net-misc/openvswitch/files/ovsdb-server-r2.service @@ -0,0 +1,24 @@ +[Unit] +Description=Open vSwitch Database Unit +Documentation=man:ovsdb-server +After=syslog.target network-pre.target +Before=network.target network.service +Wants=ovs-delete-transient-ports.service + +[Service] +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} \ + start $OPTIONS +ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop +ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \ + ${OVSUSER} \ + --no-monitor restart $OPTIONS +RuntimeDirectory=openvswitch +RuntimeDirectoryMode=0755 diff --git a/net-misc/openvswitch/files/ovsdb-server-r3.service b/net-misc/openvswitch/files/ovsdb-server-r3.service new file mode 100644 index 000000000000..a1d308478daa --- /dev/null +++ b/net-misc/openvswitch/files/ovsdb-server-r3.service @@ -0,0 +1,22 @@ +[Unit] +Description=Open vSwitch Database Unit +Documentation=man:ovsdb-server +After=syslog.target network-pre.target +Before=network.target network.service +Wants=ovs-delete-transient-ports.service + +[Service] +Type=forking +Restart=on-failure +EnvironmentFile=-/etc/conf.d/ovsdb-server +ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch +ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ + --no-ovs-vswitchd --no-monitor --system-id=random \ + --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 \ + --ovs-user=${OVS_USER_ID} \ + --no-monitor restart $OPTIONS +RuntimeDirectory=openvswitch +RuntimeDirectoryMode=0755 diff --git a/net-misc/openvswitch/files/ovsdb-server2.service b/net-misc/openvswitch/files/ovsdb-server2.service deleted file mode 100644 index 5ff6f9044660..000000000000 --- a/net-misc/openvswitch/files/ovsdb-server2.service +++ /dev/null @@ -1,24 +0,0 @@ -[Unit] -Description=Open vSwitch Database Unit -Documentation=man:ovsdb-server -After=syslog.target network-pre.target -Before=network.target network.service -Wants=ovs-delete-transient-ports.service - -[Service] -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} \ - start $OPTIONS -ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop -ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \ - ${OVSUSER} \ - --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 302aafe58fec..8b7c0be030c7 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.1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1.ebuild new file mode 100644 index 000000000000..044f33af5890 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.10.1.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit autotools eutils linux-info linux-mod python-r1 systemd + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="https://www.openvswitch.org" +SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +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.10.0[${PYTHON_USEDEP}] + || ( + dev-python/twisted[conch,${PYTHON_USEDEP}] + dev-python/twisted-web[${PYTHON_USEDEP}] + ) + dev-python/zope-interface[${PYTHON_USEDEP}] + debug? ( dev-lang/perl )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" + +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 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" + # docs state 4.17.x code states 4.15.x + kernel_is le 4 15 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules" + linux-mod_pkg_setup + else + CONFIG_CHECK+=" ~OPENVSWITCH" + linux-info_pkg_setup + fi +} + +src_prepare() { + # Never build kernelmodules, doing this manually + sed -i \ + -e '/^SUBDIRS/d' \ + datapath/Makefile.in || die "sed failed" + eautoreconf + default +} + +src_configure() { + set_arch_to_kernel + # monitor is statically enabled for bug 596206 + # 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}" + + 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 modules && linux-mod_src_compile +} + +src_install() { + default + + local SCRIPT + if use monitor; then + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do + sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" + python_foreach_impl python_doscript utilities/"${SCRIPT}" + done + rm -r "${ED%/}"/usr/share/openvswitch/python || die + fi + + keepdir /var/{lib,log}/openvswitch + keepdir /etc/ssl/openvswitch + fperms 0750 /etc/ssl/openvswitch + + rm -rf "${ED%/}"/var/run || die + + newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server + 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-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 + + 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 + + # 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}" + 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="${EROOT%/}"/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)" + ovsdb-tool convert "${db}" \ + "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" + else + einfo "Creating new database '${db}'..." + ovsdb-tool create "${db}" \ + "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" + fi +} -- cgit v1.2.3-18-g5258