From b392cbf078526e18db5d54ec37f9580be480fd48 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Aug 2022 14:24:01 +0100 Subject: gentoo auto-resync : 13:08:2022 - 14:24:01 --- net-misc/Manifest.gz | Bin 55425 -> 55425 bytes net-misc/gns3-server/Manifest | 3 +- ...s3-server-2.2.33.1-openrc-posix-complaint.patch | 21 ++++++ .../gns3-server/gns3-server-2.2.33.1-r1.ebuild | 74 ------------------- .../gns3-server/gns3-server-2.2.33.1-r2.ebuild | 78 +++++++++++++++++++++ 5 files changed, 101 insertions(+), 75 deletions(-) create mode 100644 net-misc/gns3-server/files/gns3-server-2.2.33.1-openrc-posix-complaint.patch delete mode 100644 net-misc/gns3-server/gns3-server-2.2.33.1-r1.ebuild create mode 100644 net-misc/gns3-server/gns3-server-2.2.33.1-r2.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index c34075aa458d..be73ae8f6e1a 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest index 90ed4dd723f9..69210d6879ad 100644 --- a/net-misc/gns3-server/Manifest +++ b/net-misc/gns3-server/Manifest @@ -1,7 +1,8 @@ +AUX gns3-server-2.2.33.1-openrc-posix-complaint.patch 769 BLAKE2B c32ff784e1e6d8e30afe4a0d19c9f45299be6a16d55447069131f773aa13db5ff87e27229a2eb94544f3b9577210972f39f456995cdff7ab997a4fbdec501772 SHA512 077d6a8957e24c873784e7fc915f12c157ab5f0abce0beb9ea67f8f014980791909da486f437e579d4ac866b62ce983bb72b16c4cda5bd50091b69b30c394e20 DIST gns3-server-2.2.31.tar.gz 10245461 BLAKE2B 488a91305408704accd4c7df936dde13e9a64404ac6a7e4ed7bdb94f996bb1bbd418d38523318603a8e93a7095c9fb8e30795c6b0dece70a45ed4758569b6711 SHA512 e8bf9357bc5a69e38dc27bc649af88c6ed39e6b5c63e2a1d374ec2a0784c7a6eadae3de0f4300a268fbf91ab55ad342e476573ca9a4bac609158d7d371a7a834 DIST gns3-server-2.2.33.1.tar.gz 10245850 BLAKE2B 069af8a0b77e7c7ce50903577fe0f037ddf574d9081f547686589ee7a48b71295c8c9f3fd9e47c9428e3d3b260828ddbb83188f29dd0cdb87f14fc7757032ad5 SHA512 af1207d92f64862a3f225bde70fa1bf10853c4ab7c661524d3ceed0fcf56388556cc257a31a0b2a741b90fcd793501ba54000d3b18c35d3ff0c47ca080488fc7 EBUILD gns3-server-2.2.31-r1.ebuild 2082 BLAKE2B 28fafaf83e6c99bddd61f9e57f2b847e223cf4a2d2cd50774ca0b91f0eab028de6f6e7d5fca3b2879ce36bad1251ab1949365ad623d6d9ae511d8126e838161c SHA512 e140763c03d78769bc79b7615dd72618aacb586529594f970546ec4aaac4088f2904fc0b183e787cb79f277eaa44cfb2d4554542964343125844903c41441659 EBUILD gns3-server-2.2.31.ebuild 2082 BLAKE2B a08edd08a381a217063f92ab533ab78546434604ed1a096e88b816ff923032e05d28dba8acbc5167be6e2777762bc3faade3df503d9c2afd739d55d4bd547019 SHA512 c7888cc3968590b8e71d236eeae246f7346d7b3407ec150a1a76ade50e2d97355e72d3e95167e6515a20929ae355c67c15758f9bcb6f1b94640bd28e94b6b90c -EBUILD gns3-server-2.2.33.1-r1.ebuild 2162 BLAKE2B 5d4a4a9fe13bcdbeef3dfe59d23596a1efc4401985417f4ea290956fea0b73e26720ed66627294356f4383b84a4e2b26a82f8c4e5a7ea5da4b192491a79930c9 SHA512 7ddfcea416a0c8b19fd2f3419e4f753c7fed66419d905ec73d09c9f8b9780800db7430be57c4d11590b7e0b6523b6ec39a38ecaa8c93f852b82fe10dbb41c06a +EBUILD gns3-server-2.2.33.1-r2.ebuild 2225 BLAKE2B a340110c28752dc5886af745a45a57c3421e8782f4553f67e7f1fc5b4db211b97b52424ebf127fc80a1a1fea61185f5cafcf88967790825055bbe8f7456c2e88 SHA512 268e7978787923e427c82c8ad9b5c3da247a3fa6c916a0145041328dd15216e510aa140ff182e9a3955e4377a822eee4d1a086cddc103150a95ca2797bee6334 EBUILD gns3-server-2.2.33.1.ebuild 2083 BLAKE2B 5bc59b3334b586c5eaffa135b39883a88f51145251213e07dacb8ab3bbdeaa3265ffd0d2e5f7fbdbf6dd49a9269a0a61f68d2f70aa0dc46877a9c4336cebc4f3 SHA512 aa992f0554b8b3bc143f488b8cdb3b9bee00683e979504e86b8597c8d4936f3e3d2f771831d70038e806cbbbaf509236338d485ed79b872127a0799b76ccfef3 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49 diff --git a/net-misc/gns3-server/files/gns3-server-2.2.33.1-openrc-posix-complaint.patch b/net-misc/gns3-server/files/gns3-server-2.2.33.1-openrc-posix-complaint.patch new file mode 100644 index 000000000000..9c263bd812f9 --- /dev/null +++ b/net-misc/gns3-server/files/gns3-server-2.2.33.1-openrc-posix-complaint.patch @@ -0,0 +1,21 @@ +commit 3b108563a0784df332791d44cf70bbba0fc81822 +Author: Michael Mair-Keimberger +Date: Mon Aug 8 19:23:16 2022 +0200 + + gns3.service.openrc: make openrc script posix compliant + +diff --git a/init/gns3.service.openrc b/init/gns3.service.openrc +index 8b0864cd..5a574fca 100755 +--- a/init/gns3.service.openrc ++++ b/init/gns3.service.openrc +@@ -23,8 +23,8 @@ depend() { + + checkconfig() { + if yesno "${GNS3_SERVER_LOG_ENABLED}" ; then +- command_args+=" --log ${GNS3_SERVER_LOG}"; +- if [ "${command_user}" ] ; then ++ command_args="${command_args} --log ${GNS3_SERVER_LOG}"; ++ if [ "${command_user}" ] ; then + checkpath --directory --mode 0700 --owner "${command_user}" "${GNS3_SERVER_LOG_PATH}"; + else + unset command_user diff --git a/net-misc/gns3-server/gns3-server-2.2.33.1-r1.ebuild b/net-misc/gns3-server/gns3-server-2.2.33.1-r1.ebuild deleted file mode 100644 index 10e152413aaa..000000000000 --- a/net-misc/gns3-server/gns3-server-2.2.33.1-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 optfeature systemd - -DESCRIPTION="GNS3 server to asynchronously manage emulators" -HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server" -SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - acct-group/gns3 - acct-user/gns3 - app-emulation/dynamips - >=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}] - >=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}] - >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] - >=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}] - >=dev-python/distro-1.7.0[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.1[${PYTHON_USEDEP}] - >=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.5.12[${PYTHON_USEDEP}] - net-misc/ubridge - sys-apps/busybox -" -BDEPEND=" - test? ( - dev-python/pytest-aiohttp[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - default - - # newer python packages are fine - sed -i -e 's/[<>=].*//' requirements.txt || die - - # Remove Pre-built busybox binary - rm gns3server/compute/docker/resources/bin/busybox || die -} - -python_install() { - distutils-r1_python_install - - systemd_dounit init/gns3.service.systemd - newinitd init/gns3.service.openrc gns3server - - mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die - ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die -} - -pkg_postinst() { - elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality." - elog "" - optfeature "QEMU Support" "app-emulation/qemu" - optfeature "Virtualbox Support" "app-emulation/virtualbox" - optfeature "Docker Support" "app-containers/docker" - optfeature "Wireshark Support" "net-analyzer/wireshark" - elog "" - elog "The following packages are currently unsupported:" - elog "iouyap and vpcs" -} diff --git a/net-misc/gns3-server/gns3-server-2.2.33.1-r2.ebuild b/net-misc/gns3-server/gns3-server-2.2.33.1-r2.ebuild new file mode 100644 index 000000000000..e991cd78ac09 --- /dev/null +++ b/net-misc/gns3-server/gns3-server-2.2.33.1-r2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 optfeature systemd + +DESCRIPTION="GNS3 server to asynchronously manage emulators" +HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server" +SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + acct-group/gns3 + acct-user/gns3 + app-emulation/dynamips + >=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}] + >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] + >=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}] + >=dev-python/distro-1.7.0[${PYTHON_USEDEP}] + >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.1[${PYTHON_USEDEP}] + >=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.5.12[${PYTHON_USEDEP}] + net-misc/ubridge + sys-apps/busybox +" +BDEPEND=" + test? ( + dev-python/pytest-aiohttp[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/${P}-openrc-posix-complaint.patch" + ) + +distutils_enable_tests pytest + +src_prepare() { + default + + # newer python packages are fine + sed -i -e 's/[<>=].*//' requirements.txt || die + + # Remove Pre-built busybox binary + rm gns3server/compute/docker/resources/bin/busybox || die +} + +python_install() { + distutils-r1_python_install + + systemd_dounit init/gns3.service.systemd + newinitd init/gns3.service.openrc gns3server + + mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die + ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die +} + +pkg_postinst() { + elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality." + elog "" + optfeature "QEMU Support" "app-emulation/qemu" + optfeature "Virtualbox Support" "app-emulation/virtualbox" + optfeature "Docker Support" "app-containers/docker" + optfeature "Wireshark Support" "net-analyzer/wireshark" + elog "" + elog "The following packages are currently unsupported:" + elog "iouyap and vpcs" +} -- cgit v1.2.3