From 68f980204de6c2d69eed8748edc90282879326a6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 2 Feb 2023 09:07:02 +0000 Subject: gentoo auto-resync : 02:02:2023 - 09:07:02 --- net-misc/Manifest.gz | Bin 54282 -> 54279 bytes net-misc/openvswitch/Manifest | 2 +- net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild | 163 --------------------- net-misc/openvswitch/openvswitch-2.17.2-r2.ebuild | 166 ++++++++++++++++++++++ 4 files changed, 167 insertions(+), 164 deletions(-) delete mode 100644 net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild create mode 100644 net-misc/openvswitch/openvswitch-2.17.2-r2.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 5308dcd627b4..36d68021741f 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index a81b5cee021f..6561d642f4b0 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -9,5 +9,5 @@ AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6fa DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832 DIST openvswitch-2.17.2.tar.gz 7955727 BLAKE2B da7ffc29b6af5dbf8eeb410725ed4cb6b6c5f4abe22f17d0963429a3333e459e1d4cc4ef06d13518dc2486d5e9e78a090318ad66e50175606e47fcf1d61cfce7 SHA512 e01e41ef2fea21afcc891b8ab0a773fe7c9adf873853e10926b8bde2fd970e12b354010687439238e8d80a87884f497f7396a4a1f2b179104e49e87c66cfc79e EBUILD openvswitch-2.15.0.ebuild 4588 BLAKE2B f24a50690a85c81a11070f23f04db43d74b132df6725e7e21340034683547a8e384438fc72fbfaa30442f1a68577d838f8fafeaec5820a58804f1e3a755fc570 SHA512 6fadd40705d11a81687f22e1504f5cb6e16c35c276fbcbad0448a95428f0483d27ea6155d08439795788de0378a1f21de1b0830a3452f67aa0066f9f9fe73cb5 -EBUILD openvswitch-2.17.2-r1.ebuild 4927 BLAKE2B f4482acb5821e84d0af89c249e47100c324fe1ef923b41f66129989892f580e9a2ec4cfa0a9de808f0ca71a9573b1a64dc2a316a6d5b076420a4b315dbea6af4 SHA512 f17ad3ec8770b94ede501e9759f869b78de6d83c234b31c924a6b7621e93088a4e2c06fa1321cb7309bb54398f32ec597997905d773c9a7543699d3c1eb7520e +EBUILD openvswitch-2.17.2-r2.ebuild 5032 BLAKE2B a4cd88870f71e144fa29544b63703822280b83e5911c0342464d6108c1bcba02d4c21829fd74cdcf32695ba84f6def8e18b586f6b120eef342f0bedb51d3a197 SHA512 7fa66ab911176b63b48f02f1fb74f81b19e175b2c7851926ea5bada79b62a96d5c41f6c6512878d3e9f38278133f35eec0159bf503028d3e041a935a3bce8916 MISC metadata.xml 539 BLAKE2B c6a7e8b9ffb18bd32be27bb2ba301b4b8872a0c17eec6b110f89562d261614ca9bc1a5d89350ac05b6dc26d7536fd7aa1920326c7f55a0ecb4693bfc99986810 SHA512 d731202dfe79480263006596d7da8349a6831e05d75d5ebc9cce28818d02d5a52e81b350f5afb06279e91e5dc700763fb2975b28aad15bc3a0ea72b6264eba71 diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild deleted file mode 100644 index fab5815f4556..000000000000 --- a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MODULES_OPTIONAL_USE="modules" -PYTHON_COMPAT=( python3_{9..11} ) - -inherit autotools linux-info linux-mod python-single-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}" - -# Check python/ovs/version.py in tarball for dev-python/ovs dep -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}] - dev-python/twisted[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - ') - debug? ( dev-lang/perl ) - ssl? ( dev-libs/openssl:= )" -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 <= 5.8 required for userspace modules" - kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" - linux-mod_pkg_setup - else - CONFIG_CHECK+=" ~OPENVSWITCH" - linux-info_pkg_setup - fi -} - -src_prepare() { - default - - # Never build kernelmodules, doing this manually - sed -i \ - -e '/^SUBDIRS/d' \ - datapath/Makefile.in || die "sed failed" - - eautoreconf -} - -src_configure() { - set_arch_to_kernel - python_setup - - # 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" - - # Only adds a diagram to the man page, just skip it as we don't - # want to add a BDEPEND on graphviz right now. bug #856286 - export ovs_cv_dot="no" - - local linux_config - use modules && linux_config="--with-linux=${KV_OUT_DIR}" - - # Need PYTHON3 variable for bug #860240 - PYTHON3="${PYTHON}" CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash 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 - # ovs-bugtool is installed to sbin by the build system, but we - # install it to bin below, and these clash in merged-usr - # https://bugs.gentoo.org/889846 - rm "${ED}"/usr/sbin/ovs-bugtool || die - - for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do - 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 -} diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r2.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r2.ebuild new file mode 100644 index 000000000000..c17e37e3f3bb --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.17.2-r2.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MODULES_OPTIONAL_USE="modules" +PYTHON_COMPAT=( python3_{9..11} ) + +inherit autotools linux-info linux-mod python-single-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 ~ppc64 x86" +IUSE="debug modules monitor +ssl unwind" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Check python/ovs/version.py in tarball for dev-python/ovs dep +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}] + dev-python/twisted[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + ') + debug? ( dev-lang/perl ) + unwind? ( sys-libs/libunwind:= ) + ssl? ( dev-libs/openssl:= )" +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 <= 5.8 required for userspace modules" + kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" + linux-mod_pkg_setup + else + CONFIG_CHECK+=" ~OPENVSWITCH" + linux-info_pkg_setup + fi +} + +src_prepare() { + default + + # Never build kernelmodules, doing this manually + sed -i \ + -e '/^SUBDIRS/d' \ + datapath/Makefile.in || die "sed failed" + + eautoreconf +} + +src_configure() { + set_arch_to_kernel + python_setup + + # 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" + + # Only adds a diagram to the man page, just skip it as we don't + # want to add a BDEPEND on graphviz right now. bug #856286 + export ovs_cv_dot="no" + + local linux_config + use modules && linux_config="--with-linux=${KV_OUT_DIR}" + + export ac_cv_lib_unwind_unw_backtrace="$(usex unwind)" + + # Need PYTHON3 variable for bug #860240 + PYTHON3="${PYTHON}" CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash 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 + # ovs-bugtool is installed to sbin by the build system, but we + # install it to bin below, and these clash in merged-usr + # https://bugs.gentoo.org/889846 + rm "${ED}"/usr/sbin/ovs-bugtool || die + + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do + 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