From 62f67115b5c46134c34f88f4b1cbdacc19384c0a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Sep 2018 11:19:18 +0100 Subject: gentoo resync : 30.09.2018 --- net-misc/openvswitch/Manifest | 7 +- .../files/ovs-delete-transient-ports.service | 10 ++ net-misc/openvswitch/files/ovs-vswitchd2.service | 26 ++++ net-misc/openvswitch/files/ovsdb-server2.service | 24 ++++ net-misc/openvswitch/files/ovsdb-server_conf2 | 3 + net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild | 154 +++++++++++++++++++++ 6 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 net-misc/openvswitch/files/ovs-delete-transient-ports.service create mode 100644 net-misc/openvswitch/files/ovs-vswitchd2.service create mode 100644 net-misc/openvswitch/files/ovsdb-server2.service create mode 100644 net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild (limited to 'net-misc/openvswitch') diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index d304b72618e5..3170d20edd83 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,14 +1,19 @@ AUX openvswitch.tmpfiles 40 BLAKE2B df482f24d2c48d54b6cabb1f0a37fcb193c9da71d9ae2eab0dd9a15209462e118a7160411d6d0cdb10f1721f0a86b689dd9c286325ed965ac1a510ae0af791a1 SHA512 020aaa9599b853d75a612f7bbd4ef8ea024908f283afe5c727f5d2a1f3a5a98634f82d840b3ebf886b9a82e9c60c237ced2fb13057bc7bb9ab5c449e11b51997 +AUX ovs-delete-transient-ports.service 272 BLAKE2B 4ee3767f84b4f47fe0d01aa9aaff35c9ca2be5afa6ba0f595d37ab0cdb4ccbdd7abcfb2a9c91a04d7820d1819f7757c7de569dd62cdc6c76cf533c27908f3471 SHA512 045f9c59275c555eb83c15e7cc0af4db3e9cd834385b4bbca35f5863e8432a0cf2038d10b8a55ad90a180b386a4bd0962ddcc401b4f3cf55b7e398e0683cc0f8 AUX ovs-vswitchd-r1 436 BLAKE2B 3660edee0906e3bd7fb1715601eb08567fba2ccb20a9b25b7ef250f130737d903acd187b35cb487a4141396ef3b7746d296ab613477b7fe907f1c6bb4c3da85d SHA512 7a98f85251a7b60d93a28ade482669537585fc05265cc51eb61e283739537df980230bd5f9dccfdb60772afe3f0bf2493eed9a25b289c7ef37d998e8ca5ec4df AUX ovs-vswitchd.service 393 BLAKE2B 6ca53819e5bda787eeefcf94f76749621da3462f2f92ccd70de35ba407b4dd74b29552b609871d77f85ccca764640555167b40b97d6585b80bf3bbfcb1ae242c SHA512 74d2ba9b76ad29dbb75e9b3321e1e714140a1c9bf9f5176c8418b025ffdb9c14d9f532709835c163c7256b4c81d69b522fcbc12d6bd9399283c8bd45b94cd7f2 +AUX ovs-vswitchd2.service 905 BLAKE2B 4474acd22956b21b6c89133c12013bb22ac2a19f759e2236a09b497a649ade6ea8db270f9a599931d622784109e71cce8ce9b09cef6ccfa6b938a31308eff7d5 SHA512 21e5a20bf469496f96afa13a5517393c1a55c09ae4cad57cb285a816f328ada190161210009e221acea47d0a038212e04ded7bb3f8235e6d6578ad283df7f0f5 AUX ovs-vswitchd_conf 164 BLAKE2B 89cad03c930c21e3f83a40a27a3ae011ff5be50af74b589a3313d4f4964d7931f0186c9e8a543468e08cd69c1d03f018060840d6c32f072e678b68839cc75968 SHA512 2e65f8658b6120e30849a8b3b0268d7776635c36bdd77920537355fc1883f306d3df5c78d2a5fefffdcf76b093b126f9d315c1595cd0ab643ac5f000c8b4f439 AUX ovsdb-server-r1 855 BLAKE2B 894b2bd417ad1e8113a0288db59af133e5b705deac982b01fcc9266c7c0387423a1897d55cd70651c3a0407461c641455869ceefe330cc1880abc2cf79516de6 SHA512 fa51b2a661c1bdd345adf58c2b0e4c4c68bb4ed4ce78dc6e195ba9fe662fa451753664c72f56d755cfa682d0c9accd283dc501aee3c4ba58238f44df1ddaf5a5 AUX ovsdb-server.service 480 BLAKE2B 5192dfe98551bbd81eead18a7eaba70ff0901bf2cab42fa1c93b079901777bc0e7fca0847427affc5a069e9041297369364f9aa28869f63a463e3646f70f47fd SHA512 cb9196ebdb7f16eca4182172a079027dc2c28f366d0a4f9251480b20172758cb581cd91b9a0f2a3dde95742455bec9ef96aa584305f17bdc97b3de7d4c99aa19 +AUX ovsdb-server2.service 1012 BLAKE2B b3d1d6373341d499d4e6c17b8b786de6a7861b46ed2cc76e526f0a196755408cff909a119862702e94dfd3171eae646f9f807a7b5c1be88e608938c3eff9d057 SHA512 da0deb44efabf3acd144b65bd0e32f1b4a6e6594e0e71eadcd0f98012d998c7bf21785b2bcb6b6f1cf1887836908ec7667161c31c1d827d8e865e95ebba8a591 AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2599f5a405f6f7e30e1d550090b9debc2262da674b9d04d3be16aadf375ca2031e74056433c1ce20818 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa -AUX ovsdb-server_conf2 544 BLAKE2B b406ef90df3988cdf4cf2870596471d98324bacdabdf9c517fdc30f6d59927894b310dc8d256fdc68c9d065a1c54c00035ec287d4970607cc2be1b2bf748bf17 SHA512 b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5 +AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7 +DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1e2063333a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 SHA512 f118c1c4ab4e126c3343023b03007ca9819c3c5a5ea42eaffaabdc7c50ecddede3e258574dbe0de95ed3be2e3d101612f5bdb423a7adb679987f4e501183a216 DIST openvswitch-2.7.2.tar.gz 6192414 BLAKE2B aea61637fe04d27d4c97e733987e843ef932bdd9e1d463c391e258a2b4461866a897c5063859708126c564e42ef99ab63a4b8fac8335bdc78531c46217abd945 SHA512 790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470 DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7 +EBUILD openvswitch-2.10.0-r1.ebuild 4699 BLAKE2B 25c4c0124b2d94e677274712fc03538edf5ba5119eb04fde8f388884bd780656bde4a3b84e349a2741ef626ad858ca5d78cf311ae51e9e32915c8ed5fc2d9d36 SHA512 1f4f103cc13e21105369a7da7ff0fe073776161e40c0e0768a79cd392835ea7d6d077d9128c880ab27f7bba6e7b4e20814f9492774295ad3c3c4cf0e0ac864c8 EBUILD openvswitch-2.7.2-r1.ebuild 4444 BLAKE2B 7c9830c776d48eb04b7ba492704ab4ca0b6ccd75f8e057b6fa6432896023b14a6757e91f5a2c56eef644e5253e2e5f67ca900e19a2f3a66fd79a38eaabb1c617 SHA512 6db5b15358397de27d6fd396b8468970800c4159ab6ee1a92b74be97f9e0570b0f3393d403437cd76832f61bed3b58a52179f87b11110f24967fe1cb3d871c8f EBUILD openvswitch-2.7.2.ebuild 4391 BLAKE2B cd3cd02b18f4b4ff3bb75740d18b6507abb1d1841efbe623b757aca9580843cdbe11bd314707cc650d4a126e9025a4a52cad07669ad1add0652f23aa0de9378e SHA512 6c9f52cb4a2d811cb4a07443c0cb431658b71c6d96d1011d09d5e4ec8e226265cd4bb10d1aa5a60637d0e97904d8c0e3287a28660b52eedca9807ba4b878fb6a EBUILD openvswitch-2.8.1.ebuild 4453 BLAKE2B cb74b2daedaabcb207cbbd728cdd14ce692e90bcacbd42a826bd71840104fe54f0acdb550c1fe6bd7c7ef372a879b2c4ffad8f8f19a676afe68a1a5047c28de8 SHA512 cca708a57ee51bfa50da1684d2cc28194a293c4dbf7fa366f53b598592197bced2e471fabb8e00dad60cede01c33430080f17dc78bf3fc262b05ae5730ac41b4 diff --git a/net-misc/openvswitch/files/ovs-delete-transient-ports.service b/net-misc/openvswitch/files/ovs-delete-transient-ports.service new file mode 100644 index 000000000000..4cd4d7f57f97 --- /dev/null +++ b/net-misc/openvswitch/files/ovs-delete-transient-ports.service @@ -0,0 +1,10 @@ +[Unit] +Description=Open vSwitch Delete Transient Ports +After=ovsdb-server.service +Before=ovs-vswitchd.service +AssertPathExists=/var/run/openvswitch/db.sock + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/share/openvswitch/scripts/ovs-ctl delete-transient-ports diff --git a/net-misc/openvswitch/files/ovs-vswitchd2.service b/net-misc/openvswitch/files/ovs-vswitchd2.service new file mode 100644 index 000000000000..3092fdaaa669 --- /dev/null +++ b/net-misc/openvswitch/files/ovs-vswitchd2.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/ovsdb-server2.service b/net-misc/openvswitch/files/ovsdb-server2.service new file mode 100644 index 000000000000..5ff6f9044660 --- /dev/null +++ b/net-misc/openvswitch/files/ovsdb-server2.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_conf2 b/net-misc/openvswitch/files/ovsdb-server_conf2 index 97367b9717e7..07eca5e6c9f7 100644 --- a/net-misc/openvswitch/files/ovsdb-server_conf2 +++ b/net-misc/openvswitch/files/ovsdb-server_conf2 @@ -9,6 +9,9 @@ PRIVATE_KEY="db:Open_vSwitch,SSL,private_key" CERTIFICATE="db:Open_vSwitch,SSL,certificate" BOOTSTRAP_CA_CERT="db:Open_vSwitch,SSL,ca_cert" +# Default user +OVS_USER_ID="root:root" + # Alternative path for the database (default is /etc/openvswitch/conf.db) # DATABASE="/etc/openvswitch/conf.db" diff --git a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild new file mode 100644 index 000000000000..302aafe58fec --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild @@ -0,0 +1,154 @@ +# 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 versionator + +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.9.2[${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" 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 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 + + 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}" + 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