[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/
commit: a3ab78d7f79a637cf1c5e9a286f4e32b6fcfad53 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed May 8 18:11:24 2024 + Commit: Conrad Kostecki gentoo org> CommitDate: Thu May 9 19:54:23 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ab78d7 net-misc/openvswitch: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/36605 Signed-off-by: Conrad Kostecki gentoo.org> .../files/openvswitch-2.17.6-groff-1.23.0.patch| 145 - 1 file changed, 145 deletions(-) diff --git a/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch b/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch deleted file mode 100644 index 3035005ae52e.. --- a/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch +++ /dev/null @@ -1,145 +0,0 @@ -https://bugs.gentoo.org/910196 -https://github.com/openvswitch/ovs/commit/a45b3afbf82e1c1702d25a5097a25c45923c6fae -https://github.com/openvswitch/ovs/commit/6929485d318e08c11e8e98f7847d5cefcb36c21c -https://github.com/openvswitch/ovs/commit/93412e00e7a1f61c5eb4771d150bdbf504ff59aa - -From a45b3afbf82e1c1702d25a5097a25c45923c6fae Mon Sep 17 00:00:00 2001 -From: gordonwwang -Date: Thu, 17 Aug 2023 11:04:39 +0800 -Subject: [PATCH] ovs.tmac: Fix troff warning in versions above groff-1.23. - -When the compilation dependency is groff-1.23, the following message is -displayed in the compilation log, and the compilation fails: - - troff:vswitchd/ovs-vswitchd.8:1298: warning: cannot select font 'CW' - make[1]: *** [Makefile:6761: manpage-check] Error 1 - -CW font was removed and and now groff warns about non-existent font: - https://git.savannah.gnu.org/cgit/groff.git/commit/?id=d75ea8b2e283e37bd560e821fa4597065f36725f) - -Fix that by replacing CW with CR. CW supposed to be an alias of CR -anyway. - -Submitted-at: https://github.com/openvswitch/ovs/pull/416 -Co-authored-by: Xiaojie Chen -Signed-off-by: Xiaojie Chen -Signed-off-by: gordonwwang -Signed-off-by: Ilya Maximets - lib/ovs.tmac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/ovs.tmac b/lib/ovs.tmac -index 5f8f20afa4a..97b6fa3df76 100644 a/lib/ovs.tmac -+++ b/lib/ovs.tmac -@@ -175,7 +175,7 @@ - . nr mE \\n(.f - . nf - . nh --. ft CW -+. ft CR - .. - . - . - -From 6929485d318e08c11e8e98f7847d5cefcb36c21c Mon Sep 17 00:00:00 2001 -From: Frode Nordahl -Date: Mon, 21 Aug 2023 15:53:33 +0200 -Subject: [PATCH] docs: Add `nowarn` region option to tables. - -Starting with groff 1.23.0 a warning is produced if the tbl -preprocessor is not run. A side effect of enabling it is that -new warnings on table formatting is printed. - -As requested during the review [0] of a series [1] attempting to -address this, this patch makes use of the `nowarn` region option -as opposed to attempting to change the formatting. - -0: https://patchwork.ozlabs.org/project/openvswitch/patch/zm00wfa80rob2...@riva.ucam.org/#3164177 -1: https://patchwork.ozlabs.org/project/openvswitch/list/?series=367378=* - -Reported-by: Lucas Nussbaum -Reported-at: https://bugs.debian.org/1042358 -Signed-off-by: Frode Nordahl -Signed-off-by: Ilya Maximets - build-aux/extract-ofp-fields | 6 +++--- - lib/meta-flow.xml| 1 + - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields -index 8766995d9ab..7a9788be968 100755 a/build-aux/extract-ofp-fields -+++ b/build-aux/extract-ofp-fields -@@ -578,7 +578,7 @@ def field_to_xml(field_node, f, body, summary): - body += [""".PP - \\fB%s Field\\fR - .TS --tab(;); -+tab(;),nowarn; - l lx. - """ % title] - -@@ -655,7 +655,7 @@ def group_xml_to_nroff(group_node, fields): - '.SH \"%s\"\n' % build.nroff.text_to_nroff(title.upper() + " FIELDS"), - '.SS "Summary:"\n', - '.TS\n', --'tab(;);\n', -+'tab(;),nowarn;\n', - 'l l l l l l l.\n', - 'Name;Bytes;Mask;RW?;Prereqs;NXM/OXM Support\n', - '\_;\_;\_;\_;\_;\_\n'] -@@ -665,7 +665,7 @@ def group_xml_to_nroff(group_node, fields): - return ''.join(content) - - def make_oxm_classes_xml(document): --s = '''tab(;); -+s = '''tab(;),nowarn; - l l l. - Prefix;Vendor;Class - \_;\_;\_ -diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml -index ff81fddc5e7..fe80ee930d0 100644 a/lib/meta-flow.xml -+++ b/lib/meta-flow.xml -@@ -3517,6 +3517,7 @@ actions=clone(load:0->NXM_OF_IN_PORT[],output:123) - - - -+nowarn; - r r r r r. - CriteriaOpenFlow 1.0OpenFlow 1.1OpenFlow 1.2+ NXM - \_ \_ \_ \_ \_ -From 93412e00e7a1f61c5eb4771d150bdbf504ff59aa Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Mon, 21 Aug 2023 15:53:34 +0200 -Subject: [PATCH] docs: Run tbl preprocessor in manpage-check rule. - -If we omit this, groff 1.23.0 warns: - - tbl preprocessor failed,
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: f2a6be91995797d43c877b3e10cac14e839668eb Author: Robin H. Johnson gentoo org> AuthorDate: Sun May 5 23:26:34 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun May 5 23:28:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a6be91 net-misc/openvswitch: py312 support, fix dev-python/ovs dep, fix accidental direct to stable Signed-off-by: Robin H. Johnson gentoo.org> .../{openvswitch-2.17.9.ebuild => openvswitch-2.17.9-r1.ebuild} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.9.ebuild b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild similarity index 97% rename from net-misc/openvswitch/openvswitch-2.17.9.ebuild rename to net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild index 5443b1d05e16..1053a8bdd80b 100644 --- a/net-misc/openvswitch/openvswitch-2.17.9.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 MODULES_OPTIONAL_USE="modules" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools linux-mod-r1 python-single-r1 systemd tmpfiles @@ -14,14 +14,14 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz; LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="debug modules monitor +ssl unwind valgrind" 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/ovs-2.17.9[${PYTHON_USEDEP}] dev-python/twisted[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] ')
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 3836faf8cc556b42ed987cc8e4b44cfb638a540d Author: Robin H. Johnson gentoo org> AuthorDate: Sun May 5 23:27:52 2024 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun May 5 23:28:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3836faf8 net-misc/openvswitch: cleanup v2.17.6 Signed-off-by: Robin H. Johnson gentoo.org> net-misc/openvswitch/Manifest | 1 - net-misc/openvswitch/openvswitch-2.17.6.ebuild | 174 - 2 files changed, 175 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index ac6553668f58..19823fb47223 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,3 +1,2 @@ -DIST openvswitch-2.17.6.tar.gz 8092331 BLAKE2B 0564a332e8c876552a9a3a068f4e54d3f5d56428e277e32f188aba9626035818c900be45171964ddcb782166a5e5b3b8f3a2fb80d5ed9723b94c9e1ed7410544 SHA512 ff9d19a9101c9a18117a859150d391eecbd6a331e35da3f20a62acaac1febbfbad716874734f9bd0d304d635212884f9f617b944e79bb7e554ddd9e5c53645c8 DIST openvswitch-2.17.8.tar.gz 8097747 BLAKE2B d37ae60481255476d41aa94086f6a597107b23176f7ff47eeff9d85a5904da3685886663451317e0b9e512fb049b4024e291f320752aa90fe798ff08f49772c5 SHA512 c94685b67f9f25c81a590696d36c431fadf09c2504b06565011c2945ef242c5039508b312992597822f8ee274ce615ca58bc6bb2aa0a9cf1346bc2dcada70fa1 DIST openvswitch-2.17.9.tar.gz 8136490 BLAKE2B cdb5ec81fb9ac04786fc1230d60c6c9bbf7ec2929cf5ab40bb1e0e7442480383d0ad8f24f14df4901cab8f39a6532445cf1810c9b9e3a779d7d15bfe35101a37 SHA512 b91212f9c10a208bca9d15cd5a219ae24b7e9bf8b5c8fdebc21cd9fa8229bc655f9f3591d79dd30c1a8212daed15d5a26bf9532b3496e3660bc8b62012f45636 diff --git a/net-misc/openvswitch/openvswitch-2.17.6.ebuild b/net-misc/openvswitch/openvswitch-2.17.6.ebuild deleted file mode 100644 index ff783ad71bfb.. --- a/net-misc/openvswitch/openvswitch-2.17.6.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MODULES_OPTIONAL_USE="modules" -PYTHON_COMPAT=( python3_{10..11} ) - -inherit autotools 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 valgrind" -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] - valgrind? ( dev-debug/valgrind )" -BDEPEND="virtual/pkgconfig - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - ')" - -PATCHES=( - "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" - "${FILESDIR}/openvswitch-2.17.6-groff-1.23.0.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" - - export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) - - local linux_config - use modules && linux_config="--with-linux=${KV_OUT_DIR}" - - export
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 4b43a32835fbfc3a587168be177730ac3ca57d0d Author: Matthew Thode gentoo org> AuthorDate: Sun May 5 17:01:39 2024 + Commit: Matthew Thode gentoo org> CommitDate: Sun May 5 17:02:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b43a328 net-misc/openvswitch: add 2.17.9 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.17.9.ebuild | 173 + 2 files changed, 174 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 7acfe647114a..ac6553668f58 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,2 +1,3 @@ DIST openvswitch-2.17.6.tar.gz 8092331 BLAKE2B 0564a332e8c876552a9a3a068f4e54d3f5d56428e277e32f188aba9626035818c900be45171964ddcb782166a5e5b3b8f3a2fb80d5ed9723b94c9e1ed7410544 SHA512 ff9d19a9101c9a18117a859150d391eecbd6a331e35da3f20a62acaac1febbfbad716874734f9bd0d304d635212884f9f617b944e79bb7e554ddd9e5c53645c8 DIST openvswitch-2.17.8.tar.gz 8097747 BLAKE2B d37ae60481255476d41aa94086f6a597107b23176f7ff47eeff9d85a5904da3685886663451317e0b9e512fb049b4024e291f320752aa90fe798ff08f49772c5 SHA512 c94685b67f9f25c81a590696d36c431fadf09c2504b06565011c2945ef242c5039508b312992597822f8ee274ce615ca58bc6bb2aa0a9cf1346bc2dcada70fa1 +DIST openvswitch-2.17.9.tar.gz 8136490 BLAKE2B cdb5ec81fb9ac04786fc1230d60c6c9bbf7ec2929cf5ab40bb1e0e7442480383d0ad8f24f14df4901cab8f39a6532445cf1810c9b9e3a779d7d15bfe35101a37 SHA512 b91212f9c10a208bca9d15cd5a219ae24b7e9bf8b5c8fdebc21cd9fa8229bc655f9f3591d79dd30c1a8212daed15d5a26bf9532b3496e3660bc8b62012f45636 diff --git a/net-misc/openvswitch/openvswitch-2.17.9.ebuild b/net-misc/openvswitch/openvswitch-2.17.9.ebuild new file mode 100644 index ..5443b1d05e16 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.17.9.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MODULES_OPTIONAL_USE="modules" +PYTHON_COMPAT=( python3_{10..11} ) + +inherit autotools linux-mod-r1 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 valgrind" +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] + valgrind? ( dev-debug/valgrind )" +BDEPEND="virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ')" + +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-r1_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" + + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + + 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 13057f5ddf63a17df7556d9c8c745da1e1fe5f1f Author: Joonas Niilola gentoo org> AuthorDate: Mon Apr 29 10:37:56 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Apr 29 10:37:56 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13057f5d net-misc/openvswitch: Stabilize 2.17.8 x86, #930911 Signed-off-by: Joonas Niilola gentoo.org> net-misc/openvswitch/openvswitch-2.17.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.8.ebuild b/net-misc/openvswitch/openvswitch-2.17.8.ebuild index d2521fea675e..03f00817ad77 100644 --- a/net-misc/openvswitch/openvswitch-2.17.8.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.8.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz; LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 x86" IUSE="debug modules monitor +ssl unwind valgrind" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: ddfb2a10567ce1851b3c5639b468f43b87fd07f1 Author: Joonas Niilola gentoo org> AuthorDate: Mon Apr 29 10:35:41 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Apr 29 10:35:41 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddfb2a10 net-misc/openvswitch: Stabilize 2.17.8 amd64, #930911 Signed-off-by: Joonas Niilola gentoo.org> net-misc/openvswitch/openvswitch-2.17.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.8.ebuild b/net-misc/openvswitch/openvswitch-2.17.8.ebuild index b8af26f3b838..d2521fea675e 100644 --- a/net-misc/openvswitch/openvswitch-2.17.8.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.8.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz; LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" IUSE="debug modules monitor +ssl unwind valgrind" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 361926ec953c93bac40cfe984197c461777bc9d5 Author: Joonas Niilola gentoo org> AuthorDate: Mon Mar 4 07:43:35 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Mar 4 07:53:47 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=361926ec net-misc/openvswitch: migrate 2.17.8 to linux-mod-r1.eclass Signed-off-by: Joonas Niilola gentoo.org> net-misc/openvswitch/openvswitch-2.17.8.ebuild | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.8.ebuild b/net-misc/openvswitch/openvswitch-2.17.8.ebuild index 059ccf3295d6..b8af26f3b838 100644 --- a/net-misc/openvswitch/openvswitch-2.17.8.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.8.ebuild @@ -6,7 +6,7 @@ EAPI=8 MODULES_OPTIONAL_USE="modules" PYTHON_COMPAT=( python3_{10..11} ) -inherit autotools linux-mod python-single-r1 systemd tmpfiles +inherit autotools linux-mod-r1 python-single-r1 systemd tmpfiles DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org; @@ -51,7 +51,7 @@ pkg_setup() { 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 + linux-mod-r1_pkg_setup else CONFIG_CHECK+=" ~OPENVSWITCH" linux-info_pkg_setup @@ -106,7 +106,7 @@ src_configure() { src_compile() { default - use modules && linux-mod_src_compile + use modules && linux-mod-r1_src_compile } src_install() { @@ -144,11 +144,11 @@ src_install() { insinto /etc/logrotate.d newins rhel/etc_logrotate.d_openvswitch openvswitch - use modules && linux-mod_src_install + use modules && linux-mod-r1_src_install } pkg_postinst() { - use modules && linux-mod_pkg_postinst + use modules && linux-mod-r1_pkg_postinst tmpfiles_process openvswitch.conf
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/, net-misc/openvswitch/files/
commit: 81a509bcc3fb98c2b5f3d3e323f26ce92a5ae138 Author: Brahmajit Das gmail com> AuthorDate: Thu Feb 8 19:44:21 2024 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Mar 4 07:53:47 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81a509bc net-misc/openvswitch: add 2.17.8 Updating to latest LTS release and fixing build error with GCC 14 Closes: https://bugs.gentoo.org/923703 Signed-off-by: Brahmajit Das gmail.com> Closes: https://github.com/gentoo/gentoo/pull/35235 Signed-off-by: Joonas Niilola gentoo.org> net-misc/openvswitch/Manifest | 1 + .../files/openvswitch-2.17.8-gcc14-build-fix.patch | 32 net-misc/openvswitch/openvswitch-2.17.8.ebuild | 174 + 3 files changed, 207 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 3bebee2ed69e..7acfe647114a 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1 +1,2 @@ DIST openvswitch-2.17.6.tar.gz 8092331 BLAKE2B 0564a332e8c876552a9a3a068f4e54d3f5d56428e277e32f188aba9626035818c900be45171964ddcb782166a5e5b3b8f3a2fb80d5ed9723b94c9e1ed7410544 SHA512 ff9d19a9101c9a18117a859150d391eecbd6a331e35da3f20a62acaac1febbfbad716874734f9bd0d304d635212884f9f617b944e79bb7e554ddd9e5c53645c8 +DIST openvswitch-2.17.8.tar.gz 8097747 BLAKE2B d37ae60481255476d41aa94086f6a597107b23176f7ff47eeff9d85a5904da3685886663451317e0b9e512fb049b4024e291f320752aa90fe798ff08f49772c5 SHA512 c94685b67f9f25c81a590696d36c431fadf09c2504b06565011c2945ef242c5039508b312992597822f8ee274ce615ca58bc6bb2aa0a9cf1346bc2dcada70fa1 diff --git a/net-misc/openvswitch/files/openvswitch-2.17.8-gcc14-build-fix.patch b/net-misc/openvswitch/files/openvswitch-2.17.8-gcc14-build-fix.patch new file mode 100644 index ..6a439dc0544a --- /dev/null +++ b/net-misc/openvswitch/files/openvswitch-2.17.8-gcc14-build-fix.patch @@ -0,0 +1,32 @@ +https://github.com/openvswitch/ovs/commit/335a5deac3ff91448ca14651e92f39dfdd512fcf.patch +From: Ilya Maximets +Date: Thu, 18 Jan 2024 15:59:05 +0100 +Subject: [PATCH] ovs-atomic: Fix inclusion of Clang header by GCC 14. + +GCC 14 started to advertise c_atomic extension, older versions didn't +do that. Add check for __clang__, so GCC doesn't include headers +designed for Clang. + +Another option would be to prefer stdatomic implementation instead, +but some older versions of Clang are not able to use stdatomic.h +supplied by GCC as described in commit: + 07ece367fb5f ("ovs-atomic: Prefer Clang intrinsics over .") + +This change fixes OVS build with GCC on Fedora Rawhide (40). + +Reported-by: Jakob Meng +Acked-by: Jakob Meng +Acked-by: Eelco Chaudron +Acked-by: Simon Horman +Signed-off-by: Ilya Maximets +--- a/lib/ovs-atomic.h b/lib/ovs-atomic.h +@@ -328,7 +328,7 @@ + #if __CHECKER__ + /* sparse doesn't understand some GCC extensions we use. */ + #include "ovs-atomic-pthreads.h" +-#elif __has_extension(c_atomic) ++#elif __clang__ && __has_extension(c_atomic) + #include "ovs-atomic-clang.h" + #elif HAVE_ATOMIC && __cplusplus >= 201103L + #include "ovs-atomic-c++.h" diff --git a/net-misc/openvswitch/openvswitch-2.17.8.ebuild b/net-misc/openvswitch/openvswitch-2.17.8.ebuild new file mode 100644 index ..059ccf3295d6 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.17.8.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MODULES_OPTIONAL_USE="modules" +PYTHON_COMPAT=( python3_{10..11} ) + +inherit autotools 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 valgrind" +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] + valgrind? ( dev-debug/valgrind )" +BDEPEND="virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ')" + +PATCHES=( + "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" + "${FILESDIR}/${PN}-2.17.8-gcc14-build-fix.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" +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/, net-misc/openvswitch/
commit: 3d6ce657536c2d79e5c348dbbb5da358dfb95aa6 Author: Sam James gentoo org> AuthorDate: Sat Dec 16 11:56:58 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 16 11:58:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d6ce657 net-misc/openvswitch: fix build w/ groff-1.23.0 Closes: https://bugs.gentoo.org/910196 Signed-off-by: Sam James gentoo.org> .../files/openvswitch-2.17.6-groff-1.23.0.patch| 145 + net-misc/openvswitch/openvswitch-2.17.6.ebuild | 2 + 2 files changed, 147 insertions(+) diff --git a/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch b/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch new file mode 100644 index ..3035005ae52e --- /dev/null +++ b/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch @@ -0,0 +1,145 @@ +https://bugs.gentoo.org/910196 +https://github.com/openvswitch/ovs/commit/a45b3afbf82e1c1702d25a5097a25c45923c6fae +https://github.com/openvswitch/ovs/commit/6929485d318e08c11e8e98f7847d5cefcb36c21c +https://github.com/openvswitch/ovs/commit/93412e00e7a1f61c5eb4771d150bdbf504ff59aa + +From a45b3afbf82e1c1702d25a5097a25c45923c6fae Mon Sep 17 00:00:00 2001 +From: gordonwwang +Date: Thu, 17 Aug 2023 11:04:39 +0800 +Subject: [PATCH] ovs.tmac: Fix troff warning in versions above groff-1.23. + +When the compilation dependency is groff-1.23, the following message is +displayed in the compilation log, and the compilation fails: + + troff:vswitchd/ovs-vswitchd.8:1298: warning: cannot select font 'CW' + make[1]: *** [Makefile:6761: manpage-check] Error 1 + +CW font was removed and and now groff warns about non-existent font: + https://git.savannah.gnu.org/cgit/groff.git/commit/?id=d75ea8b2e283e37bd560e821fa4597065f36725f) + +Fix that by replacing CW with CR. CW supposed to be an alias of CR +anyway. + +Submitted-at: https://github.com/openvswitch/ovs/pull/416 +Co-authored-by: Xiaojie Chen +Signed-off-by: Xiaojie Chen +Signed-off-by: gordonwwang +Signed-off-by: Ilya Maximets +--- + lib/ovs.tmac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ovs.tmac b/lib/ovs.tmac +index 5f8f20afa4a..97b6fa3df76 100644 +--- a/lib/ovs.tmac b/lib/ovs.tmac +@@ -175,7 +175,7 @@ + . nr mE \\n(.f + . nf + . nh +-. ft CW ++. ft CR + .. + . + . + +From 6929485d318e08c11e8e98f7847d5cefcb36c21c Mon Sep 17 00:00:00 2001 +From: Frode Nordahl +Date: Mon, 21 Aug 2023 15:53:33 +0200 +Subject: [PATCH] docs: Add `nowarn` region option to tables. + +Starting with groff 1.23.0 a warning is produced if the tbl +preprocessor is not run. A side effect of enabling it is that +new warnings on table formatting is printed. + +As requested during the review [0] of a series [1] attempting to +address this, this patch makes use of the `nowarn` region option +as opposed to attempting to change the formatting. + +0: https://patchwork.ozlabs.org/project/openvswitch/patch/zm00wfa80rob2...@riva.ucam.org/#3164177 +1: https://patchwork.ozlabs.org/project/openvswitch/list/?series=367378=* + +Reported-by: Lucas Nussbaum +Reported-at: https://bugs.debian.org/1042358 +Signed-off-by: Frode Nordahl +Signed-off-by: Ilya Maximets +--- + build-aux/extract-ofp-fields | 6 +++--- + lib/meta-flow.xml| 1 + + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields +index 8766995d9ab..7a9788be968 100755 +--- a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields +@@ -578,7 +578,7 @@ def field_to_xml(field_node, f, body, summary): + body += [""".PP + \\fB%s Field\\fR + .TS +-tab(;); ++tab(;),nowarn; + l lx. + """ % title] + +@@ -655,7 +655,7 @@ def group_xml_to_nroff(group_node, fields): + '.SH \"%s\"\n' % build.nroff.text_to_nroff(title.upper() + " FIELDS"), + '.SS "Summary:"\n', + '.TS\n', +-'tab(;);\n', ++'tab(;),nowarn;\n', + 'l l l l l l l.\n', + 'Name;Bytes;Mask;RW?;Prereqs;NXM/OXM Support\n', + '\_;\_;\_;\_;\_;\_\n'] +@@ -665,7 +665,7 @@ def group_xml_to_nroff(group_node, fields): + return ''.join(content) + + def make_oxm_classes_xml(document): +-s = '''tab(;); ++s = '''tab(;),nowarn; + l l l. + Prefix;Vendor;Class + \_;\_;\_ +diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml +index ff81fddc5e7..fe80ee930d0 100644 +--- a/lib/meta-flow.xml b/lib/meta-flow.xml +@@ -3517,6 +3517,7 @@ actions=clone(load:0->NXM_OF_IN_PORT[],output:123) + + + ++nowarn; + r r r r r. + CriteriaOpenFlow 1.0OpenFlow 1.1OpenFlow 1.2+ NXM + \_ \_ \_ \_ \_ +From 93412e00e7a1f61c5eb4771d150bdbf504ff59aa Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Mon, 21 Aug 2023 15:53:34 +0200 +Subject: [PATCH] docs: Run tbl preprocessor in manpage-check rule. + +If we omit this, groff 1.23.0 warns: + + tbl preprocessor failed, or it or soelim was not run;
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: d20b71fedbbb69417ec4c092c3cfe8d0b9c8bd12 Author: Francisco Javier FĂ©lix inode64 com> AuthorDate: Tue Sep 12 06:40:30 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Dec 11 13:00:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d20b71fe net-misc/openvswitch: Fix build when dev-python/sphinx is missing Remove redundant eclass inherit 'linux-info', provided by 'linux-mod' Closes: https://bugs.gentoo.org/906054 Signed-off-by: INODE64 inode64.com> Closes: https://github.com/gentoo/gentoo/pull/32734 Signed-off-by: Joonas Niilola gentoo.org> net-misc/openvswitch/openvswitch-2.17.6.ebuild | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.6.ebuild b/net-misc/openvswitch/openvswitch-2.17.6.ebuild index 1edab262a4b7..9116398edd39 100644 --- a/net-misc/openvswitch/openvswitch-2.17.6.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.6.ebuild @@ -6,7 +6,7 @@ EAPI=8 MODULES_OPTIONAL_USE="modules" PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools linux-info linux-mod python-single-r1 systemd tmpfiles +inherit autotools linux-mod python-single-r1 systemd tmpfiles DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org; @@ -31,8 +31,11 @@ RDEPEND="${PYTHON_DEPS} DEPEND="${RDEPEND} sys-apps/util-linux[caps] valgrind? ( dev-util/valgrind )" -BDEPEND="virtual/pkgconfig" - +BDEPEND="virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ')" PATCHES=( "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" )
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 04b0a279625e6fce95cf9f36a6711ceb9530a89b Author: Sam James gentoo org> AuthorDate: Tue May 16 01:31:20 2023 + Commit: Sam James gentoo org> CommitDate: Tue May 16 01:52:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b0a279 net-misc/openvswitch: add Valgrind annotation support Signed-off-by: Sam James gentoo.org> net-misc/openvswitch/openvswitch-2.17.6.ebuild | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.6.ebuild b/net-misc/openvswitch/openvswitch-2.17.6.ebuild index f6fd673f3545..1edab262a4b7 100644 --- a/net-misc/openvswitch/openvswitch-2.17.6.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.6.ebuild @@ -15,7 +15,7 @@ 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" +IUSE="debug modules monitor +ssl unwind valgrind" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Check python/ovs/version.py in tarball for dev-python/ovs dep @@ -29,7 +29,8 @@ RDEPEND="${PYTHON_DEPS} unwind? ( sys-libs/libunwind:= ) ssl? ( dev-libs/openssl:= )" DEPEND="${RDEPEND} - sys-apps/util-linux[caps]" + sys-apps/util-linux[caps] + valgrind? ( dev-util/valgrind )" BDEPEND="virtual/pkgconfig" PATCHES=( @@ -80,6 +81,8 @@ src_configure() { # want to add a BDEPEND on graphviz right now. bug #856286 export ovs_cv_dot="no" + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + local linux_config use modules && linux_config="--with-linux=${KV_OUT_DIR}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/, net-misc/openvswitch/
commit: 0a3a711dce02952f2c9386834e180979e7e78c85 Author: Matthew Thode gentoo org> AuthorDate: Sat May 6 16:32:28 2023 + Commit: Matthew Thode gentoo org> CommitDate: Sat May 6 16:32:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a3a711d net-misc/openvswitch: switch all runtime dirs to /run Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/files/openvswitch.tmpfiles| 2 +- net-misc/openvswitch/files/ovs-vswitchd-r1 | 4 ++-- net-misc/openvswitch/files/ovs-vswitchd-r3.service | 4 ++-- net-misc/openvswitch/files/ovs-vswitchd.confd-r2 | 2 +- net-misc/openvswitch/files/ovsdb-server-r1 | 4 ++-- net-misc/openvswitch/files/ovsdb-server-r3.service | 2 +- net-misc/openvswitch/files/ovsdb-server_conf2 | 2 +- net-misc/openvswitch/openvswitch-2.17.6.ebuild | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/net-misc/openvswitch/files/openvswitch.tmpfiles b/net-misc/openvswitch/files/openvswitch.tmpfiles index 58c583ee4747..f99f19f89fb2 100644 --- a/net-misc/openvswitch/files/openvswitch.tmpfiles +++ b/net-misc/openvswitch/files/openvswitch.tmpfiles @@ -1 +1 @@ -d /var/run/openvswitch 0770 root root - +d /run/openvswitch 0770 root root - diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r1 b/net-misc/openvswitch/files/ovs-vswitchd-r1 index bc5602a60030..f7da8e846789 100644 --- a/net-misc/openvswitch/files/ovs-vswitchd-r1 +++ b/net-misc/openvswitch/files/ovs-vswitchd-r1 @@ -10,12 +10,12 @@ command_args=" --detach --monitor ${OPTIONS} ${DATABASE}" -pidfile="/var/run/openvswitch/ovs-vswitchd.pid" +pidfile="/run/openvswitch/ovs-vswitchd.pid" depend() { use ovsdb-server logger } start_pre() { - checkpath -d "/var/run/openvswitch" -m 0750 + checkpath -d "/run/openvswitch" -m 0750 } diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r3.service b/net-misc/openvswitch/files/ovs-vswitchd-r3.service index 165ea3bfbf81..8f157cfdd870 100644 --- a/net-misc/openvswitch/files/ovs-vswitchd-r3.service +++ b/net-misc/openvswitch/files/ovs-vswitchd-r3.service @@ -6,12 +6,12 @@ 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 +AssertPathIsReadWrite=/run/openvswitch/db.sock [Service] Type=forking Restart=on-failure -Environment=HOME=/var/run/openvswitch +Environment=HOME=/run/openvswitch EnvironmentFile=-/etc/conf.d/ovs-vswitchd ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovsdb-server --no-monitor --system-id=random \ diff --git a/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 b/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 index eb4b6c2f2831..6f383500fe7a 100644 --- a/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 +++ b/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 @@ -1,5 +1,5 @@ # Connection string for the configuration database (usually a unix socket) -DATABASE="unix:/var/run/openvswitch/db.sock" +DATABASE="unix:/run/openvswitch/db.sock" # Additional options OPTIONS="--mlockall" diff --git a/net-misc/openvswitch/files/ovsdb-server-r1 b/net-misc/openvswitch/files/ovsdb-server-r1 index f7360adbb4c8..5fc2716d91d5 100644 --- a/net-misc/openvswitch/files/ovsdb-server-r1 +++ b/net-misc/openvswitch/files/ovsdb-server-r1 @@ -22,7 +22,7 @@ command_args=" ${bootstrap_ca_cert} ${DATABASE} ${OPTIONS}" -pidfile="/var/run/openvswitch/ovsdb-server.pid" +pidfile="/run/openvswitch/ovsdb-server.pid" depend() { need localmount @@ -30,5 +30,5 @@ depend() { } start_pre() { - checkpath -d "/var/run/openvswitch" -m 0750 + checkpath -d "/run/openvswitch" -m 0750 } diff --git a/net-misc/openvswitch/files/ovsdb-server-r3.service b/net-misc/openvswitch/files/ovsdb-server-r3.service index a1d308478daa..8b779964ee06 100644 --- a/net-misc/openvswitch/files/ovsdb-server-r3.service +++ b/net-misc/openvswitch/files/ovsdb-server-r3.service @@ -9,7 +9,7 @@ Wants=ovs-delete-transient-ports.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/chown ${OVS_USER_ID} /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} \ diff --git a/net-misc/openvswitch/files/ovsdb-server_conf2 b/net-misc/openvswitch/files/ovsdb-server_conf2 index 07eca5e6c9f7..0ffb63c21ccd 100644 --- a/net-misc/openvswitch/files/ovsdb-server_conf2 +++ b/net-misc/openvswitch/files/ovsdb-server_conf2 @@ -1,5 +1,5 @@ # Socket for bringing the server up -DB_SOCKET="/var/run/openvswitch/db.sock" +DB_SOCKET="/run/openvswitch/db.sock" # Remote sockets are defined in the database by
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: b5919009911b6965eda6b73fbda216ea0fd759ee Author: Matthew Thode gentoo org> AuthorDate: Fri Apr 7 23:09:54 2023 + Commit: Matthew Thode gentoo org> CommitDate: Fri Apr 7 23:12:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5919009 net-misc/openvswitch: add 2.17.6 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.17.6.ebuild | 166 + 2 files changed, 167 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index d4e3c4ddb1c9..a4a31088badb 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,2 +1,3 @@ DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832 DIST openvswitch-2.17.2.tar.gz 7955727 BLAKE2B da7ffc29b6af5dbf8eeb410725ed4cb6b6c5f4abe22f17d0963429ae459e1d4cc4ef06d13518dc2486d5e9e78a090318ad66e50175606e47fcf1d61cfce7 SHA512 e01e41ef2fea21afcc891b8ab0a773fe7c9adf873853e10926b8bde2fd970e12b354010687439238e8d80a87884f497f7396a4a1f2b179104e49e87c66cfc79e +DIST openvswitch-2.17.6.tar.gz 8092331 BLAKE2B 0564a332e8c876552a9a3a068f4e54d3f5d56428e277e32f188aba9626035818c900be45171964ddcb782166a5e5b3b8f3a2fb80d5ed9723b94c9e1ed7410544 SHA512 ff9d19a9101c9a18117a859150d391eecbd6a331e35da3f20a62acaac1febbfbad716874734f9bd0d304d635212884f9f617b944e79bb7e554ddd9e5c53645c8 diff --git a/net-misc/openvswitch/openvswitch-2.17.6.ebuild b/net-misc/openvswitch/openvswitch-2.17.6.ebuild new file mode 100644 index ..7f4a86d6371a --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.17.6.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 \ +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 63119145e30db5c40ab9f5b34f8e71ebddc68274 Author: Matthew Thode gentoo org> AuthorDate: Fri Apr 7 23:11:47 2023 + Commit: Matthew Thode gentoo org> CommitDate: Fri Apr 7 23:12:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63119145 net-misc/openvswitch: removing old for CVE-2023-1668 cleanup Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/Manifest | 2 - net-misc/openvswitch/openvswitch-2.15.0.ebuild| 151 net-misc/openvswitch/openvswitch-2.17.2-r2.ebuild | 166 -- 3 files changed, 319 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index a4a31088badb..3bebee2ed69e 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,3 +1 @@ -DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832 -DIST openvswitch-2.17.2.tar.gz 7955727 BLAKE2B da7ffc29b6af5dbf8eeb410725ed4cb6b6c5f4abe22f17d0963429ae459e1d4cc4ef06d13518dc2486d5e9e78a090318ad66e50175606e47fcf1d61cfce7 SHA512 e01e41ef2fea21afcc891b8ab0a773fe7c9adf873853e10926b8bde2fd970e12b354010687439238e8d80a87884f497f7396a4a1f2b179104e49e87c66cfc79e DIST openvswitch-2.17.6.tar.gz 8092331 BLAKE2B 0564a332e8c876552a9a3a068f4e54d3f5d56428e277e32f188aba9626035818c900be45171964ddcb782166a5e5b3b8f3a2fb80d5ed9723b94c9e1ed7410544 SHA512 ff9d19a9101c9a18117a859150d391eecbd6a331e35da3f20a62acaac1febbfbad716874734f9bd0d304d635212884f9f617b944e79bb7e554ddd9e5c53645c8 diff --git a/net-misc/openvswitch/openvswitch-2.15.0.ebuild b/net-misc/openvswitch/openvswitch-2.15.0.ebuild deleted file mode 100644 index 620028a7b31f.. --- a/net-misc/openvswitch/openvswitch-2.15.0.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( 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.3[${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 <= 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() { - # 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 - # ovs-bugtool is installed to sbin by the build system, but we - # install it to bin below, and these clash in merged-usr -
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: ca75cc882aad0f75ed861f56cbed920a18ffb85f Author: Matthew Thode gentoo org> AuthorDate: Fri Apr 7 23:11:18 2023 + Commit: Matthew Thode gentoo org> CommitDate: Fri Apr 7 23:12:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca75cc88 net-misc/openvswitch: 2.17.6 fast stable for CVE-2023-1668 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/openvswitch-2.17.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.6.ebuild b/net-misc/openvswitch/openvswitch-2.17.6.ebuild index 7f4a86d6371a..c17e37e3f3bb 100644 --- a/net-misc/openvswitch/openvswitch-2.17.6.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.6.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz; LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 x86" IUSE="debug modules monitor +ssl unwind" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: eb3cbacff12be389f2b9a414c1dd7af53963863b Author: Stijn Tintel linux-ipv6 be> AuthorDate: Thu Feb 2 00:03:59 2023 + Commit: Sam James gentoo org> CommitDate: Thu Feb 2 04:49:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb3cbacf net-misc/openvswitch: keyword 2.17.2-r1 for ~ppc64 Tested on a POWER8 server with 802.1Q, 802.3ad and libvirt. Signed-off-by: Stijn Tintel linux-ipv6.be> Signed-off-by: Sam James gentoo.org> net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild index fab5815f4556..c26ee73a3019 100644 --- a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild @@ -14,7 +14,7 @@ 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 ~ppc64 x86" IUSE="debug modules monitor +ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: e6b4565e4f32d431e10922941fddb71b1e464173 Author: John Helmert III gentoo org> AuthorDate: Fri Jan 6 15:32:18 2023 + Commit: John Helmert III gentoo org> CommitDate: Fri Jan 6 15:33:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6b4565e net-misc/openvswitch: fix installation with merged-usr Closes: https://bugs.gentoo.org/889846 Signed-off-by: John Helmert III gentoo.org> net-misc/openvswitch/openvswitch-2.15.0.ebuild| 7 ++- net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild | 7 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.15.0.ebuild b/net-misc/openvswitch/openvswitch-2.15.0.ebuild index 83ea5328d7d0..a81e57ca0d58 100644 --- a/net-misc/openvswitch/openvswitch-2.15.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.15.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -90,6 +90,11 @@ src_install() { 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 sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" python_foreach_impl python_doscript utilities/"${SCRIPT}" diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild index 963f20e12233..2029ed52fd05 100644 --- a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -103,6 +103,11 @@ src_install() { 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 3f65f8391af9ad9c4f9bfe589e1b39f6705aac67 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 12 10:18:24 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 12 10:18:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f65f839 net-misc/openvswitch: x86 stable wrt bug #864813 Signed-off-by: Agostino Sarubbo gentoo.org> net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild index ea07764683a9..963f20e12233 100644 --- a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild @@ -14,7 +14,7 @@ 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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 322fe130b0123ffd925ccb5b9c7159700ed6883e Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 12 10:17:11 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 12 10:17:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=322fe130 net-misc/openvswitch: amd64 stable wrt bug #864813 Signed-off-by: Agostino Sarubbo gentoo.org> net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild index 6cfb0d98f8bb..ea07764683a9 100644 --- a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild @@ -14,7 +14,7 @@ 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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 95264f6abaa1ac5c31a0f2750f117d0edf2ea590 Author: Sam James gentoo org> AuthorDate: Fri Jul 29 03:56:07 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jul 29 04:17:16 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95264f6a net-misc/openvswitch: add github upstream metadata Signed-off-by: Sam James gentoo.org> net-misc/openvswitch/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml index 564a93cad57f..fad2a4a6287d 100644 --- a/net-misc/openvswitch/metadata.xml +++ b/net-misc/openvswitch/metadata.xml @@ -11,4 +11,7 @@ Build the Python and GUI dependent monitor applications + + openvswitch/ovs +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 572c7a8f682b9662b1e8300ede6466a07c34ded3 Author: Sam James gentoo org> AuthorDate: Sun Jul 24 00:40:04 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jul 24 00:40:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=572c7a8f net-misc/openvswitch: disable automagic graphviz usage Noticed because of build failures w/ certain versions of graphviz (fixed upstream in graphviz now). Bug: https://bugs.gentoo.org/854663 Closes: https://bugs.gentoo.org/856286 Signed-off-by: Sam James gentoo.org> net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild index 0eacedda4239..6cfb0d98f8bb 100644 --- a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild @@ -75,6 +75,10 @@ src_configure() { # 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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: f20c05d22271e90531a17a04ea279dcb126c7675 Author: Sam James gentoo org> AuthorDate: Sun Jul 24 00:36:39 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jul 24 00:36:39 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20c05d2 net-misc/openvswitch: fix installed script Python shebangs Closes: https://bugs.gentoo.org/860240 Signed-off-by: Sam James gentoo.org> net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild index 4f04cb37a9a8..0eacedda4239 100644 --- a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 MODULES_OPTIONAL_USE="modules" PYTHON_COMPAT=( python3_{8..11} ) -inherit autotools linux-info linux-mod python-r1 systemd tmpfiles +inherit autotools linux-info linux-mod python-single-r1 systemd tmpfiles DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org; @@ -20,9 +20,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Check python/ovs/version.py in tarball for dev-python/ovs dep RDEPEND="${PYTHON_DEPS} - ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}] - dev-python/twisted[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] + $(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} @@ -76,7 +78,8 @@ src_configure() { local linux_config use modules && linux_config="--with-linux=${KV_OUT_DIR}" - CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash econf ${linux_config} \ + # 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 \ @@ -97,8 +100,7 @@ src_install() { 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}" + python_doscript utilities/"${SCRIPT}" done rm -r "${ED}"/usr/share/openvswitch/python || die fi
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 7c67dae014cc2a5095b828da601349906a512cb5 Author: Matthew Thode gentoo org> AuthorDate: Mon Jul 18 14:04:36 2022 + Commit: Matthew Thode gentoo org> CommitDate: Mon Jul 18 14:04:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c67dae0 net-misc/openvswitch: remove conch need as ovsdbmonitor is removed Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Matthew Thode gentoo.org> .../{openvswitch-2.17.2.ebuild => openvswitch-2.17.2-r1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.2.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild similarity index 100% rename from net-misc/openvswitch/openvswitch-2.17.2.ebuild rename to net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: b222fb133aee41dcd8c59c4a82c43931b79bb073 Author: Antti Antinoja fennosys fi> AuthorDate: Mon Jul 18 05:59:08 2022 + Commit: Matthew Thode gentoo org> CommitDate: Mon Jul 18 14:04:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b222fb13 net-misc/openvswitch: 2.17.2 Drop dev-python/twisted[conch] requirement since ovsdbmonitor was dropped around 2014. Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/openvswitch-2.17.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.2.ebuild b/net-misc/openvswitch/openvswitch-2.17.2.ebuild index 4d3678b83503..4f04cb37a9a8 100644 --- a/net-misc/openvswitch/openvswitch-2.17.2.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.2.ebuild @@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Check python/ovs/version.py in tarball for dev-python/ovs dep RDEPEND="${PYTHON_DEPS} ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}] - dev-python/twisted[conch,${PYTHON_USEDEP}] + dev-python/twisted[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] debug? ( dev-lang/perl ) ssl? ( dev-libs/openssl:= )"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 3a0f70439688bccfb7c4d0a56928e99b6a2bf600 Author: Sam James gentoo org> AuthorDate: Sat Jul 2 12:36:23 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jul 2 12:36:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a0f7043 net-misc/openvswitch: MODULES_OPTIONAL_USE is preinherit Bug: https://bugs.gentoo.org/671776 Signed-off-by: Sam James gentoo.org> net-misc/openvswitch/openvswitch-2.17.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.17.2.ebuild b/net-misc/openvswitch/openvswitch-2.17.2.ebuild index c98578a29daa..4d3678b83503 100644 --- a/net-misc/openvswitch/openvswitch-2.17.2.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.2.ebuild @@ -3,6 +3,7 @@ EAPI=8 +MODULES_OPTIONAL_USE="modules" PYTHON_COMPAT=( python3_{8..11} ) inherit autotools linux-info linux-mod python-r1 systemd tmpfiles @@ -34,7 +35,6 @@ PATCHES=( CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" -MODULES_OPTIONAL_USE="modules" BUILD_TARGETS="all" pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 9810e0f55cb9c8da7bdcf6bdcae630e61fcf3594 Author: Sam James gentoo org> AuthorDate: Sat Jul 2 12:31:46 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jul 2 12:35:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9810e0f5 net-misc/openvswitch: add 2.17.2 Bug: https://bugs.gentoo.org/766135 Closes: https://bugs.gentoo.org/596206 Closes: https://bugs.gentoo.org/633516 Closes: https://bugs.gentoo.org/671776 Closes: https://bugs.gentoo.org/672870 Closes: https://bugs.gentoo.org/794535 Closes: https://bugs.gentoo.org/854663 Signed-off-by: Sam James gentoo.org> net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.17.2.ebuild | 152 + 2 files changed, 153 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 70ff24911853..d4e3c4ddb1c9 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1 +1,2 @@ DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832 +DIST openvswitch-2.17.2.tar.gz 7955727 BLAKE2B da7ffc29b6af5dbf8eeb410725ed4cb6b6c5f4abe22f17d0963429ae459e1d4cc4ef06d13518dc2486d5e9e78a090318ad66e50175606e47fcf1d61cfce7 SHA512 e01e41ef2fea21afcc891b8ab0a773fe7c9adf873853e10926b8bde2fd970e12b354010687439238e8d80a87884f497f7396a4a1f2b179104e49e87c66cfc79e diff --git a/net-misc/openvswitch/openvswitch-2.17.2.ebuild b/net-misc/openvswitch/openvswitch-2.17.2.ebuild new file mode 100644 index ..c98578a29daa --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.17.2.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +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}" + +# Check python/ovs/version.py in tarball for dev-python/ovs dep +RDEPEND="${PYTHON_DEPS} + ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}] + dev-python/twisted[conch,${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)" +MODULES_OPTIONAL_USE="modules" +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" + + local linux_config + use modules && linux_config="--with-linux=${KV_OUT_DIR}" + + 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 + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/, net-misc/openvswitch/files/
commit: a660ae14eab8752fbcb71f2d86f259eaddfe9447 Author: Michał Górny gentoo org> AuthorDate: Wed Jun 22 11:54:12 2022 + Commit: Michał Górny gentoo org> CommitDate: Wed Jun 22 12:00:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a660ae14 net-misc/openvswitch: Remove old Signed-off-by: Michał Górny gentoo.org> net-misc/openvswitch/Manifest | 1 - .../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, 203 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index cc9e42bfb518..70ff24911853 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,2 +1 @@ -DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832 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.. --- 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.. --- 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.. --- 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.. --- 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.. --- 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"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 80385f7be49672ccb60c0c19f38f10f55518e214 Author: Sam James gentoo org> AuthorDate: Fri Jul 30 22:57:38 2021 + Commit: Sam James gentoo org> CommitDate: Fri Jul 30 23:30:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80385f7b net-misc/openvswitch: [QA] call tmpfiles_process in pkg_postinst This is needed to actually apply the tmpfiles configuration we've installed in the ebuild. See tmpfiles.eclass documentation. Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Sam James gentoo.org> net-misc/openvswitch/openvswitch-2.14.1.ebuild | 2 ++ net-misc/openvswitch/openvswitch-2.15.0.ebuild | 2 ++ 2 files changed, 4 insertions(+) diff --git a/net-misc/openvswitch/openvswitch-2.14.1.ebuild b/net-misc/openvswitch/openvswitch-2.14.1.ebuild index cb44e1d8be7..c873cc5a547 100644 --- a/net-misc/openvswitch/openvswitch-2.14.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.14.1.ebuild @@ -123,6 +123,8 @@ 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}" diff --git a/net-misc/openvswitch/openvswitch-2.15.0.ebuild b/net-misc/openvswitch/openvswitch-2.15.0.ebuild index 7f44d4ded56..83ea5328d7d 100644 --- a/net-misc/openvswitch/openvswitch-2.15.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.15.0.ebuild @@ -122,6 +122,8 @@ 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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: d9541eceef95f8758d466afd02eae7fd33555717 Author: Matthew Thode gentoo org> AuthorDate: Sat Jun 5 20:46:45 2021 + Commit: Matthew Thode gentoo org> CommitDate: Sat Jun 5 20:46:52 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9541ece net-misc/openvswitch: 2.15.0 fast stable for cve Bug: https://bugs.gentoo.org/769995 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/openvswitch-2.15.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.15.0.ebuild b/net-misc/openvswitch/openvswitch-2.15.0.ebuild index 7eaefd0c774..7f44d4ded56 100644 --- a/net-misc/openvswitch/openvswitch-2.15.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.15.0.ebuild @@ -12,14 +12,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.13.0[${PYTHON_USEDEP}] + ~dev-python/ovs-2.13.3[${PYTHON_USEDEP}] dev-python/twisted[conch,${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] debug? ( dev-lang/perl )"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 5e7539efe063efccea4bb469643ce76de1368e1c Author: Matthew Thode gentoo org> AuthorDate: Sat Jun 5 20:41:26 2021 + Commit: Matthew Thode gentoo org> CommitDate: Sat Jun 5 20:41:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e7539ef net-misc/openvswitch: 2.15.0 bump Bug: https://bugs.gentoo.org/769995 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.15.0.ebuild | 144 + 2 files changed, 145 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 516a3b3af85..cc9e42bfb51 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1 +1,2 @@ DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b +DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832 diff --git a/net-misc/openvswitch/openvswitch-2.15.0.ebuild b/net-misc/openvswitch/openvswitch-2.15.0.ebuild new file mode 100644 index 000..7eaefd0c774 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.15.0.ebuild @@ -0,0 +1,144 @@ +# 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 <= 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() { + # 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 26870efeb317b026171e6fef2945a3916855bd94 Author: Theo Anderson posteo de> AuthorDate: Sun Mar 7 11:57:25 2021 + Commit: David Seifert gentoo org> CommitDate: Sun Mar 7 11:57:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26870efe net-misc/openvswitch: migrate to tmpfiles.eclass Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Theo Anderson posteo.de> Signed-off-by: David Seifert gentoo.org> net-misc/openvswitch/openvswitch-2.14.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.14.1.ebuild b/net-misc/openvswitch/openvswitch-2.14.1.ebuild index a0571b1e652..ee149240777 100644 --- a/net-misc/openvswitch/openvswitch-2.14.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.14.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_7 python3_8 python3_9 ) -inherit autotools eutils linux-info linux-mod python-r1 systemd +inherit autotools eutils linux-info linux-mod python-r1 systemd tmpfiles DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org; @@ -112,7 +112,7 @@ src_install() { 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 + newtmpfiles "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf insinto /etc/logrotate.d newins rhel/etc_logrotate.d_openvswitch openvswitch
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: f3247cc80148d7b4153ee57e8bc7e07eecb4576f Author: Matthew Thode gentoo org> AuthorDate: Wed Jan 13 20:09:38 2021 + Commit: Matthew Thode gentoo org> CommitDate: Wed Jan 13 20:09:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3247cc8 net-misc/openvswitch: 2.14.1 bump Closes: https://bugs.gentoo.org/765073 Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --force Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/Manifest | 3 +- net-misc/openvswitch/openvswitch-2.13.0-r1.ebuild | 146 - ...tch-2.14.0.ebuild => openvswitch-2.14.1.ebuild} | 4 +- 3 files changed, 3 insertions(+), 150 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index f2db6af2aaf..516a3b3af85 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,2 +1 @@ -DIST openvswitch-2.13.0.tar.gz 7233892 BLAKE2B 66dfeb8a5dd61538360b319cfccbe49273298d6cb20df2105d1db7eb4d01f40d54ec8792a7f80d9ffc767f9b28ae09fee6aa76ac3d97be6fc43f3e7f3b2a63bd SHA512 3fcd15d07925273e0c45e6b1e70b2cd9998f753e8d1a11fd0de1d1511ad56dfddedbba436bb1c347b4afb84eb9cd6fc52c3d445b710a89d599d2ff47ed46f17c -DIST openvswitch-2.14.0.tar.gz 7359886 BLAKE2B e7633578e9db395b534e2aca84f08919d06d14b68cdf78b04de25b887bcb4eb0e476c7d6c54ae23b72f797a3b083e09d23d8eb142da1e1463b2fbcde76069108 SHA512 5fe377f9b2857e238e3d40e4452e8b36c80283230f1d0f4b983324532beba725913da817e545c8d7630762f170bb5b0dfe810fd1b8b559994d5eae828beb8ec1 +DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b diff --git a/net-misc/openvswitch/openvswitch-2.13.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.13.0-r1.ebuild deleted file mode 100644 index 41b9b1b021a..000 --- a/net-misc/openvswitch/openvswitch-2.13.0-r1.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 python3_7 ) - -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.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] - 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 4a1bacf807d9f948cd867106bc07d294e0a099db Author: Matthew Thode gentoo org> AuthorDate: Tue Dec 22 01:46:56 2020 + Commit: Matthew Thode gentoo org> CommitDate: Tue Dec 22 01:47:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1bacf8 net-misc/openvswitch: 2.14.0 bump Closes: https://bugs.gentoo.org/718448 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.14.0.ebuild | 145 + 2 files changed, 146 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index fddc3d5d792..f2db6af2aaf 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1 +1,2 @@ DIST openvswitch-2.13.0.tar.gz 7233892 BLAKE2B 66dfeb8a5dd61538360b319cfccbe49273298d6cb20df2105d1db7eb4d01f40d54ec8792a7f80d9ffc767f9b28ae09fee6aa76ac3d97be6fc43f3e7f3b2a63bd SHA512 3fcd15d07925273e0c45e6b1e70b2cd9998f753e8d1a11fd0de1d1511ad56dfddedbba436bb1c347b4afb84eb9cd6fc52c3d445b710a89d599d2ff47ed46f17c +DIST openvswitch-2.14.0.tar.gz 7359886 BLAKE2B e7633578e9db395b534e2aca84f08919d06d14b68cdf78b04de25b887bcb4eb0e476c7d6c54ae23b72f797a3b083e09d23d8eb142da1e1463b2fbcde76069108 SHA512 5fe377f9b2857e238e3d40e4452e8b36c80283230f1d0f4b983324532beba725913da817e545c8d7630762f170bb5b0dfe810fd1b8b559994d5eae828beb8ec1 diff --git a/net-misc/openvswitch/openvswitch-2.14.0.ebuild b/net-misc/openvswitch/openvswitch-2.14.0.ebuild new file mode 100644 index 000..3c2a20b5c72 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.14.0.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_6 python3_7 python3_8 python3_9 ) + +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.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] + 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 + +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 40229e56c83a1c187161c3a56e57fae004d76adc Author: Mikle Kolyada gentoo org> AuthorDate: Fri Aug 7 11:09:59 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Aug 8 12:18:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40229e56 net-misc/openvswitch: migrate to sys-apps/kmod Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Mikle Kolyada gentoo.org> .../{openvswitch-2.13.0.ebuild => openvswitch-2.13.0-r1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.13.0.ebuild b/net-misc/openvswitch/openvswitch-2.13.0-r1.ebuild similarity index 100% rename from net-misc/openvswitch/openvswitch-2.13.0.ebuild rename to net-misc/openvswitch/openvswitch-2.13.0-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/
commit: f3997db2fc476258099dc8e26d746269caa81dca Author: Michael Mair-Keimberger gmail com> AuthorDate: Fri Jun 26 06:54:48 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Sat Jun 27 20:49:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3997db2 net-misc/openvswitch: remove unused patch Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16428 Signed-off-by: Aaron Bauman gentoo.org> ...nntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch | 46 -- 1 file changed, 46 deletions(-) diff --git a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch deleted file mode 100644 index 1f77ab54b0a..000 --- a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001 -From: Yousong Zhou -Date: Fri, 3 May 2019 15:03:24 + -Subject: [PATCH 5/5] datapath: conntrack: fix include for - IP6_DEFRAG_CONNTRACK_IN - -The enum definition is now inside include/net/ipv6_frag.h since upstream commit -70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was -backported to stable trees (4.9, 4.14, 4.19) only these days. - -The error message - - CC [M] /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o - /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c: In function 'handle_fragments': - /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:8: error: variable 'user' has initializer but incomplete type - enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; - ^~~~ - /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: error: 'IP6_DEFRAG_CONNTRACK_IN' undeclared (first use in this function); did you mean 'IP_DEFRAG_CONNTRACK_IN'? - enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; - ^~~ - IP_DEFRAG_CONNTRACK_IN - /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: note: each undeclared identifier is reported only once for each function it appears in - /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: error: storage size of 'user' isn't known - enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; -^~~~ - /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: warning: unused variable 'user' [-Wunused-variable] - scripts/Makefile.build:326: recipe for target '/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o' failed - -Reference: https://github.com/openwrt/packages/issues/8548#issuecomment-488871090 -Signed-off-by: Yousong Zhou - datapath/conntrack.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/datapath/conntrack.c b/datapath/conntrack.c -index a7dc9e0c3..69bda5a9c 100644 a/datapath/conntrack.c -+++ b/datapath/conntrack.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #ifdef CONFIG_NF_NAT_NEEDED - #include
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 0336e65d7ae63fad01ed2439067417247c6b6e79 Author: Matthew Thode gentoo org> AuthorDate: Tue Jun 23 18:27:05 2020 + Commit: Matthew Thode gentoo org> CommitDate: Tue Jun 23 18:39:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0336e65d net-misc/openvswitch: 2.10.2 and 2.11.1 cleanup Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/Manifest | 2 - net-misc/openvswitch/openvswitch-2.10.2.ebuild| 144 - net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild | 147 -- 3 files changed, 293 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index c5ae0e107e3..fddc3d5d792 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,3 +1 @@ -DIST openvswitch-2.10.2.tar.gz 7561889 BLAKE2B a53dd7db7dcab5098af81671cb265861d3af79cce53436d75e0c3d8a38ce408a142f99b936a66c8bf0f3b317970ad8c1ef84bacc2e573e9b8c21b70aab1de485 SHA512 fd64ae814d85d3002d655a330268cfd6be79db6f954c132d3bfafc7dac23533918b642d0ed454e760f5820804bdff64f73ee8c36afc25a6810ef4c7aab748ba1 -DIST openvswitch-2.11.1.tar.gz 7682693 BLAKE2B f25a537d9ad4051db0049f7ba8442564fdc890035ce3984e1754b9dd916e0b78bea11b5f4bc3a85d8b8a902ab210703feb0b7cce279803f642f9ee9f87bf SHA512 de016a1acfbae34d2062f4ac23b9b0782016fef4c0575b2714435380439f19613881173fb2c876afe86317a5c0327908704e540322d80f9f7da9f59bea7b1789 DIST openvswitch-2.13.0.tar.gz 7233892 BLAKE2B 66dfeb8a5dd61538360b319cfccbe49273298d6cb20df2105d1db7eb4d01f40d54ec8792a7f80d9ffc767f9b28ae09fee6aa76ac3d97be6fc43f3e7f3b2a63bd SHA512 3fcd15d07925273e0c45e6b1e70b2cd9998f753e8d1a11fd0de1d1511ad56dfddedbba436bb1c347b4afb84eb9cd6fc52c3d445b710a89d599d2ff47ed46f17c diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild deleted file mode 100644 index 8a2e1ad9103..000 --- a/net-misc/openvswitch/openvswitch-2.10.2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_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/zope-interface[${PYTHON_USEDEP}] - debug? ( dev-lang/perl )" -DEPEND="${RDEPEND} - sys-apps/util-linux[caps] - 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 17 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" - - # 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 29df338c5da568ea973d765ef34e4e03b619d35e Author: Matthew Thode gentoo org> AuthorDate: Tue Jun 23 18:30:03 2020 + Commit: Matthew Thode gentoo org> CommitDate: Tue Jun 23 18:39:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29df338c net-misc/openvswitch: 2.13.0 stable x86 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/openvswitch-2.13.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.13.0.ebuild b/net-misc/openvswitch/openvswitch-2.13.0.ebuild index d5327d0..41b9b1b021a 100644 --- a/net-misc/openvswitch/openvswitch-2.13.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.13.0.ebuild @@ -13,7 +13,7 @@ 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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 697e4e3473d18710444750853c04cda3510c3d34 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon May 11 16:45:07 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon May 11 16:45:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=697e4e34 net-misc/openvswitch: amd64 stable wrt bug #721632 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> net-misc/openvswitch/openvswitch-2.13.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.13.0.ebuild b/net-misc/openvswitch/openvswitch-2.13.0.ebuild index cf9fdf94575..d5327d0 100644 --- a/net-misc/openvswitch/openvswitch-2.13.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.13.0.ebuild @@ -13,7 +13,7 @@ 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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 707ad6927c6de735e8718d9c823c9ee616bfa9bb Author: Matthew Thode gentoo org> AuthorDate: Thu Apr 23 20:01:23 2020 + Commit: Matthew Thode gentoo org> CommitDate: Thu Apr 23 20:01:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=707ad692 net-misc/openvswitch: clean up trailing slashes Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/openvswitch-2.13.0.ebuild | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.13.0.ebuild b/net-misc/openvswitch/openvswitch-2.13.0.ebuild index 6d6ed76b011..cf9fdf94575 100644 --- a/net-misc/openvswitch/openvswitch-2.13.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.13.0.ebuild @@ -96,14 +96,14 @@ src_install() { 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 + 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 + rm -rf "${ED%}"/var/run || die newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd @@ -132,15 +132,15 @@ pkg_postinst() { } pkg_config() { - local db="${EROOT%/}"/var/lib/openvswitch/conf.db + 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" + "${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" + "${EROOT%}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" fi }
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: c639f2f9d0274f415d34e0bbae9bb62bec71eead Author: Matthew Thode gentoo org> AuthorDate: Thu Apr 23 19:18:18 2020 + Commit: Matthew Thode gentoo org> CommitDate: Thu Apr 23 19:19:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c639f2f9 net-misc/openvswitch: 2.13.0 bump Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.13.0.ebuild | 146 + 2 files changed, 147 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index e0afa7107db..c5ae0e107e3 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,2 +1,3 @@ DIST openvswitch-2.10.2.tar.gz 7561889 BLAKE2B a53dd7db7dcab5098af81671cb265861d3af79cce53436d75e0c3d8a38ce408a142f99b936a66c8bf0f3b317970ad8c1ef84bacc2e573e9b8c21b70aab1de485 SHA512 fd64ae814d85d3002d655a330268cfd6be79db6f954c132d3bfafc7dac23533918b642d0ed454e760f5820804bdff64f73ee8c36afc25a6810ef4c7aab748ba1 DIST openvswitch-2.11.1.tar.gz 7682693 BLAKE2B f25a537d9ad4051db0049f7ba8442564fdc890035ce3984e1754b9dd916e0b78bea11b5f4bc3a85d8b8a902ab210703feb0b7cce279803f642f9ee9f87bf SHA512 de016a1acfbae34d2062f4ac23b9b0782016fef4c0575b2714435380439f19613881173fb2c876afe86317a5c0327908704e540322d80f9f7da9f59bea7b1789 +DIST openvswitch-2.13.0.tar.gz 7233892 BLAKE2B 66dfeb8a5dd61538360b319cfccbe49273298d6cb20df2105d1db7eb4d01f40d54ec8792a7f80d9ffc767f9b28ae09fee6aa76ac3d97be6fc43f3e7f3b2a63bd SHA512 3fcd15d07925273e0c45e6b1e70b2cd9998f753e8d1a11fd0de1d1511ad56dfddedbba436bb1c347b4afb84eb9cd6fc52c3d445b710a89d599d2ff47ed46f17c diff --git a/net-misc/openvswitch/openvswitch-2.13.0.ebuild b/net-misc/openvswitch/openvswitch-2.13.0.ebuild new file mode 100644 index 000..6d6ed76b011 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.13.0.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_6 python3_7 ) + +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.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] + 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 +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 8c149763968b822c158261806a3b208881ec1fb3 Author: Michał Górny gentoo org> AuthorDate: Thu Mar 26 17:29:37 2020 + Commit: Michał Górny gentoo org> CommitDate: Thu Mar 26 17:35:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c149763 net-misc/openvswitch: Flatten twisted dep Signed-off-by: Michał Górny gentoo.org> net-misc/openvswitch/openvswitch-2.10.2.ebuild| 5 + net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild | 5 + 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild index a823c0b053f..8a2e1ad9103 100644 --- a/net-misc/openvswitch/openvswitch-2.10.2.ebuild +++ b/net-misc/openvswitch/openvswitch-2.10.2.ebuild @@ -21,10 +21,7 @@ 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/twisted[conch,${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] debug? ( dev-lang/perl )" DEPEND="${RDEPEND} diff --git a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild index 091d255356d..715a907910b 100644 --- a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild @@ -21,10 +21,7 @@ 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/twisted[conch,${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] debug? ( dev-lang/perl )" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 23dec1ca0f03afcda232b446f2fac317a0567787 Author: Michał Górny gentoo org> AuthorDate: Wed Feb 5 16:48:52 2020 + Commit: Michał Górny gentoo org> CommitDate: Wed Feb 5 16:53:16 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23dec1ca net-misc/openvswitch: Remove py2 Signed-off-by: Michał Górny gentoo.org> net-misc/openvswitch/openvswitch-2.10.2.ebuild| 2 +- net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild index eebc69958d9..a823c0b053f 100644 --- a/net-misc/openvswitch/openvswitch-2.10.2.ebuild +++ b/net-misc/openvswitch/openvswitch-2.10.2.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit autotools eutils linux-info linux-mod python-r1 systemd diff --git a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild index a8e46f5ad79..091d255356d 100644 --- a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit autotools eutils linux-info linux-mod python-r1 systemd
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/
commit: ad49e79cd1c439fb595b872db60b97eff18e1a62 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sat Jun 29 18:13:46 2019 + Commit: Matthew Thode gentoo org> CommitDate: Sat Jun 29 19:19:44 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad49e79c net-misc/openvswitch: remove unused files Closes: https://github.com/gentoo/gentoo/pull/12354 Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/files/ovs-vswitchd-r2.service | 26 -- net-misc/openvswitch/files/ovs-vswitchd_conf | 6 - net-misc/openvswitch/files/ovsdb-server-r2.service | 24 3 files changed, 56 deletions(-) diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r2.service b/net-misc/openvswitch/files/ovs-vswitchd-r2.service deleted file mode 100644 index 3092fdaaa66..000 --- a/net-misc/openvswitch/files/ovs-vswitchd-r2.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/ovs-vswitchd_conf b/net-misc/openvswitch/files/ovs-vswitchd_conf deleted file mode 100644 index c9eadb41862..000 --- a/net-misc/openvswitch/files/ovs-vswitchd_conf +++ /dev/null @@ -1,6 +0,0 @@ - -# Connection string for the configuration database (usually a unix socket) -DATABASE="unix:/var/run/openvswitch/db.sock" - -# Additional options -OPTIONS="--mlockall" diff --git a/net-misc/openvswitch/files/ovsdb-server-r2.service b/net-misc/openvswitch/files/ovsdb-server-r2.service deleted file mode 100644 index 5ff6f904466..000 --- a/net-misc/openvswitch/files/ovsdb-server-r2.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
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: c2052ae16f4b3f76e026263f42a97a455f0ad64d Author: Matthew Thode gentoo org> AuthorDate: Thu Jun 27 15:06:12 2019 + Commit: Matthew Thode gentoo org> CommitDate: Thu Jun 27 15:25:40 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2052ae1 net-misc/openvswitch: 2.11.1 and 2.10.2 stable amd64 and x86 Package-Manager: Portage-2.3.66, Repoman-2.3.16 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/openvswitch-2.10.2.ebuild| 2 +- net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild index 9fa8277073f..0dfc87fec2a 100644 --- a/net-misc/openvswitch/openvswitch-2.10.2.ebuild +++ b/net-misc/openvswitch/openvswitch-2.10.2.ebuild @@ -13,7 +13,7 @@ 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}" diff --git a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild index f2304f6ae35..aa2097f58cc 100644 --- a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild @@ -13,7 +13,7 @@ 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}" @@ -32,8 +32,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=" - ${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch - ${FILESDIR}/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch + "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" + "${FILESDIR}/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch" " CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 4ff788a2c2d044128f5f1c24ecb01b9494d4a5ff Author: Matthew Thode gentoo org> AuthorDate: Thu Jun 27 15:07:07 2019 + Commit: Matthew Thode gentoo org> CommitDate: Thu Jun 27 15:25:41 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff788a2 net-misc/openvswitch: cleanup Package-Manager: Portage-2.3.66, Repoman-2.3.16 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/Manifest | 3 - net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild | 154 -- net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild | 147 - net-misc/openvswitch/openvswitch-2.10.1.ebuild| 142 net-misc/openvswitch/openvswitch-2.8.1.ebuild | 151 - 5 files changed, 597 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 67563a392ef..e0afa7107db 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,5 +1,2 @@ -DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1e206a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 SHA512 f118c1c4ab4e126c3343023b03007ca9819c3c5a5ea42eaffaabdc7c50ecddede3e258574dbe0de95ed3be2e3d101612f5bdb423a7adb679987f4e501183a216 -DIST openvswitch-2.10.1.tar.gz 7522058 BLAKE2B 0f4eef6bf376cc23de4061c04787663f31458d98ac9ffb76627d5a7bb9422ee5f1d99e5c6024ad078c1b6128fb1b9ac99ea9e7107803fd2fdf6cb09bff6b0ef3 SHA512 3634bd3e978110cb9e11191a88e4232a7af152a6ddf46e8a32e50e07de866be782b7e753d26b81183ec107816e5af4109badf8f2067a61fd9506ccf81e748e44 DIST openvswitch-2.10.2.tar.gz 7561889 BLAKE2B a53dd7db7dcab5098af81671cb265861d3af79cce53436d75e0c3d8a38ce408a142f99b936a66c8bf0f3b317970ad8c1ef84bacc2e573e9b8c21b70aab1de485 SHA512 fd64ae814d85d3002d655a330268cfd6be79db6f954c132d3bfafc7dac23533918b642d0ed454e760f5820804bdff64f73ee8c36afc25a6810ef4c7aab748ba1 DIST openvswitch-2.11.1.tar.gz 7682693 BLAKE2B f25a537d9ad4051db0049f7ba8442564fdc890035ce3984e1754b9dd916e0b78bea11b5f4bc3a85d8b8a902ab210703feb0b7cce279803f642f9ee9f87bf SHA512 de016a1acfbae34d2062f4ac23b9b0782016fef4c0575b2714435380439f19613881173fb2c876afe86317a5c0327908704e540322d80f9f7da9f59bea7b1789 -DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7 diff --git a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild deleted file mode 100644 index 7d1e0be6561..000 --- a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,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" - -
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/, net-misc/openvswitch/
commit: 9bf6443396a2c0cc12843670c920fc7ff7cb979b Author: Matthew Thode gentoo org> AuthorDate: Mon Jun 3 14:49:48 2019 + Commit: Matthew Thode gentoo org> CommitDate: Mon Jun 3 14:50:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf64433 net-misc/openvswitch: fix building on newer kernels Fixes: https://bugs.gentoo.org/687186 Package-Manager: Portage-2.3.66, Repoman-2.3.13 Signed-off-by: Matthew Thode gentoo.org> ...nntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch | 46 ++ ...-2.11.1.ebuild => openvswitch-2.11.1-r1.ebuild} | 5 ++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch new file mode 100644 index 000..1f77ab54b0a --- /dev/null +++ b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch @@ -0,0 +1,46 @@ +From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001 +From: Yousong Zhou +Date: Fri, 3 May 2019 15:03:24 + +Subject: [PATCH 5/5] datapath: conntrack: fix include for + IP6_DEFRAG_CONNTRACK_IN + +The enum definition is now inside include/net/ipv6_frag.h since upstream commit +70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was +backported to stable trees (4.9, 4.14, 4.19) only these days. + +The error message + + CC [M] /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o + /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c: In function 'handle_fragments': + /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:8: error: variable 'user' has initializer but incomplete type + enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; + ^~~~ + /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: error: 'IP6_DEFRAG_CONNTRACK_IN' undeclared (first use in this function); did you mean 'IP_DEFRAG_CONNTRACK_IN'? + enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; + ^~~ + IP_DEFRAG_CONNTRACK_IN + /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: note: each undeclared identifier is reported only once for each function it appears in + /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: error: storage size of 'user' isn't known + enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; +^~~~ + /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: warning: unused variable 'user' [-Wunused-variable] + scripts/Makefile.build:326: recipe for target '/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o' failed + +Reference: https://github.com/openwrt/packages/issues/8548#issuecomment-488871090 +Signed-off-by: Yousong Zhou +--- + datapath/conntrack.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/datapath/conntrack.c b/datapath/conntrack.c +index a7dc9e0c3..69bda5a9c 100644 +--- a/datapath/conntrack.c b/datapath/conntrack.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #ifdef CONFIG_NF_NAT_NEEDED + #include diff --git a/net-misc/openvswitch/openvswitch-2.11.1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild similarity index 96% rename from net-misc/openvswitch/openvswitch-2.11.1.ebuild rename to net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild index a36bb2cdaa1..f2304f6ae35 100644 --- a/net-misc/openvswitch/openvswitch-2.11.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild @@ -31,7 +31,10 @@ DEPEND="${RDEPEND} sys-apps/util-linux[caps] virtual/pkgconfig" -PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" +PATCHES=" + ${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch + ${FILESDIR}/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch +" CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 0d74f18fa38281b3391a535b0b8d1d44eab260a6 Author: Matthew Thode gentoo org> AuthorDate: Sun Jun 2 17:14:52 2019 + Commit: Matthew Thode gentoo org> CommitDate: Sun Jun 2 17:14:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d74f18f net-misc/openvswitch: 2.10.2 and 2.11.1 bump Bug: https://bugs.gentoo.org/687186 Package-Manager: Portage-2.3.66, Repoman-2.3.13 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/Manifest | 2 + net-misc/openvswitch/openvswitch-2.10.2.ebuild | 147 + net-misc/openvswitch/openvswitch-2.11.1.ebuild | 147 + 3 files changed, 296 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 3df07d1580f..67563a392ef 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,3 +1,5 @@ DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1e206a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 SHA512 f118c1c4ab4e126c3343023b03007ca9819c3c5a5ea42eaffaabdc7c50ecddede3e258574dbe0de95ed3be2e3d101612f5bdb423a7adb679987f4e501183a216 DIST openvswitch-2.10.1.tar.gz 7522058 BLAKE2B 0f4eef6bf376cc23de4061c04787663f31458d98ac9ffb76627d5a7bb9422ee5f1d99e5c6024ad078c1b6128fb1b9ac99ea9e7107803fd2fdf6cb09bff6b0ef3 SHA512 3634bd3e978110cb9e11191a88e4232a7af152a6ddf46e8a32e50e07de866be782b7e753d26b81183ec107816e5af4109badf8f2067a61fd9506ccf81e748e44 +DIST openvswitch-2.10.2.tar.gz 7561889 BLAKE2B a53dd7db7dcab5098af81671cb265861d3af79cce53436d75e0c3d8a38ce408a142f99b936a66c8bf0f3b317970ad8c1ef84bacc2e573e9b8c21b70aab1de485 SHA512 fd64ae814d85d3002d655a330268cfd6be79db6f954c132d3bfafc7dac23533918b642d0ed454e760f5820804bdff64f73ee8c36afc25a6810ef4c7aab748ba1 +DIST openvswitch-2.11.1.tar.gz 7682693 BLAKE2B f25a537d9ad4051db0049f7ba8442564fdc890035ce3984e1754b9dd916e0b78bea11b5f4bc3a85d8b8a902ab210703feb0b7cce279803f642f9ee9f87bf SHA512 de016a1acfbae34d2062f4ac23b9b0782016fef4c0575b2714435380439f19613881173fb2c876afe86317a5c0327908704e540322d80f9f7da9f59bea7b1789 DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7 diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild new file mode 100644 index 000..9fa8277073f --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.10.2.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,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} + sys-apps/util-linux[caps] + 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 17 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" + + # flake8 is primarily a style guide tool, running it as part of the tests + # in Gentoo
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: c3a6916d243821f098999d78ba14c1b515226fd0 Author: Tiziano MĂĽller gentoo org> AuthorDate: Sat Apr 13 17:07:58 2019 + Commit: Tiziano MĂĽller gentoo org> CommitDate: Sat Apr 13 17:07:58 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a6916d net-misc/openvswitch: never run flake8 Closes: https://bugs.gentoo.org/607280 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Tiziano MĂĽller gentoo.org> net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild index f74b7fd5ea7..e3272da6496 100644 --- a/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild @@ -66,6 +66,10 @@ src_configure() { # 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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 32d3d80ad7ba6632623cf4e420debba627db90f6 Author: Matthew Thode gentoo org> AuthorDate: Wed Mar 27 14:50:28 2019 + Commit: Matthew Thode gentoo org> CommitDate: Wed Mar 27 14:50:44 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d3d80a net-misc/openvswitch: depend on util-linux[caps] Fixes: https://bugs.gentoo.org/681852 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild | 143 ++ 1 file changed, 143 insertions(+) diff --git a/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild new file mode 100644 index 000..f74b7fd5ea7 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2019 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} + sys-apps/util-linux[caps] + 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.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 + 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 + +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 2fa4699123bf949cce6f218312ab97de5343ea0e Author: Matthew Thode gentoo org> AuthorDate: Wed Dec 19 21:14:54 2018 + Commit: Matthew Thode gentoo org> CommitDate: Wed Dec 19 21:14:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa46991 net-misc/openvswitch: fix confd typo Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/openvswitch-2.10.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.10.1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1.ebuild index 044f33af589..1f5b6181094 100644 --- a/net-misc/openvswitch/openvswitch-2.10.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.10.1.ebuild @@ -102,7 +102,7 @@ src_install() { rm -rf "${ED%/}"/var/run || die newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server - newconfd "${FILESDIR}/ovs-vswitchd.conf-r2" ovs-vswitchd + newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/, net-misc/openvswitch/
commit: 7750fade80482bf075e56f4eabd52423c314fe69 Author: Matthew Thode gentoo org> AuthorDate: Wed Dec 19 21:06:12 2018 + Commit: Matthew Thode gentoo org> CommitDate: Wed Dec 19 21:06:56 2018 + 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 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 a04e6e823a40e9a3a2d2ffd79a881b1f1e206a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 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 000..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/:*/}" !=
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: ea1bc9fe8a4a3adc50b5a5218e8c01f4144fb10b Author: Matthew Thode gentoo org> AuthorDate: Mon Nov 26 03:00:07 2018 + Commit: Matthew Thode gentoo org> CommitDate: Mon Nov 26 03:00:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1bc9fe net-misc/openvswitch: cleanup bug: https://bugs.gentoo.org/633420 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/Manifest| 1 - net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild | 151 --- net-misc/openvswitch/openvswitch-2.7.2.ebuild| 148 -- 3 files changed, 300 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index fb7dc29fbd4..f4195ba8e11 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,3 +1,2 @@ DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1e206a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 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 diff --git a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild deleted file mode 100644 index 9d3deaa6051..000 --- a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -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.7.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" - kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 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}" -
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/, net-misc/openvswitch/files/
commit: 32da9e276ee7e0af61535e3c9ab605678347ba8e Author: Matthew Thode gentoo org> AuthorDate: Sun Sep 23 20:21:21 2018 + Commit: Matt Thode gentoo org> CommitDate: Sun Sep 23 20:21:37 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32da9e27 net-misc/openvswitch: bumping to 2.10.0-r1 for some systemd changes Package-Manager: Portage-2.3.49, Repoman-2.3.11 RepoMan-Options: --force .../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 +++ ...-2.10.0.ebuild => openvswitch-2.10.0-r1.ebuild} | 8 --- 5 files changed, 68 insertions(+), 3 deletions(-) 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 000..4cd4d7f57f9 --- /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 000..3092fdaaa66 --- /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 000..5ff6f904466 --- /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 97367b9717e..07eca5e6c9f 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.ebuild b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild similarity index 92% rename from net-misc/openvswitch/openvswitch-2.10.0.ebuild rename to net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild index b0141c8947f..302aafe58fe 100644 --- a/net-misc/openvswitch/openvswitch-2.10.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 0b7c9618744eae9764bdd61ca1e0c6d600c9c013 Author: Matthew Thode gentoo org> AuthorDate: Fri Sep 21 22:39:27 2018 + Commit: Matt Thode gentoo org> CommitDate: Fri Sep 21 22:39:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7c9618 net-misc/openvswitch: 2.10.0 stable amd64 and x86 Package-Manager: Portage-2.3.49, Repoman-2.3.10 net-misc/openvswitch/openvswitch-2.10.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.10.0.ebuild b/net-misc/openvswitch/openvswitch-2.10.0.ebuild index c7dbad710b1..b0141c8947f 100644 --- a/net-misc/openvswitch/openvswitch-2.10.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.10.0.ebuild @@ -13,7 +13,7 @@ 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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 2fdaed9ffb402570f8d6c7afdf28b5587e1bf370 Author: Matthew Thode gentoo org> AuthorDate: Fri Sep 21 22:26:35 2018 + Commit: Matt Thode gentoo org> CommitDate: Fri Sep 21 22:32:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fdaed9f net-misc/openvswitch: 2.10.0 bup Package-Manager: Portage-2.3.49, Repoman-2.3.10 net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.10.0.ebuild | 152 + 2 files changed, 153 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index bccf494b887..fb7dc29fbd4 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,2 +1,3 @@ +DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1e206a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 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 diff --git a/net-misc/openvswitch/openvswitch-2.10.0.ebuild b/net-misc/openvswitch/openvswitch-2.10.0.ebuild new file mode 100644 index 000..c7dbad710b1 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.10.0.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 507e07555d018b0d5fb0dbb670f20c31306864b7 Author: Marty E. Plummer startmail com> AuthorDate: Fri Aug 3 00:21:13 2018 + Commit: Matthias Maier gentoo org> CommitDate: Thu Aug 9 18:46:38 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=507e0755 net-misc/openvswitch: add missing versionator inherit c6b150836dfef848e51ec2cce801b12daf2c77b1 dropped versionator from linux-info, which these ebuilds were using via the implicit inherit. Closes: https://github.com/gentoo/gentoo/pull/9427 Package-Manager: Portage-2.3.44, Repoman-2.3.10 Signed-off-by: Matthias Maier gentoo.org> net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild | 2 +- net-misc/openvswitch/openvswitch-2.7.2.ebuild| 2 +- net-misc/openvswitch/openvswitch-2.8.1.ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild index 6f091c8361d..9d3deaa6051 100644 --- a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild @@ -5,7 +5,7 @@ EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -inherit autotools eutils linux-info linux-mod python-r1 systemd +inherit autotools eutils linux-info linux-mod python-r1 systemd versionator DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org; diff --git a/net-misc/openvswitch/openvswitch-2.7.2.ebuild b/net-misc/openvswitch/openvswitch-2.7.2.ebuild index 4269aaab796..f5dbcf60a92 100644 --- a/net-misc/openvswitch/openvswitch-2.7.2.ebuild +++ b/net-misc/openvswitch/openvswitch-2.7.2.ebuild @@ -5,7 +5,7 @@ EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -inherit autotools eutils linux-info linux-mod python-r1 systemd +inherit autotools eutils linux-info linux-mod python-r1 systemd versionator DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org; diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild index 733122d89e8..b46ba3bd040 100644 --- a/net-misc/openvswitch/openvswitch-2.8.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.8.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 +inherit autotools eutils linux-info linux-mod python-r1 systemd versionator DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org;
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 7430855da2cda6db8fcb84a6ebe2903f39bfeea6 Author: Pacho Ramos gentoo org> AuthorDate: Tue Jun 26 19:27:04 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Tue Jun 26 19:50:48 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7430855d net-misc/openvswitch: Support python3.6 Package-Manager: Portage-2.3.40, Repoman-2.3.9 net-misc/openvswitch/openvswitch-2.8.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild index e5269337cd7..733122d89e8 100644 --- a/net-misc/openvswitch/openvswitch-2.8.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.8.1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit autotools eutils linux-info linux-mod python-r1 systemd
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: fc5efc6dea906b88030f2615c75b2a8314ced3cc Author: Aaron Bauman gentoo org> AuthorDate: Sat Apr 7 03:02:06 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Sat Apr 7 03:02:06 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc5efc6d net-misc/openvswitch: amd64 stable Bug: https://bugs.gentoo.org/633420 Package-Manager: Portage-2.3.28, Repoman-2.3.9 net-misc/openvswitch/openvswitch-2.8.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild index f118e96631a..e5269337cd7 100644 --- a/net-misc/openvswitch/openvswitch-2.8.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.8.1.ebuild @@ -13,7 +13,7 @@ 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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 33f1e03e07defe68cfd23d2bca7a1921368ecbc6 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sat Mar 24 18:35:39 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Mar 26 19:15:24 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33f1e03e net-misc/openvswitch: use HTTPS Closes: https://github.com/gentoo/gentoo/pull/7595 net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild | 4 ++-- net-misc/openvswitch/openvswitch-2.7.2.ebuild| 4 ++-- net-misc/openvswitch/openvswitch-2.8.1.ebuild| 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild index 34a1a0d9f98..6f091c8361d 100644 --- a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild @@ -8,8 +8,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} ) inherit autotools eutils linux-info linux-mod python-r1 systemd DESCRIPTION="Production quality, multilayer virtual switch" -HOMEPAGE="http://openvswitch.org; -SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; +HOMEPAGE="https://www.openvswitch.org; +SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz; LICENSE="Apache-2.0 GPL-2" SLOT="0" diff --git a/net-misc/openvswitch/openvswitch-2.7.2.ebuild b/net-misc/openvswitch/openvswitch-2.7.2.ebuild index bfba9734edf..4269aaab796 100644 --- a/net-misc/openvswitch/openvswitch-2.7.2.ebuild +++ b/net-misc/openvswitch/openvswitch-2.7.2.ebuild @@ -8,8 +8,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} ) inherit autotools eutils linux-info linux-mod python-r1 systemd DESCRIPTION="Production quality, multilayer virtual switch" -HOMEPAGE="http://openvswitch.org; -SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; +HOMEPAGE="https://www.openvswitch.org; +SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz; LICENSE="Apache-2.0 GPL-2" SLOT="0" diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild index 55df1bd4c28..f118e96631a 100644 --- a/net-misc/openvswitch/openvswitch-2.8.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.8.1.ebuild @@ -8,8 +8,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} ) inherit autotools eutils linux-info linux-mod python-r1 systemd DESCRIPTION="Production quality, multilayer virtual switch" -HOMEPAGE="http://openvswitch.org; -SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; +HOMEPAGE="https://www.openvswitch.org; +SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz; LICENSE="Apache-2.0 GPL-2" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 02340d7eb201e301e4454563e97b706f5e938924 Author: Matthew Thode gentoo org> AuthorDate: Fri Mar 16 15:32:18 2018 + Commit: Matt Thode gentoo org> CommitDate: Fri Mar 16 15:34:48 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02340d7e net-misc/openvswitch: remove 2.6.1 for bug 620200 Bug: https://bugs.gentoo.org/620200 Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-misc/openvswitch/Manifest | 1 - net-misc/openvswitch/openvswitch-2.6.1.ebuild | 155 -- 2 files changed, 156 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index db2b9ed6d53..bccf494b887 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,3 +1,2 @@ -DIST openvswitch-2.6.1.tar.gz 5399107 BLAKE2B a42e391e63c86559967ea08e425bca7a6968627ebf18fc6241c679ac011bd0688fe58124150ec48f96523bfb984aced980d011956a63d7c4df7da442ac1697fe SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 DIST openvswitch-2.7.2.tar.gz 6192414 BLAKE2B aea61637fe04d27d4c97e733987e843ef932bdd9e1d463c391e258a2b4461866a897c5063859708126c564e42ef99ab63a4b8fac8335bdc78531c46217abd945 SHA512 790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470 DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7 diff --git a/net-misc/openvswitch/openvswitch-2.6.1.ebuild b/net-misc/openvswitch/openvswitch-2.6.1.ebuild deleted file mode 100644 index 3830839ab69..000 --- a/net-misc/openvswitch/openvswitch-2.6.1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit autotools eutils linux-info linux-mod python-r1 systemd - -DESCRIPTION="Production quality, multilayer virtual switch" -HOMEPAGE="http://openvswitch.org; -SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug modules monitor +ssl" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ssl? ( dev-libs/openssl:0= ) - ${PYTHON_DEPS} - ~dev-python/ovs-${PV} - dev-python/twisted-core - dev-python/twisted-conch - dev-python/twisted-web - 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" - kernel_is le 4 7 999 || die "Linux >= 3.10.0 and <= 4.8 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 ist 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 - for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do - sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" || die - python_foreach_impl python_doscript utilities/"${SCRIPT}" - done - - python_foreach_impl python_optimize "${ED%/}"/usr/share/ovsdbmonitor - - rm -r "${ED%/}"/usr/share/openvswitch/python || die - - keepdir
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 9a8f8a2c8b18d56fa218de39626ebc7b388ada7a Author: Mike Gilbert gentoo org> AuthorDate: Fri Jan 5 20:42:08 2018 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Jan 5 20:42:08 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8f8a2c net-misc/openvswitch: drop dependency on openrc/systemd Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37 net-misc/openvswitch/openvswitch-2.6.1.ebuild| 6 +- net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild | 6 +- net-misc/openvswitch/openvswitch-2.7.2.ebuild| 6 +- net-misc/openvswitch/openvswitch-2.8.1.ebuild| 6 +- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.6.1.ebuild b/net-misc/openvswitch/openvswitch-2.6.1.ebuild index 9d7d5282fc3..3830839ab69 100644 --- a/net-misc/openvswitch/openvswitch-2.6.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,10 +18,6 @@ IUSE="debug modules monitor +ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" - || ( - >=sys-apps/openrc-0.10.5 - sys-apps/systemd - ) ssl? ( dev-libs/openssl:0= ) ${PYTHON_DEPS} ~dev-python/ovs-${PV} diff --git a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild index d8f19c8e853..34a1a0d9f98 100644 --- a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,10 +18,6 @@ IUSE="debug modules monitor +ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" - || ( - >=sys-apps/openrc-0.10.5 - sys-apps/systemd - ) ssl? ( dev-libs/openssl:0= ) ${PYTHON_DEPS} ~dev-python/ovs-2.7.0[${PYTHON_USEDEP}] diff --git a/net-misc/openvswitch/openvswitch-2.7.2.ebuild b/net-misc/openvswitch/openvswitch-2.7.2.ebuild index 596a2985f9c..bfba9734edf 100644 --- a/net-misc/openvswitch/openvswitch-2.7.2.ebuild +++ b/net-misc/openvswitch/openvswitch-2.7.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,10 +18,6 @@ IUSE="debug modules monitor +ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" - || ( - >=sys-apps/openrc-0.10.5 - sys-apps/systemd - ) ssl? ( dev-libs/openssl:0= ) ${PYTHON_DEPS} ~dev-python/ovs-2.7.0[${PYTHON_USEDEP}] diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild index 99125f9190f..55df1bd4c28 100644 --- a/net-misc/openvswitch/openvswitch-2.8.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.8.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,10 +18,6 @@ IUSE="debug modules monitor +ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" - || ( - >=sys-apps/openrc-0.10.5 - sys-apps/systemd - ) ssl? ( dev-libs/openssl:0= ) ${PYTHON_DEPS} ~dev-python/ovs-2.7.2[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 613cff73ba2e73197a8f47f16e32bbda5ef368ed Author: Matthew Thode gentoo org> AuthorDate: Thu Oct 5 04:10:39 2017 + Commit: Matt Thode gentoo org> CommitDate: Thu Oct 5 04:10:39 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=613cff73 net-misc/openvswitch: match upstream kernel versions supported Package-Manager: Portage-2.3.8, Repoman-2.3.3 net-misc/openvswitch/openvswitch-2.8.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild index 35188c9569d..99125f9190f 100644 --- a/net-misc/openvswitch/openvswitch-2.8.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.8.1.ebuild @@ -44,7 +44,7 @@ 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" - kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" + kernel_is le 4 12 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules" linux-mod_pkg_setup else CONFIG_CHECK+=" ~OPENVSWITCH"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 41773ba59880d160d83ce6e67abda2dbd8bc90fd Author: Matthew Thode gentoo org> AuthorDate: Wed Oct 4 02:29:50 2017 + Commit: Matt Thode gentoo org> CommitDate: Wed Oct 4 02:30:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41773ba5 net-misc/openvswitch: 2.8.1 bup for CVE-2017-14970 bug 633420 Package-Manager: Portage-2.3.8, Repoman-2.3.3 net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.8.1.ebuild | 155 ++ 2 files changed, 156 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index f3657364ffa..bb25830ae85 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,2 +1,3 @@ DIST openvswitch-2.6.1.tar.gz 5399107 SHA256 307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 WHIRLPOOL 1ab35852ad45fc99964c814923ea54b22ec6c4630b2aa6cb6aee7b96ca806095d0be60c1b08f926419efa79a3c7ce4d484efe497bb50a9596db69b6020175092 DIST openvswitch-2.7.2.tar.gz 6192414 SHA256 fe36c86ed52f6f7c17b01cdbb7ae37bf521cc5c2e50997b618f3f742485f655b SHA512 790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470 WHIRLPOOL 6525d475cc10b3e32d5b9c01cbfd909dff3cfad28bbe13bf55b5775471a58fd49e9f9cf484a9e68a0f371c56824910142513c34dc5d2f11a0dcebf5b789e75d4 +DIST openvswitch-2.8.1.tar.gz 6746474 SHA256 8d1c439e26d7044f0ec823c7fef1b00b7c6465da0b83a7d0cf3191ed1dc43893 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7 WHIRLPOOL 864ac85d1330cf04cf499dcbbbed0e0b09351795a5ecd780e0f94cae3dc744229875181cea05fa39a7108583271319cedc7a0dfc77b7793453c76604e81a7fe1 diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild new file mode 100644 index 000..35188c9569d --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.8.1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit autotools eutils linux-info linux-mod python-r1 systemd + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="http://openvswitch.org; +SRC_URI="http://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=" + || ( + >=sys-apps/openrc-0.10.5 + sys-apps/systemd + ) + ssl? ( dev-libs/openssl:0= ) + ${PYTHON_DEPS} + ~dev-python/ovs-2.7.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" + kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 4b936aebdd8ec7e82cef34da21e2edefe9903edd Author: Matthew Thode gentoo org> AuthorDate: Sat Sep 30 00:52:22 2017 + Commit: Matt Thode gentoo org> CommitDate: Sat Sep 30 00:52:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b936aeb net-misc/openvswitch: 2.7.2-r1 stable amd64 and x86 Package-Manager: Portage-2.3.8, Repoman-2.3.3 net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild index dfe3a852b32..d8f19c8e853 100644 --- a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 33793e140611e6890f5a82fceb6a207380341c10 Author: Matthew Thode gentoo org> AuthorDate: Thu Aug 24 19:31:21 2017 + Commit: Matt Thode gentoo org> CommitDate: Thu Aug 24 19:31:21 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33793e14 net-misc/openvswitch: switch to split twisted bug 628028 Package-Manager: Portage-2.3.6, Repoman-2.3.3 net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild | 155 +++ 1 file changed, 155 insertions(+) diff --git a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild new file mode 100644 index 000..dfe3a852b32 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit autotools eutils linux-info linux-mod python-r1 systemd + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="http://openvswitch.org; +SRC_URI="http://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=" + || ( + >=sys-apps/openrc-0.10.5 + sys-apps/systemd + ) + ssl? ( dev-libs/openssl:0= ) + ${PYTHON_DEPS} + ~dev-python/ovs-2.7.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" + kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 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_dounit "${FILESDIR}/ovsdb-server.service" + systemd_dounit "${FILESDIR}/ovs-vswitchd.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 "
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/
commit: bc6832812b3411e182361a77c997eef96ba84371 Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Aug 23 08:20:26 2017 + Commit: Matt Thode gentoo org> CommitDate: Thu Aug 24 19:14:07 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc683281 net-misc/openvswitch: remove unused patches/files Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/files/CVE-2017-9214.patch | 27 -- net-misc/openvswitch/files/atomic-test.patch | 14 --- net-misc/openvswitch/files/configure.patch | 15 --- net-misc/openvswitch/files/doc-fix.patch | 16 --- .../openvswitch/files/kernel-3.11-support.patch| 68 - .../openvswitch/files/kernel-3.12-support.patch| 19 net-misc/openvswitch/files/ovs-controller-r1 | 22 - net-misc/openvswitch/files/ovs-controller.service | 9 -- net-misc/openvswitch/files/ovs-controller_conf | 7 -- net-misc/openvswitch/files/prevent-traceback.patch | 107 - .../files/xcp-interface-reconfigure.patch | 20 11 files changed, 324 deletions(-) diff --git a/net-misc/openvswitch/files/CVE-2017-9214.patch b/net-misc/openvswitch/files/CVE-2017-9214.patch deleted file mode 100644 index 33686df3acf..000 --- a/net-misc/openvswitch/files/CVE-2017-9214.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix buffer overrread in ofputil_pull_queue_get_config_reply10() - -msg->size isn't the relevant measurement here because we're only supposed -to read 'len' bytes. Reading more than that causes 'len' to underflow to a -large number at the end of the loop. - -Reported-by: Bhargava Shastry -Signed-off-by: Ben Pfaff - lib/ofp-util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/ofp-util.c b/lib/ofp-util.c -index bdf89b6c3017..f05ca398c13e 100644 a/lib/ofp-util.c -+++ b/lib/ofp-util.c -@@ -2610,7 +2610,7 @@ ofputil_pull_queue_get_config_reply10(struct ofpbuf *msg, - - hdr = ofpbuf_at_assert(msg, 0, sizeof *hdr); - prop_len = ntohs(hdr->len); --if (prop_len < sizeof *hdr || prop_len > msg->size || prop_len % 8) { -+if (prop_len < sizeof *hdr || prop_len > len || prop_len % 8) { - return OFPERR_OFPBRC_BAD_LEN; - } - --- -2.10.2 diff --git a/net-misc/openvswitch/files/atomic-test.patch b/net-misc/openvswitch/files/atomic-test.patch deleted file mode 100644 index 14de564de9c..000 --- a/net-misc/openvswitch/files/atomic-test.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Link atomic test with -latomic for powerpc. -Author: Adam Conrad- openvswitch-2.0.0.orig/tests/automake.mk -+++ openvswitch-2.0.0/tests/automake.mk -@@ -181,7 +181,7 @@ tests_test_aes128_LDADD = lib/libopenvsw - - noinst_PROGRAMS += tests/test-atomic - tests_test_atomic_SOURCES = tests/test-atomic.c --tests_test_atomic_LDADD = lib/libopenvswitch.a $(SSL_LIBS) -+tests_test_atomic_LDADD = lib/libopenvswitch.a $(SSL_LIBS) -latomic - - noinst_PROGRAMS += tests/test-bundle - tests_test_bundle_SOURCES = tests/test-bundle.c diff --git a/net-misc/openvswitch/files/configure.patch b/net-misc/openvswitch/files/configure.patch deleted file mode 100644 index 47f5614d8ed..000 --- a/net-misc/openvswitch/files/configure.patch +++ /dev/null @@ -1,15 +0,0 @@ configure.orig 2014-01-27 21:55:14.116272645 +0200 -+++ configure 2014-01-27 21:55:40.687273108 +0200 -@@ -7949,10 +7949,10 @@ - $as_echo "$kversion" >&6; } - - if test "$version" -ge 3; then -- if test "$version" = 3 && test "$patchlevel" -le 10; then -+ if test "$version" = 3 && test "$patchlevel" -le 12; then - : # Linux 3.x -else -- as_fn_error $? "Linux kernel in $KBUILD is version $kversion, but version newer than 3.10.x is not supported" "$LINENO" 5 -+ as_fn_error $? "Linux kernel in $KBUILD is version $kversion, but version newer than 3.12.x is not supported" "$LINENO" 5 -fi - else -if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then diff --git a/net-misc/openvswitch/files/doc-fix.patch b/net-misc/openvswitch/files/doc-fix.patch deleted file mode 100644 index 1d6df01147e..000 --- a/net-misc/openvswitch/files/doc-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -We might want to backport this if there are any releases with the Sphinx -docs present. - Documentation/conf.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Documentation/conf.py b/Documentation/conf.py -index 49514ec..97f402e 100644 a/Documentation/conf.py -+++ b/Documentation/conf.py -@@ -145,8 +145,6 @@ linkcheck_anchors = False - # - if use_ovs_theme: - html_theme = 'ovs' --else: --html_theme = 'default' diff --git a/net-misc/openvswitch/files/kernel-3.11-support.patch b/net-misc/openvswitch/files/kernel-3.11-support.patch deleted file mode 100644 index 7ee53d83500..000
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: cd32c94988534b838fc7192ed36d812c824d0954 Author: Matthew Thode gentoo org> AuthorDate: Sun Jul 23 23:54:49 2017 + Commit: Matt Thode gentoo org> CommitDate: Sun Jul 23 23:54:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd32c949 net-misc/openvswitch: 2.7.2 sec bup for bug 620258 Package-Manager: Portage-2.3.6, Repoman-2.3.3 net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.7.2.ebuild | 152 ++ 2 files changed, 153 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 6ab6f7f36ff..c39926c6947 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -4,3 +4,4 @@ DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaef DIST openvswitch-2.5.0.tar.gz 4603077 SHA256 34da54fbad503205b1a66b48ca4312679e1ce5b04763a9fb86050b2b25d66f21 SHA512 32addb6ed8d4b78e6eb5b951de6b2390dacb3a66096ff8de6020e6d42d460e1038eec43c4057707942f8043ebcad848488d09c7aabfa4599d53782a9cc69f089 WHIRLPOOL 3b879ce376268bb65858f4c4b7193c54fc43a9903029f2000cee1a4f8739eae3ed5b2ad67c57de7ecfe3028874831796bd69a1b8a0599d9dad56f1b524302c5d DIST openvswitch-2.6.1.tar.gz 5399107 SHA256 307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 WHIRLPOOL 1ab35852ad45fc99964c814923ea54b22ec6c4630b2aa6cb6aee7b96ca806095d0be60c1b08f926419efa79a3c7ce4d484efe497bb50a9596db69b6020175092 DIST openvswitch-2.7.0.tar.gz 6149523 SHA256 e492cf08a929b4a2178b7f9b01dc4ff562f44138b547b4e942078187b2445d2e SHA512 d0c61fa149f5279182de561ed82125e7ddd4ecd4278eba3c5e6a7221840c8cbb70581269afdf4ff2508b8e5baeb8783b1a196d6e6f747e3a21aacdf778d6d190 WHIRLPOOL 0c26e4488bfd3bea97415d9b4b00c87730bb35c2c059f3aff2fb0f7d3e34eed6308a4734ab88395dc435bd670ef584d89af9849d0cf6ea9dfe78168329e098cd +DIST openvswitch-2.7.2.tar.gz 6192414 SHA256 fe36c86ed52f6f7c17b01cdbb7ae37bf521cc5c2e50997b618f3f742485f655b SHA512 790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470 WHIRLPOOL 6525d475cc10b3e32d5b9c01cbfd909dff3cfad28bbe13bf55b5775471a58fd49e9f9cf484a9e68a0f371c56824910142513c34dc5d2f11a0dcebf5b789e75d4 diff --git a/net-misc/openvswitch/openvswitch-2.7.2.ebuild b/net-misc/openvswitch/openvswitch-2.7.2.ebuild new file mode 100644 index 000..ee4e290d570 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.7.2.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit autotools eutils linux-info linux-mod python-r1 systemd + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="http://openvswitch.org; +SRC_URI="http://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=" + || ( + >=sys-apps/openrc-0.10.5 + sys-apps/systemd + ) + ssl? ( dev-libs/openssl:0= ) + ${PYTHON_DEPS} + ~dev-python/ovs-2.7.0[${PYTHON_USEDEP}] + dev-python/twisted[conch,${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" + kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 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 \ +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: feeed6a3f140a575563153c47583d649f19dc6c8 Author: Matthew Thode gentoo org> AuthorDate: Mon Jul 24 00:09:36 2017 + Commit: Matt Thode gentoo org> CommitDate: Mon Jul 24 00:09:36 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feeed6a3 net-misc/openvswitch: cleanup for bug 620258 Package-Manager: Portage-2.3.6, Repoman-2.3.3 net-misc/openvswitch/Manifest| 5 - net-misc/openvswitch/metadata.xml| 1 - net-misc/openvswitch/openvswitch-1.11.0.ebuild | 145 net-misc/openvswitch/openvswitch-2.0.0-r3.ebuild | 160 -- net-misc/openvswitch/openvswitch-2.1.3.ebuild| 152 - net-misc/openvswitch/openvswitch-2.5.0.ebuild| 161 --- net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild | 152 - net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild | 152 - net-misc/openvswitch/openvswitch-2.7.0-r3.ebuild | 153 - net-misc/openvswitch/openvswitch-2.7.0.ebuild| 154 -- 10 files changed, 1235 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index c39926c6947..f3657364ffa 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,7 +1,2 @@ -DIST openvswitch-1.11.0.tar.gz 2551510 SHA256 007d7d3f2deabe5a3845d1045d23b6b1de174497a8e436091541221dd71833da SHA512 9c338a9e376c845ae5f273030263dbae52fa268350d943e65987d6840d9647194f715e36517c829be32200f1064e13a585bd5b2acb9fa2a7f32199bd4be31459 WHIRLPOOL fa7bc71f0f17f789ed0dc1dce953e1399f56c7529d13a10761f90a3b40a210e511722dda99a502fa2ef8f74ccc6ea5e8c3392c408bf00a85b5824bfa96fc7f24 -DIST openvswitch-2.0.0.tar.gz 2708774 SHA256 5060e2be69cce01c15f67b481482cb1a0eaa6ef5cbdbed592bac3c3ab2a390f8 SHA512 f6d36663b65d054d179e5a09a478cf45ae9510c8f3aa31bb2013aaee1b146ee21ce986bb8b9f63ac72036f94d0b415f30ab874451b661b855f46b44eaa42537d WHIRLPOOL be6ac428d5d01b751d8d6312e7e028a23160d44da62231cc84c21d42c19c8c5f6b9457c29c26e7b283db91b08a00d8b54368534a621e556c54e15c0682dad4a1 -DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaefe73069b5699654538bf2f16ebfb1a SHA512 ede64d37f8bf4a475ab3e4a1e0cd83ae1f29df318f7834b804d9f334710ba43b25b9f562f8c7e91041e24f3121fd03e9e09fc789f398d352a2dceaa0576013dd WHIRLPOOL ddd6c1c733a7a139d58d0492ea8c0efa40065443f763faffd5964e5578acfe9b02ec1dd009c52843759d8a93027eb89412e768ca3e70d9ceeb0d030e791a9b7e -DIST openvswitch-2.5.0.tar.gz 4603077 SHA256 34da54fbad503205b1a66b48ca4312679e1ce5b04763a9fb86050b2b25d66f21 SHA512 32addb6ed8d4b78e6eb5b951de6b2390dacb3a66096ff8de6020e6d42d460e1038eec43c4057707942f8043ebcad848488d09c7aabfa4599d53782a9cc69f089 WHIRLPOOL 3b879ce376268bb65858f4c4b7193c54fc43a9903029f2000cee1a4f8739eae3ed5b2ad67c57de7ecfe3028874831796bd69a1b8a0599d9dad56f1b524302c5d DIST openvswitch-2.6.1.tar.gz 5399107 SHA256 307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 WHIRLPOOL 1ab35852ad45fc99964c814923ea54b22ec6c4630b2aa6cb6aee7b96ca806095d0be60c1b08f926419efa79a3c7ce4d484efe497bb50a9596db69b6020175092 -DIST openvswitch-2.7.0.tar.gz 6149523 SHA256 e492cf08a929b4a2178b7f9b01dc4ff562f44138b547b4e942078187b2445d2e SHA512 d0c61fa149f5279182de561ed82125e7ddd4ecd4278eba3c5e6a7221840c8cbb70581269afdf4ff2508b8e5baeb8783b1a196d6e6f747e3a21aacdf778d6d190 WHIRLPOOL 0c26e4488bfd3bea97415d9b4b00c87730bb35c2c059f3aff2fb0f7d3e34eed6308a4734ab88395dc435bd670ef584d89af9849d0cf6ea9dfe78168329e098cd DIST openvswitch-2.7.2.tar.gz 6192414 SHA256 fe36c86ed52f6f7c17b01cdbb7ae37bf521cc5c2e50997b618f3f742485f655b SHA512 790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470 WHIRLPOOL 6525d475cc10b3e32d5b9c01cbfd909dff3cfad28bbe13bf55b5775471a58fd49e9f9cf484a9e68a0f371c56824910142513c34dc5d2f11a0dcebf5b789e75d4 diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml index 75bd0ce821a..cd4755d9fd4 100644 --- a/net-misc/openvswitch/metadata.xml +++ b/net-misc/openvswitch/metadata.xml @@ -13,6 +13,5 @@ Build the Python and GUI dependent monitor applications - Use dev-python/pyside instead of dev-python/PyQt4 for Python/Qt-bindings when building with USE=monitor. diff --git a/net-misc/openvswitch/openvswitch-1.11.0.ebuild b/net-misc/openvswitch/openvswitch-1.11.0.ebuild deleted file mode 100644 index 64519609414..000 --- a/net-misc/openvswitch/openvswitch-1.11.0.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils linux-info linux-mod
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: eb68cacb5d52825fb70f585b079dfa7f227b3e5f Author: Matthew Thode gentoo org> AuthorDate: Mon Jul 24 00:12:02 2017 + Commit: Matt Thode gentoo org> CommitDate: Mon Jul 24 00:12:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb68cacb net-misc/openvswitch: 2.7.2 fast stable amd64 and x86 for bug 620258 Package-Manager: Portage-2.3.6, Repoman-2.3.3 net-misc/openvswitch/openvswitch-2.7.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.7.2.ebuild b/net-misc/openvswitch/openvswitch-2.7.2.ebuild index ee4e290d570..596a2985f9c 100644 --- a/net-misc/openvswitch/openvswitch-2.7.2.ebuild +++ b/net-misc/openvswitch/openvswitch-2.7.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://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}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 4d06b2b3c242f139841a9cb53e8bc151289667e3 Author: Alexis Ballier gentoo org> AuthorDate: Fri Jul 7 11:35:34 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Jul 7 11:35:34 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d06b2b3 net-misc/openvswitch: drop ~arm64 keywords from older revisions that have broken deps there. Package-Manager: Portage-2.3.6, Repoman-2.3.2 net-misc/openvswitch/openvswitch-2.6.1.ebuild| 2 +- net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild | 2 +- net-misc/openvswitch/openvswitch-2.7.0.ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.6.1.ebuild b/net-misc/openvswitch/openvswitch-2.6.1.ebuild index 633eafb830f..9d7d5282fc3 100644 --- a/net-misc/openvswitch/openvswitch-2.6.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="amd64 x86" IUSE="debug modules monitor +ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild index b31520aeff5..ff4706e31ab 100644 --- a/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="debug modules monitor +ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/net-misc/openvswitch/openvswitch-2.7.0.ebuild b/net-misc/openvswitch/openvswitch-2.7.0.ebuild index 8121efc668b..cdac856c6f7 100644 --- a/net-misc/openvswitch/openvswitch-2.7.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.7.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="amd64 x86" IUSE="debug modules monitor +ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/, net-misc/openvswitch/files/
commit: 2f0ef03da3f01aac834583e21ed090fcdaa20200 Author: Matthew Thode gentoo org> AuthorDate: Tue May 30 16:32:15 2017 + Commit: Matt Thode gentoo org> CommitDate: Tue May 30 16:32:15 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0ef03d net-misc/openvswitch: 2.7.0-r3 bup for CVE-2017-9214 bug 620200 Package-Manager: Portage-2.3.5, Repoman-2.3.2 net-misc/openvswitch/files/CVE-2017-9214.patch | 27 net-misc/openvswitch/openvswitch-2.7.0-r3.ebuild | 153 +++ 2 files changed, 180 insertions(+) diff --git a/net-misc/openvswitch/files/CVE-2017-9214.patch b/net-misc/openvswitch/files/CVE-2017-9214.patch new file mode 100644 index 000..33686df3acf --- /dev/null +++ b/net-misc/openvswitch/files/CVE-2017-9214.patch @@ -0,0 +1,27 @@ +Fix buffer overrread in ofputil_pull_queue_get_config_reply10() + +msg->size isn't the relevant measurement here because we're only supposed +to read 'len' bytes. Reading more than that causes 'len' to underflow to a +large number at the end of the loop. + +Reported-by: Bhargava Shastry +Signed-off-by: Ben Pfaff +--- + lib/ofp-util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ofp-util.c b/lib/ofp-util.c +index bdf89b6c3017..f05ca398c13e 100644 +--- a/lib/ofp-util.c b/lib/ofp-util.c +@@ -2610,7 +2610,7 @@ ofputil_pull_queue_get_config_reply10(struct ofpbuf *msg, + + hdr = ofpbuf_at_assert(msg, 0, sizeof *hdr); + prop_len = ntohs(hdr->len); +-if (prop_len < sizeof *hdr || prop_len > msg->size || prop_len % 8) { ++if (prop_len < sizeof *hdr || prop_len > len || prop_len % 8) { + return OFPERR_OFPBRC_BAD_LEN; + } + +-- +2.10.2 diff --git a/net-misc/openvswitch/openvswitch-2.7.0-r3.ebuild b/net-misc/openvswitch/openvswitch-2.7.0-r3.ebuild new file mode 100644 index 000..a3809b7fa0e --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.7.0-r3.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit autotools eutils linux-info linux-mod python-r1 systemd + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="http://openvswitch.org; +SRC_URI="http://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=" + || ( + >=sys-apps/openrc-0.10.5 + sys-apps/systemd + ) + ssl? ( dev-libs/openssl:0= ) + ${PYTHON_DEPS} + ~dev-python/ovs-${PV}[${PYTHON_USEDEP}] + dev-python/twisted[conch,${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 ${FILESDIR}/doc-fix.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" + kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 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 + epatch "${FILESDIR}/CVE-2017-9214.patch" + 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
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 591f2dd5b860a454ba2528adbd47318a8788110d Author: David Seifert gentoo org> AuthorDate: Sun Apr 23 20:22:17 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Apr 23 20:59:48 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591f2dd5 net-misc/openvswitch: [QA] Add missing python metadata variables Package-Manager: Portage-2.3.5, Repoman-2.3.2 net-misc/openvswitch/openvswitch-1.11.0.ebuild | 5 +++-- net-misc/openvswitch/openvswitch-2.0.0-r3.ebuild | 5 +++-- net-misc/openvswitch/openvswitch-2.1.3.ebuild| 5 +++-- net-misc/openvswitch/openvswitch-2.5.0.ebuild| 5 +++-- net-misc/openvswitch/openvswitch-2.6.1.ebuild| 1 + net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild | 1 + net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild | 1 + net-misc/openvswitch/openvswitch-2.7.0.ebuild| 1 + 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-1.11.0.ebuild b/net-misc/openvswitch/openvswitch-1.11.0.ebuild index 29082d3a317..64519609414 100644 --- a/net-misc/openvswitch/openvswitch-1.11.0.ebuild +++ b/net-misc/openvswitch/openvswitch-1.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,9 +15,10 @@ LICENSE="Apache-2.0 GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug modules monitor +pyside +ssl" +REQUIRED_USE="monitor? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=">=sys-apps/openrc-0.10.5 - ssl? ( dev-libs/openssl ) + ssl? ( dev-libs/openssl:0= ) monitor? ( ${PYTHON_DEPS} dev-python/twisted-core[${PYTHON_USEDEP}] diff --git a/net-misc/openvswitch/openvswitch-2.0.0-r3.ebuild b/net-misc/openvswitch/openvswitch-2.0.0-r3.ebuild index 87d8e4179e8..518b284b1d3 100644 --- a/net-misc/openvswitch/openvswitch-2.0.0-r3.ebuild +++ b/net-misc/openvswitch/openvswitch-2.0.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,9 +15,10 @@ LICENSE="Apache-2.0 GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug modules monitor +ssl" +REQUIRED_USE="monitor? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=">=sys-apps/openrc-0.10.5 - ssl? ( dev-libs/openssl ) + ssl? ( dev-libs/openssl:0= ) monitor? ( ${PYTHON_DEPS} dev-python/twisted-core diff --git a/net-misc/openvswitch/openvswitch-2.1.3.ebuild b/net-misc/openvswitch/openvswitch-2.1.3.ebuild index 201b5639997..2b86eb940e4 100644 --- a/net-misc/openvswitch/openvswitch-2.1.3.ebuild +++ b/net-misc/openvswitch/openvswitch-2.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,9 +15,10 @@ LICENSE="Apache-2.0 GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug modules monitor +ssl" +REQUIRED_USE="monitor? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=">=sys-apps/openrc-0.10.5 - ssl? ( dev-libs/openssl ) + ssl? ( dev-libs/openssl:0= ) monitor? ( ${PYTHON_DEPS} dev-python/twisted-core diff --git a/net-misc/openvswitch/openvswitch-2.5.0.ebuild b/net-misc/openvswitch/openvswitch-2.5.0.ebuild index a426daff267..7515af50a0e 100644 --- a/net-misc/openvswitch/openvswitch-2.5.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,13 +15,14 @@ LICENSE="Apache-2.0 GPL-2" SLOT="0" KEYWORDS="amd64 x86" IUSE="debug modules monitor +ssl" +REQUIRED_USE="monitor? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" || ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) - ssl? ( dev-libs/openssl:= ) + ssl? ( dev-libs/openssl:0= ) monitor? ( ${PYTHON_DEPS} dev-python/twisted-core diff --git a/net-misc/openvswitch/openvswitch-2.6.1.ebuild b/net-misc/openvswitch/openvswitch-2.6.1.ebuild index cca17c75d62..633eafb830f 100644 --- a/net-misc/openvswitch/openvswitch-2.6.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.1.ebuild @@ -15,6 +15,7 @@ LICENSE="Apache-2.0 GPL-2" SLOT="0" KEYWORDS="amd64 ~arm64 x86" IUSE="debug modules monitor +ssl" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" || ( diff --git a/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild index c98f3a1a510..b31520aeff5 100644 --- a/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild @@ -15,6 +15,7 @@ LICENSE="Apache-2.0 GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/, net-misc/openvswitch/
commit: 3ebea21b30582a7b11f1e17717b106ea0c660ec6 Author: Matthew Thode gentoo org> AuthorDate: Fri Apr 21 19:32:45 2017 + Commit: Matt Thode gentoo org> CommitDate: Fri Apr 21 19:32:45 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ebea21b net-misc/openvswitch: 2.7.0-r2 fixing bug 614520 Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-misc/openvswitch/files/doc-fix.patch | 16 +++ net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild | 151 +++ 2 files changed, 167 insertions(+) diff --git a/net-misc/openvswitch/files/doc-fix.patch b/net-misc/openvswitch/files/doc-fix.patch new file mode 100644 index 000..1d6df01147e --- /dev/null +++ b/net-misc/openvswitch/files/doc-fix.patch @@ -0,0 +1,16 @@ +We might want to backport this if there are any releases with the Sphinx +docs present. +--- + Documentation/conf.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Documentation/conf.py b/Documentation/conf.py +index 49514ec..97f402e 100644 +--- a/Documentation/conf.py b/Documentation/conf.py +@@ -145,8 +145,6 @@ linkcheck_anchors = False + # + if use_ovs_theme: + html_theme = 'ovs' +-else: +-html_theme = 'default' diff --git a/net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild b/net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild new file mode 100644 index 000..4bcf09a7a4f --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.7.0-r2.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit autotools eutils linux-info linux-mod python-r1 systemd + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="http://openvswitch.org; +SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="debug modules monitor +ssl" + +RDEPEND=" + || ( + >=sys-apps/openrc-0.10.5 + sys-apps/systemd + ) + ssl? ( dev-libs/openssl:0= ) + ${PYTHON_DEPS} + ~dev-python/ovs-${PV}[${PYTHON_USEDEP}] + dev-python/twisted[conch,${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 ${FILESDIR}/doc-fix.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" + kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 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_dounit "${FILESDIR}/ovsdb-server.service" +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 42520e4de1195ffeba844f51b666fb96bc234369 Author: Matthew Thode gentoo org> AuthorDate: Wed Mar 29 00:21:48 2017 + Commit: Matt Thode gentoo org> CommitDate: Wed Mar 29 00:22:32 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42520e4d net-misc/openvswitch: trying out the new twisted 2.7.0-r1 Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild | 151 +++ 1 file changed, 151 insertions(+) diff --git a/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild new file mode 100644 index 000..c98f3a1a510 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.7.0-r1.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit autotools eutils linux-info linux-mod python-r1 systemd + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="http://openvswitch.org; +SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="debug modules monitor +ssl" + +RDEPEND=" + || ( + >=sys-apps/openrc-0.10.5 + sys-apps/systemd + ) + ssl? ( dev-libs/openssl:0= ) + ${PYTHON_DEPS} + ~dev-python/ovs-${PV}[${PYTHON_USEDEP}] + dev-python/twisted[conch,${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" + kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 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_dounit "${FILESDIR}/ovsdb-server.service" + systemd_dounit "${FILESDIR}/ovs-vswitchd.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" +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 0464db224ac3bde294165ad167406bb8878a56ac Author: Matthew Thode gentoo org> AuthorDate: Wed Mar 29 00:18:30 2017 + Commit: Matt Thode gentoo org> CommitDate: Wed Mar 29 00:22:29 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0464db22 net-misc/openvswitch: 2.7.0 stable x86 and amd64 Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-misc/openvswitch/openvswitch-2.7.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.7.0.ebuild b/net-misc/openvswitch/openvswitch-2.7.0.ebuild index 39ad5813aca..694ea37e210 100644 --- a/net-misc/openvswitch/openvswitch-2.7.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.7.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://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" RDEPEND=" @@ -23,7 +23,7 @@ RDEPEND=" ) ssl? ( dev-libs/openssl:0= ) ${PYTHON_DEPS} - ~dev-python/ovs-${PV} + ~dev-python/ovs-${PV}[${PYTHON_USEDEP}] dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: ea7a3d01df95fd8e1bfd1718e318f4ec017346fd Author: Matthew Thode gentoo org> AuthorDate: Sun Mar 5 04:45:50 2017 + Commit: Matt Thode gentoo org> CommitDate: Sun Mar 5 04:45:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7a3d01 net-misc/openvswitch: 2.6.1 stable amd64 and x86 Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-misc/openvswitch/openvswitch-2.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.6.1.ebuild b/net-misc/openvswitch/openvswitch-2.6.1.ebuild index 3f00039eedf..cca17c75d62 100644 --- a/net-misc/openvswitch/openvswitch-2.6.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://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" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 0766ac4ed642a7a04ae8f50af3e8ef7e0243ff85 Author: Matthew Thode gentoo org> AuthorDate: Sun Mar 5 04:46:27 2017 + Commit: Matt Thode gentoo org> CommitDate: Sun Mar 5 04:46:27 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0766ac4e net-misc/openvswitch: cleanup Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-misc/openvswitch/Manifest| 1 - net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild | 159 - net-misc/openvswitch/openvswitch-2.6.0.ebuild| 167 --- 3 files changed, 327 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index a1ce1ccc3fd..6ab6f7f36ff 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -2,6 +2,5 @@ DIST openvswitch-1.11.0.tar.gz 2551510 SHA256 007d7d3f2deabe5a3845d1045d23b6b1de DIST openvswitch-2.0.0.tar.gz 2708774 SHA256 5060e2be69cce01c15f67b481482cb1a0eaa6ef5cbdbed592bac3c3ab2a390f8 SHA512 f6d36663b65d054d179e5a09a478cf45ae9510c8f3aa31bb2013aaee1b146ee21ce986bb8b9f63ac72036f94d0b415f30ab874451b661b855f46b44eaa42537d WHIRLPOOL be6ac428d5d01b751d8d6312e7e028a23160d44da62231cc84c21d42c19c8c5f6b9457c29c26e7b283db91b08a00d8b54368534a621e556c54e15c0682dad4a1 DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaefe73069b5699654538bf2f16ebfb1a SHA512 ede64d37f8bf4a475ab3e4a1e0cd83ae1f29df318f7834b804d9f334710ba43b25b9f562f8c7e91041e24f3121fd03e9e09fc789f398d352a2dceaa0576013dd WHIRLPOOL ddd6c1c733a7a139d58d0492ea8c0efa40065443f763faffd5964e5578acfe9b02ec1dd009c52843759d8a93027eb89412e768ca3e70d9ceeb0d030e791a9b7e DIST openvswitch-2.5.0.tar.gz 4603077 SHA256 34da54fbad503205b1a66b48ca4312679e1ce5b04763a9fb86050b2b25d66f21 SHA512 32addb6ed8d4b78e6eb5b951de6b2390dacb3a66096ff8de6020e6d42d460e1038eec43c4057707942f8043ebcad848488d09c7aabfa4599d53782a9cc69f089 WHIRLPOOL 3b879ce376268bb65858f4c4b7193c54fc43a9903029f2000cee1a4f8739eae3ed5b2ad67c57de7ecfe3028874831796bd69a1b8a0599d9dad56f1b524302c5d -DIST openvswitch-2.6.0.tar.gz 5386102 SHA256 c6f86b47b5847e739ca1c5a80059a804cd49e2b98eefef0fdbce1c4d93c7d0f1 SHA512 7bcf02a00b94924e7931642790f40a49b86338baa63405e9454bff20b82d5a53bbc43279c223946f082d050c73ce6caedcb8a1e52979c873262bc9e8ff84b42d WHIRLPOOL d275071d3491167d3672966381403e704580797eb53fb8d8da2de3c08efd614a709d70af256172670271601d8d90a1350f1c2fae0e9236f729b6c278d5038513 DIST openvswitch-2.6.1.tar.gz 5399107 SHA256 307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 WHIRLPOOL 1ab35852ad45fc99964c814923ea54b22ec6c4630b2aa6cb6aee7b96ca806095d0be60c1b08f926419efa79a3c7ce4d484efe497bb50a9596db69b6020175092 DIST openvswitch-2.7.0.tar.gz 6149523 SHA256 e492cf08a929b4a2178b7f9b01dc4ff562f44138b547b4e942078187b2445d2e SHA512 d0c61fa149f5279182de561ed82125e7ddd4ecd4278eba3c5e6a7221840c8cbb70581269afdf4ff2508b8e5baeb8783b1a196d6e6f747e3a21aacdf778d6d190 WHIRLPOOL 0c26e4488bfd3bea97415d9b4b00c87730bb35c2c059f3aff2fb0f7d3e34eed6308a4734ab88395dc435bd670ef584d89af9849d0cf6ea9dfe78168329e098cd diff --git a/net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild b/net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild deleted file mode 100644 index 62695c1b994..000 --- a/net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit autotools eutils linux-info linux-mod python-r1 systemd - -DESCRIPTION="Production quality, multilayer virtual switch" -HOMEPAGE="http://openvswitch.org; -SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug modules monitor +ssl" - -RDEPEND=" - || ( - >=sys-apps/openrc-0.10.5 - sys-apps/systemd - ) - ssl? ( dev-libs/openssl:0= ) - ${PYTHON_DEPS} - ~dev-python/ovs-${PV} - dev-python/twisted-core - dev-python/twisted-conch - dev-python/twisted-web - dev-python/PyQt4[${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" - kernel_is le 4 7 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" -
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 323451a495863127d1b5e542310d114e070dcb0b Author: Matthew Thode gentoo org> AuthorDate: Sun Mar 5 04:40:53 2017 + Commit: Matt Thode gentoo org> CommitDate: Sun Mar 5 04:41:21 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=323451a4 net-misc/openvswitch: bup Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.7.0.ebuild | 153 ++ 2 files changed, 154 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 27b53e07ab0..a1ce1ccc3fd 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -4,3 +4,4 @@ DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaef DIST openvswitch-2.5.0.tar.gz 4603077 SHA256 34da54fbad503205b1a66b48ca4312679e1ce5b04763a9fb86050b2b25d66f21 SHA512 32addb6ed8d4b78e6eb5b951de6b2390dacb3a66096ff8de6020e6d42d460e1038eec43c4057707942f8043ebcad848488d09c7aabfa4599d53782a9cc69f089 WHIRLPOOL 3b879ce376268bb65858f4c4b7193c54fc43a9903029f2000cee1a4f8739eae3ed5b2ad67c57de7ecfe3028874831796bd69a1b8a0599d9dad56f1b524302c5d DIST openvswitch-2.6.0.tar.gz 5386102 SHA256 c6f86b47b5847e739ca1c5a80059a804cd49e2b98eefef0fdbce1c4d93c7d0f1 SHA512 7bcf02a00b94924e7931642790f40a49b86338baa63405e9454bff20b82d5a53bbc43279c223946f082d050c73ce6caedcb8a1e52979c873262bc9e8ff84b42d WHIRLPOOL d275071d3491167d3672966381403e704580797eb53fb8d8da2de3c08efd614a709d70af256172670271601d8d90a1350f1c2fae0e9236f729b6c278d5038513 DIST openvswitch-2.6.1.tar.gz 5399107 SHA256 307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 WHIRLPOOL 1ab35852ad45fc99964c814923ea54b22ec6c4630b2aa6cb6aee7b96ca806095d0be60c1b08f926419efa79a3c7ce4d484efe497bb50a9596db69b6020175092 +DIST openvswitch-2.7.0.tar.gz 6149523 SHA256 e492cf08a929b4a2178b7f9b01dc4ff562f44138b547b4e942078187b2445d2e SHA512 d0c61fa149f5279182de561ed82125e7ddd4ecd4278eba3c5e6a7221840c8cbb70581269afdf4ff2508b8e5baeb8783b1a196d6e6f747e3a21aacdf778d6d190 WHIRLPOOL 0c26e4488bfd3bea97415d9b4b00c87730bb35c2c059f3aff2fb0f7d3e34eed6308a4734ab88395dc435bd670ef584d89af9849d0cf6ea9dfe78168329e098cd diff --git a/net-misc/openvswitch/openvswitch-2.7.0.ebuild b/net-misc/openvswitch/openvswitch-2.7.0.ebuild new file mode 100644 index 000..39ad5813aca --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.7.0.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit autotools eutils linux-info linux-mod python-r1 systemd + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="http://openvswitch.org; +SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="debug modules monitor +ssl" + +RDEPEND=" + || ( + >=sys-apps/openrc-0.10.5 + sys-apps/systemd + ) + ssl? ( dev-libs/openssl:0= ) + ${PYTHON_DEPS} + ~dev-python/ovs-${PV} + dev-python/twisted-core + dev-python/twisted-conch + dev-python/twisted-web + 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" + kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 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 \ +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 45d8bc74c5c8b75d84fe18177ec96d019e389ac8 Author: Sven Wegener gentoo org> AuthorDate: Fri Jan 20 10:33:53 2017 + Commit: Sven Wegener gentoo org> CommitDate: Fri Jan 20 10:34:14 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d8bc74 net-misc/openvswitch: Remove PyQt4 dependency The monitor application which used it has been removed. Package-Manager: Portage-2.3.0, Repoman-2.3.1 net-misc/openvswitch/openvswitch-2.6.1.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.6.1.ebuild b/net-misc/openvswitch/openvswitch-2.6.1.ebuild index 2276a70..46f9a79 100644 --- a/net-misc/openvswitch/openvswitch-2.6.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.1.ebuild @@ -28,7 +28,6 @@ RDEPEND=" dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web - dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] debug? ( dev-lang/perl )" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 302b33c2b83c5e263d5f4fb564bdb5397b73daae Author: Matthew Thode gentoo org> AuthorDate: Sun Jan 8 22:33:22 2017 + Commit: Matt Thode gentoo org> CommitDate: Sun Jan 8 22:33:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302b33c2 net-misc/openvswitch: bup Package-Manager: portage-2.3.0 net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.6.1.ebuild | 160 ++ 2 files changed, 161 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index efed71d..27b53e0 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -3,3 +3,4 @@ DIST openvswitch-2.0.0.tar.gz 2708774 SHA256 5060e2be69cce01c15f67b481482cb1a0ea DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaefe73069b5699654538bf2f16ebfb1a SHA512 ede64d37f8bf4a475ab3e4a1e0cd83ae1f29df318f7834b804d9f334710ba43b25b9f562f8c7e91041e24f3121fd03e9e09fc789f398d352a2dceaa0576013dd WHIRLPOOL ddd6c1c733a7a139d58d0492ea8c0efa40065443f763faffd5964e5578acfe9b02ec1dd009c52843759d8a93027eb89412e768ca3e70d9ceeb0d030e791a9b7e DIST openvswitch-2.5.0.tar.gz 4603077 SHA256 34da54fbad503205b1a66b48ca4312679e1ce5b04763a9fb86050b2b25d66f21 SHA512 32addb6ed8d4b78e6eb5b951de6b2390dacb3a66096ff8de6020e6d42d460e1038eec43c4057707942f8043ebcad848488d09c7aabfa4599d53782a9cc69f089 WHIRLPOOL 3b879ce376268bb65858f4c4b7193c54fc43a9903029f2000cee1a4f8739eae3ed5b2ad67c57de7ecfe3028874831796bd69a1b8a0599d9dad56f1b524302c5d DIST openvswitch-2.6.0.tar.gz 5386102 SHA256 c6f86b47b5847e739ca1c5a80059a804cd49e2b98eefef0fdbce1c4d93c7d0f1 SHA512 7bcf02a00b94924e7931642790f40a49b86338baa63405e9454bff20b82d5a53bbc43279c223946f082d050c73ce6caedcb8a1e52979c873262bc9e8ff84b42d WHIRLPOOL d275071d3491167d3672966381403e704580797eb53fb8d8da2de3c08efd614a709d70af256172670271601d8d90a1350f1c2fae0e9236f729b6c278d5038513 +DIST openvswitch-2.6.1.tar.gz 5399107 SHA256 307b20aba6a179bf13e5da9ac242933c31349073762473a9d4782619c8c1cf0c SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39 WHIRLPOOL 1ab35852ad45fc99964c814923ea54b22ec6c4630b2aa6cb6aee7b96ca806095d0be60c1b08f926419efa79a3c7ce4d484efe497bb50a9596db69b6020175092 diff --git a/net-misc/openvswitch/openvswitch-2.6.1.ebuild b/net-misc/openvswitch/openvswitch-2.6.1.ebuild new file mode 100644 index ..2276a70 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.6.1.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit autotools eutils linux-info linux-mod python-r1 systemd + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="http://openvswitch.org; +SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="debug modules monitor +ssl" + +RDEPEND=" + || ( + >=sys-apps/openrc-0.10.5 + sys-apps/systemd + ) + ssl? ( dev-libs/openssl:0= ) + ${PYTHON_DEPS} + ~dev-python/ovs-${PV} + dev-python/twisted-core + dev-python/twisted-conch + dev-python/twisted-web + dev-python/PyQt4[${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" + kernel_is le 4 7 999 || die "Linux >= 3.10.0 and <= 4.8 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 ist 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 \ +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/files/
commit: 4da1a5e2b8c81ad3f9cdafd02957f1f522211152 Author: Geaaru gmail com> AuthorDate: Sun Dec 18 18:36:30 2016 + Commit: Matt Thode gentoo org> CommitDate: Sun Dec 18 19:03:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da1a5e2 net-misc/openvswitch: fix ovs-vswitchd.service Package-Manager: portage-2.3.0 Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/files/ovs-vswitchd.service | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net-misc/openvswitch/files/ovs-vswitchd.service b/net-misc/openvswitch/files/ovs-vswitchd.service index 266bb0a..a573a50 100644 --- a/net-misc/openvswitch/files/ovs-vswitchd.service +++ b/net-misc/openvswitch/files/ovs-vswitchd.service @@ -7,7 +7,9 @@ Requires=ovsdb-server.service After=ovsdb-server.service [Service] -ExecStart=/usr/sbin/ovs-vswitchd --mlockall --monitor unix:/var/run/openvswitch/db.sock +# --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
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: dd9bc23a6329ea992e8b786074fa39dfe7c8a874 Author: Justin Lecher gentoo org> AuthorDate: Sat Dec 3 20:18:13 2016 + Commit: Justin Lecher gentoo org> CommitDate: Sat Dec 3 21:34:05 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9bc23a net-misc/openvswitch: Use external python package Package-Manager: portage-2.3.2 Signed-off-by: Justin Lecher gentoo.org> ...penvswitch-2.6.0-r1.ebuild => openvswitch-2.6.0-r2.ebuild} | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild similarity index 94% rename from net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild rename to net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild index 93a0483..56cef67 100644 --- a/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.0-r2.ebuild @@ -24,6 +24,7 @@ RDEPEND=" ) ssl? ( dev-libs/openssl:0= ) ${PYTHON_DEPS} + ~dev-python/ovs-${PV} dev-python/twisted-core dev-python/twisted-conch dev-python/twisted-web @@ -94,15 +95,9 @@ src_install() { python_foreach_impl python_doscript utilities/"${SCRIPT}" done - # monitor is statically enabled for bug 596206 - #if use monitor ; then - python_install() { - python_domodule "${ED%/}"/usr/share/openvswitch/python/* - python_optimize "${ED%/}"/usr/share/ovsdbmonitor - } - python_foreach_impl python_install + python_foreach_impl python_optimize "${ED%/}"/usr/share/ovsdbmonitor + rm -r "${ED%/}"/usr/share/openvswitch/python || die - #fi keepdir /var/{lib,log}/openvswitch keepdir /etc/ssl/openvswitch
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: c14d32c0676b713d8730c2e356e7a9bb74ad242f Author: Justin Lecher gentoo org> AuthorDate: Sat Dec 3 19:11:18 2016 + Commit: Justin Lecher gentoo org> CommitDate: Sat Dec 3 19:11:35 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14d32c0 net-misc/openvswitch: Fix python shebangs Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=599368 Package-Manager: portage-2.3.2 Signed-off-by: Justin Lecher gentoo.org> net-misc/openvswitch/metadata.xml| 28 net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild | 3 ++- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml index f20e0a0..75bd0ce 100644 --- a/net-misc/openvswitch/metadata.xml +++ b/net-misc/openvswitch/metadata.xml @@ -1,18 +1,18 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -dev-z...@gentoo.org - - -prometheanf...@gentoo.org - - - virtualizat...@gentoo.org - Gentoo Virtualization Project - - - Build the Python and GUI dependent monitor applications - Use dev-python/pyside instead of dev-python/PyQt4 for Python/Qt-bindings when building with USE=monitor. - + + dev-z...@gentoo.org + + + prometheanf...@gentoo.org + + + virtualizat...@gentoo.org + Gentoo Virtualization Project + + + Build the Python and GUI dependent monitor applications + Use dev-python/pyside instead of dev-python/PyQt4 for Python/Qt-bindings when building with USE=monitor. + diff --git a/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild index 4c6000a..93a0483 100644 --- a/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild @@ -90,7 +90,8 @@ src_install() { local SCRIPT for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do - python_replicate_script utilities/"${SCRIPT}" + sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" || die + python_foreach_impl python_doscript utilities/"${SCRIPT}" done # monitor is statically enabled for bug 596206
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: a65fdf6ece6cdae34fe29c76dc9d356e172f4a31 Author: Matthew Thode gentoo org> AuthorDate: Thu Nov 10 21:23:21 2016 + Commit: Matt Thode gentoo org> CommitDate: Thu Nov 10 21:26:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a65fdf6e net-misc/openvswitch: fix build errors Package-Manager: portage-2.3.0 net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild | 7 --- 1 file changed, 7 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild index 71a7445..4c6000a 100644 --- a/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild @@ -103,10 +103,6 @@ src_install() { rm -r "${ED%/}"/usr/share/openvswitch/python || die #fi - # not working without the brcompat_mod kernel module which did not get - # included in the kernel and we can't build it anymore - rm "${ED%/}"/usr/sbin/ovs-brcompatd "${ED%/}"/usr/share/man/man8/ovs-brcompatd.8 || die - keepdir /var/{lib,log}/openvswitch keepdir /etc/ssl/openvswitch fperms 0750 /etc/ssl/openvswitch @@ -116,9 +112,6 @@ src_install() { #if ! use monitor ; then # rm -r "${ED%/}"/usr/share/ovsdbmonitor || die #fi - if ! use debug ; then - rm "${ED%/}"/usr/bin/ovs-parse-leaks || die - fi newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 71dba8c9320485eb906376185bf1458948b0a8e6 Author: Matthew Thode gentoo org> AuthorDate: Wed Nov 9 22:24:49 2016 + Commit: Matt Thode gentoo org> CommitDate: Wed Nov 9 22:24:49 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71dba8c9 net-misc/openvswitch: workaround for bug 596206 Package-Manager: portage-2.3.0 net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild | 171 +++ 1 file changed, 171 insertions(+) diff --git a/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild new file mode 100644 index ..71a7445 --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.6.0-r1.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit autotools eutils linux-info linux-mod python-r1 systemd + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="http://openvswitch.org; +SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="debug modules monitor +ssl" + +RDEPEND=" + || ( + >=sys-apps/openrc-0.10.5 + sys-apps/systemd + ) + ssl? ( dev-libs/openssl:0= ) + ${PYTHON_DEPS} + dev-python/twisted-core + dev-python/twisted-conch + dev-python/twisted-web + dev-python/PyQt4[${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" + kernel_is le 4 7 999 || die "Linux >= 3.10.0 and <= 4.8 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 ist 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 + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do + python_replicate_script utilities/"${SCRIPT}" + done + + # monitor is statically enabled for bug 596206 + #if use monitor ; then + python_install() { + python_domodule "${ED%/}"/usr/share/openvswitch/python/* + python_optimize "${ED%/}"/usr/share/ovsdbmonitor + } + python_foreach_impl python_install + rm -r "${ED%/}"/usr/share/openvswitch/python || die + #fi + + # not working without the brcompat_mod kernel module which did not get + # included in the kernel and we can't build it anymore + rm "${ED%/}"/usr/sbin/ovs-brcompatd "${ED%/}"/usr/share/man/man8/ovs-brcompatd.8 || die + + keepdir /var/{lib,log}/openvswitch + keepdir /etc/ssl/openvswitch + fperms 0750 /etc/ssl/openvswitch + + rm -rf "${ED%/}"/var/run || die + # monitor is statically enabled for bug 596206 + #if ! use monitor ; then + # rm -r "${ED%/}"/usr/share/ovsdbmonitor || die + #fi + if ! use debug ; then + rm "${ED%/}"/usr/bin/ovs-parse-leaks || die + fi + + 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_dounit "${FILESDIR}/ovsdb-server.service" + systemd_dounit "${FILESDIR}/ovs-vswitchd.service" + systemd_newtmpfilesd
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: f41d199cc9faa7b31dd2120d8aec40738df01144 Author: David Seifert gentoo org> AuthorDate: Wed Oct 5 16:56:26 2016 + Commit: David Seifert gentoo org> CommitDate: Wed Oct 5 16:56:44 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f41d199c net-misc/openvswitch: Fix minor QA issues Package-Manager: portage-2.3.1 net-misc/openvswitch/openvswitch-2.6.0.ebuild | 32 --- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.6.0.ebuild b/net-misc/openvswitch/openvswitch-2.6.0.ebuild index 72b..915acb9 100644 --- a/net-misc/openvswitch/openvswitch-2.6.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.0.ebuild @@ -4,9 +4,9 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -inherit eutils linux-info linux-mod python-r1 systemd autotools +inherit autotools eutils linux-info linux-mod python-r1 systemd DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="http://openvswitch.org; @@ -22,7 +22,7 @@ RDEPEND=" >=sys-apps/openrc-0.10.5 sys-apps/systemd ) - ssl? ( dev-libs/openssl:0 ) + ssl? ( dev-libs/openssl:0= ) monitor? ( ${PYTHON_DEPS} dev-python/twisted-core @@ -60,6 +60,7 @@ src_prepare() { eautoreconf default } + src_configure() { set_arch_to_kernel use monitor || export ovs_cv_python="no" @@ -86,32 +87,34 @@ src_compile() { src_install() { default + + local SCRIPT for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do python_replicate_script utilities/"${SCRIPT}" done if use monitor ; then python_install() { - python_domodule "${ED}"usr/share/openvswitch/python/* - python_optimize "${ED}usr/share/ovsdbmonitor" + python_domodule "${ED%/}"/usr/share/openvswitch/python/* + python_optimize "${ED%/}"/usr/share/ovsdbmonitor } python_foreach_impl python_install - rm -r "${ED}usr/share/openvswitch/python" || die "rm failed" + rm -r "${ED%/}"/usr/share/openvswitch/python || die fi # not working without the brcompat_mod kernel module which did not get # included in the kernel and we can't build it anymore - rm "${ED}usr/sbin/ovs-brcompatd" "${ED}usr/share/man/man8/ovs-brcompatd.8" + rm "${ED%/}"/usr/sbin/ovs-brcompatd "${ED%/}"/usr/share/man/man8/ovs-brcompatd.8 || die keepdir /var/{lib,log}/openvswitch keepdir /etc/ssl/openvswitch fperms 0750 /etc/ssl/openvswitch - rm -rf "${ED}var/run" || die "rm failed" + rm -rf "${ED%/}"/var/run || die if ! use monitor ; then - rmdir "${ED}usr/share/ovsdbmonitor" || die "rm failed" + rm -r "${ED%/}"/usr/share/ovsdbmonitor || die fi if ! use debug ; then - rm "${ED}usr/bin/ovs-parse-leaks" die "rm failed" + rm "${ED%/}"/usr/bin/ovs-parse-leaks || die fi newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server @@ -132,6 +135,7 @@ 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" @@ -150,13 +154,15 @@ pkg_postinst() { } pkg_config() { - local db="${EPREFIX}/var/lib/openvswitch/conf.db" + 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)" - "${EPREFIX}/usr/bin/ovsdb-tool" convert "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "converting database failed" + ovsdb-tool convert "${db}" \ + "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" else einfo "Creating new database '${db}'..." - "${EPREFIX}/usr/bin/ovsdb-tool" create "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "creating database failed" + ovsdb-tool create "${db}" \ + "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" fi }
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 92b8c417d8bbeb6b531cb1cfd08ac6fc79aa40d5 Author: Matthew Thode gentoo org> AuthorDate: Wed Oct 5 13:22:53 2016 + Commit: Matt Thode gentoo org> CommitDate: Wed Oct 5 13:22:53 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92b8c417 net-misc/openvswitch: fixing it for the last time I hope Package-Manager: portage-2.3.0 net-misc/openvswitch/openvswitch-2.6.0.ebuild | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.6.0.ebuild b/net-misc/openvswitch/openvswitch-2.6.0.ebuild index b2c629c..72b 100644 --- a/net-misc/openvswitch/openvswitch-2.6.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.0.ebuild @@ -107,8 +107,12 @@ src_install() { fperms 0750 /etc/ssl/openvswitch rm -rf "${ED}var/run" || die "rm failed" - ! use monitor && rmdir "${ED}usr/share/ovsdbmonitor" || die "rm failed" - ! use debug && rm "${ED}usr/bin/ovs-parse-leaks" die "rm failed" + if ! use monitor ; then + rmdir "${ED}usr/share/ovsdbmonitor" || die "rm failed" + fi + if ! use debug ; then + rm "${ED}usr/bin/ovs-parse-leaks" die "rm failed" + fi newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 04532e97c67d089ffda10c6f77859b3ad2416649 Author: Matthew Thode gentoo org> AuthorDate: Wed Oct 5 00:16:34 2016 + Commit: Matt Thode gentoo org> CommitDate: Wed Oct 5 00:16:34 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04532e97 net-misc/openvswitch: fixing bunch of small things Package-Manager: portage-2.3.0 net-misc/openvswitch/openvswitch-2.6.0.ebuild | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.6.0.ebuild b/net-misc/openvswitch/openvswitch-2.6.0.ebuild index e757a24..b2c629c 100644 --- a/net-misc/openvswitch/openvswitch-2.6.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.0.ebuild @@ -22,7 +22,7 @@ RDEPEND=" >=sys-apps/openrc-0.10.5 sys-apps/systemd ) - ssl? ( dev-libs/openssl:= ) + ssl? ( dev-libs/openssl:0 ) monitor? ( ${PYTHON_DEPS} dev-python/twisted-core @@ -34,6 +34,8 @@ RDEPEND=" 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" @@ -55,7 +57,6 @@ src_prepare() { sed -i \ -e '/^SUBDIRS/d' \ datapath/Makefile.in || die "sed failed" - epatch "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" eautoreconf default } @@ -91,23 +92,23 @@ src_install() { if use monitor ; then python_install() { - python_domodule "${ED}"/usr/share/openvswitch/python/* - python_optimize "${ED}/usr/share/ovsdbmonitor" + python_domodule "${ED}"usr/share/openvswitch/python/* + python_optimize "${ED}usr/share/ovsdbmonitor" } python_foreach_impl python_install - rm -r "${ED}/usr/share/openvswitch/python" + rm -r "${ED}usr/share/openvswitch/python" || die "rm failed" fi # not working without the brcompat_mod kernel module which did not get # included in the kernel and we can't build it anymore - rm "${D}/usr/sbin/ovs-brcompatd" "${D}/usr/share/man/man8/ovs-brcompatd.8" + rm "${ED}usr/sbin/ovs-brcompatd" "${ED}usr/share/man/man8/ovs-brcompatd.8" keepdir /var/{lib,log}/openvswitch keepdir /etc/ssl/openvswitch fperms 0750 /etc/ssl/openvswitch - rm -rf "${ED}/var/run" - use monitor || rmdir "${ED}/usr/share/ovsdbmonitor" - use debug || rm "${ED}/usr/bin/ovs-parse-leaks" + rm -rf "${ED}var/run" || die "rm failed" + ! use monitor && rmdir "${ED}usr/share/ovsdbmonitor" || die "rm failed" + ! use debug && rm "${ED}usr/bin/ovs-parse-leaks" die "rm failed" newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd @@ -146,7 +147,7 @@ pkg_postinst() { pkg_config() { local db="${EPREFIX}/var/lib/openvswitch/conf.db" - if [ -e "${db}" ] ; then + 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)" "${EPREFIX}/usr/bin/ovsdb-tool" convert "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "converting database failed"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: c1f2a1cdabfbcc0d301fe56a03022619d691e0cc Author: Matthew Thode gentoo org> AuthorDate: Tue Oct 4 20:18:46 2016 + Commit: Matt Thode gentoo org> CommitDate: Tue Oct 4 20:19:06 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f2a1cd net-misc/openvswitch: fixing install when using monitor Package-Manager: portage-2.3.0 net-misc/openvswitch/openvswitch-2.6.0.ebuild | 23 +-- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.6.0.ebuild b/net-misc/openvswitch/openvswitch-2.6.0.ebuild index b80877a..e757a24 100644 --- a/net-misc/openvswitch/openvswitch-2.6.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.0.ebuild @@ -48,7 +48,6 @@ pkg_setup() { CONFIG_CHECK+=" ~OPENVSWITCH" linux-info_pkg_setup fi - use monitor && python-r1_pkg_setup } src_prepare() { @@ -69,7 +68,7 @@ src_configure() { local linux_config use modules && linux_config="--with-linux=${KV_OUT_DIR}" - PYTHON=python2.7 econf ${linux_config} \ + econf ${linux_config} \ --with-rundir=/var/run/openvswitch \ --with-logdir=/var/log/openvswitch \ --with-pkidir=/etc/ssl/openvswitch \ @@ -81,26 +80,22 @@ src_configure() { src_compile() { default -# use monitor && python_fix_shebang \ -# utilities/ovs-{pcap,tcpundump,test,vlan-test} \ -# utilities/bugtool/ovs-bugtool - if use monitor; then - sed -i \ - 's/^#\!\ python2\.7/#\!\/usr\/bin\/env\ python2\.7/' \ - utilities/ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} \ - utilities/bugtool/ovs-bugtool || die "sed died :(" - fi - use modules && linux-mod_src_compile } src_install() { default + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do + python_replicate_script utilities/"${SCRIPT}" + done if use monitor ; then - python_domodule "${ED}"/usr/share/openvswitch/python/* + python_install() { + python_domodule "${ED}"/usr/share/openvswitch/python/* + python_optimize "${ED}/usr/share/ovsdbmonitor" + } + python_foreach_impl python_install rm -r "${ED}/usr/share/openvswitch/python" - python_optimize "${ED}/usr/share/ovsdbmonitor" fi # not working without the brcompat_mod kernel module which did not get # included in the kernel and we can't build it anymore
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 37fb95c25a631c9b1ce53f9a1ec4ccbd553c05f2 Author: Geaaru gmail com> AuthorDate: Fri Aug 5 14:25:44 2016 + Commit: Matt Thode gentoo org> CommitDate: Tue Aug 9 19:25:35 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37fb95c2 net-misc/openvswitch: Fix deps for pure systemd env. Signed-off-by: Matthew Thode gentoo.org> net-misc/openvswitch/openvswitch-2.5.0.ebuild | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.5.0.ebuild b/net-misc/openvswitch/openvswitch-2.5.0.ebuild index 111e873..e1a284c 100644 --- a/net-misc/openvswitch/openvswitch-2.5.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.5.0.ebuild @@ -17,7 +17,11 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="debug modules monitor +ssl" -RDEPEND=">=sys-apps/openrc-0.10.5 +RDEPEND=" + || ( + >=sys-apps/openrc-0.10.5 + sys-apps/systemd + ) ssl? ( dev-libs/openssl:= ) monitor? ( ${PYTHON_DEPS}
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: cf2d8383afcb13199e0835dc0e3b20c8bb4696e2 Author: Matthew Thode gentoo org> AuthorDate: Fri Jun 3 23:49:48 2016 + Commit: Matt Thode gentoo org> CommitDate: Fri Jun 3 23:51:10 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf2d8383 net-misc/openvswitch: fixing kernel dep for bug 584396 Package-Manager: portage-2.2.28 net-misc/openvswitch/openvswitch-2.5.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.5.0.ebuild b/net-misc/openvswitch/openvswitch-2.5.0.ebuild index ee03259..111e873 100644 --- a/net-misc/openvswitch/openvswitch-2.5.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.5.0.ebuild @@ -37,8 +37,8 @@ BUILD_TARGETS="all" pkg_setup() { if use modules ; then CONFIG_CHECK+=" ~!OPENVSWITCH" - kernel_is ge 2 6 32 || die "Linux >= 2.6.32 and <= 4.0 required for userspace modules" - kernel_is le 4 0 || die "Linux >= 2.6.32 and <= 4.0 required for userspace modules" + kernel_is ge 2 6 32 || die "Linux >= 2.6.32 and <= 4.3 required for userspace modules" + kernel_is le 4 3 999 || die "Linux >= 2.6.32 and <= 4.3 required for userspace modules" linux-mod_pkg_setup else CONFIG_CHECK+=" ~OPENVSWITCH"
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: a77ab25e14daee99cc82caac21ddae361b34bd4c Author: Matthew Thode gentoo org> AuthorDate: Wed Mar 16 18:07:35 2016 + Commit: Matt Thode gentoo org> CommitDate: Wed Mar 16 18:07:35 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a77ab25e net-misc/openvswitch: remove old badness bug 577568 Package-Manager: portage-2.2.26 net-misc/openvswitch/Manifest | 4 - net-misc/openvswitch/openvswitch-2.3.0.ebuild | 151 - net-misc/openvswitch/openvswitch-2.3.1.ebuild | 157 -- net-misc/openvswitch/openvswitch-2.3.2.ebuild | 157 -- net-misc/openvswitch/openvswitch-2.4.0.ebuild | 157 -- 5 files changed, 626 deletions(-) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index a192ce7..0f04292 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,8 +1,4 @@ DIST openvswitch-1.11.0.tar.gz 2551510 SHA256 007d7d3f2deabe5a3845d1045d23b6b1de174497a8e436091541221dd71833da SHA512 9c338a9e376c845ae5f273030263dbae52fa268350d943e65987d6840d9647194f715e36517c829be32200f1064e13a585bd5b2acb9fa2a7f32199bd4be31459 WHIRLPOOL fa7bc71f0f17f789ed0dc1dce953e1399f56c7529d13a10761f90a3b40a210e511722dda99a502fa2ef8f74ccc6ea5e8c3392c408bf00a85b5824bfa96fc7f24 DIST openvswitch-2.0.0.tar.gz 2708774 SHA256 5060e2be69cce01c15f67b481482cb1a0eaa6ef5cbdbed592bac3c3ab2a390f8 SHA512 f6d36663b65d054d179e5a09a478cf45ae9510c8f3aa31bb2013aaee1b146ee21ce986bb8b9f63ac72036f94d0b415f30ab874451b661b855f46b44eaa42537d WHIRLPOOL be6ac428d5d01b751d8d6312e7e028a23160d44da62231cc84c21d42c19c8c5f6b9457c29c26e7b283db91b08a00d8b54368534a621e556c54e15c0682dad4a1 DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaefe73069b5699654538bf2f16ebfb1a SHA512 ede64d37f8bf4a475ab3e4a1e0cd83ae1f29df318f7834b804d9f334710ba43b25b9f562f8c7e91041e24f3121fd03e9e09fc789f398d352a2dceaa0576013dd WHIRLPOOL ddd6c1c733a7a139d58d0492ea8c0efa40065443f763faffd5964e5578acfe9b02ec1dd009c52843759d8a93027eb89412e768ca3e70d9ceeb0d030e791a9b7e -DIST openvswitch-2.3.0.tar.gz 3259225 SHA256 011052645cd4c7afee2732e87d45e589a0540ac7b7523027d3be2d7c7db7c899 SHA512 f3a665bc84d8a6e282928db61ae648a826f273e44e34311a60e6f0e74a6ab10c8410cb374f0ce80abe7c58b9559a97388cdbfe2ef28ac4bedd2f5e52b3cd6ed1 WHIRLPOOL 0fc743b7d12c2ab9c6bea58ec3b80d7633f860c720acb2b61306ff5035d4f3bfeddf7b9bab44a21a1b7fb62c0c3828c2aaf7e9b9167a67ee2def065248ef329c -DIST openvswitch-2.3.1.tar.gz 3266916 SHA256 21174901c311d54703b4a7f498be0c42e5d2cc68bdecb0090dbb555e2af4bcd2 SHA512 8ef4ca61b06a16b361436130bda3b119e4067e78837908fa1d509c3706bc0fe8cc8eb92c76fe439625aa6732a49cbbc6f26898f965b1bbb8b4062e21bcd2edf9 WHIRLPOOL 7556342957b8bb58667161fad37e544896a3b299384688f9edb8aa8675d7be613e6ea41bd0721f60736e52d157689a4f7e27efdd8d77e811073f6d0a9dc110b7 -DIST openvswitch-2.3.2.tar.gz 3277164 SHA256 386b11df94d06c68d391ee4091832360095bd3a14c72d454325fab284dad9887 SHA512 dfbd9d5b16aeecdc880efb910e0ec2e474dcc02515f0033b1e9466735387b39f2855bec49936a261aea66badb35e09598dbb9fc4b506e9a9e0c18d3441fea691 WHIRLPOOL ca3e767383ff4cc7527e037472ea3b98b7e36fcdc1b936919cc68c9d28b382264b6e485726e4ec266619656013c5b4e09d55a7808a8399f15246b67f264c5ff8 -DIST openvswitch-2.4.0.tar.gz 4182154 SHA256 424c5a8dea1c5b153e8c1803bb041d0495e81379fb6f386dd58ee903a7681b9a SHA512 bd66bcb37beacb0d684001609c26d9dc487efde0ecb051004813b0f8a5999039207b012617195d82d56aefe9a1756615e2158e531a71e9b1e5e10345f0370bae WHIRLPOOL 9efc94031279679611bd4a69079e452b3b0055bb96a0337851cce925d8ba1019887b747594263d2dd2a866c98c45b65b274db22d7949b6bf1edd9bc0ec17048a DIST openvswitch-2.5.0.tar.gz 4603077 SHA256 34da54fbad503205b1a66b48ca4312679e1ce5b04763a9fb86050b2b25d66f21 SHA512 32addb6ed8d4b78e6eb5b951de6b2390dacb3a66096ff8de6020e6d42d460e1038eec43c4057707942f8043ebcad848488d09c7aabfa4599d53782a9cc69f089 WHIRLPOOL 3b879ce376268bb65858f4c4b7193c54fc43a9903029f2000cee1a4f8739eae3ed5b2ad67c57de7ecfe3028874831796bd69a1b8a0599d9dad56f1b524302c5d diff --git a/net-misc/openvswitch/openvswitch-2.3.0.ebuild b/net-misc/openvswitch/openvswitch-2.3.0.ebuild deleted file mode 100644 index 676a807..000 --- a/net-misc/openvswitch/openvswitch-2.3.0.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils linux-info linux-mod python-single-r1 systemd autotools - -DESCRIPTION="Production quality, multilayer virtual switch" -HOMEPAGE="http://openvswitch.org; -SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug modules monitor +ssl" - -RDEPEND=">=sys-apps/openrc-0.10.5 - ssl? ( dev-libs/openssl ) - monitor? ( - ${PYTHON_DEPS} - dev-python/twisted-core -
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 802136789641c7072f64a0cad51bd6042a071f23 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Mar 16 18:04:03 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Mar 16 18:04:03 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80213678 net-misc/openvswitch: x86 stable wrt bug #577568 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> net-misc/openvswitch/openvswitch-2.5.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.5.0.ebuild b/net-misc/openvswitch/openvswitch-2.5.0.ebuild index aa6e385..ee03259 100644 --- a/net-misc/openvswitch/openvswitch-2.5.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.5.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug modules monitor +ssl" RDEPEND=">=sys-apps/openrc-0.10.5
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 1b3b1266da37e9d324fcd35711854e4cf2fbb70c Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Mar 16 18:03:40 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Mar 16 18:03:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b3b1266 net-misc/openvswitch: amd64 stable wrt bug #577568 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> net-misc/openvswitch/openvswitch-2.5.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openvswitch/openvswitch-2.5.0.ebuild b/net-misc/openvswitch/openvswitch-2.5.0.ebuild index 204bd0a..aa6e385 100644 --- a/net-misc/openvswitch/openvswitch-2.5.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.5.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="debug modules monitor +ssl" RDEPEND=">=sys-apps/openrc-0.10.5
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: 18bffb865e754c667a135593d358e1a0613f14f6 Author: Matthew Thode gentoo org> AuthorDate: Wed Mar 16 17:06:21 2016 + Commit: Matt Thode gentoo org> CommitDate: Wed Mar 16 17:07:09 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18bffb86 net-misc/openvswitch: bup Package-Manager: portage-2.2.26 net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.5.0.ebuild | 157 ++ 2 files changed, 158 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index e4b15d8..a192ce7 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -5,3 +5,4 @@ DIST openvswitch-2.3.0.tar.gz 3259225 SHA256 011052645cd4c7afee2732e87d45e589a05 DIST openvswitch-2.3.1.tar.gz 3266916 SHA256 21174901c311d54703b4a7f498be0c42e5d2cc68bdecb0090dbb555e2af4bcd2 SHA512 8ef4ca61b06a16b361436130bda3b119e4067e78837908fa1d509c3706bc0fe8cc8eb92c76fe439625aa6732a49cbbc6f26898f965b1bbb8b4062e21bcd2edf9 WHIRLPOOL 7556342957b8bb58667161fad37e544896a3b299384688f9edb8aa8675d7be613e6ea41bd0721f60736e52d157689a4f7e27efdd8d77e811073f6d0a9dc110b7 DIST openvswitch-2.3.2.tar.gz 3277164 SHA256 386b11df94d06c68d391ee4091832360095bd3a14c72d454325fab284dad9887 SHA512 dfbd9d5b16aeecdc880efb910e0ec2e474dcc02515f0033b1e9466735387b39f2855bec49936a261aea66badb35e09598dbb9fc4b506e9a9e0c18d3441fea691 WHIRLPOOL ca3e767383ff4cc7527e037472ea3b98b7e36fcdc1b936919cc68c9d28b382264b6e485726e4ec266619656013c5b4e09d55a7808a8399f15246b67f264c5ff8 DIST openvswitch-2.4.0.tar.gz 4182154 SHA256 424c5a8dea1c5b153e8c1803bb041d0495e81379fb6f386dd58ee903a7681b9a SHA512 bd66bcb37beacb0d684001609c26d9dc487efde0ecb051004813b0f8a5999039207b012617195d82d56aefe9a1756615e2158e531a71e9b1e5e10345f0370bae WHIRLPOOL 9efc94031279679611bd4a69079e452b3b0055bb96a0337851cce925d8ba1019887b747594263d2dd2a866c98c45b65b274db22d7949b6bf1edd9bc0ec17048a +DIST openvswitch-2.5.0.tar.gz 4603077 SHA256 34da54fbad503205b1a66b48ca4312679e1ce5b04763a9fb86050b2b25d66f21 SHA512 32addb6ed8d4b78e6eb5b951de6b2390dacb3a66096ff8de6020e6d42d460e1038eec43c4057707942f8043ebcad848488d09c7aabfa4599d53782a9cc69f089 WHIRLPOOL 3b879ce376268bb65858f4c4b7193c54fc43a9903029f2000cee1a4f8739eae3ed5b2ad67c57de7ecfe3028874831796bd69a1b8a0599d9dad56f1b524302c5d diff --git a/net-misc/openvswitch/openvswitch-2.5.0.ebuild b/net-misc/openvswitch/openvswitch-2.5.0.ebuild new file mode 100644 index 000..204bd0a --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.5.0.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils linux-info linux-mod python-single-r1 systemd autotools + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="http://openvswitch.org; +SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug modules monitor +ssl" + +RDEPEND=">=sys-apps/openrc-0.10.5 + ssl? ( dev-libs/openssl:= ) + monitor? ( + ${PYTHON_DEPS} + dev-python/twisted-core + dev-python/twisted-conch + dev-python/twisted-web + dev-python/PyQt4[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] ) + debug? ( dev-lang/perl )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +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 2 6 32 || die "Linux >= 2.6.32 and <= 4.0 required for userspace modules" + kernel_is le 4 0 || die "Linux >= 2.6.32 and <= 4.0 required for userspace modules" + linux-mod_pkg_setup + else + CONFIG_CHECK+=" ~OPENVSWITCH" + linux-info_pkg_setup + fi + use monitor && python-single-r1_pkg_setup +} + +src_prepare() { + # Never build kernelmodules, doing this manually + sed -i \ + -e '/^SUBDIRS/d' \ + datapath/Makefile.in || die "sed failed" + epatch "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" + eautoreconf +} +src_configure() { + set_arch_to_kernel + 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}" + + PYTHON=python2.7 econf ${linux_config} \ + --with-rundir=/var/run/openvswitch \ + --with-logdir=/var/log/openvswitch \ + --with-pkidir=/etc/ssl/openvswitch \ + --with-dbdir=/var/lib/openvswitch \ +
[gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/
commit: c5bb368e22f052dfed812477a02d6e8faaca260b Author: Matthew Thode mthode org> AuthorDate: Tue Sep 15 18:29:44 2015 + Commit: Matt Thode gentoo org> CommitDate: Tue Sep 15 18:29:44 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5bb368e net-misc/openvswitch: bup for bug 560270 Package-Manager: portage-2.2.20.1 net-misc/openvswitch/Manifest | 1 + net-misc/openvswitch/openvswitch-2.4.0.ebuild | 157 ++ 2 files changed, 158 insertions(+) diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index b2eabd8..e4b15d8 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -4,3 +4,4 @@ DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaef DIST openvswitch-2.3.0.tar.gz 3259225 SHA256 011052645cd4c7afee2732e87d45e589a0540ac7b7523027d3be2d7c7db7c899 SHA512 f3a665bc84d8a6e282928db61ae648a826f273e44e34311a60e6f0e74a6ab10c8410cb374f0ce80abe7c58b9559a97388cdbfe2ef28ac4bedd2f5e52b3cd6ed1 WHIRLPOOL 0fc743b7d12c2ab9c6bea58ec3b80d7633f860c720acb2b61306ff5035d4f3bfeddf7b9bab44a21a1b7fb62c0c3828c2aaf7e9b9167a67ee2def065248ef329c DIST openvswitch-2.3.1.tar.gz 3266916 SHA256 21174901c311d54703b4a7f498be0c42e5d2cc68bdecb0090dbb555e2af4bcd2 SHA512 8ef4ca61b06a16b361436130bda3b119e4067e78837908fa1d509c3706bc0fe8cc8eb92c76fe439625aa6732a49cbbc6f26898f965b1bbb8b4062e21bcd2edf9 WHIRLPOOL 7556342957b8bb58667161fad37e544896a3b299384688f9edb8aa8675d7be613e6ea41bd0721f60736e52d157689a4f7e27efdd8d77e811073f6d0a9dc110b7 DIST openvswitch-2.3.2.tar.gz 3277164 SHA256 386b11df94d06c68d391ee4091832360095bd3a14c72d454325fab284dad9887 SHA512 dfbd9d5b16aeecdc880efb910e0ec2e474dcc02515f0033b1e9466735387b39f2855bec49936a261aea66badb35e09598dbb9fc4b506e9a9e0c18d3441fea691 WHIRLPOOL ca3e767383ff4cc7527e037472ea3b98b7e36fcdc1b936919cc68c9d28b382264b6e485726e4ec266619656013c5b4e09d55a7808a8399f15246b67f264c5ff8 +DIST openvswitch-2.4.0.tar.gz 4182154 SHA256 424c5a8dea1c5b153e8c1803bb041d0495e81379fb6f386dd58ee903a7681b9a SHA512 bd66bcb37beacb0d684001609c26d9dc487efde0ecb051004813b0f8a5999039207b012617195d82d56aefe9a1756615e2158e531a71e9b1e5e10345f0370bae WHIRLPOOL 9efc94031279679611bd4a69079e452b3b0055bb96a0337851cce925d8ba1019887b747594263d2dd2a866c98c45b65b274db22d7949b6bf1edd9bc0ec17048a diff --git a/net-misc/openvswitch/openvswitch-2.4.0.ebuild b/net-misc/openvswitch/openvswitch-2.4.0.ebuild new file mode 100644 index 000..044509c --- /dev/null +++ b/net-misc/openvswitch/openvswitch-2.4.0.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils linux-info linux-mod python-single-r1 systemd autotools + +DESCRIPTION="Production quality, multilayer virtual switch" +HOMEPAGE="http://openvswitch.org; +SRC_URI="http://openvswitch.org/releases/${P}.tar.gz; + +LICENSE="Apache-2.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug modules monitor +ssl" + +RDEPEND=">=sys-apps/openrc-0.10.5 + ssl? ( dev-libs/openssl:= ) + monitor? ( + ${PYTHON_DEPS} + dev-python/twisted-core + dev-python/twisted-conch + dev-python/twisted-web + dev-python/PyQt4[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] ) + debug? ( dev-lang/perl )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +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 2 6 32 || die "Linux >= 2.6.32 and <= 4.0 required for userspace modules" + kernel_is le 4 0 || die "Linux >= 2.6.32 and <= 4.0 required for userspace modules" + linux-mod_pkg_setup + else + CONFIG_CHECK+=" ~OPENVSWITCH" + linux-info_pkg_setup + fi + use monitor && python-single-r1_pkg_setup +} + +src_prepare() { + # Never build kernelmodules, doing this manually + sed -i \ + -e '/^SUBDIRS/d' \ + datapath/Makefile.in || die "sed failed" + epatch "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" + eautoreconf +} +src_configure() { + set_arch_to_kernel + 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}" + + PYTHON=python2.7 econf ${linux_config} \ + --with-rundir=/var/run/openvswitch \ + --with-logdir=/var/log/openvswitch \ + --with-pkidir=/etc/ssl/openvswitch \ + --with-dbdir=/var/lib/openvswitch \ +