From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- net-misc/openvswitch/Manifest | 6 - .../files/ovs-delete-transient-ports.service | 10 -- net-misc/openvswitch/files/ovs-vswitchd.service | 15 --- net-misc/openvswitch/files/ovsdb-server.service | 14 -- net-misc/openvswitch/files/ovsdb-server_conf | 16 --- net-misc/openvswitch/openvswitch-2.14.1.ebuild | 147 --------------------- 6 files changed, 208 deletions(-) delete mode 100644 net-misc/openvswitch/files/ovs-delete-transient-ports.service delete mode 100644 net-misc/openvswitch/files/ovs-vswitchd.service delete mode 100644 net-misc/openvswitch/files/ovsdb-server.service delete mode 100644 net-misc/openvswitch/files/ovsdb-server_conf delete mode 100644 net-misc/openvswitch/openvswitch-2.14.1.ebuild (limited to 'net-misc/openvswitch') diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index e9c3593cd6d1..ce760f0fd2f1 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,17 +1,11 @@ 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-r3.service 904 BLAKE2B 1a9880154a7628c57838a7d0fcf60d3734f35bef36fcaf6e396da92a35fa80a056bb1122d218f0331cc3382c13433672471dba7d7e711fd4f2ced4803b5623fa SHA512 408b52e74dab747bf83c66e43515868eaddb24de6e914c7ed201425cdc24c731b3d705cf9abf2cfc30c2499b77f2795b72d11f31bcfc3237cca0ad13ca17fc63 AUX ovs-vswitchd.confd-r2 188 BLAKE2B b38ed709f5d59caed9146df078c26b08d85178e7dd783ecc1f431721a23732fdacad77886ab4387ab94121eebca267b1d628f5a3e2f8c95e11f90b8a260a80c6 SHA512 b1afe4a4095ea78e7a58c69a26c0eac6e944594702364d81766944f7470cdbac09922286b8a8f926aad8ff2e14ee6b5311188d2dc22ea2d8bb9cf28034157135 -AUX ovs-vswitchd.service 393 BLAKE2B 6ca53819e5bda787eeefcf94f76749621da3462f2f92ccd70de35ba407b4dd74b29552b609871d77f85ccca764640555167b40b97d6585b80bf3bbfcb1ae242c SHA512 74d2ba9b76ad29dbb75e9b3321e1e714140a1c9bf9f5176c8418b025ffdb9c14d9f532709835c163c7256b4c81d69b522fcbc12d6bd9399283c8bd45b94cd7f2 AUX ovsdb-server-r1 855 BLAKE2B 894b2bd417ad1e8113a0288db59af133e5b705deac982b01fcc9266c7c0387423a1897d55cd70651c3a0407461c641455869ceefe330cc1880abc2cf79516de6 SHA512 fa51b2a661c1bdd345adf58c2b0e4c4c68bb4ed4ce78dc6e195ba9fe662fa451753664c72f56d755cfa682d0c9accd283dc501aee3c4ba58238f44df1ddaf5a5 AUX ovsdb-server-r3.service 813 BLAKE2B ba16534aaf407121f56e1ffc711dcc87b4c5ee07cc12f74e1d8ca2b7e85fefede4100154ef2031470b68fe5085539984b6b38b8c518fa38a8eb19d8af3a24c1c SHA512 ed3137fb0b26be82f311aa9a56855d91bb113a64fd43ecde8d97979354edffe26ee7712eac91c96b19e56c35a5b4ef2c68acfe5c3c0c0cd21e35745fde41574e -AUX ovsdb-server.service 480 BLAKE2B 5192dfe98551bbd81eead18a7eaba70ff0901bf2cab42fa1c93b079901777bc0e7fca0847427affc5a069e9041297369364f9aa28869f63a463e3646f70f47fd SHA512 cb9196ebdb7f16eca4182172a079027dc2c28f366d0a4f9251480b20172758cb581cd91b9a0f2a3dde95742455bec9ef96aa584305f17bdc97b3de7d4c99aa19 -AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2599f5a405f6f7e30e1d550090b9debc2262da674b9d04d3be16aadf375ca2031e74056433c1ce20818 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa 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.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832 -EBUILD openvswitch-2.14.1.ebuild 4448 BLAKE2B f2621188fe68fddafa7b90b64a0ae9c5fe0352d24758f0fc98994a3c00d34c06f7426f530a03a5d22d0805030741c8792079556b1f514df94a3a6063c5d23e1f SHA512 06299fb3b77d645fc946dd25a224d33d4db478bc9de15b9142131e80c18e3d33943a224d40d62587acd46104c80e80a5b9e422a80e3912e53cf662f54799d789 EBUILD openvswitch-2.15.0.ebuild 4406 BLAKE2B 2bd8f0c6fa31c291c358666b12bc8a7cee17b8aec4f9860e8cd21d93d671ce318c2e55f6a938b2c406a5892787de3b3e1546eaff16cc7859031e6b6edcf043ea SHA512 8d8ac462e9102b7162c417eab2194601027ee1cbe247ad2bd1b10b828780ad2bebe8991addee49ff4f31358c560e946e7f3a73a2cc60d2dc148eb6e55d6ecf8b MISC metadata.xml 459 BLAKE2B b404d36a797768044b82701f1d65c2931b33d2ddb553dcc56cd476686d66102988a863261a6afd05c366b3e0521959e3c4b3af2cc1751899ecc386adf458fb12 SHA512 1b11fe7e1e1d117f60eb24da05c27a2b3e431dc4c46ea8e97cff69cef8747f110be6ae7e6a83fcb604a75954c7c2133139e052823620bdf1b010f8c4f8b0f931 diff --git a/net-misc/openvswitch/files/ovs-delete-transient-ports.service b/net-misc/openvswitch/files/ovs-delete-transient-ports.service deleted file mode 100644 index 4cd4d7f57f97..000000000000 --- a/net-misc/openvswitch/files/ovs-delete-transient-ports.service +++ /dev/null @@ -1,10 +0,0 @@ -[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-vswitchd.service b/net-misc/openvswitch/files/ovs-vswitchd.service deleted file mode 100644 index a573a503e14c..000000000000 --- a/net-misc/openvswitch/files/ovs-vswitchd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Open vSwitch Daemon -Documentation=man:ovs-vswitchd -Wants=network.target -Before=network.target -Requires=ovsdb-server.service -After=ovsdb-server.service - -[Service] -# --pidfile options is needed for create file used -# by ovs-appctl command. -ExecStart=/usr/sbin/ovs-vswitchd --mlockall --monitor unix:/var/run/openvswitch/db.sock --pidfile - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/openvswitch/files/ovsdb-server.service b/net-misc/openvswitch/files/ovsdb-server.service deleted file mode 100644 index 9493c40755d8..000000000000 --- a/net-misc/openvswitch/files/ovsdb-server.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Open vSwitch Database Server -Documentation=man:ovsdb-server - -[Service] -# The file can be shared for this as this values are prone to change -# and that way we don't need to update them in two different places -EnvironmentFile=/etc/conf.d/ovsdb-server -ExecStart=/usr/sbin/ovsdb-server --monitor \ - --remote=punix:${DB_SOCKET} \ - --remote=${REMOTE_DB} \ - --private-key=${PRIVATE_KEY} \ - --certificate=${CERTIFICATE} \ - --bootstrap-ca-cert=${BOOTSTRAP_CA_CERT} diff --git a/net-misc/openvswitch/files/ovsdb-server_conf b/net-misc/openvswitch/files/ovsdb-server_conf deleted file mode 100644 index 1299b820640c..000000000000 --- a/net-misc/openvswitch/files/ovsdb-server_conf +++ /dev/null @@ -1,16 +0,0 @@ -# Socket for bringing the server up -DB_SOCKET="/var/run/openvswitch/db.sock" - -# Remote sockets are defined in the database by default -REMOTE_DB="db:Open_vSwitch,manager_options" - -# All certificates and keys are stored in the database (if any) -PRIVATE_KEY="db:SSL,private_key" -CERTIFICATE="db:SSL,certificate" -BOOTSTRAP_CA_CERT="db:SSL,ca_cert" - -# Alternative path for the database (default is /etc/openvswitch/conf.db) -# DATABASE="/etc/openvswitch/conf.db" - -# Additional options -# OPTIONS="" diff --git a/net-misc/openvswitch/openvswitch-2.14.1.ebuild b/net-misc/openvswitch/openvswitch-2.14.1.ebuild deleted file mode 100644 index c873cc5a5478..000000000000 --- a/net-misc/openvswitch/openvswitch-2.14.1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_7 python3_8 python3_9 ) - -inherit autotools linux-info linux-mod python-r1 systemd tmpfiles - -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.13.0[${PYTHON_USEDEP}] - dev-python/twisted[conch,${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - debug? ( dev-lang/perl )" -DEPEND="${RDEPEND} - sys-apps/util-linux[caps]" -BDEPEND="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 5 5 999 || die "Linux >= 3.10.0 and <= 4.18 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" - - # flake8 is primarily a style guide tool, running it as part of the tests - # in Gentoo does not make much sense, only breaks them: bug 607280 - export ovs_cv_flake8="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.confd-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 - newtmpfiles "${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 - - tmpfiles_process openvswitch.conf - - # 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