From a40d7aa891556e7984504838ea13099a5ca12802 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Aug 2023 03:40:25 +0100 Subject: gentoo auto-resync : 20:08:2023 - 03:40:24 --- net-misc/Manifest.gz | Bin 54274 -> 54267 bytes net-misc/gns3-gui/Manifest | 4 +- net-misc/gns3-gui/gns3-gui-2.2.40.1.ebuild | 40 ------------ net-misc/gns3-gui/gns3-gui-2.2.42.ebuild | 40 ++++++++++++ net-misc/gns3-server/Manifest | 4 +- net-misc/gns3-server/gns3-server-2.2.40.1.ebuild | 71 --------------------- net-misc/gns3-server/gns3-server-2.2.42.ebuild | 71 +++++++++++++++++++++ net-misc/r8168/Manifest | 3 +- .../r8168/files/r8168-8.051.02-6.4.10-fix.patch | 17 +++++ net-misc/r8168/r8168-8.051.02.ebuild | 1 + 10 files changed, 135 insertions(+), 116 deletions(-) delete mode 100644 net-misc/gns3-gui/gns3-gui-2.2.40.1.ebuild create mode 100644 net-misc/gns3-gui/gns3-gui-2.2.42.ebuild delete mode 100644 net-misc/gns3-server/gns3-server-2.2.40.1.ebuild create mode 100644 net-misc/gns3-server/gns3-server-2.2.42.ebuild create mode 100644 net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 34353a888ac2..c57d1c47d046 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest index 32d39e78c6aa..62decfc75c66 100644 --- a/net-misc/gns3-gui/Manifest +++ b/net-misc/gns3-gui/Manifest @@ -1,5 +1,5 @@ -DIST gns3-gui-2.2.40.1.tar.gz 5047865 BLAKE2B 66c84c025b5024d243ff76ea4206421ae119e74ebcd5aeeb3cadbb6a502159e1f5c863ca114358c1460e0b50ecbc88e29443c379b40053358d52e58fdd0e1a1e SHA512 0ece7b2b230d4bc711f8e8c111cd46ae3a81c983e654baba090940cc1df80389495b78ae251489f81d29571a777cb4f51a5dd715a862a3756e574dc657d816c5 DIST gns3-gui-2.2.41.tar.gz 5046775 BLAKE2B 8ca83ed58312bd2cf0c0e854cebe6001121bf21e9f26804b779fc81ec06689c154d704b9cf2e7a5d57608519c3fbe724b07437b64c5840dd2ad6119f38669a29 SHA512 b86e23808c6158d6811a51901aff3f10c9722ca51389c2d241c6d174992299c83529014e6a098a2d5777fabda212ffb2731025843cc317f8560868bcb8cb2195 -EBUILD gns3-gui-2.2.40.1.ebuild 1023 BLAKE2B 2abaa2a68590c5d4af192a3985c9ee308d251526128e67f1ac8d3b54df6883b6ed52821f2af4e397b261c5b7f20744d29444e0c5d9a70649d3b2fc2f0b3255eb SHA512 9d2cd8f7cae33354db2efca81f8562ff9aaabf18dc190e1daa218dd94b432e9dc0a9d49f19b2be94dab92d3de4ee27a8880bd9484e693aab247f47d4a826766e +DIST gns3-gui-2.2.42.tar.gz 5048413 BLAKE2B 19c4f1977797af0a3c2bbed926cc8f9361840658dbdc25ad9a2972bec21749c84d5cdc477079f01b8c354e21e9663b27bcbc09f974c914c188f98ec151b7bd67 SHA512 19940857308da3810047cec9285c34b0011e4dc44a1316bf2fe5042e0f255546e8e3d2d4788a1f70baedb498a295223916633f4950ef9dbfa19b8e72c7545176 EBUILD gns3-gui-2.2.41.ebuild 1023 BLAKE2B 2abaa2a68590c5d4af192a3985c9ee308d251526128e67f1ac8d3b54df6883b6ed52821f2af4e397b261c5b7f20744d29444e0c5d9a70649d3b2fc2f0b3255eb SHA512 9d2cd8f7cae33354db2efca81f8562ff9aaabf18dc190e1daa218dd94b432e9dc0a9d49f19b2be94dab92d3de4ee27a8880bd9484e693aab247f47d4a826766e +EBUILD gns3-gui-2.2.42.ebuild 1023 BLAKE2B 05bc8d725680f39ec70a3ff2e47a6de85a2889d7250868035bb008902d5f54a5d26e73f8ea8bec6855e20835ff1a899b38e95a9c44170d8949072d60ff772415 SHA512 e152326027221e8f2189ef758ae107ab0a7f08f88eedc2ea2d94e609836d1e12b131c3bf795ace96cac410cdf26b1ffcd0faa93f91124c3c4039e2332b486e97 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49 diff --git a/net-misc/gns3-gui/gns3-gui-2.2.40.1.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.40.1.ebuild deleted file mode 100644 index 50f98a4b6407..000000000000 --- a/net-misc/gns3-gui/gns3-gui-2.2.40.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_11 ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 virtualx xdg - -DESCRIPTION="Graphical Network Simulator" -HOMEPAGE="https://www.gns3.com https://github.com/GNS3/gns3-gui" -SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -#net-misc/gns3-server version should always match gns3-gui version -RDEPEND=" - >=dev-python/distro-1.8.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.4[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.17.0[${PYTHON_USEDEP}] - ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}] - dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -src_prepare() { - default - - # newer python packages are fine - sed -i -e 's/[<>=].*//' requirements.txt || die -} - -src_test() { - virtx distutils-r1_src_test -} diff --git a/net-misc/gns3-gui/gns3-gui-2.2.42.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.42.ebuild new file mode 100644 index 000000000000..5834bf62b463 --- /dev/null +++ b/net-misc/gns3-gui/gns3-gui-2.2.42.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_11 ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 virtualx xdg + +DESCRIPTION="Graphical Network Simulator" +HOMEPAGE="https://www.gns3.com https://github.com/GNS3/gns3-gui" +SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +#net-misc/gns3-server version should always match gns3-gui version +RDEPEND=" + >=dev-python/distro-1.8.0[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.29.2[${PYTHON_USEDEP}] + ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}] + dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +src_prepare() { + default + + # newer python packages are fine + sed -i -e 's/[<>=].*//' requirements.txt || die +} + +src_test() { + virtx distutils-r1_src_test +} diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest index e1ba053fc30f..17ad681422da 100644 --- a/net-misc/gns3-server/Manifest +++ b/net-misc/gns3-server/Manifest @@ -1,5 +1,5 @@ -DIST gns3-server-2.2.40.1.tar.gz 9712941 BLAKE2B 24b5705c10f9aa1530f431031db4497d077da7e44c36c3201c6be5194fbbbc1ee4e09d79229520baec3a4296854711d9f0cef23786c141807e6d2eeb9902c402 SHA512 1b8d8e8957dcf8c8c142c2e2be01b88ec2b785ce63c41b21816d29c925574e204cd5dcdd1a010fa356e92babb10ade6c135f817b31aa53eb7368e28aa15b2bff DIST gns3-server-2.2.41.tar.gz 10736066 BLAKE2B c2ab5c99a67a8cd79a898e244a77eea13477c6030b5b11a63c1747802ff309dc77ee62a6ad7191c7d8bf84d62badecf924379eb58afb4d4f111a9d34380d4aec SHA512 ec34bb81e96034a36f4bc7aeadaf5ae221be23069612477e5af9c908e3764e44029d22115eac602e0a26fedc99d67d4ed64cbf5da12c6a89bf00c3cd99d2ab7b -EBUILD gns3-server-2.2.40.1.ebuild 2072 BLAKE2B b5a22cb7db512bc74025283831eca8bbf3790c48f3e971cd2c74c9ce9fc98bd9b3be2c89ca827a05ef2d8bf31811318ffcf1f39154f3acce4dd9285942f31917 SHA512 c97a356ca55651f573b199f94e9b698bd717c98bf06bb06eb95f598f87c359d04d715107494c1ab7bac6484a17267213d238f2c49202d113435e6bcc8ed039e3 +DIST gns3-server-2.2.42.tar.gz 10735078 BLAKE2B 424f73fcb7377a518873b4880b77b6e057d8293fb96073eca59224b0e5e5c1e50114f30c564b861e91769380d9d15b3c2c28a8f4cec3358282902af09eeccd30 SHA512 9982fabcdd587b090833b9137124a0accb2990cee91ca5d19d8ee691f807d547670a38b2168d0f71465088a3971eac73e101cc284922732b5132ac47b84d84f6 EBUILD gns3-server-2.2.41.ebuild 2072 BLAKE2B b5a22cb7db512bc74025283831eca8bbf3790c48f3e971cd2c74c9ce9fc98bd9b3be2c89ca827a05ef2d8bf31811318ffcf1f39154f3acce4dd9285942f31917 SHA512 c97a356ca55651f573b199f94e9b698bd717c98bf06bb06eb95f598f87c359d04d715107494c1ab7bac6484a17267213d238f2c49202d113435e6bcc8ed039e3 +EBUILD gns3-server-2.2.42.ebuild 2072 BLAKE2B 9428fb0e2675cde7eeb39762397ecb25afed1d32c8ea59a7fd2ea80e8925a7aca2d9171335a78c4bfdfd071691b73489031aebaa70280505f96e982c779cd89f SHA512 3984ffc2c982c52a6909a449fa299260aee31c36cf5810456f8d5c77f7f659915bca175ce698193e2c04e71d3796d2a6a5c353d1d039e711a020c31aa14a353a MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49 diff --git a/net-misc/gns3-server/gns3-server-2.2.40.1.ebuild b/net-misc/gns3-server/gns3-server-2.2.40.1.ebuild deleted file mode 100644 index 174ef962de0c..000000000000 --- a/net-misc/gns3-server/gns3-server-2.2.40.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_11 ) -DISTUTILS_USE_PEP517=setuptools - -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-22.1.0[${PYTHON_USEDEP}] - >=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}] - >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] - >=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}] - >=dev-python/distro-1.8.0[${PYTHON_USEDEP}] - >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] - >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.4[${PYTHON_USEDEP}] - >=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.17.0[${PYTHON_USEDEP}] - net-misc/ubridge - sys-apps/busybox[static] -" -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 -} - -python_install() { - distutils-r1_python_install - - systemd_dounit init/gns3.service.systemd - newinitd init/gns3.service.openrc gns3server - - rm "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || 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.42.ebuild b/net-misc/gns3-server/gns3-server-2.2.42.ebuild new file mode 100644 index 000000000000..de2185845ca4 --- /dev/null +++ b/net-misc/gns3-server/gns3-server-2.2.42.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_11 ) +DISTUTILS_USE_PEP517=setuptools + +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-23.1.0[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}] + >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] + >=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}] + >=dev-python/distro-1.8.0[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] + >=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.29.2[${PYTHON_USEDEP}] + net-misc/ubridge + sys-apps/busybox[static] +" +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 +} + +python_install() { + distutils-r1_python_install + + systemd_dounit init/gns3.service.systemd + newinitd init/gns3.service.openrc gns3server + + rm "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || 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/r8168/Manifest b/net-misc/r8168/Manifest index 1efe43527c5e..4ebc29a89b7e 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,4 +1,5 @@ AUX r8168-8.051.02-6.1-fix.patch 983 BLAKE2B 6c3ec1726f47ab51d702481a8e6817c25917b4e3760d49df74fd888ec04a61468a55015b2444cbed114853079b7844b14370efe095e37e8572abb271bca87ee8 SHA512 b2484ac3169c27324f204d068ffa7e29497039b1e4694ff7aa5ba22ff4da939c371cc2df4ca95b5d96e591d7dc8c558c50bc4b4fe53515ef7776f1564e40dfd7 +AUX r8168-8.051.02-6.4.10-fix.patch 436 BLAKE2B 840f5c356ae3e9862b0d346186ee6a6b9e03d4b7b54453f80f3131e2cb5047f9f7ea61fba4a6f99f8a4b413f6dfcf973efdaec7e706b05c08f2a129727ccaf79 SHA512 c4e9400c331b9500ff87a0f44855570d4c4b20f814fc0c82cd3e8e076833df8ff91e4c581640f1db07c9453611d515a28f5118eb1db9d4124be620c2c6149dcf DIST r8168-8.051.02.tar.bz2 115969 BLAKE2B 28b809c0330920ee0db7a8f8d41e178882531cd0a6793efeadd9670b1a9b5cbe903061073fd1d461f4234feb41249a244f9ef35cdbb780da498e5a6d6f1a5490 SHA512 2f29a413e7db2b7295ea0a970b3385de1dfd6e41e1820097355687daa5c8d155c1cf6115c72875bff4f366365579bffc81733469a62d76f437065b7e514387ca -EBUILD r8168-8.051.02.ebuild 1117 BLAKE2B e0d47181a336316074241c3b4fc8b683d8d30ddfb56721249ccf2cf7e05284b6abf4160ee591b3fc26839e4af7acc0850a3950fb00ab9f064526dd3b7d186632 SHA512 39eb9098797e95003f4d6a18e40ed5c66dd77c7f2c117347fc4082e64dfcc70cb2a3a504fedff671207ba34fe7673467dd9e65642a0d87ddfcbee7825a6d763f +EBUILD r8168-8.051.02.ebuild 1167 BLAKE2B 88d2d14ffa61f5136571725f24cb3ae1190c993c15335673d97d189aa55b3891f1e8e0227686870d1ca3a4fa67007a00eb1d6751010a1c32343ed0b3872a100f SHA512 44aa226134cb09a98f9567679ac9610e23449d90ee37f53da253c2effb04b82582895d6d290245e90304987e19c7a87760864a470b7cd7759d4395b010a07233 MISC metadata.xml 577 BLAKE2B 0335cbfc902163abd4ffef0ad089b15ae7eaee15e41ed7760834d0329662a8ea0c66d68366a779265205557abe31bf3055b474f6bda7469e803a6240c3e68951 SHA512 f27ae61be558fe46b14fdf43a8d975c71cc900788761e6c5044eea6e8f80ddb6528b0d9d711844b6c8b45e58401a8736d08c40827fa0ceb99be32a3a0abd7086 diff --git a/net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch b/net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch new file mode 100644 index 000000000000..f10b86447971 --- /dev/null +++ b/net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch @@ -0,0 +1,17 @@ +Fixed build with kernels 6.4.10+ +Gentoo Bug: https://bugs.gentoo.org/912242 +See also: https://github.com/mtorromeo/r8168/issues/54 + +--- +--- a/src/r8168_n.c 2023-08-13 03:33:06.977422132 +0400 ++++ b/src/r8168_n.c 2023-08-13 03:38:39.767005101 +0400 +@@ -81,6 +81,10 @@ + #include + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,10) ++#include ++#endif ++ + #include + #include diff --git a/net-misc/r8168/r8168-8.051.02.ebuild b/net-misc/r8168/r8168-8.051.02.ebuild index 1b19ce47db5e..8f0c5b529c63 100644 --- a/net-misc/r8168/r8168-8.051.02.ebuild +++ b/net-misc/r8168/r8168-8.051.02.ebuild @@ -26,6 +26,7 @@ WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel dr PATCHES=( "${FILESDIR}/${PN}-8.051.02-6.1-fix.patch" + "${FILESDIR}/${P}-6.4.10-fix.patch" # bug 912242 ) pkg_setup() { -- cgit v1.2.3