diff options
Diffstat (limited to 'net-misc')
196 files changed, 1952 insertions, 5229 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex e6394db42525..cbd6e09f3c8e 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/balance/Manifest b/net-misc/balance/Manifest index 6260bdd2612a..900f3cd04f5b 100644 --- a/net-misc/balance/Manifest +++ b/net-misc/balance/Manifest @@ -1,5 +1,4 @@ AUX balance-3.57-Makefile.patch 1349 BLAKE2B 9bf514589580af60165e4edf0558bd2924bdb13342e9e85c45fb07fe1ab988ae9660f10a3e46a999b16950b4587db68c94e020f22af20029faaa251f2b9b757c SHA512 95d98992206d21784ed53874a55c0e1bc8b0b8ad918d7daefe89f118e200d62d1bb445b6371cbca2418b2f362c57a67fc929aaba2256f502211cda96a89f443a DIST balance-3.57.tar.gz 35547 BLAKE2B 293861bdfbeb7d768c9ccc2e6373cee6000c1b048eed6d741b3e340382db15c5b012e228af47632cf6aed439caf200b62258dab9d0f4a6e64de0c299bd0588d4 SHA512 191195e2aa62c867d85085f273db911e8957c3eea7bed8e58abc29e125a0b0a4487048c7db5857e32f54545de1f81f8148b174225aaf8cf1e3a66e4b040748b4 EBUILD balance-3.57-r1.ebuild 773 BLAKE2B 00c698f6536ab12f327a21a34e3c9e5b517288884e99208716a33d6d6cfbb66765995c17e28756e318aafa71e2b69b0fff1a70817df14717d72a91ab370e115d SHA512 559194a7753723bfa3e42ce6de4566254025dded3112aa5416643f4962985bc66e1a5cef0b1a18829dd6c103f294e80ca0f29b8c1f2bfc1b61a305c0e4aa1c43 -EBUILD balance-3.57.ebuild 549 BLAKE2B 486395c7e1cc58ff632093640d4b9c6084c3a0611f7f5c67fab260adf5d23d178b06a5630c802548dbf548f23fa78a6e0da8b16c7f0020da0867b516b29e2688 SHA512 e0cc0aa6e999f917697eefb46d58268cf3f66372c1eb2ee1cc8c3ec15e9b4ff9e7b4fabdf41302dba635976e6fa811025c9386b59f0ae63ba5e8c019a9fe4cee MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/net-misc/balance/balance-3.57.ebuild b/net-misc/balance/balance-3.57.ebuild deleted file mode 100644 index 2252401cdb41..000000000000 --- a/net-misc/balance/balance-3.57.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="TCP Load Balancing Port Forwarder" -HOMEPAGE="http://www.inlab.de/balance.html" -SRC_URI="http://www.inlab.de/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -PATCHES=( "${FILESDIR}"/${P}-Makefile.patch ) - -src_prepare() { - default - - tc-export CC -} - -src_install() { - default - - #autocreated on program start, if missing - rmdir "${D}"/var/run/${PN} -} diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest index 166e2d3e8720..98dd3cfdaf3c 100644 --- a/net-misc/bridge-utils/Manifest +++ b/net-misc/bridge-utils/Manifest @@ -3,6 +3,6 @@ AUX libbridge-substitute-AR-variable-from-configure.patch 942 BLAKE2B e1835eefb9 DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02 DIST bridge-utils-1.7.1.tar.xz 29632 BLAKE2B 36b8b9c62e88f6f1510acbf23ab8dc5ec41d3bf97eecd274c91771e116650e30b366ded37e65bde061c1e9bc7b19b7eae1e17d4573fcea9fd31892bf6d937515 SHA512 6a3824853bdaa1733c552973e6a5082280facdddc52c3feeb2c8c9375ba9469a5930b559092c9de1a73b464f388f019e147b45ac1e2d10ce8968057779fcd12c EBUILD bridge-utils-1.6.ebuild 1436 BLAKE2B 42f9eab53b9e394593c7b9f78f988a5558cbb0aca979e9adbfd96bed3824e2ab1aee9b974df1870a94a639778a90f19b1bd5af3a42dc9f646181bd55dfcb5367 SHA512 002a1d7fbf2f2b756f2c15d73b6d9e7acca1c6d3295a78a19e578de82967d50ace95167a98a060254195719369c5a9e7669b2d262be120f9a1a906619740843a -EBUILD bridge-utils-1.7.1-r1.ebuild 1427 BLAKE2B 6f5b0377ffd000963f040d037d954ec61fe8d2bce5759865d11ebd478808daf6f4e32df5f395287839f6ba3d770faa98425f347dfb1ed5c854cebc2ce04f17b8 SHA512 75edd50388486d5e38075fd2baf2bccb081297ec9e58fcdbf703b979c6fb4bdc5cddaf8c712716233d1e18e82fcf1f188e97abb8d42092321cb1937936eecbad +EBUILD bridge-utils-1.7.1-r1.ebuild 1434 BLAKE2B 13d9dfd6d950dd5c39db149944d6c133335dabd03d6784500bfa843e2dfff6f3e343d8ef302f98167c82206f908f0a92b50e7ec48beb70c22ba6964783dcdf44 SHA512 d6afdb713dbb99809d5d906683e9939b78434dc1832f42f2f4bc6f0bd1c7240ed29c470fa56680e76fd13aebce53f71d84d152f10fb574a792c78a9b258ece45 EBUILD bridge-utils-1.7.1.ebuild 1379 BLAKE2B 62267a7aadaaa12fe07c2679c8beb99e6917d6c39ac3697ec696300f897c140fd2cae478cf50e1cd8668f1a3fb96dd5fbcc8c6ba69930e90ba70a679382186c1 SHA512 1283f3f38a9fe0e0065e4101b45d326df424651d708b9c0891fea6a52755cbe313717e37cae25bfd37f385b70c685a4260ea04419d913d1a5fc27279c3dbb5b9 MISC metadata.xml 492 BLAKE2B a62977b2f90df86ceacd84e556618f3adf5338eef114a17ca9a17e4bff142190fa68df777719b91bc4ec3108d3fd13c21205addaf30e4fc4012ff83fb882590f SHA512 216e32dc64a175f83b942cbc24894e055a77f7b9c251d68395cb4635bda446ea197f8feee7957747e68bdb46c8c84e8625b626c82944e161debba3009f9befa8 diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild index 85a58f61fc89..1ca3e88935d6 100644 --- a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild +++ b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="selinux" DEPEND="virtual/os-headers" diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest index 15f2b5791ea0..d3039236de8d 100644 --- a/net-misc/cgminer/Manifest +++ b/net-misc/cgminer/Manifest @@ -1,3 +1,3 @@ DIST cgminer-4.10.0.tar.bz2 1306225 BLAKE2B 29d34e5d9246fc5b0409a1647e4ddf291f1e7610888110c1917ddbc1c30a9d0301bb70dba187690f2685b2fd476d5c0b0cd65e87fafa56b62a7f3a0202a374de SHA512 ed39bffa51715756875c101f4aaf984cab566fc1c8b657f6da37d0cdf921faee752c3efadf97c98ca6e749175457fbc2c37e9332cd26d2ff1675752250ac21db -EBUILD cgminer-4.10.0-r1.ebuild 2563 BLAKE2B aae006d5737fdf141fa315121584b9090b016b4520677c1d945e8e152a8d731b31fb85b1f56289518b7a16318bbd39b6658569b3ad8a5294c772ff709bd50317 SHA512 ae98851b1edbb87c59cd55f780b38f779608f2975afbd8cb6f469fb2fa994971b3444c91ef9790f99b9418529071ef2ca85d16a90f1095a6dd4eeb2a0852d15e +EBUILD cgminer-4.10.0-r1.ebuild 2580 BLAKE2B 254c2432ac7933ec2cd85fa8df9bd0f1a958fc3dafbcd37030ef391c8d4d8140c0f5ac97c93284bd77f1f7f3cc52d5d2ce4978c3d2c14860103a2d0058a2b16c SHA512 30dcc1532e9391819ab34038f4a7c56f09e89adc1c315c40b74afe51c7c96a7986658cd2e3dbee2fe8cc240abb2f15a86a16e5bc8b15dc58b98f8dc3f340f3b2 MISC metadata.xml 2052 BLAKE2B c4fe4d3eaa47476ee0a871f6c0a247d581013c395ffba953b1c6189f402e8fa7a2a5014a9f10e9e9022eadc1de0ce15d22c50741e3bbdb9d533e9804c0e53991 SHA512 2e7cf4cc6c678a7c6b870c1a51f459c06bed247f14a304013a75d76e1683f10b8c1b51f78b23c43f28b60dc32e89dd1a92c7f20bed841a2e48e3159f0c50d381 diff --git a/net-misc/cgminer/cgminer-4.10.0-r1.ebuild b/net-misc/cgminer/cgminer-4.10.0-r1.ebuild index 016755b9d44c..7fcba45d1770 100644 --- a/net-misc/cgminer/cgminer-4.10.0-r1.ebuild +++ b/net-misc/cgminer/cgminer-4.10.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit flag-o-matic toolchain-funcs udev DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C" HOMEPAGE="https://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer" @@ -76,8 +76,7 @@ src_install() { # How about using some make install? dobin cgminer if use udev; then - insinto /lib/udev/rules.d - use udev && doins 01-cgminer.rules + udev_dorules 01-cgminer.rules fi if use doc; then @@ -91,3 +90,7 @@ src_install() { # How about using some make install? dodoc api-example.php miner.php API.java api-example.c example.conf fi } + +pkg_postinst() { + use udev && udev_reload +} diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index e9ce084169be..6b880206794b 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,18 +1,12 @@ AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c321544376ff2e48d67ee13bebcf04a8fea56326bf5efe66f568913dc92ff7f16a641ffb39a456e9cdac6004a6c SHA512 e6febb744476be6c83ac086f2054dc2c190b6e1abd2cf20d4187f222b2485817f06c4ad62b8d40fcea3e18a771cf21899fe0a1dafbfb31f5c99da9092d24d79b AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4 -AUX chrony-4.1-seccomp-glibc-2-3-4.patch 932 BLAKE2B 89f6f1ee4ece8ce021dd35f20c44749f613049f3aee1007fcbad1f123767e73ebd5567d4aeffd04938d75788b6b42c332903b93cf5c76fdfc404c3c918f52bd8 SHA512 7315f6e08a418b574fc5c9c1100b2fd39320f38d7c20117e5d8e902f71a99ad8f3e743e1cf18a0223710c6321fbac5baae05b1201f156275af404bc81c32796a -AUX chrony-4.1-systemd-gentoo.patch 309 BLAKE2B 4824abf9130c6861f2966c4cdec93313429df499c14cd75897ffebdcc1bb9dd4058aa4889f17e4549ed5d0c581208c316bc3bd28cbed96030303f401a4dd7bff SHA512 ae5d80bcf16554a22b624c2def7ccabc72cc3dba5dc0fc8096eeb7367b388d02ad2d3ce6119980fc12d573ea0803eeb58cb5b409b0c475f70e75c8d112553245 AUX chrony-4.2-seccomp-rseq.patch 1111 BLAKE2B 625d93528c11d4fc37a6ec4f7d32c80940ea33976e9b351c519cccfa1de81b3ddef74cad5a85f28c7196ff169cf14f3ff91704c7278444a6abca0e679d9ca0f4 SHA512 bcb9d17345043049c9990a3939d97100a4be6d17ff23851b3a61b929dd9ea4421ad9f5e7e3adb79675dab8a854a9a2a7f9ddbefc8dea294c7d5639c19e6169b1 AUX chrony-4.2-systemd-gentoo.patch 538 BLAKE2B 70d3bb2a190aa2401ff566dd88d1cace1d3573261819d082863fe310bb16507fcc1497fd31ec24033cb9dbe8356aef416d91b36df6067fd37f4273e59bc4e330 SHA512 62e54e1c16380812b3cf11a84091e134401341a4a64dda806af1a52dfa4158912adc4c2524388956f67a44e095e893ed714a2eee15650080c38ce44d2bc279ec AUX chrony-4.2-test-mawk.patch 1219 BLAKE2B 7cc8d36de7879a500006e6a31d6dde77343616358e6d135efc80181f97fed5e81ada2b5d0ee4ac2d125cf828ac94a0894ffe40ec09ffb5328bf9b8cb71addd24 SHA512 69a9e1bd7c632ecf98992840d2b8aa5bd6e9ac3e7a67485ad9b59286414509001e71c47638059ebfcb952d17e7b6e754d74950dd0ebbdb265c8127e06bb94f34 AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea7106356083cf1a20bdb8fd4b85bd8cce8cf20ce6839e8788fedc1f94e912ec512193988f83283ceef86d6cfc7 SHA512 ab0bbd07c17e391d068c5a37d5f8d9c8fc2c42add2700869217a95784666bd3f23bebd70942cf11b42c124e0947f68c101153998e89bc61ccb71b30a0187cf0c AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da -DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f -DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff SHA512 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969 SHA512 d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10 -EBUILD chrony-4.1-r2.ebuild 6684 BLAKE2B b366d69c4a2068b512bd7cbb14b7387ccd02947a7cb94f21bfc552ecc904829abc6dee333c4bbc11b9a3cdc97aa6c95d7a1c662fea22cc7df9b1c83f566873d9 SHA512 621e244dbaa0bff3bb74d5d7f92c9db85104f4c7ec02e774cd96fb1a7012141699c711e06b8b5a92be8ac70876ee933280bcabbea7a6f35593eec5d41b203028 EBUILD chrony-4.2-r1.ebuild 6719 BLAKE2B 9dbf927768234a5e9f4a38463815395ae78b982c784cf25be1d6e78c0b268a6b9ed327d9de71505a4c1c4f158be50c15e6ecdff691369fb25f6ff664d73dce55 SHA512 12c3470d09c3b98f81649b8d16c58b53f9a2721540ae4fb376f4aea9a1f144540e0e415f94d08aceee9d69afddf1571855798c7ee175a278096f63fc32dcb0ab -EBUILD chrony-4.2.ebuild 6643 BLAKE2B 42de896b755ab3992c620c440adcfbf088e6b325085fdaa7bf1d2798c5219781b5741052d605541054536925524f78734f8c4cb0ad04d5b4d279422212ecd2a5 SHA512 7843e59659e2c1fdc381c0e2995e198e21e180abbe11faa7425c13348950c2f997d2caef1ee899d3f7e38666f21224e969493a2167e967c6d6ce8445215e8499 EBUILD chrony-9999.ebuild 6645 BLAKE2B 36e2fa322fd75673afe913a472ba65d6aa6610700a149545107e381106950fcddcf0e30e077f95d169b12d550faad8c8526e8c2f782b75126ce7aaea4cac87ee SHA512 5817e255eb667f7bf788bf7b42d99851583cca22178c4a5301b071fdb30e0c53dbc9f4c6951f36aea2b9de6bb6352265920450455103234be8fe711c8e428fb9 MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0 diff --git a/net-misc/chrony/chrony-4.1-r2.ebuild b/net-misc/chrony/chrony-4.1-r2.ebuild deleted file mode 100644 index eefd2899e047..000000000000 --- a/net-misc/chrony/chrony-4.1-r2.ebuild +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd tmpfiles toolchain-funcs - -DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" - inherit git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc - inherit verify-sig - - SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" - - if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" - fi -fi - -S="${WORKDIR}/${P/_/-}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux" -# nettle > nss > libtomcrypt in configure -REQUIRED_USE=" - sechash? ( || ( nettle nss libtomcrypt ) ) - nettle? ( !nss ) - nss? ( !nettle ) - libtomcrypt? ( !nettle !nss ) - !sechash? ( !nss ) - !sechash? ( !nts? ( !nettle ) ) -" - -DEPEND=" - caps? ( - acct-group/ntp - acct-user/ntp - sys-libs/libcap - ) - libedit? ( dev-libs/libedit ) - !libedit? ( sys-libs/readline:= ) - nettle? ( dev-libs/nettle:= ) - nss? ( dev-libs/nss:= ) - nts? ( net-libs/gnutls:= ) - pps? ( net-misc/pps-tools ) - seccomp? ( sys-libs/libseccomp ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" -BDEPEND=" - html? ( dev-ruby/asciidoctor ) - nts? ( virtual/pkgconfig ) - sechash? ( - nettle? ( virtual/pkgconfig ) - nss? ( virtual/pkgconfig ) - ) -" - -if [[ ${PV} == "9999" ]] ; then - # Needed for doc generation in 9999 - REQUIRED_USE+=" html" - BDEPEND+=" virtual/w3m" -else - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch - "${FILESDIR}"/${PN}-4.1-systemd-gentoo.patch - "${FILESDIR}"/${P}-seccomp-glibc-2-3-4.patch -) - -src_prepare() { - default - - sed -i \ - -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ - doc/* examples/* || die - - cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die -} - -src_configure() { - if ! use caps ; then - sed -i \ - -e 's/ -u ntp//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - if ! use seccomp ; then - sed -i \ - -e 's/ -F 2//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - tc-export CC PKG_CONFIG - - # Update from time to time with output from "date +%s" - # on a system that is time-synced. - export SOURCE_DATE_EPOCH=1607976314 - - # Not an autotools generated script - local myconf=( - $(use_enable seccomp scfilter) - - $(usex caps '' '--disable-linuxcaps') - $(usex cmdmon '' '--disable-cmdmon') - $(usex debug '--enable-debug' '') - $(usex ipv6 '' '--disable-ipv6') - $(usex libedit '' '--without-editline') - $(usex libtomcrypt '' '--without-tomcrypt') - $(usex nettle '' '--without-nettle') - $(usex nss '' '--without-nss') - $(usex ntp '' '--disable-ntp') - $(usex nts '' '--disable-nts') - $(usex nts '' '--without-gnutls') - $(usex phc '' '--disable-phc') - $(usex pps '' '--disable-pps') - $(usex refclock '' '--disable-refclock') - $(usex rtc '' '--disable-rtc') - $(usex samba '--enable-ntp-signd' '') - $(usex sechash '' '--disable-sechash') - - --chronysockdir="${EPREFIX}/run/chrony" - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --mandir="${EPREFIX}/usr/share/man" - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc/chrony" - --with-hwclockfile="${EPREFIX}/etc/adjtime" - --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - - ${EXTRA_ECONF} - ) - - # Print the ./configure call - echo sh ./configure "${myconf[@]}" >&2 - sh ./configure "${myconf[@]}" || die -} - -src_compile() { - if [[ ${PV} == "9999" ]] ; then - # Uses w3m - emake -C doc man txt - fi - - emake all docs $(usex html '' 'ADOC=true') -} - -src_install() { - default - - newinitd "${FILESDIR}"/chronyd.init-r2 chronyd - newconfd "${T}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - docinto examples - dodoc examples/*.example* - - newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" - - if use html ; then - docinto html - dodoc doc/*.html - fi - - keepdir /var/{lib,log}/chrony - - if use caps ; then - # Prepare a directory for the chrony.drift file (a la ntpsec) - # Ensures the environment is sane on new installs - # bug #711058 - fowners ntp:ntp /var/{lib,log}/chrony - fperms 770 /var/lib/chrony - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - - systemd_dounit examples/chronyd.service - systemd_dounit examples/chrony-wait.service - systemd_enable_ntpunit 50-chrony chronyd.service -} - -pkg_preinst() { - HAD_CAPS=0 - HAD_SECCOMP=0 - HAD_PRE_NEW_SECCOMP_LEVEL=0 - - # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5 - # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand - if has_version 'net-misc/chrony[caps]' ; then - HAD_CAPS=1 - fi - - if has_version 'net-misc/chrony[seccomp]' ; then - HAD_SECCOMP=1 - fi - - if has_version '>=net-misc/chrony-4.1[seccomp]' ; then - # This version introduced a new filter level: -F 2 - # It's a limited set of seccomp filters designed to be 'bare minimum' - HAD_PRE_NEW_SECCOMP_LEVEL=1 - fi -} - -pkg_postinst() { - tmpfiles_process chronyd.conf - - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then - # bug #719876 - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" - ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" - ewarn "This is necessary for chrony to drop privileges" - elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" - fi - fi - - # See bug #783915 for general discussion on enabling seccomp filtering - # by default. - local show_seccomp_enable_msg=0 - - # Was seccomp disabled before and now enabled? - if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then - show_seccomp_enable_msg=1 - fi - - # Are we coming from an old version without the new 'minimal' filter? - # (-F 2) - if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then - show_seccomp_enable_msg=1 - fi - - if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then - elog "To enable seccomp in a stricter mode, please modify:" - elog "- /etc/conf.d/chronyd for OpenRC" - elog "- systemctl edit chronyd for systemd" - elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)" - elog "By default, we now use -F 2 which is a baseline/minimal filter." - fi -} diff --git a/net-misc/chrony/chrony-4.2.ebuild b/net-misc/chrony/chrony-4.2.ebuild deleted file mode 100644 index 51af47377ea6..000000000000 --- a/net-misc/chrony/chrony-4.2.ebuild +++ /dev/null @@ -1,252 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd tmpfiles toolchain-funcs - -DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" - inherit git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc - inherit verify-sig - - SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" - - if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86" - fi -fi - -S="${WORKDIR}/${P/_/-}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux" -# nettle > nss > libtomcrypt in configure -REQUIRED_USE=" - sechash? ( || ( nettle nss libtomcrypt ) ) - nettle? ( !nss ) - nss? ( !nettle ) - libtomcrypt? ( !nettle !nss ) - !sechash? ( !nss ) - !sechash? ( !nts? ( !nettle ) ) -" - -DEPEND=" - caps? ( - acct-group/ntp - acct-user/ntp - sys-libs/libcap - ) - libedit? ( dev-libs/libedit ) - !libedit? ( sys-libs/readline:= ) - nettle? ( dev-libs/nettle:= ) - nss? ( dev-libs/nss:= ) - nts? ( net-libs/gnutls:= ) - pps? ( net-misc/pps-tools ) - seccomp? ( sys-libs/libseccomp ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" -BDEPEND=" - html? ( dev-ruby/asciidoctor ) - nts? ( virtual/pkgconfig ) - sechash? ( - nettle? ( virtual/pkgconfig ) - nss? ( virtual/pkgconfig ) - ) -" - -if [[ ${PV} == "9999" ]] ; then - # Needed for doc generation in 9999 - REQUIRED_USE+=" html" - BDEPEND+=" virtual/w3m" -else - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch - "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch -) - -src_prepare() { - default - - sed -i \ - -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ - doc/* examples/* || die - - cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die -} - -src_configure() { - if ! use caps ; then - sed -i \ - -e 's/ -u ntp//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - if ! use seccomp ; then - sed -i \ - -e 's/ -F 2//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - tc-export CC PKG_CONFIG - - # Update from time to time with output from "date +%s" - # on a system that is time-synced. - export SOURCE_DATE_EPOCH=1607976314 - - # Not an autotools generated script - local myconf=( - $(use_enable seccomp scfilter) - - $(usex caps '' '--disable-linuxcaps') - $(usex cmdmon '' '--disable-cmdmon') - $(usex debug '--enable-debug' '') - $(usex ipv6 '' '--disable-ipv6') - $(usex libedit '' '--without-editline') - $(usex libtomcrypt '' '--without-tomcrypt') - $(usex nettle '' '--without-nettle') - $(usex nss '' '--without-nss') - $(usex ntp '' '--disable-ntp') - $(usex nts '' '--disable-nts') - $(usex nts '' '--without-gnutls') - $(usex phc '' '--disable-phc') - $(usex pps '' '--disable-pps') - $(usex refclock '' '--disable-refclock') - $(usex rtc '' '--disable-rtc') - $(usex samba '--enable-ntp-signd' '') - $(usex sechash '' '--disable-sechash') - - --chronysockdir="${EPREFIX}/run/chrony" - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --mandir="${EPREFIX}/usr/share/man" - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc/chrony" - --with-hwclockfile="${EPREFIX}/etc/adjtime" - --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - - ${EXTRA_ECONF} - ) - - # Print the ./configure call - echo sh ./configure "${myconf[@]}" >&2 - sh ./configure "${myconf[@]}" || die -} - -src_compile() { - if [[ ${PV} == "9999" ]] ; then - # Uses w3m - emake -C doc man txt - fi - - emake all docs $(usex html '' 'ADOC=true') -} - -src_install() { - default - - newinitd "${FILESDIR}"/chronyd.init-r2 chronyd - newconfd "${T}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - docinto examples - dodoc examples/*.example* - - newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" - - if use html ; then - docinto html - dodoc doc/*.html - fi - - keepdir /var/{lib,log}/chrony - - if use caps ; then - # Prepare a directory for the chrony.drift file (a la ntpsec) - # Ensures the environment is sane on new installs - # bug #711058 - fowners ntp:ntp /var/{lib,log}/chrony - fperms 770 /var/lib/chrony - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - - systemd_dounit examples/chronyd.service - systemd_dounit examples/chrony-wait.service - systemd_enable_ntpunit 50-chrony chronyd.service -} - -pkg_preinst() { - HAD_CAPS=0 - HAD_SECCOMP=0 - HAD_PRE_NEW_SECCOMP_LEVEL=0 - - # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5 - # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand - if has_version 'net-misc/chrony[caps]' ; then - HAD_CAPS=1 - fi - - if has_version 'net-misc/chrony[seccomp]' ; then - HAD_SECCOMP=1 - fi - - if has_version '>=net-misc/chrony-4.1[seccomp]' ; then - # This version introduced a new filter level: -F 2 - # It's a limited set of seccomp filters designed to be 'bare minimum' - HAD_PRE_NEW_SECCOMP_LEVEL=1 - fi -} - -pkg_postinst() { - tmpfiles_process chronyd.conf - - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then - # bug #719876 - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" - ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" - ewarn "This is necessary for chrony to drop privileges" - elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" - fi - fi - - # See bug #783915 for general discussion on enabling seccomp filtering - # by default. - local show_seccomp_enable_msg=0 - - # Was seccomp disabled before and now enabled? - if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then - show_seccomp_enable_msg=1 - fi - - # Are we coming from an old version without the new 'minimal' filter? - # (-F 2) - if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then - show_seccomp_enable_msg=1 - fi - - if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then - elog "To enable seccomp in a stricter mode, please modify:" - elog "- /etc/conf.d/chronyd for OpenRC" - elog "- systemctl edit chronyd for systemd" - elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)" - elog "By default, we now use -F 2 which is a baseline/minimal filter." - fi -} diff --git a/net-misc/chrony/files/chrony-4.1-seccomp-glibc-2-3-4.patch b/net-misc/chrony/files/chrony-4.1-seccomp-glibc-2-3-4.patch deleted file mode 100644 index 56dd89b3ffdc..000000000000 --- a/net-misc/chrony/files/chrony-4.1-seccomp-glibc-2-3-4.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://git.tuxfamily.org/chrony/chrony.git/patch/?id=bbbd80bf03223f181d4abf5c8e5fe6136ab6129a - -From bbbd80bf03223f181d4abf5c8e5fe6136ab6129a Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar <mlichvar@redhat.com> -Date: Mon, 9 Aug 2021 11:48:21 +0200 -Subject: sys_linux: allow clone3 and pread64 in seccomp filter - -These seem to be needed with the latest glibc. - ---- a/sys_linux.c -+++ b/sys_linux.c -@@ -503,6 +503,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) - - /* Process */ - SCMP_SYS(clone), -+#ifdef __NR_clone3 -+ SCMP_SYS(clone3), -+#endif - SCMP_SYS(exit), - SCMP_SYS(exit_group), - SCMP_SYS(getpid), -@@ -595,6 +598,7 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) - #ifdef __NR_ppoll_time64 - SCMP_SYS(ppoll_time64), - #endif -+ SCMP_SYS(pread64), - SCMP_SYS(pselect6), - #ifdef __NR_pselect6_time64 - SCMP_SYS(pselect6_time64), -cgit v0.10.2 diff --git a/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch b/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch deleted file mode 100644 index ff3b320d1e47..000000000000 --- a/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/examples/chronyd.service -+++ b/examples/chronyd.service -@@ -8,8 +8,7 @@ - [Service] - Type=forking - PIDFile=/run/chrony/chronyd.pid --EnvironmentFile=-/etc/sysconfig/chronyd --ExecStart=/usr/sbin/chronyd $OPTIONS -+ExecStart=/usr/sbin/chronyd -u ntp -F 2 - PrivateTmp=yes - ProtectHome=yes - ProtectSystem=full diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest index beb91a507086..3f14d6069dcd 100644 --- a/net-misc/cmst/Manifest +++ b/net-misc/cmst/Manifest @@ -1,5 +1,5 @@ -DIST cmst-2022.01.05.tar.gz 3031739 BLAKE2B 19d57e7e62ecc82d9e2d8d54491a46093aa8a6424df6e41a66d6d44a2a49be6d25bcaf699b2da94f26de3ca3fe34a2fa542cc696ce6ab70a799a7a8cab8cb532 SHA512 75f4b611755f24cc193cabd56c053098ebd6be13f6eff0bbde2842f6d35c90111bbf475d7da4dfc1f4462c34e27e526bf8d0ba60ec0ae42ee0cbc582c113bc2f DIST cmst-2022.03.13.tar.gz 3178885 BLAKE2B 0f67d4b63c1d9c5925811ae11cd6e0a16c7edefaf802dfcb7847b5e1ce5dac8435343523b5b6ba863c08d49340a06a16df65f057b7297ff874768b929e30d676 SHA512 ed8ccec8c132bfdb42bcd8429d6b25242ff2575eadf5c60afe04477a3962eb474b841c57cc4dca9345cb61b1a2502873ac91bb97b6766e637ca4254d82856a1e -EBUILD cmst-2022.01.05.ebuild 887 BLAKE2B ca3214162a928ab5975c15a02c29ee01bdad629aea7688a81015e3223d8e285ec061f6fe4c2f19dfb4c12e4fea21750c364a763e1002203c3d1a3a4636fb6e23 SHA512 e9bf2d363d20911881d689555e093ca4bc6cde6a733efe6d3d6fdd7292630fc9a24c63a60e0cd5470072de8aa1bcb7ba2879254e1305e53b6f624869bfc263a5 +DIST cmst-2022.05.01.tar.gz 3427199 BLAKE2B 3e48c45d5ce45259934af95eeb0a6462a62a7caf2c4eb030487c66d1c25ccb6204dd312e778a97310026dd3f7622b43c6b02c6dc750fe81400a756366be6d3bf SHA512 54a3cc6feee7e388d0b84967796b5d3306fdf0c5a1dde17ccaa582f4803841ea624894e6cd9afc4566d6972c1981e848dc12fbd0004669341821c068064770c8 EBUILD cmst-2022.03.13.ebuild 887 BLAKE2B ca3214162a928ab5975c15a02c29ee01bdad629aea7688a81015e3223d8e285ec061f6fe4c2f19dfb4c12e4fea21750c364a763e1002203c3d1a3a4636fb6e23 SHA512 e9bf2d363d20911881d689555e093ca4bc6cde6a733efe6d3d6fdd7292630fc9a24c63a60e0cd5470072de8aa1bcb7ba2879254e1305e53b6f624869bfc263a5 +EBUILD cmst-2022.05.01.ebuild 889 BLAKE2B eb54a7fcf2e5dfc74c2f2a3c14f7377dc5cba74c07f1a546888dff89abf0a34f46e94e96d4b2aa92995bca56af848a4ce5dcec969407e40d38423556dfe5a049 SHA512 26b9525df4fafe9b628a43099c3c6f1860ac102e842992378230250d197661b1ebd6a625ee94b2702ae616d11a201d098dec5da6aa590b9de5e056c9747a9282 MISC metadata.xml 390 BLAKE2B 19055fbf6cc2b268ff117e4cd4e39c894452cd7a3f9c71a113831a142ee4458aae99f86497fc85ee5e29ee73a50d2363ce816e46e2cf3cf47e6be51658d882d2 SHA512 fcc4db887275f29a69ddb8d731f3bc1516734b75bb5ce494d2ddfc13f951a7c1ce9f715383c62725919755b61488943f91c1286d126fb91a24176c24e0e3dcaf diff --git a/net-misc/cmst/cmst-2022.01.05.ebuild b/net-misc/cmst/cmst-2022.05.01.ebuild index 45b56952a1ac..72cbdbb60aab 100644 --- a/net-misc/cmst/cmst-2022.01.05.ebuild +++ b/net-misc/cmst/cmst-2022.05.01.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="dev-qt/qtcore:5 diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest index 85edc8e9bd80..54cb3442c471 100644 --- a/net-misc/connman/Manifest +++ b/net-misc/connman/Manifest @@ -1,10 +1,7 @@ AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40 AUX libresolv-musl-fix.patch 1554 BLAKE2B 496cae4e748089c6f2fe46850a4940660bcaff8289f477e1c4b019f2a854d33022a171d7f16e2b8193c94964806542560e00fbf54e63deea9038845201120aa8 SHA512 c258e747e13b86c81ae96ac1743abf0c1461b9053c5b386d594a49f0b1890f10d89bea92610762ff609a4cc5fea04a43fab83894702f552b05af400f01cb011e -DIST connman-1.40.tar.xz 758516 BLAKE2B 66834032f82e80a6f950d7ff823dc5f1f45090f3444b5a0241cabd0346cf9749b8780b624ce6a8e505305cc1a75423e5a95a7b1f77a282d231845bc33389924a SHA512 33df90814b7499aeafcd51fca4f8ffbc07efacfa29dda46d3b9bcd3ff26264dc53c3991e7e53a8563ca403015c345e59c7ad29427c38ee3d88dd282479db7a0f DIST connman-1.41.tar.xz 758556 BLAKE2B 45e522d4a3a8d1a2f8eb21612d85435020f51387d4285da65da56d022df2d521f81a782af82387bdede8b71bdc591b9ffb8b79e1b1dd9d1d83ffa96eede9c1bd SHA512 b7880d908635ab9350c12e207213d20b11c1a50afcb93ae92e1fc57d4345bf792afe1a5534650e18b8cd05a3766ce9993083b2d659e49f87b867e6f2c1a83b2d -EBUILD connman-1.40.ebuild 2769 BLAKE2B 35f60256a6caacccab4669f29d4fc85dea55eee4d368590ffaae072e1898a4b892b47efa5e244fd83c6edd7266691ce086b96e55921fc4aa9bb1a08de80b64a1 SHA512 14d15a1134310baa57b5de17619fe06faaffe465a4c9a8219be58d40c65048d03f3c2339a67ae36747db31a3a3e9ccb1247c833cf2755741f520b7a28a8b1dc4 EBUILD connman-1.41-r1.ebuild 2821 BLAKE2B 02806a41c60c37033f24562c3300a0a319f92acdd9059d738198d5b63d04309dd409718c96e45ff491f02c04bd5fd96c1580997e0549b0eec00004ab0861be21 SHA512 000ec62fbe715919f3effe2604fe70eb2caeb5bdcd9d052c9e1c79a6d5b1ebf6d3165c3f4c669c713da5a22c1e6a2cb7127034ffb377d8cbc5ddbac9859d6b8c -EBUILD connman-1.41.ebuild 2775 BLAKE2B 43ffd94a5bc41d57f008c8af34819ab0655c5dc5bbe866375818779f0ffaa304f507fa650f0e40a2c63b750f0708a425448b6808d7866a60d1f2d05b39ade5a7 SHA512 498fa57ed4e5f863c66c1a2b4428f54d964b4e8e91d98b5f7b66c1b7c7dc38da3ac499f5e6de070255d9319c33136e93cd6f0742f7b2ce8c41894dde1082ac14 EBUILD connman-9999.ebuild 2768 BLAKE2B 941f992ea03c199415c7c453a58335bc14f5d1bea965a676c364052a4dacaa3b95f28e7b8258f8069d2d4551142a0cd96c4eb748900778612372f79085141446 SHA512 b0e4d9b12c0a509899304e021b36a24ccae6e60334a50561224065b7ab022b14c31336cb4032cbaec05f8fd49db4fdc1c13775cccd434eef2cabc24203b8b495 MISC metadata.xml 1303 BLAKE2B 5fd7c4c795c7003e86fb1f47f9e4569bfce981b13199efe2021009ba659cf67e2afa554fb99ded6f45985a43b09003e483d4c2283434efe26d4e06f7c97df6b0 SHA512 5575e585a4756330c323a2f000a53d80a9bf76225e294888542b5020c72846b27a4c4432d874b1952ed1c7ed4ee26e35925a75fd89d867b82c276784f50c3620 diff --git a/net-misc/connman/connman-1.40.ebuild b/net-misc/connman/connman-1.40.ebuild deleted file mode 100644 index d76ef5ba0be7..000000000000 --- a/net-misc/connman/connman-1.40.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -inherit autotools systemd tmpfiles - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git" -else - SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" - KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" -fi - -DESCRIPTION="Provides a daemon for managing internet connections" -HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/" - -LICENSE="GPL-2" -SLOT="0" - -IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager -+nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard -wispr" - -REQUIRED_USE="^^ ( iptables nftables )" -BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/glib-2.16 - >=sys-apps/dbus-1.2.24 - sys-libs/readline:0= - bluetooth? ( net-wireless/bluez ) - iptables? ( >=net-firewall/iptables-1.4.8 ) - iwd? ( net-wireless/iwd ) - l2tp? ( net-dialup/xl2tpd ) - nftables? ( - >=net-libs/libnftnl-1.0.4:0= - >=net-libs/libmnl-1.0.0:0= ) - ofono? ( net-misc/ofono ) - openconnect? ( net-vpn/openconnect ) - openvpn? ( net-vpn/openvpn ) - policykit? ( sys-auth/polkit ) - pptp? ( net-dialup/pptpclient ) - vpnc? ( net-vpn/vpnc ) - wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) - wireguard? ( >=net-libs/libmnl-1.0.0:0= ) - wispr? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.39" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --localstatedir=/var \ - --runstatedir=/run \ - --with-systemdunitdir=$(systemd_get_systemunitdir) \ - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ - --enable-client \ - --enable-datafiles \ - --enable-loopback=builtin \ - $(use_enable bluetooth bluetooth builtin) \ - $(use_enable debug) \ - $(use_enable ethernet ethernet builtin) \ - $(use_enable examples test) \ - $(use_enable iwd) \ - $(use_enable l2tp l2tp builtin) \ - $(use_enable networkmanager nmcompat) \ - $(use_enable ofono ofono builtin) \ - $(use_enable openconnect openconnect builtin) \ - $(use_enable openvpn openvpn builtin) \ - $(use_enable policykit polkit builtin) \ - $(use_enable pptp pptp builtin) \ - $(use_enable tools) \ - $(use_enable vpnc vpnc builtin) \ - $(use_enable wifi wifi builtin) \ - $(use_enable wireguard) \ - $(use_enable wispr wispr builtin) \ - --with-firewall=$(usex iptables "iptables" "nftables" ) \ - --disable-iospm \ - --disable-hh2serial-gps -} - -src_install() { - default - dobin client/connmanctl - - if use doc; then - dodoc doc/*.txt - fi - keepdir /usr/lib/${PN}/scripts - keepdir /var/lib/${PN} - newinitd "${FILESDIR}"/${PN}.initd2 ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} -} - -pkg_postinst() { - tmpfiles_process connman_resolvconf.conf -} diff --git a/net-misc/connman/connman-1.41.ebuild b/net-misc/connman/connman-1.41.ebuild deleted file mode 100644 index 75fbfd795b38..000000000000 --- a/net-misc/connman/connman-1.41.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -inherit autotools systemd tmpfiles - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git" -else - SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="Provides a daemon for managing internet connections" -HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/" - -LICENSE="GPL-2" -SLOT="0" - -IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager -+nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard -wispr" - -REQUIRED_USE="^^ ( iptables nftables )" -BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/glib-2.16 - >=sys-apps/dbus-1.2.24 - sys-libs/readline:0= - bluetooth? ( net-wireless/bluez ) - iptables? ( >=net-firewall/iptables-1.4.8 ) - iwd? ( net-wireless/iwd ) - l2tp? ( net-dialup/xl2tpd ) - nftables? ( - >=net-libs/libnftnl-1.0.4:0= - >=net-libs/libmnl-1.0.0:0= ) - ofono? ( net-misc/ofono ) - openconnect? ( net-vpn/openconnect ) - openvpn? ( net-vpn/openvpn ) - policykit? ( sys-auth/polkit ) - pptp? ( net-dialup/pptpclient ) - vpnc? ( net-vpn/vpnc ) - wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) - wireguard? ( >=net-libs/libmnl-1.0.0:0= ) - wispr? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.39" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --localstatedir=/var \ - --runstatedir=/run \ - --with-systemdunitdir=$(systemd_get_systemunitdir) \ - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ - --enable-client \ - --enable-datafiles \ - --enable-loopback=builtin \ - $(use_enable bluetooth bluetooth builtin) \ - $(use_enable debug) \ - $(use_enable ethernet ethernet builtin) \ - $(use_enable examples test) \ - $(use_enable iwd) \ - $(use_enable l2tp l2tp builtin) \ - $(use_enable networkmanager nmcompat) \ - $(use_enable ofono ofono builtin) \ - $(use_enable openconnect openconnect builtin) \ - $(use_enable openvpn openvpn builtin) \ - $(use_enable policykit polkit builtin) \ - $(use_enable pptp pptp builtin) \ - $(use_enable tools) \ - $(use_enable vpnc vpnc builtin) \ - $(use_enable wifi wifi builtin) \ - $(use_enable wireguard) \ - $(use_enable wispr wispr builtin) \ - --with-firewall=$(usex iptables "iptables" "nftables" ) \ - --disable-iospm \ - --disable-hh2serial-gps -} - -src_install() { - default - dobin client/connmanctl - - if use doc; then - dodoc doc/*.txt - fi - keepdir /usr/lib/${PN}/scripts - keepdir /var/lib/${PN} - newinitd "${FILESDIR}"/${PN}.initd2 ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} -} - -pkg_postinst() { - tmpfiles_process connman_resolvconf.conf -} diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest index 63a5f9d295df..a4ed5e3c26f0 100644 --- a/net-misc/croc/Manifest +++ b/net-misc/croc/Manifest @@ -1,6 +1,6 @@ AUX croc-disable-network-tests-r1.patch 763 BLAKE2B daf8248adb801bd16f1a567d1ce16746877617a83a2f63ab640312abf3b1089105e8b71b4fcb21ccdf8cd59987ac4e5826463680634c44d417d8bf5c2b514b35 SHA512 659936bafed02bc2274ee7a9a482c711850a08ed1e871584d978930e5b38b019b42b3308a3550e388e04cbdcd92964cb5326fc5825b7b377c11e6ba99660f772 -DIST croc-9.5.2.tar.gz 2833379 BLAKE2B de4623932b03b2c882bfa3f31aba45a6cf6383853a429a1bf5f28330ac8ca264fc3bffb9097c2eb2bc4ec3a8ba1a2ea2fe120cb0da2f6a5adf0180150b73e002 SHA512 d407379da195a0fb69b3fdd2b220e3c700d16380e495a30012628e08e5876cccb09ce3eb285285a1c4c63bfe08d0f7c3d6d64d28edc5332b0f4cd6c87b90a0f3 DIST croc-9.5.3.tar.gz 2847753 BLAKE2B 7ba9f321f3e6edb3e9332ca1e71ef3bcd9ec96ec2040ea00b861e5caa4427035ac4ffd1fbb01ebd944cd77f37e52789f2d6f0fe589646725b25ef2c59a4668e1 SHA512 b4f237af9d36cdf72b993ebbfcb9502f13f383d45888057394a9fe78ac778eefbf9a61268df6e584e8880879195ab1f30cf59ff2b74bfdd16b1d451c8670af5d -EBUILD croc-9.5.2.ebuild 1031 BLAKE2B f72a0826bf7f95a93413559e0511050f05a73c3483207295d44cc632ac555d967c798501e25531a0d04fdaa2d34acea7ee735f9d96f202228bfd41ba47ed8822 SHA512 2bd13bc734de6f47201769ec0aa5a0bfe7a28aa9d5a28e84f1b531999777589be74c28eeb82f510dbcbb88d52c0b2fefa3514459df98d5dd5c3f7d2d185316ac +DIST croc-9.5.5.tar.gz 2868323 BLAKE2B 52fda421cca32ec2f1f45f0df8e38e44c7dbb161856f9624665816b60957f5906ec01b4bdb0efd769974d2eed6f423adf987397a2e6e064e48382286d5c602a2 SHA512 7bb4f23dc6b0f809da87d67b10cfb1530cb138a3a70c9578b35de602ddf90cd0f61c2ba643a83d990890a07de29588b1387b83ac63b8eac2a75620a221330eb8 EBUILD croc-9.5.3.ebuild 1031 BLAKE2B f72a0826bf7f95a93413559e0511050f05a73c3483207295d44cc632ac555d967c798501e25531a0d04fdaa2d34acea7ee735f9d96f202228bfd41ba47ed8822 SHA512 2bd13bc734de6f47201769ec0aa5a0bfe7a28aa9d5a28e84f1b531999777589be74c28eeb82f510dbcbb88d52c0b2fefa3514459df98d5dd5c3f7d2d185316ac +EBUILD croc-9.5.5.ebuild 1031 BLAKE2B f72a0826bf7f95a93413559e0511050f05a73c3483207295d44cc632ac555d967c798501e25531a0d04fdaa2d34acea7ee735f9d96f202228bfd41ba47ed8822 SHA512 2bd13bc734de6f47201769ec0aa5a0bfe7a28aa9d5a28e84f1b531999777589be74c28eeb82f510dbcbb88d52c0b2fefa3514459df98d5dd5c3f7d2d185316ac MISC metadata.xml 327 BLAKE2B f52f36927c80520e4bebaf1e63792cbbf31642eb2a7a4d233446a8328a2c02a69e8662e4f2c0de85228ea2331997f9c432c38d2073a8e1e51f4c024366a8c537 SHA512 531ac4904fbd95dced03613bc852e0d531e8f8498b49741edeefb396be44b8931f716007aaa36cdd1fb257735186a7be9fb6be994881f613dcde5ad6470212a0 diff --git a/net-misc/croc/croc-9.5.2.ebuild b/net-misc/croc/croc-9.5.5.ebuild index 03dce788293d..03dce788293d 100644 --- a/net-misc/croc/croc-9.5.2.ebuild +++ b/net-misc/croc/croc-9.5.5.ebuild diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index c9f0984046b8..74e700cd26b4 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,11 +1,20 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f +AUX curl-7.82.0-certs-processing.patch 853 BLAKE2B 5e05d6f31a93fd81ee597d88c1adeef97ac805befd2615044ad09d41c4b8c8b69f0689b21c2765c547c1dffa695d18791ee4c9301ae9b9e873621fd74eb6107a SHA512 839f262bec4b3730810a3cc849b571c1f7b9482d1c6f37fed9f56e7c3ccf1e07c0eb91bdf973846162bd0e259973e5dc90581db0a9cc7a808924948894437890 +AUX curl-7.83.0-http2.patch 1109 BLAKE2B f1cfcbcd68e046151e5d61c3d95e92cfdec9e412bc51375f08fcb7af508cea19fe48aabdd817949ecde61f9d6ba10d4051f3fe418ce7ca73326847e4bc6b4b04 SHA512 e98eb9129929bd00b1c8387da3668689b4da77b9641761766cf02f28909da5bad8bd506b59b5ce4cd066262a08341d2fa1d39803233c832e998be9a84ecbcab2 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d +DIST curl-7.79.1.tar.xz.asc 488 BLAKE2B cf1864b15ee4b47a61a03968c4fd9526d4c8d0c5a8a0a1357de61758640e6dfda57334df1e63afd94c0064b7e61527623dd20446b27fa0130e0bf92c647d9820 SHA512 4f7930fde0a21358cf0bd8d5cbde5a05efc34202265b4744e59f49d9dc269987f47b4ead77c33e2ae03acabd7b6d6a731c69b91999eea70542f49d9ea0c2ba94 DIST curl-7.80.0.tar.xz 2474492 BLAKE2B 0452ecb6943bc56b20ad8f1223135c9cae68cf31089b0e17e84d81af98dc5a47f5edfc271c5b4c23f232db6cea7ff5a9bffa9c7c319255d9afdb06fa5b8f761f SHA512 e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab +DIST curl-7.80.0.tar.xz.asc 488 BLAKE2B 5cde8a91059bb19b9ee9b1aa4c3225522398a0d5837edf3d99b7f9ea758e5df2a729ce1d0a9763967c2319c30d94ba80ff50888dec07665a818216d42b91feee SHA512 e11adb85fb061bba8838f435f6afb200924f24cb7351d9a8208ec3d317d8ef8c1e16f06dedfc623acc749931015c42dcd86236a53602c6632b3a750841345b05 DIST curl-7.81.0.tar.xz 2486388 BLAKE2B bf8a3a03564648a9d7a5b4e7a523d840230f03237cf9eb5b07dcb4f531b036eb8111c1944bedd0c1df188e09a09468b3487d24ea50781124bc33d194546691f4 SHA512 38355aaee38db04bb2babdc5fd7a88284580c836d15df754f42b104997dd344b7841be8e53b4fc91aea31db170a7d6967c4976833eb4bfe0d265c7275c4800df +DIST curl-7.81.0.tar.xz.asc 488 BLAKE2B 9280f10b14ddd95a1405fda79f8c51528c91c5e86b8f90d16d20d7f11d212e6e4391377eed971d0b0b27f5f4692c702e9d7a11705f0558ad39df38608d6a0648 SHA512 ca32a639900a9f8211005227dfb594f809c5ca5ec1eb87e944ef33cca60e4844f5b6ebe49de79fba53068e5dee9652b1d43a7d3a74e05419a2ffb5b40dab8176 DIST curl-7.82.0.tar.xz 2446764 BLAKE2B 838accae4a45c090909cff91477a023789a79535691c80e507fd9e9712861b0c08e25ecd26079cb8ac8946cdf429a50991a7521e7b550b43c19e455625bc0750 SHA512 a977d69360d1793f8872096a21f5c0271e7ad145cd69ad45f4056a0657772f0f298b04bdb41aefd4ea5c4478352c60d80b5a118642280a07a7198aa80ffb1d57 -EBUILD curl-7.79.1-r1.ebuild 7957 BLAKE2B dc4d20d1a6bff37960f5c03dfdd6359a173a5b133b41dc5bce6172e543c4bd24129a1097bd949895770dc73e0be968a6ead19cc7dff45a635cbfe19556233cec SHA512 f20444dc9b5f0ddacd62293b3c9289836d48c1ff7a9c21d5555fc2bdcb67c588f07a912b89b7427adab9aac6217282b42a888a08b4d1cd588504c4be0e19d4cc -EBUILD curl-7.80.0-r1.ebuild 7506 BLAKE2B 51a738a98dfe4a4b2f8e79cd241297a1a1687191f37119db39b8c10251f7d7209d3dd2e2c59637a3cb59ae3d1fb17caf90787153891625ec4b001e4d3ae49526 SHA512 76c9d89615d65d2c0d4ddd55c9ee51b7058a86d4e47928d20e0589874ab9382807eec90d026f4c922eb14fae9eecacb770ac76308186b1b59e5841e462ffb240 -EBUILD curl-7.81.0-r1.ebuild 7506 BLAKE2B f4c85463fe2bc4eb6a9fc0bbf6b58069768bc40ae341ee5396a8265d6f2b8de198d6b560dd97684db1dbfc6e2ae65bbbe15689d85c77f7ef62586f91061a93f8 SHA512 882730b1b758bce4a677f923d01fde75fb39b759f29b1b25445980409e52c3a23af42acaafb1cccbed0a9a6ca39e9833cf13647001277185ac989ea24d6ccd44 -EBUILD curl-7.82.0-r1.ebuild 7528 BLAKE2B bb06f485c65045b022d3a3ea031903bfd9086770f82b139b2fb45ad74f0bdb0062d71a6a17307d2a4b3dfdf0c88b3291dfe35a840584641595dcbc803a2ed225 SHA512 9e45306043a75380354628ae8054d8a2df25c2af013db51d116e0fd9ba18d90eba23052a012ddf0acb22d5e02b92e8ace079455074c365564b65ed4972708aec +DIST curl-7.82.0.tar.xz.asc 488 BLAKE2B 9da4ea63671621df956aa5dc191cfc6c8d2a8b1958416ca58ffc04d43ed65b89244968588879e6bd3299ca8f60b1eccb34dede012f8a2a37acf3ca34021da958 SHA512 1f14d8ab55360ba735dff916369ee318e98767718394654ce9443b6013509b6d3ed5597685b142e9823cec7496373b709a8656515d66039c06783879655151fe +DIST curl-7.83.0.tar.xz 2472560 BLAKE2B 0669f40265a56e7549e8038ed8421680d7264bff44dcc0692cf9f5248621311be5e228314710149bf9d2ccbe739f929039e04402c1d04a1362d0bbf08cb8cdc7 SHA512 be02bb2a8a3140eff3a9046f27cd4f872ed9ddaa644af49e56e5ef7dfec84a15b01db133469269437cddc937eda73953fa8c51bb758f7e98873822cd2290d3a9 +DIST curl-7.83.0.tar.xz.asc 488 BLAKE2B a8f6dcf00f1b01b457a7eecc8364538393f414df60757f3664709c62b6007023a34ddf4ecb4688734e396031d30905b490dd0c115f09a9428db6a6be97cdf72c SHA512 8fb90f9692f4fdb82ea49f0e5151219b2334da5d3910f28e787bb688fb055b8b028ccf75cdcc15cd9f86d780d479f88f902fef7d7b9e007a4b849cb25c6c13cc +EBUILD curl-7.79.1-r1.ebuild 8166 BLAKE2B 69d521028d1ff2d37b270539c8ad37a8033923d60ad057a347b843587a035c0afb829361fb605ef4186243657bef6a94156e493321161c62d16ecc2b4a73d0f0 SHA512 05ef78d4080f609ff1a5deb191d1d7d09ddfe58c617cd8688c231c4e71268784ebc9c2eee1a5a023488868d23b15db7b04718e6e7a3b4dbe17ac9880eeaa1eb9 +EBUILD curl-7.80.0-r1.ebuild 7715 BLAKE2B 13c87739394cb6a67ba281c62ff526f90cf1a569bb1efde7062b7c68ed778df5a21cde4539fce35e9585121618db7bafa57546b3bbdd9f7db0e9449284ab2ad0 SHA512 e7f91f01ff332f7a72aeceed4f739da7b8d950ca0574e541c4992e9a254168102d3337c09d18748ae326b20cb64d6eee78bdc672ef4497b5a925aa7f1d475f1f +EBUILD curl-7.81.0-r1.ebuild 7715 BLAKE2B 43b427e5dcc240c051bfb8e01d876af9b1cf73a6016035893bc3024d7ceccfd72615bd327f5898a58ddd6c772953d7d2a30613cb70bca92cdbdf904bd6782ab2 SHA512 b76b11e4cae0026c4a887218be05dc49ec261e493891183dec84d07f1238437a12598a9db7ddf20731b69564479e1da2278457f41990ddd1d4da5a20deed9c31 +EBUILD curl-7.82.0-r2.ebuild 7787 BLAKE2B ce60b96c42b3803fd2bf8d55dba99267ce8ac34796bbdd93217e5e767aa4ab0e5bde123e8dab78ce5fa4dcdcbf7887fe9a16171dce06f30125acccf8b38048b7 SHA512 65c6d9765a799e28bdb32e35831c6de269758f2058aef9927b434de9ab6bb91e3db55225d7c7606099db8395e6997a3ca0c4d02e48b029851eea6edbeef43ba1 +EBUILD curl-7.83.0.ebuild 8371 BLAKE2B ff1769914582fea62d02521d4e9bf858151a6c4f4fd9460eefd88c8161dfec5ea1e4433044af508d022018c0428151f6fc5b032e99cbdf278690601ce9f01b2a SHA512 fd1f368701c446ef3c4c8e79b1fa5734ab618923b702d56dccfaef911ccb1d2ebf37398677e6c150e97496f683bf3bc39e36fab5afcc71b785730527dec4fc77 MISC metadata.xml 2050 BLAKE2B a795f1af5b0945a936d279317ac89de2c32ca0e0512ccbd5d19acd29d82415d6c8e4ea4480150de8910b0a1c5e7ce4260b3c26f5f720a4ec828c4d78f6d40adf SHA512 add740cc284bd6912dcd4beb1d706cbfde85ff9859032b9706dddb69dbd5df613043f8e2b1fe634700b97a92cd6a953908486ec9b7b1564a16ecbec2c48b5dfd diff --git a/net-misc/curl/curl-7.79.1-r1.ebuild b/net-misc/curl/curl-7.79.1-r1.ebuild index fc93e21ea1cc..ac8292e30cfe 100644 --- a/net-misc/curl/curl-7.79.1-r1.ebuild +++ b/net-misc/curl/curl-7.79.1-r1.ebuild @@ -3,11 +3,12 @@ EAPI="7" -inherit autotools prefix multilib-minimal +inherit autotools prefix multilib-minimal verify-sig DESCRIPTION="A Client that groks URLs" HOMEPAGE="https://curl.haxx.se/" -SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" +SRC_URI="https://curl.haxx.se/download/${P}.tar.xz + verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" LICENSE="curl" SLOT="0" @@ -15,6 +16,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd" IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" nghttp3 quiche" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc # c-ares must be disabled for threads # only one default ssl provider can be enabled @@ -84,7 +86,8 @@ BDEPEND="dev-lang/perl test? ( sys-apps/diffutils dev-lang/perl - )" + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) diff --git a/net-misc/curl/curl-7.80.0-r1.ebuild b/net-misc/curl/curl-7.80.0-r1.ebuild index 5dc026fde598..f1c2d6838600 100644 --- a/net-misc/curl/curl-7.80.0-r1.ebuild +++ b/net-misc/curl/curl-7.80.0-r1.ebuild @@ -3,11 +3,12 @@ EAPI="7" -inherit autotools prefix multilib-minimal +inherit autotools prefix multilib-minimal verify-sig DESCRIPTION="A Client that groks URLs" HOMEPAGE="https://curl.haxx.se/" -SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" +SRC_URI="https://curl.haxx.se/download/${P}.tar.xz + verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" LICENSE="curl" SLOT="0" @@ -15,6 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~ IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd" IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" IUSE+=" nghttp3 quiche" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc # c-ares must be disabled for threads # only one default ssl provider can be enabled @@ -78,7 +80,8 @@ BDEPEND="dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils - )" + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) diff --git a/net-misc/curl/curl-7.81.0-r1.ebuild b/net-misc/curl/curl-7.81.0-r1.ebuild index 772988452027..e47b2c09b3db 100644 --- a/net-misc/curl/curl-7.81.0-r1.ebuild +++ b/net-misc/curl/curl-7.81.0-r1.ebuild @@ -3,11 +3,12 @@ EAPI="8" -inherit autotools prefix multilib-minimal +inherit autotools prefix multilib-minimal verify-sig DESCRIPTION="A Client that groks URLs" HOMEPAGE="https://curl.haxx.se/" -SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" +SRC_URI="https://curl.haxx.se/download/${P}.tar.xz + verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" LICENSE="curl" SLOT="0" @@ -15,6 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~ IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd" IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" IUSE+=" nghttp3 quiche" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc # c-ares must be disabled for threads # only one default ssl provider can be enabled @@ -78,7 +80,8 @@ BDEPEND="dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils - )" + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) diff --git a/net-misc/curl/curl-7.82.0-r1.ebuild b/net-misc/curl/curl-7.82.0-r2.ebuild index 9b955edd99ac..e4a7ea60d92d 100644 --- a/net-misc/curl/curl-7.82.0-r1.ebuild +++ b/net-misc/curl/curl-7.82.0-r2.ebuild @@ -3,18 +3,20 @@ EAPI="8" -inherit autotools prefix multilib-minimal +inherit autotools prefix multilib-minimal verify-sig DESCRIPTION="A Client that groks URLs" HOMEPAGE="https://curl.haxx.se/" -SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" +SRC_URI="https://curl.haxx.se/download/${P}.tar.xz + verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" LICENSE="curl" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd" IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" IUSE+=" nghttp3 quiche" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc # c-ares must be disabled for threads # only one default ssl provider can be enabled @@ -78,7 +80,8 @@ BDEPEND="dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils - )" + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) @@ -93,6 +96,7 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-7.30.0-prefix.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${P}-certs-processing.patch ) src_prepare() { diff --git a/net-misc/curl/curl-7.83.0.ebuild b/net-misc/curl/curl-7.83.0.ebuild new file mode 100644 index 000000000000..041b6cd5a2e4 --- /dev/null +++ b/net-misc/curl/curl-7.83.0.ebuild @@ -0,0 +1,290 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit autotools prefix multilib-minimal verify-sig + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.haxx.se/" +SRC_URI="https://curl.haxx.se/download/${P}.tar.xz + verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )" + +LICENSE="curl" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd" +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" +IUSE+=" nghttp3 quiche" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc + +# c-ares must be disabled for threads +# only one default ssl provider can be enabled +REQUIRED_USE=" + threads? ( !adns ) + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + ) + )" + +# lead to lots of false negatives, bug #285669 +RESTRICT="!test? ( test )" + +RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + mbedtls? ( + net-libs/mbedtls:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + openssl? ( + dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + nss? ( + dev-libs/nss:0[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + ) + http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) + nghttp3? ( + net-libs/nghttp3[${MULTILIB_USEDEP}] + net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + ) + quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) + adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + sys-libs/zlib[${MULTILIB_USEDEP}] + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" + +# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 +# rtmp? ( +# media-video/rtmpdump +# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) +# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) +# ) + +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/perl + virtual/pkgconfig + test? ( + sys-apps/diffutils + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + # Bug 842780, fixed upstream, drop on next version bump + "${FILESDIR}"/${P}-http2.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl ) + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + #myconf+=( --without-default-ssl-backend ) + if use ssl ; then + if use gnutls || use curl_ssl_gnutls; then + einfo "SSL provided by gnutls" + myconf+=( --with-gnutls --with-nettle ) + fi + if use mbedtls || use curl_ssl_mbedtls; then + einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use nss || use curl_ssl_nss; then + einfo "SSL provided by nss" + myconf+=( --with-nss --with-nss-deprecated ) + fi + if use openssl || use curl_ssl_openssl; then + einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + + if use curl_ssl_gnutls; then + einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_nss; then + einfo "Default SSL provided by nss" + myconf+=( --with-default-ssl-backend=nss ) + elif use curl_ssl_openssl; then + einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + else + eerror "We can't be here because of REQUIRED_USE." + fi + + else + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-crypto-auth + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + $(use_enable ipv6) + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --disable-sspi + $(use_enable static-libs static) + $(use_enable threads threaded-resolver) + $(use_enable threads pthreads) + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --without-fish-functions-dir + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + --without-libpsl + --without-msh3 + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + $(use_with quiche) + $(use_with rtmp librtmp) + --without-rustls + --without-schannel + --without-secure-transport + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + ) + + ECONF_SOURCE="${S}" \ + econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # avoid building the client + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use quiche; then + libs+=( "-lquiche" ) + priv+=( "quiche" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "-libtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc +} + +multilib_src_test() { + # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 + # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) + # -v: verbose + # -a: keep going on failure (so we see everything which breaks, not just 1st test) + # -k: keep test files after completion + # -am: automake style TAP output + # -p: print logs if test fails + # Note: if needed, we can disable tests. See e.g. Fedora's packaging + # or just read https://github.com/curl/curl/tree/master/tests#run. + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/curl/files/curl-7.82.0-certs-processing.patch b/net-misc/curl/files/curl-7.82.0-certs-processing.patch new file mode 100644 index 000000000000..a62c1df20b30 --- /dev/null +++ b/net-misc/curl/files/curl-7.82.0-certs-processing.patch @@ -0,0 +1,27 @@ +https://github.com/curl/curl/issues/8559 +https://bugs.gentoo.org/836629 + +From 911714d617c106ed5d553bf003e34ec94ab6a136 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Tue, 8 Mar 2022 13:38:13 +0100 +Subject: [PATCH] openssl: fix CN check error code + +Due to a missing 'else' this returns error too easily. + +Regressed in: d15692ebb + +Reported-by: Kristoffer Gleditsch +Fixes #8559 +Closes #8560 +--- a/lib/vtls/openssl.c ++++ b/lib/vtls/openssl.c +@@ -1817,7 +1817,8 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy *data, struct connectdata *conn, + memcpy(peer_CN, ASN1_STRING_get0_data(tmp), peerlen); + peer_CN[peerlen] = '\0'; + } +- result = CURLE_OUT_OF_MEMORY; ++ else ++ result = CURLE_OUT_OF_MEMORY; + } + } + else /* not a UTF8 name */ diff --git a/net-misc/curl/files/curl-7.83.0-http2.patch b/net-misc/curl/files/curl-7.83.0-http2.patch new file mode 100644 index 000000000000..ede69a177b98 --- /dev/null +++ b/net-misc/curl/files/curl-7.83.0-http2.patch @@ -0,0 +1,30 @@ +Bug: https://bugs.gentoo.org/842780, https://github.com/curl/curl/pull/8768 +https://github.com/curl/curl/commit/6eb7fb37d901ed1e4ce07cbd628ee11bf02db1f3 + +From 6eb7fb37d901ed1e4ce07cbd628ee11bf02db1f3 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Thu, 28 Apr 2022 17:11:50 +0200 +Subject: [PATCH] mbedtls: fix compile when h2-enabled + +Fixes #8766 +Reported-by: LigH-de on github +Closes #8768 +--- + lib/vtls/mbedtls.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c +index 64f57c5d8321..5f9b87e6b75b 100644 +--- a/lib/vtls/mbedtls.c ++++ b/lib/vtls/mbedtls.c +@@ -815,8 +815,8 @@ mbed_connect_step2(struct Curl_easy *data, struct connectdata *conn, + if(next_protocol) { + infof(data, VTLS_INFOF_ALPN_ACCEPTED_1STR, next_protocol); + #ifdef USE_HTTP2 +- if(!strncmp(next_protocol, ALPN_H2, ALPN_H2_LEN) && +- !next_protocol[ALPN_H2_LEN]) { ++ if(!strncmp(next_protocol, ALPN_H2, ALPN_H2_LENGTH) && ++ !next_protocol[ALPN_H2_LENGTH]) { + conn->negnpn = CURL_HTTP_VERSION_2; + } + else diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest index a88d53af56c7..793795c7b771 100644 --- a/net-misc/dahdi-tools/Manifest +++ b/net-misc/dahdi-tools/Manifest @@ -7,5 +7,5 @@ AUX dahdi-tools-3.1.0-fno-common.patch 1030 BLAKE2B ca9f8ce7116656f66107194c7cce AUX dahdi-tools-3.1.0-parallel-make-no-config.patch 681 BLAKE2B c72cc644d88514c836784511abd9d4c06009218a311dc937b32fe3bcd048ae17439a882ed6a5f159e619eea478d664552e59b7a2ff6b4331c9b44e7ed93033c8 SHA512 d368a0fb5b03618d4adb49c01a6ccb518a67b7e48a209b927878b71b68e4a4a1093574e394970f9d6426bd75b5ca737326f27fc8322654ce39f9b2b272813992 AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694 -EBUILD dahdi-tools-3.1.0-r2.ebuild 2107 BLAKE2B b948eceb9ffbb90b991a33319e9c607e9e4ab810dee34ce160d7f3e7708df9ec9ae70c9e97b4410a9fd4df29d5ebcefb1f89b26842fa9dcb5af4af0dc322a854 SHA512 a2afb9b44b897ff1905401a51789223d01b86d8a11f7e91fbfbe5395b8f6d11fcb2c10c39be4caba9a64b5eea3c8294b4adc2a0aded5bf794601220b9f3caacd +EBUILD dahdi-tools-3.1.0-r2.ebuild 2152 BLAKE2B 2c84f625ba1d41d43a69841c8d4dcbe898e1f5c54c54b0a554b3e382c0861fa97b4d027fb63b1b4e4ae2fa7b32dd81389554af2cab3cedfad0c68c2288748537 SHA512 b4e76d483b67390b1a889d868118093d2d5db443d80ded95c0a3424b478a16da934b3911fa451ae7fca380f3a76fad6b821f2ca9ba91f87b27869f15d14b486c MISC metadata.xml 474 BLAKE2B 05062875e00c015c39cce4432a8197606dcbe1d40efb3058843c05defedd04304581a449b7a1abeb37ac96c5e6c9559ef9b36f7cbe1123783cc1822a25c5ee78 SHA512 bd60b375dd7863a16f525eb82c7c97d2a93032a93963ab764523fb774692b2ad107cb69eab4eacc695d67316307b91bac8e299a9c3d2689894d9dc174516c2a7 diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild index 33e37114b885..49903c27e61a 100644 --- a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild +++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools bash-completion-r1 perl-functions +inherit autotools bash-completion-r1 perl-functions udev DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" HOMEPAGE="https://www.asterisk.org" @@ -47,7 +47,7 @@ src_install() { local bashcompdir="$(get_bashcompdir)" local bashcmd bashcmdtarget - emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir=/lib/udev/rules.d install + emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install emake DESTDIR="${ED}" install-config dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest @@ -64,3 +64,7 @@ src_install() { # Delete *if* the libtool file exists, bug #778380 find "${ED}" -name '*.la' -delete || die } + +pkg_postinst() { + udev_reload +} diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index 38802b29f983..74067c0e1697 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -26,6 +26,6 @@ AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9 DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040 DIST dhcp-4.4.3.tar.gz 10078953 BLAKE2B d88570760cc00bd72d1e9c2e76c7a7b9f07cadfbe044220a43ee33fc201c217725c3909a386ae11f28346920dacb0313d78193a9e3d7eac9757384b4fe762597 SHA512 4472d6794af80b482560956cee6895889cc1aca39980f851faf56824627e95731f2983cf7c7454bc3decb0a12c874fcbd29bd6c5a9695412def6bc14c6df17e0 -EBUILD dhcp-4.4.2_p1-r2.ebuild 8388 BLAKE2B e15cf0c72a535417561f5e4aeab3872a0032a94cd7dec5a0d9911f3724310357279c05ab5c799266e0883d02e26a8daa4604f504e45de1c6854851867f536295 SHA512 c730d446fc5d64bd366385535755b8932d0a4692d7c6687822af5d7add14ca396d55f29457d56a21bf611f31b567e18e0bb0a272e0f33c0ddcc86bbebf74b089 -EBUILD dhcp-4.4.3-r1.ebuild 8512 BLAKE2B 4625cf2ee8d1f2c67e780c1a512626f8fd5f33e3c95f74f8df7c3b2e9cc4e32dcf260a523873570cc4e1d0b395750a0f1b1ab010a4f246f2ef7867cc2cb8edc5 SHA512 4062f586a3ec9e47c119456cc2e15381e86730231b5cca3ab4e84e3f85e1d171df9cf28ccc54199c2f5041bb67ecd2b280327bb2e98c7adf57bb1c5ac74f869f +EBUILD dhcp-4.4.2_p1-r2.ebuild 8410 BLAKE2B bce58f30a590a98a8d5d61076ae43d5783ab2daa6095456e4253b671d94f2012072d4525ec8e7fff2adc641496ba519aa06d438d66ab969c37cbe0a3a4f339cf SHA512 e6fe16ac2fc57f9eaa9bdafc2af75fec1053cb6191a79d1b09064cdf77c0a88e0f7254d5b97e3a1a72477814d2d57d26cc2719eef543b2c538f3d62b802fbacc +EBUILD dhcp-4.4.3-r1.ebuild 8534 BLAKE2B 74abdb1e4b5b61a60a81635efe42db161f851cf219c041be04a4c306c03dfe4675fdc9dfdc05fb285f3594a0fe7b6b21c1ed8122a111871a9cbeb356e23a128a SHA512 2d24aed63de63687328361c50dd996a195dd655845f71cc47e22bdab81a58fd43ea51a863f8c77b4790088eae5bb2f4c60b5932e3291004fb349dd0e04f23f6e MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d diff --git a/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild index df94d6ae017e..6b2cf7158832 100644 --- a/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild +++ b/net-misc/dhcp/dhcp-4.4.2_p1-r2.ebuild @@ -163,8 +163,8 @@ src_configure() { # bug #787935 append-flags -fno-strict-aliasing - # https://bugs.gentoo.org/720806 - if use ppc || use arm || use hppa; then + # bug #720806, bug #801592 + if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then append-libs -latomic fi diff --git a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild index b261be6fe3cc..0cd58207062a 100644 --- a/net-misc/dhcp/dhcp-4.4.3-r1.ebuild +++ b/net-misc/dhcp/dhcp-4.4.3-r1.ebuild @@ -167,8 +167,8 @@ src_configure() { # bug #787935 append-flags -fno-strict-aliasing - # https://bugs.gentoo.org/720806 - if use ppc || use arm || use hppa; then + # bug #720806, bug #801592 + if use ppc || use arm || use hppa || [[ ${CHOST} == i486* ]] ; then append-libs -latomic fi diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index dd06f6cef42b..23f64095dd85 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -6,6 +6,6 @@ AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45 EBUILD dhcpcd-9.4.0-r1.ebuild 4778 BLAKE2B 509b52d1d4334116b1c5d3fdd41e53ee52b206c1f92e58402384b8d9b8c85370a9f008aa2028293c0a450542dea53bbc44f4d26b4999dd298ea3e478295991a8 SHA512 2605a40bc99c35f1acaf8beeedc37d2ee4e82b2693bb0b40b004d785718b54ee0c8bda11f621e5d2a9e62c465380ca061b8e61384eb5f5dd8a183ef018e10bc0 -EBUILD dhcpcd-9.4.1.ebuild 4647 BLAKE2B a722a65460483c3eb185c6ab5a11e09a68f706b50ec1e2d73f0e32e88e33000d04290e98d88fea1f439a9f0d86f09a2d6573441ec4501a353630b8d1f86c9d2c SHA512 448bbe2b5d26c1ab2ba0d35e2e6d87ea936771342f825aa330de01f0cfa11ba14321d474111f17726c79c5bb6395dc5212a191ab3a1eda15f063876b80d935e2 +EBUILD dhcpcd-9.4.1.ebuild 4639 BLAKE2B 7fba6ef68f78a85ba37f82f67371d05ff49d7b0c1e40ce66773a490523ae7364a9fd2eb4a432bab11d806ac752fe9343cd23bb1d85be6fc8fe23cee913d4c2c9 SHA512 bc6b360259c18262fbb9fdcac56324ee56d2726157222fdf021fa8bcdaee6932bac285554faa186b31c6eee221031f9e6b4b4bb85a8fe13e851662c3290e26a7 EBUILD dhcpcd-9999.ebuild 4647 BLAKE2B a722a65460483c3eb185c6ab5a11e09a68f706b50ec1e2d73f0e32e88e33000d04290e98d88fea1f439a9f0d86f09a2d6573441ec4501a353630b8d1f86c9d2c SHA512 448bbe2b5d26c1ab2ba0d35e2e6d87ea936771342f825aa330de01f0cfa11ba14321d474111f17726c79c5bb6395dc5212a191ab3a1eda15f063876b80d935e2 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45 diff --git a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild index 6ad423e41da9..1aa27d0a3b4e 100644 --- a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild @@ -13,7 +13,7 @@ else MY_P="${MY_P/_beta/-beta}" MY_P="${MY_P/_rc/-rc}" SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index d10c2aabd755..6b7ae1ad8d57 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -1,9 +1,10 @@ AUX dropbear-0.46-dbscp.patch 432 BLAKE2B 93f27fb4f5806d7a5e637ccc3ed14b6929d25b395d4731807895761a3cec76de8fcc154db85bb4913214ecac4f65a85489e0091d36c213be38b7b1f7719d5694 SHA512 071a346dbd98490a1ad967b582bb54ef07c45bb25e3b130eb7f22405dd361d6a54061a800e687385f37b2efd4057efcac8e4d07506b9100e51a334c0be12e2d6 +AUX dropbear-2022.82-x11.patch 636 BLAKE2B 89e95851d9f184d215f1e6ffd972f9519be8ef0c153d49306c3fe09b97c8e3ae4b8c1705c0f1532681c4d5e49f17f6f85f8c75667f2340d3cdd1a1e52a9795cf SHA512 ceacd4776d3c7b4c830bdded66e61b77c8e267fdcc0f0b42fd0ad4981610bdcfca98e2dc14c48eac5681035f2e7f0644553dfb419424d1536bf4f7b81e577f6c AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8 DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da DIST dropbear-2022.82.tar.bz2 2309514 BLAKE2B 56ff931de1e5681850a4c96b8f2c1d90db1680a08a8a741ae3034a433c2780715ede9754357477c9adfe35a310859641d7a03534e6a656e11cd7de8832fbc27d SHA512 94c664e0d56bce3750b04aff166bf073f778dc2aa08e093541b520db1f165d4173e1cf25eef69a59b0a5a0a63cfb3ce8bbf94d6c4010687a0233ba1ad8ea403b DIST dropbear-2022.82.tar.bz2.asc 833 BLAKE2B 7d152456f24a61add2935e7f2c9ae7a05e00137ae2c39638004cccc1fd0491311328b5e829443cbe727ae6ec9d58973270b917bae0f23ddcef0b5051b62ca60b SHA512 a45fa49857598195b8d7e51e02bf26498a74c6900245c114ce1fa19bc4eb0ef0518cbb68996c3584c0b98c22bb2078eb963e4a513f0dfb03baae6d04f5911105 EBUILD dropbear-2020.81-r3.ebuild 3009 BLAKE2B c85c3b010afa5aa31cad91e362385a38d7e39467d2b6b0353898eb603e3624da7b520c79512c3ae87b100445d4470eac16b762391589a2e4091de2a92767285e SHA512 bfb2f428fa98bb9accb282c18cb13378970362705f74a04711604dbe8ad9c25619f2b96d6e5df4060a9b556d04ea7fc7d695a1741481d541cc6032b131fbdfeb -EBUILD dropbear-2022.82.ebuild 3395 BLAKE2B 0413546d02089e7477fc0844cf05ef5836ed3cc758d48a2fe99b229e2b4587cc2b51248cbf143734a56a45a40d46ce5fb4a700de46f58ec4dad565f14c9568fe SHA512 b32dc2140c1a9d14be678392c267152da849cc753ca1dfa3238c9147508b3dcd88789a6bdbe96cf7f3fb2c53e9f2fb14d04301cdfc4951c60f70f4f7e62b4778 +EBUILD dropbear-2022.82.ebuild 3434 BLAKE2B 68136a480b294f7885413772c284909f9b8f689c58df682c988548d5bd0b0301807893091881047a6174f6eb720075729aeb8c5c8d61fe09e1a28bb70d5b69d5 SHA512 d59db5bcec4cd29cb755dc0970a2880d0b3d36a505d28f48265e3a430ddb68dbbfb095b681d0563621a830f892bdb1a1829dbfb28ab6389f6ac93804fdc6c3d6 MISC metadata.xml 1792 BLAKE2B 11de80280a55da65d07a8a89195bd8342b34c5ac2b15b8c86aaee64dd81253bd0b3d0b6ce1b5544dbbb290a9359194981357b7e95570e52c45103c482a1828c9 SHA512 1d18e935fab0b524df060d3b4a000b9bd639f75f40328137c7bdf0b6a016307d3ddf7c60bf5e6500489d8e721fca39bc6332ace5fad97d2f0a9de91136da91dc diff --git a/net-misc/dropbear/dropbear-2022.82.ebuild b/net-misc/dropbear/dropbear-2022.82.ebuild index 27bbc8b51dd6..1df3c22e1a2c 100644 --- a/net-misc/dropbear/dropbear-2022.82.ebuild +++ b/net-misc/dropbear/dropbear-2022.82.ebuild @@ -45,6 +45,7 @@ REQUIRED_USE="pam? ( !static )" PATCHES=( "${FILESDIR}"/${PN}-0.46-dbscp.patch + "${FILESDIR}"/${PN}-2022.82-x11.patch ) set_options() { diff --git a/net-misc/dropbear/files/dropbear-2022.82-x11.patch b/net-misc/dropbear/files/dropbear-2022.82-x11.patch new file mode 100644 index 000000000000..82cb9c812ebe --- /dev/null +++ b/net-misc/dropbear/files/dropbear-2022.82-x11.patch @@ -0,0 +1,22 @@ +From 0292aacdf0aa57d03f2a3ab7e53cf650e6f29389 Mon Sep 17 00:00:00 2001 +From: Matt Johnston <matt@ucc.asn.au> +Date: Sat, 23 Apr 2022 22:33:31 +0800 +Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY + +--- + svr-x11fwd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/svr-x11fwd.c b/svr-x11fwd.c +index 353cb12e..5d9e6a96 100644 +--- a/svr-x11fwd.c ++++ b/svr-x11fwd.c +@@ -206,7 +206,7 @@ void x11cleanup(struct ChanSess *chansess) { + } + + static int x11_inithandler(struct Channel *channel) { +- channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE; ++ channel->prio = DROPBEAR_PRIO_LOWDELAY; + return 0; + } + diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index b53705e6781b..495973189f21 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -2,10 +2,10 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85 DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712 -DIST dropbox-lnx.x86-144.4.4491.tar.gz 102606173 BLAKE2B e662ffac51126b1541a448a32aa4885e4a9a300a48cda79b2cd26e9edcdc53c2cf76dd1e03be4bc7d44d2a7c11e2b7f32d2b89af6ded4c650af8f05ddd865753 SHA512 ed040ddc8883877dd28966691ac068e26cc57a89d9cd9c364b005afb6057c025ec7182f341e1d8c7c2edb1d65ad7ab71a8f39c17e2dcbf73a5af6eba1275986b -DIST dropbox-lnx.x86-145.4.4921.tar.gz 102627045 BLAKE2B a048bce81530d3874f4139e6e98e787f4e2242da830b5a5a43e6ec5f5502ad91bd90bfd25d2068895d18487b516cbd1e35c2fc2cfee9a50f15aca20ea48f8f6b SHA512 3bc7059e5387862c9ccc720f620d7aa47b594c78360f7644b5312659056cbca7cd345c0ee784b4de20c2bcd5f47958a64cc0e0eb63200bdfa8b73e6c06156f0a -DIST dropbox-lnx.x86_64-144.4.4491.tar.gz 104875474 BLAKE2B 42dd986edcf1ae6b709f0a52872219618d771636dccd6f4d0ff0abd7302c8d9358ed0cc6f6f26fb007633a9696f6119c7aac80f631f6687203cd8ed85760f8e4 SHA512 4bef381d4ab177325cd089a854942814b8a7efd553b4f71980c17ea1312d8e9c9a64662ab6a99626254e50a195c2c66f5fc92f465f12881cbd4e89618e120d89 -DIST dropbox-lnx.x86_64-145.4.4921.tar.gz 104888508 BLAKE2B 11a91e4c0da4066e4d18daaf5e066c141bb480811a54e3aab8b7c6ef3a96faaee40d5d7007c871de7cc1bd5f402a03c2586de49a13ff2ce75d5bf1dbf120d1bd SHA512 f3f8805c7f98f5bc0010545be2daa9d8713253a5391494537b5c2a8e010b605f50a32ebf1dff473ce6e8768e5350a8b62310541197de24b44a4c5c2295d43c30 -EBUILD dropbox-144.4.4491.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5 -EBUILD dropbox-145.4.4921.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820 +DIST dropbox-lnx.x86-147.4.4800.tar.gz 102214911 BLAKE2B a35086b6787cf442a326d1f6a3e6bd1d453a6d76817ece33f9a43d6d35182b20c343eafded7a6023b37267fc2c3b99896e28f7913ed18f5541fe107b0235cbe9 SHA512 16b40b080ce0b97d0d3da86543a31f07331d27ec42dcf0c06a3632c4e5448ea11f4e2471f3796729de20d13af4bfbc0bf65ae1993eb592f0b170ab44fa441b62 +DIST dropbox-lnx.x86-148.4.4519.tar.gz 103388037 BLAKE2B 5bc5a7a211dd5d4bfa12070bfcac061fa5ecfce39a7390e945a00ac3e440d5aa82633581538cffe6525dd7d55dbaa68a00648b8e62c6545a395cc6810e0e7d01 SHA512 a063e2d3f6d2edc01df9ff40dfefbfef9e42decd8b1088605cab6a1482f73b75908a4350c3053fa05e0c9cf62dd44dbb319cdce8b882bcde6f738255e366c0e5 +DIST dropbox-lnx.x86_64-147.4.4800.tar.gz 104476319 BLAKE2B 0bb282285df72bed5da4134b22500f0d3ee649d0b7902c3016288914bf331c40e6704fcbde7de21215ca93500f559f32fb503025f2d18832962650ad85ce6e74 SHA512 f54d083d901f0cb2ab53e5fc735f4fd69eb9bce87b5177c2ef9ba54913bab1d286ccd57f7ae13bc09b8dc7482a4209fc9ad792c9f74d550487daee311319c247 +DIST dropbox-lnx.x86_64-148.4.4519.tar.gz 105252627 BLAKE2B 923412d600c34daa248be2179a8c8d09b097bec9a9efb68bd9df5a8d68e0702336ef35f4c2f9cebb4a45f6bec4f2731d24e9b75a9696f6696216f1388a31d0dc SHA512 b51b06cc9a23a65c5cc75632f5c9b2cfa7e2bff9ced7527f1392c85631622c74bac2e0d3b106883f4e73012563b5eb8fd498e44d617a25bc15a41fe3c7d903cc +EBUILD dropbox-147.4.4800.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5 +EBUILD dropbox-148.4.4519.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0 diff --git a/net-misc/dropbox/dropbox-144.4.4491.ebuild b/net-misc/dropbox/dropbox-147.4.4800.ebuild index f43dae64fff9..f43dae64fff9 100644 --- a/net-misc/dropbox/dropbox-144.4.4491.ebuild +++ b/net-misc/dropbox/dropbox-147.4.4800.ebuild diff --git a/net-misc/dropbox/dropbox-145.4.4921.ebuild b/net-misc/dropbox/dropbox-148.4.4519.ebuild index 0c3e0f739306..0c3e0f739306 100644 --- a/net-misc/dropbox/dropbox-145.4.4921.ebuild +++ b/net-misc/dropbox/dropbox-148.4.4519.ebuild diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest index 17043ed57405..6e2862bbf307 100644 --- a/net-misc/econnman/Manifest +++ b/net-misc/econnman/Manifest @@ -1,5 +1,3 @@ -DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b DIST econnman-1.1_p20160305.tar.xz 240428 BLAKE2B 6417b30fd110416f6339b4dfad9edaff2888e9fb9562451ffb13661664c1e51d45f513a192f7850f8030caab13ebd914a138ff6cd596ed09c7210940c98ce748 SHA512 c50155a286e8a8d20deb4d5bf30ce91cc97e7323bc6dd209a16c767c3a1d6f30aab0d3b60c3a14df091d086fc10c2584d7bf56c59c95af684af3d2af7eff726c -EBUILD econnman-1.1-r2.ebuild 868 BLAKE2B e7fda84fe81a76306006310768da2babde38fcdf492ec0c93acc86ab04ca0bbaaa8e23c9c5a79039060eb5b75f13fc81704a2ec859c0847fcdf8e410779d6253 SHA512 b99a9baedc815e63a74ddecb97ba8d6b5dd7205b3e74afff823cf65368a5cf48ff4c52a11978240649b40db69fdf9da390d0537af71a150351903ac37f1d4644 EBUILD econnman-1.1_p20160305.ebuild 772 BLAKE2B bb0b4fa8f0616d193bd8f403adca94ed7248cc6b502a400a4e21aa68a2006db1c4f1215532e829aad4a9381b7dbaddacd4f6416d766d6e7678208782b86c229f SHA512 502b61f8724dea73adc5806ed6869b7d0a080e83ff800ad1efe0e8aab5b14e4d00c446a58b291cd0096bd0dc9357d80b147860b2d190529cd6a615a7d1cffd72 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362 diff --git a/net-misc/econnman/econnman-1.1-r2.ebuild b/net-misc/econnman/econnman-1.1-r2.ebuild deleted file mode 100644 index 9e8ccac3016b..000000000000 --- a/net-misc/econnman/econnman-1.1-r2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit python-single-r1 - -DESCRIPTION="ConnMan User Interface written with EFL & python" -HOMEPAGE="https://phab.enlightenment.org/w/projects/econnman/ https://www.enlightenment.org/" -SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - dev-libs/efl[X,connman] - $(python_gen_cond_dep ' - dev-python/python-efl[${PYTHON_USEDEP}] - ')" - -src_prepare() { - default - python_fix_shebang econnman-bin.in - sed -e \ - 's/Categories=Network;Settings;Enlightenment;/Categories=Network;Settings;Dialup;Monitor;/g' \ - -i data/desktop/econnman{.desktop,-agent.desktop} || die -} diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index daa759a96d80..e56c2e0aa119 100644 --- a/net-misc/electrum/Manifest +++ b/net-misc/electrum/Manifest @@ -1,9 +1,4 @@ AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173 -AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff -DIST electrum-4.1.5.gh.tar.gz 4998188 BLAKE2B c33f1a8fa2af68370319a4f4fefe4d1814a20870114f4929d53bf90eca6bbb555cf9e52681f329d18dec32642ee21ee0e32558ec817936291296ce8e196c8fb1 SHA512 9430dfde6d6e78bb71db416cd35f474b44e234d69421b370dc7e4b09584ad86e095051dcf1366c142d5e6c3029aca617b4fb383f50904fc43d2f7f99053b1c92 -DIST electrum-4.2.0.gh.tar.gz 5065087 BLAKE2B 800667f2661ef45fae7e7f2d73229810eb490e90a9bea7ff84c04c3cf859f07ac71972658a52f802817a42de7eeb0084c6b0e1aba74733918f250228996f0641 SHA512 72c8afcd2f3fc3de2b8b6516dc82355718c7dc9a88b06ba91d8e3a3d1e2bf329c02cfc8ea9dc22aff88fbde622dd443606f14e11e0bf8050da5765cd9be75a83 DIST electrum-4.2.1.gh.tar.gz 5066728 BLAKE2B 66b1ef4ec21f74f2f5c25de97a31c2ec23f907526df2ac661fdcb563e1e857ca88f4f534f2373e809ba978c66b78af72260af27944ac7aa8a92e86531827fef6 SHA512 b32ee5f8779bdb9bcda6a163f3f0a4cd95e91efb37418734c9f08930221ad15e54868fca0d5d0fb1dd3b1fac91b8cdea6c6ec822d98ad6b3d6ee01c841972e88 -EBUILD electrum-4.1.5.ebuild 2427 BLAKE2B b3f6b497dc1598fffda1d3a33cde9ccaac99a7b1a1eb91a8fa8cdf4e4da102626bb1b4d0895ce9d72857204405432ef11b8a80d46022028e622517e058786513 SHA512 ffa7139cb2eb713a4fe637ff741f4823f52527fcd0524d88f8288dbd669760f8472ae12779e4d593d4300c2e1d6f5a30a83e82d990d0085b9d74279618f38b7d -EBUILD electrum-4.2.0.ebuild 2250 BLAKE2B c7609f6232a501975c536bccc6e5f71261690763d8df18b02ec469b10122f0cb0692247c643f1cb3d70e64cc4f5b71238b79edc152890e87df761309d2a77a80 SHA512 7e8c3165cbe29bf5ab8f80eef0817b49035cf49954011e939ae5abfdbcacb863bc855749429662ae91de8b95f603ae4c222e703c5ebd1ac926c1455f20f03116 -EBUILD electrum-4.2.1.ebuild 2250 BLAKE2B c7609f6232a501975c536bccc6e5f71261690763d8df18b02ec469b10122f0cb0692247c643f1cb3d70e64cc4f5b71238b79edc152890e87df761309d2a77a80 SHA512 7e8c3165cbe29bf5ab8f80eef0817b49035cf49954011e939ae5abfdbcacb863bc855749429662ae91de8b95f603ae4c222e703c5ebd1ac926c1455f20f03116 +EBUILD electrum-4.2.1-r1.ebuild 2307 BLAKE2B 48de95d56ee10861da40806431c10441ed3c364d251d762d5b81e316e2b70973886ff4f0621ff21976f45b04bb6c75514bd4c45da63ca243bca81d96528ede2f SHA512 b9071f5f882617cf8ba5667abbf658374548bd3a702a677b00bccd840de08cb305516a5496b71ab27260585dcfef02afe6a94e74814ae87eac66e2b99418721e MISC metadata.xml 668 BLAKE2B b57807d75d1d31c191ecb43c4ed0bb7c598ed8bf82f8c00552299b15dc47942340777a60bd216aae6d2abbaab74952a8e17ba9db8dd5f6b857ed96d49556cb38 SHA512 6177da58a0be608c51f6b457785d91ff918636d9377ad81af0ad9dcfa7291526b6fa1f3c7a049d233951bd7b37d62215884c8fa20372c7220e490c6e161db625 diff --git a/net-misc/electrum/electrum-4.1.5.ebuild b/net-misc/electrum/electrum-4.1.5.ebuild deleted file mode 100644 index 1efda47c7185..000000000000 --- a/net-misc/electrum/electrum-4.1.5.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE="ncurses?" - -inherit desktop distutils-r1 xdg-utils - -DESCRIPTION="User friendly Bitcoin client" -HOMEPAGE="https://electrum.org/" -SRC_URI=" - https://github.com/spesmilo/electrum/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="cli ncurses qrcode +qt5" -REQUIRED_USE="|| ( cli ncurses qt5 )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/libsecp256k1 - >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}] - =dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}] - >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] - dev-python/bitstring[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - >=dev-python/dnspython-2[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}] - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( $(python_gen_impl_dep 'ncurses') ) -" -BDEPEND=" - test? ( - dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - eapply "${FILESDIR}/3.1.2-no-user-root.patch" - eapply "${FILESDIR}/3.3.2-desktop.patch" - - # unbind aiorpcX dep - sed -e '/aiorpcx/s:,<0.19::' \ - -i contrib/requirements/requirements.txt || die - sed -e '/aiorpcx/s:raise.*:pass:' \ - -i run_electrum || die - - # Prevent icon from being installed in the wrong location - sed -i '/icons_dirname/d' setup.py || die - - # use backwards-compatible cryptodome API - sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die - - local bestgui - if use qt5; then - bestgui=qt - elif use ncurses; then - bestgui=text - else - bestgui=stdio - fi - sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die - - eapply_user - - xdg_environment_reset - distutils-r1_src_prepare -} - -src_install() { - doicon -s 128 electrum/gui/icons/${PN}.png - dodoc RELEASE-NOTES - distutils-r1_src_install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electrum/electrum-4.2.0.ebuild b/net-misc/electrum/electrum-4.2.1-r1.ebuild index 02786de94c6c..7811b4d896ad 100644 --- a/net-misc/electrum/electrum-4.2.0.ebuild +++ b/net-misc/electrum/electrum-4.2.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="ncurses?" inherit desktop distutils-r1 xdg-utils @@ -13,15 +13,17 @@ DESCRIPTION="User friendly Bitcoin client" HOMEPAGE="https://electrum.org/" SRC_URI=" https://github.com/spesmilo/electrum/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz" + -> ${P}.gh.tar.gz +" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="cli ncurses qrcode +qt5" REQUIRED_USE="|| ( cli ncurses qt5 )" -RDEPEND="${PYTHON_DEPS} +RDEPEND=" + ${PYTHON_DEPS} dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}] =dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}] @@ -54,8 +56,8 @@ distutils_enable_tests pytest src_prepare() { eapply "${FILESDIR}/3.1.2-no-user-root.patch" - # Prevent icon from being installed in the wrong location - sed -i '/icons_dirname/d' setup.py || die + # Prevent data files from being installed in the wrong location + sed -i -e '/icons_dirname/d' -e '/applications/d' setup.py || die # use backwards-compatible cryptodome API sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die @@ -78,6 +80,7 @@ src_prepare() { src_install() { doicon -s 128 electrum/gui/icons/${PN}.png + domenu electrum.desktop dodoc RELEASE-NOTES distutils-r1_src_install } diff --git a/net-misc/electrum/electrum-4.2.1.ebuild b/net-misc/electrum/electrum-4.2.1.ebuild deleted file mode 100644 index 02786de94c6c..000000000000 --- a/net-misc/electrum/electrum-4.2.1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE="ncurses?" - -inherit desktop distutils-r1 xdg-utils - -DESCRIPTION="User friendly Bitcoin client" -HOMEPAGE="https://electrum.org/" -SRC_URI=" - https://github.com/spesmilo/electrum/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cli ncurses qrcode +qt5" -REQUIRED_USE="|| ( cli ncurses qt5 )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/libsecp256k1 - >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}] - =dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}] - >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] - dev-python/bitstring[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - >=dev-python/dnspython-2[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}] - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( $(python_gen_impl_dep 'ncurses') ) -" -BDEPEND=" - test? ( - dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - eapply "${FILESDIR}/3.1.2-no-user-root.patch" - - # Prevent icon from being installed in the wrong location - sed -i '/icons_dirname/d' setup.py || die - - # use backwards-compatible cryptodome API - sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die - - local bestgui - if use qt5; then - bestgui=qt - elif use ncurses; then - bestgui=text - else - bestgui=stdio - fi - sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die - - eapply_user - - xdg_environment_reset - distutils-r1_src_prepare -} - -src_install() { - doicon -s 128 electrum/gui/icons/${PN}.png - dodoc RELEASE-NOTES - distutils-r1_src_install -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electrum/files/3.3.2-desktop.patch b/net-misc/electrum/files/3.3.2-desktop.patch deleted file mode 100644 index e932623be246..000000000000 --- a/net-misc/electrum/files/3.3.2-desktop.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur Electrum-3.3.2.orig/electrum.desktop Electrum-3.3.2/electrum.desktop ---- Electrum-3.3.2.orig/electrum.desktop 2000-11-11 06:11:11.000000000 -0500 -+++ Electrum-3.3.2/electrum.desktop 2019-01-08 20:47:55.628978706 -0500 -@@ -3,7 +3,7 @@ - - [Desktop Entry] - Comment=Lightweight Bitcoin Client --Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u" -+Exec=electrum %u - GenericName[en_US]=Bitcoin Wallet - GenericName=Bitcoin Wallet - Icon=electrum -@@ -14,8 +14,3 @@ - Terminal=false - Type=Application - MimeType=x-scheme-handler/bitcoin; --Actions=Testnet; -- --[Desktop Action Testnet] --Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u" --Name=Testnet mode diff --git a/net-misc/fakeidentd/Manifest b/net-misc/fakeidentd/Manifest index 06b0f7a9a563..417bed62b2a4 100644 --- a/net-misc/fakeidentd/Manifest +++ b/net-misc/fakeidentd/Manifest @@ -2,5 +2,5 @@ AUX fakeidentd.confd 196 BLAKE2B cda0ee38bd0749555a9eb51fabb123c34b9ee85978ab721 AUX fakeidentd.rc 392 BLAKE2B b60185a59497781ab357eea73607222c8f116d9418204d6bf59e9eeaf3efeb231c27b4226b97b084b2ec09abe6c8da8e479bffc3dd8880d53f15360135c4cad3 SHA512 2831d5cf5292dbef0d0fd8f5b6aebdc0e753a8c8ed871f40b76fabde52ca65db939be4e1eef66ec0c73af0041add3c2a3a615bd16dc3fe7d89239d6cfe56f7f5 DIST fakeidentd-2.6.c 23042 BLAKE2B f19b51f7a479d0d27db146b67287dcd35d0a9b771d081db697295ec936399b6d57a730bebbebdc969f3044bb8f58005450a526ad5714fa69208b14eff4e5fd08 SHA512 97f6cc70c5cbd757d250db58dfe01f0b82bfecd8296f26f258ef16cc612d7427350ad93740150bf2e8a3c09b92de3340b2e9612ed5c9b4a4be5550f0b18da76b DIST fakeidentd-2.6.readme 5589 BLAKE2B db9ac49c57c096ec245ec9ec9b0b06f2c01d21e5b6f7f71148f9e23d2a8b73be6e5178bf06090430d8a3bc65804ff636980873c80569b8e90a640303df890a40 SHA512 057f0ce278b5520d5db1edf3139a68ac15f36fde1aefcb2c94db59d1557905f4f437a0bfaa30f0714e3b8b4c1cf4698a245d2c94fc6023fd2e677cc76e796d75 -EBUILD fakeidentd-2.6-r1.ebuild 903 BLAKE2B 9fa63d6b84c5f1686b58294e7e800ce504126cb2e139b6b93ca1b0bba0d202a2360de832bbb86e2b4b057c10aabbe160d246239bdff1ebfa6691d0a2d311e2bb SHA512 f2534848000105fb493ab44300220ec07eb5225af0d67a8005f7f1bb550c3c2d8cef69b85f776b696759632b372f8b2dbd0ab4e7c9e4e2d1a3f363c077677e46 -MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a +EBUILD fakeidentd-2.6-r1.ebuild 855 BLAKE2B 61a3ff8294edd457b362ab797f1b1f55982b7ca53c82f202abf05186219269676e45767f40d681373b576df9250ba438d2a0e5d24f70ebab04d64d128364ab3b SHA512 f75fc85de5f479a5990fb5210329f3adf7c72a87828350b60eb8038a83b324363d220ab38ec15f575f55ede17b3efeb678e3e8952a68e44e80818460568251ab +MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild b/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild index a1b1584dfa28..60a633ebe65a 100644 --- a/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild +++ b/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs +inherit edo toolchain-funcs DESCRIPTION="A static, secure identd. One source file only!" HOMEPAGE="http://www.guru-group.fi/~too/sw/" @@ -13,22 +13,16 @@ SRC_URI="http://www.guru-group.fi/~too/sw/identd.readme -> ${P}.readme LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="" - -echoit() { - echo "$@" - "$@" -} src_unpack() { - mkdir -p "${S}" - echoit cp "${DISTDIR}"/${P}.{c,readme} "${S}" || die + mkdir -p "${S}" || die + edo cp "${DISTDIR}"/${P}.{c,readme} "${S}" } src_compile() { - echoit $(tc-getCC) ${CFLAGS} ${LDFLAGS} \ + edo $(tc-getCC) ${CFLAGS} ${LDFLAGS} \ -DTRG=\"${PN}\" -DUSE_UNIX_OS -DVERSION=\"${PV}\" \ - -o ${PN} ${P}.c || die + -o ${PN} ${P}.c } src_install() { diff --git a/net-misc/fakeidentd/metadata.xml b/net-misc/fakeidentd/metadata.xml index 85e4ed814fa2..115e9d64a669 100644 --- a/net-misc/fakeidentd/metadata.xml +++ b/net-misc/fakeidentd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index c3b5bb562beb..eb49dff001f9 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,12 +1,5 @@ -AUX freerdp-2.4.1-rdpei-free.patch 859 BLAKE2B 2bf990acf4b4294bedb11acd824637b168fc9e03c4e41b9437388e0e09c2dbfa90e955c254fef2d8c6cae7e796b09cc1875953688c58c13462bc7b05d2a85b11 SHA512 5877a95569d0f3e099d1de35bb8ee5fc8c6889f76aa3f410bd095932440ab6c50c0fc88322ff8982a0ee34a93da97becfa07b52a76804fc262b9a06d9e789f20 -DIST freerdp-2.4.1.tar.gz 7300797 BLAKE2B cd14cadfbad9f30ab6ee6ba80c3a3bfb191b68dc0cf576082044a20489f558e222e618ed314a7fefdefcb480f201f384df5d77db8699d2e4530559fd3d5b4398 SHA512 9bacd6a7219690ed62d6a646616a54770293ff45b59211aff73dc8d67300a79ba22e72cbe56803d301b60964e4acccea9b7c6d7e2d698b91eafcf6ba561cd66a -DIST freerdp-2.5.0.tar.gz 7303832 BLAKE2B 93f7428f04e0f5faaf93c08acd75cb4af655b52fc89653d470f28175e8d3fad9b61c9c19bfd7fb7e6edf947c9cca12a1d6a98b410409cd9f96007de1bc52b034 SHA512 d9f70bc12175d4ab1c874a2106d37c7d8c0f5e1f81ef30329518eecc5c58c0131429243a3faa6c7d68b187c8f43f93000a1de0e39e81ab71ad626e33f373f33d -DIST freerdp-2.5.0_p39.tar.gz 37767 BLAKE2B ae520958e2b1418c46d20c4fb50ecf952d0b0cf2c455dca2d6cf08daf85dabcf2dacb5934240a7c3411ff490903bf15a21f621267a47e81e57edaf520b93c274 SHA512 e7455953f11b82290f6689f4ebaa030e73bf5ea3dac768527027bbb09e4d925208d9b324ae175d28642c161eb0e3227f6c98f4c8717e1f83c81d4399586495db -DIST freerdp-2.6.1.tar.gz 7270692 BLAKE2B c4da1868be5f1fc40fb14ba54b33c7c79c66cf44b464e4f2e62cfd9cad2da3a6980dc5d33fdd93a11bf8138a75e4427c46977a7110f4cb8669827c0940e3b196 SHA512 4de8718924b63b32fb5068c6538ba31f966e3cc14d17ae42dc90a01787dfff388c486263dcc085777baf4ce25b89f12191e1a5d6afb42f17cbcb38282f4868b7 -EBUILD freerdp-2.4.1-r1.ebuild 2871 BLAKE2B de9740ea0c2a87abab293645ec75da55f51fb63edd01b7335b8783b06294000ddb56681004ea2c190cd4fceb9da70016370cb8cd1be09852f63401d86a19ef07 SHA512 237d458cdeb28bde23fe764705fad0bf5916faaf8ce775963210c24b8c377d6ede9b8c4f7e114593babd79c31716cb4d689ddb28085b70ed1d67251dfe7e4332 -EBUILD freerdp-2.5.0.ebuild 2818 BLAKE2B 1e4378eda5aa5126b96edc10699ec57e760fb2c0145df2cf2c5013e4a311286f90243965b98ce1b50a2e611b118a9a032578c1d909590988d3e1c1aee973bf13 SHA512 491028d8efd3a5c1bf1d35ef7447514004643689bcea6c8c4506bd7af309b7241b48bfbec3617be81287f2b1c29e8e0080c72812c222dc3ae3cb97c51fffb124 -EBUILD freerdp-2.5.0_p39.ebuild 2919 BLAKE2B f9f712ac341b9d43db123a21313fb7baa84f58fca229d2453d84b56b7e93de954c158596f54e358bb9c0c446359b039503f9704a3be1dbfd2fb4e7530e169ae7 SHA512 778f79acdc9eeb81dfeb0d1fe3c19823e77ac3b7af925d93d0533dbe0b1f39737b71554bc0ce8404c9e1cddb983b43a749d9a1ad92f1de425f41bf02dbc2bdbd -EBUILD freerdp-2.6.1.ebuild 2919 BLAKE2B 2f09e74283529e4c2a99dd258e2fc80fbb759b3c8cd38dd7a9515ec4b2faf3855f0aa3b6781fe158f86729866f55c1cf658880f463f5c11c384247ad3b6ee210 SHA512 fbe08f13bcb4af401d1f93f4fdd06c4de26e4f010d3409663822f03f6d885aac50c7d14d1f0bb2f210beaf6c0b9cd2f951e8630274afbc7fc631d975635c0d10 -EBUILD freerdp-2.9999.ebuild 2925 BLAKE2B 01ca37a036ca50aaafb3e44ea1843360309c1a2e52f31a3a01b76b4ff3205b6bde8d689ca48bef43e8e0fb8b9cc993fffc72a13e0554e2d1a205ce03755bd593 SHA512 1fcb2ca5519fcddfb643647eb5ca17a0eee0a2fcbe11c6917581a7422ab8c6b2633f2713e197df4de4961c1eb3613b78024dc92abb76f9294a0709e0658c68d0 -EBUILD freerdp-9999.ebuild 2925 BLAKE2B 01ca37a036ca50aaafb3e44ea1843360309c1a2e52f31a3a01b76b4ff3205b6bde8d689ca48bef43e8e0fb8b9cc993fffc72a13e0554e2d1a205ce03755bd593 SHA512 1fcb2ca5519fcddfb643647eb5ca17a0eee0a2fcbe11c6917581a7422ab8c6b2633f2713e197df4de4961c1eb3613b78024dc92abb76f9294a0709e0658c68d0 +DIST freerdp-2.7.0.tar.gz 7274512 BLAKE2B 82dc1403c8c2cada81585e869315ee2601d1fe87c3cb293f3cfe90278110644a5dab42ec0b516a204a651dc3127e458cd47994269644c41183501b848e399348 SHA512 9e9df14a39412f3ee3cd8a97123377d3da39492f66a0caee37d122f487639483d172cb89824523d57516aa83d22b9da569f2169a0598b475fbe70eab65fa2dc4 +EBUILD freerdp-2.7.0-r1.ebuild 2932 BLAKE2B 3aaeead1b1de541514b2f138d07943e1f5598d92e3ce29d3d0bc9d0758a1aad7f417d7c9da119a6baaf15f73c9577b4039f22869670d3bf044a3309b320eca8b SHA512 d37e89b2584fedae4963059986f8fd905f1bad35cc49455de1807d278e202c82747ee5f624bc9718d722267fec38bdb494413efed86d63f24a616dfe993d1329 +EBUILD freerdp-2.9999.ebuild 2938 BLAKE2B 8d5554dc8720f339a3188c137be858bb9f542f5cbe11a8f447d74bdf50a5a5a6225a484a3ca45be4eae35b5573cb57dc91ec693d0f299dedd2f2fb004b5042cc SHA512 adcb7ead414092aeb0ef5655049a56a8c409174ebe469ce8aa67e59cd244f0542e4894350ce8cbc936494d79388394e792ed4855fa4c5e143519544915f4777c +EBUILD freerdp-9999.ebuild 2938 BLAKE2B 8d5554dc8720f339a3188c137be858bb9f542f5cbe11a8f447d74bdf50a5a5a6225a484a3ca45be4eae35b5573cb57dc91ec693d0f299dedd2f2fb004b5042cc SHA512 adcb7ead414092aeb0ef5655049a56a8c409174ebe469ce8aa67e59cd244f0542e4894350ce8cbc936494d79388394e792ed4855fa4c5e143519544915f4777c MISC metadata.xml 482 BLAKE2B 9961a7b8e99468833978be3722ffcfa1fe38ed2b9c0de0ec7237fbbdd1484b674df65995e4802abe961e70df37e8a7d11c8d1e26f25779e5419b4439cd336ed3 SHA512 3dd28b1ac648b19794970f306d811ebcb860146da9dd4e0dc1ca72c493f78ddf63e95c8232c583a71bee7e6ad90bbad24ece5fca4e6f561a9c019767a4755b72 diff --git a/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch b/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch deleted file mode 100644 index d6e73631c6e2..000000000000 --- a/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a0ce57541f4f22c4a7201de317e603103d6ffdc6 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Sun, 24 Oct 2021 10:04:38 -0400 -Subject: [PATCH] channels/rdpei: avoid calling free() on contactPoints array - -This was fixed on master as part of -268bc2e8ef7b76887d14d50702bb8446ce15a4c1. Backporting that change seems -like too much for the stable branch. ---- - channels/rdpei/client/rdpei_main.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c -index f20d58a13..1d95054a0 100644 ---- a/channels/rdpei/client/rdpei_main.c -+++ b/channels/rdpei/client/rdpei_main.c -@@ -1386,7 +1386,6 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) - return CHANNEL_RC_OK; - error_out: - free(context); -- free(rdpei->contactPoints); - free(rdpei); - return error; - } --- -2.33.1 - diff --git a/net-misc/freerdp/freerdp-2.4.1-r1.ebuild b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild deleted file mode 100644 index 6494b88b6bfb..000000000000 --- a/net-misc/freerdp/freerdp-2.4.1-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 2011-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" - case ${PV} in - 2.*) EGIT_BRANCH="stable-2.0";; - esac -else - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="http://www.freerdp.com/" - -LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib:0 - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ffmpeg? ( media-video/ffmpeg:0= ) - !ffmpeg? ( - x11-libs/cairo:0= - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - x11-libs/libXrandr - ) - jpeg? ( virtual/jpeg:0 ) - openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-sound/pulseaudio ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" - -PATCHES=( - "${FILESDIR}/freerdp-2.4.1-rdpei-free.patch" -) - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) - -DWITH_CCACHE=OFF - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) - -DWITH_MANPAGES=$(usex doc ON OFF) - -DWITH_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_SWSCALE=$(usex ffmpeg ON OFF) - -DWITH_CAIRO=$(usex ffmpeg OFF ON) - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_X11=$(usex X ON OFF) - -DWITH_XINERAMA=$(usex xinerama ON OFF) - -DWITH_XV=$(usex xv ON OFF) - -DWITH_WAYLAND=$(usex wayland ON OFF) - ) - cmake_src_configure -} diff --git a/net-misc/freerdp/freerdp-2.5.0.ebuild b/net-misc/freerdp/freerdp-2.5.0.ebuild deleted file mode 100644 index 670754db442c..000000000000 --- a/net-misc/freerdp/freerdp-2.5.0.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 2011-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" - case ${PV} in - 2.*) EGIT_BRANCH="stable-2.0";; - esac -else - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="http://www.freerdp.com/" - -LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib:0 - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ffmpeg? ( media-video/ffmpeg:0= ) - !ffmpeg? ( - x11-libs/cairo:0= - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - x11-libs/libXrandr - ) - jpeg? ( virtual/jpeg:0 ) - openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-sound/pulseaudio ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) - -DWITH_CCACHE=OFF - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) - -DWITH_MANPAGES=$(usex doc ON OFF) - -DWITH_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_SWSCALE=$(usex ffmpeg ON OFF) - -DWITH_CAIRO=$(usex ffmpeg OFF ON) - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_X11=$(usex X ON OFF) - -DWITH_XINERAMA=$(usex xinerama ON OFF) - -DWITH_XV=$(usex xv ON OFF) - -DWITH_WAYLAND=$(usex wayland ON OFF) - ) - cmake_src_configure -} diff --git a/net-misc/freerdp/freerdp-2.5.0_p39.ebuild b/net-misc/freerdp/freerdp-2.5.0_p39.ebuild deleted file mode 100644 index 5755601b61ed..000000000000 --- a/net-misc/freerdp/freerdp-2.5.0_p39.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 2011-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" - case ${PV} in - 2.*) EGIT_BRANCH="stable-2.0";; - esac -else - MY_P=${P%_p*} - MY_P=${MY_P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz - https://dev.gentoo.org/~floppym/dist/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="http://www.freerdp.com/" - -LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib:0 - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ffmpeg? ( media-video/ffmpeg:0= ) - !ffmpeg? ( - x11-libs/cairo:0= - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - x11-libs/libXrandr - ) - jpeg? ( virtual/jpeg:0 ) - openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-sound/pulseaudio ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" - -PATCHES=( - "${WORKDIR}/${P}" -) - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) - -DWITH_CCACHE=OFF - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) - -DWITH_MANPAGES=$(usex doc ON OFF) - -DWITH_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_SWSCALE=$(usex ffmpeg ON OFF) - -DWITH_CAIRO=$(usex ffmpeg OFF ON) - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_X11=$(usex X ON OFF) - -DWITH_XINERAMA=$(usex xinerama ON OFF) - -DWITH_XV=$(usex xv ON OFF) - -DWITH_WAYLAND=$(usex wayland ON OFF) - ) - cmake_src_configure -} diff --git a/net-misc/freerdp/freerdp-2.6.1.ebuild b/net-misc/freerdp/freerdp-2.7.0-r1.ebuild index 191ea6dabde4..ea738875d837 100644 --- a/net-misc/freerdp/freerdp-2.6.1.ebuild +++ b/net-misc/freerdp/freerdp-2.7.0-r1.ebuild @@ -54,7 +54,7 @@ RDEPEND=" media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:0= ) openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-sound/pulseaudio ) server? ( diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild index 99ddb2dd9804..d46c57ffe2df 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -54,7 +54,7 @@ RDEPEND=" media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:0= ) openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-sound/pulseaudio ) server? ( diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 99ddb2dd9804..d46c57ffe2df 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -54,7 +54,7 @@ RDEPEND=" media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:0= ) openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-sound/pulseaudio ) server? ( diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest index 5012a949fc55..7379cb88b45d 100644 --- a/net-misc/frr/Manifest +++ b/net-misc/frr/Manifest @@ -2,5 +2,7 @@ AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285eb AUX frr-openrc-v1 7078 BLAKE2B d5c0276540fa09318f6e92575dd7e03f3bc6ebfce186d062c2d65fa49c502b3b4de0fd32914ce7c4708bb6f6188296f75d387e0384c142381bb77cfb706c7e1c SHA512 8e6f0e58863402f0169b8a7625d049bf85db60bebe40a42dfb450a1bddfcd6f8f436002de6c1ff599c8f848e4ba85a70e4058cb55a9a49fafb1e69a8e7eb9f57 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed DIST frr-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa +DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf SHA512 52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256 EBUILD frr-8.1-r1.ebuild 3473 BLAKE2B 9f3639c7f9eb192cce91e0f7ed3ea0a310c66f64c33bb6c32e735698fb62be4e93eb31c8148492e44541be1ac63b358e1f5aa677988431967efe53cd02f7a381 SHA512 05a86b3c5166eee80145301923cefecdb4586d6dfb4a906cfe199f6dc31ba59fc0567e24e14ace48ab661becc6d46b0cdf9984ccc3bd2ffeaaf386d00a680aee +EBUILD frr-8.2.2.ebuild 3475 BLAKE2B e92fefd9d1326b742b21c96b47c18500736c7642ce745e07998ba17c48532bb97a48c47e6f3150cc65415c13995b86ef30e4382dbc165acf71e1dc56b931580c SHA512 a6e7eb0600f1d56df1446a2fbe988898c37397c61c02c5c3b13a98b5995664fd8f57c0fce2ba1ca91712f22cb0be84ce9864c0c214336d22dec57c3d7f04650f MISC metadata.xml 767 BLAKE2B ce7920e238d443a1ede5f38b323c86dc2f4e24d5efeb6603a59e8ec9a0d083cdc8e6162d7d3e9463b29bf786b26e00aac19c549ddf943b16175897fb94265516 SHA512 29dd8aa5ad6706a53e00c14feea8e7a75d10ec453dec715a495a75a0390661c268d5a5fc10acdb26d050a0d804162930de79bf0e41a499b803a4762442b8a108 diff --git a/net-misc/frr/frr-8.2.2.ebuild b/net-misc/frr/frr-8.2.2.ebuild new file mode 100644 index 000000000000..44fb6e2685fc --- /dev/null +++ b/net-misc/frr/frr-8.2.2.ebuild @@ -0,0 +1,148 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit autotools pam python-single-r1 systemd + +DESCRIPTION="The FRRouting Protocol Suite" +HOMEPAGE="https://frrouting.org/" +SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz" +# FRR tarballs have weird format. +S="${WORKDIR}/frr-${P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + acct-user/frr + dev-libs/json-c:0= + >=net-libs/libyang-2.0.0 + sys-libs/libcap + sys-libs/readline:0= + virtual/libcrypt:= + grpc? ( net-libs/grpc:= ) + nhrp? ( net-dns/c-ares:0= ) + pam? ( sys-libs/pam ) + rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) + snmp? ( net-analyzer/net-snmp:= ) +" +BDEPEND=" + ~dev-util/clippy-${PV} + sys-devel/flex + virtual/yacc + doc? ( dev-python/sphinx ) +" +DEPEND=" + ${COMMON_DEPEND} + elibc_musl? ( sys-libs/queue-standalone ) + test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) +" +RDEPEND=" + ${COMMON_DEPEND} + $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]') + !net-misc/quagga +" + +PATCHES=( + "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch +) + +src_prepare() { + default + + python_fix_shebang tools + eautoreconf +} + +src_configure() { + local myconf=( + --disable-static + --with-pkg-extra-version="-gentoo" + --enable-configfile-mask=0640 + --enable-logfile-mask=0640 + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/lib/frr + --sbindir="${EPREFIX}"/usr/lib/frr + --libexecdir="${EPREFIX}"/usr/lib/frr + --sysconfdir="${EPREFIX}"/etc/frr + --localstatedir="${EPREFIX}"/run/frr + --with-moduledir="${EPREFIX}"/usr/lib/frr/modules + --with-clippy="${BROOT}"/usr/bin/clippy + --enable-user=frr + --enable-group=frr + --enable-vty-group=frr + --enable-multipath=64 + $(use_enable doc) + $(use_enable fpm) + $(use_enable grpc) + $(use_enable ipv6 ospf6d) + $(use_enable ipv6 ripngd) + $(use_enable ipv6 rtadv) + $(use_enable kernel_linux realms) + $(use_enable nhrp nhrpd) + $(usex ospfapi '--enable-ospfclient' '' '' '') + $(use_enable rpki) + $(use_enable snmp) + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + + use doc && emake -C doc html +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + + # Install user documentation if asked + use doc && dodoc -r doc/user/_build/html + + # Create configuration directory with correct permissions + keepdir /etc/frr + fowners frr:frr /etc/frr + fperms 775 /etc/frr + + # Create logs directory with the correct permissions + keepdir /var/log/frr + fowners frr:frr /var/log/frr + fperms 775 /var/log/frr + + # Install the default configuration files + insinto /etc/frr + doins tools/etc/frr/vtysh.conf + doins tools/etc/frr/frr.conf + doins tools/etc/frr/daemons + + # Fix permissions/owners. + fowners frr:frr /etc/frr/vtysh.conf + fowners frr:frr /etc/frr/frr.conf + fowners frr:frr /etc/frr/daemons + fperms 640 /etc/frr/vtysh.conf + fperms 640 /etc/frr/frr.conf + fperms 640 /etc/frr/daemons + + # Install logrotate configuration + insinto /etc/logrotate.d + newins redhat/frr.logrotate frr + + # Install PAM configuration file + use pam && newpamd "${FILESDIR}"/frr.pam frr + + # Install init scripts + systemd_dounit tools/frr.service + newinitd "${FILESDIR}"/frr-openrc-v1 frr + + # Conflict files, installed by net-libs/libsmi, bug #758383 + rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die +} diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest index bedcbfa0a5b4..774dff04a03b 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -1,8 +1,8 @@ -DIST gallery-dl-1.20.5.tar.gz 417267 BLAKE2B f1f4b34d87b21d4c4c8fa15e9a1f39f3fccf7ed3bdd446fcdec03d435878e708fa2169270a610a6de79c5e57a4cc8becb98399638a353ec92490fe408d822beb SHA512 a53102a9495763e001810c509265affc1594468e3ba73d3a677652e73d8f18d3414e6cf83dd30914e882e7867380f9c0322d42bf418b372f59be6981106d4cd5 DIST gallery-dl-1.21.0.tar.gz 425507 BLAKE2B ca31b169558385fa6ed6ce9fe8082fddcc7124f945fcfaef2aab13a4357fd9d488bdfde48c27d0a86fb0f626ea831e7dc3600c7e50abce2bbcfd37a350ee2767 SHA512 dc85d522e372e8ec2565029b9dc3d736b546b4cf66bd9242fdfa11aab30975263e221ba50234ace409a4cf3dc6f36d5b1031cfbf74dc4ba3053eded5aea7f38c DIST gallery-dl-1.21.1.tar.gz 432380 BLAKE2B 58267dad8af16cb8b03bc7532e934e15c510f8ac36a92cfbf4cf48791634973fa68dc0c1fae8968a5df1a340833980ef032c8c47fc2b2ae4c7b9018bf2d6b197 SHA512 6725937e81ef0ff6b3ad2718f51eb7be09ce364584b16be6031e5608f6b58b366aa96cf0616974147d4ec101825cdedbed8c8790970040f4f80e955847772901 -EBUILD gallery-dl-1.20.5.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394 +DIST gallery-dl-1.21.2.tar.gz 434114 BLAKE2B 2f1335d0745c3fd3de95f9f3005fc67f079fec16925b7ac8fb3f2e9c8521139e56bf18675e15e7e0edbad2889cd7fa895552e8b40d9f1cf6bc555894c8d1da48 SHA512 11615ebb3cab5a6d9e042a94cf802f3781af6166eb199ac22f70a0d3351299bdc82dda212a3a363c323e0edb6707355fe9b6f3d89a851037a8f6ebc12894558f EBUILD gallery-dl-1.21.0.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394 EBUILD gallery-dl-1.21.1.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394 +EBUILD gallery-dl-1.21.2.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394 EBUILD gallery-dl-9999.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394 MISC metadata.xml 722 BLAKE2B d44c3a3cc18ecaceb2e112a314c63bb913448516eec1118a86a4c0e770ed6dca322d4653358bd78b0b3c0dcf10007e1c5d1033dd9d5996f6d6f3dc5659280f74 SHA512 7a95345138c738aec445af215a3381308a40bcc1475d2718880cc124795237bff6bbc4312e63b5a135815b17b37b1b130da90b81b895c16f3f86de4b51fd3f40 diff --git a/net-misc/gallery-dl/gallery-dl-1.20.5.ebuild b/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild index d424151deeb1..d424151deeb1 100644 --- a/net-misc/gallery-dl/gallery-dl-1.20.5.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest index e7a3b6d5142c..38befd5d157b 100644 --- a/net-misc/gerbera/Manifest +++ b/net-misc/gerbera/Manifest @@ -1,7 +1,7 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417 -DIST gerbera-1.10.0.tar.gz 3960516 BLAKE2B 9240ff4334f6f018ed27489f3984bd8439eb1ae9784712d23e778f9c3054c37241036a32167fc1c19303f4d68db3862ae09e35b7a3f4c15ee1e960a1aa78086c SHA512 9bb605b6475bddc5b683433bc9c50818e4986fc134bb0a6daaa444d1733624164c6ff7440789af95da2ec3c04b6c2f4fd46a29744b4ef793b10d9fab0c65a881 -EBUILD gerbera-1.10.0.ebuild 2243 BLAKE2B d01c18d7a95217703f4c3e4e5155716418c5d6fdb59cf4cf29f10695d5213bb881b949f7450c7636939339f833c094b192e906ef01b3ee4729d8137a867703d2 SHA512 fdeaf5d80a85f3d3b5a491e07c01dff949409ca494e18284312bb4587bab7c8db796b6f92f7c01016ce180686c1b168feaa36f8f3351446b41e4a6fb8526862c +DIST gerbera-1.11.0.tar.gz 4115178 BLAKE2B 1b5f28c4602f949459816f57555bfebbedbabc9681b3d0d9eb3d7742a9b273644cf9c10b411baeb3b0c4b5ea3c340d1c0d8d6035cb0e7f38ba0c40fae1c5cd1b SHA512 ae2b3342b3b57ce6d656d0ebadfd73b5f2764f2164314f6b0deac170a82e6861349c37732e6914454918112124038b221dbd4882001b5de51a49326432ccd70f +EBUILD gerbera-1.11.0.ebuild 2243 BLAKE2B d01c18d7a95217703f4c3e4e5155716418c5d6fdb59cf4cf29f10695d5213bb881b949f7450c7636939339f833c094b192e906ef01b3ee4729d8137a867703d2 SHA512 fdeaf5d80a85f3d3b5a491e07c01dff949409ca494e18284312bb4587bab7c8db796b6f92f7c01016ce180686c1b168feaa36f8f3351446b41e4a6fb8526862c EBUILD gerbera-9999.ebuild 2243 BLAKE2B d01c18d7a95217703f4c3e4e5155716418c5d6fdb59cf4cf29f10695d5213bb881b949f7450c7636939339f833c094b192e906ef01b3ee4729d8137a867703d2 SHA512 fdeaf5d80a85f3d3b5a491e07c01dff949409ca494e18284312bb4587bab7c8db796b6f92f7c01016ce180686c1b168feaa36f8f3351446b41e4a6fb8526862c MISC metadata.xml 1205 BLAKE2B f0fbdc991782018368d65f2d5475ede1a1a0cb2a8a16de4e7c4ed7586057cac18a2d6fe9bb405c8267337e453b26c69e69042dac3bfd5ef858f23fa7c468ef2c SHA512 a231be2b6829fb2f59fa3e66c830a16358782c915e806bfbee919a6f7ebdf9d33d53aa6860814ba5a5c7251ce2562f313af592ab5fcda701a7673b334627b1a0 diff --git a/net-misc/gerbera/gerbera-1.10.0.ebuild b/net-misc/gerbera/gerbera-1.11.0.ebuild index f069b91f13cf..f069b91f13cf 100644 --- a/net-misc/gerbera/gerbera-1.10.0.ebuild +++ b/net-misc/gerbera/gerbera-1.11.0.ebuild diff --git a/net-misc/gnome-connections/Manifest b/net-misc/gnome-connections/Manifest new file mode 100644 index 000000000000..7cd3e5073ea0 --- /dev/null +++ b/net-misc/gnome-connections/Manifest @@ -0,0 +1,3 @@ +DIST gnome-connections-42.1.2.tar.xz 3987992 BLAKE2B 2cad2376c238884b069767efbcd8afae5270f576e499fa59defe2d8ec10188cfd9b263a63cd44fcbe9ceed315267807f6b106f93d1fc73092e6c5366d9daac62 SHA512 34bc8e167ccd828c1aa52728017a52282d96b607751d566e3f8a5169d6fd5ccd7c6ae04abb073946f5cf6038c7b23b3eb897e2922b6d5b914d89ac0afbbbc7ed +EBUILD gnome-connections-42.1.2.ebuild 1142 BLAKE2B 55e93469531e95fd8e6a756e557420374229ef20286b140be660f193d62da3d645ba4b0ba27fac814f388858c4e89493a9482e63879d11880342407fcfb44d85 SHA512 c65dcf3e54070ea3168b8af9121ef33ba02b238643b8d08f7b0103e0c59179f2e82064e0e06029107ba9cd639c65bd3824963014136e33316ddc2b64e4ab9740 +MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132 diff --git a/net-misc/gnome-connections/gnome-connections-42.1.2.ebuild b/net-misc/gnome-connections/gnome-connections-42.1.2.ebuild new file mode 100644 index 000000000000..8fb4b3b9b9da --- /dev/null +++ b/net-misc/gnome-connections/gnome-connections-42.1.2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) +inherit gnome.org gnome2-utils meson python-any-r1 vala xdg + +DESCRIPTION="A remote desktop client for the GNOME desktop environment" +HOMEPAGE="https://gitlab.gnome.org/GNOME/connections" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/gobject-introspection + >=dev-libs/glib-2.50:2 + >=x11-libs/gtk+-3.22:3[introspection] + >=net-libs/gtk-vnc-0.4.4[vala] + >=gui-libs/libhandy-1.2.0:1[vala] + >=dev-libs/libxml2-2.7.8 + app-crypt/libsecret[vala] + + >=net-misc/freerdp-2.0.0:0= +" +RDEPEND="${DEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + $(vala_depend) + dev-libs/glib + dev-util/glib-utils + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig + + test? ( + dev-libs/appstream-glib + dev-util/desktop-file-utils + ) +" + +src_prepare() { + default + vala_setup +} + +src_configure() { + local emesonargs=( + -Dprofile=default + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/net-misc/realtek-r8152/metadata.xml b/net-misc/gnome-connections/metadata.xml index 8ac26ba5990d..f453528b934f 100644 --- a/net-misc/realtek-r8152/metadata.xml +++ b/net-misc/gnome-connections/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> </maintainer> </pkgmetadata> diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest index 9bf6bd8ce7b2..63272c416725 100644 --- a/net-misc/gnome-remote-desktop/Manifest +++ b/net-misc/gnome-remote-desktop/Manifest @@ -1,5 +1,9 @@ DIST gnome-remote-desktop-41.2.tar.xz 111000 BLAKE2B 1d6dfcc9860a5253cfb2a8111c5c039e7d236f45fa79a74ddc479f449b01ddb231368c4b604d28a8f796ab33f1648a332e110fd2adb9b739032dba67c029b9f8 SHA512 7636c0446c86748ce51c869734a2d33d8285c30616a28a0358f45d8399fd9f5dba7a1bdb830d3ca4753982ac3b9715604eb5934906645a1c11c58b4342c524eb DIST gnome-remote-desktop-42.0.tar.xz 158448 BLAKE2B 35c5458ec314d7e3abc60583d136e18296609af2caac658cf936685085b6f8b6725bc453336131293dadd1b548d110a4cf5cf8871fcb80d838212e60e204feb1 SHA512 3bf03fc96205df4c5efcef0e340ad85e7011ad8e4fecf2e29d9902fbb1633801da7d1094645e850267249dda9383ae0aa782f3e0207a7351d764482f2d0dc349 +DIST gnome-remote-desktop-42.1.1.tar.xz 160632 BLAKE2B 9686a9fc626c7bb5cb57196ff24ba4c694edda2a9419697283746afaf166f57511e2949699cb92885e44687bf528dde0060b559c87a7fa623a0df4bbc83f7ce0 SHA512 4fbf9305aa7339d9e7fcbf8df8eea97ba675630f6d01ef9a9f049ca3a3bf930f26b0e993ffe386682906d719b15058ce752e4592a3e710ceceb977000ebb1ce1 +DIST gnome-remote-desktop-42.1.tar.xz 160320 BLAKE2B 6f797a49cd0e17f3a553b6bd63d32d22cfedc633230ab13cd464a8755c77a14cd26a5eeb7872573b527d3fa84ff05347ea50dc798aef2f631749c29076b8bf53 SHA512 3e17d6482941fccfe6860d2ca2db50235ee70a26fd8942ee1850addb11006cfb152dd949102a4c573f2b6a29f9f2bb78c9ad5be1cba8622ad5b54f82c509376f EBUILD gnome-remote-desktop-41.2.ebuild 1195 BLAKE2B eb6178bfec196d8139080fa5414f5d90670ccde2fa80bad95fa6c9f1b13b5ec59195e4e28935b32ecdd06dcb2955878280a1462917938911dae6028c903d2f1c SHA512 887d7d4ca98c987088f287c0baaf99e559b07fb92d15899a0dc2bc07dd1a2b351d8c8fa2c6fd11661ecef368692726a2945782750720f02b174daf3d4e6edfdc EBUILD gnome-remote-desktop-42.0.ebuild 1260 BLAKE2B 19090e2c2377fdc1b9a048422e1eac61e686390666d5f89125413de5e1eae9bc40c725ab636508b9a6c17b01e87babbe0ce20b074e64ea770521cc68c4d3314c SHA512 edb68cc632781ba078cfc2ca503b27f32c6a4d3f6a9daccabb0ebd979df5e8f0b265dc18a912732edc638124fb76731f9232fb9c2b19ea015c2427bbc84b72c4 +EBUILD gnome-remote-desktop-42.1.1.ebuild 1260 BLAKE2B 19090e2c2377fdc1b9a048422e1eac61e686390666d5f89125413de5e1eae9bc40c725ab636508b9a6c17b01e87babbe0ce20b074e64ea770521cc68c4d3314c SHA512 edb68cc632781ba078cfc2ca503b27f32c6a4d3f6a9daccabb0ebd979df5e8f0b265dc18a912732edc638124fb76731f9232fb9c2b19ea015c2427bbc84b72c4 +EBUILD gnome-remote-desktop-42.1.ebuild 1260 BLAKE2B 19090e2c2377fdc1b9a048422e1eac61e686390666d5f89125413de5e1eae9bc40c725ab636508b9a6c17b01e87babbe0ce20b074e64ea770521cc68c4d3314c SHA512 edb68cc632781ba078cfc2ca503b27f32c6a4d3f6a9daccabb0ebd979df5e8f0b265dc18a912732edc638124fb76731f9232fb9c2b19ea015c2427bbc84b72c4 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132 diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.1.ebuild new file mode 100644 index 000000000000..e0ed71da320e --- /dev/null +++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) +inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg + +DESCRIPTION="Remote desktop daemon for GNOME using pipewire" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+rdp systemd +vnc" +REQUIRED_USE="|| ( rdp vnc )" +RESTRICT="test" # Tests run xvfb-run directly + +DEPEND=" + x11-libs/cairo + >=dev-libs/glib-2.68:2 + >=media-video/pipewire-0.3.0:= + app-crypt/libsecret + x11-libs/libnotify + media-libs/libepoxy + x11-libs/libdrm + rdp? ( + >=media-libs/nv-codec-headers-11.1.5.0 + >=net-misc/freerdp-2.5.0:=[server] + >=sys-fs/fuse-3.9.1 + >=x11-libs/libxkbcommon-1.0.0 + ) + vnc? ( + net-libs/libvncserver + ) +" +RDEPEND="${DEPEND} + x11-wm/mutter[screencast] +" +BDEPEND=" + ${PYTHON_DEPS} + dev-util/gdbus-codegen + dev-util/glib-utils + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + $(meson_use rdp) + $(meson_use vnc) + $(meson_use systemd) + -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.ebuild new file mode 100644 index 000000000000..e0ed71da320e --- /dev/null +++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) +inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg + +DESCRIPTION="Remote desktop daemon for GNOME using pipewire" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+rdp systemd +vnc" +REQUIRED_USE="|| ( rdp vnc )" +RESTRICT="test" # Tests run xvfb-run directly + +DEPEND=" + x11-libs/cairo + >=dev-libs/glib-2.68:2 + >=media-video/pipewire-0.3.0:= + app-crypt/libsecret + x11-libs/libnotify + media-libs/libepoxy + x11-libs/libdrm + rdp? ( + >=media-libs/nv-codec-headers-11.1.5.0 + >=net-misc/freerdp-2.5.0:=[server] + >=sys-fs/fuse-3.9.1 + >=x11-libs/libxkbcommon-1.0.0 + ) + vnc? ( + net-libs/libvncserver + ) +" +RDEPEND="${DEPEND} + x11-wm/mutter[screencast] +" +BDEPEND=" + ${PYTHON_DEPS} + dev-util/gdbus-codegen + dev-util/glib-utils + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + $(meson_use rdp) + $(meson_use vnc) + $(meson_use systemd) + -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest index 5e66e172beba..7488c03f6863 100644 --- a/net-misc/gns3-gui/Manifest +++ b/net-misc/gns3-gui/Manifest @@ -1,5 +1,6 @@ DIST gns3-gui-2.2.29.tar.gz 5043197 BLAKE2B 9a08f16a96448400a2826e94cf244a126527578fb6f09c6f207b106aa30c194c522f78d4803125a694bdda8bf464d8fa923bbf5e9cf4f79834028aa605ac218b SHA512 7a6ad191d772ae91739196baa64644b5fcebdd3baf8781e07ce0cbbc70b98b09930005b349b15940237798624912e466abce7eedda588fb32c43601247570ec8 DIST gns3-gui-2.2.31.tar.gz 5043086 BLAKE2B 3b028b57406d86137fc4d0488cb588bf5821de1d79c4be80c7da6b8895fb594f90bc7018341d82d4e77db2e25510b8fdb191ce819904423ebbcc5caef612bf21 SHA512 ea894cf65b80dad985fbc2112d018750c42b3c0bd358f6f5a6a491748d12e90e2de01108658611c7ba890a55fa688853c3e98d9220c8cb28c772595fa586100e EBUILD gns3-gui-2.2.29.ebuild 1026 BLAKE2B aa0a46f4016ec2fbe7e04adce0833968596963c1d1d2b9cd2ee6b1b21121a81632d52e9f26625babd180386974f86beab1277383eb21d729bfae628eca4b42bb SHA512 a21c7c1814ad86299a538f6c614b49c5d3028093cdd04933651eac0d7bb22feb7ddb2ae126f3acfbd0e8befe5a5bdffc36d5c46203a103749ccccdd14b75c85d +EBUILD gns3-gui-2.2.31-r1.ebuild 1028 BLAKE2B 9c671256241def910d47cd711ad5f98524c08233d5162cea5e3b9e566d26da709ce8f7b16ac6b887c60470ac3bb5acb7ff41d17e227676751cb2e3f031db249d SHA512 f932eab7abb0e82e90cd834c1c04932f8b8a7d218a01bb3aa12d493c13d69abdb06d62a37a0a7119b3daac52fa393bdb62f679ebb1c384fd56b7114a8de11b81 EBUILD gns3-gui-2.2.31.ebuild 1028 BLAKE2B 1d7b4a0b5b4b26966cc1abb49d6c0d4f0c99e42dc303b498bebeef664be57afde6f24dd545d813fe288b3df800318e36b788d4fb78b7445d380068d0f03d4371 SHA512 5c407af4148e1fa26ce7bf20c607b78d625bc648f5ea9b08768e263256ed5f4df28dfc23bbeb899c8a3efcf5b37545dca26a5d80f8476f74e8241bd61f245563 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49 diff --git a/net-misc/gns3-gui/gns3-gui-2.2.31-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.31-r1.ebuild new file mode 100644 index 000000000000..5ab96a981071 --- /dev/null +++ b/net-misc/gns3-gui/gns3-gui-2.2.31-r1.ebuild @@ -0,0 +1,40 @@ +# 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 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.6.0[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.0[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.5.4[${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 5fd69753f05a..b3f6c77bc95e 100644 --- a/net-misc/gns3-server/Manifest +++ b/net-misc/gns3-server/Manifest @@ -1,5 +1,6 @@ DIST gns3-server-2.2.29.tar.gz 10241179 BLAKE2B ae9df1414d679c49f3b0da84f6b07789a0343ee74cf1c744c7b8dc55ab5395a92cc223cddc0d04516f315d5483d4cc3260c0f815c81992a12127fc6694fbaa2a SHA512 1e5eaeb127efddd6f21e167de4b56a2713c8a4dbc470e2595f807d8283f4b9208564f910dc3ac4602049ee4b1267eaffb9c5787b2d556c4d27176d153c67fc05 DIST gns3-server-2.2.31.tar.gz 10245461 BLAKE2B 488a91305408704accd4c7df936dde13e9a64404ac6a7e4ed7bdb94f996bb1bbd418d38523318603a8e93a7095c9fb8e30795c6b0dece70a45ed4758569b6711 SHA512 e8bf9357bc5a69e38dc27bc649af88c6ed39e6b5c63e2a1d374ec2a0784c7a6eadae3de0f4300a268fbf91ab55ad342e476573ca9a4bac609158d7d371a7a834 EBUILD gns3-server-2.2.29.ebuild 2080 BLAKE2B 610964ac5108a4acf0fd7c75f575a3721e1e643c7bd9fc5e4d2008a66c562911461b16f5adcc952e8043a6a0fc092c0a10c0a187457ce90d0c3c95117abe7e2c SHA512 ece130239e1b43164b332e5b44cbfa87432fd57a5145a28dc428ed3d9b70c177f9acd9c2c5a6b8341b5eef167e76cb34aea9751216630d2afe83049249d8d547 +EBUILD gns3-server-2.2.31-r1.ebuild 2082 BLAKE2B 1e8b704bd367e64060f7e9489f4689d7abcca177ebb77eb4acc6e44dbacc0c5ef7a359b3a9273f9d9338f62af80b7443c18014078d878c61219904dbcabda59a SHA512 f5b9c1085743b62f94772129277f4ebd56a121b029675094e30a4c53ad1ff93168b72d166b510a522a646d8868243facf3fbba3a5fbeea8995fbc0351308db08 EBUILD gns3-server-2.2.31.ebuild 2082 BLAKE2B e4bb2f8d1945076f5f736b2b07ab0c2f49c4a8e4ee3e49b0a7ef9f4f704f307922f746f6d99dc5e7cc69103880acb5f4e9c113e772fa512a395f5f7f704a1d4d SHA512 edb14145263381e914e40c88c72d5160d2085c0f8e0cd3828e935db341217b38eb6a615680002b194a644571ceca5f1029731891291a45222311d0bf8ddb02c8 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49 diff --git a/net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild b/net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild new file mode 100644 index 000000000000..f27244c73657 --- /dev/null +++ b/net-misc/gns3-server/gns3-server-2.2.31-r1.ebuild @@ -0,0 +1,71 @@ +# 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=" + app-emulation/dynamips + >=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}] + >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] + >=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}] + >=dev-python/distro-1.6.0[${PYTHON_USEDEP}] + >=dev-python/jinja-3.0.3[${PYTHON_USEDEP}] + >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.0[${PYTHON_USEDEP}] + >=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.5.4[${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 + + 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/grdesktop/Manifest b/net-misc/grdesktop/Manifest deleted file mode 100644 index f152187a9817..000000000000 --- a/net-misc/grdesktop/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST grdesktop-0.23-patchset.tar.xz 17912 BLAKE2B 0252f3c7fa1779df05d1f7d4315e18e4cce5d4acf69e2a914805d072de25730206bf906b9fe767b777fdfde701ce033563f96087bdc2d85d11271b835947f029 SHA512 0327a17b48ff0f5eb8ab88c683f91deec612cf202cabcde3f150b4be5b19afb612a83ff9dcb965b29899a35c214a7334603263b42c0d2605b48209018845b04b -DIST grdesktop-0.23.tar.gz 299914 BLAKE2B 0a00c721c8d962dd1ad885f4d85130486b3ad9973d21817068f4147ade03d59a2d13dd5e5b26376a0415120521e283a20d79627b62a8bcca15fb2f0213c05bc4 SHA512 a0993d7589d0b22b26535de0cf562604c89ce580fede076c15d8d7f2e7a3bd2fd5ec0a35c6a8ec07fcc8f53a0635381fefe9c2e67d9ff75cec7af47cdd25732f -EBUILD grdesktop-0.23-r2.ebuild 1080 BLAKE2B b2d8544a08e70f5aadc352406c5496370ef903149a1674ae5ff00d26734090661fbbe874944d0fd15fda3b78a59518462a349e8cc7b452f7953972ddfa95fbc1 SHA512 3ccf3f08814b8ae47089e98e2a8df4701702988bf4fd9f18a8db367c33858583df26dbb914bf5bd46d9606c624cff264819b30011dbe38c3a1826bacd5afd028 -MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/net-misc/grdesktop/grdesktop-0.23-r2.ebuild b/net-misc/grdesktop/grdesktop-0.23-r2.ebuild deleted file mode 100644 index 15edde92c9a0..000000000000 --- a/net-misc/grdesktop/grdesktop-0.23-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -inherit gnome2 - -DESCRIPTION="Gtk3 frontend for rdesktop" -HOMEPAGE="http://www.nongnu.org/grdesktop/" -SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="" - -RDEPEND=" - >=x11-libs/gtk+-3.21.4:3 - net-misc/rdesktop -" -DEPEND="${RDEPEND} - app-text/rarian - virtual/pkgconfig -" - -PATCHES=( - # Patches from debian: - # Correct icon path. See bug #50295. - # Fix compilation with format-security, bug #517662 - # gsettings, gtk3 port, gcc10 compat, etc - "${WORKDIR}"/grdesktop-0.23+d040330-7 -) - -src_prepare() { - gnome2_src_prepare - # Fix desktop file validation after debian patchset (it removes Action line, but not the action itself - remove that here) - sed -e '/Desktop Action Full/,+1d' -i grdesktop.desktop -} - -src_configure() { - gnome2_src_configure \ - --with-keymap-path=/usr/share/rdesktop/keymaps/ -} diff --git a/net-misc/grdesktop/metadata.xml b/net-misc/grdesktop/metadata.xml deleted file mode 100644 index 7b343b06be8a..000000000000 --- a/net-misc/grdesktop/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest index 8d8002cee4ad..d7d8f828ddeb 100644 --- a/net-misc/htpdate/Manifest +++ b/net-misc/htpdate/Manifest @@ -2,7 +2,9 @@ AUX htpdate.conf 359 BLAKE2B 7bcd2aa3e818ee31796e6f1e3b060cb6c04558fbfcfbdc51cd6 AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba97997925bd421164dd25d3820e4c7727e14389cd5372635afdf5cc8e313297679e74b3a65ab65f0c4a12b3 SHA512 d18a91792787fdcb4808da042025d60bbe19335fd8492b33af33d33bc24d250bcc65c8ead7d443e4d37a9ca61428361db7b418a5fb3256b030b02b9a772fe10f DIST htpdate-1.2.2.tar.gz 13625 BLAKE2B 11813def81e3cce1194120a21cf99e8ad288b0f604aab201850f03b6ca786d19792b9586c9d805aa1945bbc651e6afc5099b5c7cb6ea354473a4b3bab01397e3 SHA512 00d52b291004ddb3d0282aef78c5fbe5d9397dbf171a6646803ee7ba4bd0514af6089f7e48a92397dd1b0fbae5ba314f5165c9902028438e16d3516b65724de0 DIST htpdate-1.3.3.tar.gz 16302 BLAKE2B eb19462e1e5d02fe3cda7f4d2c954e2fe4b8dfcc299dc9094466a8652250ce27d37b2cf85716435639580e48295a92ad65521e0420cecac875c9b6e8074d425a SHA512 5d4892ea3626b80e5d529de873f675616dfef156e91d1e574225f91f9496503f55da43aa4f3522cb2b55da7c41dba7d97b3cc557a2704945577ec0243d8bd7f8 +DIST htpdate-1.3.4.tar.gz 16312 BLAKE2B 9ebff6df6de69fa310a6459099cff2bf5ec28ac2bb486a29121b87b93505f6bb31b4debc510dc82b7d7b7cce217d9002ec7606fcf4fa863d7b2cfc78dfc6e8d5 SHA512 634317966f1e5c5d78a889a398e77f89505a5918efa076e2cd1184341f25d963b7f1c135afee7d5489bd8a20b2421d9dfea312e09b5e6bdd389626bfd4d2d960 EBUILD htpdate-1.2.2.ebuild 1004 BLAKE2B 5a0491ca50a095a94ff339ab6343c7dae1d359609d3d1d0ec23fa58a2bf85875359e9e50f7e7df849cf84fcc10931c6ccaf18cb8341646ee99bedee7e218ac5e SHA512 0d627e3d4aef1a2f3924382af51207802784cc5cb7c36f3e8a97a9336d5ae398652a580d97567d2ee89e4f0bb885bd3d574fa7b0f6fc0c857bc5c45cc8d900b8 EBUILD htpdate-1.3.3.ebuild 1419 BLAKE2B a7e6c5f37ad0f88439655367bbcf85c950cf39bea3bd01190773eefb3f89b27ae0d1a468fa584afa2b83633252972974b83eba241b3230ace191df593af1ad3f SHA512 997518b4bdebe852fe539813ba0024da6a2196f0cc0683dad8a901cc5d5c370f950d6b37ee3f6d12706b246e74167e243d0a1d07d7c55106cc805758054d18e1 -EBUILD htpdate-9999.ebuild 1419 BLAKE2B a7e6c5f37ad0f88439655367bbcf85c950cf39bea3bd01190773eefb3f89b27ae0d1a468fa584afa2b83633252972974b83eba241b3230ace191df593af1ad3f SHA512 997518b4bdebe852fe539813ba0024da6a2196f0cc0683dad8a901cc5d5c370f950d6b37ee3f6d12706b246e74167e243d0a1d07d7c55106cc805758054d18e1 +EBUILD htpdate-1.3.4.ebuild 1419 BLAKE2B 6b8ce12848ba935d75baee8fb6201909092ce0d99a978fd30715ea9a37e05c6f3afb1fef46731714dcb8f7886d4f3c88626fff173b43231613921c92555eae3d SHA512 cf90b252aef4b7b49f618a864e6ce7129a32107f46cd00534d5bc682a2970b127fea7a5dfd3606b78cfc141f03d0ed9c4cc6d8498c6392dc78ea70a7e696fc66 +EBUILD htpdate-9999.ebuild 1419 BLAKE2B 6b8ce12848ba935d75baee8fb6201909092ce0d99a978fd30715ea9a37e05c6f3afb1fef46731714dcb8f7886d4f3c88626fff173b43231613921c92555eae3d SHA512 cf90b252aef4b7b49f618a864e6ce7129a32107f46cd00534d5bc682a2970b127fea7a5dfd3606b78cfc141f03d0ed9c4cc6d8498c6392dc78ea70a7e696fc66 MISC metadata.xml 332 BLAKE2B 6c0897fc2de1055040f534683bd62cf5341a128d3959f75dc1cae9a356a3ec2524f325eb0dd948492bdbc8718edeec627e8280841c8c61ae1b3cf5c54b246c8f SHA512 8c0feeb2a16e0c085b414735707f98fa0a2727a1b9cb1727511fdae315dcd012c59441d78185ecd6f87feb38db4e787ae267e9fd296fa88d64b76bed0d1c8c52 diff --git a/net-misc/htpdate/htpdate-1.3.4.ebuild b/net-misc/htpdate/htpdate-1.3.4.ebuild new file mode 100644 index 000000000000..31e1a7d493bf --- /dev/null +++ b/net-misc/htpdate/htpdate-1.3.4.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="Synchronize local workstation with time offered by remote webservers" +HOMEPAGE="https://www.vervest.org/htp/" +if [[ "${PV}" == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/twekkel/htpdate" +else + SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux" +fi +IUSE="+ssl" +LICENSE="GPL-2" +SLOT="0" + +DEPEND="ssl? ( dev-libs/openssl:0= )" +RDEPEND="${DEPEND}" + +# Test suite tries to connect to the Internet +RESTRICT="test" + +DOC_CONTENTS="If you would like to run htpdate as a daemon, set +appropriate http servers in /etc/conf.d/htpdate!" + +PATCHES=( ) + +src_prepare() { + default + + # Use more standard adjtimex() to fix uClibc builds. + sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die + # Don't compress man pages by default + sed '/gzip/d' -i Makefile || die +} + +src_compile() { + emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \ + $(usex ssl "https" '') +} + +src_install() { + emake DESTDIR="${D}" STRIP="/bin/true" bindir='$(prefix)/sbin' install + dodoc README.md Changelog + + newconfd "${FILESDIR}"/htpdate.conf htpdate + newinitd "${FILESDIR}"/htpdate.init-r1 htpdate + + readme.gentoo_create_doc +} diff --git a/net-misc/htpdate/htpdate-9999.ebuild b/net-misc/htpdate/htpdate-9999.ebuild index eedff8c28a70..31e1a7d493bf 100644 --- a/net-misc/htpdate/htpdate-9999.ebuild +++ b/net-misc/htpdate/htpdate-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit readme.gentoo-r1 toolchain-funcs diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest index 0d0bc10a3621..29c938857038 100644 --- a/net-misc/iperf/Manifest +++ b/net-misc/iperf/Manifest @@ -5,11 +5,9 @@ AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea -DIST iperf-3.10.1.tar.gz 636957 BLAKE2B 8390b4fb0d4c6590bf73e46d55fbe100f1c9832b4e7baba23b4bec2808b42582bf76cc4250c529a1eb4a58c7214120f0e3a393a7c2602b838b22d97eb53842b3 SHA512 d1139aed0c7a99e8cfc23c41d606854d48a57db24d45ea31412d81222b09faeee6edccdf4030a00eeb6acbfd540d4b985b4a89f81a4d5b84592339ad5e2e9e41 DIST iperf-3.11.tar.gz 638521 BLAKE2B b2981c170aac947c407b0a5686cd9708012282044be30ec7e5f993a9d61d55c4517003024890a194f6e55d342be0e60f1bcab27460541d2b9631a3bb88e094a5 SHA512 4be3e407f77a083d826bddc5ce2939047c85f5b816a6aeb3293eacabf2ea23bf13df4226e629ade3bf390c2eb08d6a1cb96f8cdb0fefb290a0fa4c8331d11a17 EBUILD iperf-2.0.14a.ebuild 863 BLAKE2B 48a3db3ec6b41bad2abef2854e694949a1e14cb71c01b52de2ca28149c9430a9b052f70959b1eb0630ca6ee6460dd54e0e0420a65892e6a86eb3e67875b673b0 SHA512 cd0241a86c550a18572042151c402913ec5e362611580b7a70de5b38c6664c3398f06258be706d311704046f4add0b868a81f913c7afd1d06622307fdc215913 EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 753dbd819ad867ee52dcdb9af069667d78053826f0028257eaee9fa13b6fab31cb27e5d419baa4c038a3346f607cd06639ed4dcc8fabbee6af943de336e9c45d SHA512 37d2329648792714b13e5fcdd2709b181d1cf32aa159aa39d8e3a1b922a01ef47e13ea340bef966991b7321d93bf9a41e7d2e824204f6770610eb71afeec6f13 -EBUILD iperf-3.10.1.ebuild 956 BLAKE2B c15ea0249e0b0d6b42f8201c906d21cb6cd2c7feddcd5e08c763fa8bd9e80114f77feabd9b800b2b6c55a18593ffe9ca36b604e4308689e06f875bf9bfaf8d36 SHA512 9c189cc81ae98013a401f2224913b8a223f2467b7cf89cea563ffd5995954262daecbfb8defc3dadd117e5cb587d02c4a613ad56ad58b0ca33c22fe7e90d3d25 EBUILD iperf-3.11.ebuild 934 BLAKE2B 6f73bc2c30297582aa0b1c422b667e2227c7166350098b72a472e7ab42181e478584ff8052a932e4b32d83d2fbb1f0ef0d64542efe1c27cf4f8cfa41c21e5298 SHA512 4802a1f32cebae592b5db1819214d85d8e8422bbe809bdc0583dcb39dd384559329bdb27e64675336bad0f25cee33e307b2d5cde0f1ba81b3a8312ed57bd565f EBUILD iperf-3.99999.99999.ebuild 722 BLAKE2B 3e048d5eb49365b5c5f89e4072de496e908269c1dcf754f54810671d6ee66c08c814278be899060a7ac97a04464da4ddcbb9a93e79f5cbc6fa195eed584ea71d SHA512 b47ee419c1d04829ccb9a5a4225d58bb15f723a0f297b01c99f194ec662bba4200371aa0e084e737af0f9ccbbccb656c4e0dd680830fc9af11dc1be342bcd64c MISC metadata.xml 570 BLAKE2B e17cc2b8458663f6ed2e9de7cca4e6a0d2e21e7f0c22a92c7b2d8589a944a466436f0dec4e18843641cc9364f407b061ff44dbbe342162ab28556ec953b029b4 SHA512 e3acd2262d442675557b837bbed0feaf7a1f148f7306b64139d8ba39d052794a9e7b60f125eee8745b0d13cdeafbb93012c62d1c524caa1e0f4730d1200426cc diff --git a/net-misc/iperf/iperf-3.10.1.ebuild b/net-misc/iperf/iperf-3.10.1.ebuild deleted file mode 100644 index d16bea61f8d4..000000000000 --- a/net-misc/iperf/iperf-3.10.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool" -HOMEPAGE="https://github.com/esnet/iperf" -SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P/_/}" - -LICENSE="BSD" -SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="sctp" - -DEPEND=" - dev-libs/openssl:0= - sctp? ( net-misc/lksctp-tools ) -" -RDEPEND="${DEPEND}" - -DOCS=( README.md RELNOTES.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch -) - -src_configure() { - econf \ - --disable-static \ - $(use_with sctp) -} - -src_install() { - default - - newconfd "${FILESDIR}"/iperf.confd iperf3 - newinitd "${FILESDIR}"/iperf3.initd iperf3 - systemd_dounit contrib/iperf3.service - - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest index 7d7a893fbd17..0a987b30ccd6 100644 --- a/net-misc/ipmiview/Manifest +++ b/net-misc/ipmiview/Manifest @@ -1,5 +1,5 @@ AUX fake-java-r1.bash 289 BLAKE2B 1bd0c9477af5d064f4479fadd040338d972195ad99f87e7244b4953764da3f4a2bc4ffb7118bbe8bcc9c6d8cf9c5e42a1990219ca7e8d89cb931f5ee6265d214 SHA512 9de74481bcff69098484b328157ad2208255e791dd4595e1ba926a2754c7bbae04b94ec4d717e7b9556b64bf4fdc749e012c99fdc771844fbf003021d9cda65a AUX launcher-pre.bash 143 BLAKE2B b33051ba8052380465c59b68733416298166949bcc794047a097816dac68fed0bc7ad39dc056e57e5114f622faf64b67598028b35b83d6ded95034d2a71126d0 SHA512 2a1b35175fe6364eb7790de93878d4834ca69f1dde438fdcf0cebd7c7bf16600f2eaacf334f91c740512ad068914c1adb7a09017a23694bcceb837be20989161 -DIST IPMIView_2.19.0_build.210401_bundleJRE_Linux_x64.tar.gz 147779297 BLAKE2B e3a0846e2704c5acc91ec303d40882d3572165b608c875e02d171b78e8158ea388c38da4e22a78ec4008517bbe7a826f89566bd4a16380009ed94b773b476686 SHA512 6bbde5ff7e5ba73d35068e30a6ca34a2993bc96b3ee10a5bbbafbeb321eb98960a176ec6712183e94705c33462791c23e93732b2945c93b2df5304e8e7d95a10 -EBUILD ipmiview-2.19.0.210401-r2.ebuild 2023 BLAKE2B c65f575835a5dcac20ae10b0b7d0cab6397160e6f992c5caa7a178368c2299112114844787e086e845b354116b57eea5165cbe2651ed03a74fedb0160ecafb45 SHA512 28c9666ae443e14e9390a103ce7d353fd7f17ecf4031485c98d0a4c44b37aa04612d285cc113fe915e633b9439cf37c5d7a8b69704733fc5080e7ee181b6ec25 +DIST IPMIView_2.20.0_build.220309_bundleJRE_Linux_x64.tar.gz 151702450 BLAKE2B 11b47da54e414d110007aac9ab120182659c2eb4a39dcc5b141db68db9e7c70760ad477f4f21b697ccb8571c1585b6096c6e7c562c3e629865bb8504b3599292 SHA512 13f7e3b50ad95206c41b3153748dd6f5ac29947416c3cd2ae18d82e06afed107d15378bb398cf3d7e6ebaf7cfc08e413897e8847daf53194c16efae5e3393750 +EBUILD ipmiview-2.20.0.220309.ebuild 2023 BLAKE2B c65f575835a5dcac20ae10b0b7d0cab6397160e6f992c5caa7a178368c2299112114844787e086e845b354116b57eea5165cbe2651ed03a74fedb0160ecafb45 SHA512 28c9666ae443e14e9390a103ce7d353fd7f17ecf4031485c98d0a4c44b37aa04612d285cc113fe915e633b9439cf37c5d7a8b69704733fc5080e7ee181b6ec25 MISC metadata.xml 703 BLAKE2B dc49c70c55ec3fab0bffd75b82500d88c0abcf072e61b96db1653373e6c7f6e01998441c9e107f7eb498ba23eb611c8c18fbf4f187c6aaa127f935754fa49f5a SHA512 e831ad0df261192f11dd6cd89fd62604a474e8810df47bd7a4275ed63a6056ef4d0dd005ed446842e492fc47beaa6d58c4a39ae85e329d80226914219aeeaadf diff --git a/net-misc/ipmiview/ipmiview-2.19.0.210401-r2.ebuild b/net-misc/ipmiview/ipmiview-2.20.0.220309.ebuild index 0969639c5c31..0969639c5c31 100644 --- a/net-misc/ipmiview/ipmiview-2.19.0.210401-r2.ebuild +++ b/net-misc/ipmiview/ipmiview-2.20.0.220309.ebuild diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index b0d97be6bfb4..6ae36e6c2b6a 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,14 +1,10 @@ AUX iputils-20210722-fix-no-ipv6-ping.patch 2038 BLAKE2B ac403da299a9e407482396c1fb232bc16d388aec0f53954214ba9af982fb37f60140c179bd6a547a079bca63a9a9ccf1f0660ec6bee184a5db544959df94b103 SHA512 3d2bcc77d7e3cc433bdf9d7d84deb1471b6860167dbc0b0937b688762a183c7e8da5285a5c8fb09252322511601133721148f06edc64ee6f3e8f741d02182851 AUX iputils-20210722-optional-tests.patch 5276 BLAKE2B c485d39b06916acdaaec6f98ffeb718afbfd630af7220c7dfb408855a8862c2b121bbf4482621f633b86f1b94df78afc54157d99f2ff28cff833ae263aae5e78 SHA512 59d7ff881c03d7c03f5f41d2015f03175456487d9802999173f4705b3cfd7819957258e68a0b932fd9901f418bca866252d4a673d66f08b9e179a07ae84e8c40 -DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d SHA512 af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526 DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f56225c998ecc6c3d332fef046dd8032e5afaff1cdc916d048f9d84cc8a85736a26a3176e66e111e02c9dbfcb0f195 SHA512 8f85bf468f8ef1e2832e9bbf9009552df4a6d723dd130fa0d5b2aa3bae617c972f936143c2370c3b4ce2ba2499828c91a299ee42cf81fa81aabe10552db2b328 DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9 -DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1 DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415 DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee -EBUILD iputils-20210202.ebuild 4210 BLAKE2B b090f1cd2ceff44eefe1491c796ee6851bfdc78aff2cdadadd808fdc554b6876e164d5d4c89819401e6f2c25b0177d9886700c3abaae042f52fbe707df156a29 SHA512 83f5a2327619765b9d768534ea688fde8099e45162209da26465ef6abe6f49483255ce9c1c862d3f9f2e18eeeffae7f3af0ca8291f2e0a744bee0f88669c3670 -EBUILD iputils-20210722-r1.ebuild 4497 BLAKE2B 141f0df921a2b3841b1d8befca29f7699b518daef3231a0d6239b10b1663478c7cf0014ce024fb10b718a7bde838f2528c6b630ceb83abdecd3af72384215454 SHA512 516a2d32faca7775076badae729bc0b49d03740b93e707f489d0dadcf417d4adca23c42a2a055a26c0de60fdf5663f72afffa687dcfd39194fb99114776ef61d -EBUILD iputils-20210722.ebuild 4512 BLAKE2B 1db6a9919ec592900f53fe4676a31b21059a6f011418616eef131f2d57d869b5af8ee3a0d4b527adc85a65c564a9137d23f631c03376920890d4140d8ceb0435 SHA512 fad6f0ac622ed92df810b9a34c9450853af63ad7ace9707dd1855058ff47188dffa2b134bf50862ab1c52e26c8c2207ac7183115d9c7452e0e116bf1c536538c -EBUILD iputils-20211215.ebuild 4773 BLAKE2B f65e64db9db6252eb36f21cf3221800909eb9a90f588bfbcf0b8efa0a74454a807a4ef46891e7509b8a8840e3e6424b0e8e9edb6329fdd2a7c78ac8cc290b0ce SHA512 a187a4bbc760c73bf527cea3c3229dde55914967fde59d41b78ad1a71de8317adaa7aa762219d09ed1f4fa8c85b2bbedb71099ed0080e4c55f101362661c5918 -EBUILD iputils-99999999.ebuild 4579 BLAKE2B 974cfa5b771f8bd983d2b28dc51ca8cf1bc05a9497ee733a67a187fd023e4572d6fb1955b1d66d9c7151f203b3b4cf91b486149607ade7cfe941f5f39dc6b4f8 SHA512 b4de09522b2b91954b5742d92f898e1522064f7d9345247c06c63d2ce06c54d34daa62ca1a6d5ec892d4780e28f8adabe571b99391ebc0548c423fc39a29dc3b -MISC metadata.xml 1510 BLAKE2B 773a096616c325fdef0d4fc5e5cc887d47ab3433be7efdcbfaf99e4d04f82d589ab759a7493e1cd10e80cc047c5288ee2200f7b21cfa24ab801f5b84688f5fd8 SHA512 4e207561d2d42f4bd07b6ded0729688883b6f8fa38d15734ab42ca66b1baac98bf283a71fb80f210f7a1732611e987e85084e615c4ef727126faa29acd154ae9 +EBUILD iputils-20210722-r1.ebuild 4479 BLAKE2B 750d9f2d727712cf18dbe0ba57c3a00778550ef3c6acbed220c49d9f3b5923b8f17571fcf711419c849aadef9f8068306f1bfc5df01d1a1930ddd1fc334a2021 SHA512 35a603440b190972fa0738384415d7ed5ebaa086a3edf5d33521aeb1cf1a9c1725257721a0ff866e1d4ae1c2b32c40c229e9c0147c4df62954727f26a8039053 +EBUILD iputils-20211215.ebuild 4762 BLAKE2B bc353f7d10c4881bb7424c7828db70d2a574cb21ec572cab9e769ba18c87ac3fb27a084589d495c9c2822c1eb0aeafc241b33071f5521c631bdac8748429173d SHA512 db0d6efba7bb58258935b4962f613be358abe3be9869dd03638406c3110eb25d62a7b67af2271a91c5acc09766e818a73f45ce9297c9848843ab643ee9ccc5bc +EBUILD iputils-99999999.ebuild 4256 BLAKE2B b58c87e7b56ca6f0b5127153ec1d8d551d6bbbbf2d609ad654bab0cab556f0875af0be11b76067c3b4cabe76d1b545dfad65549ffcc061cd019feeb45e2edb6c SHA512 e775320e5759ef38f20fdccdfc4a6b7713fc8fb466b976697dc1315b5770cd44a08f4e75d86ab3a4b5f465a3ef53b0742d878ce871b69e443aba5be373711d89 +MISC metadata.xml 1351 BLAKE2B fadee46aec2d000027cd23e6eb442bca0077635fe98ae847e37c5848dffabef28950e54df9e6e86b49ec18630ec2e305975a5a04575a9246b86f9504c61f18aa SHA512 fac4af2402993b203cbc225c54f905e63334ef714fcddbeaa56d95963fa13d5be308b0b2030b6c74719596deed4cdfb50c668698b6acf493b2bf964c3df85251 diff --git a/net-misc/iputils/iputils-20210202.ebuild b/net-misc/iputils/iputils-20210202.ebuild deleted file mode 100644 index 429e1a716287..000000000000 --- a/net-misc/iputils/iputils-20210202.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and reduces dependencies. -# To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag, all USE flags enabled and -# tar ${S}/doc folder. - -EAPI="7" - -PLOCALES="de fr ja pt_BR tr uk zh_CN" - -inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/iputils/iputils.git" - inherit git-r3 -else - SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Network monitoring tools including ping and ping6" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" - -LICENSE="BSD GPL-2+ rdisc" -SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6" - -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -LIB_DEPEND=" - caps? ( sys-libs/libcap[static-libs(+)] ) - idn? ( net-dns/libidn2:=[static-libs(+)] ) - nls? ( virtual/libintl[static-libs(+)] ) -" - -RDEPEND=" - traceroute6? ( !net-analyzer/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) -" - -DEPEND=" - ${RDEPEND} - virtual/os-headers - static? ( ${LIB_DEPEND} ) -" - -if [[ ${PV} == "99999999" ]] ; then - BDEPEND+=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-ns-stylesheets - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - " -fi - -src_prepare() { - default - - plocale_get_locales > po/LINGUAS || die -} - -src_configure() { - use static && append-ldflags -static - - local emesonargs=( - -DUSE_CAP="$(usex caps true false)" - -DUSE_IDN="$(usex idn true false)" - -DBUILD_ARPING="$(usex arping true false)" - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)" - -DBUILD_PING="true" - -DBUILD_RARPD="$(usex rarpd true false)" - -DBUILD_RDISC="$(usex rdisc true false)" - -DENABLE_RDISC_SERVER="$(usex rdisc true false)" - -DBUILD_TFTPD="$(usex tftpd true false)" - -DBUILD_TRACEPATH="$(usex tracepath true false)" - -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)" - -DBUILD_NINFOD="false" - -DNINFOD_MESSAGES="false" - -DNO_SETCAP_OR_SUID="true" - -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -DUSE_GETTEXT="$(usex nls true false)" - ) - - if [[ "${PV}" == 99999999 ]] ; then - emesonargs+=( - -DBUILD_HTML_MANS="$(usex doc true false)" - -DBUILD_MANS="true" - ) - else - emesonargs+=( - -DBUILD_HTML_MANS="false" - -DBUILD_MANS="false" - ) - fi - - meson_src_configure -} - -src_compile() { - tc-export CC - meson_src_compile -} - -src_install() { - meson_src_install - - dodir /bin - local my_bin - for my_bin in $(usex arping arping '') ping ; do - mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die - done - dosym ping /bin/ping4 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath4 - fi - - if use ipv6 ; then - dosym ping /bin/ping6 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath6 - dosym tracepath.8 /usr/share/man/man8/tracepath6.8 - fi - fi - - if [[ "${PV}" != 99999999 ]] ; then - local -a man_pages - local -a html_man_pages - - while IFS= read -r -u 3 -d $'\0' my_bin - do - my_bin=$(basename "${my_bin}") - [[ -z "${my_bin}" ]] && continue - - if [[ -f "${S}/doc/${my_bin}.8" ]] ; then - man_pages+=( ${my_bin}.8 ) - fi - - if [[ -f "${S}/doc/${my_bin}.html" ]] ; then - html_man_pages+=( ${my_bin}.html ) - fi - done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) - - pushd doc &>/dev/null || die - doman "${man_pages[@]}" - if use doc ; then - docinto html - dodoc "${html_man_pages[@]}" - fi - popd &>/dev/null || die - else - if use doc ; then - mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die - fi - fi -} - -pkg_postinst() { - fcaps cap_net_raw \ - bin/ping \ - $(usex arping 'bin/arping' '') \ - $(usex clockdiff 'usr/bin/clockdiff' '') -} diff --git a/net-misc/iputils/iputils-20210722-r1.ebuild b/net-misc/iputils/iputils-20210722-r1.ebuild index 2ae5257319b0..a97324cae332 100644 --- a/net-misc/iputils/iputils-20210722-r1.ebuild +++ b/net-misc/iputils/iputils-20210722-r1.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" LICENSE="BSD GPL-2+ rdisc" SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6" +IUSE="+arping caps clockdiff doc idn nls rarpd rdisc static test tftpd tracepath traceroute6" RESTRICT="!test? ( test )" BDEPEND=" diff --git a/net-misc/iputils/iputils-20210722.ebuild b/net-misc/iputils/iputils-20210722.ebuild deleted file mode 100644 index a4f130b6e606..000000000000 --- a/net-misc/iputils/iputils-20210722.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and reduces dependencies. -# To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag, all USE flags enabled and -# tar ${S}/doc folder. - -EAPI="7" - -PLOCALES="de fr ja pt_BR tr uk zh_CN" - -inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/iputils/iputils.git" - inherit git-r3 -else - SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Network monitoring tools including ping and ping6" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" - -LICENSE="BSD GPL-2+ rdisc" -SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6" -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig - test? ( sys-apps/iproute2 ) - nls? ( sys-devel/gettext ) -" - -LIB_DEPEND=" - caps? ( sys-libs/libcap[static-libs(+)] ) - idn? ( net-dns/libidn2:=[static-libs(+)] ) - nls? ( virtual/libintl[static-libs(+)] ) -" - -RDEPEND=" - traceroute6? ( !net-analyzer/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) -" - -DEPEND=" - ${RDEPEND} - virtual/os-headers - static? ( ${LIB_DEPEND} ) -" - -if [[ ${PV} == "99999999" ]] ; then - BDEPEND+=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-ns-stylesheets - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - " -fi - -PATCHES=( - # Upstream; drop on bump - "${FILESDIR}"/${P}-optional-tests.patch -) - -src_prepare() { - default - - plocale_get_locales > po/LINGUAS || die -} - -src_configure() { - use static && append-ldflags -static - - local emesonargs=( - -DUSE_CAP="$(usex caps true false)" - -DUSE_IDN="$(usex idn true false)" - -DBUILD_ARPING="$(usex arping true false)" - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)" - -DBUILD_PING="true" - -DBUILD_RARPD="$(usex rarpd true false)" - -DBUILD_RDISC="$(usex rdisc true false)" - -DENABLE_RDISC_SERVER="$(usex rdisc true false)" - -DBUILD_TFTPD="$(usex tftpd true false)" - -DBUILD_TRACEPATH="$(usex tracepath true false)" - -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)" - -DBUILD_NINFOD="false" - -DNINFOD_MESSAGES="false" - -DNO_SETCAP_OR_SUID="true" - -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -DUSE_GETTEXT="$(usex nls true false)" - $(meson_use !test SKIP_TESTS) - ) - - if [[ "${PV}" == 99999999 ]] ; then - emesonargs+=( - -DBUILD_HTML_MANS="$(usex doc true false)" - -DBUILD_MANS="true" - ) - else - emesonargs+=( - -DBUILD_HTML_MANS="false" - -DBUILD_MANS="false" - ) - fi - - meson_src_configure -} - -src_compile() { - tc-export CC - meson_src_compile -} - -src_test() { - if [[ ${EUID} != 0 ]]; then - einfo "Tests require root privileges; Skipping ..." - return - fi - - meson_src_test -} - -src_install() { - meson_src_install - - dodir /bin - local my_bin - for my_bin in $(usex arping arping '') ping ; do - mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die - done - dosym ping /bin/ping4 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath4 - fi - - if use ipv6 ; then - dosym ping /bin/ping6 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath6 - dosym tracepath.8 /usr/share/man/man8/tracepath6.8 - fi - fi - - if [[ "${PV}" != 99999999 ]] ; then - local -a man_pages - local -a html_man_pages - - while IFS= read -r -u 3 -d $'\0' my_bin - do - my_bin=$(basename "${my_bin}") - [[ -z "${my_bin}" ]] && continue - - if [[ -f "${S}/doc/${my_bin}.8" ]] ; then - man_pages+=( ${my_bin}.8 ) - fi - - if [[ -f "${S}/doc/${my_bin}.html" ]] ; then - html_man_pages+=( ${my_bin}.html ) - fi - done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) - - pushd doc &>/dev/null || die - doman "${man_pages[@]}" - if use doc ; then - docinto html - dodoc "${html_man_pages[@]}" - fi - popd &>/dev/null || die - else - if use doc ; then - mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die - fi - fi -} - -pkg_postinst() { - fcaps cap_net_raw \ - bin/ping \ - $(usex arping 'bin/arping' '') \ - $(usex clockdiff 'usr/bin/clockdiff' '') -} diff --git a/net-misc/iputils/iputils-20211215.ebuild b/net-misc/iputils/iputils-20211215.ebuild index 010a74464c06..74d10298e9c0 100644 --- a/net-misc/iputils/iputils-20211215.ebuild +++ b/net-misc/iputils/iputils-20211215.ebuild @@ -21,7 +21,7 @@ else SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" @@ -29,7 +29,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" LICENSE="BSD GPL-2+ rdisc" SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tracepath" +IUSE="+arping caps clockdiff doc idn nls rarpd rdisc static test tracepath" RESTRICT="!test? ( test )" LIB_DEPEND=" diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index cef1837240e2..9022c8970b5d 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -29,19 +29,17 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" LICENSE="BSD GPL-2+ rdisc" SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn nettle nls ssl static test tracepath" +IUSE="+arping caps clockdiff doc idn nls test tracepath" RESTRICT="!test? ( test )" -LIB_DEPEND=" - caps? ( sys-libs/libcap[static-libs(+)] ) - idn? ( net-dns/libidn2:=[static-libs(+)] ) - nls? ( virtual/libintl[static-libs(+)] ) +RDEPEND=" + caps? ( sys-libs/libcap ) + idn? ( net-dns/libidn2:= ) + nls? ( virtual/libintl ) " -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND=" ${RDEPEND} virtual/os-headers - static? ( ${LIB_DEPEND} ) " BDEPEND=" virtual/pkgconfig @@ -66,8 +64,6 @@ src_prepare() { } src_configure() { - use static && append-ldflags -static - local emesonargs=( -DUSE_CAP=$(usex caps true false) -DUSE_IDN=$(usex idn true false) @@ -114,13 +110,8 @@ src_test() { src_install() { meson_src_install - dodir /bin - local my_bin - for my_bin in $(usex arping arping '') ping ; do - mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die - done - dosym ping /bin/ping4 - dosym ping /bin/ping6 + dosym ping /usr/bin/ping4 + dosym ping /usr/bin/ping6 if use tracepath ; then dosym tracepath /usr/bin/tracepath4 diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml index b6ebdf9c592a..cd78568cc221 100644 --- a/net-misc/iputils/metadata.xml +++ b/net-misc/iputils/metadata.xml @@ -8,8 +8,6 @@ <use> <flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag> <flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag> - <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for md5 support</flag> - <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for md5 support</flag> <flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag> <flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag> <flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag> diff --git a/net-misc/jrdesktop/Manifest b/net-misc/jrdesktop/Manifest deleted file mode 100644 index 3c07b282e438..000000000000 --- a/net-misc/jrdesktop/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST jrdesktop-source-0.3.1.0.tar.gz 228134 BLAKE2B d40fc0e12908bc535aa2be32962f30c41b4b7244363bea23fac983db9f25cde942da7ede23895d3c5c7f283dabc00331659567e76ba8357b850a655462a593fe SHA512 dc18187349f2526c027bf45acffa638d4d32692fdcf60b016a540a9245269e4ef49e4893fd666b8ad084dff0c83eb05a0549bcdf112c038f29224ff5a451cca6 -EBUILD jrdesktop-0.3.1.0.ebuild 699 BLAKE2B e0ba01d6e18c00faef158566c328ad480f10f1a9087d350def056aac0a068409b353394d027bb8524c15a17b7aad296da5f9314960b583f34e7d7b419688c038 SHA512 27d29e52f615db823146c2849b9e56114e6081787f8e4299721d5ffcf1446912ad7ea3baceb232ea0a66882f00d6098fd03e428c5241098489435d55f713de24 -MISC metadata.xml 772 BLAKE2B a4394b2cba84ed8a016d131304c54acf90b8e65ff3e7155f900272751cc244b82a0d51538817be13af3f9563eeddd2c3ad54248c3979c79cb87ad5c100df83c9 SHA512 13afa221804b458443d537e09d57c07aacf1a87d7f2f610562a3a0c035e265696e12a1106748ada7f36b3bc8a424a4d684d85b7cae392890a572744392a6d41b diff --git a/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild b/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild deleted file mode 100644 index 8c578e84e9f1..000000000000 --- a/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="source doc" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java Remote Desktop (jrdesktop) for viewing and/or controlling a distance PC" -HOMEPAGE="http://jrdesktop.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=">=virtual/jdk-1.6" -RDEPEND=">=virtual/jre-1.6" - -S="${WORKDIR}/${PN}" - -EANT_EXTRA_ARGS="-Djnlp.enabled=false" - -src_install() { - java-pkg_dojar "dist/${PN}.jar" - - use source && java-pkg_dosrc src/* - use doc && java-pkg_dojavadoc dist/javadoc - - java-pkg_dolauncher -} diff --git a/net-misc/jrdesktop/metadata.xml b/net-misc/jrdesktop/metadata.xml deleted file mode 100644 index 81f53435aaea..000000000000 --- a/net-misc/jrdesktop/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <longdescription lang="en"> - Java Remote Desktop (jrdesktop) is an open source software for viewing and/or controlling a distance PC. - -Besides then screenshots, keyboard and mouse events transfer, jrdesktop includes many additional features (like: file transfer, data compression, color conversion, ...). - -jrdesktop uses RMI (Remote Method Invocation) with SSL/TLS to establish a secured connection between the viewer and the server. - </longdescription> - <upstream> - <remote-id type="sourceforge">jrdesktop</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/knock/Manifest b/net-misc/knock/Manifest index 1fb9f2df1c32..8e80c9da3498 100644 --- a/net-misc/knock/Manifest +++ b/net-misc/knock/Manifest @@ -1,7 +1,5 @@ AUX knockd.confd.2 189 BLAKE2B 288c5c9e47a3001d83edd0f9d54286754fecd7d8321896370af63c0e3429a2c4004a8e99a835e558878f6b934d8c50f6ecdc5f267cd7608c59de46cfed195162 SHA512 75a483770c31f8de3744c9c3119c5cf818b9ff780bf9cffb49c1f4a78b2f384dc392218ea2a0df9fd7178a19b0b1f5a59d8a81cdb56f952cd4c8e5a91c9cf25a AUX knockd.initd.2 527 BLAKE2B 1c0e429d07d4023d34ae129c900161a9a681cd76761e953e3b6416fb3f5ad067b8f2e5c567887ccfc43adaa3b1a1f9e58bcb19ed660b118785db41aa45330107 SHA512 dc66e53bdc42487609d978a538dec26712f25c87b9a2e4a70e1a833fedfbacf3b8618f87cbe110ed54938f6620fd2e5f7a79143d7f8503927686dfa26eb9acff -DIST knock-0.7.tar.gz 110791 BLAKE2B 19e63854800f4ef77199fb4005dabd749f16681068d205a924fa0bc926d2cc31a69c1f62ffa8ec335209cfa987e7db92d9332b43e971f71528f69740ced06391 SHA512 eab5d855f7111d9411e84a56a15e8ea74f41c5bd9dee27ab49f0d8d509eeeb96a60c508928c92916dc0ec9b737c447ca8ca5ed4db6479b389549d60e76a85aa7 DIST knock-0.8.tar.gz 377107 BLAKE2B 1397ed04b1a202db08b0bd3a8a26745cd2e8390604c9dde7d18182e7ad4ddd19da074b1b54ea1ed59b1576f3110e21bac722c90a2cd3820910bdaa0026eec395 SHA512 6511e29f604cebc4a4048f5e49c1b73db0bbe0041a88f7c8559fa1a60ea894aadb72a608c423f867a5a4dddb06d00a0713863473981e42273662a77364c260ec -EBUILD knock-0.7-r1.ebuild 1093 BLAKE2B 6fa890d34f137f602cca10a1b24c6d05341a8ade371eb20ae3e241eb51072e37ca5a358085237c01f51dd141aa6fc3868c58d1e1f3994dc593861d74c4a11a35 SHA512 7d2d709aeda869f5e5191ee79c150aa7f40e7749e6c0a65be304989f4fb6f21262df7bf6d032401c5342f5bf3da7e43e10cc678a305bfb6210e9b81a70940125 EBUILD knock-0.8.ebuild 1093 BLAKE2B 6fa890d34f137f602cca10a1b24c6d05341a8ade371eb20ae3e241eb51072e37ca5a358085237c01f51dd141aa6fc3868c58d1e1f3994dc593861d74c4a11a35 SHA512 7d2d709aeda869f5e5191ee79c150aa7f40e7749e6c0a65be304989f4fb6f21262df7bf6d032401c5342f5bf3da7e43e10cc678a305bfb6210e9b81a70940125 MISC metadata.xml 324 BLAKE2B 2bcab639e09a1402c24fe93524e2463d7a358c07b058259c0e3a36b25a2999d133533c974a02fd73e310f363b6da85027445a822b28c45e316f40705e82f00d2 SHA512 1ca84e8689eaac870d01e155e4ee8f26c141763066dbe0f4f6d046139f7a3a2cc29dec6fd30c5e1b557e7d481f188a5281edd54e9a6f0a30eddaa1663da9efbd diff --git a/net-misc/knock/knock-0.7-r1.ebuild b/net-misc/knock/knock-0.7-r1.ebuild deleted file mode 100644 index 5d3643d7508a..000000000000 --- a/net-misc/knock/knock-0.7-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Simple port-knocking daemon" -HOMEPAGE="https://www.zeroflux.org/projects/knock" -SRC_URI="https://www.zeroflux.org/proj/knock/files/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="+server" - -DEPEND="server? ( net-libs/libpcap )" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -e "/^AM_CFLAGS/s: -g : :" \ - -e "/dist_doc_DATA/s:COPYING::" \ - -i Makefile.in || die - - sed -e "s:/usr/sbin/iptables:/sbin/iptables:g" \ - -i knockd.conf || die -} - -src_configure() { - econf $(use_enable server knockd) -} - -src_install() { - emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install - - if use server ; then - newinitd "${FILESDIR}"/knockd.initd.2 knock - newconfd "${FILESDIR}"/knockd.confd.2 knock - fi -} - -pkg_postinst() { - if use server && ! has_version net-firewall/iptables ; then - elog "You're really encouraged to install net-firewall/iptables to" - elog "actually modify your firewall and use the example configuration." - fi -} diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index 597e5748b630..623c7bd44398 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -12,5 +12,5 @@ DIST memcached-1.6.15.tar.gz 1051109 BLAKE2B 96e931b2a513cc6717dbc3262e3c7d30a22 EBUILD memcached-1.6.10.ebuild 2861 BLAKE2B 766d0823415f5695f50c3ef538277ca8eaddc0c21c19680bf917acc4c2cda54f942fb4bb742fe87bc2b734f4e3d440a1db1f5f3fde8f9783b611fa4d731e47ef SHA512 f19bc943a41580db184bf036fdc517f59fe8f8418ffa7855a5066160c1427ebfb9eb73d07df62803c5f095fa01e0deba56ae1464bd462610b6f0c4f175897cff EBUILD memcached-1.6.13.ebuild 2868 BLAKE2B 5f38656aec2eb9d62cc12ee437410a01d9e666e33856c9755aa3c2add6c75db2614932415933431f545e5f0b1bc90d8af11397ece9ddeddd70fe474f6082432e SHA512 b7388ee5dc5bef4597104a92d3a314207fb35bfc3a66c17b5c691fabc3bbb9bc49587acc0d432b01c1e838c032330ee23c93df4d15bd726bbe300032381deff3 EBUILD memcached-1.6.14-r1.ebuild 2968 BLAKE2B d1683d929f3a1165f0c92645fa33ae16cee48f64bae0427e75228edf2611acb7432012f04d754693fe36bef88ae689a13c1f6fe6af7177bfde399af8201c8a2d SHA512 edde0dcf4d1d46972b7503b4b4ce0ea8ff0ad6ee0086beb12a63148b1e2ea96036842f3e2c47f5c61d2e12dd99c5f9d3286f9e29f1686d7a2cb6fb6f4a811c75 -EBUILD memcached-1.6.15.ebuild 2968 BLAKE2B be697710d4688ad91fb6eac4ae72bb3f76b5195a24cd93b4e5df74aa3f38244a6fb2c28d9200798ed54f3b469858db0a9afe84ffcbc806f44fe969851c5c6182 SHA512 e4881b5088fa43f10c3bfd2a310a8e5479a133e3760a0c61402509ef89b8160398b2e190b9a2945628290fa3268ca9185f75b8eda9ed7c823d3711153d6d2dfe +EBUILD memcached-1.6.15.ebuild 2975 BLAKE2B 99872c458f163b3b1a297776faaea7fd20834858c69e512e98d86f412359a4f9cae5111cad94ace6d6d1de1a3209594f0fcbdf22ee714f05c1edeef9add7e602 SHA512 accb543d702a6998989aee10cf7618fa7498aa2a87bc26541b428a9f29d12f9a7254aa243253d052490b402ce263c3cf233ea434163e9245f02ad590e669d466 MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de diff --git a/net-misc/memcached/memcached-1.6.15.ebuild b/net-misc/memcached/memcached-1.6.15.ebuild index 510916602bb0..39801d79547c 100644 --- a/net-misc/memcached/memcached-1.6.15.ebuild +++ b/net-misc/memcached/memcached-1.6.15.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest index 7ba56294f7a6..22fab460024d 100644 --- a/net-misc/mico/Manifest +++ b/net-misc/mico/Manifest @@ -1,6 +1,4 @@ -DIST mico-2.3.13-gentoo-r13.patch 133254 BLAKE2B 71e22f8bd7491b6aa594a32d7d2a5677b3fc1376bb8ff11eae20e6749ec9c582b99704030c2178f81f1b1fd4ac8f4c2b14e3c80cdf9769ed49004c5a4bab761d SHA512 4e4c60c8e3f6e303b136d17cc83cd5bb92a2b23c0a843721ba74e62d6c69224719bf254a5d8c028df0166c36a07ef349e98f4244b4d208e689c3b6c382c1b906 DIST mico-2.3.13-gentoo-r14.patch 136291 BLAKE2B 3416fe0fc2e0b9243d22c9cf6a0dffbf14c99846d1b064b3df6496c2d1b9021de0268d0543f566d13425d4fef29626829359deb133ce678d299627f93b0461de SHA512 3ec284442ac00bf429f633dddcaae46a83b720045bc93a177a609255957956aaccb188b0e858ac88b3d8b0c9be081501dcffabd86965b1a4b30a07d45aab0850 DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895 -EBUILD mico-2.3.13-r13.ebuild 3963 BLAKE2B b456926c8cabfe9304fb4766ef82f6a7fc9b17b1c225547456cc3899b962f41e1d0160301c7d2826e10a64bb564bc6494dbacb6e5cfa5f1082647f8ee3d9191e SHA512 391abc480d3b61d71893e7139891f0e261a8fdca517ae7f831367c085b67ad2f0a0747f57ac26b632b5e8d5f3c1f96a3ddde31e87687022a3408631fbb47d7c7 EBUILD mico-2.3.13-r14.ebuild 3963 BLAKE2B b456926c8cabfe9304fb4766ef82f6a7fc9b17b1c225547456cc3899b962f41e1d0160301c7d2826e10a64bb564bc6494dbacb6e5cfa5f1082647f8ee3d9191e SHA512 391abc480d3b61d71893e7139891f0e261a8fdca517ae7f831367c085b67ad2f0a0747f57ac26b632b5e8d5f3c1f96a3ddde31e87687022a3408631fbb47d7c7 MISC metadata.xml 546 BLAKE2B b1799caa4afd503c95d70b7d06e90c97524d9160cfe443009b297a60f4fbb1d3253a260058dde8629cff6b205d3a9ac8203045f646f72a0a7bb08c969c364b0e SHA512 95993f5d38d3e7fff293c22161eca3107e05195a6a16ca4e3e5bf2933d870faffce1e048957f1dfaa85ff3f8b93b794bf0b3ff4860c1fe6ba3ed0d168743becf diff --git a/net-misc/mico/mico-2.3.13-r13.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild deleted file mode 100644 index 324ead110f2b..000000000000 --- a/net-misc/mico/mico-2.3.13-r13.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic toolchain-funcs autotools - -DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard" -HOMEPAGE="http://www.mico.org/" -SRC_URI=" - http://www.mico.org/${P}.tar.gz - https://github.com/ssi-schaefer/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch -" -S="${WORKDIR}"/${PN} - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" -IUSE="gtk postgres ssl tcl threads X" -RESTRICT="test" #298101 - -# doesn't compile: -# bluetooth? ( net-wireless/bluez ) - -RDEPEND=" - gtk? ( x11-libs/gtk+:2 ) - postgres? ( dev-db/postgresql:* ) - ssl? ( dev-libs/openssl:0= ) - tcl? ( dev-lang/tcl:0 ) - X? ( x11-libs/libXt ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/flex-2.5.2 - >=sys-devel/bison-1.22 -" - -PATCHES=( - "${DISTDIR}"/${P}-gentoo-${PR}.patch -) - -src_prepare() { - default - - mv configure.in configure.ac || die #426262 - eautoreconf - - # cannot use big TOC (AIX only), gdb doesn't like it. - # This assumes that the compiler (or -wrapper) uses - # gcc flag '-mminimal-toc' for compilation. - sed -i -e 's/,-bbigtoc//' "${S}"/configure || die -} - -src_configure() { - tc-export CC CXX - append-cxxflags -fno-strict-aliasing - - # Don't know which version of JavaCUP would suffice, but there is no - # configure argument to disable checking for JavaCUP. - # So we override the configure check to not find 'javac'. - export ac_cv_path_JAVAC=no - - # '--without-ssl' just does not add another search path - the only way - # to disable openssl utilization seems to override the configure check. - use ssl || export ac_cv_lib_ssl_open=no - - local myconf= - myconf() { - myconf="${myconf} $*" - } - - myconf --disable-mini-stl - myconf $(use_enable threads) - - # '--without-*' or '--with-*=no' does not disable some features, - # the value needs to be empty instead. - # This applies to: pgsql, qt, tcl, bluetooth. - myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr) - myconf --with-tcl=$( use tcl && echo "${EPREFIX}"/usr) - # bluetooth and wireless both don't compile cleanly - myconf --with-bluetooth='' - myconf --disable-wireless - # But --without-x works. - myconf $(use_with X x "${EPREFIX}"/usr) - # Same for gtk after patch 013, searches for gtk release. - myconf $(use_with gtk gtk 2) - - # http://www.mico.org/pipermail/mico-devel/2009-April/010285.html - [[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED - - if [[ ${CHOST} == *-winnt* ]]; then - # disabling static libs, since ar on interix takes nearly - # one hour per library, thanks to mico's monster objects. - use threads && - ewarn "disabling USE='threads', does not work on ${CHOST}" - myconf --disable-threads --disable-static --enable-final - append-flags -D__STDC__ - fi - - econf ${myconf} -} - -src_install() { - emake INSTDIR="${ED}"/usr SHARED_INSTDIR="${ED}"/usr install LDCONFIG=: - if [[ $(get_libdir) != lib ]]; then #500744 - mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die - fi - - # avoid conflict with net-dns/nsd, bug#544488 - mv "${ED}"/usr/bin/{,mico-}nsd || die - mv "${ED}"/usr/man/man8/{,mico-}nsd.8 || die - - # avoid conflict with net-misc/eventd, bug#632170 - mv "${ED}"/usr/bin/{,mico-}eventd || die - - dodir /usr/share - mv "${ED}"/usr/man "${ED}"/usr/share || die - dodir /usr/share/doc/${PF} - mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die - - dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO - dodoc FAQ -} - -pkg_postinst() { - einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'" - einfo "due to a name conflict with net-dns/nsd. For details" - einfo "please refer to https://bugs.gentoo.org/544488." - einfo - einfo "The MICO Event daemon 'eventd' is named 'mico-eventd'" - einfo "due to a name conflict with net-misc/eventd. For details" - einfo "please refer to https://bugs.gentoo.org/632170." -} diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest index 4b956fdbf30d..1877d1b96f4e 100644 --- a/net-misc/minidlna/Manifest +++ b/net-misc/minidlna/Manifest @@ -1,9 +1,7 @@ AUX minidlna-1.0.25.confd 313 BLAKE2B f08adcd103be5fcffa02d2c62ca85537cb5803336bb70ba3457b3b61790e1800d453168aaed981c15776fa92353149d17c6c5eeafb70033727fb0aa838e4422d SHA512 e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8 AUX minidlna-1.1.2.service 230 BLAKE2B 13db2b522a5c27143106f7d45410f94c657133440a5e352794cc4fc48c818865b28087c666911c905efd3fb9c00b6aa9f79f9d0b014eae9130db0d40b5a0ec20 SHA512 0cfa770c43097007dce2c440512e4ca27e02678a08299c8343c91d2e9f70d4756bfd9527c6747a484c639e0e8467cad3d5f2f5a216684ce75495be084e6ac5df AUX minidlna-1.1.5.initd 682 BLAKE2B ea0522de80f8525c5db7a4cb70ac72fd68db9c2beb263d87ef4ab18a128f55117929c6d244de72e5e663e06579a551ff1aa9df385afd277135aa1a2ed0201bbb SHA512 918e282b91434c29d7510e3c04749cd5b2d11aa623fada13d60749793cd7635e4b671e74dc6b1c4e45de0c96b56a271f017a17438651f9d24c03a16df26e09d2 -AUX minidlna-1.3.0-fd-leak.patch 1176 BLAKE2B 007c5ea969cc6b8a28353ef5a9bf8b653eb097ce2a3f25a3ed48fa36b88563b6bb6c538006ea738f90404a69a2a5b5d8b4f6f1a5b8c68ed8240fe16d6ecaf2e6 SHA512 a400df035c125179087daf57faa8f3ec282599b2f88f10003f41a8edbbaf7bedf0f7fe627392c0346a4ef8429e6d6c47a62ed8f9be26b1600f21a8d409643f16 -AUX minidlna-1.3.0-fno-common.patch 602 BLAKE2B dca6dff5dd0d2b7eafa5d58b8879d4f0f28ff8cbe7fe8d31d97a3078c5c6eecbf0462b10fb646f57ecc734e0102a9010f6f66142774f32d69d9b6a7c09b5d17c SHA512 a02c78cdac03884115f5fffc85cedf92c13687fad002a82c9497b63d394d53020bb4ab5e04e2d6a27b662b93153c6244576559a425ed67de849cecb7f7e5a9b8 -DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6 +DIST minidlna-1_3_1.tar.gz 299749 BLAKE2B 0c4e5b5dc8b4fb14609cc71eafb008dfab0ef81350ac5c7f1a83e65f54b1d87296b3f0a063dbda3bd642fc777c36a0f839d5426c03ae852b07827a2b7d38c765 SHA512 6e94f33070db04660b83285a13942173537866ab53f9375e3162131fd86948349991a6c60cb2800c46546d73e58222a008d4cee1914c826f3a2f450f1c95a0e5 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e -EBUILD minidlna-1.3.0-r2.ebuild 2095 BLAKE2B 5244e6d9dc8b817e4a719a44e40a308e1dfba8ea9f592eb074299d040944487875b3054d06e7803cf54c1e80b99c0c09046c760e86d28214eb984e32aa9926df SHA512 e03701ab0ea317fb88e8b52f452be01ceeb61b3282c2d6197b558d7a6b1980f7f025aa384a1129e61ff4ea3249c433ee2b950977a1a5411f70b6b535358ebc6d +EBUILD minidlna-1.3.1.ebuild 2186 BLAKE2B 0de953f06210e4b10a1baef86043ec3b63940c24e8e11684f05282098a302380224155c04f4cce5aa0ebe62a5d79c3bb930a9d60bc07c8980e6d195a99f4e8ca SHA512 5fbcb1b7cc213a9e7749cff4e7a40e09857461b8bb731cac3d877c58fb04273cb31bdc734a3a744c7350674e267c002f8d788d9d8727424c365b9642bf3ad201 MISC metadata.xml 513 BLAKE2B 6e851975b83efd7972d5d58c85093a36bf0f51845cb6ef1f7d7b37dab65dd913a5bbd6e5f163b2142eee11d6860b55e1bd346e23b5f4f427ca0812701149eede SHA512 99fe90016717a048a38feec908049f5f0c7b81045dc9e8953b204eb22e858f74b876fd5ae3765cbf88204f9f6ece87310dccb2123bdb1cc007e3c9049967a4e1 diff --git a/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch b/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch deleted file mode 100644 index eec2bcd020e7..000000000000 --- a/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/upnpevents.c b/upnpevents.c -index 4de6ce8..1126fa7 100644 ---- a/upnpevents.c -+++ b/upnpevents.c -@@ -290,18 +290,17 @@ upnp_event_create_notify(struct subscriber *sub) - addr.sin_family = AF_INET; - inet_aton(obj->addrstr, &addr.sin_addr); - addr.sin_port = htons(port); -- DPRINTF(E_DEBUG, L_HTTP, "%s: '%s' %hu '%s'\n", "upnp_event_notify_connect", -+ DPRINTF(E_DEBUG, L_HTTP, "%s: '%s' %hu '%s'\n", "upnp_event_create_notify", - obj->addrstr, port, obj->path); - obj->state = EConnecting; -+ obj->ev = (struct event ){ .fd = s, .rdwr = EVENT_WRITE, -+ .process = upnp_event_process_notify, .data = obj }; -+ event_module.add(&obj->ev); - if(connect(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - if(errno != EINPROGRESS && errno != EWOULDBLOCK) { -- DPRINTF(E_ERROR, L_HTTP, "%s: connect(): %s\n", "upnp_event_notify_connect", strerror(errno)); -+ DPRINTF(E_ERROR, L_HTTP, "%s: connect(): %s\n", "upnp_event_create_notify", strerror(errno)); - obj->state = EError; - } -- } else { -- obj->ev = (struct event ){ .fd = s, .rdwr = EVENT_WRITE, -- .process = upnp_event_process_notify, .data = obj }; -- event_module.add(&obj->ev); - } - - return; diff --git a/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch b/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch deleted file mode 100644 index 50da196377f1..000000000000 --- a/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/tivo_utils.c -+++ b/tivo_utils.c -@@ -27,6 +27,7 @@ - #include <sqlite3.h> - #include "tivo_utils.h" - -+struct sqlite3PrngType sqlite3Prng; - /* This function based on byRequest */ - char * - decodeString(char *string, int inplace) ---- a/tivo_utils.h -+++ b/tivo_utils.h -@@ -30,7 +30,9 @@ struct sqlite3PrngType { - unsigned char isInit; /* True if initialized */ - unsigned char i, j; /* State variables */ - unsigned char s[256]; /* State variables */ --} sqlite3Prng; -+}; -+ -+extern struct sqlite3PrngType sqlite3Prng; - - char * - decodeString(char *string, int inplace); diff --git a/net-misc/minidlna/minidlna-1.3.0-r2.ebuild b/net-misc/minidlna/minidlna-1.3.1.ebuild index 37b1bb9ceac0..d1addd8794ad 100644 --- a/net-misc/minidlna/minidlna-1.3.0-r2.ebuild +++ b/net-misc/minidlna/minidlna-1.3.1.ebuild @@ -1,44 +1,51 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit systemd tmpfiles +inherit autotools systemd tmpfiles +MY_P=${P//./_} DESCRIPTION="DLNA/UPnP-AV compliant media server" HOMEPAGE="https://sourceforge.net/projects/minidlna/" +# https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz SRC_URI=" - https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz - mirror://gentoo/minidlna-gentoo-artwork.patch.xz" + https://github.com/mgorny/minidlna/archive/v${PV//./_}.tar.gz + -> ${MY_P}.tar.gz + mirror://gentoo/minidlna-gentoo-artwork.patch.xz +" +S=${WORKDIR}/${MY_P} LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="amd64 arm x86" IUSE="netgear readynas zeroconf" -RDEPEND=" - acct-group/minidlna - acct-user/minidlna +DEPEND=" dev-db/sqlite:3 media-libs/flac media-libs/libexif media-libs/libid3tag:= + media-libs/libjpeg-turbo:0= media-libs/libogg media-libs/libvorbis media-video/ffmpeg:0= - virtual/jpeg:0= elibc_musl? ( sys-libs/queue-standalone ) - zeroconf? ( net-dns/avahi )" -DEPEND=${RDEPEND} + zeroconf? ( net-dns/avahi ) +" +RDEPEND=" + ${DEPEND} + acct-group/minidlna + acct-user/minidlna +" BDEPEND=" - virtual/pkgconfig" + virtual/pkgconfig +" CONFIG_CHECK="~INOTIFY_USER" PATCHES=( "${WORKDIR}"/minidlna-gentoo-artwork.patch - "${FILESDIR}"/${P}-fno-common.patch - "${FILESDIR}"/${P}-fd-leak.patch ) src_prepare() { @@ -47,6 +54,7 @@ src_prepare() { -i minidlna.conf || die default + eautoreconf } src_configure() { diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest index d0354d7dc173..4a788511ba9f 100644 --- a/net-misc/mobile-broadband-provider-info/Manifest +++ b/net-misc/mobile-broadband-provider-info/Manifest @@ -1,5 +1,7 @@ DIST mobile-broadband-provider-info-20210805.tar.xz 83756 BLAKE2B c7872a4bbb9c0ed2a36c374210e57cdd6a1346772c7f1c06a273e753606f70fe5d911eb6b11c6779382e2fc8a7bfa99ce216522807c6be60ed1719d05b7b452b SHA512 d3166484792aa0d97d7a094ecac309062fa1bf07c50c5b9bcc827e45c0a4d005a1131a589af1ec9920f373346d9ccb27bea6c019bad39c633998c00df92a5356 DIST mobile-broadband-provider-info-20220315.tar.xz 84068 BLAKE2B 69b1805cdac393d733c7c4bd033f623d01260abe9be97108b1f7525a1e96935dd6b6582cd647e415a4f6329988cc105a220fbd3672b0d8c719e298ac53e0bcac SHA512 92da9e03f48d1a3e5807cab616627d0d31539dfee5c9650f78c5eb4371748366700ffe26f922ac061f877cd1bd5c3fb766e71fea0677eee007e68873c39c597c +DIST mobile-broadband-provider-info-20220511.tar.xz 85064 BLAKE2B 7abb1d493cc39b9988a188edf260b5440bc8cb9e0879897df550ee63cb46c52721ee75dee304bbc93add3173a7ff56bd17bccf8dd062590ae583cee67e9093ab SHA512 7b3a9c0a2e618ef3ef0e29b947ab9f0a55f30bd738f0e976529e8f3ddbb60a738f623e718ea67fa6e6008275dbbe78ce3ed9852c005748a266f04e3dd65179a6 EBUILD mobile-broadband-provider-info-20210805.ebuild 481 BLAKE2B c3c19e8e6fe775978d4d6e6f711263a79cb5b1e4021db4134fd7605b09dbb4bcd2f99dfc19a189c492f1bc5b9ca0f996283d4c28b72cdee87ed48f04efd992a4 SHA512 584d39732abe9789cf94ec2f0a74c769e4119b9660685ae078b337dc5fe67cd580a55f6580d34546e846d6113cf06017b3ad641afb1cafad4a1ef8c4189b246f EBUILD mobile-broadband-provider-info-20220315.ebuild 488 BLAKE2B 53964ee3d58e66980dde3d952e25295a648fe86b48693ecd13c59be8c999bc349ec55cf893887a898b2be0b05c81994b07161b8870efadb9c4a296202c2eb247 SHA512 58f291acd42c78dfaddde0f3d96ccab717710dae8f35ccd373bab5a564d1b62eb98cc3348a7f55ad5d7baa12c3c172ddb855f913c29fe734c9c7571b7f4d9bfb +EBUILD mobile-broadband-provider-info-20220511.ebuild 488 BLAKE2B 53964ee3d58e66980dde3d952e25295a648fe86b48693ecd13c59be8c999bc349ec55cf893887a898b2be0b05c81994b07161b8870efadb9c4a296202c2eb247 SHA512 58f291acd42c78dfaddde0f3d96ccab717710dae8f35ccd373bab5a564d1b62eb98cc3348a7f55ad5d7baa12c3c172ddb855f913c29fe734c9c7571b7f4d9bfb MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild new file mode 100644 index 000000000000..d0704be34ed8 --- /dev/null +++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org + +DESCRIPTION="Database of mobile broadband service providers" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband" + +LICENSE="CC-PD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-libs/libxslt + test? ( dev-libs/libxml2 ) +" + +DOCS=( README ) diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest index dfbe02f6cbb3..e1cacea302c3 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -1,5 +1,7 @@ AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460 AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4 DIST ModemManager-1.18.6.tar.xz 2519572 BLAKE2B 022e461d43a10bfce8d97f39b855cd28e1d165d07ec65db15c4ec3e89d932829b8c88a1834d182bc966c22f0d848cb6bb06bae2cc2930f685c9fa43b277668d9 SHA512 3b154d459e1196494d7f99303f88088215992aadb57a8cc66f838b068e762fa3d25f19a597922c26a138f670e1da46d627de11cf41d83ce96b3197a086f8e91b +DIST ModemManager-1.18.8.tar.xz 2533392 BLAKE2B 7e95aa2303b55524174475ace96e0b938d2ac9abee0867bb56c6405f3460e73fad0ab68e50361c148551401ff2450abe70733616534507251cbaaee41ee02028 SHA512 fd853ad5ecd018303850f506cd75025bc0cad90d7a003b082178f7495b8763e71675ac34428d09002bf5d06963030d2ee5b84a1c888c959b03f00cddb1cdaf4c EBUILD modemmanager-1.18.6.ebuild 3997 BLAKE2B 899f0debecec6c84737ac6abcf6a1bbf09b2caa9c112d138836817acf583d398369791c081362dfdfcd5cdad4f2899334506ba39e0390972f101c6bda6a8ae88 SHA512 3c6d50fb4c231fbaa57394d8a04edb627815be67aa6acead2caa5e8f57e5f5a02d81546a9d6ed86bf28484a826181f6a0c7eee6116ea3eb3dac9aca5b53975c6 +EBUILD modemmanager-1.18.8.ebuild 4003 BLAKE2B d800093327f92efb25a1fcdd4950af83bc1381d9635f6ca6fdd62b215dd1051d35f76de0d6bab201c3354f2f9e3d29154e06b61e8e1b83772229843612f3d9ea SHA512 539908220d8ea7ebf96772e08d2dbc6bdfabe9f6284d84b8de49dc2786c6d81ad8e87c25910bae2122e8cc06a97385a6856f1470bbb5d7389b645600e56608c0 MISC metadata.xml 432 BLAKE2B f9a84e1bbcd6bb14effe1d41ef9eddfdf5b10ccaee4cfe041ac2f68e405dfdffe4930d5e701f9808d62832253e3255498425df53b6c652fb313365f260765433 SHA512 57f8df2fc04eea86d59a03e151dbd1df719faf3fad8c2ff6b8a74567ea01c0c30a1a92d4bd29db29116b4cdb8b688821f4fe62b81a89239c68ca884b160cefee diff --git a/net-misc/modemmanager/modemmanager-1.18.8.ebuild b/net-misc/modemmanager/modemmanager-1.18.8.ebuild new file mode 100644 index 000000000000..a86bab79aa95 --- /dev/null +++ b/net-misc/modemmanager/modemmanager-1.18.8.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8..10} ) +inherit gnome2 python-any-r1 readme.gentoo-r1 systemd udev vala + +DESCRIPTION="Modem and mobile broadband management libraries" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" +SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + +IUSE="elogind +introspection mbim policykit +qmi systemd test +udev vala" +REQUIRED_USE=" + ?? ( elogind systemd ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/glib-2.56.0:2 + udev? ( >=dev-libs/libgudev-232:= ) + introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) + mbim? ( >=net-libs/libmbim-1.26.0 ) + policykit? ( >=sys-auth/polkit-0.106[introspection?] ) + qmi? ( >=net-libs/libqmi-1.30.2:= ) + elogind? ( sys-auth/elogind ) + systemd? ( >=sys-apps/systemd-209 ) +" +RDEPEND="${DEPEND} + policykit? ( acct-group/plugdev ) +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/gtk-doc-am-1 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) + vala? ( $(vala_depend) ) +" + +S="${WORKDIR}/ModemManager-${PV}" + +python_check_deps() { + has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + DOC_CONTENTS=" + If your USB modem shows up only as a storage device when you plug it in, + then you should install sys-apps/usb_modeswitch, which will automatically + switch it over to USB modem mode whenever you plug it in.\n" + + if use policykit; then + DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, + add your user account to the 'plugdev' group." + fi + + use vala && vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + local myconf=( + --disable-Werror + --disable-static + --with-dist-version=${PVR} + --with-udev-base-dir="$(get_udevdir)" + $(use_with udev) + $(use_enable introspection) + $(use_with mbim) + $(use_with policykit polkit) + $(use_with systemd systemd-journal) + $(use_with qmi) + --without-qrtr # libqrtr-glib not packaged + $(use_enable vala) + ) + if use systemd || use elogind; then + myconf+=(--with-systemd-suspend-resume) + else + myconf+=(--without-systemd-suspend-resume) + fi + gnome2_src_configure "${myconf[@]}" +} + +src_install() { + gnome2_src_install + + # Allow users in plugdev group full control over their modem + if use policykit; then + insinto /usr/share/polkit-1/rules.d/ + doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules + fi + + readme.gentoo_create_doc + + newinitd "${FILESDIR}/modemmanager.initd" modemmanager +} + +pkg_postinst() { + gnome2_pkg_postinst + + # The polkit rules file moved to /usr/share + old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" + if [[ -f "${old_rules}" ]]; then + case "$(md5sum ${old_rules})" in + c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) + # Automatically delete the old rules.d file if the user did not change it + elog + elog "Removing old ${old_rules} ..." + rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" + ;; + * ) + elog "The ${old_rules}" + elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" + elog "If you edited ${old_rules}" + elog "without changing its behavior, you may want to remove it." + ;; + esac + fi + + if ! use udev; then + ewarn "You have built ModemManager without udev support. You may have to teach it" + ewarn "about your modem port manually." + fi + + systemd_reenable ModemManager.service + + readme.gentoo_print_elog +} diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest index ce8fcfad8384..a088565eca92 100644 --- a/net-misc/mosh/Manifest +++ b/net-misc/mosh/Manifest @@ -1,5 +1,5 @@ AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b98209e668b17a1e08abd23aee704a52111a94b34150e6fcee1a4de3df065dc1cabdbfb37e2c852dc7e7595ee613e1 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d AUX mosh-1.3.2-bind-misinterpret.patch 432 BLAKE2B 81bda9f9a2d63ed2f5298b399ec92435db12b1e2c57906a6a38267df2dc525d209ec8cb72591627dd58d0c0c79e5c878345d52976df7b3b8d7893447f34574a5 SHA512 d9068c169f5ecc7c64d424490bbe9c03bdd5ecf184ad4a28fe106c68cbf228641ad39e3cf4da061b1693318e5bb3b4f91365203693537021ed75b67fc494b7f8 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769 -EBUILD mosh-1.3.2-r2.ebuild 1488 BLAKE2B 0569f3b88a3ccbe672850cd9d115abbd3f99044d847e498466979b6c6073636c6a47847716d21b39b82920fbaee241dd933ea478c8208c1d60213f52620d9b32 SHA512 87a797af7b99397a91a16ff60c6d71a80db655c7455c6526139e5811f34bc6ae2acb35d3f300888f415deeea7c531eaedc27364b5151a5d6b13d0bc55e0a4eb9 +EBUILD mosh-1.3.2-r2.ebuild 1495 BLAKE2B 37b69dd27d145709d283351072318f9c121d9d0b291138c8e65deb75af2f30956bbb1172497fa6e109511d19829e1e589fceacf0d9d25e3448aae416e5d3cfe0 SHA512 5ab027e930195649efbfeda59f32ab06513880fec2e54b85d8104c31b3620a2b49d81eff887bd79319a413b688230748493e4f7f3530ea09c9281c66e6b3ed0a MISC metadata.xml 1047 BLAKE2B 86b2beea09ccbdca70646b00a5af74f253ecd18fed70f364287b122520f4e15f507416c3ef9b40fe28b267e3dad9e8e16f0139dd0966c55d1597a5cae1c411b5 SHA512 3940264e614abb7b646d24e6786503793b3a651af7f802f5ef5bf1d395e89f38542eae2df5b2d737bf2474963215529771c1ba2eabc785a5649ecaa1da4713db diff --git a/net-misc/mosh/mosh-1.3.2-r2.ebuild b/net-misc/mosh/mosh-1.3.2-r2.ebuild index 93b11c32f7b9..4f8c1ca09ae2 100644 --- a/net-misc/mosh/mosh-1.3.2-r2.ebuild +++ b/net-misc/mosh/mosh-1.3.2-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+client examples +mosh-hardening +server ufw +utempter" REQUIRED_USE=" diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest index 32c5fb6f2281..270ea70bdf4b 100644 --- a/net-misc/mrouted/Manifest +++ b/net-misc/mrouted/Manifest @@ -1,8 +1,6 @@ AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a9482fa0eca45d15b8aa5e544dc24f80152c29d0d47931e2a68c26b55cbcf7f4257cf55cd6592a SHA512 08e65f7bcf759889fe42349d6b7432e7b76c84069ff295ad7d72e0517cae2eabd2de11619e07cf7a573e5c2eeb3f0159becd355cae4358be093b93a9824424d3 DIST mrouted-4.2.tar.gz 292640 BLAKE2B 5d356c7c0132e2dc74e360c5a1761b6e39bcdfcb5306dcd7a8a35f5658139bdd74d92587b7fea248092bd4947b5119987bdf4066676c08c6baa849c1845f905b SHA512 88de66f24210bcf9d8e9ab0d38171c64c7dae2981fb2f81a54be2b08bbe26ff9b26ad5a7ec0fd4d67c2dad00a6df608aa7c1536c897bbc98f6bf223766924131 -DIST mrouted-4.3.tar.gz 327278 BLAKE2B 3f9182f90170868c0c770cb07ac8d6cfb5a8dce305a9b5e3bb9881e238cbdb246389225fb1524a0765a4c2725402546e07945a406edd78c5c6dd3272a16f263d SHA512 c471e95f5ce6ff017d269ab3005741ecbf1c41931da07f584bf9e28799c3cbbeeb57d8c517dd2fa342b63a460fb4df8f7f7db53312480059509a9d64b5e765b6 DIST mrouted-4.4.tar.gz 316949 BLAKE2B c768f78588ef5a321b33a6444627db0eae36dfd1798f58672392729e0ce45392fbcaad074e55eccef43dcda5d29cfee24f30aa85eded130ad8d1a6a006e62411 SHA512 cadd4cb15674c04bd976daad36ac38ec93eb9d6d0e2888cb7b4b73d2802f58beb11c122de34c1c5214a58f74dc832f35bff0820265370f4636036813ff283c09 EBUILD mrouted-4.2.ebuild 739 BLAKE2B 0600285e2c195f010ce90cff56552869a018ee311c238aacd22f4e13ae50dd80c794fa1925922aca99e087b4163b1328115ad85bbd4b4e9b33b54031a1f2453a SHA512 ce61708bdaadeec297a442fd5d9059af362786b47f6e7539f2ced24a86200633f5d206da7e031ffa1e3263bfcc7471d4efe2d971c7b7ed7d1d1f46a7be1b72ca -EBUILD mrouted-4.3.ebuild 716 BLAKE2B d7c391767251635f300684bf18165314999f7dbf844ca2f5e64af13e6725c17eb28e2466816c9d95d204c126611e94805fb4fd7da011fedcfa1b03c55feac0cc SHA512 04549e79911d8bef24297a87aae547128c780c4a713b47b6e9c503f785e929b490e97c133f336c95d16b21a06a7f54ca6a337fb40f0842f0da4ad4e5a7d76fc6 EBUILD mrouted-4.4.ebuild 794 BLAKE2B f9f5f03b28afa0905153f61a52ef995afe5ac45ad009cb8eb0170f091ba802972eeddc4235d6b3a9e5926f696592c3cb7a9396bb61275cb745dc17360912177d SHA512 8044de2bd2c044b4b2e9c0cf662038f0e32bd932f9d13c0ef5ea73d81e51b7fb76fc354ccec2af2395fa99bbaa2b87a3783cc4507d3d4c6a4a91ffe3f5d3b340 MISC metadata.xml 351 BLAKE2B 2cc58048ba632fa6ae2147b949a5ac8441b4e10c5cab17527369a1100a5d95cca3746d82c43a7d99b564f07ed68cd95114aa5a13bfd73b07befd1203a423cb3b SHA512 1ccf9c0699efed649eff70b1b2eaf588b9bad3838c1530609e8bb912ace18bd21f35571f7d731727e886cbd7027aae5b234cf3e4959da5d81991724679a815d0 diff --git a/net-misc/mrouted/mrouted-4.3.ebuild b/net-misc/mrouted/mrouted-4.3.ebuild deleted file mode 100644 index f46a82c1fafe..000000000000 --- a/net-misc/mrouted/mrouted-4.3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs systemd - -DESCRIPTION="IP multicast routing daemon" -HOMEPAGE="https://troglobit.com/projects/mrouted/" -SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="Stanford GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="rsrr" - -BDEPEND="virtual/pkgconfig - virtual/yacc" - -src_configure() { - tc-export CC CXX - - econf $(usex rsrr --enable-rsrr '') -} - -src_compile() { - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -} - -src_install() { - default - - insinto /etc - doins mrouted.conf - - newinitd "${FILESDIR}"/mrouted.rc mrouted - systemd_dounit mrouted.service -} diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest index b66ddfa6c281..57a71449b0a2 100644 --- a/net-misc/netifrc/Manifest +++ b/net-misc/netifrc/Manifest @@ -7,6 +7,6 @@ DIST netifrc-0.7.3.tar.gz 84770 BLAKE2B 075440bfd81e4dedd406d9555a18f530b07a47f9 EBUILD netifrc-0.7.1-r1.ebuild 2163 BLAKE2B 4aa9bcf12490e3078d1e3f35a2a1986466ed8813e7ed6a103789f1b40c4fb21c0900266d0c94ee04e7f5a7476c5fae098f8a4f797714cf396a459ad7037aed50 SHA512 4f0e51fd9d543175d9851f42a24fa2d26beb73122ebef6c3b594827d682aaced4ae72b872d00fd9802e2f052600ef22caee4ad455dbd4e500ff66770a8780396 EBUILD netifrc-0.7.1-r2.ebuild 2150 BLAKE2B f59f860df7863caae5bb6dccb875ee69f07eadfe8daecc8cd2e6a950f065f066f07851e430206dda368534bf895b9adc140dd1903aefe70df8ff5f467a734e03 SHA512 b84e81bb7e9ccdb1bf0dbe9e120bffc021075ff93adf886d2a9ac6c47ce5cf2c4103dabe3735ea008becb7079fbd056ff418f514739c796f182a4b75f82ac8be EBUILD netifrc-0.7.2.ebuild 2047 BLAKE2B 64858661488665f75d13d3a5ecad330f45ed7dc6716dc7259d70053f618f0839eb25a830651af522223664be04f7e5ddce2ecfd1e0cfaa2d38691c0bd2fd2202 SHA512 fb050a6c9058eb08624c838a5d3ec5c10c0ee1f7fbd08d6a0234ebf3e8be75cef9f781372a6eecea080e6c9ab886054b384fae6b00c59e99973eaf31ee8d3618 -EBUILD netifrc-0.7.3.ebuild 2039 BLAKE2B 0654285f39d568cd1c9654c4743ebd0a4c0fce156398e1e200a0c7303e0b9ced8243b25d4007854e56e69a0f140bab4c9350a04543a6da27be10625fdd7d93b0 SHA512 1344a0e56f90c5b4da2617a64b529792621ecff5fa03462c440f1556fa0dca74c01f29f5109f0895e774d42ca00a6179faa154899380b92ddd7a249531b51a06 +EBUILD netifrc-0.7.3.ebuild 2046 BLAKE2B 4fcaa88f1e704dcf458f091ddf2c27c2cccb18df34445f4184e70a827b75f66e0d6424e933af645ab62771842a3cc06d2522e9f7a8b99ec0112c7aa345ab5f3f SHA512 f67ce294110d44caf484925ebf8a8db87e804556008696248c3f2efa0cb7ebd5f68eb5e4471a659ace35d7d6f78001ce7b10a26366c580db9cf4d53de29b21a1 EBUILD netifrc-9999.ebuild 2047 BLAKE2B decbe78b5ac86f957ee27f203b0af14d8e4e022bc326891b5f990849c5817e9fec3a07ad0409fd3619b07a3a3683fbf6c9aef8f0c39f378a7e7276a7a5c6e80a SHA512 0b3d9ea722a45d91a9edc38616ee239910df1c8bf8c5ada1e75f78842c07e89756da519e46132cabd18b705b51c52a3dabfa3ed8ef196e156e34364ec8733a23 MISC metadata.xml 378 BLAKE2B e584edab27591b4a40ac076f15cd088bd26a3b025cc745b1a59dde9f706b442915f8bd002667643891be203cfc4d6c660fee6fe6674f8e0240022055e84fdfca SHA512 80963f5069e87f4c6929ccfc7cd819fd169f12fc576a2184e6bc8908459086552f252da89996e153a9ca7d524feaed9f9833c03ad571a1b987c46adbc18bdd78 diff --git a/net-misc/netifrc/netifrc-0.7.3.ebuild b/net-misc/netifrc/netifrc-0.7.3.ebuild index 5aa4ea9667c5..ac56715aca1e 100644 --- a/net-misc/netifrc/netifrc-0.7.3.ebuild +++ b/net-misc/netifrc/netifrc-0.7.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="BSD-2" diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest index 747e427e3e24..01a874320cfb 100644 --- a/net-misc/netopeer2/Manifest +++ b/net-misc/netopeer2/Manifest @@ -1,5 +1,3 @@ -DIST netopeer2-2.0.35.tar.gz 381321 BLAKE2B c776561b59bf05d093496e242fdb37766bf6292175186f92b85b86162d5fd6bba7118c41cef0ccfc835b09f34da1978f4e3aefb9961893b3d15b57117c3dbdb6 SHA512 f6b956c4b9d0f799f622eba62c2b20beb5f7db4899c6284bbb53303ff15f8787644687eeb99f1c68b455784166f2e858959ee16a345c0aabc444952bde70427d DIST netopeer2-2.1.16.tar.gz 371327 BLAKE2B fb9022cdad297ce366c00efbb0394feaa4dcff766f35c614354ea83a31871f24e05893e418face4e14df4d677c84e254cd8058259cddbc86ab4c94903eabd0f5 SHA512 9d0f1ddd38db2e9ac9a15ca1d8929eb32f682dd47c491a475acc406849fac0bc5f61f15cfabdacdedafe572855cf31cff4294c34eda2cad61e7518b62f40f71d -EBUILD netopeer2-2.0.35.ebuild 979 BLAKE2B 72e9500e0b0d16f9f6653fe93a16bab58429caffc1282f32699eafe3e5880cffc7f5cac6979b11a98d817bc6bb175cac36f4ef44b7f266cde70bc46aee584d7b SHA512 e62166179026286c494bdc75c009ec00fbfd9217a85b7ed94a903c62ecdb4c87ac5145d00ca6be0bbdb39cb4545bfb38ae33b6486f2c2ace14c0c2b192c1a456 -EBUILD netopeer2-2.1.16.ebuild 978 BLAKE2B bab8b7b4576f5bf2102a3e37c65050cfc5670d14d7fd710cb00a2e48cc20ec3426e4fd1a9377a2ed9cf78157ca1e10b7e1acdc95faae23031e88974170119884 SHA512 9bb6c4bcf4730405e26f099f433e83ff196acc2f37d22eec65566a2960c08b25750f2838f131d452c59aa62cca5c5576c2a27bc7bfa3eb55dfa1a9f83a05ee29 +EBUILD netopeer2-2.1.16.ebuild 977 BLAKE2B eb43aec29553758503be90b21b00ea2492f88ae588947fe2e8c79495687b10f5d2a511ad001022fa0b1eb43655f7b56f7d311a8c060dce182d7ab130477c7059 SHA512 5823d2d5c2e3a2d93e62bd5481e9193d7eb417cb673306328a1736a4aade595a511dde32f2d20c9e3f4189b538cdc617a94151ec4f2a18dd1c09ce7fc0fc7c83 MISC metadata.xml 329 BLAKE2B 65eb219ac645e711725eef7985454f1d818421b3c152fbc28d1ec9efe1154233b16749cd4f2aeb87c41fe305979c62605409da6f2df68d589ec2d6e4bd657c5a SHA512 a3fc10fa1cc2754842547ecfd1b80ed16e32e7b406a1fb4fb1f8959423e85cdd9e5145b48649d19c95abac1702440abb6ac4a1b7f7715e15ff2264e8796da4dd diff --git a/net-misc/netopeer2/netopeer2-2.0.35.ebuild b/net-misc/netopeer2/netopeer2-2.0.35.ebuild deleted file mode 100644 index 1b2774f2b27a..000000000000 --- a/net-misc/netopeer2/netopeer2-2.0.35.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Server for implementing NETCONF configuration management" -HOMEPAGE="https://github.com/CESNET/netopeer2" -SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~x86" - -RDEPEND=" - dev-libs/openssl:= - net-misc/curl:= - >=net-misc/sysrepo-2.0.53:= - >=net-libs/libnetconf2-2.0.24:= - net-libs/libssh:= - >=net-libs/libyang-2.0.112:=" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_configure() { - local mycmakeargs=( - -DGENERATE_HOSTKEY=OFF - -DINSTALL_MODULES=OFF - -DMERGE_LISTEN_CONFIG=OFF - -DENABLE_TESTS=OFF - -DENABLE_VALGRIND_TESTS=OFF - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /etc/netopeer2 - doins -r scripts/. -} - -pkg_postinst() { - elog "In order to do initial server setup please" - elog "run setup scripts located in /etc/netopeer2" -} diff --git a/net-misc/netopeer2/netopeer2-2.1.16.ebuild b/net-misc/netopeer2/netopeer2-2.1.16.ebuild index be90dbbc4e6e..b2fbb5b2af45 100644 --- a/net-misc/netopeer2/netopeer2-2.1.16.ebuild +++ b/net-misc/netopeer2/netopeer2-2.1.16.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RDEPEND=" dev-libs/openssl:= diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest index 16b2e1b1feaa..e76768f8ff65 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -3,10 +3,13 @@ AUX ntpd-r1.service 613 BLAKE2B 9e0d0fdefa670c2ac25142bfb37880ce4ba0662f70f7cf9a AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fdc0a3ad18c9855b74a70f1a89eb31854bbdad6729753c3a199cddb25b58178a79a0ea0a7050 SHA512 a2fdf88f6f55bcf0a6545db77817e3a740dba50bf56b4fdd80d335e8c909d0880fbd962041754d7f5fb3946ed131d9a739ec72008bacab9f1f47ff82dc74c542 AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf459ea335058ff8a7835f3931017505aad6c5ba60e546b608ce26a51ad38f5972675d0a47559 SHA512 dc89a58edf6f83878d42522a015f2c3e12db9505ea3d6bc4b04e6e82947a7be6e8d143e8808bb58644641dd754744fd4be20c8b944a4261b460c30b95436fc31 AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0dba7f268febd10fa7599ef6b9bee30199ce10529d2d326719f5b376d301aabfef3beacecd4af813bcef1d6a65d61ab00996d72f1240f83ef8e3 SHA512 3e012ad70507f440ed3a4aca4886a96e40d49a0dd7c14572f664633a56139cb7767e07ee1bb5e8295fc32052914364660c928d11369b6f80193ae7e190e5a48e +AUX ntpsec-1.2.1-build-notests.patch 1512 BLAKE2B 16f1b49802c2883866d5ddc862c49ddca994fc530938b53d6059a0f044aa67692180efd528727b91940357562eb4db4a1abaa0a04404b13b912eb11a6a94b9fc SHA512 5b9cf22809a727c687d4a6796a334fd515d1de3883f2e72b5a44e787dd5e1189cc86e5a50c7f693d45e58ac1c5ee0503571fe4aa15cc31f7fc7d3f409128d21e AUX ntpsec-1.2.1-seccomp-rollup.patch 2987 BLAKE2B 82bd355cdd169133f232f6514f363e87b6876472d49d69d034dd33aefe7179dc3db5e661909774471635dd947761f5e8ab47ecc0dcf8d6c2e62ffdad06044a3f SHA512 34c1941dfd7d7968fa954fb36411aad5e711767f1c0b6aca52cd8f8c839163110af2d4774a7a41b1f3d0daa49af5823b74e9c8a2a9ec12b9a344c72ce505d279 AUX ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch 785 BLAKE2B df61801e9748e20ce7fa8577c472ea2ed4e31a8d2cb1aef39a245bfe145e482b61b6b30398fc5c2da69685ed872b70ac8399481ec71ea35fc4469df1b83bd195 SHA512 a35ba539aa6a0b8f28079e1dd7a729e7ea21ab045233d7b5e1938a11c03a72aa87907068505e0330c644ebb9b509663a21a24ad9a4cc954a0f03ec7198309c0e AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302 +AUX ntpsec-py3-test-clarify.patch 993 BLAKE2B 85df81d6301e3f057601bbb2e01590a11cefe338b8a309d37818524896cb694d9a479ab80613763bd2c779680ccecc06526dfca87370409372788ba9254b9003 SHA512 3ac296a2329b2a9dede51499a75f82eeae1870ad5dbd769b7ea1f3d4634ff2512fda8383f7d3adc6fa1a4fd03e035cf0b52157639ca21f458af161fffbf6a0e4 DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277 EBUILD ntpsec-1.2.1-r2.ebuild 4434 BLAKE2B fc33f87243be18fe8ccf1faccc5aa261a162656e8c675fedaa333631ae85c95ca59bf8a06b24c4a3b3e46ab669bc026ae164afdb2a507f3e19b2cef3c7139602 SHA512 d564a533817ad9a54c81db43b8ab1e09dea2f8aa749c930662e2912bb0e058d9fdc835ab22599d403fe34dc85c6a1a25fe0635667ea8a6cf12cd9d5718baa507 -EBUILD ntpsec-9999.ebuild 4329 BLAKE2B f6706f89cbd8191608ca4092ee2de304db5ac676cd6fcf3fc0d2c107acb5a66da0d546d8b060ff80db60a00a9029b0746e104b71546b0109ffddef259144d778 SHA512 26a81887ef0537376df3f458772cf000fb7f40171e7d481a1f72393f0226ee7c3c810715bcae144dab63b06e942767d6e073112e7626e2a12db5ecc80c8fc6e5 +EBUILD ntpsec-1.2.1-r3.ebuild 4686 BLAKE2B 648e6194976a9a9e237f49c5fc05e7fab7bb777ffc318887d137f0222ddeaf14aee9785d03d574bf45cd2503c0e80605eb9badc4ff158c360a83444db41ebaa6 SHA512 270c6e2496e250f9871a16f74438aa709105c2da06f0df0459cdafc8692543ddcb2e2e7b44af85c66d7c33badeeae6647f9592165fd8dd9ee2f066014d22d49b +EBUILD ntpsec-9999.ebuild 4534 BLAKE2B baffc367ed04fe5042e4acad1c7172e280f49e9f391f409f14bc4511ae02d3a1927c3c4f2198e7bedd64243c81ff8e75b797faf8b04f8c1b92cda922468f9843 SHA512 979c140c15e1c7f6b99c21fad33d825961e22306031d6ada7775d0af35f35391af33007049359a8b66b983cf0dc178683c8f5db62cd42600fb10f15826f31f12 MISC metadata.xml 1902 BLAKE2B d807dc3dae199835bfa1624e76b43e39a1392f07d736ab5936c48bd4cfd69fdc1bae71a02c3cd9f405aa0992e7ebe27f5ffb639eafed027deba96eaa99ace391 SHA512 a29e4dfebcda69c393487ccfccdefd2b9e4e5c63591d2ed7c008b54b7c04afea071938fd2e0ce6c67f26ccecf427053b1a2b8e946dfcc3e092f64d00bc28aadf diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch new file mode 100644 index 000000000000..dab51a97fc0a --- /dev/null +++ b/net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch @@ -0,0 +1,48 @@ +From 1a7bb2e3a2749bd709ea4cf10b66b6f6d05aaf9d Mon Sep 17 00:00:00 2001 +From: James Browning <jamesb.fe80@gmail.com> +Date: Sun, 10 Apr 2022 07:53:37 -0700 +Subject: [PATCH] I: NTPsec build does not repect --notests + +STR: (run the following) +- git clone https://gitlab.com/NTPsec/ntpsec +- cd ntpsec +- ./waf configure build --notests -p + +AR: NTPsec runs tests despite having a parameter telling it not to +ER: NTPsec should not run tests when it has been told not to +--- + wscript | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index c1d765046..d8a20b82e 100644 +--- a/wscript ++++ b/wscript +@@ -1131,6 +1131,7 @@ def build(ctx): + ctx.manpage(8, "ntpclients/ntpsnmpd-man.adoc") + + # Skip running unit tests on a cross compile build ++ from waflib import Options + if not ctx.env.ENABLE_CROSS: + # Force re-running of tests. Same as 'waf --alltests' + if ctx.cmd == "check": +@@ -1139,6 +1140,8 @@ def build(ctx): + # Print log if -v is supplied + if verbose > 0: + ctx.add_post_fun(test_print_log) ++ elif Options.options.no_tests: ++ return + + # Test binaries + ctx.add_post_fun(bin_test) +@@ -1152,7 +1155,6 @@ def build(ctx): + ctx.add_post_fun(bin_test_summary) + else: + pprint("YELLOW", "Unit test runner skipped on a cross-compiled build.") +- from waflib import Options + Options.options.no_tests = True + + if ctx.cmd == "build": +-- +2.32.0 + diff --git a/net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch b/net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch new file mode 100644 index 000000000000..027c3df18ad2 --- /dev/null +++ b/net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch @@ -0,0 +1,34 @@ +From f360741dec76a9c9d831f0b547596891ea321599 Mon Sep 17 00:00:00 2001 +From: James Browning <jamesb.fe80@gmail.com> +Date: Sun, 10 Apr 2022 16:23:34 -0700 +Subject: [PATCH] clean test output up in Python 3 + +--- + wafhelpers/test.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/wafhelpers/test.py b/wafhelpers/test.py +index 9351a5675..6bba34881 100644 +--- a/wafhelpers/test.py ++++ b/wafhelpers/test.py +@@ -31,12 +31,13 @@ def test_print_log(ctx): + pprint("YELLOW", "RETURN VALUE:", retval) + print("") + +- if retval or error: ++ if retval: + pprint("RED", "****** ERROR ******\n") + +- print(error or lines) ++ print(polystr(error) or polystr(lines)) + +- if (not retval) and (not error): +- pprint("GREEN", "****** LOG ******\n", lines) ++ else: ++ pprint("GREEN", "****** LOG ******\n", ++ polystr(lines), polystr(error)) + + print("") +-- +2.32.0 + diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild new file mode 100644 index 000000000000..69d38d6263b9 --- /dev/null +++ b/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE='threads(+)' +DISTUTILS_USE_SETUPTOOLS=no + +inherit distutils-r1 flag-o-matic waf-utils systemd + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" +else + SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi + +DESCRIPTION="The NTP reference implementation, refactored" +HOMEPAGE="https://www.ntpsec.org/" + +NTPSEC_REFCLOCK=( + oncore trimble truetime gpsd jjy generic spectracom + shm pps hpgps zyfer arbiter nmea modem local +) + +IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} + +LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" +SLOT="0" +IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice +REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" + +# net-misc/pps-tools oncore,pps +DEPEND="${PYTHON_DEPS} + dev-libs/openssl:= + dev-python/psutil[${PYTHON_USEDEP}] + sys-libs/libcap + libbsd? ( dev-libs/libbsd:0= ) + seccomp? ( sys-libs/libseccomp ) + rclock_oncore? ( net-misc/pps-tools ) + rclock_pps? ( net-misc/pps-tools )" +RDEPEND="${DEPEND} + !net-misc/ntp + !net-misc/openntpd + acct-group/ntp + acct-user/ntp + ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )" +BDEPEND=">=app-text/asciidoc-8.6.8 + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + sys-devel/bison" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" + "${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch" + "${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch" + "${FILESDIR}/${PN}-1.2.1-build-notests.patch" + "${FILESDIR}/${PN}-py3-test-clarify.patch" +) + +WAF_BINARY="${S}/waf" + +src_prepare() { + default + + # Remove autostripping of binaries + sed -i -e '/Strip binaries/d' wscript || die + if ! use libbsd ; then + eapply "${FILESDIR}/${PN}-no-bsd.patch" + fi + # remove extra default pool servers + sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die + + python_copy_sources +} + +src_configure() { + is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin + + local string_127="" + local rclocks=""; + local CLOCKSTRING="" + + for refclock in ${NTPSEC_REFCLOCK[@]} ; do + if use rclock_${refclock} ; then + string_127+="$refclock," + fi + done + CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" + + local myconf=( + --notests + --nopyc + --nopyo + --enable-pylib ext + --refclock="${CLOCKSTRING}" + #--build-epoch="$(date +%s)" + $(use doc || echo "--disable-doc") + $(use early && echo "--enable-early-droproot") + $(use gdb && echo "--enable-debug-gdb") + $(use samba && echo "--enable-mssntp") + $(use seccomp && echo "--enable-seccomp") + $(use smear && echo "--enable-leap-smear") + $(use debug && echo "--enable-debug") + ) + + python_configure() { + waf-utils_src_configure "${myconf[@]}" + } + python_foreach_impl run_in_build_dir python_configure +} + +src_compile() { + unset MAKEOPTS + python_compile() { + waf-utils_src_compile --notests + } + python_foreach_impl run_in_build_dir python_compile +} + +src_test() { + python_compile() { + waf-utils_src_compile check + } + python_foreach_impl run_in_build_dir python_compile +} + +python_test() { + # Silence QA warning as we're running tests via src_test anyway. + :; +} + +src_install() { + python_install() { + waf-utils_src_install --notests + python_fix_shebang "${ED}" + } + python_foreach_impl run_in_build_dir python_install + python_foreach_impl python_optimize + + # Install heat generating scripts + use heat && dosbin "${S}"/contrib/ntpheat{,usb} + + # Install the openrc files + newinitd "${FILESDIR}"/ntpd.rc-r2 ntp + newconfd "${FILESDIR}"/ntpd.confd ntp + + # Install the systemd unit file + systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service + + # Prepare a directory for the ntp.drift file + mkdir -pv "${ED}"/var/lib/ntp + chown ntp:ntp "${ED}"/var/lib/ntp + chmod 770 "${ED}"/var/lib/ntp + keepdir /var/lib/ntp + + # Install a log rotate script + mkdir -pv "${ED}"/etc/logrotate.d + cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd + + # Install the configuration file and sample configuration + cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf + cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/ + + # move doc files to /usr/share/doc/"${P}" + use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html +} + +pkg_postinst() { + einfo "If you want to serve time on your local network, then" + einfo "you should disable all the ref_clocks unless you have" + einfo "one and can get stable time from it. Feel free to try" + einfo "it but PPS probably won't work unless you have a UART" + einfo "GPS that actually provides PPS messages." +} diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index 2065ee52d6a6..4d49e9065f2e 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE='threads(+)' DISTUTILS_USE_SETUPTOOLS=no @@ -13,9 +13,8 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" else - SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" - RESTRICT="mirror" - KEYWORDS="amd64 arm arm64 ~riscv ~x86" + SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi DESCRIPTION="The NTP reference implementation, refactored" @@ -24,41 +23,38 @@ HOMEPAGE="https://www.ntpsec.org/" NTPSEC_REFCLOCK=( oncore trimble truetime gpsd jjy generic spectracom shm pps hpgps zyfer arbiter nmea modem local - ) +) IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" SLOT="0" -IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice +IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" # net-misc/pps-tools oncore,pps -CDEPEND="${PYTHON_DEPS} - sys-libs/libcap +DEPEND="${PYTHON_DEPS} + dev-libs/openssl:= dev-python/psutil[${PYTHON_USEDEP}] + sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) - dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) -" -RDEPEND="${CDEPEND} - ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) + rclock_oncore? ( net-misc/pps-tools ) + rclock_pps? ( net-misc/pps-tools )" +RDEPEND="${DEPEND} !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp -" -DEPEND="${CDEPEND} - >=app-text/asciidoc-8.6.8 + ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )" +BDEPEND=">=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets - sys-devel/bison - rclock_oncore? ( net-misc/pps-tools ) - rclock_pps? ( net-misc/pps-tools ) -" + sys-devel/bison" PATCHES=( "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" + "${FILESDIR}/${PN}-py3-test-clarify.patch" ) WAF_BINARY="${S}/waf" @@ -92,6 +88,7 @@ src_configure() { CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" local myconf=( + --notests --nopyc --nopyo --enable-pylib ext @@ -103,7 +100,6 @@ src_configure() { $(use samba && echo "--enable-mssntp") $(use seccomp && echo "--enable-seccomp") $(use smear && echo "--enable-leap-smear") - $(use tests && echo "--alltests") $(use debug && echo "--enable-debug") ) @@ -116,14 +112,26 @@ src_configure() { src_compile() { unset MAKEOPTS python_compile() { - waf-utils_src_compile + waf-utils_src_compile --notests } python_foreach_impl run_in_build_dir python_compile } +src_test() { + python_compile() { + waf-utils_src_compile check + } + python_foreach_impl run_in_build_dir python_compile +} + +python_test() { + # Silence QA warning as we're running tests via src_test anyway. + :; +} + src_install() { python_install() { - waf-utils_src_install + waf-utils_src_install --notests python_fix_shebang "${ED}" } python_foreach_impl run_in_build_dir python_install diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest index 5946e44a8f46..744f352ff542 100644 --- a/net-misc/olsrd/Manifest +++ b/net-misc/olsrd/Manifest @@ -1,10 +1,5 @@ AUX olsrd 491 BLAKE2B 31844255d3aac5d427ab821a7655201ede53a3ab57ac8da3562e9db473d786c1e9acccf3512ba437d203798114ea1e9eb1fa79f4e5c6eca977b7b1357c2e668e SHA512 26329da5360bd25dacea3fde8c025f0bc34203970d2e75b47157fc0c4a3873cf6e7faa93c0a5a51bf20618846135ab18a09b6157521c3199c0667f969d491c4d AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625eb05e62338efce126fe06e7c59f021848ba12247d35196864496cab3ac9414bdd9cddda54ea6fb5deb2360e2 SHA512 191bb1cb0da122a9b44a9297e78998f9b1ecc70948dd9ee216b5d4fb56b41072c53249b39a6c0584366c7518ee2d4b161833be2e5289d707693dd0d87f2e6791 -AUX olsrd-0.9.6-gpsd.patch 537 BLAKE2B 841d0d92106a620aec47d781cf0a79e669e4aa3e6ba304c023a98c7776fc1df53e6bee5c080deb784106b05273a702d093617c9dc33bfa427a6f3b20c444234e SHA512 d3f89ead360acb8d1c26884ec7559c21dd1b7fbc40eb17d7d3fc2313e17d4f160b507d4b6271ed458d7b74fc7a7f1d9482fcb953d2762734fc963a1fb0e94f88 -DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B 180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a -DIST olsrd-0.9.8.tar.gz 14416300 BLAKE2B 67477d9359686cb163221f5f354f330b38811e9e77bd71379e359bbfba2b55e917009ac537b845420a5bb73284ac83e0b91495e011c810f8169e4edb6bea940f SHA512 cf3066310c4ea644ba1f482e847aa073ad006000308bfa993cecda4ccf4e9919a9005680b3c1d98e34f0c13818213f208e8dc93c8b060eeaaac160fc3df4ce8c DIST olsrd-0.9.8_p20210612.tar.gz 14446761 BLAKE2B ef841fcf81ae25acb3c47d70f15e34c614b17c28688e0f718aa45ebabea68844f825a4187bbf5468daa4763c8a2b8c87f5f5a502ce0c5fde1b940f9aa3c6ca5e SHA512 466b762ea1f9ecc4ded3298700d1786b893d87fbcc2e457c75f5adfaaf543e6cea5ab2e63d34814a7c2f65cab895fb19c4cb5a7ec5347b13d0e18703a641126e -EBUILD olsrd-0.9.6.1.ebuild 2243 BLAKE2B c8c1227e9cb3c445c59c37bc88f567fe0d6f931fa02c3972c9eb0288eec57eb797877d411706c01ac7782ceee55f7b8143186af0d1fff028712e668b18b39e05 SHA512 f28e2701e44d7e6b6e9a5ab1044d337a1c9a456d6c35e85986e7fec9a2df9143d2a18b27c7f3a275d42cbcb78ad6a0894c212f42415bf3b041009e2f0792ec48 -EBUILD olsrd-0.9.8.ebuild 2411 BLAKE2B 0cda86cfb22e55060a58fc5e73e73997c4db95525eb12bcc12df80587f8c5d61b74bd32c51f2869a8aaa28f9b60e96441775bf40c5b2e13343df92bd74b9af59 SHA512 3d4cfb163509c3d2c71f51c5cf6bb2a9d11af4663856e6e5193233708747c35928d82aa03b89cfdaf299b7cc1b3858994b555bf6f1a85002bc119ac2583fb04e EBUILD olsrd-0.9.8_p20210612.ebuild 2655 BLAKE2B 46420f18ff26eb00d8b29f18a71a8d21e12ff6d5bf6b50da4a1e17c4b2a91d74dff7ad9400f77d4367c855395163d65a0dfcdd01048eea737ba99ec33e06bb08 SHA512 086b206676f785066746108cdc713f72e2eb9e7c783f1abb38433589b7c34a82baa9d5d911f2c158b9d24d5ea1b230292ec5551ed684244c0605c7db61da6e31 MISC metadata.xml 244 BLAKE2B c96f92863f59c5672e9fd06a833d19ac4884039c1a6b4550b167f4e228b663963c2f98534e9865cd039561345d1097edb52b4c5614417b46accc48c2acbab668 SHA512 c044670830d2077e8075125980c7502a96fc956fcdb24ac01d390afebe4780cf6b7f79b4a8749e57ae436fc5e8f7af976c02765ab5f6575de01a5f0881008c4c diff --git a/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch b/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch deleted file mode 100644 index a70115f1675c..000000000000 --- a/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/lib/pud/src/gpsdclient.c -+++ b/lib/pud/src/gpsdclient.c -@@ -343,7 +343,6 @@ - | POLICY_SET // - #ifdef GPSD_JESSIE - | TIMEDRIFT_SET // -- | EOF_SET // - #endif - #ifdef GPSD_NEW - | TOFF_SET // ---- a/lib/pud/Makefile -+++ b/lib/pud/Makefile -@@ -108,7 +108,7 @@ - - default_target: nmealib library $(PLUGIN_FULLNAME) - --$(PLUGIN_FULLNAME): $(OBJS) version-script.txt -+$(PLUGIN_FULLNAME): nmealib library $(OBJS) version-script.txt - ifeq ($(PUD_NMEALIB_STATICALLY_LINKED),) - ifeq ($(VERBOSE),0) - endif diff --git a/net-misc/olsrd/olsrd-0.9.6.1.ebuild b/net-misc/olsrd/olsrd-0.9.6.1.ebuild deleted file mode 100644 index 8e8f409db132..000000000000 --- a/net-misc/olsrd/olsrd-0.9.6.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs versionator - -DESCRIPTION="An implementation of the Optimized Link State Routing protocol" -HOMEPAGE="http://www.olsr.org/" -SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.tar.bz2" - -LICENSE="BSD LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gtk pud" - -DEPEND=" - virtual/pkgconfig - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - pud? ( sci-geosciences/gpsd ) -" -RDEPEND=" - ${DEPEND} -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch - "${FILESDIR}"/${PN}-0.9.6-gpsd.patch -) - -src_prepare() { - default - - # fix parallel make - # respect AR - # verbose build - # fix default prefix, bug #453440 - sed -i \ - -e '/@echo "\[/d' \ - -e 's|$(MAKECMD)|$(MAKE)|g' \ - -e 's|@$(CC)|$(CC)|g' \ - -e 's|@ar |$(AR) |g' \ - -e '/^prefix/s:/usr/local:/usr:' \ - $( find . -name 'Makefile*' ) || die - - # respect LDFLAGS - sed -i \ - -e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \ - lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die -} - -src_configure() { - if ! use pud; then - sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die - fi -} - -src_compile() { - tc-export PKG_CONFIG - emake \ - CC="$(tc-getCC)" \ - VERBOSE=1 \ - LIBDIR="/usr/$(get_libdir)/${PN}" \ - OLSRD_LDFLAGS="${LDFLAGS}" \ - OS=linux \ - build_all - - if use gtk; then - emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)" - fi -} - -src_install() { - emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ - DESTDIR="${D}" STRIP=true install_all - - if use gtk; then - emake -C gui/linux-gtk \ - LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install - fi - - doinitd "${FILESDIR}/${PN}" - - dodoc CHANGELOG \ - valgrind-howto.txt files/olsrd.conf.default.rfc \ - files/olsrd.conf.default.lq \ - lib/arprefresh/README_ARPREFRESH \ - lib/bmf/README_BMF \ - lib/dot_draw/README_DOT_DRAW \ - lib/dyn_gw/README_DYN_GW \ - lib/dyn_gw_plain/README_DYN_GW_PLAIN \ - lib/httpinfo/README_HTTPINFO \ - lib/mini/README_MINI \ - lib/nameservice/README_NAMESERVICE \ - lib/pgraph/README_PGRAPH \ - lib/quagga/README_QUAGGA \ - lib/secure/README_SECURE \ - lib/txtinfo/README_TXTINFO \ - lib/watchdog/README_WATCHDOG -} diff --git a/net-misc/olsrd/olsrd-0.9.8.ebuild b/net-misc/olsrd/olsrd-0.9.8.ebuild deleted file mode 100644 index bede675037e3..000000000000 --- a/net-misc/olsrd/olsrd-0.9.8.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="An implementation of the Optimized Link State Routing protocol" -HOMEPAGE="http://www.olsr.org/" -SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk pud" - -DEPEND=" - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - pud? ( sci-geosciences/gpsd ) -" -RDEPEND=" - ${DEPEND} -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch - "${FILESDIR}"/${PN}-0.9.6-gpsd.patch -) - -src_prepare() { - default - - # fix parallel make - # respect AR - # verbose build - # fix default prefix, bug #453440 - sed -i \ - -e '/@echo "\[/d' \ - -e 's|$(MAKECMD)|$(MAKE)|g' \ - -e 's|@$(CC)|$(CC)|g' \ - -e 's|@ar |$(AR) |g' \ - -e '/^prefix/s:/usr/local:/usr:' \ - $( find -name 'Makefile*' ) || die - - # respect LDFLAGS - sed -i \ - -e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \ - lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die -} - -src_configure() { - if ! use pud; then - sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die - fi -} - -src_compile() { - tc-export PKG_CONFIG - - emake \ - CC="$(tc-getCC)" \ - LIBDIR="/usr/$(get_libdir)/${PN}" \ - OLSRD_LDFLAGS="${LDFLAGS}" \ - OS=linux \ - VERBOSE=1 \ - build_all - - if use gtk; then - emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)" - fi -} - -src_install() { - emake \ - DESTDIR="${D}" \ - DOCDIR_OLSRD="${D}/usr/share/doc/${PF}" \ - LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ - OS=linux \ - STRIP=true \ - install_all - - if use gtk; then - emake -C gui/linux-gtk \ - DESTDIR="${D}" \ - LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ - install - fi - - doinitd "${FILESDIR}"/${PN} - - gzip -d \ - "${ED}"/usr/share/man/man5/olsrd.conf.5.gz \ - "${ED}"/usr/share/man/man8/olsrd.8.gz \ - || die - - dodoc CHANGELOG \ - valgrind-howto.txt files/olsrd.conf.default.rfc \ - files/olsrd.conf.default.lq \ - lib/arprefresh/README_ARPREFRESH \ - lib/bmf/README_BMF \ - lib/dot_draw/README_DOT_DRAW \ - lib/dyn_gw/README_DYN_GW \ - lib/dyn_gw_plain/README_DYN_GW_PLAIN \ - lib/httpinfo/README_HTTPINFO \ - lib/mini/README_MINI \ - lib/nameservice/README_NAMESERVICE \ - lib/pgraph/README_PGRAPH \ - lib/quagga/README_QUAGGA \ - lib/secure/README_SECURE \ - lib/txtinfo/README_TXTINFO \ - lib/watchdog/README_WATCHDOG -} diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 685d0fe1c448..b0b04a66e42b 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -6,9 +6,6 @@ AUX openssh-8.0_p1-fix-putty-tests.patch 1760 BLAKE2B a1127e8f2275c1e23c956b5041 AUX openssh-8.5_p1-hpn-15.2-sctp-glue.patch 727 BLAKE2B fafb6bc3ec680327abf01a7a2f673d4be601094d518d74f5afd0c596c1d60ddfc6f31add6b5533f85bc09cf2122b9e3f7243d5d26a2d6923c88c2f6a811ea2b8 SHA512 eda1c1613e94a7b10df9cc08c87ed8a39edb3f8a160600a74780877772bbd76cc9842d5d5d68ed6a9554e1e310675a1e461d894144d514b8e482d4a1affbc9bd AUX openssh-8.6_p1-hpn-version.patch 556 BLAKE2B 26ef960db46c82ee62e6a6f1be15c2897855caa6cbd05db87d3e606ce42d03fb6e88916f0c6644f67dc008ca802617d0f63e5e8e35d1a6c6076188ba19009186 SHA512 c13d14dc496863bd6bbbf08940322a60e74fa1cc2171f81132dfd874b9371ee0edd77f75ffd606f874fa2de498b174be91da5c641029abff2d2a8503c2f0fc02 AUX openssh-8.7_p1-GSSAPI-dns.patch 11576 BLAKE2B 84aa0128ddeccf67e14c20f9d2acb61226c5091a3e3106285c79db4a297dbd781eddf7a6d4cb3b1a5a5dcbbcd158d32dbca5986b6fbf15f62cd3928cf125b083 SHA512 794b06c6ee6acd1bcd861753970cfc4d04f42499d48ff4119746dbcab8643f75761fddb9f52f49fe01e356740eb3882671ac3ae209e0e45745d195a219ffe5dd -AUX openssh-8.7_p1-hpn-15.2-X509-glue.patch 16283 BLAKE2B 7181c63f43398bda89f663c6de4a688e302d382519b0030ece980777d110ec56077dc6e5ca357f67c8a7a932f2df850ddc4ff7db1ea91c59d136767857c8b24e SHA512 525b68bcd9c891ab6be104d30cf4b9cc9214c257bc41a7e9c306dcfe3fb12109f7422118d9fad58698fe9a6d501b27309e675c857d00c04c46acff27eec60154 -AUX openssh-8.7_p1-hpn-15.2-glue.patch 7354 BLAKE2B 1b5afc662d39db3ab137b2a389b3a5cebf55e0c6741c12ade4977d8d5d8cb4f4cf2d8e8978150808c6570cba7b8080ace971d20913df9a740c1e03adc7134726 SHA512 ea57ea2c6138a275bce8cb7d62ea8771bf51db4d8dca4ea33f46539b33ab5a17c7c1749fa7b10c90e167846fd087f4084dcf5604017ad5c2821c2c74793ca9c2 -AUX openssh-8.8_p1-X509-glue-13.2.3.patch 2238 BLAKE2B a97643157ecf7b808ae9ee76e00cc58c4515bf5a1e2ff863124dd8b8941f390a90e2b52aa7444898782fc062ccef47983e127efaea7acf225d260479da88f12f SHA512 205c499d03f3bc2c767d406021f5f413eeae06ef5593aa11b24ccce75ebe9e90aacce4f53b120f6330326151c8f11ca43e10fe969f7ed832ef3a604f451f129f AUX openssh-8.9_p1-X509-glue-13.3.1.patch 4141 BLAKE2B aa875e0de69cdb4935b6053415833b1a0d5858f7f63084e5106dd491060a7a56c208a43a97e663289b3b832cef2d208325e573d161792d35ca4bd6a45fa8f1fa SHA512 90342932f8d191640285afc3ba82456b463640b7f30ba8193f5db023e5fcd4969fb7e57ed3637b0ea6088f4a985b85d563a17b4f0e71a1827cd3ee045e2d392a AUX openssh-8.9_p1-allow-ppoll_time64.patch 396 BLAKE2B b5bb202f79699d9037f12155044328f89ee0573efa43da7cdf8511555e706b6bf66cae069ac95cca900779c6ce293eedec48450f786fd033375e9be17bfb2872 SHA512 9b88024e6a898fc85205fbc038274a3271f787276962150965ab8f599fa355ee73cb48e7e12e3f090034293f9dca94a1ce41dfce2aaeb140693545ff3bc391f0 AUX openssh-8.9_p1-fzero-call-used-regs.patch 1182 BLAKE2B 45dda480614fd3de6aa6752d3c2f5bb34e8ef1d5576fe75878e349ca56ef451f981dc8e22ce8dd232d6a870cb3c221d8e07bccc45e3f38e43008d48941fafbe4 SHA512 0fb1ae4c4e5d44fa7d6ad301c0c36d4291611a3a34150d2a89499cd486a61b6ce0774be7387e2cd3385aa4b2be9d9b6e9dda7d3783fe1bbf7bfb36067aa973c6 @@ -22,10 +19,6 @@ AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391a AUX sshd.service 259 BLAKE2B e65ea7227658295584c3fdee3bf46f098c1c5a53a0b433e88ae8d43f0823fade25846a5f3abbacf939a13af8195a888d0ffb937e8da943478e76eea7c0e13c82 SHA512 9656ae4c045ba47ad28f983e50d1119d51c1d0a7471fe8e792d6f734a71c8d4d900431b591f2f40bb8af3a382e6215933ae32eff56de6da0f2f166d6fb855987 AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42 AUX sshd_at.service 177 BLAKE2B 0e78184f58cb4c68fb834953fac3ce01f9e39e9eb1a84c03f720205f5b611365c9a48fba445962c06c7e18bdb310cdb9ffe4fc49e95f69608922d224b00c890b SHA512 423120ea2e1ac0b92575ce4eb05347483f902238dc104848e74088f49483c37d30c27364e7fe8599b3e85562159c69284ecf25a4c5394b4cfa18c5c77c6beacd -DIST openssh-8.8p1+x509-13.2.3.diff.gz 1071138 BLAKE2B dfbe53ccfdfe0a3da9bac927c5bb0ccfeb20f1ba69cef2ffb52999e6f6b0a3282e28a888aab40096fe9eed819f4c9b27592a8771d786580b8fa4f507f6b02557 SHA512 e55e9cdcde1b02b2799600083db8c3b85d207b251b99b4efabe8614bedf1daae28e5ed10cbe1f6a2e5ba766fe1eaf41be9e90fefdaae1352808c504fc0f4e7e6 -DIST openssh-8.8p1-sctp-1.2.patch.xz 6744 BLAKE2B 9f99e0abfbfbda2cc1c7c2a465d044c900da862e5a38f01260f388ac089b2e66c5ea7664d71d18b924552ae177e5893cdcbfbccc20eeb3aaeae00b3d552379e3 SHA512 5290c5ef08a418dcc9260812d8e75ce266e22e2258514f11da6fb178e0ae2ef16046523f72a50f74ae7b98e7eb52d16143befc8ce2919041382d314aa05adda0 -DIST openssh-8.8p1.tar.gz 1815060 BLAKE2B 3a054ce19781aceca5ab1a0839d7435d88aff4481e8c74b91ffd2046dc8b6f03d6bf584ecda066c0496acf43cea9ab4085f26a29e34e20736e752f204b8c76c3 SHA512 d44cd04445f9c8963513b0d5a7e8348985114ff2471e119a6e344498719ef40f09c61c354888a3be9dabcb5870e5cbe5d3aafbb861dfa1d82a4952f3d233a8df -DIST openssh-8.8p1.tar.gz.asc 833 BLAKE2B ffe78af226b9c8395e60ca54bcb626cc933ee069f9f0f17f408ca1493cb346aa3fb878efeaccc646f8fa7bf1c40d6d61a81e37342ccf56ae601403bf9d59f4d6 SHA512 165e025305902f884d04d4444fa3143e4ea1a25a1c65aafe05e113537b3d3e50f7cd5f818bc2ca3404699372ca78f69c46b7452faf2d3998c448a5b80a411ae4 DIST openssh-8.9p1+x509-13.3.1.diff.gz 1113333 BLAKE2B 01fc34ed5c5c64a97db99f8f5a98f5917519474b4c22a2372f76a9c36d5dfc4efe1d03fcc43ed3d1602177f7e674a58676b9d04444d7bb66bc1c096136fd2ed0 SHA512 4fea3cf0dd0f6e0b9e28c16fb88f2a125c3ec7f86111d33e040664ab4976e697b137ffe80d02c979e2eb55a5c004f597299cfec22e730b80279665de61cb1f13 DIST openssh-8.9p1-sctp-1.2.patch.xz 6752 BLAKE2B 8f87a4e604ce412f45432ae29b6ccb5a10f6bd6ddc3c688b85d75c2126387dc5d4ed2b2396691db016cc0dee3e71a557611bcf34066dee075d62c9e69e887f14 SHA512 88a36e2d87bb8b6136885094729d001953e15799e06885ff1c489300458b6e412520f7a78c48dfd24df46e58f2561051212d7948f8af63082edcb85c33b4d32b DIST openssh-8.9p1.tar.gz 1820282 BLAKE2B 02934da7f7a2954141888e63e81e38fad4fb8558ddd1032de44f69684802c62771fdd7e9e470e0715059635999c8f9d2ab95f6351217e236573ead83a867f59b SHA512 04bd38ea6fe4be31acc8c4e83de7d3dda66fb7207be2e4ba25d3b8118d13d098a283769da9e8ce1fc4fba7edf739c14efcc6c9137132919261a7f882314b0f6b @@ -37,7 +30,6 @@ DIST openssh-9.0p1+x509-13.3.2.diff.gz 1128591 BLAKE2B fb560e2f1803ceb946a1ba8bd DIST openssh-9.0p1-sctp-1.2.patch.xz 6768 BLAKE2B 8a18aea57b0b3f8f0a641870f0cd1570c6cc48d1e28ef7261344918905e94a548d3a3acb6feb1c6ef13f0c6cacf2b845163cad2b96ab20cb9fc58a49aeb699c1 SHA512 d6aa5f32464d5f3e2e63e9ba82108f33bdaa890e2adf2ccc47ce0d672979fc67510d9dd7561b17eaba0c2f11a8eb565029b0ebff3b2d050e9e04e6143aedb8a3 DIST openssh-9.0p1.tar.gz 1822183 BLAKE2B 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2 SHA512 613ae95317e734868c6a60d9cc5af47a889baa3124bbdd2b31bb51dd6b57b136f4cfcb5604cca78a03bd500baab9b9b45eaf77e038b1ed776c86dce0437449a9 DIST openssh-9.0p1.tar.gz.asc 833 BLAKE2B e29ff08f10feee7347c02a7ce4b33b8d9c71a26656f0430a2511c25bc6b5006f1683d845826a68ff4eed068b30c911e273cb34e5b4880854d55a776415474019 SHA512 7b1445764058435d2fa8a9c7553643983650d4232036c088e46e44beeb538d32cba88f775b1be9da5f21a01d6caea59b3dc4714507781e9cb946546fa54f169f -EBUILD openssh-8.8_p1-r4.ebuild 17055 BLAKE2B cee54e3781c78b8f8e150d819473c3140ee07161b3bce92ba5dbe7cbf6e81d69fa3c4cf8ceba0c8d0d2f7a1c295482a3072bb8758bb3225cf011bbb74622cf06 SHA512 65f31daf43c96d56a46c6f3238471dafffe7aab2f0811c72113feda8b670100d024e6426587e3f35cc630f72e5d6ff141ee6a13b795643d2edc484472048b125 -EBUILD openssh-8.9_p1-r2.ebuild 17240 BLAKE2B fdfb71a829a3983efaa528240ced37a7cfe4843e1f6d8c02bd6c991455ef32f7ec4bc592f157d778d1cf8944e42387fb85de251e22f32b790021a663e1630afd SHA512 1fe0d20d824716cade9075266508eaf94d9e28de9a72dc51f62841dc0a052adf8933384a6eb8d577a31e79ba3fe8db5ac0de4fd8e9afc8f422e5ba4c1eac5799 -EBUILD openssh-9.0_p1.ebuild 17019 BLAKE2B 31e456333420152aca08da03b0cc0ac14c03c2771ea147c92a0e35f9777deaecd067aa16764b39ed76d2979a7ce5be9cc534be5f8f482d870cbb41632488500b SHA512 4e9f851633462a621e437c8c187f06850cd10340009093905218768c3d82ea67f606f3beb205f4d6ae454198f0ff9901f00794a28aaad77ae8c6a39f994da173 +EBUILD openssh-8.9_p1-r2.ebuild 17076 BLAKE2B d43c27180c5ea6242d3942c375da7714c915c8a7c7b50b80a963c48db6bbb100e7f7d892bcf031b62527fffc570e44ee527bc24e22e4e3611b68909ec4b24111 SHA512 88a6668e89bec99acb58890b19c744b2e194e7c7f30cdfcf8907f7ee0d8f63c986647fac1ee09394437597d27dee9392d25912b5b0470d9a31ff8e76d6f15f8b +EBUILD openssh-9.0_p1.ebuild 16870 BLAKE2B 143e4901b4dabbb1aaa7c83ecaf98618f356636f6eca747ff2ad939d9237f8dcd8b56835216fa712878f5c8efaa4ca33346f963473e4381954358e3c8870d5b0 SHA512 fa6433bc13fc8c78a42eb73c62bd4b16bf5e95bbd5d10d7dfa1a888d3fb807def36eca98491b60da03f31795014593b62f06cdfd1fce8f8b034fe9cd15da2aad MISC metadata.xml 2013 BLAKE2B 5d452c9b16516ff3a7e01ae7a6f95102bec19b3f0df1aa4607558b012718e14e72e24fa09c1bd3ea6bc48506a7fc55180a9e4735809381bf4535569de59b1409 SHA512 5b56870f1e203f339b57792fca7ddcdf488be2f010c0a23e0b811825e0d8f2f5823c2f4ae8a2ec05b27ffd663fac4f8029a3b2bede9fa1beac067f5b5a57d6bd diff --git a/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-X509-glue.patch b/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-X509-glue.patch deleted file mode 100644 index 49c05917779a..000000000000 --- a/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-X509-glue.patch +++ /dev/null @@ -1,447 +0,0 @@ -diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff ---- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-08-31 11:12:46.412119817 -0700 -+++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-08-31 11:26:11.116026151 -0700 -@@ -3,9 +3,9 @@ - --- a/Makefile.in - +++ b/Makefile.in - @@ -46,7 +46,7 @@ CFLAGS=@CFLAGS@ -- CFLAGS_NOPIE=@CFLAGS_NOPIE@ -- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ -- PICFLAG=@PICFLAG@ -+ LD=@LD@ -+ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA) -+ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ - -LIBS=@LIBS@ - +LIBS=@LIBS@ -lpthread - K5LIBS=@K5LIBS@ -@@ -803,8 +803,8 @@ - ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out) - { - struct session_state *state; --- const struct sshcipher *none = cipher_by_name("none"); --+ struct sshcipher *none = cipher_by_name("none"); -+- const struct sshcipher *none = cipher_none(); -++ struct sshcipher *none = cipher_none(); - int r; - - if (none == NULL) { -@@ -894,24 +894,24 @@ - intptr = &options->compression; - multistate_ptr = multistate_compression; - @@ -2272,6 +2278,7 @@ initialize_options(Options * options) -- options->revoked_host_keys = NULL; - options->fingerprint_hash = -1; - options->update_hostkeys = -1; -+ options->known_hosts_command = NULL; - + options->disable_multithreaded = -1; -- options->hostbased_accepted_algos = NULL; -- options->pubkey_accepted_algos = NULL; -- options->known_hosts_command = NULL; -+ } -+ -+ /* - @@ -2467,6 +2474,10 @@ fill_default_options(Options * options) -+ options->update_hostkeys = 0; - if (options->sk_provider == NULL) - options->sk_provider = xstrdup("$SSH_SK_PROVIDER"); -- #endif - + if (options->update_hostkeys == -1) - + options->update_hostkeys = 0; - + if (options->disable_multithreaded == -1) - + options->disable_multithreaded = 0; - -- /* Expand KEX name lists */ -- all_cipher = cipher_alg_list(',', 0); -+ /* expand KEX and etc. name lists */ -+ { char *all; - diff --git a/readconf.h b/readconf.h - index 2fba866e..7f8f0227 100644 - --- a/readconf.h -@@ -950,9 +950,9 @@ - /* Portable-specific options */ - sUsePAM, - + sDisableMTAES, -- /* Standard Options */ -- sPort, sHostKeyFile, sLoginGraceTime, -- sPermitRootLogin, sLogFacility, sLogLevel, sLogVerbose, -+ /* X.509 Standard Options */ -+ sHostbasedAlgorithms, -+ sPubkeyAlgorithms, - @@ -662,6 +666,7 @@ static struct { - { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL }, - { "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL }, -diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff ---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-08-31 11:12:46.412119817 -0700 -+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-08-31 14:17:59.366248683 -0700 -@@ -157,6 +157,36 @@ - + Allan Jude provided the code for the NoneMac and buffer normalization. - + This work was financed, in part, by Cisco System, Inc., the National - + Library of Medicine, and the National Science Foundation. -+diff --git a/auth2.c b/auth2.c -+--- a/auth2.c 2021-03-15 19:30:45.404060786 -0700 -++++ b/auth2.c 2021-03-15 19:37:22.078476597 -0700 -+@@ -229,16 +229,17 @@ -+ double delay; -+ -+ digest_alg = ssh_digest_maxbytes(); -+- len = ssh_digest_bytes(digest_alg); -+- hash = xmalloc(len); -++ if (len = ssh_digest_bytes(digest_alg) > 0) { -++ hash = xmalloc(len); -+ -+- (void)snprintf(b, sizeof b, "%llu%s", -+- (unsigned long long)options.timing_secret, user); -+- if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0) -+- fatal_f("ssh_digest_memory"); -+- /* 0-4.2 ms of delay */ -+- delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000; -+- freezero(hash, len); -++ (void)snprintf(b, sizeof b, "%llu%s", -++ (unsigned long long)options.timing_secret, user); -++ if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0) -++ fatal_f("ssh_digest_memory"); -++ /* 0-4.2 ms of delay */ -++ delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000; -++ freezero(hash, len); -++ } -+ debug3_f("user specific delay %0.3lfms", delay/1000); -+ return MIN_FAIL_DELAY_SECONDS + delay; -+ } - diff --git a/channels.c b/channels.c - index b60d56c4..0e363c15 100644 - --- a/channels.c -@@ -209,14 +239,14 @@ - static void - channel_pre_open(struct ssh *ssh, Channel *c, - fd_set *readset, fd_set *writeset) --@@ -2120,22 +2147,32 @@ channel_check_window(struct ssh *ssh, Channel *c) -+@@ -2164,21 +2191,31 @@ channel_check_window(struct ssh *ssh, Channel *c) - - if (c->type == SSH_CHANNEL_OPEN && - !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) && - - ((c->local_window_max - c->local_window > - - c->local_maxpacket*3) || --+ ((ssh_packet_is_interactive(ssh) && --+ c->local_window_max - c->local_window > c->local_maxpacket*3) || -++ ((ssh_packet_is_interactive(ssh) && -++ c->local_window_max - c->local_window > c->local_maxpacket*3) || - c->local_window < c->local_window_max/2) && - c->local_consumed > 0) { - + u_int addition = 0; -@@ -235,9 +265,8 @@ - (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 || - - (r = sshpkt_put_u32(ssh, c->local_consumed)) != 0 || - + (r = sshpkt_put_u32(ssh, c->local_consumed + addition)) != 0 || -- (r = sshpkt_send(ssh)) != 0) { -- fatal_fr(r, "channel %i", c->self); -- } -+ (r = sshpkt_send(ssh)) != 0) -+ fatal_fr(r, "channel %d", c->self); - - debug2("channel %d: window %d sent adjust %d", c->self, - - c->local_window, c->local_consumed); - - c->local_window += c->local_consumed; -@@ -337,70 +366,92 @@ - index 70f492f8..5503af1d 100644 - --- a/clientloop.c - +++ b/clientloop.c --@@ -1578,9 +1578,11 @@ client_request_x11(struct ssh *ssh, const char *request_type, int rchan) -+@@ -1578,10 +1578,11 @@ client_request_x11(struct ssh *ssh, const char *request_type, int rchan) - sock = x11_connect_display(ssh); - if (sock < 0) - return NULL; - - c = channel_new(ssh, "x11", - - SSH_CHANNEL_X11_OPEN, sock, sock, -1, --- CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); --+ c = channel_new(ssh, "x11", --+ SSH_CHANNEL_X11_OPEN, sock, sock, -1, --+ /* again is this really necessary for X11? */ --+ options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size, --+ CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); -+- CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", -+- CHANNEL_NONBLOCK_SET); -++ c = channel_new(ssh, "x11", -++ SSH_CHANNEL_X11_OPEN, sock, sock, -1, -++ /* again is this really necessary for X11? */ -++ options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size, -++ CHAN_X11_PACKET_DEFAULT, 0, "x11", CHANNEL_NONBLOCK_SET); - c->force_drain = 1; - return c; - } --@@ -1608,9 +1610,10 @@ client_request_agent(struct ssh *ssh, const char *request_type, int rchan) -+@@ -1608,9 +1609,10 @@ client_request_agent(struct ssh *ssh, const char *request_type, int rchan) - return NULL; - } - c = channel_new(ssh, "authentication agent connection", - - SSH_CHANNEL_OPEN, sock, sock, -1, - - CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, --- "authentication agent connection", 1); --+ SSH_CHANNEL_OPEN, sock, sock, -1, --+ options.hpn_disabled ? CHAN_X11_WINDOW_DEFAULT : options.hpn_buffer_size, --+ CHAN_TCP_PACKET_DEFAULT, 0, --+ "authentication agent connection", 1); -+- "authentication agent connection", CHANNEL_NONBLOCK_SET); -++ SSH_CHANNEL_OPEN, sock, sock, -1, -++ options.hpn_disabled ? CHAN_X11_WINDOW_DEFAULT : options.hpn_buffer_size, -++ CHAN_TCP_PACKET_DEFAULT, 0, -++ "authentication agent connection", CHANNEL_NONBLOCK_SET); - c->force_drain = 1; - return c; - } --@@ -1635,10 +1638,13 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode, -+@@ -1635,9 +1637,9 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode, - } - debug("Tunnel forwarding using interface %s", ifname); - - - c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1, --- CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); --+ c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1, -+- CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", -+- CHANNEL_NONBLOCK_SET); -++ c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1, - + options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size, --+ CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); -++ CHAN_TCP_PACKET_DEFAULT, 0, "tun", CHANNEL_NONBLOCK_SET); - c->datagram = 1; - --+ --+ - #if defined(SSH_TUN_FILTER) -- if (options.tun_open == SSH_TUNMODE_POINTOPOINT) -- channel_register_filter(ssh, c->self, sys_tun_infilter, - diff --git a/compat.c b/compat.c - index 69befa96..90b5f338 100644 - --- a/compat.c - +++ b/compat.c --@@ -149,6 +149,14 @@ compat_banner(struct ssh *ssh, const char *version) -- debug_f("match: %s pat %s compat 0x%08x", -+@@ -43,7 +43,7 @@ compat_datafellows(const char *version) -+ static u_int -+ compat_datafellows(const char *version) -+ { -+- int i; -++ int i, bugs = 0; -+ static struct { -+ char *pat; -+ int bugs; -+@@ -147,11 +147,26 @@ -+ if (match_pattern_list(version, check[i].pat, 0) == 1) { -+ debug("match: %s pat %s compat 0x%08x", - version, check[i].pat, check[i].bugs); -- ssh->compat = check[i].bugs; - + /* Check to see if the remote side is OpenSSH and not HPN */ --+ /* TODO: need to use new method to test for this */ - + if (strstr(version, "OpenSSH") != NULL) { - + if (strstr(version, "hpn") == NULL) { --+ ssh->compat |= SSH_BUG_LARGEWINDOW; -++ bugs |= SSH_BUG_LARGEWINDOW; - + debug("Remote is NON-HPN aware"); - + } - + } -- return; -+- return check[i].bugs; -++ bugs |= check[i].bugs; - } - } -+- debug("no match: %s", version); -+- return 0; -++ /* Check to see if the remote side is OpenSSH and not HPN */ -++ if (strstr(version, "OpenSSH") != NULL) { -++ if (strstr(version, "hpn") == NULL) { -++ bugs |= SSH_BUG_LARGEWINDOW; -++ debug("Remote is NON-HPN aware"); -++ } -++ } -++ if (bugs == 0) -++ debug("no match: %s", version); -++ return bugs; -+ } -+ -+ char * - diff --git a/compat.h b/compat.h - index c197fafc..ea2e17a7 100644 - --- a/compat.h -@@ -459,7 +510,7 @@ - @@ -890,6 +890,10 @@ kex_choose_conf(struct ssh *ssh) - int nenc, nmac, ncomp; - u_int mode, ctos, need, dh_need, authlen; -- int r, first_kex_follows; -+ int r, first_kex_follows = 0; - + int auth_flag = 0; - + - + auth_flag = packet_authentication_state(ssh); -@@ -553,7 +604,7 @@ - #define MAX_PACKETS (1U<<31) - static int - ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) --@@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) -+@@ -1317,7 +1336,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) - struct session_state *state = ssh->state; - int len, r, ms_remain; - fd_set *setp; -@@ -1035,19 +1086,6 @@ - - /* Minimum amount of data to read at a time */ - #define MIN_READ_SIZE 512 --diff --git a/ssh-keygen.c b/ssh-keygen.c --index cfb5f115..36a6e519 100644 ----- a/ssh-keygen.c --+++ b/ssh-keygen.c --@@ -2971,7 +2971,7 @@ do_download_sk(const char *skprovider, const char *device) -- freezero(pin, strlen(pin)); -- error_r(r, "Unable to load resident keys"); -- return -1; --- } --+ } -- if (nkeys == 0) -- logit("No keys to download"); -- if (pin != NULL) - diff --git a/ssh.c b/ssh.c - index 53330da5..27b9770e 100644 - --- a/ssh.c -@@ -1093,7 +1131,7 @@ - + else - + options.hpn_buffer_size = 2 * 1024 * 1024; - + --+ if (ssh->compat & SSH_BUG_LARGEWINDOW) { -++ if (ssh_compat_fellows(ssh, SSH_BUG_LARGEWINDOW)) { - + debug("HPN to Non-HPN Connection"); - + } else { - + int sock, socksize; -@@ -1157,14 +1195,14 @@ - } - @@ -2089,6 +2167,11 @@ ssh_session2_open(struct ssh *ssh) - window, packetmax, CHAN_EXTENDED_WRITE, -- "client-session", /*nonblock*/0); -+ "client-session", CHANNEL_NONBLOCK_STDIO); - - + if ((options.tcp_rcv_buf_poll > 0) && !options.hpn_disabled) { - + c->dynamic_window = 1; - + debug("Enabled Dynamic Window Scaling"); - + } - + -- debug3_f("channel_new: %d", c->self); -+ debug2_f("channel %d", c->self); - - channel_send_open(ssh, c->self); - @@ -2105,6 +2188,13 @@ ssh_session2(struct ssh *ssh, const struct ssh_conn_info *cinfo) -@@ -1335,7 +1373,29 @@ - /* Bind the socket to the desired port. */ - if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) { - error("Bind to port %s on %s failed: %.200s.", --@@ -1727,6 +1734,19 @@ main(int ac, char **av) -+@@ -1625,13 +1632,14 @@ -+ if (ssh_digest_update(ctx, sshbuf_ptr(server_cfg), -+ sshbuf_len(server_cfg)) != 0) -+ fatal_f("ssh_digest_update"); -+- len = ssh_digest_bytes(digest_alg); -+- hash = xmalloc(len); -+- if (ssh_digest_final(ctx, hash, len) != 0) -+- fatal_f("ssh_digest_final"); -+- options.timing_secret = PEEK_U64(hash); -+- freezero(hash, len); -+- ssh_digest_free(ctx); -++ if ((len = ssh_digest_bytes(digest_alg)) > 0) { -++ hash = xmalloc(len); -++ if (ssh_digest_final(ctx, hash, len) != 0) -++ fatal_f("ssh_digest_final"); -++ options.timing_secret = PEEK_U64(hash); -++ freezero(hash, len); -++ ssh_digest_free(ctx); -++ } -+ ctx = NULL; -+ return; -+ } -+@@ -1727,6 +1735,19 @@ main(int ac, char **av) - fatal("AuthorizedPrincipalsCommand set without " - "AuthorizedPrincipalsCommandUser"); - -@@ -1355,7 +1415,7 @@ - /* - * Check whether there is any path through configured auth methods. - * Unfortunately it is not possible to verify this generally before --@@ -2166,6 +2186,9 @@ main(int ac, char **av) -+@@ -2166,6 +2187,9 @@ main(int ac, char **av) - rdomain == NULL ? "" : "\""); - free(laddr); - -@@ -1365,7 +1425,7 @@ - /* - * We don't want to listen forever unless the other side - * successfully authenticates itself. So we set up an alarm which is --@@ -2343,6 +2366,12 @@ do_ssh2_kex(struct ssh *ssh) -+@@ -2343,6 +2367,12 @@ do_ssh2_kex(struct ssh *ssh) - struct kex *kex; - int r; - -@@ -1405,14 +1465,3 @@ - # Example of overriding settings on a per-user basis - #Match User anoncvs - # X11Forwarding no --diff --git a/version.h b/version.h --index 6b4fa372..332fb486 100644 ----- a/version.h --+++ b/version.h --@@ -3,4 +3,5 @@ -- #define SSH_VERSION "OpenSSH_8.5" -- -- #define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_HPN "-hpn15v2" --+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN -diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-PeakTput-15.2.diff b/openssh-8_5_P1-hpn-PeakTput-15.2.diff ---- a/openssh-8_5_P1-hpn-PeakTput-15.2.diff 2021-08-31 11:12:16.778011216 -0700 -+++ b/openssh-8_5_P1-hpn-PeakTput-15.2.diff 2021-08-31 11:13:11.573211934 -0700 -@@ -12,9 +12,9 @@ - static long stalled; /* how long we have been stalled */ - static int bytes_per_second; /* current speed in bytes per second */ - @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update) -+ off_t bytes_left; - int cur_speed; -- int hours, minutes, seconds; -- int file_len; -+ int len; - + off_t delta_pos; - - if ((!force_update && !alarm_fired && !win_resized) || !can_output()) -@@ -30,15 +30,17 @@ - if (bytes_left > 0) - elapsed = now - last_update; - else { --@@ -166,7 +173,7 @@ refresh_progress_meter(int force_update) -- -+@@ -166,8 +173,8 @@ refresh_progress_meter(int force_update) -+ buf[1] = '\0'; -+ - /* filename */ -- buf[0] = '\0'; --- file_len = win_size - 36; --+ file_len = win_size - 45; -- if (file_len > 0) { -- buf[0] = '\r'; -- snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s", -+- if (win_size > 36) { -++ if (win_size > 45) { -+- int file_len = win_size - 36; -++ int file_len = win_size - 45; -+ snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ", -+ file_len, file); -+ } - @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update) - (off_t)bytes_per_second); - strlcat(buf, "/s ", win_size); -@@ -63,15 +65,3 @@ - } - - /*ARGSUSED*/ --diff --git a/ssh-keygen.c b/ssh-keygen.c --index cfb5f115..986ff59b 100644 ----- a/ssh-keygen.c --+++ b/ssh-keygen.c --@@ -2959,7 +2959,6 @@ do_download_sk(const char *skprovider, const char *device) -- -- if (skprovider == NULL) -- fatal("Cannot download keys without provider"); --- -- pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN); -- if (!quiet) { -- printf("You may need to touch your authenticator " diff --git a/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-glue.patch b/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-glue.patch deleted file mode 100644 index 309e57e88643..000000000000 --- a/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-glue.patch +++ /dev/null @@ -1,198 +0,0 @@ -diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff ---- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-08-20 11:49:32.351767063 -0700 -+++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-08-20 11:58:08.746214945 -0700 -@@ -1026,9 +1026,9 @@ - + } - +#endif - + -- debug("Authentication succeeded (%s).", authctxt.method->name); -- } -- -+ if (ssh_packet_connection_is_on_socket(ssh)) { -+ verbose("Authenticated to %s ([%s]:%d) using \"%s\".", host, -+ ssh_remote_ipaddr(ssh), ssh_remote_port(ssh), - diff --git a/sshd.c b/sshd.c - index 6277e6d6..bf3d6e4a 100644 - --- a/sshd.c -diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff ---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-08-20 11:49:32.351767063 -0700 -+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-08-20 12:04:45.008038085 -0700 -@@ -536,18 +536,10 @@ - if (state->rekey_limit) - *max_blocks = MINIMUM(*max_blocks, - state->rekey_limit / enc->block_size); --@@ -954,6 +963,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode) -+@@ -954,6 +963,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode) - return 0; - } - --+/* this supports the forced rekeying required for the NONE cipher */ --+int rekey_requested = 0; --+void --+packet_request_rekeying(void) --+{ --+ rekey_requested = 1; --+} --+ - +/* used to determine if pre or post auth when rekeying for aes-ctr - + * and none cipher switch */ - +int -@@ -561,20 +553,6 @@ - #define MAX_PACKETS (1U<<31) - static int - ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) --@@ -980,6 +1007,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) -- if (state->p_send.packets == 0 && state->p_read.packets == 0) -- return 0; -- --+ /* used to force rekeying when called for by the none --+ * cipher switch methods -cjr */ --+ if (rekey_requested == 1) { --+ rekey_requested = 0; --+ return 1; --+ } --+ -- /* Time-based rekeying */ -- if (state->rekey_interval != 0 && -- (int64_t)state->rekey_time + state->rekey_interval <= monotime()) - @@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) - struct session_state *state = ssh->state; - int len, r, ms_remain; -@@ -598,12 +576,11 @@ - }; - - typedef int (ssh_packet_hook_fn)(struct ssh *, struct sshbuf *, --@@ -155,6 +158,10 @@ int ssh_packet_inc_alive_timeouts(struct ssh *); -+@@ -155,6 +158,9 @@ int ssh_packet_inc_alive_timeouts(struct ssh *); - int ssh_packet_set_maxsize(struct ssh *, u_int); - u_int ssh_packet_get_maxsize(struct ssh *); - - +/* for forced packet rekeying post auth */ --+void packet_request_rekeying(void); - +int packet_authentication_state(const struct ssh *); - + - int ssh_packet_get_state(struct ssh *, struct sshbuf *); -@@ -627,9 +604,9 @@ - oLocalCommand, oPermitLocalCommand, oRemoteCommand, - + oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize, - + oNoneEnabled, oNoneMacEnabled, oNoneSwitch, -+ oDisableMTAES, - oVisualHostKey, - oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, -- oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, - @@ -297,6 +300,9 @@ static struct { - { "kexalgorithms", oKexAlgorithms }, - { "ipqos", oIPQoS }, -@@ -637,9 +614,9 @@ - + { "noneenabled", oNoneEnabled }, - + { "nonemacenabled", oNoneMacEnabled }, - + { "noneswitch", oNoneSwitch }, -- { "proxyusefdpass", oProxyUseFdpass }, -- { "canonicaldomains", oCanonicalDomains }, -- { "canonicalizefallbacklocal", oCanonicalizeFallbackLocal }, -+ { "sessiontype", oSessionType }, -+ { "stdinnull", oStdinNull }, -+ { "forkafterauthentication", oForkAfterAuthentication }, - @@ -317,6 +323,11 @@ static struct { - { "securitykeyprovider", oSecurityKeyProvider }, - { "knownhostscommand", oKnownHostsCommand }, -@@ -717,9 +694,9 @@ - + options->hpn_buffer_size = -1; - + options->tcp_rcv_buf_poll = -1; - + options->tcp_rcv_buf = -1; -- options->proxy_use_fdpass = -1; -- options->ignored_unknown = NULL; -- options->num_canonical_domains = 0; -+ options->session_type = -1; -+ options->stdin_null = -1; -+ options->fork_after_authentication = -1; - @@ -2426,6 +2484,41 @@ fill_default_options(Options * options) - options->server_alive_interval = 0; - if (options->server_alive_count_max == -1) -@@ -778,9 +755,9 @@ - int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ - SyslogFacility log_facility; /* Facility for system logging. */ - @@ -120,7 +124,11 @@ typedef struct { -- - int enable_ssh_keysign; - int64_t rekey_limit; -+ int disable_multithreaded; /*disable multithreaded aes-ctr*/ - + int none_switch; /* Use none cipher */ - + int none_enabled; /* Allow none cipher to be used */ - + int nonemac_enabled; /* Allow none MAC to be used */ -@@ -842,9 +819,9 @@ - /* Portable-specific options */ - if (options->use_pam == -1) - @@ -424,6 +434,49 @@ fill_default_server_options(ServerOptions *options) -- } -- if (options->permit_tun == -1) - options->permit_tun = SSH_TUNMODE_NO; -+ if (options->disable_multithreaded == -1) -+ options->disable_multithreaded = 0; - + if (options->none_enabled == -1) - + options->none_enabled = 0; - + if (options->nonemac_enabled == -1) -@@ -1047,17 +1024,17 @@ - Note that - diff --git a/sftp.c b/sftp.c - index fb3c08d1..89bebbb2 100644 ----- a/sftp.c --+++ b/sftp.c --@@ -71,7 +71,7 @@ typedef void EditLine; -- #include "sftp-client.h" -- -- #define DEFAULT_COPY_BUFLEN 32768 /* Size of buffer for up/download */ ---#define DEFAULT_NUM_REQUESTS 64 /* # concurrent outstanding requests */ --+#define DEFAULT_NUM_REQUESTS 256 /* # concurrent outstanding requests */ -+--- a/sftp-client.c -++++ b/sftp-client.c -+@@ -65,7 +65,7 @@ typedef void EditLine; -+ #define DEFAULT_COPY_BUFLEN 32768 -+ -+ /* Default number of concurrent outstanding requests */ -+-#define DEFAULT_NUM_REQUESTS 64 -++#define DEFAULT_NUM_REQUESTS 256 - -- /* File to read commands from */ -- FILE* infile; -+ /* Minimum amount of data to read at a time */ -+ #define MIN_READ_SIZE 512 - diff --git a/ssh-keygen.c b/ssh-keygen.c - index cfb5f115..36a6e519 100644 - --- a/ssh-keygen.c -@@ -1330,9 +1307,9 @@ - + } - + } - + -- debug("Authentication succeeded (%s).", authctxt.method->name); -- } - -+ #ifdef WITH_OPENSSL -+ if (options.disable_multithreaded == 0) { - diff --git a/sshd.c b/sshd.c - index 6277e6d6..d66fa41a 100644 - --- a/sshd.c -@@ -1359,8 +1336,8 @@ - if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) { - error("Bind to port %s on %s failed: %.200s.", - @@ -1727,6 +1734,19 @@ main(int ac, char **av) -- /* Fill in default values for those options not explicitly set. */ -- fill_default_server_options(&options); -+ fatal("AuthorizedPrincipalsCommand set without " -+ "AuthorizedPrincipalsCommandUser"); - - + if (options.none_enabled == 1) { - + char *old_ciphers = options.ciphers; -@@ -1375,9 +1352,9 @@ - + } - + } - + -- /* challenge-response is implemented via keyboard interactive */ -- if (options.challenge_response_authentication) -- options.kbd_interactive_authentication = 1; -+ /* -+ * Check whether there is any path through configured auth methods. -+ * Unfortunately it is not possible to verify this generally before - @@ -2166,6 +2186,9 @@ main(int ac, char **av) - rdomain == NULL ? "" : "\""); - free(laddr); diff --git a/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch b/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch deleted file mode 100644 index b6827623cd66..000000000000 --- a/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -ur '--exclude=.*.un~' a/openssh-8.8p1+x509-13.2.3.diff b/openssh-8.8p1+x509-13.2.3.diff ---- a/openssh-8.8p1+x509-13.2.3.diff 2021-10-29 14:59:17.070546984 -0700 -+++ b/openssh-8.8p1+x509-13.2.3.diff 2021-10-29 14:59:55.086664489 -0700 -@@ -954,15 +954,16 @@ - char b[512]; - - size_t len = ssh_digest_bytes(SSH_DIGEST_SHA512); - - u_char *hash = xmalloc(len); -+- double delay; - + int digest_alg; - + size_t len; - + u_char *hash; -- double delay; -- -++ double delay = 0; -++ - + digest_alg = ssh_digest_maxbytes(); - + len = ssh_digest_bytes(digest_alg); - + hash = xmalloc(len); --+ -+ - (void)snprintf(b, sizeof b, "%llu%s", - (unsigned long long)options.timing_secret, user); - - if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0) -@@ -51859,12 +51860,11 @@ - - install-files: - $(MKDIR_P) $(DESTDIR)$(bindir) --@@ -391,6 +372,8 @@ -+@@ -391,6 +372,7 @@ - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - $(MKDIR_P) $(DESTDIR)$(libexecdir) - + $(MKDIR_P) $(DESTDIR)$(sshcadir) --+ $(MKDIR_P) $(DESTDIR)$(piddir) - $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) -@@ -71985,7 +71985,7 @@ - +if test "$sshd_type" = "pkix" ; then - + unset_arg='' - +else --+ unset_arg=none -++ unset_arg= - +fi - + - cat > $OBJ/sshd_config.i << _EOF -@@ -132360,16 +132360,6 @@ - +int asnmprintf(char **, size_t, int *, const char *, ...) - __attribute__((format(printf, 4, 5))); - void msetlocale(void); --diff -ruN openssh-8.8p1/version.h openssh-8.8p1+x509-13.2.3/version.h ----- openssh-8.8p1/version.h 2021-09-26 17:03:19.000000000 +0300 --+++ openssh-8.8p1+x509-13.2.3/version.h 2021-10-23 16:27:00.000000000 +0300 --@@ -2,5 +2,4 @@ -- -- #define SSH_VERSION "OpenSSH_8.8" -- ---#define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-8.8p1/version.m4 openssh-8.8p1+x509-13.2.3/version.m4 - --- openssh-8.8p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-8.8p1+x509-13.2.3/version.m4 2021-10-23 16:27:00.000000000 +0300 diff --git a/net-misc/openssh/openssh-8.8_p1-r4.ebuild b/net-misc/openssh/openssh-8.8_p1-r4.ebuild deleted file mode 100644 index 561dc2dd6076..000000000000 --- a/net-misc/openssh/openssh-8.8_p1-r4.ebuild +++ /dev/null @@ -1,491 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} - -# PV to USE for HPN patches -#HPN_PV="${PV^^}" -HPN_PV="8.5_P1" - -HPN_VER="15.2" -HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff -) - -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="13.2.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="https://www.openssh.com/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )} - ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} - verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) -" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc -S="${WORKDIR}/${PARCH}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -# Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - hpn? ( ssl ) - ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp ssl !xmss ) - xmss? ( ssl ) - test? ( ssl ) -" - -# tests currently fail with XMSS -REQUIRED_USE+="test? ( !xmss )" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - net-libs/ldns[ecdsa(+),ssl(+)] - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) - virtual/libcrypt:=[static-libs(+)] - >=sys-libs/zlib-1.2.3:=[static-libs(+)] -" -RDEPEND=" - acct-group/sshd - acct-user/sshd - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam ) - kerberos? ( virtual/krb5 ) -" -DEPEND="${RDEPEND} - virtual/os-headers - kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) - static? ( ${LIB_DEPEND} ) -" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - !prefix? ( sys-apps/shadow ) - X? ( x11-apps/xauth ) -" -BDEPEND=" - virtual/pkgconfig - sys-devel/autoconf - verify-sig? ( sec-keys/openpgp-keys-openssh ) -" - -pkg_pretend() { - # this sucks, but i'd rather have people unable to `emerge -u openssh` - # than not be able to log in to their server any more - local missing=() - check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); } - check_feature hpn HPN_VER - check_feature sctp SCTP_PATCH - check_feature X509 X509_PATCH - if [[ ${#missing[@]} -ne 0 ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${missing[*]}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "Missing requested third party patch." - fi - - # Make sure people who are using tcp wrappers are notified of its removal. #531156 - if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then - ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" - ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." - fi -} - -src_unpack() { - default - - # We don't have signatures for HPN, X509, so we have to write this ourselves - use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc} -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch - eapply "${FILESDIR}"/${PN}-8.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex - eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches - - local PATCHSET_VERSION_MACROS=() - - if use X509 ; then - pushd "${WORKDIR}" &>/dev/null || die - eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch" - popd &>/dev/null || die - - eapply "${WORKDIR}"/${X509_PATCH%.*} - - # We need to patch package version or any X.509 sshd will reject our ssh client - # with "userauth_pubkey: could not parse key: string is too large [preauth]" - # error - einfo "Patching package version for X.509 patch set ..." - sed -i \ - -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ - "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" - - einfo "Patching version.h to expose X.509 patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in X.509 patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) - fi - - if use sctp ; then - eapply "${WORKDIR}"/${SCTP_PATCH%.*} - - einfo "Patching version.h to expose SCTP patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in SCTP patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) - - einfo "Disabling known failing test (cfgparse) caused by SCTP patch ..." - sed -i \ - -e "/\t\tcfgparse \\\/d" \ - "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" - fi - - if use hpn ; then - local hpn_patchdir="${T}/${P}-hpn${HPN_VER}" - mkdir "${hpn_patchdir}" || die - cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die - pushd "${hpn_patchdir}" &>/dev/null || die - eapply "${FILESDIR}"/${PN}-8.7_p1-hpn-${HPN_VER}-glue.patch - use X509 && eapply "${FILESDIR}"/${PN}-8.7_p1-hpn-${HPN_VER}-X509-glue.patch - use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch - popd &>/dev/null || die - - eapply "${hpn_patchdir}" - - use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch" - - einfo "Patching Makefile.in for HPN patch set ..." - sed -i \ - -e "/^LIBS=/ s/\$/ -lpthread/" \ - "${S}"/Makefile.in || die "Failed to patch Makefile.in" - - einfo "Patching version.h to expose HPN patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ - "${S}"/version.h || die "Failed to sed-in HPN patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) - - if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - einfo "Disabling known non-working MT AES cipher per default ..." - - cat > "${T}"/disable_mtaes.conf <<- EOF - - # HPN's Multi-Threaded AES CTR cipher is currently known to be broken - # and therefore disabled per default. - DisableMTAES yes - EOF - sed -i \ - -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ - "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" - - sed -i \ - -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ - "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" - fi - fi - - if use X509 || use sctp || use hpn ; then - einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" - - einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" - - einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." - sed -i \ - -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ - "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" - fi - - sed -i \ - -e "/#UseLogin no/d" \ - "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" - - eapply_user #473004 - - # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox - sed -e '/\t\tpercent \\/ d' \ - -i regress/Makefile || die - - tc-export PKG_CONFIG - local sed_args=( - -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" - # Disable PATH reset, trust what portage gives us #254615 - -e 's:^PATH=/:#PATH=/:' - # Disable fortify flags ... our gcc does this for us - -e 's:-D_FORTIFY_SOURCE=2::' - ) - - # The -ftrapv flag ICEs on hppa #505182 - use hppa && sed_args+=( - -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' - -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' - ) - # _XOPEN_SOURCE causes header conflicts on Solaris - [[ ${CHOST} == *-solaris* ]] && sed_args+=( - -e 's/-D_XOPEN_SOURCE//' - ) - sed -i "${sed_args[@]}" configure{.ac,} || die - - eautoreconf -} - -src_configure() { - addwrite /dev/ptmx - - use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG - use static && append-ldflags -static - use xmss && append-cflags -DWITH_XMSS - - if [[ ${CHOST} == *-solaris* ]] ; then - # Solaris' glob.h doesn't have things like GLOB_TILDE, configure - # doesn't check for this, so force the replacement to be put in - # place - append-cppflags -DBROKEN_GLOB - fi - - # use replacement, RPF_ECHO_ON doesn't exist here - [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no - - local myconf=( - --with-ldflags="${LDFLAGS}" - --disable-strip - --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX}"/etc/ssh - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX}"/usr/share/openssh - --with-privsep-path="${EPREFIX}"/var/empty - --with-privsep-user=sshd - $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX}"/usr) - # We apply the sctp patch conditionally, so can't pass --without-sctp - # unconditionally else we get unknown flag warnings. - $(use sctp && use_with sctp) - $(use_with ldns) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use_with selinux) - $(usex X509 '' "$(use_with security-key security-key-builtin)") - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 - ) - - if use elibc_musl; then - # musl defines bogus values for UTMP_FILE and WTMP_FILE - # https://bugs.gentoo.org/753230 - myconf+=( --disable-utmp --disable-wtmp ) - fi - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_test() { - local tests=( compat-tests ) - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - ewarn "user, so we will run a subset only." - tests+=( interop-tests ) - else - tests+=( tests ) - fi - - local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 - mkdir -p "${HOME}"/.ssh || die - emake -j1 "${tests[@]}" </dev/null -} - -# Gentoo tweaks to default config files. -tweak_ssh_configs() { - local locale_vars=( - # These are language variables that POSIX defines. - # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 - LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME - - # These are the GNU extensions. - # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html - LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE - ) - - # First the server config. - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config - - # Allow client to pass locale environment variables. #367017 - AcceptEnv ${locale_vars[*]} - - # Allow client to pass COLORTERM to match TERM. #658540 - AcceptEnv COLORTERM - EOF - - # Then the client config. - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config - - # Send locale environment variables. #367017 - SendEnv ${locale_vars[*]} - - # Send COLORTERM to match TERM. #658540 - SendEnv COLORTERM - EOF - - if use pam ; then - sed -i \ - -e "/^#UsePAM /s:.*:UsePAM yes:" \ - -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ - -e "/^#PrintMotd /s:.*:PrintMotd no:" \ - -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ - "${ED}"/etc/ssh/sshd_config || die - fi - - if use livecd ; then - sed -i \ - -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ - "${ED}"/etc/ssh/sshd_config || die - fi -} - -src_install() { - emake install-nokeys DESTDIR="${D}" - fperms 600 /etc/ssh/sshd_config - dobin contrib/ssh-copy-id - newinitd "${FILESDIR}"/sshd-r1.initd sshd - newconfd "${FILESDIR}"/sshd-r1.confd sshd - - if use pam; then - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - fi - - tweak_ssh_configs - - doman contrib/ssh-copy-id.1 - dodoc CREDITS OVERVIEW README* TODO sshd_config - use hpn && dodoc HPN-README - use X509 || dodoc ChangeLog - - diropts -m 0700 - dodir /etc/skel/.ssh - - # https://bugs.gentoo.org/733802 - if ! use scp; then - rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \ - || die "failed to remove scp" - fi - - rmdir "${ED}"/var/empty || die - - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' -} - -pkg_preinst() { - if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then - show_ssl_warning=1 - fi -} - -pkg_postinst() { - local old_ver - for old_ver in ${REPLACING_VERSIONS}; do - if ver_test "${old_ver}" -lt "5.8_p1"; then - elog "Starting with openssh-5.8p1, the server will default to a newer key" - elog "algorithm (ECDSA). You are encouraged to manually update your stored" - elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." - fi - if ver_test "${old_ver}" -lt "7.0_p1"; then - elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." - elog "Make sure to update any configs that you might have. Note that xinetd might" - elog "be an alternative for you as it supports USE=tcpd." - fi - if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 - elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" - elog "weak sizes. If you rely on these key types, you can re-enable the key types by" - elog "adding to your sshd_config or ~/.ssh/config files:" - elog " PubkeyAcceptedKeyTypes=+ssh-dss" - elog "You should however generate new keys using rsa or ed25519." - - elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" - elog "to 'prohibit-password'. That means password auth for root users no longer works" - elog "out of the box. If you need this, please update your sshd_config explicitly." - fi - if ver_test "${old_ver}" -lt "7.6_p1"; then - elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." - elog "Furthermore, rsa keys with less than 1024 bits will be refused." - fi - if ver_test "${old_ver}" -lt "7.7_p1"; then - elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." - elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" - elog "if you need to authenticate against LDAP." - elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." - fi - if ver_test "${old_ver}" -lt "8.2_p1"; then - ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" - ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" - ewarn "connection is generally safe." - fi - done - - if [[ -n ${show_ssl_warning} ]]; then - elog "Be aware that by disabling openssl support in openssh, the server and clients" - elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" - elog "and update all clients/servers that utilize them." - fi - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/openssh/openssh-8.9_p1-r2.ebuild b/net-misc/openssh/openssh-8.9_p1-r2.ebuild index 64d88e4197f6..7cc0b4d2528a 100644 --- a/net-misc/openssh/openssh-8.9_p1-r2.ebuild +++ b/net-misc/openssh/openssh-8.9_p1-r2.ebuild @@ -36,7 +36,7 @@ S="${WORKDIR}/${PARCH}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # Probably want to drop ssl defaulting to on in a future version. IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" @@ -323,9 +323,6 @@ src_configure() { myconf+=( --disable-utmp --disable-wtmp ) fi - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - econf "${myconf[@]}" } diff --git a/net-misc/openssh/openssh-9.0_p1.ebuild b/net-misc/openssh/openssh-9.0_p1.ebuild index 6e16f5eb038c..13c0bb4fa5c5 100644 --- a/net-misc/openssh/openssh-9.0_p1.ebuild +++ b/net-misc/openssh/openssh-9.0_p1.ebuild @@ -36,7 +36,7 @@ S="${WORKDIR}/${PARCH}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # Probably want to drop ssl defaulting to on in a future version. IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss" @@ -322,9 +322,6 @@ src_configure() { myconf+=( --disable-utmp --disable-wtmp ) fi - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - econf "${myconf[@]}" } diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest index 920b7954e60e..95944c164d5b 100644 --- a/net-misc/r8125/Manifest +++ b/net-misc/r8125/Manifest @@ -1,5 +1,4 @@ -DIST r8125-9.007.01.tar.bz2 88973 BLAKE2B fda3be9bded138bb6ee6b131c4d89d2dc777153eb1d003f11803d412d28957c944f220452762ca92ebb1cbfe2d5e7bdc0f9944517a0bb58ed0f3f112986c21ee SHA512 753c328d5a962366ea1bd495ca3860309bc6ff8b2f3fb367a9f184441dd7c507d0eb4d63cc9b23851d0287e75ad2d602caee5ffed911691349cf8d0f37477a5c +AUX r8125-9.008.00-linux-5.17.patch 4449 BLAKE2B d00d43f1efae664d02a5c8e7fb6716114bd6cc1b78a5b94f99ea72400f9e9c776eaed60c5dc0593b32857e73aa27883e971b570e7b561cad4b85db1d706194b1 SHA512 a3459c78d55561ae703977e147965b04aa854eff1035c273a703936e6f069d5d501c91cf1db746d0ef93dbfe61c3d28b5d35be34a4982fcbe9f0c42d9204b1bf DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6 -EBUILD r8125-9.007.01.ebuild 1264 BLAKE2B c5d1f14d0407c63f45c2182aaaf593ded862d2e0c806a2eba3ba74b1b479ab571d11f322a6e62dda4f83cd974eb8dd5d1f068b65658ff488b3096b94091520d2 SHA512 5b1ec0229839cbd06c690546320752e04f43b54f8b62b1de329691cb5222905fb4c6cf80483adb09239d9c4fe6f8cb6fd22f995debbcc4fbe24d7b274d24364b -EBUILD r8125-9.008.00.ebuild 1266 BLAKE2B 2dba10ff4639ea88b418bf1f96404f9265633138f3ffcc5af68fcc31326f108b24d1f40e8b1269013fc7d520f62b2b5bc5ca5ebb612ee5acf1c0a9d03f0572e1 SHA512 63abe0979940d437e11d3cd5e426470e3bcc56e2f53195001338b17fecad6fa76d737c8793c75246cad5b9a4a0d83309aa3fe5ab26632caab23d1e5cec709c8e +EBUILD r8125-9.008.00.ebuild 1339 BLAKE2B f2c89508a6f3342eb2a55dca67a43e08da455a9d816ca70ea61dfe557c60676ed74423d5da8b1ab2e417da4ccefe42467d6a807f21a06b296e5f16177b68be9d SHA512 2933786074e2524225d3ecbb641e48b51bf593cbeef76ef18c26e6a74be004b67a8de77f81abbe0016d151239716e697c9783a709eca901b1d7e377491e38527 MISC metadata.xml 840 BLAKE2B 6fa88a6b1b49f0abd18ca64abf2ab93a04e89d51c66ebb602ca5070c56723fbe79e4a0fcfa49b4cc90e3ec904730c8e39b1a2159fcae0f036035d5696537a5a4 SHA512 f15e195ac564002f169610c0490f1f377716260e758241d5228a3b6c7d481de135c03a4da1e5c2eb121e4539a2abceabc3a4e1d26d8d987e093b981dd6eaea9f diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch new file mode 100644 index 000000000000..1a4afdb31bea --- /dev/null +++ b/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch @@ -0,0 +1,115 @@ +Added compatibility with Linux Kernel 5.17+. + +Author: Karlson2k (Evgeny Grin) +Gentoo bug: https://bugs.gentoo.org/839282 + +diff --git a/src/r8125_n.c b/src/r8125_n.c +--- a/src/r8125_n.c ++++ b/src/r8125_n.c +@@ -349,7 +349,7 @@ static int rtl8125_change_mtu(struct net_device *dev, int new_mtu); + static void rtl8125_down(struct net_device *dev); + + static int rtl8125_set_mac_address(struct net_device *dev, void *p); +-static void rtl8125_rar_set(struct rtl8125_private *tp, uint8_t *addr); ++static void rtl8125_rar_set(struct rtl8125_private *tp, const uint8_t *addr); + static void rtl8125_desc_addr_fill(struct rtl8125_private *); + static void rtl8125_tx_desc_init(struct rtl8125_private *tp); + static void rtl8125_rx_desc_init(struct rtl8125_private *tp); +@@ -1750,7 +1750,13 @@ static void rtl8125_proc_module_init(void) + static int rtl8125_proc_open(struct inode *inode, struct file *file) + { + struct net_device *dev = proc_get_parent_data(inode); +- int (*show)(struct seq_file *, void *) = PDE_DATA(inode); ++ int (*show)(struct seq_file *, void *) = ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) ++ PDE_DATA(inode); ++#else ++ pde_data(inode); ++#endif ++ + + return single_open(file, show, dev); + } +@@ -5234,8 +5240,15 @@ rtl8125_set_ring_size(struct rtl8125_private *tp, u32 rx, u32 tx) + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) + static void rtl8125_get_ringparam(struct net_device *dev, + struct ethtool_ringparam *ring) ++#else ++static void rtl8125_get_ringparam(struct net_device* dev, ++ struct ethtool_ringparam* ring, ++ struct kernel_ethtool_ringparam* kernel_ring, ++ struct netlink_ext_ack* extack) ++#endif + { + struct rtl8125_private *tp = netdev_priv(dev); + +@@ -5245,8 +5258,15 @@ static void rtl8125_get_ringparam(struct net_device *dev, + ring->tx_pending = tp->tx_ring[0].num_tx_desc; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) + static int rtl8125_set_ringparam(struct net_device *dev, + struct ethtool_ringparam *ring) ++#else ++static int rtl8125_set_ringparam(struct net_device* dev, ++ struct ethtool_ringparam* ring, ++ struct kernel_ethtool_ringparam* kernel_ring, ++ struct netlink_ext_ack* extack) ++#endif + { + struct rtl8125_private *tp = netdev_priv(dev); + u32 new_rx_count, new_tx_count; +@@ -10889,6 +10909,9 @@ rtl8125_get_mac_address(struct net_device *dev) + struct rtl8125_private *tp = netdev_priv(dev); + int i; + u8 mac_addr[MAC_ADDR_LEN]; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0) ++ u8 addr[ETH_ALEN]; ++#endif + + for (i = 0; i < MAC_ADDR_LEN; i++) + mac_addr[i] = RTL_R8(tp, MAC0 + i); +@@ -10916,9 +10939,17 @@ rtl8125_get_mac_address(struct net_device *dev) + rtl8125_rar_set(tp, mac_addr); + + for (i = 0; i < MAC_ADDR_LEN; i++) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) + dev->dev_addr[i] = RTL_R8(tp, MAC0 + i); + tp->org_mac_addr[i] = dev->dev_addr[i]; /* keep the original MAC address */ ++#else ++ addr[i] = RTL_R8(tp, MAC0 + i); ++ tp->org_mac_addr[i] = addr[i]; /* keep the original MAC address */ ++#endif + } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0) ++ eth_hw_addr_set(dev, addr); ++#endif + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) + memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); + #endif +@@ -10944,7 +10975,11 @@ rtl8125_set_mac_address(struct net_device *dev, + if (!is_valid_ether_addr(addr->sa_data)) + return -EADDRNOTAVAIL; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) + memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); ++#else ++ eth_hw_addr_set(dev, addr->sa_data); ++#endif + + rtl8125_rar_set(tp, dev->dev_addr); + +@@ -10959,7 +10994,7 @@ rtl8125_set_mac_address(struct net_device *dev, + *****************************************************************************/ + void + rtl8125_rar_set(struct rtl8125_private *tp, +- uint8_t *addr) ++ const uint8_t *addr) + { + uint32_t rar_low = 0; + uint32_t rar_high = 0; + + diff --git a/net-misc/r8125/r8125-9.007.01.ebuild b/net-misc/r8125/r8125-9.007.01.ebuild deleted file mode 100644 index 7389ba42cca3..000000000000 --- a/net-misc/r8125/r8125-9.007.01.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info linux-mod - -DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" - -# The alternative direct URL for the file from the link above with description -# "2.5G Ethernet LINUX driver r8125 for kernel up to 5.6" to avoid CAPTCHA -SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -MODULE_NAMES="r8125(net:${S}/src)" -BUILD_TARGETS="modules" -IUSE="multi-tx-q ptp rss use-firmware" - -CONFIG_CHECK="~!R8169" -WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" - BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)" - BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)" - BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)" - BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)" -} - -src_install() { - linux-mod_src_install - einstalldocs -} diff --git a/net-misc/r8125/r8125-9.008.00.ebuild b/net-misc/r8125/r8125-9.008.00.ebuild index a028be892582..7b0093e09b81 100644 --- a/net-misc/r8125/r8125-9.008.00.ebuild +++ b/net-misc/r8125/r8125-9.008.00.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit linux-info linux-mod @@ -20,6 +20,10 @@ MODULE_NAMES="r8125(net:${S}/src)" BUILD_TARGETS="modules" IUSE="+multi-tx-q ptp +rss use-firmware" +PATCHES=( + "${FILESDIR}/${PN}-9.008.00-linux-5.17.patch" # bug 839282 +) + CONFIG_CHECK="~!R8169" WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index 08136e1b464e..7764633b1c4f 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,4 +1,6 @@ AUX r8168-8.049.02-5.17-fix.patch 2572 BLAKE2B 7bbd4de5576e1686a269ae88b68eb6f3317affe6192f2271fa21bfaf2ca5bb8d59c8fc3ae4e1f41cb9d325e12dbbfe83fc4ab166378895a68f4c11a98cf6aa92 SHA512 7a03481aa0c195188e975dcd99a3954dda45601fde2d7f110d4840ff498fb5a274d8d9bde83a8d83520a506f8e5bebbb1aea18f75b1c2e959d916f3b0359d900 DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0 +DIST r8168-8.050.00.tar.bz2 115418 BLAKE2B b3e24d0548494f1904b5d3341994bdda35a05a71dce85a64c9e87cbde7f40807b0b1bcd78401928ff7625e67606918d5c844e8254cbbab62ed3f8e8058a3f15b SHA512 04043fd01ea877ea9f422b8f2319630b8664a49b41363039fc725ed382dc5afb732dda59ba63021a94c50b12ed2f0b3585cd668d969bc06fdc40d08420dbdb95 EBUILD r8168-8.049.02-r1.ebuild 1116 BLAKE2B 5d3323e1997a3f3948cd197b92570044664a1d90c57bb5e997701755e74feb1caf677bf585b27c2870d350d87b61db9d3b31400ef44dae52821688a3292ca2c5 SHA512 30090d6e07e5abcb5e2b3983365773846a9226fba7d661742f6f0256c4c856f5f641725b81958a9c49c1bea544e063ef862feed892d500035db4d6648ac6b1c5 +EBUILD r8168-8.050.00.ebuild 1062 BLAKE2B 9f53614cb2b380f9a325ecc36a9ca4320a92011307cc85ac749227729f5286028e92adc10d821d1eb3e5d1f0bd791518d85690a894b22853eca1d5acccf0f412 SHA512 843fa593eba960ca5a81d30354bcaf4452db990a12e45d5d740d363393f8e23d8097492b008ddb9ddc2942945e82eb367bfa66b8df9755ee1875c5715d42cf16 MISC metadata.xml 577 BLAKE2B 0335cbfc902163abd4ffef0ad089b15ae7eaee15e41ed7760834d0329662a8ea0c66d68366a779265205557abe31bf3055b474f6bda7469e803a6240c3e68951 SHA512 f27ae61be558fe46b14fdf43a8d975c71cc900788761e6c5044eea6e8f80ddb6528b0d9d711844b6c8b45e58401a8736d08c40827fa0ceb99be32a3a0abd7086 diff --git a/net-misc/r8168/r8168-8.050.00.ebuild b/net-misc/r8168/r8168-8.050.00.ebuild new file mode 100644 index 000000000000..df0f69ffed62 --- /dev/null +++ b/net-misc/r8168/r8168-8.050.00.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info linux-mod + +DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" + +# "GBE Ethernet LINUX driver r8168 for kernel up to 5.17" from above link, +# we need to mirror it to avoid users from needing to fill a captcha to +# download +SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +MODULE_NAMES="r8168(net:${S}/src)" +BUILD_TARGETS="modules" +IUSE="use-firmware" + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KERNELDIR=${KV_DIR}" + BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)" +} + +src_install() { + linux-mod_src_install + einstalldocs +} diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest index 47ec04cd05de..c6c0ac0b6d5e 100644 --- a/net-misc/rclone/Manifest +++ b/net-misc/rclone/Manifest @@ -1399,6 +1399,8 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.zip 561290 BLAKE2B 2bdf9fb92ee838f5a9112bc5e3ace3e1cdc7a4dd5b3940c94b36abdbd6def28f9629a49e9ec901a32b76c944cc82af19f0f99f281b15ce666ebf153d062bc052 SHA512 9d01facc2b973a45604ac010f0bf0ec6aa3121966eaea6d7e1ac15869a8f5892077c3bbf0cbc21517890e24379848b8def33bf7dee7b1152ce232dd996ad017f DIST rclone-1.53.3.tar.gz 14714224 BLAKE2B 0669bd046484867febe6ae201153540c40ce213d5a25eab84e84c97e577012a19423c89a1bc88ac0450ab58279fdd41e746fba266c96618bd0c19983cba3a205 SHA512 17d0ccf1165bc9d36e2aae5729dded2ccc6ecddd8a9902f1ca6b2bb26628afa99f58da5521ec5a1ebb27e8ea04cb736f88279603eeaeb0740cfe633cbe9de083 DIST rclone-1.57.0.tar.gz 15443082 BLAKE2B 35b930d1a2234d3887e046f676850e88c07b2fcddaec3d1f44be52cebe2f79cf76bfb2ecce1081e4f3448be505d0e5eddd98f6481c43c4512cab6f160b50261c SHA512 d0428263b8ee1779f96176574dc17adb73668d56b9dcf6894a0aae4db2990148d785226defa520143df788d4401e1f297faa5c5c645d3c8503c796c06a1d3229 +DIST rclone-1.58.1-deps.tar.xz 201798856 BLAKE2B e739b038953292e78161a40c3bd2753e4172b1e330109a4ad0aa5a10255a165c2ae1a4cbd191aeff3bee98c2b2ffd5c9f142bd290ef41fe0ab560baf43cb9702 SHA512 f40f00da9da7b6535ee1de2a120e047522e50e9341bf30ca8f0b01559621ed7474a59d925a88393600a90120818233eaa45ee44727b12336a7d48f3e2dfe550b +DIST rclone-1.58.1.tar.gz 15696598 BLAKE2B 601d60c5a1facc18bd6c157bf017ff8c0793fe4ca0bd8e8b719ad457882829919b18085c54a606c8880b60199c50b4a8f8fb7e73ca2c200efa899b8bcb7e0b63 SHA512 104ff2e743374ad3d0f3c517e34ac068d6439445732bc3ce4ffe8fbc13e7d2b4285518e8037c5600589425e001c26e334c7e31d12f9a476af958cb47097c4e00 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863 @@ -1420,5 +1422,6 @@ DIST storj.io%2Fuplink%2F@v%2Fv1.4.6.mod 500 BLAKE2B 1d766d04067e357df8762c6428b DIST storj.io%2Fuplink%2F@v%2Fv1.4.6.zip 122968 BLAKE2B 0b84c24ee6e79338bb7925c2d2728ceac3811cf1e27e5e3553fa9e619199577496c0a1779b25805d4a7a3a06a85425adc497460fc5de814372e0637db0e24142 SHA512 0f4f09a58c0b13898cabd0c5e2460b8f08a31fb28b490a7f5df44a987f6a6a4cec559f2e333c69b8e37b1dca07137c45c3cd74bc84008b1a69e897aafae6ba6b EBUILD rclone-1.53.3.ebuild 43482 BLAKE2B 12c4a443fcc7dcf11efe23572f59a65f66731382e99442681ca413007b116c0a566558692ed9fe12143a982bb12693478ab6991b25c79b38fdae4e740eaf9acb SHA512 bb5850a4cf44f0661db46c0a3e4a1ed8bc1358fe832e2fd068036a0f61f8eff1cf9c5bd64406057b7e43c3fd2f1f47b542af039f3de4702acfe7f2c22c349a7b EBUILD rclone-1.57.0.ebuild 65784 BLAKE2B 36b63186dfa0a301a61e82aac7237f627c6fb36f15e33cebc69fd6d2f8f395110fe0adc4645238ab4207c0009b4f2fb9164c5b157012494d7281bc32cfa436bd SHA512 b4581d54a1d18cca093b91b4b758f4b57a9f76c7735727eb57f09927640377b23f4cb5e5224eb5c7800c03bbb20bfa3032f6fcd8afcaca36574f9c1b566ee803 +EBUILD rclone-1.58.1.ebuild 1074 BLAKE2B ca47c040ff9a63dc00578909465952c2249f569722fdfe545bce41b08d31eb7a7cb93526cd13d48f992e225371c2d175b533aa83b40cd1f88817bd5f7feaf307 SHA512 cae04594405b3286e63616f8825ba03c86d412d8545e900293ff2894a4901f7ac5bd2eaf9f2302fd39c98dea1b449561558afa435e724b898bda867bd4159a9a EBUILD rclone-9999.ebuild 43484 BLAKE2B 1e9456708ccaf5b2e510a3d56cd5dd565c089fafb343a739e379572197c5a1460693e2dd6d9b2b0bf1d2f4405f01a922fdd069bff9b39561b73f4536b801eee8 SHA512 f7109a557e3a0ce2073f578f12414795c4d4002965b8d7e9fa6bd401d3afcf796837dd77f27b42bc9801d24fa3252836368be814fc23ec6b1222e17d4eaf5cf5 -MISC metadata.xml 248 BLAKE2B fc6c49e6d2a9807728c39d8b35e23c41446ef45106e9e400926334eecc4fac18c2614dfa18e68888f2e8c7d9356468794734ad0b33bbdf632f690a1c3dc4df34 SHA512 d9e2f282ed49c5ecde0d12d63ebcc971b7c487b9cdac14fe57790cc89a5984ea62bd0ba7c9aed86679598e7704c38f1767e0222d7f54c694f4328a9c4b9d36fa +MISC metadata.xml 361 BLAKE2B 9543147863f95ab48ae7f30ae94e33460cdae92bb641a5756d0f62f03a23fc56d84fc21a4c3f0d3d4700c585c165219a87bfea9398b03041cde84e3366ddcf1e SHA512 8d536ab26cfb37cf5e56fc73219ec97acf079732c8a521d38b5277d63fbc43931b546c42cfee7672e1fda127d912ad215546a37ac0b28a72a59a9641091a924d diff --git a/net-misc/rclone/metadata.xml b/net-misc/rclone/metadata.xml index e85252a96df1..de4f6ee3f2e3 100644 --- a/net-misc/rclone/metadata.xml +++ b/net-misc/rclone/metadata.xml @@ -5,4 +5,8 @@ <email>perfinion@gentoo.org</email> <name>Jason Zaman</name> </maintainer> + <maintainer type="person"> + <email>slashbeast@gentoo.org</email> + <name>Piotr Karbowski</name> + </maintainer> </pkgmetadata> diff --git a/net-misc/rclone/rclone-1.58.1.ebuild b/net-misc/rclone/rclone-1.58.1.ebuild new file mode 100644 index 000000000000..7c77180a06c2 --- /dev/null +++ b/net-misc/rclone/rclone-1.58.1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit bash-completion-r1 go-module + +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +SRC_URI=" + https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-deps.tar.xz +" + +DESCRIPTION="A program to sync files to and from various cloud storage providers" +HOMEPAGE="https://rclone.org/" + +LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" +SLOT="0" +IUSE="" + +src_compile() { + go build -mod=readonly . || die "compile failed" +} + +src_test() { + # Setting CI skips unreliable tests, see fstest/testy/testy.go + # TestAddPlugin and TestRemovePlugin fail + RCLONE_CONFIG="/notfound" CI="true" go test -mod=readonly -v -run "!Test.*Plugin" ./... || die "test failed" +} + +src_install() { + dobin ${PN} + doman ${PN}.1 + dodoc README.md + + ./rclone genautocomplete bash ${PN}.bash || die + newbashcomp ${PN}.bash ${PN} + + ./rclone genautocomplete zsh ${PN}.zsh || die + insinto /usr/share/zsh/site-functions + newins ${PN}.zsh _${PN} +} diff --git a/net-misc/realtek-r8152/Manifest b/net-misc/realtek-r8152/Manifest deleted file mode 100644 index a934e9e3a78f..000000000000 --- a/net-misc/realtek-r8152/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST realtek-r8152-2.14.0.tar.gz 88356 BLAKE2B c530080cab5e6f7433aa6452e3c5f1f19f14c2ac473751958d85efa5553d2b2889d80cc47c2ad4064ad5673008df97dce197254f445c5fc7ae3905c7833e1641 SHA512 2908e9963b6bec9d638514e6a54ab8bca0b56c4866245f476889e4c8462c36f2bece86abac2e5ece9aee1776f00f7d4a67fd5561d830a67e02e386d79aba07dd -DIST realtek-r8152-2.15.0.tar.gz 93420 BLAKE2B 24b7a71adfddde3ff2ecc8c0b92d51f50202dada31a2f86a19d518f37814dd52d7ca5ffb5f81f07c7a92436f4fef53c8538a64d6bc5afbb0b6b7ccbace0a7923 SHA512 b46012d6e9c48ebb0eb0b7387933977bc56df7a9e010f0707907719e833a8f409d5af55ef84ebb0d54de89239e69697b6995c75e194ef7d0fa2c371d5fc362ba -EBUILD realtek-r8152-2.14.0.ebuild 1605 BLAKE2B 525fcf936fb04e0ddf45509a594d643cbf64a7c6059ecad352e994f8b1c7fe8f40519a7f1f20ecd262105f704c2dd3aaf337178355a2eb6f03397dd9747417a1 SHA512 636a53aa95fa0efac53e1f5ce74e3fd4b85ba896a8966c082bc9dd86426f5e04ca5816145267c2e347cd5eaa511584d295dd229e0213d639c82b5f80bb437e65 -EBUILD realtek-r8152-2.15.0.ebuild 1607 BLAKE2B 46b615bcca4d117f9f0ef41e47c37ee4cb2319f243b30f6d35e9296c6e76cc6cce35296abc071b063794a39768a0d6568018d9ec4abc03317f4927b4b789df90 SHA512 87238a316d9080022fbbb53583b45f431e343db2e88521956bd0693ec16d69bf522299d188d14c256a437e75c0aa1e9e464cda859ad2ff787845730ad13d2ed9 -MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df diff --git a/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild b/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild deleted file mode 100644 index 82668bc49329..000000000000 --- a/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod linux-info udev - -SRC_URI="https://github.com/slashbeast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 x86" - -DESCRIPTION="Out-of-tree driver for Realtek's 2.5 GbE USB NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software" - -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -DEPEND=" - virtual/linux-sources - sys-kernel/linux-headers -" -RDEPEND="" - -MODULE_NAMES="r8152(net/usb)" - -pkg_setup() { - linux_config_exists - - for module in USB_USBNET USB_NET_CDC_NCM USB_NET_CDCETHER; do - linux_chkconfig_module "${module}" || ewarn "CONFIG_${module} needs to be built as module (builtin doesn't work)" - done - - linux_chkconfig_present MII || ewarn "CONFIG_MII needs to be built as module or builtin into the kernel" - - linux_chkconfig_present USB_RTL8152 && ewarn "CONFIG_USB_RTL8152 must NOT be enabled in the kernel!" - - linux-mod_pkg_setup - - BUILD_TARGETS="modules" - BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERNELDIR=${KERNEL_DIR}" -} - -src_install() { - linux-mod_src_install - - udev_newrules 50-usb-realtek-net.rules 50-usb-realtek-net.rules -} - -pkg_postinst() { - linux-mod_pkg_postinst - udev_reload - - echo - elog "If the cdc_ncm was loaded before this r8152 driver, one might get a flood" - elog "of 'usbN: network connection: disconnected' in kernel log." - elog "In that case one needs to unload r8152, cdc_ether and cdc_ncm modules and" - elog "let udev load them in right order or manually load r8152." - echo -} diff --git a/net-misc/realtek-r8152/realtek-r8152-2.15.0.ebuild b/net-misc/realtek-r8152/realtek-r8152-2.15.0.ebuild deleted file mode 100644 index b8439d39d198..000000000000 --- a/net-misc/realtek-r8152/realtek-r8152-2.15.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod linux-info udev - -SRC_URI="https://github.com/slashbeast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="Out-of-tree driver for Realtek's 2.5 GbE USB NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software" - -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -DEPEND=" - virtual/linux-sources - sys-kernel/linux-headers -" -RDEPEND="" - -MODULE_NAMES="r8152(net/usb)" - -pkg_setup() { - linux_config_exists - - for module in USB_USBNET USB_NET_CDC_NCM USB_NET_CDCETHER; do - linux_chkconfig_module "${module}" || ewarn "CONFIG_${module} needs to be built as module (builtin doesn't work)" - done - - linux_chkconfig_present MII || ewarn "CONFIG_MII needs to be built as module or builtin into the kernel" - - linux_chkconfig_present USB_RTL8152 && ewarn "CONFIG_USB_RTL8152 must NOT be enabled in the kernel!" - - linux-mod_pkg_setup - - BUILD_TARGETS="modules" - BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERNELDIR=${KERNEL_DIR}" -} - -src_install() { - linux-mod_src_install - - udev_newrules 50-usb-realtek-net.rules 50-usb-realtek-net.rules -} - -pkg_postinst() { - linux-mod_pkg_postinst - udev_reload - - echo - elog "If the cdc_ncm was loaded before this r8152 driver, one might get a flood" - elog "of 'usbN: network connection: disconnected' in kernel log." - elog "In that case one needs to unload r8152, cdc_ether and cdc_ncm modules and" - elog "let udev load them in right order or manually load r8152." - echo -} diff --git a/net-misc/rsync-bpc/Manifest b/net-misc/rsync-bpc/Manifest new file mode 100644 index 000000000000..2ec8b1593073 --- /dev/null +++ b/net-misc/rsync-bpc/Manifest @@ -0,0 +1,3 @@ +DIST rsync-bpc-3.1.3.0.tar.gz 883808 BLAKE2B 56cb299fb75219043364344d6575a443e32b5992a00f6691dde0f6b99c9b54d73d74bbef8dc98a9c927643985031e027df89d4aa1969d493e624290f28cb19f0 SHA512 24ae86c6108720d7f0ba6d144053ccba6499623018bc2bcff8f1d8e289f9c015f80e73244e965a7fcdccb5f9b2a876f1a54ceed42a19a80fd7c87c6b05c7701d +EBUILD rsync-bpc-3.1.3.0.ebuild 423 BLAKE2B 1b854f7c08506e1e53d1fa4d707797b436b60607d33d066c77448b4b99b3d95998ff6431ce15c83cddd990045765db00055ad19d3dba83520cabe36e7befdb24 SHA512 c3f914cc56d2cdb34f5241240bf57433606a52395f6a8fa1566637bd4a6aafc7b378f5d4aa7ed8b38b1629ee51ace13675b1ba2a9f1061f420defd9674485e08 +MISC metadata.xml 416 BLAKE2B e5fc28ce3c8f63e47a48deac7d2ee6a656739c00701b40348a19f7cebcd7523817764c54a7aed7ba4c1eea6553e673ef7a626a1963a5f1fccae1d190b6a20edb SHA512 c1355c99fe725f93dead8d6ef8670c97026e359bf4e9a34eb019c935dbe6e515bfdc2250bfcd36c21458ec6b9cf40b57b2a24a6aad901e55dbd41327e71fccbc diff --git a/net-misc/rsync-bpc/metadata.xml b/net-misc/rsync-bpc/metadata.xml new file mode 100644 index 000000000000..bf9ec30888ef --- /dev/null +++ b/net-misc/rsync-bpc/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>kernlpanic@dennis-eisele.de</email> + <name>Dennis Eisele</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> +</pkgmetadata> diff --git a/net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild b/net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild new file mode 100644 index 000000000000..c62f819d61f9 --- /dev/null +++ b/net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Rsync-bpc is a customized version of rsync that is used as part of BackupPC" +HOMEPAGE="https://github.com/backuppc/rsync-bpc" +SRC_URI="https://github.com/backuppc/rsync-bpc/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="virtual/ssh" +DEPEND="${RDEPEND}" diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 9e193cfd6e16..10290e00394f 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -10,8 +10,7 @@ DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800 DIST rsync-3.2.3.tar.gz.asc 195 BLAKE2B cc18dd2589c09f869e35ecaf94a610e5b605dcb10ceaf01e6c0eb2667666a9a73feb7dcb2325638686c772f91a74d6d1f15ea33fdb6a38e89640f32a8cd0e04a SHA512 b7e512d8bb0aaff7c48571b918a7b0362942c65ef2a0aa076574ec86c05822dc5df41f8796fdf62b762b12d166a671c9e979f9962357b89e3649459c4567525b DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B a67fcb9619874f1c5346a876138e59f4bf508a90736f830fb2b4eaf180ab11f15a0a7db9b3b28c3b990b77c2b0973d8e668bf509e4134f464159ed3172f53d80 SHA512 96318e2754fbddf84d16df671c721e577766969dfa415925c4dc1be2e4e60a51246623747a8aec0c6e9c0824e6aa7335235ccd07f3d6fd901f8cf28e2d6e91b6 DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 9bc2fbd59e5396a91de82f27a461367ad2a129820e2d1926c3b1e26dacf93c676a7231f186c341b6dec9c764a9619b504bc9b5f95925982e78de4607eddf6c65 SHA512 7e1bbebc777d5710345fdec1efd4c2ef1079d6c0ec90272a1a4a51a59ae3cb619b9d1c0ae2f337ecdd06827bb3536b969b6f21f9108f8d21114713aa1750012b -EBUILD rsync-3.2.3-r4.ebuild 3498 BLAKE2B 7ed62167acab5e725dba71c258a9a4f770595142469ca6c3b43939c2f99669f08fadc5fa6ac0104a14b774f6e679d547065b58135f13b5f0bacfb22e3d1b03b5 SHA512 b1bcf2bc437955ff6c86a9f0dbf492b927103b05d93edbdc44823fa49496f373d11c477af5c0fd83a1894f8e12148f6eddc0767c6535ef78b5ea4394520e0fa6 EBUILD rsync-3.2.3-r5.ebuild 4019 BLAKE2B cfc6983ceae44e3fff86e43186fe0ffbfddac35843895586a593aa6aa97e398ccab12f696a36353a2a8e2509cd79a4795be4653c06c6bcd77872649166a4b0a2 SHA512 3f7462e646d7407e649a03c992faf10688b980cb4f42c36c6e7c1964abb0fbe64d76829f052130fe15cfcce2cc5a53e44422bc9ffcffc2cf72454e905c5cdc1f -EBUILD rsync-3.2.4-r1.ebuild 4490 BLAKE2B cf88182b642dea41913431c96f3fe67d5a254767cb65721139423702f53d613c6fa59d614ae6c0475314e5153525682e8bd6c154aaddba92c486c1ae00833592 SHA512 ca478bfa7cb1c50712816631c1d4cdbc4284eac6240306f10e8498956f1209f8dac94d7bc7f540bcfe21911fbafd5412fb42ea1d271756ef48ad5d799e9e05c0 +EBUILD rsync-3.2.4-r1.ebuild 4497 BLAKE2B 04a00f7ed3e40d2caafa9b0473d05b3635efae6823ca8df46a3a1c75d44a6528c41defa2e57041eaf95c0af3f7c39c2ee1265b8cf95338c1d1188c09e59f00c5 SHA512 b8d1c6ce1b18960c14964504d406445e2b0c03fc85fcaf2efbae9a611d2ba83288b18c3b0ebbf96e1e19829f579b9a3239039221e4fe78a550dfb54e8ee7e340 EBUILD rsync-9999.ebuild 4490 BLAKE2B cf88182b642dea41913431c96f3fe67d5a254767cb65721139423702f53d613c6fa59d614ae6c0475314e5153525682e8bd6c154aaddba92c486c1ae00833592 SHA512 ca478bfa7cb1c50712816631c1d4cdbc4284eac6240306f10e8498956f1209f8dac94d7bc7f540bcfe21911fbafd5412fb42ea1d271756ef48ad5d799e9e05c0 MISC metadata.xml 655 BLAKE2B 4c3c8c26cf6d9bd27ae43a72408e8d587d7a5d3db588ccf67b2d68a8b697e4dbc531e959ebe57274413f5a1630be54415a56540953e44241d4810baa8bbb06d8 SHA512 de38cb9841631855730caa0630af6acc5413d8460dfb529ab1e972cbb33f557475a37b1fb1544114a8a48f72bcec670b72d2d142e951ac30e9356a4c540d59e4 diff --git a/net-misc/rsync/rsync-3.2.3-r4.ebuild b/net-misc/rsync/rsync-3.2.3-r4.ebuild deleted file mode 100644 index 38c591855af9..000000000000 --- a/net-misc/rsync/rsync-3.2.3-r4.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} != 3.2.3 ]]; then - # Make sure we revert the autotools hackery applied in 3.2.3. - die "Please use rsync-9999.ebuild as a basis for version bumps" -fi - -WANT_LIBTOOL=none - -inherit autotools prefix systemd - -DESCRIPTION="File transfer program to keep remote files into sync" -HOMEPAGE="https://rsync.samba.org/" -SRC_DIR="src" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz" -S="${WORKDIR}/${P/_/}" - -LICENSE="GPL-3" -SLOT="0" -IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd" - -RDEPEND="acl? ( virtual/acl ) - lz4? ( app-arch/lz4 ) - ssl? ( dev-libs/openssl:0= ) - system-zlib? ( sys-libs/zlib ) - xattr? ( kernel_linux? ( sys-apps/attr ) ) - xxhash? ( dev-libs/xxhash ) - zstd? ( >=app-arch/zstd-1.4 ) - >=dev-libs/popt-1.5 - iconv? ( virtual/libiconv )" -DEPEND="${RDEPEND}" - -src_prepare() { - local PATCHES=( - "${FILESDIR}/rsync-3.2.3-glibc-lchmod.patch" - "${FILESDIR}/rsync-3.2.3-cross.patch" - ) - default - eautoconf -o configure.sh - touch config.h.in || die -} - -src_configure() { - local myeconfargs=( - --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf - --without-included-popt - $(use_enable acl acl-support) - $(use_enable iconv) - $(use_enable ipv6) - $(use_enable lz4) - $(use_enable ssl openssl) - $(use_with !system-zlib included-zlib) - $(use_enable xattr xattr-support) - $(use_enable xxhash) - $(use_enable zstd) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd - newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd - - dodoc NEWS.md README.md TODO tech_report.tex - - insinto /etc - newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf - - insinto /etc/logrotate.d - newins "${FILESDIR}"/rsyncd.logrotate rsyncd - - insinto /etc/xinetd.d - newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd - - # Install stunnel helpers - if use stunnel ; then - emake DESTDIR="${D}" install-ssl-daemon - fi - - # Install the useful contrib scripts - if use examples ; then - exeinto /usr/share/rsync - doexe support/* - rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} - fi - - eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* - - systemd_newunit "packaging/systemd/rsync.service" "rsyncd.service" -} - -pkg_postinst() { - if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ - "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then - ewarn "You have disabled chroot support in your rsyncd.conf. This" - ewarn "is a security risk which you should fix. Please check your" - ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." - fi - if use stunnel ; then - einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." - einfo - einfo "You maybe have to update the certificates configured in" - einfo "${EROOT}/etc/stunnel/rsync.conf" - fi - if use system-zlib ; then - ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" - ewarn "using the --compress option." - ewarn - ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," - ewarn "and the --compress option, add --new-compress (-zz)." - ewarn - ewarn "For syncing the portage tree, add:" - ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" - fi -} diff --git a/net-misc/rsync/rsync-3.2.4-r1.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild index d172d6ec7259..a5cde37a6997 100644 --- a/net-misc/rsync/rsync-3.2.4-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r1.ebuild @@ -21,7 +21,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest index d0367648f37a..5a3d0d16d285 100644 --- a/net-misc/smb4k/Manifest +++ b/net-misc/smb4k/Manifest @@ -1,5 +1,5 @@ DIST smb4k-3.1.1.tar.xz 3185504 BLAKE2B c85007bf205a46f7a0c592556d816ed630b91663e443c4b322a611bd64d9b7dcb7ad6627d8b0d194b4dbb350505d95ef43aceb19d8d7fbd1caa14cb6b638c825 SHA512 2a9035f4bfcf982a084f2de20b1b3a1e0b0ceebb262f89b782dfc0229c80d3d43969b6fae90c20bac96749a958fd1f82f1b5cda423562491cba6e2981a79febf DIST smb4k-3.1.2.tar.xz 3189176 BLAKE2B 5d34eca46015a939fe3c0c4e2c73882938e6e462e06d3138429c01f203d894be0625703c38767b0260ea8e349acf9b5ce739fda0daed2091527fc08d6a2fb84f SHA512 6871d831e4b4f1cf471e9b225eb0761549a3a754c82a219041c335f970965d7ffd897cac8becfca5e358e1664dc1afed31febe44531267c272e565d2039b3f4c EBUILD smb4k-3.1.1.ebuild 2042 BLAKE2B 9b4edaddb0f9ef9c333d6df926970f07d2fd02ee08d0e10e770535dace05b6c56324014eba8c0997224793cbabccfe0739b5d3688bb6c887016c6cfd7a3c9567 SHA512 4295a76709306a5d889f1bb223c5cf3dc0462e33dc41c884372fe441d4897d4c31c3ee37b9c0eb3f2556ae254a52fe695d261b9647954d321d596017ae2f4271 -EBUILD smb4k-3.1.2.ebuild 2044 BLAKE2B a52fa8577aceeb714a45cd7ee336e42553b881deb0db336a2a983efe4773483f70838fc1e6a58f004656aa5f44ebd305d150f829cc4cc47cc06f1447817a723b SHA512 0d124c8dfc8398dee0e571ac22cccde502f82293649eded446d0ff3fb99ab723674f72b5cf01bc3e7ccdde56b66e7ba615dcae56d31ae78029caa494c8556e7b +EBUILD smb4k-3.1.2.ebuild 2042 BLAKE2B 9b4edaddb0f9ef9c333d6df926970f07d2fd02ee08d0e10e770535dace05b6c56324014eba8c0997224793cbabccfe0739b5d3688bb6c887016c6cfd7a3c9567 SHA512 4295a76709306a5d889f1bb223c5cf3dc0462e33dc41c884372fe441d4897d4c31c3ee37b9c0eb3f2556ae254a52fe695d261b9647954d321d596017ae2f4271 MISC metadata.xml 473 BLAKE2B 6d6939d13ca2672154cfe76f878fdacfdfff7e28faf8e8a10a06b81385d7d0805b6dba675a82e6fd4da0cbfd7d6f5828adc0dbb42ecc0d95297a83e8ba5ba42c SHA512 d100a9358ed143b814b40346e055dc6f27f66fb00f2628039ba035d4fe7565a08c0e1e2ea44779f015d3f3abce078074f4f320496cbeee65c1098adf5568f53b diff --git a/net-misc/smb4k/smb4k-3.1.2.ebuild b/net-misc/smb4k/smb4k-3.1.2.ebuild index 6afc6176d8df..d3a8b0160e1b 100644 --- a/net-misc/smb4k/smb4k-3.1.2.ebuild +++ b/net-misc/smb4k/smb4k-3.1.2.ebuild @@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~riscv ~x86" + KEYWORDS="amd64 ~riscv x86" fi LICENSE="GPL-2" diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index 0c012c61642d..f5c4f3b8f241 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -1,10 +1,8 @@ AUX socat-1.7.3.0-filan-build.patch 1164 BLAKE2B ea158041a421fdfbbcfb14f050920f9f6ea9d99097d74c9c81c63c5816595f2ef8475b3add04d9efd8d19498382520a4f686d73c85b1df1879d5997b2f4da635 SHA512 479a189bbc0546e8838f40e770902c0c82d5fd042e1d94731d0036f66448810dd5ffcd5297b3ad4e474db8e037d211e65648a5f35f41827d7a320d6b2b8208bf AUX socat-1.7.3.1-stddef_h.patch 1272 BLAKE2B 1693a96be8fc27c102ef48fd16a1c719ff240b7330800ee26876f2b9a0b21671d79da3244f87894ee2f65ca833f34e9636ed7ace4f19951fa4443abe26a2bb9c SHA512 294acc9f05526eb47bc2cc01603b1c5bc553c4a2ffaaf63b87b66eb653930c0f8139fb8c4d72ddec10482e35ae3a6ba144a6555c8ba64066c30cc4132f10f2bf AUX socat-1.7.3.4-fno-common.patch 497 BLAKE2B b1329f43afd86989d527a292ec188ebacfd269efe68bb649c6652cc7eb49d43363b0e0925c40cfa2e52a318a7eb84ae4822db98a5cbed69b394481f168def9ca SHA512 0dd7c92f8da42e99409b086ba48e757aa0fcdc404b771ce6d8f43296c72ab939bb98c202056312df5424332f9209b4f2b32b212b90c9d5819fb98ab0d890bc24 -DIST socat-1.7.4.2.tar.gz 653068 BLAKE2B 0eba89e2f8993e6c5f2ffaa57ca9e93ae89cb01bf9d6f0f0d5e9550d4cd7e6aa390b26120a47e3661772550f4fb189807bedd31d1477ff0065f478ef2be062ab SHA512 c331a6348e0febb35cd8adc2b116e3b8896cd7f64bcd93e507df4b8197ee1e6738ca256abf74c9b225e7a3769cf9643f0e237826125c6f390b5124ce0f10c972 DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B d91de7ef55332001e6439f64130555b9558338fb9b6c15c91ab5efc8f86a2e7e0f5fe0b292754731a198d83be5f511c3388c65c7c7f559c55691f42703f1849b SHA512 81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834 -EBUILD socat-1.7.4.2.ebuild 1502 BLAKE2B 35babb2d5719c566afebb8717ed3fdc92b5c611cb097d46851471d2f2b91eb9c15fe90efe2fb2433b6a88f0ebf41ab36afdaefee581ae91f88572b86f4e382b3 SHA512 db8b77987c12436f8db4a89a6b8cfb8fa1c0e818e7d1f2de14bfab0ef0291cff2ae96e624f9d1deadc14fca56d1a1789c8d032abf45a18095eefd4922a4aa6d8 EBUILD socat-1.7.4.3.ebuild 1839 BLAKE2B e3abbce79b31b5f8e3811e5f1d3a4a23778c4701a207828dcd82c9a63de90195e724e4802573e4104da86019b8dac71d197ecf9ff3244bcff1b972830d1e810a SHA512 d0c5e16414d25146f4aaf4a545aecf80666c813be9091ac24cb7be9e5347678bd778630d8dae70b8f79d7fd68a111f31d305e19d6d0545d4b75b515e0b14c9f1 EBUILD socat-2.0.0_beta9.ebuild 1569 BLAKE2B 9dfa4c8b0b0abf35ac8f5cb1b8b719bae89f5814084606ecc3b1fc8197aa598b11b94912985578e939ce8c549da194fe2e17bb42214521297f0a41c5acc0d1cb SHA512 219edf709f24642d0113f0a9e4ea1566940895b1cc9b11163ab69f598a8863155fec5f06b66a8c09441e113d9fa210a1d7e26a194b5e4c6441d6e52cc2a1cb1a MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa diff --git a/net-misc/socat/socat-1.7.4.2.ebuild b/net-misc/socat/socat-1.7.4.2.ebuild deleted file mode 100644 index 7bb1513b232e..000000000000 --- a/net-misc/socat/socat-1.7.4.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -MY_P=${P/_beta/-b} -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bindist ipv6 readline ssl tcpd" - -DEPEND="ssl? ( dev-libs/openssl:0= ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers )" -RDEPEND="${DEPEND}" - -# Tests are a large bash script -# Hard to disable individual tests needing network or privileges -# in 1.7.4.2: FAILED: 59 329 -RESTRICT="test ssl? ( readline? ( bindist ) )" - -DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) - -pkg_setup() { - # bug #587740 - if use readline && use ssl ; then - elog "You are enabling both readline and openssl USE flags, the licenses" - elog "for these packages conflict. You may not be able to legally" - elog "redistribute the resulting binary." - fi -} - -src_configure() { - # bug #293324 - filter-flags '-Wno-error*' - - tc-export AR - - econf \ - $(use_enable ssl openssl) \ - $(use_enable readline) \ - $(use_enable ipv6 ip6) \ - $(use_enable tcpd libwrap) -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css -} diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest index bf143424badb..a6c1854cef75 100644 --- a/net-misc/sstp-client/Manifest +++ b/net-misc/sstp-client/Manifest @@ -1,5 +1,8 @@ AUX sstp-client-1.0.12-fix-example.patch 417 BLAKE2B 5f91dd2ee3e3ccc089712a2efd26dd05c91aed7a787e4240a7e10a8e81f1f74d732299731500033551331e23d8927fa9519f52214c6e8949bbd3f8f6c558dfa7 SHA512 a7bef85e7be5a90a0820317d6aa87ab6e26f97caea9e47c6e678fdc8cd1c25b1a8f11c9e2ccb93f99950da39076253b435156edd4b7dfbb606db2fe58eef66e2 AUX sstp-client-1.0.12-remove-network-test.patch 313 BLAKE2B 80857c01cfdb8a4b919729d5316ec78a9d6d4de4092afb615bbd731557e033b55d400a3fa8c0fac83a2732e3cc8212c0c16a067bfb01041d2ab2f0fc3c233847 SHA512 00d1b0ad75aa75417cf87210802c48164a715eddd7a1f53e8956e524387eb170078471d67fab32e3b25990b1b44fa415b153bf22fdf8b3c90385627c8f0075e4 +AUX sstp-client-1.0.17-fix-bashism-configure.ac.patch 1054 BLAKE2B 6c73460707247ec49d639d993b45f9dc6fc96df9cf2c8946bd222a305f4e818016ccfaf3d13985eccd0020bebcf8a22f2fff22964d97aadd8018c5b9b5d234fa SHA512 8aa8417ef1ae6df46fcf7328a979d75983ecf6c279dd972651bd0faec372a3ee952e4c6b3dd3318ea463a2a080a17f60303d637cf2e5c7d8b31069051eef35c7 DIST sstp-client-1.0.12.tar.gz 468683 BLAKE2B 4bb97465ee29eb6dd816a69b45c53e58e9de2cd5d7b5c9e39ea4ebbb3c3de0c21b3d95317114ae8c93bc3be359300bd6a55fa0512540bf25405fb47f8fb4e736 SHA512 d29128e59977fa844b0f2b02580284bb4e909994e5616c4dfa150b7a9807d0f34219355abe8c315c60c5f2482e3255824ce7e05566dbea9a7f13a1739d46468f +DIST sstp-client-1.0.17.tar.gz 482831 BLAKE2B d19c752b3f061401f89eb46bd52091e3ab0a3c931c6646a55c1ee0e6dd7e9c501fba14b7c870a2514cb72fb0fd1d8bc89538562d4d99b9d58a081e0917734f5d SHA512 eff18eb894b2c96d46315b5ac7530fe50e8dd6e6c29ea946cd0e7c05c56416e85088fc65650fb77c05e3a747cb0b4e3575af5457515d240161027910abae9775 EBUILD sstp-client-1.0.12-r1.ebuild 1325 BLAKE2B 0965f2f89c3905ba02070d0a9fdec51b154e54a37d8c520067ae6f646af38a0ce534437aad6e11a2432ee6d4b5623d53272c4e4521adcd8cd8232cf197d055fe SHA512 e953a85ad8a62922b246bae364095c2894fad0d4355f5bcf14c8c84812d054317ece4c67af445d065f9bc1f288a6f62da66b4a845aad81d602b5c88fc635c2fc -MISC metadata.xml 249 BLAKE2B abffff2d7e7577e3fcc40c67d5934d9a8288da07bf7b3d877b6333631b60f27dd3fa33f84b9a385b9db3fdbdafc7e89efac540f7d0e53fa8634827a07304726e SHA512 7f48ec7b7fd90db599c0e89370d01de8fe623c5d92f48cec2e1ca3c92c3439a40f2727098d4fd6fcf662fe815148bb7909fb23d5b7fb1535101f425a4d10a9ff +EBUILD sstp-client-1.0.17.ebuild 1401 BLAKE2B e9c6b3a8da998d3cc9d2aa79c9902137665db12aa186ee179bec82ab2ecaaf690ef02da383419ac462eb0a2cb94711d5d718e4a73afc9267fa1b09900069031d SHA512 621c57bf85dd0c4d93fba79b143af39b031e1d82e6da0416379ab59e8c576bac35aa149f77480a7cf77b6a4fdf332e88e9e50d685461829cd92ea72b79f2e488 +MISC metadata.xml 308 BLAKE2B 3a472844a5dc30193440521d7cba758d6c78b10528e9aee2d76491a526c94bc410376b9db50062de890819b553e5db25c6b596fa6e28432d1095153f3c498573 SHA512 75461a9b457611c5b72de5d80f75969cb63987c6b8e771d3c10b321c00c51fd1bbd06ad6e30c1d9e8a8867320191fd7213ee80cd5adbee35f44226e227a4109c diff --git a/net-misc/sstp-client/files/sstp-client-1.0.17-fix-bashism-configure.ac.patch b/net-misc/sstp-client/files/sstp-client-1.0.17-fix-bashism-configure.ac.patch new file mode 100644 index 000000000000..a3a41fb206a9 --- /dev/null +++ b/net-misc/sstp-client/files/sstp-client-1.0.17-fix-bashism-configure.ac.patch @@ -0,0 +1,23 @@ +https://gitlab.com/eivnaes/sstp-client/-/merge_requests/2 + +From 3cae209750549b17c547c3025859c0468cd5fcf6 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 10 May 2022 18:04:20 +0000 +Subject: [PATCH] configure.ac: fix bashism + +configure scripts are expected to work with POSIX compliant shells providing +/bin/sh so use = instead of == to work with both Bash and other shells. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -129,7 +129,7 @@ PKG_CHECK_EXISTS([pppd], + AM_CONDITIONAL(WITH_PPP_PLUGIN, test "${enable_ppp_plugin}" = "yes") + AC_ARG_WITH([pppd-auth-notify-support], + AS_HELP_STRING([--with-pppd-auth-notify-support], [is the auth-notifier supported in this pppd version])) +-AS_IF([test "x$with_pppd_auth_notify_support" == "xyes" ], ++AS_IF([test "x$with_pppd_auth_notify_support" = "xyes" ], + [AC_DEFINE(USE_PPPD_AUTH_HOOK,1,[Define if pppd has support for client side authentication complete notification]) + PPPD_AUTH_NOTIFIER="yes"], + [PPPD_AUTH_NOTIFIER="no"]) +GitLab diff --git a/net-misc/sstp-client/metadata.xml b/net-misc/sstp-client/metadata.xml index 8c9ceb44c429..c93fe2ce4d92 100644 --- a/net-misc/sstp-client/metadata.xml +++ b/net-misc/sstp-client/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> + <remote-id type="gitlab">eivnaes/sstp-client</remote-id> <remote-id type="sourceforge">sstp-client</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/sstp-client/sstp-client-1.0.17.ebuild b/net-misc/sstp-client/sstp-client-1.0.17.ebuild new file mode 100644 index 000000000000..57f15cf30687 --- /dev/null +++ b/net-misc/sstp-client/sstp-client-1.0.17.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info + +DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)" +HOMEPAGE="http://sstp-client.sourceforge.net/" +SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="static" + +DEPEND="dev-libs/libevent:= + dev-libs/openssl:= + net-dialup/ppp:=" +RDEPEND="${DEPEND} + acct-group/sstpc + acct-user/sstpc" +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~NETFILTER_NETLINK" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.12-remove-network-test.patch" + "${FILESDIR}/${PN}-1.0.12-fix-example.patch" + + "${FILESDIR}/${PN}-1.0.17-fix-bashism-configure.ac.patch" +) + +DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING ) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local PPPD_VER="$(best_version net-dialup/ppp)" + # Reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER#*/*-} + # Main version without beta/pre/patch/revision + PPPD_VER=${PPPD_VER%%[_-]*} + + local myeconfargs=( + --enable-ppp-plugin + --enable-group=sstpc + --enable-user=sstpc + --with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" + --with-runtime-dir="/run/sstpc" + $(use_enable static) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest index 50f72c2141c6..cdba1e0a37b7 100644 --- a/net-misc/sysrepo/Manifest +++ b/net-misc/sysrepo/Manifest @@ -1,6 +1,3 @@ -AUX sysrepo-2.0.53-musl.patch 208 BLAKE2B 9cc49eeef2bd950c25259fdfbc308a8788bf2e8d97777db7a67abdda9cc66fa9a32c4221eefe82cd8b8b829d9848df6164ceffd3e63b251ce845ed0adc453456 SHA512 34d058d0a5dff6ea959ab0ee0882b6fc4c6c0ea257f790568bbd5f8cc12abb5405dbf7bb850d81d5b1836a34c231041157a0aba55ca5f67d570e85b2dce19b7c -DIST sysrepo-2.0.53.tar.gz 669484 BLAKE2B f612080b316d6cf86ea70d88834f75b647dc16b29ad824829338d2144784bd7f425d3811055b9b956ef4e6820d467ecbe9a33a3d54a51a4024999b79e62b8255 SHA512 47949514df988a7a8a3b2a506f69baf6ea31bb32d5e80b85af968c827382cadf96e1ab237519308564a59ae67514d6ca3f5e300855259b9baf6ab49252a2eb12 DIST sysrepo-2.1.42.tar.gz 712516 BLAKE2B 6ae56ada0156f49483ca9c3b2494a4bc8093ffa910a2f043e12f4cc5af2285580dfd0f950d5fccb2c00b5a299c9345045194b480ef857448479de5e838b49bbc SHA512 186eee0f1ddef28a1aa2d9a9038e9fcbfc829579f1a47eeefb4f2aa31d18f97ec2723bd04fe0684f80dacfba3d1a8da8748b564e310ffbdde5f18251c81d7405 -EBUILD sysrepo-2.0.53.ebuild 817 BLAKE2B 945398e8c90a9f38063cdfbe0b94a5749afc1580057b994984848b6cec59d60d7aba25206008daf98ba90993e708ff1f33d06b206eb04bcef5eb11bf37b41fba SHA512 8a0dfd76eec843331c3bb21b15455e95e92b13da7524477f1c7a5ecf421a0450bd3e39f0afeb8400fc442734d441a6d82f2c4d2004a432c957bf1e5fba2e73cd -EBUILD sysrepo-2.1.42.ebuild 777 BLAKE2B 312ef3da87ae2f18eb0c19b07d99fae6e81222a52b0ed6ec1b7d3b6a7167d7cbf9ca7e1f709e21513e68f241e45435d311716d290aca951951f7cd9366061305 SHA512 a4fb7651fa0c20ed8aefa7fb2dfe66d9f26ee042a925d18d465732d33cd05153309a795935c936cae2e71f7f48eea9cbc04363185744a5d88ec44252bc065e48 +EBUILD sysrepo-2.1.42.ebuild 776 BLAKE2B b471c3dbcb63922783798bb9e56ba8e23492cb8c4656adfebabf42cc4167389b96d681f0ddfd72a296e83d081c7e66448b1520c74970c5ffbbdd1219791733e3 SHA512 fa25527f2efff4a73bf2d71bc04d2c70bce3b94e87f84570b6f4cffd477b38f54e019c4dfcce92fe7b0f4589f74b3ebd599f5bd6b1bd70e068e48b1d7bd14cda MISC metadata.xml 328 BLAKE2B e91ac8ab81f342a9cdbf7b924f37c12f2adade3b0dee1972a3b2f2035997d6e8f5de414a052f2e154f6cecba1ab310103db2fd60e16d085875200bf08fcea522 SHA512 acdb3728e90337d98aea6f5174aba7a81d84259226ec6dda4607524184137b75431e621ebe29b99d371f6b3ff54aed15732a1d89229bf8cb100b52b4e0ae1a99 diff --git a/net-misc/sysrepo/files/sysrepo-2.0.53-musl.patch b/net-misc/sysrepo/files/sysrepo-2.0.53-musl.patch deleted file mode 100644 index 24c5d86edc59..000000000000 --- a/net-misc/sysrepo/files/sysrepo-2.0.53-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://bugs.gentoo.org/828916 ---- a/src/sysrepo_types.h -+++ b/src/sysrepo_types.h -@@ -19,6 +19,7 @@ - - #include <inttypes.h> - #include <stddef.h> -+#include <sys/stat.h> - - struct lyd_node; - struct timespec; diff --git a/net-misc/sysrepo/sysrepo-2.0.53.ebuild b/net-misc/sysrepo/sysrepo-2.0.53.ebuild deleted file mode 100644 index 0a27e12a8305..000000000000 --- a/net-misc/sysrepo/sysrepo-2.0.53.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="YANG-based configuration and operational state data store" -HOMEPAGE="https://www.sysrepo.org" -SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=">=net-libs/libyang-2.0.112:=" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen[dot] )" - -PATCHES=( - "${FILESDIR}"/${P}-musl.patch -) - -src_configure() { - local mycmakeargs=( - -DENABLE_TESTS=$(usex test) - -DENABLE_VALGRIND_TESTS=OFF - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - use doc && cmake_src_compile doc -} - -src_install() { - cmake_src_install - - use doc && dodoc -r doc/. -} diff --git a/net-misc/sysrepo/sysrepo-2.1.42.ebuild b/net-misc/sysrepo/sysrepo-2.1.42.ebuild index eec10cb96a87..ff659f5568e9 100644 --- a/net-misc/sysrepo/sysrepo-2.1.42.ebuild +++ b/net-misc/sysrepo/sysrepo-2.1.42.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index d46b09b07de2..019f6e20ba0e 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -14,7 +14,7 @@ DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d -EBUILD tigervnc-1.12.0-r5.ebuild 4912 BLAKE2B ce619fccea148d0c1cb54ee4ca1f8d750f6ba9026c40d8e382e5f58ae727c8d1f0179e644118592df85ffa2ada6a229c942b1138e3f0b1c20c25f3b39a935618 SHA512 ed2267828aeaeada0234d0003ddb683e4bcacd7df4e9fbdf561f3e92cdeb71f8ce98e2119f72941f508bfa918ad5adeb0bbea9bdc0680bfc0340c0e2259aa7ad +EBUILD tigervnc-1.12.0-r5.ebuild 4907 BLAKE2B b3b7f361196e6b58fbfac738b45f6ac1a873eee1af28db51054856829cff620f75c06d44a24ebb0eeca2348873afe517f6451616b90620bd4a37eefdd1557f93 SHA512 a00d73c9212f8ffb8208a391ae5c375841cc525bb62091d90386b9d5d2c2356ab5e3936bc56e358f18f31240744ad3d4a7dff6c769bf893f989f0532618f6769 EBUILD tigervnc-1.9.0-r2.ebuild 4221 BLAKE2B 5d9ee5be8f6a8b23c62959105a5dafac0db043e6c76462b9c8aa5c1fb9ee56985d08d750f754f030055796980ef3e2987d41af6247bc07431403e5494a0cbd19 SHA512 9937b4ef4d969d329fd04ed372cbc079e4f1f17397cc22d41c08cb464625e9ee6cf6f771cef2e5c6d45e947ebe28851bd45dae08186bcd489c418ff1be8642c0 EBUILD tigervnc-9999.ebuild 4072 BLAKE2B 8d9d1d942146ee2fd64e597bb362b444b88933fdbbf0412dcca117dc2be6abbb77e4260788fba900a00698e5b61b8742905d64c5587f2e1470aa6631cbcf72ef SHA512 a7e0a4b8a74a52296e157577c34de37bb70202171e37d2ea36af68860fdc86b72c4ee79bec18edf413e39ee98716444f44313a5e01c07674494bed963a59ab4a MISC metadata.xml 706 BLAKE2B 221033648808798dd4d0be5db1374b76552a2a92eb5dc7b57f11c3feb7774e8fd85fd81f740753e3007bfd431fee4d4686210a5c1f2e967c2a67b76dfe03bb7f SHA512 f69cadf29c700280cae57028179c5e94eca3a3a71c82093bb7236e908d4407e149622aa39fc0a71ab25eab93a6250750cc95cdaa7ae933fd7f332de50250f845 diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild index 0b98ec1f8f59..5a4087287b50 100644 --- a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild +++ b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule" REQUIRED_USE="dri3? ( drm )" diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index aca7b05f0f49..5d3b298ef5a5 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,3 +1,4 @@ +AUX turbovnc-2.2.7-fix-musl-compilation.patch 1535 BLAKE2B d0a95f7bffef46da41bb1faf3de3b3c3651890e3653ccb2d961e11921bb25c6910f9d4a049e9b6d867d214e1e0310de22ec3c423424acbebe7be2437d2ffb2ab SHA512 94ba2b53e02e9b2e32f70f2cfb4dd0cfb733726bb31383462113681c95afff4823dc82302641773947ab5e71fe6547a9f233b25146d9cd292f08da66faf8f786 DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788 -EBUILD turbovnc-2.2.7-r2.ebuild 2521 BLAKE2B 20eef8401e0309d888febf26f36129df9d056309849eeffdaadf3f060de60ac5f1ec7b372229a74976bf3c8c882e817d4dfc93476ea5e9c256611c06e0970d32 SHA512 1380c77cf9471add17046b57a1b6a72b141a8ba88eba07b9f81cb69ca71c397626dbd7d92ba73400ea262a7b620b9e49da7d4f364887c0810231b8e79739293f +EBUILD turbovnc-2.2.7-r2.ebuild 2696 BLAKE2B a03f3d8f43871bdaedf3010b914e05580827a45579bca9c400a7bb533514956c920cde88fd67b9e0211a9df1b0c28f149791021e5854e0a913c5cdd7413cec59 SHA512 7b04acfbcb3e34c12c11baa36d11ed5de8a05a42bac8fc3068a1fde118999d0850fad349b7db92b6de3e44759f83bfc7e31e57c699b5460018979c8964ab86bb MISC metadata.xml 784 BLAKE2B 55a8bba421a15da5ed9401949b8e056b9c376030875bac0b28dece1a71f50c07010949bf82792129db82df98068061959a80c31093c8e91afb94cbdee0b2f020 SHA512 1e15fc8d88a46e7027eec5cdb8f8f7d6973f2ff1ea586ba6cf2d46a6d09050c6ba0ba94eaa9f59a8624a9885b8b25ec7a2977f1f4d71c02517bd8f681c05bec9 diff --git a/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch new file mode 100644 index 000000000000..c9f5f0397b4c --- /dev/null +++ b/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch @@ -0,0 +1,51 @@ +See bug https://bugs.gentoo.org/836723 + +There are 2 compilation errors: + +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds': +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known + 1178 | struct ucred peercred; + | ^~~~~~~~ + +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c:48:10: fatal error: asm/page.h: No such file or directory + 48 | #include <asm/page.h> + | ^~~~~~~~~~~~ + + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -69,6 +69,8 @@ + boolean_number(TVNC_BUILDSERVER) + report_option(TVNC_BUILDSERVER "TurboVNC Server") + ++option(BUILDING_ON_MUSL "Define GNU macros on musl" 0) ++ + if(TVNC_BUILDNATIVE OR TVNC_BUILDSERVER) + set(USEC 1) + endif() +--- a/unix/Xvnc/programs/Xserver/os/CMakeLists.txt ++++ b/unix/Xvnc/programs/Xserver/os/CMakeLists.txt +@@ -13,6 +13,10 @@ + add_definitions(-DBSD44SOCKETS) + endif() + ++if(BUILDING_ON_MUSL) ++ add_definitions(-D_GNU_SOURCE) ++endif() ++ + set(EXTRASRCS "") + if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") + add_definitions(-DSECURE_RPC) +--- a/unix/Xvnc/programs/Xserver/Xext/CMakeLists.txt ++++ b/unix/Xvnc/programs/Xserver/Xext/CMakeLists.txt +@@ -8,6 +8,10 @@ + endif() + endforeach() + ++if(BUILDING_ON_MUSL) ++ add_definitions(-D__GNU_LIBRARY__=2) ++endif() ++ + disable_compiler_warnings() + handle_type_puns() + diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild index 5b1a5561d896..1764dc4c265b 100644 --- a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="gnutls +ssl" -DEPEND=" +COMMON_DEPEND=" app-arch/bzip2 media-libs/freetype >=media-libs/libjpeg-turbo-2.0.0:=[java?] @@ -40,9 +40,15 @@ DEPEND=" !net-misc/tigervnc " RDEPEND=" - ${DEPEND} + ${COMMON_DEPEND} x11-apps/xkbcomp " +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans +" + +PATCHES=( "${FILESDIR}"/"${P}"-fix-musl-compilation.patch ) src_prepare() { use java && java-pkg-opt-2_src_prepare @@ -57,6 +63,7 @@ src_configure() { -DTVNC_BUILDNATIVE=$(usex java) -DXKB_BIN_DIRECTORY=/usr/bin -DXKB_DFLT_RULES=base + -DBUILDING_ON_MUSL=$(usex elibc_musl) # bug #836723 ) if use ssl ; then diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest index a5e76b1d4a44..1b197689c8b7 100644 --- a/net-misc/vde/Manifest +++ b/net-misc/vde/Manifest @@ -7,7 +7,7 @@ AUX vde.init-r1 1021 BLAKE2B cf91532a53a59fb653b3c9c221ce68a4351a40503dedb28e89b DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6 EBUILD vde-2.3.2-r6.ebuild 1407 BLAKE2B 639dd926dc7bcfde76216470b381cec847f7a7369e18b359d614f8edde3e3570cab2ab6416cc312f316a962d3cfd028a136209a607338b48a6cc318cb367b9c4 SHA512 852218c41c305ab7ae013c674c3b3194fbb03895377e37ef0b203611b8e1f1a68bfa5d6ea5bd5fef16afc82ac0706f431afaa3f98dc421d19dd7f8673585e2ac -EBUILD vde-2.3.2_p20191011-r1.ebuild 2037 BLAKE2B 44ce43460f5c330e89260a2bc381a8a025eacef886d80f4384accba8d262f82d05d88727e5639c00624919bda21fc83030a815109032b8b7fc530f60c9efc34c SHA512 1cceea111264d3044a4ea0b4ae8528d4ab1cdf10b082c24a5a33c99c38143c2a5ca5cf087dc37cff808278ffaefa6dee6f0f3decbd8b29dd81e3ad80ccb7252a +EBUILD vde-2.3.2_p20191011-r1.ebuild 2044 BLAKE2B 56b2f6f1c4573e3cf3d54b05e2b56d9559f1118f30ce583e5db181185c26bf12d58f0e1bf0a5540b53bb1060cbde18c3a7ab2c7fb3bffac49b98b81bb30ac752 SHA512 8759e5d336e62cfb318f37feda6f290cf1107289ddfe7046ce297048f808e16656b5bf2cc13ed8a42e4953fc08a303581e929d668c51395911dfa97c8c630c6c EBUILD vde-2.3.2_p20191011.ebuild 1967 BLAKE2B 2435594c7f62fb10476d0a9ded2352096f5bd4ff5b7bcd9953ce27926ea8b2c57a51ec7739162dced5abcedf589db795ffe583b280ac4cdd825bcbd4959ba770 SHA512 5f9cb5597d05fcd02636b5b318c6904fad10c06fb9ccfb568ca1bc8927bf05e2e4ea9137b3b2863dc58177ce99ce643754bd55f48f2d2f176aade1af87d85b1e EBUILD vde-9999.ebuild 1924 BLAKE2B 5a3ceff00f2c858d35696a6ee1ef80a7a3db12c0ffe44b07da5089424e0bb3768138dbb6fab7de64c1491844f90c178d1b117b4db3f6dc29140ffbef2023fcec SHA512 490dcf752cf332d7947515f7348acce13b1f53793732ce354d9684470901e37d2d07befd88dd6b552f773fe2e45e95a5037f1224167c9720c082c1c2745c9992 MISC metadata.xml 988 BLAKE2B 24bada8b93480ba4644e90e8ab37a67feaad750783d2dc5bb484ffdf32ebd5be15f23596d243a6d1891abecb073c586773903e75a4a5500253f1883d840d0381 SHA512 fe715ee3977df72eb82c65f85471deec3f8cd466c3911d3059a586c56bb02c9cdb83fcc67663e35691fce87a46dc13072785a1f0089e54f22e0e64f55b0bda0a diff --git a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild index 69fb8a181891..b8cab1c90092 100644 --- a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild +++ b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ elif [[ ${PV} = *_p* ]]; then MY_PN="vde-2" COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb" SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}/${MY_PN}-${COMMIT}" else diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest deleted file mode 100644 index f7270afc2f8c..000000000000 --- a/net-misc/vinagre/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX vinagre-3.20.2-freerdp2.patch 1355 BLAKE2B 6d9655bcb8bf778d6c9a9a4336d08d6e9d29a999845be18eaa611d3162125ba4b8b7e3743406c1381c191edde2fbfb29967cf427823ce74e445ddc29b93c10ed SHA512 9fbe2c45bdda85226410020154441f25f1010e331c30a6d64eabd302c59408d2097238412f4b75407b0bb65163b3ed7258c280b411f17e4b071c95c27b0b2095 -AUX vinagre-3.22.0-freerdp2-2.patch 3671 BLAKE2B 62d1307fc79adbe7d2949c005fcb133f2a75ed39572dcceb85348a60bdd0a1d432b21ad3bb9689866d644cc48e764f5c7b42b12e2b614805b3b4b82c5b7ba41d SHA512 167d92664001ee35ba8d2b0e262b7f45ec9488eca604e4a63979c51065c9d1e97701fab9377fb7cd623dd87ed9db8be3361ad306a1f55cce8da234ac13e2a312 -AUX vinagre-3.22.0-gcc10-fno-common.patch 690 BLAKE2B 4f552f190f520fb1e09ae91fb8d88a4c31658f99c4e218df1d2362c8b2c20de1b7d67d04a6846041d26a0eaaf38236823381436c05abb2e293491fde2b17e94a SHA512 f6ec1a339aaf0d8a6a9f663cc51ae10c9a15e6c772dcc978c27a54842e8079d68079f5280cec34942921e4265f8fe94f61af9edc29946b6262d36ad321b6c37d -DIST vinagre-3.22.0.tar.xz 1574984 BLAKE2B a8e6c7be07816b49f7194ece223a3ee35608736e69c0390e5f67691135706f1e993df53b3e4cb5b1f3d6850ff546444efc477419ca1b5f5ca2fa490124f6c373 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f -EBUILD vinagre-3.22.0-r3.ebuild 1772 BLAKE2B 82db5f93fb9202bb8a9ae78193387a4579e6b02ef75b32e5fa11b64cb27029cdfe539009941b1f15643b50da3c4b037cb8091b1c8d90ea432cfd5419527860f7 SHA512 aea23a5d170b2e3861f55573d3b66558a29b3bfbee9dc380f21c8106a3a2431fef61b4d925e589960580a408d7e9f3d3165b96944aa0f3cb49ca6fdd3de361bf -MISC metadata.xml 551 BLAKE2B 59c0171d54fb7a4ae9f9eb9092dae3a3a933a72d68ffd7ca98b3fe43411ca0150f5283235fd1e13eead8fe39af78286991dce5234bbef6911f6c18acb7fc20e3 SHA512 73064bbb94834be628ac91b7a1da25b068ef9a9b37da2398c9adb8eb2e2513ce8be285d826f658b2f5272d612b589633d153fbf30ab41ceb3def7dd884a65a63 diff --git a/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch b/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch deleted file mode 100644 index 4f88ab013e10..000000000000 --- a/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001 -From: Adam Williamson <awilliam@redhat.com> -Date: Fri, 22 Apr 2016 14:54:09 -0700 -Subject: [PATCH] handle new freerdp pkgconfig name - -freerdp has now changed its pkgconfig name to 'freerdp2' - -https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming -we can build against both 1 and 2, we should handle both names. ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 585c016..362951d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"]) - - # Whether to enable support for RDP. - RDP_DEPS="freerdp x11" -+RDP_2_DEPS="freerdp2 x11" - AC_ARG_ENABLE([rdp], - [AS_HELP_STRING([--disable-rdp], - [Disable Remote Desktop Protocol (RDP) support])]) -@@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"], - [have_rdp=yes - PKG_CHECK_EXISTS(freerdp >= 1.1, - [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])], -- [have_rdp=no])], -+ [PKG_CHECK_EXISTS([$RDP_2_DEPS], -+ [have_rdp=yes -+ RDP_DEPS=$RDP_2_DEPS -+ AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])], - [have_rdp=no]) - - AS_IF([test "x$have_rdp" = "xyes"], --- -2.7.3 - diff --git a/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch b/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch deleted file mode 100644 index 6c22b46b2583..000000000000 --- a/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch +++ /dev/null @@ -1,117 +0,0 @@ -Fix build issue with freerdp2 - -Gnome-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=765444 -Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=609474 - -diff --git c/plugins/rdp/vinagre-rdp-tab.c i/plugins/rdp/vinagre-rdp-tab.c -index b731f9b20ec910cc..13100de3dc0e07e1 100644 ---- c/plugins/rdp/vinagre-rdp-tab.c -+++ i/plugins/rdp/vinagre-rdp-tab.c -@@ -476,16 +476,17 @@ frdp_drawing_area_draw (GtkWidget *area, - return TRUE; - } - --static void -+static BOOL - frdp_begin_paint (rdpContext *context) - { - rdpGdi *gdi = context->gdi; - - gdi->primary->hdc->hwnd->invalid->null = 1; - gdi->primary->hdc->hwnd->ninvalid = 0; -+ return TRUE; - } - --static void -+static BOOL - frdp_end_paint (rdpContext *context) - { - VinagreRdpTab *rdp_tab = ((frdpContext *) context)->rdp_tab; -@@ -495,7 +496,7 @@ frdp_end_paint (rdpContext *context) - gint x, y, w, h; - - if (gdi->primary->hdc->hwnd->invalid->null) -- return; -+ return TRUE; - - x = gdi->primary->hdc->hwnd->invalid->x; - y = gdi->primary->hdc->hwnd->invalid->y; -@@ -517,6 +518,7 @@ frdp_end_paint (rdpContext *context) - { - gtk_widget_queue_draw_area (priv->display, x, y, w, h); - } -+ return TRUE; - } - - static BOOL -@@ -587,15 +589,7 @@ frdp_post_connect (freerdp *instance) - rdpGdi *gdi; - int stride; - -- gdi_init (instance, --#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ -- !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \ -- FREERDP_VERSION_MINOR >= 2)) -- CLRBUF_24BPP, --#else -- CLRBUF_32BPP, --#endif -- NULL); -+ gdi_init (instance, PIXEL_FORMAT_BGRA32); - gdi = instance->context->gdi; - - instance->update->BeginPaint = frdp_begin_paint; -@@ -934,11 +928,13 @@ frdp_authenticate (freerdp *instance, - return TRUE; - } - --static BOOL -+static DWORD - frdp_certificate_verify (freerdp *instance, -- char *subject, -- char *issuer, -- char *fingerprint) -+ const char *common_name, -+ const char *subject, -+ const char *issuer, -+ const char *fingerprint, -+ BOOL host_mismatch) - { - VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab); - GtkBuilder *builder; -@@ -968,17 +964,20 @@ frdp_certificate_verify (freerdp *instance, - gtk_widget_hide (dialog); - - -- return response == GTK_RESPONSE_YES; -+ return (response == GTK_RESPONSE_YES) ? 1 : 0; - } - - - #if HAVE_FREERDP_1_1 --static BOOL -+static DWORD - frdp_changed_certificate_verify (freerdp *instance, -- char *subject, -- char *issuer, -- char *new_fingerprint, -- char *old_fingerprint) -+ const char *common_name, -+ const char *subject, -+ const char *issuer, -+ const char *new_fingerprint, -+ const char *old_subject, -+ const char *old_issuer, -+ const char *old_fingerprint) - { - VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab); - GtkBuilder *builder; -@@ -1023,7 +1022,7 @@ frdp_changed_certificate_verify (freerdp *instance, - gtk_widget_hide (dialog); - - -- return response == GTK_RESPONSE_YES; -+ return (response == GTK_RESPONSE_YES) ? 1 : 0; - } - #endif - diff --git a/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch b/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch deleted file mode 100644 index d23ce4fa59f6..000000000000 --- a/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/plugins/vnc/vinagre-vnc-connection.c -+++ b/plugins/vnc/vinagre-vnc-connection.c -@@ -27,6 +27,8 @@ - #include "vinagre-vnc-connection.h" - #include "vinagre-vala.h" - -+gboolean scaling_command_line; -+ - struct _VinagreVncConnectionPrivate - { - gchar *desktop_name; ---- a/plugins/vnc/vinagre-vnc-connection.h -+++ b/plugins/vnc/vinagre-vnc-connection.h -@@ -26,7 +26,7 @@ - - G_BEGIN_DECLS - --gboolean scaling_command_line; -+extern gboolean scaling_command_line; - - #define VINAGRE_TYPE_VNC_CONNECTION (vinagre_vnc_connection_get_type ()) - #define VINAGRE_VNC_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_VNC_CONNECTION, VinagreVncConnection)) diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml deleted file mode 100644 index c20584016666..000000000000 --- a/net-misc/vinagre/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="ssh">Enable ssh plugin using <pkg>x11-libs/vte</pkg></flag> - <flag name="spice">Enable access to SPICE-enabled virtual machines</flag> - <flag name="telepathy">Enable access to remote desktop via a - <pkg>net-libs/telepathy-glib</pkg> client</flag> - </use> -</pkgmetadata> diff --git a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild deleted file mode 100644 index 143a016eb411..000000000000 --- a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools gnome2 linux-info vala - -DESCRIPTION="VNC client for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86" -IUSE="rdp +ssh spice +telepathy zeroconf" - -# cairo used in vinagre-tab -# gdk-pixbuf used all over the place -RDEPEND=" - >=dev-libs/glib-2.32.0:2 - >=x11-libs/gtk+-3.9.6:3 - app-crypt/libsecret - >=dev-libs/libxml2-2.6.31:2 - >=net-libs/gtk-vnc-0.4.3[gtk3(+)] - x11-libs/cairo:= - x11-libs/gdk-pixbuf:2 - x11-themes/hicolor-icon-theme - - rdp? ( >=net-misc/freerdp-1.1:= ) - ssh? ( >=x11-libs/vte-0.20:2.91 ) - spice? ( - app-emulation/spice-protocol - >=net-misc/spice-gtk-0.5[gtk3(+)] ) - telepathy? ( - dev-libs/dbus-glib - >=net-libs/telepathy-glib-0.11.6 ) - zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) -" -DEPEND="${RDEPEND} - $(vala_depend) - app-text/yelp-tools - dev-libs/appstream-glib - >=dev-util/intltool-0.50 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - - gnome-base/gnome-common -" -# gnome-base/gnome-common needed for eautoreconf -pkg_pretend() { - # Needed for VNC ssh tunnel, bug #518574 - CONFIG_CHECK="~IPV6" - check_extra_config -} - -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=765444 - eapply "${FILESDIR}"/${PN}-3.20.2-freerdp2.patch - eapply "${FILESDIR}"/${PN}-3.22.0-freerdp2-2.patch - # https://gitlab.gnome.org/GNOME/vinagre/merge_requests/8 - eapply "${FILESDIR}"/${PN}-3.22.0-gcc10-fno-common.patch - - vala_src_prepare - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_enable rdp) \ - $(use_enable ssh) \ - $(use_enable spice) \ - $(use_with telepathy) \ - $(use_with zeroconf avahi) -} diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest deleted file mode 100644 index a873cd3e2cc1..000000000000 --- a/net-misc/vino/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX CVE-2014-6053.patch 1054 BLAKE2B 4f1b4512bc2c0d3ea971379bcbe28ceda2288f7acd041e565ad7bcd884fbca2373f5ed5e862a11d83cd6d4a222d8e75ad0fd20f4e8e867ec657a6f009cb573fd SHA512 0c3873b5a26576d13446c8b78b8737ada2f1bf9efd7af015061bfe1df694d54c741ee6d9f551abc60d8bf30e92e5ce8b40d50d12b378add5e5f9ce3a70fef8a5 -AUX CVE-2018-7225.patch 2397 BLAKE2B 2adae0915f8ab5046b80d30b9e1ad7ae923ddc01c9281d4b1ef59ff360a5408f3581e70dcca2e31e0b66179e32503d36df5e2ce4903478e06a4c7b5331676aa0 SHA512 9a9d8f8bbb96a75e96d4eb4c649e2c5e6ff3fb713b030559ba465b1267e742e0399b8f142de94d9ce2aacf9cd8403406bac247b29812559172b5b324c87b9e1c -AUX CVE-2019-15681.patch 950 BLAKE2B 5c45bd813ef1329ebec3486fd5464df510d72f52172cd0b6ce9aeebb06685e33500df3f2e335a882067e0aa1b8db4f9307aba04879b91e4b6b04071a50e9551a SHA512 4e9e638b12970ccac3ffd85135cc93a943ec30a9d73797fda4e8403a464e6f63870b28f6f1dfa27d959a5703068cc53287112b1d4d85682edf7161b300951a61 -DIST vino-3.22.0-patchset.tar.xz 158480 BLAKE2B fb8b50abde8cb4728410302c1d3a57bc4d344a33ac0bd9f1265fd24eb142dcd52e870845b902c9b63e98134f87873ebf6abfcfcd1efadb72b0cc72b04f9bf4be SHA512 cf96f5dce96d5c060462698c9d8df6f6d94eb9d624cb689c1262830840ed8f3617485f2274832076c273625e92a89732f9c2ae99dbcbf495e5293cf88408064f -DIST vino-3.22.0.tar.xz 768716 BLAKE2B 5c3f6df059f129009bbc97527d1767bc8a29d8cbff5e6f9e89dabc4583ffdae2cf235eec66cbcb5f9e73c9a0a7c05a504e4e90221bf5adfc2ecbbbd518fdc84a SHA512 29b88e151b0b8c69bce1565ae3ec2e788f48c7645429984329fb2d3daaf03cc5ac100abbf70247bf0516c6d03a3b9aeb78d018c8f1bf35fd241919117fd1105f -EBUILD vino-3.22.0-r3.ebuild 2012 BLAKE2B d6604f807b9e5b5aafe15b68e6b15ff8acf304620996cacb033e4b8b8bd992257c14d408aec763542d73c7f845668709869e95cf05f33ecd55f28ec7d9a652ad SHA512 a02a240c99114b1803fa1829d1a1853e53041ff0eba31ab1898b6136daf4c07b54b9158ceb4cf00829fb95e4beabcf73bd5e8fd9279bbae77838210cbe26792b -MISC metadata.xml 344 BLAKE2B b89a374a41a9da43ae3a6e48ce91e410f44577b0e06b0720abc8fa4f1e152fe4efd035021467aa65e6a5fea355c84ae84c2ffeaea8299845d8c32ce73f2d3986 SHA512 7100cdaccb91d3e29aa9bbbae17d0b2500b82333ace16248f1755f4f4ca8cee9f5ba699152a1f78333dc851ae99cc3fa2e7d92ae5620466eb6123b82438e42f9 diff --git a/net-misc/vino/files/CVE-2014-6053.patch b/net-misc/vino/files/CVE-2014-6053.patch deleted file mode 100644 index 8830c30f870d..000000000000 --- a/net-misc/vino/files/CVE-2014-6053.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b1bfadcbfd88970c6d48672e2dbcca8713c91411 Mon Sep 17 00:00:00 2001 -From: Nicolas Ruff <nruff@google.com> -Date: Mon, 18 Aug 2014 15:16:16 +0200 -Subject: [PATCH 1/3] Check malloc() return value on client->server - ClientCutText message. Client can send up to 2**32-1 bytes of text, and such - a large allocation is likely to fail in case of high memory pressure. This - would in a server crash (write at address 0). - ---- - server/libvncserver/rfbserver.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c -index a880b53..2615dc3 100644 ---- a/server/libvncserver/rfbserver.c -+++ b/server/libvncserver/rfbserver.c -@@ -853,6 +853,11 @@ rfbProcessClientNormalMessage(rfbClientPtr cl) - msg.cct.length = Swap32IfLE(msg.cct.length); - - str = (char *)malloc(msg.cct.length); -+ if (str == NULL) { -+ rfbLogPerror("rfbProcessClientNormalMessage: not enough memory"); -+ rfbCloseClient(cl); -+ return; -+ } - - if ((n = ReadExact(cl, str, msg.cct.length)) <= 0) { - if (n != 0) --- -2.20.1 - diff --git a/net-misc/vino/files/CVE-2018-7225.patch b/net-misc/vino/files/CVE-2018-7225.patch deleted file mode 100644 index 1b1186b4fe78..000000000000 --- a/net-misc/vino/files/CVE-2018-7225.patch +++ /dev/null @@ -1,64 +0,0 @@ -From d8a663541ef358a13fed2fbb39e7d323454369dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> -Date: Mon, 26 Feb 2018 13:48:00 +0100 -Subject: [PATCH 2/3] Limit client cut text length to 1 MB - -This patch constrains a client cut text length to 1 MB. Otherwise -a client could make server allocate 2 GB of memory and that seems to -be to much to classify it as a denial of service. - -The limit also prevents from an integer overflow followed by copying -an uninitilized memory when processing msg.cct.length value larger -than SIZE_MAX or INT_MAX - sz_rfbClientCutTextMsg. - -This patch also corrects accepting length value of zero (malloc(0) is -interpreted on differnet systems differently). - -CVE-2018-7225 -<https://github.com/LibVNC/libvncserver/issues/218> ---- - server/libvncserver/rfbserver.c | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) - -diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c -index 2615dc3..2224edb 100644 ---- a/server/libvncserver/rfbserver.c -+++ b/server/libvncserver/rfbserver.c -@@ -59,6 +59,9 @@ - #define DEBUGPROTO(x) - #endif - -+/* PRIu32 */ -+#include <inttypes.h> -+ - rfbClientPtr pointerClient = NULL; /* Mutex for pointer events */ - - static void rfbProcessClientProtocolVersion(rfbClientPtr cl); -@@ -852,7 +855,23 @@ rfbProcessClientNormalMessage(rfbClientPtr cl) - - msg.cct.length = Swap32IfLE(msg.cct.length); - -- str = (char *)malloc(msg.cct.length); -+ /* uint32_t input is passed to malloc()'s size_t argument, -+ * to rfbReadExact()'s int argument, to rfbStatRecordMessageRcvd()'s int -+ * argument increased of sz_rfbClientCutTextMsg, and to setXCutText()'s int -+ * argument. Here we impose a limit of 1 MB so that the value fits -+ * into all of the types to prevent from misinterpretation and thus -+ * from accessing uninitialized memory (CVE-2018-7225) and also to -+ * prevent from a denial-of-service by allocating to much memory in -+ * the server. */ -+ if (msg.cct.length > 1<<20) { -+ rfbLog("rfbClientCutText: too big cut text length requested: %" PRIu32 "\n", -+ msg.cct.length); -+ rfbCloseClient(cl); -+ return; -+ } -+ -+ /* Allow zero-length client cut text. */ -+ str = (char *)calloc(msg.cct.length ? msg.cct.length : 1, 1); - if (str == NULL) { - rfbLogPerror("rfbProcessClientNormalMessage: not enough memory"); - rfbCloseClient(cl); --- -2.20.1 - diff --git a/net-misc/vino/files/CVE-2019-15681.patch b/net-misc/vino/files/CVE-2019-15681.patch deleted file mode 100644 index 31bb47ee9b27..000000000000 --- a/net-misc/vino/files/CVE-2019-15681.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d9f3fa0ede556c6a751a8ca6c8bc37e769715233 Mon Sep 17 00:00:00 2001 -From: Christian Beier <dontmind@freeshell.org> -Date: Mon, 19 Aug 2019 22:32:25 +0200 -Subject: [PATCH 3/3] rfbserver: don't leak stack memory to the remote - -Thanks go to Pavel Cheremushkin of Kaspersky for reporting. ---- - server/libvncserver/rfbserver.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c -index 2224edb..ca4f59b 100644 ---- a/server/libvncserver/rfbserver.c -+++ b/server/libvncserver/rfbserver.c -@@ -1565,6 +1565,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len) - rfbServerCutTextMsg sct; - rfbClientIteratorPtr iterator; - -+ memset((char *)&sct, 0, sizeof(sct)); -+ - iterator = rfbGetClientIterator(rfbScreen); - while ((cl = rfbClientIteratorNext(iterator)) != NULL) { - /* Client is not authenticated, ignore. See GNOME bug 678434. */ --- -2.20.1 - diff --git a/net-misc/vino/metadata.xml b/net-misc/vino/metadata.xml deleted file mode 100644 index 117499b97b35..000000000000 --- a/net-misc/vino/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="telepathy">Enable desktop sharing through a telepathy client</flag> -</use> -</pkgmetadata> diff --git a/net-misc/vino/vino-3.22.0-r3.ebuild b/net-misc/vino/vino-3.22.0-r3.ebuild deleted file mode 100644 index 2b7a49e24349..000000000000 --- a/net-misc/vino/vino-3.22.0-r3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -inherit gnome2 systemd - -DESCRIPTION="An integrated VNC server for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/Vino" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="crypt debug gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib" -# bug #394611; tight encoding requires zlib encoding -REQUIRED_USE="jpeg? ( zlib )" - -# cairo used in vino-fb -# libSM and libICE used in eggsmclient-xsmp -RDEPEND=" - >=dev-libs/glib-2.26:2 - >=dev-libs/libgcrypt-1.1.90:0= - >=x11-libs/gtk+-3:3 - - x11-libs/cairo:= - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXtst - x11-libs/pango[X] - - >=x11-libs/libnotify-0.7.0:= - - crypt? ( >=dev-libs/libgcrypt-1.1.90:0= ) - gnome-keyring? ( app-crypt/libsecret ) - jpeg? ( virtual/jpeg:0= ) - ssl? ( >=net-libs/gnutls-2.2.0:= ) - telepathy? ( - dev-libs/dbus-glib - >=net-libs/telepathy-glib-0.18 ) - zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) - zlib? ( sys-libs/zlib:= ) -" -DEPEND="${RDEPEND} - app-crypt/libsecret - dev-util/glib-utils - >=dev-util/intltool-0.50 - gnome-base/gnome-common - virtual/pkgconfig -" -# libsecret is always required at build time per bug 322763 -# eautoreconf needs gnome-common - -PATCHES=( - "${WORKDIR}"/patches/ # Patches from master branch at 2020-02-15 state; needs autoreconf - "${FILESDIR}"/CVE-2014-6053.patch - "${FILESDIR}"/CVE-2018-7225.patch - "${FILESDIR}"/CVE-2019-15681.patch -) - -src_configure() { - gnome2_src_configure \ - $(use_enable ipv6) \ - $(use_with crypt gcrypt) \ - $(usex debug --enable-debug=yes ' ') \ - $(use_with gnome-keyring secret) \ - $(use_with jpeg) \ - $(use_with ssl gnutls) \ - $(use_with telepathy) \ - $(use_with zeroconf avahi) \ - $(use_with zlib) \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" -} diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 81436bf35e1a..ecfd00f283dd 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -2,5 +2,5 @@ DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a DIST wget-1.21.3.tar.gz 5079864 BLAKE2B 4ff40a30cb3be82ea492d0eae324a9d43de30a0169d3b219ce25f3d667915f90c7eb1559760d1605340f112e96e028613265e0be73aaba7935c69cc06a4ae4f6 SHA512 29889ecbf590dff0f39183d9e0621741d731a554d990e5c995a4644725dca62e8e19601d40db0ef7d62ebf54e5457c7409965e4832b6e60e4ccbc9c8caa30718 DIST wget-1.21.3.tar.gz.sig 854 BLAKE2B 71f69492397ae9e36284be9acdd1c94da34a7397c14a6de1a867c0d1e807bf961f8a2e098ab5629425691ce595227fb08f046416245fda2a6025929079f2d7c2 SHA512 b9f41496e0083545bc703c97b0758500f337527647cdc422152d7855d05351e3a62685269238c78300eafdbfaed8afecaeb988901a3d8a6b002e9fb3d70efe4f EBUILD wget-1.21.2.ebuild 2873 BLAKE2B b0ca4fa3105c73c9623e788863cd6c46b6da3d4d2f7f158538a7b5468560648d89bfef1900818ddf64343cc8e5d3675b1324835c30964767b51fab2c94e44e90 SHA512 4c2c0e9751fd37ce85be5c9abfa028f0813d17b7d0c902792406e4a94c30590781d00d243e936fd4a107090921d5ec4023c358e712c84aed44bb99d6982936b9 -EBUILD wget-1.21.3.ebuild 3204 BLAKE2B 291ed2df152aaf641b43b1db9b79792f4496a9592b88b9831903479e40277c842fa312a4c6372ee7e4f7c7d596e9ddc9ed09798154ee39a07b94cfb42e463029 SHA512 f8d1c70b1ed103aca64b0fb3e3c9f8370794e16caa8bfe14787623deffb000a4ee71a4bd2dc08a6885ef3bdb321228cdfb52f9eb215b5340382cd7d74bcceff1 +EBUILD wget-1.21.3.ebuild 3211 BLAKE2B d7e79dcb543bb11440a42c7a016f8f0acea77b0df425c31d7361cd89bf16b33a3d4b1ee390764355c820ba681d04f04167e8ae64ea205bd936a4ade4234dd8f2 SHA512 308a901a46b044c3e2b0786a67e1c1bf323e0cda062171511d3971d34887be1fb50f97af8fe6fc7e50e9b78f09e3877b1cfcabb63328bd053b9bd227047e1ecd MISC metadata.xml 740 BLAKE2B 1b36b1f6e8add5fcbbc757974dd8d9f89b4fb62ad1cdde882ec464e2348773e28f923c89259fa56b8d080be1b1975d91c113e4f10553fdd87c3d270bf29c393d SHA512 25e2e34967bd2a04f5aae19849353c798084031888a3aa300a4f9d4ef9029c41a4cc013a842c906dcc2720af155085e047ed99e45a102589f59625bc60042238 diff --git a/net-misc/wget/wget-1.21.3.ebuild b/net-misc/wget/wget-1.21.3.ebuild index 6392db11c418..af2f49b03f74 100644 --- a/net-misc/wget/wget-1.21.3.ebuild +++ b/net-misc/wget/wget-1.21.3.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.sig )" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest index a826852878a5..5a9f0ba59f9a 100644 --- a/net-misc/whois/Manifest +++ b/net-misc/whois/Manifest @@ -1,13 +1,9 @@ AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305 -DIST whois-5.5.10.tar.gz 102555 BLAKE2B 9f1236ceeaea839e5f2a33aa63b39fa7e0566eeb4d2131b88b47dd62f037639a5860719a645d9cc2d0707faa1e86c9822634dda37e1a7a8d3b31a78cf34ecce2 SHA512 5ee92c15146353e77dddcbeddb6e704e0c42d29b8c0ff899ecce80f8e39903e8c796daec7f3de3f197d382f88e7cd4abd470463ea6c13a01347d0cd15d99af28 DIST whois-5.5.11.tar.gz 102806 BLAKE2B be1a5f04ee5af4987224151116d1d7e37ad580b8cc00c3fd4752e10b2cbc1dc46a528591cf75e95a83a99884c961f20865802246e00508c90e338590e7e0be37 SHA512 a7e400a727dd88b4c8f1df2e850879ece882b9af1d5daaff22bb3e1c88be01b4e5430f74f9d4afd4c73538d87022536e40d5f3f63a501a95845396fe0be595b4 -DIST whois-5.5.12.tar.gz 103268 BLAKE2B f9e132a0de189ede87342383f4b869529efe4d99ffdb12450ab909f4df135dbab40319b16d889533803783ed7de4a518ff81d267d0939b3040bf2e25bff8b711 SHA512 f46065d6df0dc6f7d33996e33f456cef9b313e025515916e0476c36255df2919e49f2dcb7666b179393a4429572ac7e099c2783d72cff73222953ac093484786 DIST whois_5.5.13.tar.xz 87384 BLAKE2B 6ce90ad907c4ea79301adbcda5a402344df9f283ac258a3186f5c405e0abfb97f603f3f163652f1cf03a1fc60290b8f9f54b509bf7d9fd3cec12189eeeaaffe5 SHA512 b4a70cc6d58133287d70775ecd8173c255f800362639a3e2dea0d3d56c35405b7fc93c4c220cc50cbd15ae5ae402a59bd15f99e98a7cccb314f82a205aa7ee61 -EBUILD whois-5.5.10-r1.ebuild 1941 BLAKE2B e187093a1335885c467d0bed56fa1c0f15d37ef25a9047e6fd6a0ca0550dd7bbe7b792b9d1c7bd3c23b572ae83c7df7749a1b7c02465f845530cb150c800165f SHA512 3ea777e829c31260d1951dd9e3efeff28e33df092600e3f7f5d96a1f4f9cb7154671e6dd9283cc97a7efb7fc2d9174ae7e7f0dfc75afe66a142fabf5de803bd2 EBUILD whois-5.5.11.ebuild 1941 BLAKE2B 22a19b0e416e2629a0970df690d373d6e0dc5892cdb672d159480c038c50b8b3ed5044e90a1620235feb39d5d20f697388803136c13182627848167d9054f143 SHA512 4f4bc41ac5754e630b3192f3550530e2656000c5d25e9665a8dc1e2dd3adfb3674139339ee2ca3586cdd3e2f70910c795b2aab0d7f63623d0337b40e90dc0b68 -EBUILD whois-5.5.12.ebuild 1923 BLAKE2B 8aebbfb7d3bcd670355bc436292d7ec57fa1e17a72cd676924e46195066d0f2050c543fc7e2ead58fa539c33d4a1bbfc51188a36fc22f37a25a3efda0f6be98a SHA512 d6a9c8493f00233a829bac737ecfcd0893684349bc86fc62ed191ff0ec5d053e1323db9047cb1bac0e555da5610acbfe8d52582e86ba79b8a00440f75eda3acc EBUILD whois-5.5.13.ebuild 1946 BLAKE2B 0a8fa5aac6e378e825bc844c678adfba99ad6be0e7d6d37506012cf9ed72f5bd878f836330a18cbb16deb09c1929aa61c0c944ec91d27d653f2e4a85a1dc5822 SHA512 0497b1f0bbd7b8f41e3daa7cc4effbc9b0e1026ce818177a285fbd6d605953d81dd12585d9ac83365c622020dca088a9f98e3d42032bd527bb8e37a07b1713f9 EBUILD whois-9999.ebuild 1955 BLAKE2B f1dc35b6b4907d25dc09adc21331b7b7af947f19de70541d477cd88fd59fa650145dce37748cb4c03baa3c69835e7c7f29e7cbbd7b5f1132c83038a535b3f70d SHA512 8e51c9fd5d12a919e77ce82c1a3f477976ca250dae9c6bd7cb32dcd940e9506c77da1342a3f3fbee25419de356de612b1f62cc8ace2f77c645286b253ebc3524 MISC metadata.xml 439 BLAKE2B 609f61e31ef22ab28f06d9f0b6542a0efbcb8a006b05f14ff6339a332bb3f04996d13c9a62b55765ce4611df0e9efe021b6f5b5060b13d00d72eae71eb9f9e3e SHA512 05bf067e25586b2032b137dae008a4c59aed9e633f37b545d6ccdca6dc3d69d8614d8ad26c34e87d956b93d24b7962c3fe908070dcfd6826c8fe916b51f29d2f diff --git a/net-misc/whois/whois-5.5.10-r1.ebuild b/net-misc/whois/whois-5.5.10-r1.ebuild deleted file mode 100644 index 633807559d48..000000000000 --- a/net-misc/whois/whois-5.5.10-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_P="${P/-/_}" -DESCRIPTION="improved Whois Client" -HOMEPAGE="https://github.com/rfc1036/whois" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/rfc1036/whois.git" -else - #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" - SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi -LICENSE="GPL-2" -SLOT="0" -IUSE="iconv idn nls xcrypt" -RESTRICT="test" #59327 - -RDEPEND=" - iconv? ( virtual/libiconv ) - idn? ( net-dns/libidn2:= ) - nls? ( virtual/libintl ) - xcrypt? ( >=sys-libs/libxcrypt-4.1:= ) - !xcrypt? ( virtual/libcrypt:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - >=dev-lang/perl-5 - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.7.2-config-file.patch - "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch - "${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch -) - -src_prepare() { - default - if use nls ; then - sed -i -e 's:#\(.*pos\):\1:' Makefile || die - else - sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die - - # don't generate po files when nls is disabled (bug #419889) - sed -i -e '/^all:/s/ pos//' \ - -e '/^install:/s/ install-pos//' Makefile || die - fi -} - -src_configure() { :; } # expected no-op - -src_compile() { - unset HAVE_ICONV HAVE_LIBIDN - use iconv && export HAVE_ICONV=1 - use idn && export HAVE_LIBIDN=1 - use xcrypt && export HAVE_XCRYPT=1 - tc-export CC - emake CFLAGS="${CFLAGS} ${CPPFLAGS}" -} - -src_install() { - emake BASEDIR="${ED}" prefix=/usr install - insinto /etc - doins whois.conf - dodoc README debian/changelog - - if [[ ${USERLAND} != "GNU" ]]; then - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die - mv "${ED}"/usr/bin/{whois,mdwhois} || die - fi -} diff --git a/net-misc/whois/whois-5.5.12.ebuild b/net-misc/whois/whois-5.5.12.ebuild deleted file mode 100644 index e1d0e7edf616..000000000000 --- a/net-misc/whois/whois-5.5.12.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_P=${P/-/_} -DESCRIPTION="Improved Whois Client" -HOMEPAGE="https://github.com/rfc1036/whois" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/rfc1036/whois.git" -else - #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" - SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="iconv idn nls xcrypt" - -RDEPEND="iconv? ( virtual/libiconv ) - idn? ( net-dns/libidn2:= ) - nls? ( virtual/libintl ) - xcrypt? ( >=sys-libs/libxcrypt-4.1:= ) - !xcrypt? ( virtual/libcrypt:= )" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/xz-utils - >=dev-lang/perl-5 - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.7.2-config-file.patch - "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch - "${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch -) - -src_prepare() { - default - - if use nls ; then - sed -i -e 's:#\(.*pos\):\1:' Makefile || die - else - sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die - - # don't generate po files when nls is disabled (bug #419889) - sed -i -e '/^all:/s/ pos//' \ - -e '/^install:/s/ install-pos//' Makefile || die - fi -} - -src_configure() { :; } # expected no-op - -src_compile() { - unset HAVE_ICONV HAVE_LIBIDN - - use iconv && export HAVE_ICONV=1 - use idn && export HAVE_LIBIDN=1 - use xcrypt && export HAVE_XCRYPT=1 - - tc-export CC - - emake CFLAGS="${CFLAGS} ${CPPFLAGS}" -} - -src_install() { - emake BASEDIR="${ED}" prefix=/usr install - - insinto /etc - doins whois.conf - dodoc README debian/changelog - - if ! use userland_GNU ; then - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die - mv "${ED}"/usr/bin/{whois,mdwhois} || die - fi -} diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest index 3010e481c22f..3eb84cdd4663 100644 --- a/net-misc/you-get/Manifest +++ b/net-misc/you-get/Manifest @@ -1,3 +1,5 @@ DIST you-get-0.4.1555.tar.gz 165932 BLAKE2B 3342441f653703899396cd7a5255bd4498125b332566a149f4528cdab9981caefbf79f12171f031efea93e4b6859ab0cb7c72a0e28b6fd89308fd7747f0f8668 SHA512 8c5a485334c813ec31bf3e72f7df322503cca900272d9c13f6f10f19576bf0b77fcf595d4a5d97a56c8f69b91ccd5a54c2a44a0ac46cc24ec59bf9af196bf8f0 +DIST you-get-0.4.1602.tar.gz 151182 BLAKE2B 343465ac823f92a862ac16e85e9a01918d41d1a68a4a0469e44cc202f82352dac31a42b97699627f29cb656475e75abe3b59a53f6a3cc3d1e304fe33dac302db SHA512 8ca41e0d5499d8150bf782e7fd93ab7baf86ba40599ca120e9afa51b8f2696526cdab9f5b29b7c173fd9830c9cfbf8463d8840ad13cbaa4b34729e1809415760 EBUILD you-get-0.4.1555.ebuild 496 BLAKE2B 1641f39759fcdfe9703a6cf20d245d7f93d0fd8503277eaa3a5572b6876e352a35f451b5212ab1e08accbd4ce8e4a0c12a151389c3f56899f77f3fc0c982060b SHA512 4b2891207ae7b7a335524bc9b0f018fd2d22f620e8e87a41bdd46ccb4cc61476f2edcb126ee82b2f29ded31436c15da467443c22802aa739cda78f24b7dd5aa2 +EBUILD you-get-0.4.1602.ebuild 508 BLAKE2B bb93ae7b89bee351bf12bbcd4fd370ca18cf5bbd2e876e395c723eb1c2fad69938ead39ee587226215a8d7d6ebfed32b07541877fc7db04e7d1857889baa7477 SHA512 b6ae6982a4f200cc1bd7b02790f38c20301e9cdef70d147f7b1deec1ffbf8814f88a421225f78797631e3b5ea5360ddcf3895c43d4b98bf6714632701378649d MISC metadata.xml 356 BLAKE2B 318d22fcafcc9dc37f3487eaf71e6090352e7cabc9e8e46631777c63e6767a95eac7dd3d40958501e474b55fa50b61d4203ed1136911b73a7fc67a8ace78aae5 SHA512 da3bc209c98f0165f249f083ddb172d47d5bff2e15b836f9bccbb2083c7b7ad90fde4c355fa981d66f75676b4f7efc37ca7120df9e91b33a6c13a9d5a018d89b diff --git a/net-misc/you-get/you-get-0.4.1602.ebuild b/net-misc/you-get/you-get-0.4.1602.ebuild new file mode 100644 index 000000000000..224c8b53367e --- /dev/null +++ b/net-misc/you-get/you-get-0.4.1602.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit distutils-r1 + +DESCRIPTION="Utility to download media contents from the web" +HOMEPAGE="https://you-get.org" +SRC_URI="https://github.com/soimort/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RESTRICT="test" +PROPERTIES="test_network" + +RDEPEND=" + media-video/ffmpeg +" + +distutils_enable_tests unittest diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest index a06f30e681cb..5eed014b903c 100644 --- a/net-misc/yt-dlp/Manifest +++ b/net-misc/yt-dlp/Manifest @@ -1,5 +1,3 @@ -DIST yt-dlp-2022.3.8.2.tar.gz 2454754 BLAKE2B f07c1eb8d0e1f936298d6516e518f366558107ba9ae65f7c0b52bdcd185b27e501d0d0ffb20e923a94ce5f42c88ae335069876946c411232b9dfc1309ae796ca SHA512 bd6c105f65415e2229781bb1e859167686a5f5f6886e98f9693acc127d4f9124aa2d55f32835f82509f6ab5a82601a5d612ac608063ef9041769fa91e3539c44 DIST yt-dlp-2022.4.8.tar.gz 2257195 BLAKE2B 1d83ef14900789d0af0fc80bafcd6d80ca3162ede818d74382598161014c1a4c4450c0cdf57cdc79f3c5e2970a46004619eeffa9dfdb0d7af128bbe2a023ebf8 SHA512 b2d865682ba44dbd168cd76089105fc1d7ff2d79ba884c9626b3a4009c05f07eccaed2b8801318e89e3e197affc70aad68c1813590eef2a5148ded9c037bf0ce -EBUILD yt-dlp-2022.3.8.2.ebuild 1877 BLAKE2B b682b846467304818b83ebadee7a23701f1802a70f2e8e7a3e656dda920c2544e60fbf5b99563bc1011fda1d63c52cc311c9471d35ad5231da822c5fc4e0bc52 SHA512 27e1676e2d53594e8441570bfe0eaaf2faed67c73a430a959da43cf42e39971f592bcdd3d7d09101993511246f02c06424c547fb9b4423444f9a4ccf75d120c5 EBUILD yt-dlp-2022.4.8.ebuild 1885 BLAKE2B f3f160e116976414a446feaa719a6da7bc4a046044a0e7731776322b27a1b2f999c498ff03fde4ae275fae29af08147abad25b93845700bbf63d5543ed46fc68 SHA512 805bda576fb2a811bb92820bafda501b02e2365bafdd9454957cfb0757547a769869475adb39eab666d2168ffe4151c9ad99bfb9e9539201c4dd8151d7969239 MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734 diff --git a/net-misc/yt-dlp/yt-dlp-2022.3.8.2.ebuild b/net-misc/yt-dlp/yt-dlp-2022.3.8.2.ebuild deleted file mode 100644 index 15fd9ad97135..000000000000 --- a/net-misc/yt-dlp/yt-dlp-2022.3.8.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 distutils-r1 optfeature - -DESCRIPTION="youtube-dl fork with additional features and fixes" -HOMEPAGE="https://github.com/yt-dlp/yt-dlp" -SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos" - -RDEPEND=" - dev-python/pycryptodome[${PYTHON_USEDEP}] - !net-misc/youtube-dl[-yt-dlp(-)]" - -distutils_enable_tests pytest - -python_prepare_all() { - distutils-r1_python_prepare_all - - # adjust requires for pycryptodome and optional dependencies (bug #828466) - sed -ri requirements.txt \ - -e "s/^(pycryptodome)x/\1/" \ - -e "/^(brotli.*|mutagen|websockets)/d" || die -} - -python_test() { - epytest -m 'not download' -p no:markdown -} - -python_install_all() { - dodoc README.md Changelog.md supportedsites.md - doman yt-dlp.1 - - dobashcomp completions/bash/yt-dlp - - insinto /usr/share/fish/vendor_completions.d - doins completions/fish/yt-dlp.fish - - insinto /usr/share/zsh/site-functions - doins completions/zsh/_yt-dlp - - rm -r "${ED}"/usr/share/doc/yt_dlp || die - - newbin - youtube-dl <<-EOF - #!/usr/bin/env sh - exec yt-dlp --compat-options youtube-dl "\${@}" - EOF -} - -pkg_postinst() { - optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg - has_version media-video/atomicparsley || # allow fallback but don't advertise - optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen - - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed' - elog 'as "youtube-dl". This is strictly for compatibility and it is' - elog 'recommended to use "yt-dlp" directly, it may be removed in the future.' - fi -} diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest index b83d1dc7c7cb..010e614609f4 100644 --- a/net-misc/ytfzf/Manifest +++ b/net-misc/ytfzf/Manifest @@ -1,5 +1,3 @@ -DIST ytfzf-2.2.tar.gz 3242266 BLAKE2B 7bc6317ea2ee67ca1d93acc5262d5ebc7f6c9828531f1b97d1fd8e4cfb9e9328cf9955da993d59dcfe05a1a983106cf98f3c93ab4b2c007458154f860e333b55 SHA512 9f47da0e56d096d248b14387c3e34f11cc101fa958945e17bdee83d81c2da57faf384fe87d46132e4cc78a5f4f6057462e28c1a64ea647a98120c37ed4e7f50d DIST ytfzf-2.3.tar.gz 3249215 BLAKE2B 963442379ea324aa6f7b4077df417815ec1e1822d1598029efd397e2a29996ae92aa2f18e67ec6f7fea16a5804d3a7875cec625be1f5f49eb35c85dc84f3a894 SHA512 a282f578459ec53e725d1089a5b5efb78dcc66684ce572d0318f6bfd6e222b706418c77eeeca34d4015ed2bae1cb54de10edaab36522d6012c2ac421796ef34b -EBUILD ytfzf-2.2.ebuild 1564 BLAKE2B dd76cdd455ad3afa7470a824bff1eb04c7808dd1ec8a75cb91077eea0c6116490300998881e74a3f66c8c5c3a32b8606bfe5f98b4266df54fc66c72e7a26d7f9 SHA512 c538fe597e9d9c1261333ee1c6c840ea4816abcdfc634a5c153281a106a3ac633142979891e9b48adba4b94e1e1b286025f072390dc712ee9fdc69d06eeeabce EBUILD ytfzf-2.3.ebuild 1497 BLAKE2B 168bd27352e08dcd0315da0067132a4ff73b852a4f464786a2e21fe10631d6a74769ecb267f346e96c73c7b0ff81580f4d1f010cec88ef068a86e64761e31121 SHA512 fdeac28e638efb39676f03f7087d533490e1d5104c53891be7c86ffbaab3fea779b075c6c0f649b620e05c71ac71c268d41cce5bd6379fa16ff0fe1f5ce4da47 MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884 diff --git a/net-misc/ytfzf/ytfzf-2.2.ebuild b/net-misc/ytfzf/ytfzf-2.2.ebuild deleted file mode 100644 index 1a6d408ced73..000000000000 --- a/net-misc/ytfzf/ytfzf-2.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit optfeature - -DESCRIPTION="Posix script to find and watch youtube videos from the terminal" -HOMEPAGE="https://github.com/pystardust/ytfzf/" -SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="minimal" - -# fzf/mpv/yt-dlp "can" be optfeatures depending on configuration, but depend -# on them so it works as expected out-of-the-box while allowing to disable. -RDEPEND=" - app-misc/jq - net-misc/curl[ssl] - virtual/awk - !minimal? ( - app-shells/fzf - media-video/mpv[lua] - net-misc/yt-dlp - )" - -src_prepare() { - default - - sed -i "/^: ...YTFZF_SYSTEM_ADDON_DIR/s|/usr/local|${EPREFIX}/usr|" ytfzf || die -} - -src_compile() { :; } - -src_install() { - local emakeargs=( - DESTDIR="${D}" - PREFIX="${EPREFIX}"/usr - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} - ) - - emake "${emakeargs[@]}" addons doc install - einstalldocs - - rm -r "${ED}"/usr/share/licenses || die -} - -pkg_postinst() { - optfeature "external menu support" x11-misc/dmenu - optfeature "in-terminal thumbnails on X11" media-gfx/ueberzug - optfeature "desktop notifications" x11-libs/libnotify - - if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0; then - elog "Note that >=${PN}-2.0 is a major rewrite and is not compatible with" - elog "configuration and some command arguments of older versions, see the" - elog "newly added ${PN}(1) and ${PN}(5) man pages for more information." - fi -} diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest index a260045a7b54..a1f8913279b3 100644 --- a/net-misc/zerotier/Manifest +++ b/net-misc/zerotier/Manifest @@ -1,10 +1,7 @@ AUX zerotier-1.4.6-add-armv7a-support.patch 419 BLAKE2B 8670511fb18c3833d17b601e692e141281d429f47281d12b420e5bf84c61a0312642be00785284739d68c33c353ff76b76b0651b03de4789cf7112c352c39648 SHA512 e2be80e39ee1a6f554b60c481f11e04c60a30bd8b198142aaeb7479365fee3d3e73ed9365f1ad7795c33781bf83693cc51a86ea5e294c63030fb111872dbad3a AUX zerotier-1.4.6-respect-ldflags.patch 455 BLAKE2B 2add558b3770e35d9318965eee27219366af4660935d2ee1261bc7735cbd77405ec8c8677f95ad31e02a0f81a9b9f1984b89ba2aeff3b919a84adfdebf7518bf SHA512 8b00309912e64a33086173f0c14649115bf82d5ceaf838642dc604e6ae1ec49d883c90ad5fcd93c9291fb7491cdd06b4d609ffc80c512425ee7c9988bb67149f -AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad6957af53064ccb53cda7c028cf2348e6999508262e86576fdd5c02feba81af6e1a9a88653bbd7a0e7 SHA512 938dcdf16228ca62a14c18658d746054590104dc50028d5dc4d56dba139dfc894d88d567e918533820df81723d56411cc046050b4b7c0e11e1128bef599fb12a AUX zerotier.init-r1 285 BLAKE2B cb30206b6b2fa00e9b77bee83d0ef61bc864146337e06c6900a6e5bcad95dab87dc88f30a1407f87ecea839b99f5aadd7807719ffaefd7be4137986284d1e43e SHA512 911a90d14bbacb2e5a139d50716850d7286f893769bf0f7fb02a0829293d5fb233ad44255b8ffc5c1d4aee4fbe1361be0f1826732b50de07bd1d418f77651faa AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701 -DIST zerotier-1.6.3.tar.gz 16020606 BLAKE2B d958ac3276b34b0b99dcce7178ca08a7ac398831172103bb26ddb32814f9043103c9cde6e55853a20d090c1b239746c65cd70de3b9e498dc174baaf6ca403a66 SHA512 56052a9cd50f2a754ba8979fec9b7ba6caf54d83582428b1b43d8b54e5caf388adccbb955fcb9c3fd5b3d7ebde7663023ca4a9a3805b877c3063fa72e23cbed0 DIST zerotier-1.6.4.tar.gz 16021448 BLAKE2B b45219c2e54f3e789fb970fc8cd9d26ce6175c9737f02838efd11c07223ca49c10480935319292e609cb24bef46aaf7f5eebc8335e84af642d25e87ea5a8e163 SHA512 b1cd96cdc76cfd7929016382bc4a373a88d468010134cd65efbe32fc23e1cb56e0306f84ae10b3ad6d65e7a3fa6aebe79ec6c019840123f770bbc6fe2152723c -EBUILD zerotier-1.6.3.ebuild 1804 BLAKE2B e5851370c3b941b2dd21c549b2d13722c5a360b7dbfe589f8d7ce2870fdb33cafd7116c0cdf2a547ce4a03854bb901af1bc91012766b8e5175728c41dbf40391 SHA512 a4d3fe66fd5907ad48e950c25cda57ebc01ab0d89f8d1891c0eaa6acfaa6468891f2129538b5fce4090bf8760b589d00f00609536b5e768d0a98faae074f7bd3 EBUILD zerotier-1.6.4.ebuild 1804 BLAKE2B e5851370c3b941b2dd21c549b2d13722c5a360b7dbfe589f8d7ce2870fdb33cafd7116c0cdf2a547ce4a03854bb901af1bc91012766b8e5175728c41dbf40391 SHA512 a4d3fe66fd5907ad48e950c25cda57ebc01ab0d89f8d1891c0eaa6acfaa6468891f2129538b5fce4090bf8760b589d00f00609536b5e768d0a98faae074f7bd3 MISC metadata.xml 420 BLAKE2B c51b54f7c06949c82cb1c1676110dc9221c8cb5638a1ac746a3cccf2bea40189b9c2d5eca2d0770ce60e3a934ba2c2c00930d54dd6855a5f27e8eeb2f7c1f259 SHA512 2318e3bbb8738b7f50f46e80a8186649ab5cfc1645fae790fdaa58bdb987dca6ca3819af0537ad27c437bbc0cf5c34ed265a54b6043a0d26431a1919c8ee8289 diff --git a/net-misc/zerotier/files/zerotier.init b/net-misc/zerotier/files/zerotier.init deleted file mode 100644 index f5f199e17d11..000000000000 --- a/net-misc/zerotier/files/zerotier.init +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run - -ZEROTIERONE_PIDFILE="/var/run/${SVCNAME}.pid" -PN="zerotier-one" -PN_PATH="/usr/sbin/${PN}" - -depend() { - need net -} - -start() { - ebegin "Starting ${PN}" - start-stop-daemon --start \ - --exec "${PN_PATH}" --make-pidfile --pidfile "${ZEROTIERONE_PIDFILE}" --background - eend $? -} - -stop() { - ebegin "Stopping ${PN}" - start-stop-daemon --stop --quiet --pidfile "${ZEROTIERONE_PIDFILE}" - eend $? -} diff --git a/net-misc/zerotier/zerotier-1.6.3.ebuild b/net-misc/zerotier/zerotier-1.6.3.ebuild deleted file mode 100644 index fc017b010fc9..000000000000 --- a/net-misc/zerotier/zerotier-1.6.3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic llvm systemd toolchain-funcs - -HOMEPAGE="https://www.zerotier.com/" -DESCRIPTION="A software-based managed Ethernet switch for planet Earth" -SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="clang cpu_flags_arm_neon" - -S="${WORKDIR}/ZeroTierOne-${PV}" - -RDEPEND=" - dev-libs/json-glib - net-libs/libnatpmp - net-libs/miniupnpc:= - clang? ( >=sys-devel/clang-6:* )" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.6-respect-ldflags.patch" - "${FILESDIR}/${PN}-1.4.6-add-armv7a-support.patch" -) - -DOCS=( README.md AUTHORS.md ) - -LLVM_MAX_SLOT=11 - -llvm_check_deps() { - if use clang ; then - if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then - ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." - return 1 - fi - - if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then - ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." - return 1 - fi - - einfo "Will use LLVM slot ${LLVM_SLOT}!" - fi -} - -pkg_setup() { - if use clang && ! tc-is-clang ; then - export CC=${CHOST}-clang - export CXX=${CHOST}-clang++ - else - tc-export CXX CC - fi - use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1 -} - -src_compile() { - append-ldflags -Wl,-z,noexecstack - emake CXX="${CXX}" STRIP=: one -} - -src_test() { - emake selftest - ./zerotier-selftest || die -} - -src_install() { - default - # remove pre-zipped man pages - rm "${ED}"/usr/share/man/{man1,man8}/* || die - - newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" - systemd_dounit "${FILESDIR}/${PN}".service - doman doc/zerotier-{cli.1,idtool.1,one.8} -} |