diff options
Diffstat (limited to 'net-misc')
128 files changed, 2801 insertions, 2474 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex cfac3dcbb2d8..e48e48fb3c88 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest index 338bc74e51b5..b7dc02f978a0 100644 --- a/net-misc/chrome-remote-desktop/Manifest +++ b/net-misc/chrome-remote-desktop/Manifest @@ -3,4 +3,4 @@ AUX chrome-remote-desktop.conf.d 283 BLAKE2B a0146298fa2e18e16911587de10aa3dd229 AUX chrome-remote-desktop.rc 1183 BLAKE2B d1d56ac91a2ced2c6f13019f9d5c7f1d554c2fbd3f57842d6d0b791f2e90233e4d6e8a49155b634a5e20c0bad212a5bc5f63924b1a83d45db01b1fd69445fa07 SHA512 831391b6fcaeeda476a3064d6fff1fdcebb8037aba124814a81ad4a1336a68973f319a003d1ed0938eea68f5ddad179fe29fb12efa05fd204f7fa9c5fb8dd735 DIST chrome-remote-desktop_118.0.5993.9_amd64.deb 17677480 BLAKE2B 1f29d8a8d90f12515afbea857e5f4b7ec0ca56a3051e14e7f67c38c906d743c74ca274a00342a8a9745effeb0023a7e88615c886dcbdcbe68bbcafe317b8902d SHA512 ffa0fb28cb7842a13df3228b5ca6e83c2e9d3967c5013b3613cefec7f86f56e6df069f33e65c3a979ce15d971906cb4488b90a4dffc4b95cd5d65346b4a08f87 EBUILD chrome-remote-desktop-118.0.5993.9.ebuild 4852 BLAKE2B 274fbb64e75b175009e4f53e48e0099ef58aac45dd0403593eac20606826fb25b8e4939292b33a05864970ccf420577681497f62e10f65d93a9259aaad07ab5e SHA512 a00c349f715feffac0704d9382a86957fad47f15aaddd59fafa5f9bcf0895ea129d4cd730ecf942161385869aa4f0b327cc571a7d5acaf417eca7fad87a16513 -MISC metadata.xml 248 BLAKE2B 2545c58c45b8fd57a236bab059e0bd3da47a3e0d3881d141a9b2dc2e275a2d8f0663d83366b45103b48fd257d62a4a2314a8dd6b79113f8b86c91a90524918c5 SHA512 1397e06cb2ad5941988872f37df6f54100aaa06bfc7ef30ba394f95191ddaa1e9f2180d8eb856eb10f9646d9cbc4a6f020805470633c492519e66e3de788439a +MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/net-misc/chrome-remote-desktop/metadata.xml b/net-misc/chrome-remote-desktop/metadata.xml index 7517f8d97dd7..115e9d64a669 100644 --- a/net-misc/chrome-remote-desktop/metadata.xml +++ b/net-misc/chrome-remote-desktop/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <name>Mike Frysinger</name> - <email>vapier@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index c4c1b3f1dbe8..e556ed925ad8 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -5,6 +5,6 @@ AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea710635608 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da DIST chrony-4.5.tar.gz 620287 BLAKE2B e89665e6ff700805b41f89e9349d280579aebab31a30817512a165da939c8f39dc55ef9a17a50e3d7e298015620667638ab119901a71868a9188093606a95d32 SHA512 58a449e23186da799064b16ab16f799c1673296984b152b43e87c620d86e272c55365e83439d410fc89e4e0ba0befd7d5c625eac78a6665813b7ea75444f71b5 DIST chrony-4.5.tar.gz.asc 833 BLAKE2B 7d680a4f5d86335b067b95cb900761615180701cabae5978d6f924063f7a43748534bb2e4f23cd9cd2e6919ed005014db6d396330fbfb5aa6d5f1c46f3c0c3a0 SHA512 05470e6cc34524fdab494f70cee71d46172b38bdd4acd8173ac79fdec12178239248880db474437690094aae7909002113289ac7f9305130c5e0a1d9364122cb -EBUILD chrony-4.5.ebuild 6814 BLAKE2B 392707d5e5dd672eb18159911ad19645ff132cb25ca6ddd102eb17974e492c6370d87b6994ce40dc0191c74b184feba3ac5fe52dd28fe1fd545320841eb02a77 SHA512 699d6e4a24f6b5f0f7c1bcfdce728c3db694ae17684a91ad45d6360c71257db012d24d12bcd83ae3eb0df09c0cfbc23cbf113074894937cef3730baa2c935f43 -EBUILD chrony-9999.ebuild 6822 BLAKE2B 38c6b067e7f07b2045865b83c5064c9b26b02357d1718a8b1e67cb7cbafafac4b1f7425fb957d439c9793b34af4135c5d7d7fe6875394e06ed4c6f9e2f62df35 SHA512 2a2c83c5520ed3d38e9535898aeb6134a9ecda752c8ba5d7a71bea014403b7af758a35f546fd192b3b09b6d5769e9e1fd2eef1d8be9c6b44d34a966a75732e98 +EBUILD chrony-4.5.ebuild 6911 BLAKE2B ac0bdce5b5f7ea606b23418e1412353c1cf232a5100dc9daa51c9b507be5a875548120159c597ec877e0799fe7a35c9754a6bdfc226777f2d0cf39f1b7a72707 SHA512 a04f65080b8f5a97729f35797eb5a3728cc75d1e46a8863d7ba8efdf2a220dca2b8f87c8ab2c01446e0fb37eb3b854e6b51505f6734c490dde330fefa35957c9 +EBUILD chrony-9999.ebuild 6919 BLAKE2B 3786f90705c40750bc29031b9acbf7592048b151cf91d4495d09a44bf3e9024841655f8ae9d798e128203cd2c7fa98d65811d53d0fa730bd3ca8f2e9ef464bb9 SHA512 5efe4da1d571f3898bff7c1d887849845058fbb24e02d2e1b672d7b5d464145fd7b150b1087e905ff421a600dbc3eab49d9f7b669159d63e5f9daf01ad37157f MISC metadata.xml 2353 BLAKE2B c5a7458f2aabf443f01e670cf1e1a578c6d1095b607df07a6a979610f8446ad8fbbbc2b86ca79f8f06b49cfeba1a31cd05b2748c46e2d283863fd43d0b8e7a3a SHA512 1ec4023f55368e03158535d45239572e6bd160d94c85126d3c7d1ddd02fd5743d65ee9ea2bf2e6fbde5b010483928432b5d5848bed03bcc78e9f6924ee189b42 diff --git a/net-misc/chrony/chrony-4.5.ebuild b/net-misc/chrony/chrony-4.5.ebuild index f6d81c3f64ff..8eb587f88c65 100644 --- a/net-misc/chrony/chrony-4.5.ebuild +++ b/net-misc/chrony/chrony-4.5.ebuild @@ -19,7 +19,7 @@ else SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86" fi fi @@ -81,6 +81,11 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch ) +QA_CONFIG_IMPL_DECL_SKIP=( + # FP, checks with macro afterwards (bug #907877) + recvmmsg +) + src_prepare() { default diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 13628d6f3fc3..75c467aacec7 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -19,7 +19,7 @@ else SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi fi @@ -81,6 +81,11 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch ) +QA_CONFIG_IMPL_DECL_SKIP=( + # FP, checks with macro afterwards (bug #907877) + recvmmsg +) + src_prepare() { default diff --git a/net-misc/connman-gtk/Manifest b/net-misc/connman-gtk/Manifest index d5b611d8348f..3474a939a72f 100644 --- a/net-misc/connman-gtk/Manifest +++ b/net-misc/connman-gtk/Manifest @@ -1,4 +1,5 @@ AUX connman-gtk-1.1.1-gtk_typecasts.patch 290 BLAKE2B d56657aa0eabb6523207f5e7c66298b5c3685b9cd4a8cf91f676c290f9447d04c8a1ba372428f7a32f6da24fc06e38cbd3defdcbc4a04b0c544f7102d0e98355 SHA512 3f08a980cdbbde155ab058867e3473edeac2f8fec49940dc7f34b0d2dc87de128970de3ac9c02ba3295270a4e4b8b8f156340afebda5b7b092e191416f0fe246 DIST connman-gtk-1.1.1.tar.gz 61789 BLAKE2B d04d508b5bb03abe78c9b6734df919b6589cea9e7f38c41059210e62795ce79a17b6ba8b3ab1b0c403a43fa2712893bc0d00b1e5f15d9910ca45108b9e760e12 SHA512 78fd41a37370c76f118e3fb8a707b96fd6bf1234a8832d047302d4b0fa350f87316f6e2e749860b2cdf0ff6e6eb76e4d7d398dc7fc084403ca2f8682d2907553 EBUILD connman-gtk-1.1.1-r1.ebuild 987 BLAKE2B 9d8ae2bb547e3a7c182bcac06a31c5242f80efc1dac4519ec3647821afebed4d61150c51ad06a1f3d92708155e668d7b2e84a9017af76f6696821dc1afbb8c42 SHA512 5f9a78571c0511b4cab543c6af9e64eb87554e4446d9a41ba879ca3d4a85add9793855db137b2e5c476595f9cc791dfcce1e4ca90e7a54a484dd219a9e71d970 -MISC metadata.xml 489 BLAKE2B 319f458eee0b6c76523376e744dc9edb91f8b0372eaf360011e257173dc0059ff08d32f19a24ba50606dd0f8057422c9141688eca6f6829c144c8368f57d88e9 SHA512 d8f183505fc9272a418d01b02cdf6decfe381af425459337610f904cd11f9ce1b9908f5a3684e1d240ca64d29a533fda0e921fd7a6b53350c390c3592a746af4 +EBUILD connman-gtk-1.1.1-r2.ebuild 989 BLAKE2B e9f7fd9f5e79da361a3e481bc3828e64d8fa967466de1d8a6556128f734aef6bf157f2dc1a3bbbcdad11adfd131209deecd9ed60292c04f7db8cb382ef758205 SHA512 95498238132306d6eba7b467641fcc2649802fec64d542b2aedd32d9d093f63b79bb666719dc87ed8b9559e9b2c665e1c197992c900774fbe92a9aa11f44f06b +MISC metadata.xml 411 BLAKE2B de0c8db99b67633368f44da8c385ab0cc930d665f2042b31caa4395c41aefed85bdc452037bb96b10c98913ee817906bc0690d0714553243a5763aebe6d56e38 SHA512 092462662e6262788704b608882f8f0b3e546f587de1fe0a1588c654d5b7dafcc4a55ec76d59a28580453e4afec1f8f4b1db879e2d31c53eee975336f04a2cf1 diff --git a/net-misc/connman-gtk/connman-gtk-1.1.1-r2.ebuild b/net-misc/connman-gtk/connman-gtk-1.1.1-r2.ebuild new file mode 100644 index 000000000000..89e484d62819 --- /dev/null +++ b/net-misc/connman-gtk/connman-gtk-1.1.1-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools gnome2-utils + +DESCRIPTION="GTK GUI for Connman" +HOMEPAGE="https://github.com/jgke/connman-gtk" +SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="openconnect" + +CDEPEND=" + >=dev-libs/glib-2.0:2 + >=x11-libs/gtk+-3.10:3 + openconnect? ( >=net-vpn/openconnect-5.99 ) +" +RDEPEND="${CDEPEND} + net-misc/connman +" +DEPEND="${CDEOEND} + >=dev-util/intltool-0.35.0 + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.1-gtk_typecasts.patch +) + +src_prepare() { + default + sed -i -e '/^Categories/ s/$/;/' connman-gtk.desktop.in || die + eautoreconf +} + +src_configure() { + econf \ + --disable-schemas-compile \ + $(use_with openconnect) +} + +pkg_preinst() { + gnome2_schemas_savelist +} + +pkg_postinst() { + gnome2_schemas_update +} + +pkg_postrm() { + gnome2_schemas_update +} diff --git a/net-misc/connman-gtk/metadata.xml b/net-misc/connman-gtk/metadata.xml index f349009f7349..71feae52b29b 100644 --- a/net-misc/connman-gtk/metadata.xml +++ b/net-misc/connman-gtk/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="openconnect">Support easier authentication to AnyConnect VPNs</flag> </use> diff --git a/net-misc/connman-json-client/Manifest b/net-misc/connman-json-client/Manifest index b9551d316e6a..df1851346eda 100644 --- a/net-misc/connman-json-client/Manifest +++ b/net-misc/connman-json-client/Manifest @@ -1,4 +1,4 @@ AUX cjc-fix-for-json-0.14.patch 1554 BLAKE2B a521777f66e34a425306c03f92096731f8ad93f6001930efabafbc4764ce698110a482063f53dcb0eec34a3ffae871407ef1ff53a6a918a6c809decee9b85cc7 SHA512 6a545259c2ffa4f9c5e628566890264aaf2be908e2a2a3313812777a28e1b57a60f1c8920f88f25a0574fe1a2e101c8dd020b51cb22ae1ebb851cca3b0f3bb50 DIST connman-json-client-1.0_p20150721.tar.gz 55520 BLAKE2B 81f81721563bb8a7c4e604e8a036b162329f1334092f345438c34f787bceb8e548d69e0c206773b880799d1327858275bbbade59d1b84271e4fc05372937ce7a SHA512 77cfbc9f1b57ff5ce73a80f42198bbdb7120db6510f3f33251465ed83d1fac3b2bb41e3959f43cc8d274d37c8da375009a07e9003664482136eed64f5b32c0bc -EBUILD connman-json-client-1.0_p20150721-r2.ebuild 788 BLAKE2B 88ba3ed6a0bc687211090152b38ea4f6a39435fbecc9c6555d77b6b85fffc65590436feb12bb3ff7f57cc501bd89c674040b23a3219bb077102c4070f0294c32 SHA512 1277acea76456709d7863d9e515960d6692b3c88dabb66bb3bab152937a3377bdf4195e5bd23c40f695a8fa2beddec5e28ddad03116bc3b9f7451d6744d397f2 +EBUILD connman-json-client-1.0_p20150721-r3.ebuild 781 BLAKE2B 3e9a30265ed733fcdf86a3a37ad3bbbab44dcb05f6960d9fa10195c1656c0a05efafac84acc5ac5d1a771952d32083b543b88e00094c64e076c30db05c33668e SHA512 2778287b8500aabbef5d7dab81fd9b1459a2ec6c6437a5cd8d11aef45d1113a22f61f05d7cddbb111b3fd133d6162eaac6d6c7e80f66a2f890ddb2f38a838bd3 MISC metadata.xml 337 BLAKE2B e5a3c97f738fc2c201f8f514b10061d8a25c1daf2b8f771c354f12cdad1d0992671ba128f6f9a15c925db3d5ec6c24422a7b0253af534c1842e7e532dc9a01e7 SHA512 02f8d70dde6c20b5d59c44751012c863fb6ee82786e5449f69877110a38fffc344687d11ec214c33113c3cc74d39385166df3bcc2af4cfe69d430a878c16e102 diff --git a/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r2.ebuild b/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r3.ebuild index 2fe35cf86af6..c5fed0b76125 100644 --- a/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r2.ebuild +++ b/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools vcs-snapshot COMMIT="3c34b2ee62d2e188090d20e7ed2fd94bab9c47f2" @@ -10,10 +10,9 @@ DESCRIPTION="An ncurses UI for connman" HOMEPAGE="https://github.com/eurogiciel-oss/connman-json-client" SRC_URI="https://github.com/eurogiciel-oss/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="dev-libs/json-c:0= >=sys-apps/dbus-1.4 diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 9f6608a3637a..a9217585e12a 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -17,7 +17,7 @@ DIST curl-8.7.1.tar.xz.asc 488 BLAKE2B 1c91d116aecc8e98d8ec3aad68b7c96f11151e6c2 EBUILD curl-8.5.0-r3.ebuild 11079 BLAKE2B 6d975ad2d3591ea6de6a248ddd1acb049f0cd5d0a371eb487c6a4d193084a5e684673bd55860ac838a48a4c66d11f778b37a253bd325abba5ab545a65bd1bfb5 SHA512 33b5a05de99819327fac0af5ec94790be3953086b2996cb6628cbfb6be959f64a6b5a8d2015371eacd6945be768e3fe1bae67773b512599d127c298c66858c91 EBUILD curl-8.6.0-r2.ebuild 10882 BLAKE2B 1d706f59390420fae5c19b6615aa6cf07387e0d53ef90d5dcabc9aa75c1435eb89f587f9dda1c9a179b5c71a86897a80008a847145bce2216bcb6a22e1345ad2 SHA512 5f48ab69e84695c8b25675ba5bf32072a74f12e488d30dce653447a65d21f1be0f2a2a34f77608939ed0bd2763e3a86c1ab8b57312f691815b6ce93bf424383d EBUILD curl-8.7.1-r1.ebuild 10869 BLAKE2B 405e8cc4d0c6ec696d7b6fa97330d3ff6cfb6420cc7239cd56df3416066f6309093f6eba23a3cca964b6ca98850b7e9de785c81a2a42a4fafc31e70a1258dfe1 SHA512 c1914cae9f108a386c39bd1def774e77acfeb617da093fd2ad48c1e47cdd75b53cf5dd20bfdd4f4201518b76f76798013d99e3e27c337d7e2f91d619018a1335 -EBUILD curl-8.7.1-r3.ebuild 10954 BLAKE2B 80d0149578ff9c98088c7bc807c490fcafa214036ee98c17d45a76ba8e86dfe00a180c91c3dccb4d5492c45f03737b3021e5481dbfa10683fc643dd5787dc2b7 SHA512 f295ea7679239236db7fcadc71da0a95920bd168a4cc8b117d09fdf5d6df80e0c3f9552c6f40ee2f6ed301a9e02d7f1eb1287f9b0ed5865722e659da3a9c18d6 -EBUILD curl-8.7.1-r4.ebuild 11178 BLAKE2B f0217ed0532b6fca7c0fb3a8dacd6d5fe480f48e6b6ac2dd48d57ba56b84cc5e46cb580bca4f25eeff8c2fd606a19c3def2163fbd53a3a41fb184286cd625913 SHA512 99f842289d178f9daed2d509702655c469c337525344ad13e91318434041415e76c21d2505352f3f9975313df06c1050bfd4c6901aff7a3adc45a0e98b73a6f0 +EBUILD curl-8.7.1-r3.ebuild 10953 BLAKE2B 32daf91983ccd8e8a8aca6f2931a6b40b26a5b81d286fe2c79364e0a2f9945d8420fbd14e3d0e7969663088b0f3508a03041e717933259a21924189cb0c4de9d SHA512 1d688de2070102a91f7768fe44ab869e4fc1d862033d3b38d52d2d36e9bd47ee60f57cd6973ca441aa87e7d8787145c91526ef0c9d2164807a1d4bd9065b654f +EBUILD curl-8.7.1-r4.ebuild 11177 BLAKE2B 0242a484da2b38aa88fcc751a09a72c906855b3b315927662f5b967dde3981b4d2ed4eaca41295605cf4b718b44af0049a297438c1c9c449c208beefd3d7a86a SHA512 f600a58282cc9278dbe5c38099e9d4d068c14a8925f1339a57842e92af54eaf893d01afaf3ab62a260d23d71324849c0e8b0316900f309941dd2e4201751bf90 EBUILD curl-9999.ebuild 10953 BLAKE2B d0c7d0551a1a6ee1f634e821151bc68f017f8e5da22a2f13c4d277c0f7a209876a366ea59629ee7fa3de6f7266d204fa78f99836b3d5be17ce8848e5551e3298 SHA512 486aa5f62626147bff91a511262b57859e65e50de04f51ab3daa06b4bcb560018e7a1a31fab506cdd2b280f241587e33ca59a5156dca7a484c585f6a0848e35b MISC metadata.xml 2090 BLAKE2B 54d366aadfc25650c40081ff10eb150bcb9811a29f802c418afce166c384e2bafc999ff7e69ceeb25a96e952d4875d808e8e89240b437741cd363fab46267a25 SHA512 2103a849b67f9a14a85eb769b870e7272bf8f9c78ca579b4271150be01f26787a884614bff874d50f90be99af4a6ecb136510fca2837463e0bc91611ddbeae40 diff --git a/net-misc/curl/curl-8.7.1-r3.ebuild b/net-misc/curl/curl-8.7.1-r3.ebuild index 9b0fa3517f54..a1df53206714 100644 --- a/net-misc/curl/curl-8.7.1-r3.ebuild +++ b/net-misc/curl/curl-8.7.1-r3.ebuild @@ -17,7 +17,7 @@ else https://curl.se/download/${P}.tar.xz verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) " - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="BSD curl ISC test? ( BSD-4 )" diff --git a/net-misc/curl/curl-8.7.1-r4.ebuild b/net-misc/curl/curl-8.7.1-r4.ebuild index aefd425553b9..3c985b74ec75 100644 --- a/net-misc/curl/curl-8.7.1-r4.ebuild +++ b/net-misc/curl/curl-8.7.1-r4.ebuild @@ -21,7 +21,7 @@ else https://curl.se/download/${P}.tar.xz verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) " - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="BSD curl ISC test? ( BSD-4 )" diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 066d3dfe427a..1d601566be64 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,22 +1,12 @@ -AUX 10.0.5/0001-control-fix-hangup-non-privsep-builds.patch 688 BLAKE2B 16983efd39db7bce4cf0680a37e0b19e6a2983af0add1951d03c1440f42b1885bf4e1639d5c7fc17ce42fe6e26af7d0a5a1e2f6053800fdf6459adf67f78bd5e SHA512 555804f1c0b7e5ad6dd95315a57ed77ef6c162bbeb80e7d7fc9d70c9b71e3b2e619e4ceace3018d5745fe28d49967d71bd346eb69703936237ebb031b23a9384 -AUX 10.0.5/0002-dhcpcd-detach-from-launcher.patch 2431 BLAKE2B d55f402f4820b7d853f6380b2b7bd8e053a61090f4832be525ed05a69e60c2761353b5e42cadcb14056da33cac01bc7df05328d46ec4df11ca2cff8e80895f69 SHA512 9941bb9f8f34a49e904664a3ed0952447ad9accf81db5d5c3290704defd71cbd4d19742c4b92e14ba63accafd06b2947de01b7730ef6ac2e73b92584dda512f4 -AUX 10.0.5/0003-control-abort-control-recv-path-hangup.patch 2592 BLAKE2B 48321916c9bbca4f8db7e54f005626dedb2e54fd78eeb8fd9b0251766feb652b2bfd39c2453c62158f8b7cafbc1343524d63526ff1ba6f5cc0d60204f5fef538 SHA512 6bbdda6979cf16e7471875372dae5f7f13382ff604b3e83d93857787b646f9ed5891d1a8f5462d8055681fec4eb97dae67540f48d3f31a64335c2570eab35dda -AUX 10.0.5/0004-dhcpcd-remove-stdio-callback-detach-daemonize.patch 8772 BLAKE2B ec0c000fe60582dc9d7f2b7d2686dd84eb740d92bd44d1da3af4bca67b0db3f0dd548f4b8a1f3ad5dd4413276267084e7d0da1c181b7fda39dd667e3cd3df2c5 SHA512 e76e37c08a854d4d99bfcbb468aa8b9e83a220812c937e32dca5e6ba66d3aa147bc3f3da25d64b8bafdf1fdbf7fc5c9a46ad336a812e0bac65165bf3435e7471 -AUX 10.0.5/0005-fix-privsep-builds-for-prior.patch 589 BLAKE2B 951aa4e4ad7f441c958a4ebe9341616a5041b99cd68f669a6e4bfab6882de7f55a7fafa9a7c75295e77ef38fd823ba44ee8385bc0920e383b515ac7bc89562da SHA512 275337e99543eadeeb8804e1a8f5ec8ccbef9e922a3a25536c3cd69ca0a60cacdda26bbf8103adab46fafd0e2f6e9a6b75dcbec3b6146823ad611b6c9614914c -AUX 10.0.5/0006-fix-unused-var-warning.patch 1148 BLAKE2B 2f4a800e55aec46d834777649357a0e4137261d0b7ca342d53b08fdfde69ffe7654478978145c6400feb82f9d1a05598319ccb6e5421da94155829512315fcba SHA512 e8a0874f5a216e101a3adb9f56c12b798263a300f13a9b34ff3ce9b6276f43dc50f39d59977f38ea9abcaa24c49753add19add10589fe185f85dde8451820287 AUX dhcpcd-10.0.6-crash.patch 1598 BLAKE2B 149cd9ab0372ba507505d1d30707e18ef69b7db583211e86bd48c2fabcde62003356735813789d4f021bdc1636291b0469601fbd2be33f79f84ba17147968f84 SHA512 dfe49bb7d872ffc27ece3d59635cc5a81975181065ae0c54576195637266b24653832c05146bf2e6c0e9f772faf1920c09f234d40b0bf57c8eabf50d0a9818ae +AUX dhcpcd-10.0.6-fix-lib-check.patch 340 BLAKE2B 6e9f881e64676477b100bb65d4962ac4de360a21e938e79c294cd8f8cb837bbe30cdcfa8ca84b3d9558fcf3d5109ba04704c2e4bb269ba2526deed51fec0bf11 SHA512 66ac97580ae066afb4e46b15161a8331140c010764f7932218ce03112bed4bf52e316f58fbb7919c38052ce6ef2a4c36768103aa01f146161cf94169cb8ccacd AUX dhcpcd-10.0.6-rebinding.patch 1351 BLAKE2B 5bf20cc11f82082b9aed01279c2071d948cb4308e935289b2ff7022cd146b4e600cd35dfe63d08006311769b1816cbadb0fcfe7cecaecec64d25fc1f0ddc450f SHA512 c657af1001ea7dbfcd3a6c502667cda3eb164ee532e2083976ab5a46cdc4ab0a0812fd828f0bb98dd6bf326ecdaa3ef16f4d545580c59c63f8aad0e893651427 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041 -DIST dhcpcd-10.0.3.tar.xz 268872 BLAKE2B c063fbb44b4a6928ffd84c109c1ed8ae0345c81b732fc75ce1c1aebc51c190fa512de9822c1c6865794db126f4ad2aceef97c4da28d6922cca082b1aeedb4760 SHA512 f4437e9aa094ab38f077c455b012f46cc84a39f97a19eae896a0954f24f2064e91407dc7f7be7fae00faf3455a8e50695e94c406f476f88a61b980169a778560 -DIST dhcpcd-10.0.5.tar.xz 269696 BLAKE2B 52435e2afa4fa5563b629af3f69b149b87de75097d20819423429741e8f2d16df136409180c509ff08b28fd060ad74da4d73057556349b8041c716dbeb7dbcc3 SHA512 f8213eee93e83c174ce5d2487364400fe07b39bb0f052d072518e12f7189136704f65e1f4467432b477f195d64eebe6ca167aec160aed1575ea9ef551b43eb43 DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 4afd08cf7377b2262d33bf3f7ac503e081572a7c1ffd53b285842a92d99d88fae44e7e6384134bbe1eb839001f822fa7fb43718c42f9e8e6d11a05ec66fa2fc6 SHA512 403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004 DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee -EBUILD dhcpcd-10.0.3.ebuild 4649 BLAKE2B e00e857c44168096c3530004d32bb62250681d686b17954b46bd6993f32ca963d4369ae79ee9d15afc90c53b9e1d7c3f71b2a819278c44e12b59d1cb08a8affb SHA512 3596770f90d6b49b1c677538cbe1b34b482a886a322050f664d90ec6851b839b3294a57144d8e7c1f93530db3e4120b95d11ded5c568162c6ac0510ec9dcbfdf -EBUILD dhcpcd-10.0.5-r1.ebuild 4684 BLAKE2B a9f60400d1d3be191f47de793f49413d4d24fbeedd8e637d2a3beedfeaed5a123740323ba438319369845ca78b2771fe366e9f4edaa576716262d68064b76d99 SHA512 166a9f1999e7611a3bf39085a2499c9596e33d9cd35d09c1d1a94fbd5cf0770f994814e315ae2417e7469dd91b8a5c13abde2f12b03d77c909491b653fc95b13 -EBUILD dhcpcd-10.0.6-r1.ebuild 4874 BLAKE2B 7d6cf19cd8cd9183a1d373372c3f2cef5338a98ceb95457b69ff1f0165f0f5e33465d3aca203a5e5c44722cd12ccccc6353cc580b5219055230de5091f6eb219 SHA512 af060355f679965ae45bdc378028464735c88374ddda41b8bbcac80ef3231b6dc571d50a4d093aa2be0af4247245987117de01e67a0998f0cacfdb2a9470ec3a EBUILD dhcpcd-10.0.6-r2.ebuild 4914 BLAKE2B 06d46941ff39863b0741e63a5584762a5ea72fcf8ab8f5bc08899e124777c0bd14133d0b8f3916a64d191836cd1f8aa754d21415845977a4351e8e68ca40152d SHA512 f653bbdeb503a6464bfa7fc1469cb41fdaef83f9a9042158c5401d179dca3c8ce61a545c68821f9b0a172f65037672250885d5171dc63669361465d2e7a318a4 -EBUILD dhcpcd-10.0.6.ebuild 4825 BLAKE2B 770a30abb6aa31c7c980f9ae97f53ee6390e9aa2f147c2290daf1e3b0202e7ad9c366fbf389e464b0766e8d1a42ecfc643c0e11ad55490d587f039c0def60f56 SHA512 ea7aaa97d18efecb1abbb2ad4b969138e5b4c0b46b772d1c2b5ecc9a8ae844fd320831b9a7eadd03178daa70324a23e3e6f73a3cb36929364776a5f62ee75939 +EBUILD dhcpcd-10.0.6-r3.ebuild 4990 BLAKE2B 35cdce24f98d29b36ff50fd154c0d8c07362a8eebf36bd43091e7cf8948cf0e1a455e2d4fc0fb7bb0da2d57dd48484eb5611f2c711d106e13e618700713aec04 SHA512 af40c3642abec1333dd46a53094809f2e5b4a6a8013ba76607a6d86fb813ee803ff645bd05dd3fdc226634c2d8ffe37647f18a4544545379f2af83f8d0a13ff3 EBUILD dhcpcd-9.5.1.ebuild 4610 BLAKE2B e74ed2bcac66ce60354b6a1d5fe606b91c87057db2e23dd31fd1035aa5ab05042053c62d04b406c5ff9c1b96a2e196a60a8df699c7755319ca50a58f627e684e SHA512 88976827203f49c28d45cb0dfd65b1f71e881e53c617e3cc131f6886197cfcc50dfaa6d0d1a2e6e678e12f9964aa50f70d102475bcbcc9431e6d5f4c98c5120b -EBUILD dhcpcd-9999.ebuild 4825 BLAKE2B 770a30abb6aa31c7c980f9ae97f53ee6390e9aa2f147c2290daf1e3b0202e7ad9c366fbf389e464b0766e8d1a42ecfc643c0e11ad55490d587f039c0def60f56 SHA512 ea7aaa97d18efecb1abbb2ad4b969138e5b4c0b46b772d1c2b5ecc9a8ae844fd320831b9a7eadd03178daa70324a23e3e6f73a3cb36929364776a5f62ee75939 +EBUILD dhcpcd-9999.ebuild 4906 BLAKE2B 467184746097a6a81fbd96a75379a59871e5f7f12fcc8ec5f0612d12df5ae2c01bcae44c1f9f25095a55ba2b936bec7a37ef471fe65c9f435891cf55c1f9ab36 SHA512 e17ef164b3aa95caec81113ab65b3d2f0d5fab5e20537835b6c70425231ac7fc3e520a0d24b9f6cc94cb4df4449025b9468178789d8d5d5d52aeadb4620e6628 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45 diff --git a/net-misc/dhcpcd/dhcpcd-10.0.3.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.3.ebuild deleted file mode 100644 index f311304756fa..000000000000 --- a/net-misc/dhcpcd/dhcpcd-10.0.3.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" -else - MY_P="${P/_alpha/-alpha}" - MY_P="${MY_P/_beta/-beta}" - MY_P="${MY_P/_rc/-rc}" - SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" - -LICENSE="BSD-2 BSD ISC MIT" -SLOT="0" -IUSE="debug +embedded ipv6 privsep +udev" - -DEPEND="udev? ( virtual/udev )" -RDEPEND=" - ${DEPEND} - privsep? ( - acct-group/dhcpcd - acct-user/dhcpcd - ) -" - -src_configure() { - local myeconfargs=( - --dbdir="${EPREFIX}/var/lib/dhcpcd" - --libexecdir="${EPREFIX}/lib/dhcpcd" - --localstatedir="${EPREFIX}/var" - --prefix="${EPREFIX}" - --with-hook=ntp.conf - $(use_enable debug) - $(use_enable embedded) - $(use_enable ipv6) - $(use_enable privsep) - $(usex elibc_glibc '--with-hook=yp.conf' '') - --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") - $(usex privsep '--privsepuser=dhcpcd' '') - $(usex udev '' '--without-dev --without-udev') - CC="$(tc-getCC)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - keepdir /var/lib/dhcpcd - newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd - systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service -} - -pkg_postinst() { - local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - - local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT}"/etc/dhcpcd.duid - local new_duid="${dbdir}"/duid - if [[ -e "${old_old_duid}" ]] ; then - # Upgrade the duid file to the new format if needed - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" - fi - - # Move the duid to /etc, a more sensible location - if [[ ! -e "${old_duid}" ]] ; then - cp -p "${old_old_duid}" "${new_duid}" - fi - old_files+=( "${old_old_duid}" ) - fi - - # dhcpcd-7 moves the files out of /etc - if [[ -e "${old_duid}" ]] ; then - if [[ ! -e "${new_duid}" ]] ; then - cp -p "${old_duid}" "${new_duid}" - fi - old_files+=( "${old_duid}" ) - fi - local old_secret="${EROOT}"/etc/dhcpcd.secret - local new_secret="${dbdir}"/secret - if [[ -e "${old_secret}" ]] ; then - if [[ ! -e "${new_secret}" ]] ; then - cp -p "${old_secret}" "${new_secret}" - fi - old_files+=( "${old_secret}" ) - fi - - # dhcpcd-7 renames some files in /var/lib/dhcpcd - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic - local new_rdm="${dbdir}"/rdm_monotonic - if [[ -e "${old_rdm}" ]] ; then - if [[ ! -e "${new_rdm}" ]] ; then - cp -p "${old_rdm}" "${new_rdm}" - fi - old_files+=( "${old_rdm}" ) - fi - local lease= - for lease in "${dbdir}"/dhcpcd-*.lease*; do - [[ -f "${lease}" ]] || continue - old_files+=( "${lease}" ) - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") - [[ -e "${dbdir}/${new_lease}" ]] && continue - cp "${lease}" "${dbdir}/${new_lease}" - done - - # Warn about removing stale files - if [[ -n "${old_files[@]}" ]] ; then - elog - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT}/etc to ${dbdir}" - elog "and copied leases in ${dbdir} to new files with the dhcpcd-" - elog "prefix dropped." - elog - elog "You should remove these files if you don't plan on reverting" - elog "to an older version:" - local old_file= - for old_file in ${old_files[@]}; do - elog " ${old_file}" - done - fi - - if [ -z "${REPLACING_VERSIONS}" ]; then - elog - elog "dhcpcd has zeroconf support active by default." - elog "This means it will always obtain an IP address even if no" - elog "DHCP server can be contacted, which will break any existing" - elog "failover support you may have configured in your net configuration." - elog "This behaviour can be controlled with the noipv4ll configuration" - elog "file option or the -L command line switch." - elog "See the dhcpcd and dhcpcd.conf man pages for more details." - - elog - elog "Dhcpcd has duid enabled by default, and this may cause issues" - elog "with some dhcp servers. For more information, see" - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" - fi - - if ! has_version net-dns/bind-tools; then - elog - elog "If you activate the lookup-hostname hook to look up your hostname" - elog "using the dns, you need to install net-dns/bind-tools." - fi -} diff --git a/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild deleted file mode 100644 index 0702947d5bac..000000000000 --- a/net-misc/dhcpcd/dhcpcd-10.0.5-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" -else - MY_P="${P/_alpha/-alpha}" - MY_P="${MY_P/_beta/-beta}" - MY_P="${MY_P/_rc/-rc}" - SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" - -LICENSE="BSD-2 BSD ISC MIT" -SLOT="0" -IUSE="debug +embedded ipv6 privsep +udev" - -DEPEND="udev? ( virtual/udev )" -RDEPEND=" - ${DEPEND} - privsep? ( - acct-group/dhcpcd - acct-user/dhcpcd - ) -" - -PATCHES=( - "${FILESDIR}"/10.0.5 -) - -src_configure() { - local myeconfargs=( - --dbdir="${EPREFIX}/var/lib/dhcpcd" - --libexecdir="${EPREFIX}/lib/dhcpcd" - --localstatedir="${EPREFIX}/var" - --prefix="${EPREFIX}" - --with-hook=ntp.conf - $(use_enable debug) - $(use_enable embedded) - $(use_enable ipv6) - $(use_enable privsep) - $(usex elibc_glibc '--with-hook=yp.conf' '') - --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") - $(usex privsep '--privsepuser=dhcpcd' '') - $(usex udev '' '--without-dev --without-udev') - CC="$(tc-getCC)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - keepdir /var/lib/dhcpcd - newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd - systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service -} - -pkg_postinst() { - local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - - local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT}"/etc/dhcpcd.duid - local new_duid="${dbdir}"/duid - if [[ -e "${old_old_duid}" ]] ; then - # Upgrade the duid file to the new format if needed - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" - fi - - # Move the duid to /etc, a more sensible location - if [[ ! -e "${old_duid}" ]] ; then - cp -p "${old_old_duid}" "${new_duid}" - fi - old_files+=( "${old_old_duid}" ) - fi - - # dhcpcd-7 moves the files out of /etc - if [[ -e "${old_duid}" ]] ; then - if [[ ! -e "${new_duid}" ]] ; then - cp -p "${old_duid}" "${new_duid}" - fi - old_files+=( "${old_duid}" ) - fi - local old_secret="${EROOT}"/etc/dhcpcd.secret - local new_secret="${dbdir}"/secret - if [[ -e "${old_secret}" ]] ; then - if [[ ! -e "${new_secret}" ]] ; then - cp -p "${old_secret}" "${new_secret}" - fi - old_files+=( "${old_secret}" ) - fi - - # dhcpcd-7 renames some files in /var/lib/dhcpcd - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic - local new_rdm="${dbdir}"/rdm_monotonic - if [[ -e "${old_rdm}" ]] ; then - if [[ ! -e "${new_rdm}" ]] ; then - cp -p "${old_rdm}" "${new_rdm}" - fi - old_files+=( "${old_rdm}" ) - fi - local lease= - for lease in "${dbdir}"/dhcpcd-*.lease*; do - [[ -f "${lease}" ]] || continue - old_files+=( "${lease}" ) - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") - [[ -e "${dbdir}/${new_lease}" ]] && continue - cp "${lease}" "${dbdir}/${new_lease}" - done - - # Warn about removing stale files - if [[ -n "${old_files[@]}" ]] ; then - elog - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT}/etc to ${dbdir}" - elog "and copied leases in ${dbdir} to new files with the dhcpcd-" - elog "prefix dropped." - elog - elog "You should remove these files if you don't plan on reverting" - elog "to an older version:" - local old_file= - for old_file in ${old_files[@]}; do - elog " ${old_file}" - done - fi - - if [ -z "${REPLACING_VERSIONS}" ]; then - elog - elog "dhcpcd has zeroconf support active by default." - elog "This means it will always obtain an IP address even if no" - elog "DHCP server can be contacted, which will break any existing" - elog "failover support you may have configured in your net configuration." - elog "This behaviour can be controlled with the noipv4ll configuration" - elog "file option or the -L command line switch." - elog "See the dhcpcd and dhcpcd.conf man pages for more details." - - elog - elog "Dhcpcd has duid enabled by default, and this may cause issues" - elog "with some dhcp servers. For more information, see" - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" - fi - - if ! has_version net-dns/bind-tools; then - elog - elog "If you activate the lookup-hostname hook to look up your hostname" - elog "using the dns, you need to install net-dns/bind-tools." - fi -} diff --git a/net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild deleted file mode 100644 index cd313329537c..000000000000 --- a/net-misc/dhcpcd/dhcpcd-10.0.6-r1.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" -else - MY_P="${P/_alpha/-alpha}" - MY_P="${MY_P/_beta/-beta}" - MY_P="${MY_P/_rc/-rc}" - SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" - -LICENSE="BSD-2 BSD ISC MIT" -SLOT="0" -IUSE="debug +embedded ipv6 privsep +udev" - -DEPEND="udev? ( virtual/udev )" -RDEPEND=" - ${DEPEND} - privsep? ( - acct-group/dhcpcd - acct-user/dhcpcd - ) -" - -QA_CONFIG_IMPL_DECL_SKIP=( - # These don't exist on Linux/glibc (bug #900264) - memset_explicit - memset_s - setproctitle - strtoi - consttime_memequal - SHA256_Init - hmac -) - -PATCHES=( - "${FILESDIR}"/${PN}-10.0.6-rebinding.patch -) - -src_configure() { - local myeconfargs=( - --dbdir="${EPREFIX}/var/lib/dhcpcd" - --libexecdir="${EPREFIX}/lib/dhcpcd" - --localstatedir="${EPREFIX}/var" - --prefix="${EPREFIX}" - --with-hook=ntp.conf - $(use_enable debug) - $(use_enable embedded) - $(use_enable ipv6) - $(use_enable privsep) - $(usex elibc_glibc '--with-hook=yp.conf' '') - --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") - $(usex privsep '--privsepuser=dhcpcd' '') - $(usex udev '' '--without-dev --without-udev') - CC="$(tc-getCC)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - keepdir /var/lib/dhcpcd - newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd - systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service -} - -pkg_postinst() { - local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - - local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT}"/etc/dhcpcd.duid - local new_duid="${dbdir}"/duid - if [[ -e "${old_old_duid}" ]] ; then - # Upgrade the duid file to the new format if needed - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" - fi - - # Move the duid to /etc, a more sensible location - if [[ ! -e "${old_duid}" ]] ; then - cp -p "${old_old_duid}" "${new_duid}" - fi - old_files+=( "${old_old_duid}" ) - fi - - # dhcpcd-7 moves the files out of /etc - if [[ -e "${old_duid}" ]] ; then - if [[ ! -e "${new_duid}" ]] ; then - cp -p "${old_duid}" "${new_duid}" - fi - old_files+=( "${old_duid}" ) - fi - local old_secret="${EROOT}"/etc/dhcpcd.secret - local new_secret="${dbdir}"/secret - if [[ -e "${old_secret}" ]] ; then - if [[ ! -e "${new_secret}" ]] ; then - cp -p "${old_secret}" "${new_secret}" - fi - old_files+=( "${old_secret}" ) - fi - - # dhcpcd-7 renames some files in /var/lib/dhcpcd - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic - local new_rdm="${dbdir}"/rdm_monotonic - if [[ -e "${old_rdm}" ]] ; then - if [[ ! -e "${new_rdm}" ]] ; then - cp -p "${old_rdm}" "${new_rdm}" - fi - old_files+=( "${old_rdm}" ) - fi - local lease= - for lease in "${dbdir}"/dhcpcd-*.lease*; do - [[ -f "${lease}" ]] || continue - old_files+=( "${lease}" ) - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") - [[ -e "${dbdir}/${new_lease}" ]] && continue - cp "${lease}" "${dbdir}/${new_lease}" - done - - # Warn about removing stale files - if [[ -n "${old_files[@]}" ]] ; then - elog - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT}/etc to ${dbdir}" - elog "and copied leases in ${dbdir} to new files with the dhcpcd-" - elog "prefix dropped." - elog - elog "You should remove these files if you don't plan on reverting" - elog "to an older version:" - local old_file= - for old_file in ${old_files[@]}; do - elog " ${old_file}" - done - fi - - if [ -z "${REPLACING_VERSIONS}" ]; then - elog - elog "dhcpcd has zeroconf support active by default." - elog "This means it will always obtain an IP address even if no" - elog "DHCP server can be contacted, which will break any existing" - elog "failover support you may have configured in your net configuration." - elog "This behaviour can be controlled with the noipv4ll configuration" - elog "file option or the -L command line switch." - elog "See the dhcpcd and dhcpcd.conf man pages for more details." - - elog - elog "Dhcpcd has duid enabled by default, and this may cause issues" - elog "with some dhcp servers. For more information, see" - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" - fi - - if ! has_version net-dns/bind-tools; then - elog - elog "If you activate the lookup-hostname hook to look up your hostname" - elog "using the dns, you need to install net-dns/bind-tools." - fi -} diff --git a/net-misc/dhcpcd/dhcpcd-10.0.6.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild index 914373137e7d..3fcb61425cc4 100644 --- a/net-misc/dhcpcd/dhcpcd-10.0.6.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,10 @@ LICENSE="BSD-2 BSD ISC MIT" SLOT="0" IUSE="debug +embedded ipv6 privsep +udev" -DEPEND="udev? ( virtual/udev )" +DEPEND=" + app-crypt/libmd + udev? ( virtual/udev ) +" RDEPEND=" ${DEPEND} privsep? ( @@ -45,6 +48,12 @@ QA_CONFIG_IMPL_DECL_SKIP=( hmac ) +PATCHES=( + "${FILESDIR}"/${PN}-10.0.6-rebinding.patch + "${FILESDIR}"/${PN}-10.0.6-crash.patch + "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch +) + src_configure() { local myeconfargs=( --dbdir="${EPREFIX}/var/lib/dhcpcd" diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild index 914373137e7d..1c3bbc87d456 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,10 @@ LICENSE="BSD-2 BSD ISC MIT" SLOT="0" IUSE="debug +embedded ipv6 privsep +udev" -DEPEND="udev? ( virtual/udev )" +DEPEND=" + app-crypt/libmd + udev? ( virtual/udev ) +" RDEPEND=" ${DEPEND} privsep? ( @@ -45,6 +48,10 @@ QA_CONFIG_IMPL_DECL_SKIP=( hmac ) +PATCHES=( + "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch +) + src_configure() { local myeconfargs=( --dbdir="${EPREFIX}/var/lib/dhcpcd" diff --git a/net-misc/dhcpcd/files/10.0.5/0001-control-fix-hangup-non-privsep-builds.patch b/net-misc/dhcpcd/files/10.0.5/0001-control-fix-hangup-non-privsep-builds.patch deleted file mode 100644 index 632cf402fc94..000000000000 --- a/net-misc/dhcpcd/files/10.0.5/0001-control-fix-hangup-non-privsep-builds.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/issues/262 -https://github.com/NetworkConfiguration/dhcpcd/commit/584b52db330a96471ff9301b85ce47ebb065a8a4 - -From 584b52db330a96471ff9301b85ce47ebb065a8a4 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Sun, 12 Nov 2023 11:30:01 +0000 -Subject: [PATCH] control: Fix hangup for non privsep builds - -Fix related to #262. ---- a/src/control.c -+++ b/src/control.c -@@ -113,8 +113,9 @@ control_handle_read(struct fd_list *fd) - ssize_t bytes; - - bytes = read(fd->fd, buffer, sizeof(buffer) - 1); -- if (bytes == -1) { -+ if (bytes == -1) - logerr(__func__); -+ if (bytes == -1 || bytes == 0) { - control_hangup(fd); - return; - } - diff --git a/net-misc/dhcpcd/files/10.0.5/0002-dhcpcd-detach-from-launcher.patch b/net-misc/dhcpcd/files/10.0.5/0002-dhcpcd-detach-from-launcher.patch deleted file mode 100644 index 44de6a83f843..000000000000 --- a/net-misc/dhcpcd/files/10.0.5/0002-dhcpcd-detach-from-launcher.patch +++ /dev/null @@ -1,69 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/issues/262 -https://github.com/NetworkConfiguration/dhcpcd/commit/21d020b00e60e71b1300d89815f914145d7372f6 - -From 21d020b00e60e71b1300d89815f914145d7372f6 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Sun, 12 Nov 2023 12:16:53 +0000 -Subject: [PATCH] dhcpcd: Detach from launcher before stopping root process - -This fixes non privsep builds where the launcher reports dhcpcd -hungup. Unsure why this happens, but it should not be a problem. - -While here, shutdown has no effect on non STREAM sockets and -remove the silly error logging in fork_cb that we read an -error. We already printed the error so this makes no sense. - -Hopefully fixes #262. ---- a/src/dhcpcd.c -+++ b/src/dhcpcd.c -@@ -395,7 +395,6 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx) - logerr("write"); - ctx->options |= DHCPCD_DAEMONISED; - // dhcpcd_fork_cb will close the socket -- shutdown(ctx->fork_fd, SHUT_RDWR); - #endif - } - -@@ -1877,8 +1876,6 @@ dhcpcd_fork_cb(void *arg, unsigned short events) - if (ctx->options & DHCPCD_FORKED) { - if (exit_code == EXIT_SUCCESS) - logdebugx("forked to background"); -- else -- logerrx("exited with code %d", exit_code); - eloop_exit(ctx->eloop, exit_code); - } else - dhcpcd_signal_cb(exit_code, ctx); -@@ -2738,8 +2735,19 @@ main(int argc, char **argv, char **envp) - if (ps_stopwait(&ctx) != EXIT_SUCCESS) - i = EXIT_FAILURE; - #endif -- if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED)) -+ if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED)) { - loginfox(PACKAGE " exited"); -+#ifdef USE_SIGNALS -+ /* Detach from the launch process. -+ * This *should* happen after we stop the root process, -+ * but for some reason non privsep builds get a zero length -+ * read in dhcpcd_fork_cb(). */ -+ if (ctx.fork_fd != -1) { -+ if (write(ctx.fork_fd, &i, sizeof(i)) == -1) -+ logerr("%s: write", __func__); -+ } -+#endif -+ } - #ifdef PRIVSEP - if (ps_root_stop(&ctx) == -1) - i = EXIT_FAILURE; -@@ -2753,12 +2761,6 @@ main(int argc, char **argv, char **envp) - setproctitle_fini(); - #endif - #ifdef USE_SIGNALS -- if (ctx.options & DHCPCD_STARTED) { -- /* Try to detach from the launch process. */ -- if (ctx.fork_fd != -1 && -- write(ctx.fork_fd, &i, sizeof(i)) == -1) -- logerr("%s: write", __func__); -- } - if (ctx.options & (DHCPCD_FORKED | DHCPCD_PRIVSEP)) - _exit(i); /* so atexit won't remove our pidfile */ - #endif diff --git a/net-misc/dhcpcd/files/10.0.5/0003-control-abort-control-recv-path-hangup.patch b/net-misc/dhcpcd/files/10.0.5/0003-control-abort-control-recv-path-hangup.patch deleted file mode 100644 index de4ee353ccf3..000000000000 --- a/net-misc/dhcpcd/files/10.0.5/0003-control-abort-control-recv-path-hangup.patch +++ /dev/null @@ -1,105 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/issues/262 -https://github.com/NetworkConfiguration/dhcpcd/commit/3b4c71859c45b9405f96a5ee8fce04bd3014b2d0 - -From 3b4c71859c45b9405f96a5ee8fce04bd3014b2d0 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Mon, 13 Nov 2023 10:24:15 +0000 -Subject: [PATCH] control: Abort control recv path on hangup - -This fixes a crash when we try and re-use it in another function. ---- a/src/control.c -+++ b/src/control.c -@@ -106,7 +106,7 @@ control_hangup(struct fd_list *fd) - control_free(fd); - } - --static void -+static int - control_handle_read(struct fd_list *fd) - { - char buffer[1024]; -@@ -117,7 +117,7 @@ control_handle_read(struct fd_list *fd) - logerr(__func__); - if (bytes == -1 || bytes == 0) { - control_hangup(fd); -- return; -+ return -1; - } - - #ifdef PRIVSEP -@@ -129,21 +129,23 @@ control_handle_read(struct fd_list *fd) - fd->flags &= ~FD_SENDLEN; - if (err == -1) { - logerr(__func__); -- return; -+ return 0; - } - if (err == 1 && - ps_ctl_sendargs(fd, buffer, (size_t)bytes) == -1) { - logerr(__func__); - control_free(fd); -+ return -1; - } -- return; -+ return 0; - } - #endif - - control_recvdata(fd, buffer, (size_t)bytes); -+ return 0; - } - --static void -+static int - control_handle_write(struct fd_list *fd) - { - struct iovec iov[2]; -@@ -170,7 +172,7 @@ control_handle_write(struct fd_list *fd) - logerr("%s: write", __func__); - } - control_hangup(fd); -- return; -+ return -1; - } - - TAILQ_REMOVE(&fd->queue, data, next); -@@ -183,7 +185,7 @@ control_handle_write(struct fd_list *fd) - #endif - - if (TAILQ_FIRST(&fd->queue) != NULL) -- return; -+ return 0; - - #ifdef PRIVSEP - if (IN_PRIVSEP_SE(fd->ctx) && !(fd->flags & FD_LISTEN)) { -@@ -196,9 +198,9 @@ control_handle_write(struct fd_list *fd) - if (eloop_event_add(fd->ctx->eloop, fd->fd, ELE_READ, - control_handle_data, fd) == -1) - logerr("%s: eloop_event_add", __func__); -+ return 0; - } - -- - static void - control_handle_data(void *arg, unsigned short events) - { -@@ -207,10 +209,14 @@ control_handle_data(void *arg, unsigned short events) - if (!(events & (ELE_READ | ELE_WRITE | ELE_HANGUP))) - logerrx("%s: unexpected event 0x%04x", __func__, events); - -- if (events & ELE_WRITE && !(events & ELE_HANGUP)) -- control_handle_write(fd); -- if (events & ELE_READ) -- control_handle_read(fd); -+ if (events & ELE_WRITE && !(events & ELE_HANGUP)) { -+ if (control_handle_write(fd) == -1) -+ return; -+ } -+ if (events & ELE_READ) { -+ if (control_handle_read(fd) == -1) -+ return; -+ } - if (events & ELE_HANGUP) - control_hangup(fd); - } - diff --git a/net-misc/dhcpcd/files/10.0.5/0004-dhcpcd-remove-stdio-callback-detach-daemonize.patch b/net-misc/dhcpcd/files/10.0.5/0004-dhcpcd-remove-stdio-callback-detach-daemonize.patch deleted file mode 100644 index 331f60e739a1..000000000000 --- a/net-misc/dhcpcd/files/10.0.5/0004-dhcpcd-remove-stdio-callback-detach-daemonize.patch +++ /dev/null @@ -1,286 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/issues/262 -https://github.com/NetworkConfiguration/dhcpcd/commit/ea53344a2430736124bf9fa62acb0d3107acd58f - -From ea53344a2430736124bf9fa62acb0d3107acd58f Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Mon, 13 Nov 2023 10:29:58 +0000 -Subject: [PATCH] dhcpcd: Remove stdio callback and detach on daemonise - -For some reason, the stdio callback is extremely flaky on -*some* Linux based distributions making it very hard to debug some -things. -Removing it is fine because we now enforce that we have file descriptors -for stdin, stdout and stdrr on launch and dup them to /dev/null on daemonise. - -It's also interesting to see behavioural differences between -some socketpair implementations that emit a HANGUP and some don't. - -As such, we now close the fork socket on daemonise once more AND -in the fork_cb depending on if we hangup or read zero first. - -Fixes #262 ---- a/src/dhcpcd.c -+++ b/src/dhcpcd.c -@@ -364,7 +364,7 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx) - errno = ENOSYS; - return; - #else -- int i; -+ int exit_code; - - if (ctx->options & DHCPCD_DAEMONISE && - !(ctx->options & (DHCPCD_DAEMONISED | DHCPCD_NOWAITIP))) -@@ -385,16 +385,19 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx) - return; - - #ifdef PRIVSEP -- ps_daemonised(ctx); -+ if (IN_PRIVSEP(ctx)) -+ ps_daemonised(ctx); -+ else - #else -- dhcpcd_daemonised(ctx); -+ dhcpcd_daemonised(ctx); - #endif - -- i = EXIT_SUCCESS; -- if (write(ctx->fork_fd, &i, sizeof(i)) == -1) -- logerr("write"); -- ctx->options |= DHCPCD_DAEMONISED; -- // dhcpcd_fork_cb will close the socket -+ eloop_event_delete(ctx->eloop, ctx->fork_fd); -+ exit_code = EXIT_SUCCESS; -+ if (write(ctx->fork_fd, &exit_code, sizeof(exit_code)) == -1) -+ logerr(__func__); -+ close(ctx->fork_fd); -+ ctx->fork_fd = -1; - #endif - } - -@@ -1814,30 +1817,6 @@ dhcpcd_readdump(struct dhcpcd_ctx *ctx) - dhcpcd_readdump0, ctx); - } - --static void --dhcpcd_stderr_cb(void *arg, unsigned short events) --{ -- struct dhcpcd_ctx *ctx = arg; -- char log[BUFSIZ]; -- ssize_t len; -- -- if (events & ELE_HANGUP) -- eloop_exit(ctx->eloop, EXIT_SUCCESS); -- -- if (!(events & ELE_READ)) -- return; -- -- len = read(ctx->stderr_fd, log, sizeof(log) - 1); -- if (len == -1) { -- if (errno != ECONNRESET) -- logerr(__func__); -- return; -- } -- -- log[len] = '\0'; -- fprintf(stderr, "%s", log); --} -- - static void - dhcpcd_fork_cb(void *arg, unsigned short events) - { -@@ -1928,7 +1907,7 @@ main(int argc, char **argv, char **envp) - ssize_t len; - #if defined(USE_SIGNALS) || !defined(THERE_IS_NO_FORK) - pid_t pid; -- int fork_fd[2], stderr_fd[2]; -+ int fork_fd[2]; - #endif - #ifdef USE_SIGNALS - int sig = 0; -@@ -2013,22 +1992,17 @@ main(int argc, char **argv, char **envp) - TAILQ_INIT(&ctx.ps_processes); - #endif - -- /* Check our streams for validity */ -- ctx.stdin_valid = fcntl(STDIN_FILENO, F_GETFD) != -1; -- ctx.stdout_valid = fcntl(STDOUT_FILENO, F_GETFD) != -1; -- ctx.stderr_valid = fcntl(STDERR_FILENO, F_GETFD) != -1; -+ logopts = LOGERR_LOG | LOGERR_LOG_DATE | LOGERR_LOG_PID; - -- /* Even we if we don't have input/outputs, we need to -- * ensure they are setup for shells. */ -- if (!ctx.stdin_valid) -+ /* Ensure we have stdin, stdout and stderr file descriptors. -+ * This is important as we do run scripts which expect these. */ -+ if (fcntl(STDIN_FILENO, F_GETFD) == -1) - dup_null(STDIN_FILENO); -- if (!ctx.stdout_valid) -+ if (fcntl(STDOUT_FILENO, F_GETFD) == -1) - dup_null(STDOUT_FILENO); -- if (!ctx.stderr_valid) -+ if (fcntl(STDERR_FILENO, F_GETFD) == -1) - dup_null(STDERR_FILENO); -- -- logopts = LOGERR_LOG | LOGERR_LOG_DATE | LOGERR_LOG_PID; -- if (ctx.stderr_valid) -+ else - logopts |= LOGERR_ERR; - - i = 0; -@@ -2398,17 +2372,13 @@ main(int argc, char **argv, char **envp) - loginfox(PACKAGE "-" VERSION " starting"); - - // We don't need stdin past this point -- if (ctx.stdin_valid) -- dup_null(STDIN_FILENO); -+ dup_null(STDIN_FILENO); - - #if defined(USE_SIGNALS) && !defined(THERE_IS_NO_FORK) - if (!(ctx.options & DHCPCD_DAEMONISE)) - goto start_manager; - -- if (xsocketpair(AF_UNIX, SOCK_SEQPACKET|SOCK_CXNB, 0, fork_fd) == -1 || -- (ctx.stderr_valid && -- xsocketpair(AF_UNIX, SOCK_SEQPACKET|SOCK_CXNB, 0, stderr_fd) == -1)) -- { -+ if (xsocketpair(AF_UNIX, SOCK_SEQPACKET|SOCK_CXNB, 0, fork_fd) == -1) { - logerr("socketpair"); - goto exit_failure; - } -@@ -2429,22 +2399,6 @@ main(int argc, char **argv, char **envp) - dhcpcd_fork_cb, &ctx) == -1) - logerr("%s: eloop_event_add", __func__); - -- /* -- * Redirect stderr to the stderr socketpair. -- * Redirect stdout as well. -- * dhcpcd doesn't output via stdout, but something in -- * a called script might. -- */ -- if (ctx.stderr_valid) { -- if (dup2(stderr_fd[1], STDERR_FILENO) == -1 || -- (ctx.stdout_valid && -- dup2(stderr_fd[1], STDOUT_FILENO) == -1)) -- logerr("dup2"); -- close(stderr_fd[0]); -- close(stderr_fd[1]); -- } else if (ctx.stdout_valid) -- dup_null(STDOUT_FILENO); -- - if (setsid() == -1) { - logerr("%s: setsid", __func__); - goto exit_failure; -@@ -2478,19 +2432,6 @@ main(int argc, char **argv, char **envp) - dhcpcd_fork_cb, &ctx) == -1) - logerr("%s: eloop_event_add", __func__); - -- if (ctx.stderr_valid) { -- ctx.stderr_fd = stderr_fd[0]; -- close(stderr_fd[1]); --#ifdef PRIVSEP_RIGHTS -- if (ps_rights_limit_fd(ctx.stderr_fd) == 1) { -- logerr("ps_rights_limit_fd"); -- goto exit_failure; -- } --#endif -- if (eloop_event_add(ctx.eloop, ctx.stderr_fd, ELE_READ, -- dhcpcd_stderr_cb, &ctx) == -1) -- logerr("%s: eloop_event_add", __func__); -- } - #ifdef PRIVSEP - if (IN_PRIVSEP(&ctx) && ps_managersandbox(&ctx, NULL) == -1) - goto exit_failure; -@@ -2602,6 +2543,7 @@ main(int argc, char **argv, char **envp) - if (ifp->active == IF_ACTIVE_USER) - break; - } -+ - if (ifp == NULL) { - if (ctx.ifc == 0) { - int loglevel; -@@ -2735,24 +2677,22 @@ main(int argc, char **argv, char **envp) - if (ps_stopwait(&ctx) != EXIT_SUCCESS) - i = EXIT_FAILURE; - #endif -- if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED)) { -+ if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED)) - loginfox(PACKAGE " exited"); --#ifdef USE_SIGNALS -- /* Detach from the launch process. -- * This *should* happen after we stop the root process, -- * but for some reason non privsep builds get a zero length -- * read in dhcpcd_fork_cb(). */ -- if (ctx.fork_fd != -1) { -- if (write(ctx.fork_fd, &i, sizeof(i)) == -1) -- logerr("%s: write", __func__); -- } --#endif -- } - #ifdef PRIVSEP - if (ps_root_stop(&ctx) == -1) - i = EXIT_FAILURE; - eloop_free(ctx.ps_eloop); - #endif -+ -+#ifdef USE_SIGNALS -+ /* If still attached, detach from the launcher */ -+ if (ctx.options & DHCPCD_STARTED && ctx.fork_fd != -1) { -+ if (write(ctx.fork_fd, &i, sizeof(i)) == -1) -+ logerr("%s: write", __func__); -+ } -+#endif -+ - eloop_free(ctx.eloop); - logclose(); - free(ctx.logfile); -@@ -2760,6 +2700,7 @@ main(int argc, char **argv, char **envp) - #ifdef SETPROCTITLE_H - setproctitle_fini(); - #endif -+ - #ifdef USE_SIGNALS - if (ctx.options & (DHCPCD_FORKED | DHCPCD_PRIVSEP)) - _exit(i); /* so atexit won't remove our pidfile */ ---- a/src/dhcpcd.h -+++ b/src/dhcpcd.h -@@ -116,10 +116,6 @@ struct passwd; - struct dhcpcd_ctx { - char pidfile[sizeof(PIDFILE) + IF_NAMESIZE + 1]; - char vendor[256]; -- bool stdin_valid; /* It's possible stdin, stdout and stderr */ -- bool stdout_valid; /* could be closed when dhcpcd starts. */ -- bool stderr_valid; -- int stderr_fd; /* FD for logging to stderr */ - int fork_fd; /* FD for the fork init signal pipe */ - const char *cffile; - unsigned long long options; ---- a/src/privsep.c -+++ b/src/privsep.c -@@ -172,8 +172,7 @@ ps_dropprivs(struct dhcpcd_ctx *ctx) - * Obviously this won't work if we are using a logfile - * or redirecting stderr to a file. */ - if ((ctx->options & DHC_NOCHKIO) == DHC_NOCHKIO || -- (ctx->logfile == NULL && -- (!ctx->stderr_valid || isatty(STDERR_FILENO) == 1))) -+ (ctx->logfile == NULL && isatty(STDERR_FILENO) == 1)) - { - if (setrlimit(RLIMIT_FSIZE, &rzero) == -1) - logerr("setrlimit RLIMIT_FSIZE"); -@@ -305,14 +304,11 @@ ps_rights_limit_stdio(struct dhcpcd_ctx *ctx) - const int iebadf = CAPH_IGNORE_EBADF; - int error = 0; - -- if (ctx->stdin_valid && -- caph_limit_stream(STDIN_FILENO, CAPH_READ | iebadf) == -1) -+ if (caph_limit_stream(STDIN_FILENO, CAPH_READ | iebadf) == -1) - error = -1; -- if (ctx->stdout_valid && -- caph_limit_stream(STDOUT_FILENO, CAPH_WRITE | iebadf) == -1) -+ if (caph_limit_stream(STDOUT_FILENO, CAPH_WRITE | iebadf) == -1) - error = -1; -- if (ctx->stderr_valid && -- caph_limit_stream(STDERR_FILENO, CAPH_WRITE | iebadf) == -1) -+ if (caph_limit_stream(STDERR_FILENO, CAPH_WRITE | iebadf) == -1) - error = -1; - - return error; diff --git a/net-misc/dhcpcd/files/10.0.5/0005-fix-privsep-builds-for-prior.patch b/net-misc/dhcpcd/files/10.0.5/0005-fix-privsep-builds-for-prior.patch deleted file mode 100644 index bafabfcb0275..000000000000 --- a/net-misc/dhcpcd/files/10.0.5/0005-fix-privsep-builds-for-prior.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/commit/8d12632c670f02d8a685e80c8abad7049d3dd18f - -From 8d12632c670f02d8a685e80c8abad7049d3dd18f Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Mon, 13 Nov 2023 15:54:50 +0000 -Subject: [PATCH] Fix privsep builds for prior. - ---- a/src/dhcpcd.c -+++ b/src/dhcpcd.c -@@ -388,9 +388,8 @@ dhcpcd_daemonise(struct dhcpcd_ctx *ctx) - if (IN_PRIVSEP(ctx)) - ps_daemonised(ctx); - else --#else -- dhcpcd_daemonised(ctx); - #endif -+ dhcpcd_daemonised(ctx); - - eloop_event_delete(ctx->eloop, ctx->fork_fd); - exit_code = EXIT_SUCCESS; diff --git a/net-misc/dhcpcd/files/10.0.5/0006-fix-unused-var-warning.patch b/net-misc/dhcpcd/files/10.0.5/0006-fix-unused-var-warning.patch deleted file mode 100644 index 9672dc5b9570..000000000000 --- a/net-misc/dhcpcd/files/10.0.5/0006-fix-unused-var-warning.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/commit/6788608eb0fcd32fd23974100cdd42d3174cb8d1 - -From 6788608eb0fcd32fd23974100cdd42d3174cb8d1 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Mon, 13 Nov 2023 16:05:04 +0000 -Subject: [PATCH] Fix an unused var warning for capsicum for prior - ---- a/src/privsep.c -+++ b/src/privsep.c -@@ -299,7 +299,7 @@ ps_rights_limit_fdpair(int fd[]) - } - - static int --ps_rights_limit_stdio(struct dhcpcd_ctx *ctx) -+ps_rights_limit_stdio() - { - const int iebadf = CAPH_IGNORE_EBADF; - int error = 0; -@@ -452,7 +452,7 @@ ps_startprocess(struct ps_process *psp, - ctx->ps_log_root_fd = -1; - } - #ifdef PRIVSEP_RIGHTS -- if (ps_rights_limit_stdio(ctx) == -1) { -+ if (ps_rights_limit_stdio() == -1) { - logerr("ps_rights_limit_stdio"); - goto errexit; - } -@@ -666,7 +666,7 @@ ps_managersandbox(struct dhcpcd_ctx *ctx, const char *_pledge) - #ifdef PRIVSEP_RIGHTS - if ((ctx->pf_inet_fd != -1 && - ps_rights_limit_ioctl(ctx->pf_inet_fd) == -1) || -- ps_rights_limit_stdio(ctx) == -1) -+ ps_rights_limit_stdio() == -1) - { - logerr("%s: cap_rights_limit", __func__); - return -1; - diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch new file mode 100644 index 000000000000..0d609822aad1 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch @@ -0,0 +1,16 @@ +--- a/configure ++++ b/configure +@@ -361,11 +361,8 @@ if [ -e "$LDELF" ]; then + echo "LDFLAGS+= -Wl,-rpath=${LIBDIR}" >>$CONFIG_MK + fi + +-if [ -z "$PREFIX" ] || [ "$PREFIX" = / ]; then +- ALLOW_USR_LIBS=false +-else +- ALLOW_USR_LIBS=true +-fi ++ALLOW_USR_LIBS=true ++ + case "$OS" in + linux*|solaris*|sunos*|kfreebsd*|dragonfly*|freebsd*) ;; + *) diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index 478512385463..064059dc3568 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -2,16 +2,7 @@ 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-195.4.4995.tar.gz 113305439 BLAKE2B 87dc38715189e06e98e5895389909f45a38208c8471ec92b9fb278c054ee5711d2acf95bdad01d34c097b96c8e3fe47d230af6bec8d3d2ff6782b1b477e23b61 SHA512 bf9ed46f1a34d96155b0d8f0c9d4a3583344d9eb06585e8e6c04e93dfcae7c55585861f31c2d70e79ba41f0141491aaf2b2c6b28b2baa9faf213ecdd97542fa8 -DIST dropbox-lnx.x86-196.4.6900.tar.gz 113848883 BLAKE2B 05ef3a79d3bbc67a15cd6ede011883424686b7302761ed49a9456735718c05f80a9a273e431283d1b32790b52ec3c6bdbce0253a5a570bdfd47c21f9d02e12be SHA512 652adbace0abbcbfa2729e9e5af11bafd1459924d67180f5be82e3c0feb81b8333307c3cfeb7e528cdcc576062783a1275bba82217bf3761b62b89775d0d3155 -DIST dropbox-lnx.x86-197.4.7571.tar.gz 113668413 BLAKE2B 359dfba6bdf615a82f7af454e6c9ee7ab66b0ce0a048025f6981539054b93716dfeef67ba1a56b1c98117d1bdf376bd6da0fe6c11d156e02859d9a4833e11df9 SHA512 08238adbe96ec95797631790bb74d77ff7cffa8559f7f27e1b1d6580ba83c725b8ca5159b0a184831c5337bc546885743f6171e75b654624859c51260f6771b4 -DIST dropbox-lnx.x86-197.4.7629.tar.gz 113669173 BLAKE2B 48d99401cbe5e895bcfaa30cee458769f3b31745c00d4e2f0c09f5de5fd95c0942ec800991d07f6ca100700167ec829667edf024cf707af0860b3c8731516b97 SHA512 7c3ef252b2d6b441881e7c140ecb11254fb8109b15c36912f6b18273d13b4cafe7fb1c2ba2e7710ac5eb327e1a79f81fbe8eeb1ee2df03e73560f21a1a7899b0 -DIST dropbox-lnx.x86_64-195.4.4995.tar.gz 115954161 BLAKE2B 86f349f6813e160eea71a6c32e37ee8213639dfaa6c69b0a560bfee8e90dae6a95fd0f3b822d6c029e3046d73aa088fb097ce9246c1c0786df9c292b40091adc SHA512 e4ad740d873dbdad995f05fcfda824f57a8ed4707acab66576284c97c00329ef1dbe2d55980694f2edc8a00fbc6ab20a08ca7afcc12488d9fb188cddc0c3501f -DIST dropbox-lnx.x86_64-196.4.6900.tar.gz 116604283 BLAKE2B 5398f43c33e488d346c9991952673b607e88f93467915ac7e341e29de6e66cb4f60bcc6311a0e261075df38834e53da7a38ac10b20bd4cf5d41f70394668ba13 SHA512 a43cdee6cb192085c484cbaf1aa54691ce8dc24eb682c3f2fb8f8ff7135f7590e4dbfeed33ec3afbd5dbfe2bb6fd72a8c136329ebd9e8223fcd5c63819d25429 -DIST dropbox-lnx.x86_64-197.4.7571.tar.gz 116465452 BLAKE2B d83e16ca390a6974427371894f9d92199af3bf7f0510f88de6b51350d7435cd1b1e2629d0f335b718e5eb9d69705cb67eae692789144a989d138a1d23a8a1b8f SHA512 9f4cb1b6381b13d29880401f23c2b9e24c16a3b7cd00d944e1a9268bc8652b333409d16def3e71cc2ec6fe92d39a3a3aa3b99adb12c96ca2972ab6ca070ba18c -DIST dropbox-lnx.x86_64-197.4.7629.tar.gz 116466779 BLAKE2B c46f49e53a58204e4338a2ec8368b70c7393f77c11acbb4ad1df8b640ebc2c254e4e3ae602994e321e6c2732feed31788397be41832afcae5ee0ff86b5fc4efa SHA512 2db38f05b0b785a4984ea3181ff7a54049596fed5ee603f9b6bfc652f75ac9ace0964cf38a5b185238fd6f596a5aeaba4b24b974747b0c723ee31f5f8a5c8612 -EBUILD dropbox-195.4.4995.ebuild 2854 BLAKE2B 83fb409fd9c6af41a884408f2258e3563a2d146f1fba8edfcc7e5fee674b8396cc1a674207533091721a2709118cdf655f24c5871ecdda663eb96da9b05b3861 SHA512 17f3737762fbaf48508b911b9605b629a876f3a503367298250ced4e81d599b6d496ef7f8b2742c0ccb9df89d8f8002ee732bd66f67148d474ae79fc96336ba8 -EBUILD dropbox-196.4.6900.ebuild 2856 BLAKE2B f8cc4e91838f412f3ef580f75bb4e4658f513b79ad144eaa5ebcdecd3ab3fda2fc75b40ada47ea83f165bb1f16396e0bfccdc050747d868797987ba21d6ca2fe SHA512 9d6d54d5c7755a7678c3dc2a684fe0fb8e98c142e8b5e0fbf6f090a694bec12504ed0d28088a3af193388cf3bf540f306ff691181427d036ae03ef072332a785 -EBUILD dropbox-197.4.7571.ebuild 2856 BLAKE2B f8cc4e91838f412f3ef580f75bb4e4658f513b79ad144eaa5ebcdecd3ab3fda2fc75b40ada47ea83f165bb1f16396e0bfccdc050747d868797987ba21d6ca2fe SHA512 9d6d54d5c7755a7678c3dc2a684fe0fb8e98c142e8b5e0fbf6f090a694bec12504ed0d28088a3af193388cf3bf540f306ff691181427d036ae03ef072332a785 -EBUILD dropbox-197.4.7629.ebuild 2856 BLAKE2B f8cc4e91838f412f3ef580f75bb4e4658f513b79ad144eaa5ebcdecd3ab3fda2fc75b40ada47ea83f165bb1f16396e0bfccdc050747d868797987ba21d6ca2fe SHA512 9d6d54d5c7755a7678c3dc2a684fe0fb8e98c142e8b5e0fbf6f090a694bec12504ed0d28088a3af193388cf3bf540f306ff691181427d036ae03ef072332a785 +DIST dropbox-lnx.x86-199.4.6287.tar.gz 113741255 BLAKE2B bb7a9b52bfdad485de61fb5b36f4d0651a39769194fcc4a3960b72d0ebe35f0e82024ac449cc2b5a5f4d05eb23b9aa99faada56887049f2108ee931b59a35d22 SHA512 c9dfc4b19736f4b8eeb5ecde6badace4f6023cecf39a61b9729a96f73da6d866dbb4e46d9f5dd1e937ad85ea9966ad590ec80c7af4ff96b18b5cf3d2e6e4651d +DIST dropbox-lnx.x86_64-199.4.6287.tar.gz 116574689 BLAKE2B 8ab6032081b296d08a60fa4a7dd61399ecf333776381d7832dd3d5cc703c071d3991ca735283bc9421ace08b522cbac31ae0764727c34987c199e0c3506686cf SHA512 244f3f7601722bf2f4a821271187472c8bbbb088cfbf61891a6cdb8f9202cc3ec5deec0df88c1e9c39ca27a3addfa97261c75c880444d6cb393c0d15c815182a +EBUILD dropbox-199.4.6287.ebuild 2854 BLAKE2B 83fb409fd9c6af41a884408f2258e3563a2d146f1fba8edfcc7e5fee674b8396cc1a674207533091721a2709118cdf655f24c5871ecdda663eb96da9b05b3861 SHA512 17f3737762fbaf48508b911b9605b629a876f3a503367298250ced4e81d599b6d496ef7f8b2742c0ccb9df89d8f8002ee732bd66f67148d474ae79fc96336ba8 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0 diff --git a/net-misc/dropbox/dropbox-196.4.6900.ebuild b/net-misc/dropbox/dropbox-196.4.6900.ebuild deleted file mode 100644 index 7d9715a71882..000000000000 --- a/net-misc/dropbox/dropbox-196.4.6900.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop pax-utils systemd xdg - -DESCRIPTION="Dropbox daemon (pretends to be GUI-less)" -HOMEPAGE="https://www.dropbox.com/" -SRC_URI=" - amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz ) - x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz ) - https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg -" - -LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="selinux X" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/.*" -QA_EXECSTACK="opt/dropbox/dropbox" - -BDEPEND="dev-util/patchelf" - -# Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND=" - X? ( - x11-themes/hicolor-icon-theme - ) - selinux? ( sec-policy/selinux-dropbox ) - app-arch/bzip2 - dev-libs/glib:2 - dev-libs/libffi-compat:6 - media-libs/fontconfig - media-libs/freetype - net-misc/wget - sys-libs/zlib - sys-libs/ncurses-compat:5 - virtual/opengl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - x11-libs/libxcb -" - -src_unpack() { - unpack ${A} - mkdir -p "${S}" || die - mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die - mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die - rmdir "${S}"/dropbox-lnx.*-${PV}/ || die - rmdir .dropbox-dist || die -} - -src_prepare() { - default - # we supply all of these in RDEPEND - rm -vf libGL.so.1 libX11* libffi.so.6 || die - # some of these do not appear to be used - rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \ - PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \ - wmctrl libdrm.so.2 libpopt.so.0 || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf images || die - fi - patchelf --set-rpath '$ORIGIN' \ - apex._apex.*.so \ - nucleus_python.*.so \ - tprt.*.so \ - || die - pax-mark cm dropbox - mv README ACKNOWLEDGEMENTS "${T}" || die -} - -src_install() { - local targetdir="/opt/dropbox" - - insinto "${targetdir}" - doins -r * - fperms a+x "${targetdir}"/{dropbox,dropboxd} - dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" - - if use X; then - doicon -s 16 -c status "${T}"/status - newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg - fi - - make_desktop_entry "${PN}" "Dropbox" "dropbox" - - newinitd "${FILESDIR}"/dropbox.initd dropbox - newconfd "${FILESDIR}"/dropbox.conf dropbox - systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service" - - dodoc "${T}"/{README,ACKNOWLEDGEMENTS} -} - -pkg_postinst() { - einfo "Warning: while running, dropbox may attempt to autoupdate itself in" - einfo " your user's home directory. To prevent this, run the following as" - einfo " each user who will run dropbox:" - einfo "" - einfo "install -dm0 ~/.dropbox-dist" -} diff --git a/net-misc/dropbox/dropbox-197.4.7571.ebuild b/net-misc/dropbox/dropbox-197.4.7571.ebuild deleted file mode 100644 index 7d9715a71882..000000000000 --- a/net-misc/dropbox/dropbox-197.4.7571.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop pax-utils systemd xdg - -DESCRIPTION="Dropbox daemon (pretends to be GUI-less)" -HOMEPAGE="https://www.dropbox.com/" -SRC_URI=" - amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz ) - x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz ) - https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg -" - -LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="selinux X" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/.*" -QA_EXECSTACK="opt/dropbox/dropbox" - -BDEPEND="dev-util/patchelf" - -# Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND=" - X? ( - x11-themes/hicolor-icon-theme - ) - selinux? ( sec-policy/selinux-dropbox ) - app-arch/bzip2 - dev-libs/glib:2 - dev-libs/libffi-compat:6 - media-libs/fontconfig - media-libs/freetype - net-misc/wget - sys-libs/zlib - sys-libs/ncurses-compat:5 - virtual/opengl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - x11-libs/libxcb -" - -src_unpack() { - unpack ${A} - mkdir -p "${S}" || die - mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die - mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die - rmdir "${S}"/dropbox-lnx.*-${PV}/ || die - rmdir .dropbox-dist || die -} - -src_prepare() { - default - # we supply all of these in RDEPEND - rm -vf libGL.so.1 libX11* libffi.so.6 || die - # some of these do not appear to be used - rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \ - PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \ - wmctrl libdrm.so.2 libpopt.so.0 || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf images || die - fi - patchelf --set-rpath '$ORIGIN' \ - apex._apex.*.so \ - nucleus_python.*.so \ - tprt.*.so \ - || die - pax-mark cm dropbox - mv README ACKNOWLEDGEMENTS "${T}" || die -} - -src_install() { - local targetdir="/opt/dropbox" - - insinto "${targetdir}" - doins -r * - fperms a+x "${targetdir}"/{dropbox,dropboxd} - dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" - - if use X; then - doicon -s 16 -c status "${T}"/status - newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg - fi - - make_desktop_entry "${PN}" "Dropbox" "dropbox" - - newinitd "${FILESDIR}"/dropbox.initd dropbox - newconfd "${FILESDIR}"/dropbox.conf dropbox - systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service" - - dodoc "${T}"/{README,ACKNOWLEDGEMENTS} -} - -pkg_postinst() { - einfo "Warning: while running, dropbox may attempt to autoupdate itself in" - einfo " your user's home directory. To prevent this, run the following as" - einfo " each user who will run dropbox:" - einfo "" - einfo "install -dm0 ~/.dropbox-dist" -} diff --git a/net-misc/dropbox/dropbox-197.4.7629.ebuild b/net-misc/dropbox/dropbox-197.4.7629.ebuild deleted file mode 100644 index 7d9715a71882..000000000000 --- a/net-misc/dropbox/dropbox-197.4.7629.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop pax-utils systemd xdg - -DESCRIPTION="Dropbox daemon (pretends to be GUI-less)" -HOMEPAGE="https://www.dropbox.com/" -SRC_URI=" - amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz ) - x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz ) - https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg -" - -LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="selinux X" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/.*" -QA_EXECSTACK="opt/dropbox/dropbox" - -BDEPEND="dev-util/patchelf" - -# Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND=" - X? ( - x11-themes/hicolor-icon-theme - ) - selinux? ( sec-policy/selinux-dropbox ) - app-arch/bzip2 - dev-libs/glib:2 - dev-libs/libffi-compat:6 - media-libs/fontconfig - media-libs/freetype - net-misc/wget - sys-libs/zlib - sys-libs/ncurses-compat:5 - virtual/opengl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - x11-libs/libxcb -" - -src_unpack() { - unpack ${A} - mkdir -p "${S}" || die - mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die - mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die - rmdir "${S}"/dropbox-lnx.*-${PV}/ || die - rmdir .dropbox-dist || die -} - -src_prepare() { - default - # we supply all of these in RDEPEND - rm -vf libGL.so.1 libX11* libffi.so.6 || die - # some of these do not appear to be used - rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \ - PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \ - wmctrl libdrm.so.2 libpopt.so.0 || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf images || die - fi - patchelf --set-rpath '$ORIGIN' \ - apex._apex.*.so \ - nucleus_python.*.so \ - tprt.*.so \ - || die - pax-mark cm dropbox - mv README ACKNOWLEDGEMENTS "${T}" || die -} - -src_install() { - local targetdir="/opt/dropbox" - - insinto "${targetdir}" - doins -r * - fperms a+x "${targetdir}"/{dropbox,dropboxd} - dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" - - if use X; then - doicon -s 16 -c status "${T}"/status - newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg - fi - - make_desktop_entry "${PN}" "Dropbox" "dropbox" - - newinitd "${FILESDIR}"/dropbox.initd dropbox - newconfd "${FILESDIR}"/dropbox.conf dropbox - systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service" - - dodoc "${T}"/{README,ACKNOWLEDGEMENTS} -} - -pkg_postinst() { - einfo "Warning: while running, dropbox may attempt to autoupdate itself in" - einfo " your user's home directory. To prevent this, run the following as" - einfo " each user who will run dropbox:" - einfo "" - einfo "install -dm0 ~/.dropbox-dist" -} diff --git a/net-misc/dropbox/dropbox-195.4.4995.ebuild b/net-misc/dropbox/dropbox-199.4.6287.ebuild index e90baaad900e..e90baaad900e 100644 --- a/net-misc/dropbox/dropbox-195.4.4995.ebuild +++ b/net-misc/dropbox/dropbox-199.4.6287.ebuild diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index 731d80368817..0282213d3245 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -3,15 +3,19 @@ AUX freerdp-2.11.2-clang.patch 1132 BLAKE2B ba35de705f66e571e177f1291ccaf3c72f23 AUX freerdp-3.4.0-incompatible-pointer.patch 10251 BLAKE2B 70a23022ff8db7dcf0ada3bf2165d6b271f259f4a49b40d4ca2c2de75e5321156cbedcca77240663e143986073d5a49e74b2b6caf456a6136d83673becf6c35e SHA512 c44165fc843742d1cb5859f24c6eaa78cda13837315ca3fde48092835992998701a670a66cf351c406153a65166050b5523e432789b5b6e2151227ea43ef034d DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd DIST freerdp-2.11.6.tar.gz 7337387 BLAKE2B 6d6b338710fccc4ad5067f4cf7f17190409f5313cb0c2c4ad84c82326b605897e01e03e2f334346ae5e20642c7813b415d0123558c00565b4b8c11257ebac226 SHA512 4facaff07bc26434474776e2463c9ebf0111190cb6bcf7d3dc7a6b3d8e2de991925a92b7889b2c5dec50ee4cf28f94bb1016c36da207a00ead09005ea0ace36d +DIST freerdp-2.11.6.tar.gz.asc 228 BLAKE2B cfcd673da04fcd749883b5dbbc27f12d6680442991d884006401521222385c7b325af35828683d96e1de866850a9c4eaae5f26d4b3cff4111391dc31f94ca1bd SHA512 4ef9a1fcb6f97295affbe080657a5a812d73e3448e1f480b382774e6f6fd3276a4e251e94cac66fdc83ae974ccc0b9ca9ca2b82b76b5128915885a35fafd18e4 +DIST freerdp-2.11.7.tar.gz 7337520 BLAKE2B ad579b4c36d96a17ccceb26c4c34124a050c05c49c05e2d8b4fd46789929dd4581d26aad88de7a3b3e6ecdd330b9b2ac2d45616537c1c635d10706f14a36f5ca SHA512 e1b4ac112090f2364ef2c360453f91b4643680cad75785cb214b48ebbc78c5eeca9fa8fe9f84f241a70825eefb5273e4e380483a5cdc86c92aa6ac1eb22c188e +DIST freerdp-2.11.7.tar.gz.asc 228 BLAKE2B a374c22ada6da59fb66fcb8021d5bb27545df0c0875b929766dc9b468e9fbfb4a79b1c38b2dbf5c44f925fd44305b1798e5ede0e6726a85c98cac96ceb8020f2 SHA512 18a1b8f18bba14e0156e5eca8fad28efdadd2f87fa29221629ffd9cf53f74606392de0df0e11ae41809fad0509c87462ee29d1e01e9df0dfe08b29832378be76 DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1 SHA512 b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5 DIST freerdp-3.5.0.tar.gz 9335565 BLAKE2B fc417336cda9dd14a2c7605a2b0172220f711599356b38d4d346130fc865c1ef563e627b57bcb20843dae231d8cfda272261db30d956ea98c29ebf7908c4722c SHA512 5f6f6fc84d0fb3581b3debd8dde8ed7054275af46f71b6ebd618d240b196e26352cf5ea260bd819a2b4464101012184910715b546701a95fc1aa951433150b07 DIST freerdp-3.5.1.tar.gz 9338947 BLAKE2B dd004333a52046300a5f319346da46ddb460e8acbb5902dc4daa18e3d0b6e3d9ee1d43f43e54f0887fec68cf6a952567be4c7995e807099585b9062a56058506 SHA512 6c7861131e1ae2cf824659fe8cff34e0f608c4e3796b64f02a61aeeaa12dce76aad2bfa5096c821f0f86fde82ffed7e4876f20cd4016ea1adb7555e4828551d8 +DIST freerdp-3.5.1.tar.gz.asc 228 BLAKE2B ae5826e539f0078d3adf7a4886f0b0c249c73fd2fc7ae21dcf815d876ec26f4482c242c076dbd9dcadd18927f4f97199f16fac3b40c0c04b1e43482865af15dc SHA512 ba52d6a5aa3d91fdab988d91b8591ccb075ce3d52bbee0596ffdb50902b54e650b397995f273463296a484199b969bab47708b5dbfc76c4128aa54ec5afcfdf2 EBUILD freerdp-2.11.5-r10.ebuild 3675 BLAKE2B 81ed6fb24d6bdd2ca894b2368e47adc29996441fa251ab5e4fa5d45128027a446c83f733dc9c010c6701e4b42bec15d987381bc3d72a234563c021552fd18a7e SHA512 910dad20fca8dbd8a287b31769f71fb2f660f4001df1b013e1340e19898fe2fd950765517faea66ecb9b8488b7bd1e87595813dccde3749a76f91b92b6a5b4e8 -EBUILD freerdp-2.11.5-r2.ebuild 3470 BLAKE2B 738dfd8ac8d02cf814ee17ca07a593b0c4394862aa8c5ac5a4a59f5aaf4f58f8d28c4069a7d2726a8a5a2bceace3497c18a6f93f894e02f8af997fa257799194 SHA512 cf303673f413fe5d404d98ba0dc8d08fbe1a67175f20b00fd5f857a0674baaa62c439e1a88158aa204e0498fab5a7a326521b630d73c8b72de74a6417a434812 -EBUILD freerdp-2.11.6.ebuild 3688 BLAKE2B dd1662cfaee67464c7c247a9ac42509ec7e9787a8cab282659b32349bd8097d16cb883979675da85be5a8f64c2fc7f63d7668a7409ed6fca676be263e1963505 SHA512 85168564e40c9ab524289a16e14ec185ffa84816cee4c4f4b6171f3856bb0928b4bad9b1263195c348c0b9a78ce8a0fc4ef8379339dc39d0824656a90ae81e21 -EBUILD freerdp-2.9999.ebuild 3688 BLAKE2B dd1662cfaee67464c7c247a9ac42509ec7e9787a8cab282659b32349bd8097d16cb883979675da85be5a8f64c2fc7f63d7668a7409ed6fca676be263e1963505 SHA512 85168564e40c9ab524289a16e14ec185ffa84816cee4c4f4b6171f3856bb0928b4bad9b1263195c348c0b9a78ce8a0fc4ef8379339dc39d0824656a90ae81e21 +EBUILD freerdp-2.11.6.ebuild 3909 BLAKE2B 2d146692aa17251bfdd1d18f79907c37397ce69a25c4596d4fb7c9044c15f6f6c32d149eb6502f0ae0888b340a08f5c41a0f5253bafaff1caec396a3b994783a SHA512 e7b1eb0a93083e1417b4ce49d7f7e92af58fdcc28714ea0a04d9cc9808f7782e92f0fb2de3520435c30e48049ebc289d6a44d30a5f1eb12ee28a7a2d1ae78d8f +EBUILD freerdp-2.11.7.ebuild 3909 BLAKE2B 2d146692aa17251bfdd1d18f79907c37397ce69a25c4596d4fb7c9044c15f6f6c32d149eb6502f0ae0888b340a08f5c41a0f5253bafaff1caec396a3b994783a SHA512 e7b1eb0a93083e1417b4ce49d7f7e92af58fdcc28714ea0a04d9cc9808f7782e92f0fb2de3520435c30e48049ebc289d6a44d30a5f1eb12ee28a7a2d1ae78d8f +EBUILD freerdp-2.9999.ebuild 3909 BLAKE2B 2d146692aa17251bfdd1d18f79907c37397ce69a25c4596d4fb7c9044c15f6f6c32d149eb6502f0ae0888b340a08f5c41a0f5253bafaff1caec396a3b994783a SHA512 e7b1eb0a93083e1417b4ce49d7f7e92af58fdcc28714ea0a04d9cc9808f7782e92f0fb2de3520435c30e48049ebc289d6a44d30a5f1eb12ee28a7a2d1ae78d8f EBUILD freerdp-3.4.0-r11.ebuild 4170 BLAKE2B d0c489ddda31ec18c760f17f151cf1381ff9ad018b33d8246a4e7231f98298d8a7083e91be321d75d263f58e0b6e4fc3a71f029f3cf4b8c88d2ef4d7b45f5262 SHA512 da6d233a7bb1ef6aa31a6457dce467aab9abb22f73a3f480825c16bfc3be25501635baf9849ef5e5de2771908adf6a9d89f40d9d6f83b843f32a5e972f52acd8 EBUILD freerdp-3.5.0.ebuild 4061 BLAKE2B db81f0a4e3e724a56f8a751a8ea75157ddf1bb2084bbcbb0d7cb79c1303943841eb25b47062f873ca37c0c653b5fdaea945aee0679f881e23b3ea3c5aaaaceb9 SHA512 c39ca3be52c6a180268384108dfa908dfdc912988b2b1e6dc4aeb13b53beebca02745898106afb3bde52035d3f78bf752b69ebcec8bdc28527d3540be13ca6af -EBUILD freerdp-3.5.1.ebuild 4061 BLAKE2B db81f0a4e3e724a56f8a751a8ea75157ddf1bb2084bbcbb0d7cb79c1303943841eb25b47062f873ca37c0c653b5fdaea945aee0679f881e23b3ea3c5aaaaceb9 SHA512 c39ca3be52c6a180268384108dfa908dfdc912988b2b1e6dc4aeb13b53beebca02745898106afb3bde52035d3f78bf752b69ebcec8bdc28527d3540be13ca6af -EBUILD freerdp-9999.ebuild 4061 BLAKE2B db81f0a4e3e724a56f8a751a8ea75157ddf1bb2084bbcbb0d7cb79c1303943841eb25b47062f873ca37c0c653b5fdaea945aee0679f881e23b3ea3c5aaaaceb9 SHA512 c39ca3be52c6a180268384108dfa908dfdc912988b2b1e6dc4aeb13b53beebca02745898106afb3bde52035d3f78bf752b69ebcec8bdc28527d3540be13ca6af +EBUILD freerdp-3.5.1.ebuild 4282 BLAKE2B 7df61eb651420605019dd8fd67569194f57aeb3ac79b2a9632812a8f3f537bcac7a7e6457c3bbe35f187b73348aa88f6e6fe749c5e90895d5c15669b2ecb3e6f SHA512 c04f62608dcf2f511468175b7f1fb8eb83174acd61f3a11862751176900b232ebc1bc80d947d07dd513b3570ab6542a5bb1f8a9bb28906af5e61274f1a5227d2 +EBUILD freerdp-9999.ebuild 4282 BLAKE2B 7df61eb651420605019dd8fd67569194f57aeb3ac79b2a9632812a8f3f537bcac7a7e6457c3bbe35f187b73348aa88f6e6fe749c5e90895d5c15669b2ecb3e6f SHA512 c04f62608dcf2f511468175b7f1fb8eb83174acd61f3a11862751176900b232ebc1bc80d947d07dd513b3570ab6542a5bb1f8a9bb28906af5e61274f1a5227d2 MISC metadata.xml 650 BLAKE2B 619e236cb4c4b249beafc2e4772c5321e5c912242a0e69d7e181867a83078ebfadd639aa5b7cf2a0da58572ade2ae374bfd61f41d83e333065bbfde2c06533ed SHA512 f9ec3e33c342c2a364be4d780c0fc69800617896bda40e473175f0b98f39925ea7bcc1896993782470fd9aad1b04edc2848baf5db2a8dd4e2c4099c062e657ae diff --git a/net-misc/freerdp/freerdp-2.11.5-r2.ebuild b/net-misc/freerdp/freerdp-2.11.5-r2.ebuild deleted file mode 100644 index dfd5ba988b49..000000000000 --- a/net-misc/freerdp/freerdp-2.11.5-r2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 2011-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -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 ~loong ppc ppc64 ~riscv x86" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="https://www.freerdp.com/" - -LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" -COMMON_DEPEND=" - 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 - X? ( x11-libs/libXrandr ) - ) - icu? ( dev-libs/icu:0= ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - kerberos? ( virtual/krb5 ) - openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-libs/libpulse ) - 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="${COMMON_DEPEND} - valgrind? ( dev-debug/valgrind ) -" -RDEPEND="${COMMON_DEPEND} - !net-misc/freerdp:2 - !net-misc/freerdp:3 -" - -PATCHES=( - "${FILESDIR}/freerdp-2.11.2-clang.patch" - "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" -) - -src_configure() { - # bug #881695 - filter-lto - - local mycmakeargs=( - -Wno-dev - -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_ICU=$(usex icu ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_GSSAPI=$(usex kerberos ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_OSS=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_VALGRIND_MEMCHECK=$(usex valgrind 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 -} - -src_test() { - local myctestargs=() - use elibc_musl && myctestargs+=( -E TestBacktrace ) - cmake_src_test -} diff --git a/net-misc/freerdp/freerdp-2.11.6.ebuild b/net-misc/freerdp/freerdp-2.11.6.ebuild index 452680239826..2a7209cfab84 100644 --- a/net-misc/freerdp/freerdp-2.11.6.ebuild +++ b/net-misc/freerdp/freerdp-2.11.6.ebuild @@ -12,10 +12,14 @@ if [[ ${PV} == *9999 ]]; then 2.*) EGIT_BRANCH="stable-2.0";; esac else + inherit verify-sig MY_P=${P/_/-} S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" @@ -26,7 +30,7 @@ SLOT="2" IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" -BDEPEND=" +BDEPEND+=" virtual/pkgconfig app-text/docbook-xml-dtd:4.1.2 app-text/xmlto diff --git a/net-misc/freerdp/freerdp-2.11.7.ebuild b/net-misc/freerdp/freerdp-2.11.7.ebuild new file mode 100644 index 000000000000..2a7209cfab84 --- /dev/null +++ b/net-misc/freerdp/freerdp-2.11.7.ebuild @@ -0,0 +1,172 @@ +# Copyright 2011-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +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 + inherit verify-sig + MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="2" +IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" +RESTRICT="!test? ( test )" + +BDEPEND+=" + virtual/pkgconfig + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto +" + +COMMON_DEPEND=" + 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 + X? ( x11-libs/libXrandr ) + ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-libs/libpulse ) + 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= ) + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:3[client] ) + server? ( !net-misc/freerdp:3[server] ) +" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/freerdp-2.11.2-clang.patch" + "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" + ) + cmake_src_prepare +} + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + +src_configure() { + # bug #881695 + filter-lto + + local mycmakeargs=( + -Wno-dev + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_ALSA=$(option alsa) + -DWITH_CCACHE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_CLIENT=$(option client) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_ICU=$(option icu) + -DWITH_JPEG=$(option jpeg) + -DWITH_GSSAPI=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_PCSC=$(option smartcard) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WINPR_TOOLS=$(option server) + ) + cmake_src_configure +} + +src_test() { + local myctestargs=( -E TestBacktrace ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die +} diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild index 452680239826..2a7209cfab84 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -12,10 +12,14 @@ if [[ ${PV} == *9999 ]]; then 2.*) EGIT_BRANCH="stable-2.0";; esac else + inherit verify-sig MY_P=${P/_/-} S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" @@ -26,7 +30,7 @@ SLOT="2" IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" -BDEPEND=" +BDEPEND+=" virtual/pkgconfig app-text/docbook-xml-dtd:4.1.2 app-text/xmlto diff --git a/net-misc/freerdp/freerdp-3.5.1.ebuild b/net-misc/freerdp/freerdp-3.5.1.ebuild index 78789fee28fc..0c7ce6eacd22 100644 --- a/net-misc/freerdp/freerdp-3.5.1.ebuild +++ b/net-misc/freerdp/freerdp-3.5.1.ebuild @@ -12,10 +12,14 @@ if [[ ${PV} == *9999 ]]; then 2.*) EGIT_BRANCH="stable-2.0";; esac else + inherit verify-sig MY_P=${P/_/-} S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" @@ -26,7 +30,7 @@ SLOT="3" IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" -BDEPEND=" +BDEPEND+=" virtual/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 78789fee28fc..0c7ce6eacd22 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -12,10 +12,14 @@ if [[ ${PV} == *9999 ]]; then 2.*) EGIT_BRANCH="stable-2.0";; esac else + inherit verify-sig MY_P=${P/_/-} S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" @@ -26,7 +30,7 @@ SLOT="3" IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" -BDEPEND=" +BDEPEND+=" virtual/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest index cd499b3b71b6..69e1ecd28223 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -1,6 +1,5 @@ -DIST gallery-dl-1.26.8.gh.tar.gz 659327 BLAKE2B f0d394c077fefda91fce494fa8bd6ef369a634f06f3303c4f91009b3d5d381a40aa8918e639ed6faddc9000d5a3091a569124d62b794d727c46354bc144c8b63 SHA512 f8093d8e51c815333a182d1cdf5134d2e54d10b44067a0130943993d63e49d4e51d5bb9eb1704b7999639e73ae8ab4cadb6a8d0fb444abbe26ffdc445e5cdb5f +DIST gallery-dl-1.26.9-5227bb6.patch 3415 BLAKE2B 864d6877ba9f6ee6449465ebce9b6648325c176f2ae4062c27e7059852b05983a99f203aabc9e3c361214b14d489bdb450920879171385474ddec50d83f1b937 SHA512 6931eeb00f6fcd6b9005672aa23ed2b0270846758a762a8a86ef51ca860bea2563673b02881abd5a1a224b7518a89e66de46da5cc0a7994d58078886aa090c64 DIST gallery-dl-1.26.9.gh.tar.gz 670467 BLAKE2B 849d20ff6fd802915b3bc4f6bb11d638d1e8f24f1dbdcfd5946461798044d59bf9243faa370cdddcdffe40a24d39d44a43abc79b4c8e89e7c60b40e5e204603a SHA512 54c2a86a67c53b7d5c62e6c23c549fd89503386549dc9d2f9c7de058b52ecb60b5089555e97dd0b63d33686e1bd08a3be940152715a6d26647e6949e641df9cb -EBUILD gallery-dl-1.26.8.ebuild 1135 BLAKE2B 3c2d4c20d3ceaa605b7a3f995e9829c83ccb8359e752e9e693fe4183fe6fa13fdfeef89e82ec6d075174bc960cb0d0347b65f06d366626c93ab941844b36e531 SHA512 3f1092f2fda60dfe920456ca40ca03f4ffb6c0d4afe956b36ba48a3b7805297b18299caa2fd44d6ea4d2ca79ce2abf23d426498ccd4387512729c57afbc982ef -EBUILD gallery-dl-1.26.9.ebuild 1135 BLAKE2B 3c2d4c20d3ceaa605b7a3f995e9829c83ccb8359e752e9e693fe4183fe6fa13fdfeef89e82ec6d075174bc960cb0d0347b65f06d366626c93ab941844b36e531 SHA512 3f1092f2fda60dfe920456ca40ca03f4ffb6c0d4afe956b36ba48a3b7805297b18299caa2fd44d6ea4d2ca79ce2abf23d426498ccd4387512729c57afbc982ef +EBUILD gallery-dl-1.26.9.ebuild 1297 BLAKE2B 4887d8139f44daa0a8ce4ad56ac50107165e2ca4f9f50e71076531770ad8d17cb67c6485581cca5f03f16476f9042523aed9cd1c6a59a27a38215a53d45f2d16 SHA512 d2304f95acc119c0229e104d5343de465d60246af78a4c73c15da25ad8fd57cbaba540d9bc4a4ec70502304b2ff138475712a005757047864396237fa38e3fc5 EBUILD gallery-dl-9999.ebuild 1142 BLAKE2B 6a0c03091500dd90754cc580a693c3ee9544d7ea1188fa56f7e5c08c2b678e540aa7a23c8b859921518c722a135a02328144d52f5bd485f07b3a0f9076e5edc0 SHA512 119516d297a7abceb2d9fde4bf9c9edf1fff83bcac856efc67e8b35c6b4b58b3080bb50f2a59a90ba858bf30a9c42f391be67187e4e363f1cdeee284b2043cba MISC metadata.xml 747 BLAKE2B bb63a74ca71891f1e937e6bd41b4cef50f1e1d459ab389f83f881cbfcc5c39bf5c4b8e999ea6cab7406a97f3dca9644380eaf1930d811746c5b893b948085ecd SHA512 302b9f3cde6c404de62347415c1f02d6884a9327c88871ea67b986ac7eaadac6b79018d919f5e6a2d8dde5dfd9e12d6c7c4702120fb08bfbfa291df4d1baecae diff --git a/net-misc/gallery-dl/gallery-dl-1.26.8.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.8.ebuild deleted file mode 100644 index 310c7066bc74..000000000000 --- a/net-misc/gallery-dl/gallery-dl-1.26.8.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="sqlite,ssl,xml(+)" - -inherit distutils-r1 optfeature - -DESCRIPTION="Download image galleries and collections from several image hosting sites" -HOMEPAGE="https://github.com/mikf/gallery-dl/" - -if [[ "${PV}" == *9999* ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/mikf/${PN}.git" -else - SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - - KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86" -fi - -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=" - >=dev-python/requests-2.11.0[${PYTHON_USEDEP}] -" - -distutils_enable_tests unittest - -src_prepare() { - # Tests against real servers, some tests always fail and some are subject to change. - rm test/test_results.py || die - - distutils-r1_src_prepare -} - -python_compile_all() { - emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man -} - -pkg_postinst() { - optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg - optfeature "video downloads" net-misc/yt-dlp -} diff --git a/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild index 310c7066bc74..74f78f4c094c 100644 --- a/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild @@ -17,8 +17,12 @@ if [[ "${PV}" == *9999* ]]; then EGIT_REPO_URI="https://github.com/mikf/${PN}.git" else - SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz" + SRC_URI=" + https://github.com/mikf/${PN}/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + https://github.com/mikf/${PN}/commit/5227bb6b1d62ecef5b281592b0d001e7f9c101e3.patch + -> ${P}-5227bb6.patch + " KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86" fi @@ -30,6 +34,8 @@ RDEPEND=" >=dev-python/requests-2.11.0[${PYTHON_USEDEP}] " +PATCHES=( "${DISTDIR}/${P}-5227bb6.patch" ) + distutils_enable_tests unittest src_prepare() { diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest index 18df69775d1a..9ae4120d7b5c 100644 --- a/net-misc/gns3-gui/Manifest +++ b/net-misc/gns3-gui/Manifest @@ -1,5 +1,5 @@ -DIST gns3-gui-2.2.44.1.tar.gz 5056513 BLAKE2B ac9004771dea320dd24db905ae556c47c5950f95f6871272339223e019da804b97f3238677a0758426ec550ec354052196a4b30cbd4cc1cc154a3a437a3b006f SHA512 e9ae8604f6675ce7edc3e491dc5217b985ca948eaf0df69b59d60b236deee6e0d34e245b4779295d28a05b35eb01f93534a2da070817ace36a2d259525a606de DIST gns3-gui-2.2.45.tar.gz 5057093 BLAKE2B 0e5f92a5450f8bd87c67ef3916a949d12d3ba2222b9c894260fe4c486236455c5b0214350e6144081049a6e7a85a9fc60c596b5932dd3f6fa07c7f94cc5d31f5 SHA512 2122dbf88625ea8fbc7eae20d7d1406a72f8dc8a5fea2c9577218127c54c10b9db7b154010c519a170ea9067e1ea774181e0e56936129c091800dab615cb8b3b -EBUILD gns3-gui-2.2.44.1.ebuild 1029 BLAKE2B 2da071d1570adab8b3c50c71610fa8555fafd21f20894bb9011314bb6ebb9e22a2ff0dc550ca85ba78bc313bd01016940a068eb86c8a9b8d0368b49e26604303 SHA512 dff33f88c85f12c76169df66dc6243ca5b4e3396f7826ee4af8a38c3fc3329bcdeb80986030e4b7002fe7dd829667df42e56dcc68292ef5ae1fdb68b50fd87ee +DIST gns3-gui-2.2.46.tar.gz 5058596 BLAKE2B 1b3b84d3677c815bfe950f0fe2bf618bca12d1c854bf9d6328611feb41344b952a8579716db936a6010bbe4db772e9d3cc2e57b365b2e66264b9fd4dee576c4b SHA512 25ca6a9bf626182ae16662bc7d9f571c14b107c4036ccba0b4c2d562aa4f26fd7af23765de53e4159f67e48632548d3148dbb9c9ae19bffbef50c48a10f85a01 EBUILD gns3-gui-2.2.45.ebuild 1073 BLAKE2B f06ada27c2aa08a913a83a71688b892a003e0b4e8543b68fda350e42471a9df702c0d61c259f56882dd0caef37ff2ace520ba46b64281e62b55b8442c41873c8 SHA512 f2024b07e32b57aa5892140bcf94279f2634bebaa1c3b2fbbcf8d345f649cebb2a65ac623fd5399920d360b86bc1ee5e213c63b03459c1a68664dc4023726e38 +EBUILD gns3-gui-2.2.46.ebuild 1073 BLAKE2B 051752911b728153fcfaba792ff1055c04612ac0fa312209cf6eb2b41cea8052ec3e923e193b4068e9349e6c0ee925a40513e987ca2f220a34c289bc5c7fee9c SHA512 c5f1d73edc8c5afb4862787ca86d08b09751d0fce35fd26a42dab0abee76555f05c6a108e7f54127063d731266b22fe166242ca051e94811541f830b673a87f5 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49 diff --git a/net-misc/gns3-gui/gns3-gui-2.2.44.1.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.46.ebuild index c0d753adc2e4..9ced99155546 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.44.1.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.46.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,14 +14,15 @@ SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" #net-misc/gns3-server version should always match gns3-gui version RDEPEND=" - >=dev-python/distro-1.8.0[${PYTHON_USEDEP}] + >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.6[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.8[${PYTHON_USEDEP}] >=dev-python/sentry-sdk-1.34.0[${PYTHON_USEDEP}] + >=dev-python/truststore-0.8.0[${PYTHON_USEDEP}] ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}] dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] " diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest index 8a5171050f16..6bb404f85e42 100644 --- a/net-misc/gns3-server/Manifest +++ b/net-misc/gns3-server/Manifest @@ -1,5 +1,5 @@ -DIST gns3-server-2.2.44.1.tar.gz 10739635 BLAKE2B 8f9cc5affce48b95ef5ceee452d643f450594f1f5710ceace830ccd5a30281c6a04458a6864c65bcb3b023190b2aebe00d2f4316c80596a4c443616cad161cb6 SHA512 60c66f07242ba64a9bbc9471ee71fc975a95f36fced440798c8076b968a2e29cacccb889928f22b878d5928feb9024b26da854a03e3610b1ba36fa09826023fc DIST gns3-server-2.2.45.tar.gz 10747348 BLAKE2B bb8f45347f9ea2e05e199a5128f73fe7fad6d7b3bebf30dcae009c761934e5d2ee986623fa82bb328db31b43cd39da05f52ac9a3f534d223fbf46ca585f3b433 SHA512 570bac3aab8c0f31144f8ac34f27b04a16efadd02e93faf949d4fe0078bf87c59e479b17ead8feec774b3907703cddeae9a434b9abc7fbd459cc060636478a2e -EBUILD gns3-server-2.2.44.1.ebuild 2078 BLAKE2B bbd76963968f5640c56ec5f673ef3d0a606af9f44355a83536770f257e1c39d69e78c3f7ce8e47dc260d2ead552a70d9a88d19689dad580833eb719336436021 SHA512 d3ac8130780d003d753ae906c8422f0b4fb6e4a3cfbb7fd63ff9bd47b27ecccb6510b13b1b0f3c0e36605159883918d173eeb26d0a6dc389926e72fe2bcbecb3 +DIST gns3-server-2.2.46.tar.gz 10745825 BLAKE2B 280c16e76a73b638ea66c1c8a674a0e11eab3f0dee612b40c480d604244bf6e78d32c79f6a4587a95b88ce601ba3911672b6402831fce8c7a721465dcdd2da9d SHA512 6f7e52c0f1fcdbb0af7963cfaf1cd17c7d6af36e1ac89b4b2e725c14ff17d1560a50d286ea351ab2649560c09dcac62b35add9492f06c5068010129751b0848e EBUILD gns3-server-2.2.45.ebuild 2078 BLAKE2B 64741a73ff89e6803ea0e2c5dd5b75a9917991c772699acbc7382f12e2dbba3dabc6c2bebb5654976a9c469d3a55da30c173e67a28531a7a6c17672929730446 SHA512 4f0d1b1c4a1823594929822ba7140522a9ddd5b31412fcc4fcc10197dda455877fc1f790014127140d7d13a27e5ea66ecb1909b88ba52bd20f53edd6df7a51b8 +EBUILD gns3-server-2.2.46.ebuild 1887 BLAKE2B 161d290ff8157d99b6f7692699622ef0c735e49a1ccfdf84feb7e1c43eb7e8738c476594d1476366b9a21c0d22269164f6f340bcb4d3edd5c4051e48db2c4af1 SHA512 f0bf75787a0e0c4ae2c71a8da90d517177b4d7bbfc191561dfacb5553959a69f5f7030ed31da917c526e94e8e8ba2c0de903c0bc6ac3e560166849f0c50ee775 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49 diff --git a/net-misc/gns3-server/gns3-server-2.2.44.1.ebuild b/net-misc/gns3-server/gns3-server-2.2.46.ebuild index ec1573e4269f..3a083dab53e0 100644 --- a/net-misc/gns3-server/gns3-server-2.2.44.1.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.46.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,13 +21,13 @@ RDEPEND=" acct-user/gns3 app-emulation/dynamips >=dev-python/aiofiles-23.2.1[${PYTHON_USEDEP}] - >=dev-python/aiohttp-3.8.5[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.9.3[${PYTHON_USEDEP}] >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] - >=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}] - >=dev-python/distro-1.8.0[${PYTHON_USEDEP}] - >=dev-python/jinja-3.1.2[${PYTHON_USEDEP}] + >=dev-python/async-timeout-4.0.3[${PYTHON_USEDEP}] + >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.3[${PYTHON_USEDEP}] >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.6[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.8[${PYTHON_USEDEP}] >=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] >=dev-python/sentry-sdk-1.34.0[${PYTHON_USEDEP}] net-misc/ubridge @@ -53,9 +53,6 @@ python_install() { systemd_dounit init/gns3.service.systemd newinitd init/gns3.service.openrc gns3server - - rm "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die - ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die } pkg_postinst() { diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest index 5311e507d99b..59d8777854fe 100644 --- a/net-misc/httpie/Manifest +++ b/net-misc/httpie/Manifest @@ -1,5 +1,7 @@ +AUX httpie-3.2.1-pytest-fixtures.patch 19140 BLAKE2B df54635098d0da8b9b8c37dd4a144caf330f6ca9ca657de90ea510f91498735700b84b6ce48d91ff1ed88eecfa0d80a0ac626d2d8384a8ac68d9a7303d048509 SHA512 b881cefb48079ffa5ee0450e591185e15bf9052ecd16ccce7a5faddc7cc4cc9cf3f73cfcdde8dca129969b182086a2c1d867669261f91196df4318aae466a7b0 AUX httpie-urllib3-2-fixes.patch 1852 BLAKE2B 8298b18a64e0fc99f422d5c3260ca9b567de08f9cc7b0d2cb0c20ba675a717dd1e4cff03bc036beead71f58426153e2b040fea06e4383df768d004afdbd807e7 SHA512 c926450b4ef43274e0e70b51605ff020ccf82a0704d86814590cbe40db5ea1329ec357b7f630f860b09549f76a34211c3799956b67d8f2f0db51ad14c1ba53b9 DIST httpie-3.2.1.gh.tar.gz 1276550 BLAKE2B 627aa3db762e9e407f882be2c4267f5227301b189695537e7ac69ff140d6d39292251e131f9b9e7761e904a736d112bb4c1f5c6708c1468c6309474ee8c140b6 SHA512 ffcf6050138c49d5acb01f214d9b3fee6c78502c4c6dc45a295bafc88aafd1789f97a69c922f6e093fb48a402c1f83a7fff5307849130df81c4bcb2d595a03bf -EBUILD httpie-3.2.1-r1.ebuild 1199 BLAKE2B cc2325459fd6bfc94cccf18f4a33ef762009ddfeb2c23cde5af7ccf7785873e0cc0ef41e77ad85c8ddc30bbc1296d117b50edf2c997a6ca4e40a4fbda8dbda45 SHA512 b46af54de9bddeffb4649418342710e6324dfa4ea2ef6638caa07bc58f7aff809d8246475b57375fabaee2fb65118cf4964068d16be30d064bf20ac4a204267e +DIST httpie-3.2.2.gh.tar.gz 1279161 BLAKE2B aa5df73acbbe635fbfd3db458a2289042091a27d7b1791e9739874c1882e436814f74eec2b695f8acd76f9b9dd210f43dd9f8b7c0feea0cf4782b30f0e53b91a SHA512 5e95eba5a5ca8017dfd76ace525c57d2931d8918d51e84e8744eb9393cda5ae8e6cd6a1455c4aa82e50fa35edc35468a8b3582169c8f94858e61b09548cfa13d EBUILD httpie-3.2.1-r2.ebuild 1255 BLAKE2B 760084b16fbcd95341e67b24db2919dc84d75e20063fee3793245fc659a18bf816d64348a12aefa22f843d40e216da69588cdde8736f74b4c1b724c128e19502 SHA512 b984af94d3104df7956ede9485f563f23ef8835d50d0524de632f12b02ca2429ba4c2ba587c7023d82538fad3428b0103e9fca623e5ae0bfbc9ad9a3f9bd7d70 +EBUILD httpie-3.2.2.ebuild 3086 BLAKE2B bed66cc50988b57f716ffa0e9770f6398aa305730e77542e566efebf4b500a39f00349831943c63ee5576751d5105b62f7fadc9e305078c7def12e7b46b63dd6 SHA512 17a0f0fb01c191fc5730f8e7684545a95c47b50ed106af2e3d54ca5170c21daad7407e201530acefc7111a5761930202e7c874b4b3491e0c8baaf51638b43725 MISC metadata.xml 933 BLAKE2B a0e1a09be17802bd416493a82c30eeef966985e7e9dd75a0c00de03d36b90b52883cf274d5257f62e2881fad6c8505cfefe47394c2796b97c9973e8a82fd2598 SHA512 dcb5b425e423af7fe38f82f5f32d2cce740789e2f7cae1dbc32a0cf46b6cd1be107fbe9fffa139f9a699042681bdd37a0fa7141fcf8b991cdea8991ed89a694c diff --git a/net-misc/httpie/files/httpie-3.2.1-pytest-fixtures.patch b/net-misc/httpie/files/httpie-3.2.1-pytest-fixtures.patch new file mode 100644 index 000000000000..be3dc48d16b7 --- /dev/null +++ b/net-misc/httpie/files/httpie-3.2.1-pytest-fixtures.patch @@ -0,0 +1,599 @@ +https://github.com/httpie/cli/commit/3524ccf0baa9f2b3029368ab07ba5f64e62dcb1f +https://github.com/httpie/cli/commit/db16bbee961ceb93b7831fe1ec44a72d56a33e38 + +From 3524ccf0baa9f2b3029368ab07ba5f64e62dcb1f Mon Sep 17 00:00:00 2001 +From: Jakub Roztocil <jakub@roztocil.co> +Date: Mon, 4 Mar 2024 16:27:52 +0100 +Subject: [PATCH] Drop dependency on the abandoned python-lazy-fixture + +--- a/setup.py ++++ b/setup.py +@@ -11,7 +11,6 @@ + tests_require = [ + 'pytest', + 'pytest-httpbin>=0.0.6', +- 'pytest-lazy-fixture>=0.0.6', + 'responses', + 'pytest-mock', + 'werkzeug<2.1.0' +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -3,14 +3,14 @@ + import pytest + from pytest_httpbin import certs + +-from .utils import ( # noqa ++from .utils import ( # noqa + HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN, + HTTPBIN_WITH_CHUNKED_SUPPORT, + REMOTE_HTTPBIN_DOMAIN, + IS_PYOPENSSL, + mock_env + ) +-from .utils.plugins_cli import ( # noqa ++from .utils.plugins_cli import ( # noqa + broken_plugin, + dummy_plugin, + dummy_plugins, +@@ -18,7 +18,9 @@ + httpie_plugins_success, + interface, + ) +-from .utils.http_server import http_server, localhost_http_server # noqa ++from .utils.http_server import http_server, localhost_http_server # noqa ++# noinspection PyUnresolvedReferences ++from .fixtures import pytest_lazy_fixture + + + @pytest.fixture(scope='function', autouse=True) +--- /dev/null ++++ b/tests/fixtures/pytest_lazy_fixture.py +@@ -0,0 +1,99 @@ ++""" ++Replacement for the abandoned `pytest.lazy_fixture` <https://github.com/TvoroG/pytest-lazy-fixture> ++ ++Based on <https://github.com/TvoroG/pytest-lazy-fixture/issues/65#issuecomment-1914581161> ++ ++""" ++import dataclasses ++import typing ++ ++import pytest ++ ++ ++@dataclasses.dataclass ++class LazyFixture: ++ """Lazy fixture dataclass.""" ++ ++ name: str ++ ++ ++def lazy_fixture(name: str) -> LazyFixture: ++ """Mark a fixture as lazy.""" ++ return LazyFixture(name) ++ ++ ++# NOTE: Mimic the original API ++pytest.lazy_fixture = lazy_fixture ++ ++ ++def is_lazy_fixture(value: object) -> bool: ++ """Check whether a value is a lazy fixture.""" ++ return isinstance(value, LazyFixture) ++ ++ ++def pytest_make_parametrize_id( ++ config: pytest.Config, ++ val: object, ++ argname: str, ++) -> str | None: ++ """Inject lazy fixture parametrized id. ++ ++ Reference: ++ - https://bit.ly/48Off6r ++ ++ Args: ++ config (pytest.Config): pytest configuration. ++ value (object): fixture value. ++ argname (str): automatic parameter name. ++ ++ Returns: ++ str: new parameter id. ++ """ ++ if is_lazy_fixture(val): ++ return typing.cast(LazyFixture, val).name ++ return None ++ ++ ++@pytest.hookimpl(tryfirst=True) ++def pytest_fixture_setup( ++ fixturedef: pytest.FixtureDef, ++ request: pytest.FixtureRequest, ++) -> object | None: ++ """Lazy fixture setup hook. ++ ++ This hook will never take over a fixture setup but just simply will ++ try to resolve recursively any lazy fixture found in request.param. ++ ++ Reference: ++ - https://bit.ly/3SyvsXJ ++ ++ Args: ++ fixturedef (pytest.FixtureDef): fixture definition object. ++ request (pytest.FixtureRequest): fixture request object. ++ ++ Returns: ++ object | None: fixture value or None otherwise. ++ """ ++ if hasattr(request, "param") and request.param: ++ request.param = _resolve_lazy_fixture(request.param, request) ++ return None ++ ++ ++def _resolve_lazy_fixture(__val: object, request: pytest.FixtureRequest) -> object: ++ """Lazy fixture resolver. ++ ++ Args: ++ __val (object): fixture value object. ++ request (pytest.FixtureRequest): pytest fixture request object. ++ ++ Returns: ++ object: resolved fixture value. ++ """ ++ if isinstance(__val, list | tuple): ++ return tuple(_resolve_lazy_fixture(v, request) for v in __val) ++ if isinstance(__val, typing.Mapping): ++ return {k: _resolve_lazy_fixture(v, request) for k, v in __val.items()} ++ if not is_lazy_fixture(__val): ++ return __val ++ lazy_obj = typing.cast(LazyFixture, __val) ++ return request.getfixturevalue(lazy_obj.name) + +From db16bbee961ceb93b7831fe1ec44a72d56a33e38 Mon Sep 17 00:00:00 2001 +From: Jakub Roztocil <jakub@roztocil.co> +Date: Mon, 4 Mar 2024 18:05:26 +0100 +Subject: [PATCH] Drop dependency on the abandoned python-lazy-fixture II. + +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -2,6 +2,7 @@ + + import pytest + from pytest_httpbin import certs ++from pytest_httpbin.serve import Server as PyTestHttpBinServer + + from .utils import ( # noqa + HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN, +@@ -19,8 +20,10 @@ + interface, + ) + from .utils.http_server import http_server, localhost_http_server # noqa +-# noinspection PyUnresolvedReferences +-from .fixtures import pytest_lazy_fixture ++ ++ ++# Patch to support `url = str(server)` in addition to `url = server + '/foo'`. ++PyTestHttpBinServer.__str__ = lambda self: self.url + + + @pytest.fixture(scope='function', autouse=True) +@@ -72,8 +75,15 @@ def _remote_httpbin_available(): + + @pytest.fixture + def remote_httpbin(_remote_httpbin_available): ++ + if _remote_httpbin_available: +- return 'http://' + REMOTE_HTTPBIN_DOMAIN ++ class Server(str): ++ """Look like `pytest_httpbin.serve.Server` but only provide URL info.""" ++ @property ++ def url(self): ++ return self ++ ++ return Server('http://' + REMOTE_HTTPBIN_DOMAIN) + pytest.skip(f'{REMOTE_HTTPBIN_DOMAIN} not resolvable') + + +--- a/tests/fixtures/pytest_lazy_fixture.py ++++ /dev/null +@@ -1,99 +0,0 @@ +-""" +-Replacement for the abandoned `pytest.lazy_fixture` <https://github.com/TvoroG/pytest-lazy-fixture> +- +-Based on <https://github.com/TvoroG/pytest-lazy-fixture/issues/65#issuecomment-1914581161> +- +-""" +-import dataclasses +-import typing +- +-import pytest +- +- +-@dataclasses.dataclass +-class LazyFixture: +- """Lazy fixture dataclass.""" +- +- name: str +- +- +-def lazy_fixture(name: str) -> LazyFixture: +- """Mark a fixture as lazy.""" +- return LazyFixture(name) +- +- +-# NOTE: Mimic the original API +-pytest.lazy_fixture = lazy_fixture +- +- +-def is_lazy_fixture(value: object) -> bool: +- """Check whether a value is a lazy fixture.""" +- return isinstance(value, LazyFixture) +- +- +-def pytest_make_parametrize_id( +- config: pytest.Config, +- val: object, +- argname: str, +-) -> str | None: +- """Inject lazy fixture parametrized id. +- +- Reference: +- - https://bit.ly/48Off6r +- +- Args: +- config (pytest.Config): pytest configuration. +- value (object): fixture value. +- argname (str): automatic parameter name. +- +- Returns: +- str: new parameter id. +- """ +- if is_lazy_fixture(val): +- return typing.cast(LazyFixture, val).name +- return None +- +- +-@pytest.hookimpl(tryfirst=True) +-def pytest_fixture_setup( +- fixturedef: pytest.FixtureDef, +- request: pytest.FixtureRequest, +-) -> object | None: +- """Lazy fixture setup hook. +- +- This hook will never take over a fixture setup but just simply will +- try to resolve recursively any lazy fixture found in request.param. +- +- Reference: +- - https://bit.ly/3SyvsXJ +- +- Args: +- fixturedef (pytest.FixtureDef): fixture definition object. +- request (pytest.FixtureRequest): fixture request object. +- +- Returns: +- object | None: fixture value or None otherwise. +- """ +- if hasattr(request, "param") and request.param: +- request.param = _resolve_lazy_fixture(request.param, request) +- return None +- +- +-def _resolve_lazy_fixture(__val: object, request: pytest.FixtureRequest) -> object: +- """Lazy fixture resolver. +- +- Args: +- __val (object): fixture value object. +- request (pytest.FixtureRequest): pytest fixture request object. +- +- Returns: +- object: resolved fixture value. +- """ +- if isinstance(__val, list | tuple): +- return tuple(_resolve_lazy_fixture(v, request) for v in __val) +- if isinstance(__val, typing.Mapping): +- return {k: _resolve_lazy_fixture(v, request) for k, v in __val.items()} +- if not is_lazy_fixture(__val): +- return __val +- lazy_obj = typing.cast(LazyFixture, __val) +- return request.getfixturevalue(lazy_obj.name) +--- a/tests/test_cookie_on_redirects.py ++++ b/tests/test_cookie_on_redirects.py +@@ -2,54 +2,47 @@ + from .utils import http + + +-def _stringify(fixture): +- return fixture + '' +- +- +-@pytest.mark.parametrize('instance', [ +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++@pytest.mark.parametrize('target_httpbin', [ ++ 'httpbin', ++ 'remote_httpbin', + ]) +-def test_explicit_user_set_cookie(httpbin, instance): +- # User set cookies ARE NOT persisted within redirects +- # when there is no session, even on the same domain. +- ++def test_explicit_user_set_cookie(httpbin, target_httpbin, request): ++ """User set cookies ARE NOT persisted within redirects when there is no session, even on the same domain.""" ++ target_httpbin = request.getfixturevalue(target_httpbin) + r = http( + '--follow', + httpbin + '/redirect-to', +- f'url=={_stringify(instance)}/cookies', ++ f'url=={target_httpbin.url}/cookies', + 'Cookie:a=b' + ) + assert r.json == {'cookies': {}} + + +-@pytest.mark.parametrize('instance', [ +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++@pytest.mark.parametrize('target_httpbin', [ ++ 'httpbin', ++ 'remote_httpbin', + ]) +-def test_explicit_user_set_cookie_in_session(tmp_path, httpbin, instance): +- # User set cookies ARE persisted within redirects +- # when there is A session, even on the same domain. +- ++def test_explicit_user_set_cookie_in_session(tmp_path, httpbin, target_httpbin, request): ++ """User set cookies ARE persisted within redirects when there is A session, even on the same domain.""" ++ target_httpbin = request.getfixturevalue(target_httpbin) + r = http( + '--follow', + '--session', + str(tmp_path / 'session.json'), + httpbin + '/redirect-to', +- f'url=={_stringify(instance)}/cookies', ++ f'url=={target_httpbin}/cookies', + 'Cookie:a=b' + ) + assert r.json == {'cookies': {'a': 'b'}} + + +-@pytest.mark.parametrize('instance', [ +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++@pytest.mark.parametrize('target_httpbin', [ ++ 'httpbin', ++ 'remote_httpbin', + ]) +-def test_saved_user_set_cookie_in_session(tmp_path, httpbin, instance): +- # User set cookies ARE persisted within redirects +- # when there is A session, even on the same domain. +- ++def test_saved_user_set_cookie_in_session(tmp_path, httpbin, target_httpbin, request): ++ """User set cookies ARE persisted within redirects when there is A session, even on the same domain.""" ++ target_httpbin = request.getfixturevalue(target_httpbin) + http( + '--follow', + '--session', +@@ -62,32 +55,33 @@ def test_saved_user_set_cookie_in_session(tmp_path, httpbin, instance): + '--session', + str(tmp_path / 'session.json'), + httpbin + '/redirect-to', +- f'url=={_stringify(instance)}/cookies', ++ f'url=={target_httpbin}/cookies', + ) + assert r.json == {'cookies': {'a': 'b'}} + + +-@pytest.mark.parametrize('instance', [ +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++@pytest.mark.parametrize('target_httpbin', [ ++ 'httpbin', ++ 'remote_httpbin', + ]) + @pytest.mark.parametrize('session', [True, False]) +-def test_explicit_user_set_headers(httpbin, tmp_path, instance, session): +- # User set headers ARE persisted within redirects +- # even on different domains domain with or without +- # an active session. ++def test_explicit_user_set_headers(httpbin, tmp_path, target_httpbin, session, request): ++ """ ++ User set headers ARE persisted within redirects even on different domains domain with or without an active session. ++ ++ """ ++ target_httpbin = request.getfixturevalue(target_httpbin) + session_args = [] + if session: + session_args.extend([ + '--session', + str(tmp_path / 'session.json') + ]) +- + r = http( + '--follow', + *session_args, + httpbin + '/redirect-to', +- f'url=={_stringify(instance)}/get', ++ f'url=={target_httpbin}/get', + 'X-Custom-Header:value' + ) + assert 'X-Custom-Header' in r.json['headers'] +@@ -95,16 +89,13 @@ def test_explicit_user_set_headers(httpbin, tmp_path, instance, session): + + @pytest.mark.parametrize('session', [True, False]) + def test_server_set_cookie_on_redirect_same_domain(tmp_path, httpbin, session): +- # Server set cookies ARE persisted on the same domain +- # when they are forwarded. +- ++ """Server set cookies ARE persisted on the same domain when they are forwarded.""" + session_args = [] + if session: + session_args.extend([ + '--session', + str(tmp_path / 'session.json') + ]) +- + r = http( + '--follow', + *session_args, +@@ -136,8 +127,7 @@ def test_server_set_cookie_on_redirect_different_domain(tmp_path, http_server, h + + + def test_saved_session_cookies_on_same_domain(tmp_path, httpbin): +- # Saved session cookies ARE persisted when making a new +- # request to the same domain. ++ """Saved session cookies ARE persisted when making a new request to the same domain.""" + http( + '--session', + str(tmp_path / 'session.json'), +@@ -152,8 +142,7 @@ def test_saved_session_cookies_on_same_domain(tmp_path, httpbin): + + + def test_saved_session_cookies_on_different_domain(tmp_path, httpbin, remote_httpbin): +- # Saved session cookies ARE persisted when making a new +- # request to a different domain. ++ """Saved session cookies ARE persisted when making a new request to a different domain.""" + http( + '--session', + str(tmp_path / 'session.json'), +@@ -167,45 +156,49 @@ def test_saved_session_cookies_on_different_domain(tmp_path, httpbin, remote_htt + assert r.json == {'cookies': {}} + + +-@pytest.mark.parametrize('initial_domain, first_request_domain, second_request_domain, expect_cookies', [ ++@pytest.mark.parametrize(['initial_domain', 'first_request_domain', 'second_request_domain', 'expect_cookies'], [ + ( + # Cookies are set by Domain A + # Initial domain is Domain A + # Redirected domain is Domain A +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('httpbin'), ++ 'httpbin', ++ 'httpbin', ++ 'httpbin', + True, + ), + ( + # Cookies are set by Domain A + # Initial domain is Domain B + # Redirected domain is Domain B +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++ 'httpbin', ++ 'remote_httpbin', ++ 'remote_httpbin', + False, + ), + ( + # Cookies are set by Domain A + # Initial domain is Domain A + # Redirected domain is Domain B +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++ 'httpbin', ++ 'httpbin', ++ 'remote_httpbin', + False, + ), + ( + # Cookies are set by Domain A + # Initial domain is Domain B + # Redirected domain is Domain A +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), +- pytest.lazy_fixture('httpbin'), ++ 'httpbin', ++ 'remote_httpbin', ++ 'httpbin', + True, + ), + ]) +-def test_saved_session_cookies_on_redirect(tmp_path, initial_domain, first_request_domain, second_request_domain, expect_cookies): ++def test_saved_session_cookies_on_redirect( ++ tmp_path, initial_domain, first_request_domain, second_request_domain, expect_cookies, request): ++ initial_domain = request.getfixturevalue(initial_domain) ++ first_request_domain = request.getfixturevalue(first_request_domain) ++ second_request_domain = request.getfixturevalue(second_request_domain) + http( + '--session', + str(tmp_path / 'session.json'), +@@ -216,7 +209,7 @@ def test_saved_session_cookies_on_redirect(tmp_path, initial_domain, first_reque + str(tmp_path / 'session.json'), + '--follow', + first_request_domain + '/redirect-to', +- f'url=={_stringify(second_request_domain)}/cookies' ++ f'url=={second_request_domain}/cookies' + ) + if expect_cookies: + expected_data = {'cookies': {'a': 'b'}} +--- a/tests/test_sessions.py ++++ b/tests/test_sessions.py +@@ -821,16 +821,17 @@ def test_session_multiple_headers_with_same_name(basic_session, httpbin): + 'server, expected_cookies', + [ + ( +- pytest.lazy_fixture('localhost_http_server'), ++ 'localhost_http_server', + {'secure_cookie': 'foo', 'insecure_cookie': 'bar'} + ), + ( +- pytest.lazy_fixture('remote_httpbin'), ++ 'remote_httpbin', + {'insecure_cookie': 'bar'} + ) + ] + ) +-def test_secure_cookies_on_localhost(mock_env, tmp_path, server, expected_cookies): ++def test_secure_cookies_on_localhost(mock_env, tmp_path, server, expected_cookies, request): ++ server = request.getfixturevalue(server) + session_path = tmp_path / 'session.json' + http( + '--session', str(session_path), +--- a/tests/test_update_warnings.py ++++ b/tests/test_update_warnings.py +@@ -132,10 +132,10 @@ def test_check_updates_first_invocation( + + + @pytest.mark.parametrize( +- 'should_issue_warning, build_channel', ++ ['should_issue_warning', 'build_channel'], + [ +- (False, pytest.lazy_fixture('lower_build_channel')), +- (True, pytest.lazy_fixture('higher_build_channel')), ++ (False, 'lower_build_channel'), ++ (True, 'higher_build_channel'), + ], + ) + def test_check_updates_first_time_after_data_fetch( +@@ -145,7 +145,9 @@ def test_check_updates_first_time_after_data_fetch( + static_fetch_data, + should_issue_warning, + build_channel, ++ request, + ): ++ request.getfixturevalue(build_channel) + http('fetch_updates', '--daemon', env=with_warnings) + r = http(httpbin + '/get', env=with_warnings) + +@@ -176,14 +178,15 @@ def test_cli_check_updates( + + + @pytest.mark.parametrize( +- "build_channel", [ +- pytest.lazy_fixture("lower_build_channel"), +- pytest.lazy_fixture("unknown_build_channel") ++ 'build_channel', [ ++ 'lower_build_channel', ++ 'unknown_build_channel', + ] + ) + def test_cli_check_updates_not_shown( +- static_fetch_data, build_channel ++ static_fetch_data, build_channel, request + ): ++ request.getfixturevalue(build_channel) + r = httpie('cli', 'check-updates') + assert r.exit_status == ExitStatus.SUCCESS + assert not check_update_warnings(r) diff --git a/net-misc/httpie/httpie-3.2.1-r1.ebuild b/net-misc/httpie/httpie-3.2.1-r1.ebuild deleted file mode 100644 index 8408d5324ea8..000000000000 --- a/net-misc/httpie/httpie-3.2.1-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="ssl(+)" -DISTUTILS_USE_PEP517=setuptools - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Modern command line HTTP client" -HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/" -SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - dev-python/charset-normalizer[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/multidict[${PYTHON_USEDEP}] - dev-python/rich[${PYTHON_USEDEP}] - >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] - >=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest-httpbin[${PYTHON_USEDEP}] - dev-python/responses[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_install_all() { - newbashcomp extras/httpie-completion.bash http - insinto /usr/share/fish/vendor_completions.d - newins extras/httpie-completion.fish http.fish - distutils-r1_python_install_all -} diff --git a/net-misc/httpie/httpie-3.2.2.ebuild b/net-misc/httpie/httpie-3.2.2.ebuild new file mode 100644 index 000000000000..d6672c06715a --- /dev/null +++ b/net-misc/httpie/httpie-3.2.2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="ssl(+)" +DISTUTILS_USE_PEP517=setuptools + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Modern command line HTTP client" +HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/" +SRC_URI="https://github.com/httpie/cli/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}"/cli-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/charset-normalizer[${PYTHON_USEDEP}] + dev-python/defusedxml[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/multidict[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] + >=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + ${RDEPEND} + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest-httpbin[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/responses[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-3.2.1-pytest-fixtures.patch" +) + +EPYTEST_DESELECT=( + # https://github.com/httpie/cli/issues/1530 + tests/test_compress.py::test_compress_form + tests/test_binary.py::TestBinaryResponseData + + # Needs network + 'tests/test_cookie_on_redirects.py::test_explicit_user_set_cookie_in_session[remote_httpbin]' + 'tests/test_cookie_on_redirects.py::test_explicit_user_set_cookie[remote_httpbin]' + 'tests/test_cookie_on_redirects.py::test_explicit_user_set_headers[False-remote_httpbin]' + 'tests/test_cookie_on_redirects.py::test_explicit_user_set_headers[True-remote_httpbin]' + tests/test_cookie_on_redirects.py::test_saved_session_cookie_pool + tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_different_domain + 'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-httpbin-remote_httpbin-False]' + 'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-remote_httpbin-httpbin-True]' + 'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-remote_httpbin-remote_httpbin-False]' + 'tests/test_cookie_on_redirects.py::test_saved_user_set_cookie_in_session[remote_httpbin]' + 'tests/test_sessions.py::test_secure_cookies_on_localhost[remote_httpbin-expected_cookies1]' + tests/test_tokens.py::test_verbose_chunked + tests/test_uploads.py::test_chunked_form + tests/test_uploads.py::test_chunked_json + tests/test_uploads.py::test_chunked_raw + tests/test_uploads.py::test_chunked_stdin + tests/test_uploads.py::test_chunked_stdin_multiple_chunks + tests/test_uploads.py::TestMultipartFormDataFileUpload::test_multipart_chunked + tests/test_uploads.py::TestRequestBodyFromFilePath::test_request_body_from_file_by_path_chunked +) + +EPYTEST_IGNORE=( + # Assumes installation in a clean venv + tests/test_plugins_cli.py +) + +distutils_enable_tests pytest + +python_install_all() { + newbashcomp extras/httpie-completion.bash http + insinto /usr/share/fish/vendor_completions.d + newins extras/httpie-completion.fish http.fish + distutils-r1_python_install_all +} diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest index d5ee52cad5b4..d706cb0e50a6 100644 --- a/net-misc/kea/Manifest +++ b/net-misc/kea/Manifest @@ -15,5 +15,5 @@ DIST kea-2.4.0.tar.gz 10462721 BLAKE2B 07a4424c01872142b85446ee881afbdc9d8b3a0bc DIST kea-2.4.1.tar.gz 10487415 BLAKE2B 21037d28f812ebbc65ae34f5151a209e9c74f6aa005e96ed7cbbf6e4250e6c40eecf5d257b852bf01663a0982b5401008dd6a51a16d861b30a83549f827538b6 SHA512 b8a3b6f2cae213fd9826c37568c71d3458f52eed973dbe437a1d0974dafa026635a730d828c6ff03b32e030be57d75a7914a8ca313833e91d9996b6a05b2b224 EBUILD kea-2.4.0-r1.ebuild 3783 BLAKE2B 08cfb9157984ed86622c14944d051614204e59b16ff21601d5b1a08e0815dc9fbb1b4110210911a9f0f0730eadb712c625773105c19bfd1fa6bea40097bab7ef SHA512 484936bc34d274088f9243fcd23ecff95cf30bebd5036ab8995cf3ad81057df2dacc13e418d11557094d8e9f7aadf01ffa91eaa25913832e359e98d73f98448e EBUILD kea-2.4.1.ebuild 3783 BLAKE2B 08cfb9157984ed86622c14944d051614204e59b16ff21601d5b1a08e0815dc9fbb1b4110210911a9f0f0730eadb712c625773105c19bfd1fa6bea40097bab7ef SHA512 484936bc34d274088f9243fcd23ecff95cf30bebd5036ab8995cf3ad81057df2dacc13e418d11557094d8e9f7aadf01ffa91eaa25913832e359e98d73f98448e -EBUILD kea-9999.ebuild 3649 BLAKE2B 7f2ba60798621edbb491186351f8185947e31a8b6b17d14c930f4b0873bd392aedc36970f15cca9cd58f98dbd3eda069dd274c12c154c6935f9846dccfd4d0bb SHA512 d6e3fcfa8c5f4109a7925007df6311154c8b3b1e535e90b1917609c4a2e614dadcb3727c37cea7448287a60a3558b682c75ed75fb12aa477faccf0bab8e5bbf9 +EBUILD kea-9999.ebuild 3783 BLAKE2B 08cfb9157984ed86622c14944d051614204e59b16ff21601d5b1a08e0815dc9fbb1b4110210911a9f0f0730eadb712c625773105c19bfd1fa6bea40097bab7ef SHA512 484936bc34d274088f9243fcd23ecff95cf30bebd5036ab8995cf3ad81057df2dacc13e418d11557094d8e9f7aadf01ffa91eaa25913832e359e98d73f98448e MISC metadata.xml 760 BLAKE2B def46b553ea484e8c8ebb887fbaa45f30b65b4607b6dbc269540e19e7edac2dd152b6b724f666a2e920b7c7e7269b0e60a08ad46f5e8131b5135950c678d2144 SHA512 308b7461e94919cc2b5ec0627bd63292b874eae91e7520465264fa5c2187085afdfe9c95fddf68265eea49ad38b5cd0e3426982234d191ccbbb4c0161c36a7c9 diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index 2c411fe395c2..72c97487d6f6 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -71,11 +71,15 @@ pkg_setup() { src_prepare() { default - cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' + if use test; then + cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' + fi # brand the version with Gentoo sed -i \ - -e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT([kea], [${PVR}-gentoo], [kea-dev@lists.isc.org])/g" \ + -e 's/KEA_SRCID="tarball"/KEA_SRCID="gentoo"/g' \ + -e 's/AC_MSG_RESULT("tarball")/AC_MSG_RESULT("gentoo")/g' \ + -e "s/EXTENDED_VERSION=\"\${EXTENDED_VERSION} (\$KEA_SRCID)\"/EXTENDED_VERSION=\"${PVR} (\$KEA_SRCID)\"/g" \ configure.ac || die sed -i \ @@ -105,7 +109,6 @@ src_configure() { --with-log4cplus $(use_enable debug) $(use_enable doc generate-docs) - $(use_enable test gtest) $(use_enable shell) $(use_with mysql) $(use_with openssl) @@ -115,7 +118,8 @@ src_configure() { } src_install() { - default + emake -j1 install DESTDIR="${D}" + newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest index 538178fb77c6..4ff5903def30 100644 --- a/net-misc/kio-zeroconf/Manifest +++ b/net-misc/kio-zeroconf/Manifest @@ -1,5 +1,5 @@ DIST kio-zeroconf-23.08.5.tar.xz 44360 BLAKE2B bf441b10221ba8c731756cb5455664fff5a1c8904a952e558084dadb6fe5bcc3a3da072ff58fd31f6c2c35a40ea27241c85403a3db16fd46b52e1a87586b1b5c SHA512 33ed5cb23280ba85ccd4fee149f5983e64164ff0c5f7730e2d49c80784b445c569aa7b925e2d44221854cf7588310f211920d8e4492d87f20be531dbbc9198e6 -DIST kio-zeroconf-24.02.2.tar.xz 44388 BLAKE2B d1724dc433715bc2477fe146469feb66b6535b56cba2172bd66cd5f5b4629a6227a63adb19b50a714ba0330aae5af7c61d4d0899bd281ea5d87c302f3ef12b61 SHA512 8152414cdb7ae3087a03d83471e2c107e9a98cfb9f9f86f451d0e4b00bfbd93450011fa8a7c5e4cc47212169efc9058ae42f24cfcae64960616980a7dca40e01 +DIST kio-zeroconf-24.04.90.tar.xz 44420 BLAKE2B bb3745ef9d2cfa297010a5e7ff41b80145ab762834783cae00d2e624d11ead93359ecff9989d819fe8b59cdc00b9e93e0ab609bf2df4f70bfa15bc54b1397944 SHA512 510796b2b622c638baf050142cecd6c30d62c5c5dfcd73dcbfaf589624e5929c8d720976cff081035c3df3d07e17a23de4fd93df9dc8eddd51d592ef02f92366 EBUILD kio-zeroconf-23.08.5.ebuild 900 BLAKE2B 31511b68fc1fde36743d4eda7530feaa77d6a11e79dd48c920d61aee84216f910ce8c1254182d41d630343a8c288df9e9c33ab8643312c981ef72131c7d19c27 SHA512 81299817a158568a5d1f8f053d7cd57b14d5bebe207b997991b3efaff8fdd75d99c86c8f9a321b8efa35527864a11631a9c5c99c5f33f7538f5fc960972363ea -EBUILD kio-zeroconf-24.02.2.ebuild 590 BLAKE2B 516a79a839a332fdf8822df2f008fb9f9b9d1ae31047cba87edbaae5bbf7d82c1c63defeb27c3dbc61ba32e40cf3672f23993b4d9f4fb818e44175083e6aebe6 SHA512 6087a72d42885792badc77dd9c492810ea368f47a225d4afa9bdf8f51f6bcaba40b6fb35c20a1adee8ac009c306712f888a9e414721c4072c9267b1ccedb6a17 +EBUILD kio-zeroconf-24.04.90.ebuild 590 BLAKE2B 516a79a839a332fdf8822df2f008fb9f9b9d1ae31047cba87edbaae5bbf7d82c1c63defeb27c3dbc61ba32e40cf3672f23993b4d9f4fb818e44175083e6aebe6 SHA512 6087a72d42885792badc77dd9c492810ea368f47a225d4afa9bdf8f51f6bcaba40b6fb35c20a1adee8ac009c306712f888a9e414721c4072c9267b1ccedb6a17 MISC metadata.xml 501 BLAKE2B 467c829559f7cb706ba27fe6400ac8282b9270faadb574fa78ea977c35075a29e8d4c98267f3c4bfdb83d2c39dc8abd3b5db3e94acc3ffaf5cd5c1c52bd9c3bf SHA512 dba3e3de6cb07e240e7664806b196c748df3604e22e84a265b01bbdc2a56192ed1906b30a76c79d6d8c98763c8651c3a3dcff30a0fc942c22a65901234ad2740 diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.02.2.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.04.90.ebuild index d4d2fb728f5d..d4d2fb728f5d 100644 --- a/net-misc/kio-zeroconf/kio-zeroconf-24.02.2.ebuild +++ b/net-misc/kio-zeroconf/kio-zeroconf-24.04.90.ebuild diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index f644a6213a84..8f412e6375a4 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -3,10 +3,10 @@ AUX memcached-1.4.17-EWOULDBLOCK.patch 506 BLAKE2B e6e7c597dc227f42c0af0cb45d99a AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034ca92b0e26280cbd99db3c487f57ef8f1d6ebfae49db44852b88018a95f8d2b0e0a1c6ce16bbaa5c0 SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95 -DIST memcached-1.6.24.tar.gz 1168521 BLAKE2B f68b9111c179865dba8ec126775195bc1dc0efb1ad76b121a06ca019a8fba675866b6d6c243d91412db259bc79cf54ef126b7c7c800198d5c980e1c48f6307a2 SHA512 e43386c2a6c0b95cefdccfe7f6b3890c59ca8b5c2636efc2e910b9617b20a5cf6de9bfedaafe0fb05c91bebb175fbdf033f5e0e512cb041b73af5af0d1854265 DIST memcached-1.6.25.tar.gz 1178044 BLAKE2B a00fb61cf6fbad07d18ecf878c08b250bcc2206f5bc1bbf91d2d1524ba14bba15743a3cc2d919fbdf0388d01ec26671dcfd0e4511b477747497ee564d796828f SHA512 70b11244fdedbea29cceda0f6db94fcd3723f70643f614db1163bae90d9b9792fe247233aa08b894869252f7b8340e85e41213cd04195b5f4ba288901ede80f7 DIST memcached-1.6.26.tar.gz 1178446 BLAKE2B 95919a83bd46bcddc7d055467954da6d64d42d0b9d1ee8e373e6c2a79cf518b768e0bd5d10f25a0eb27e642dd5fbc825f24c968d12034aa6e885a945a018e761 SHA512 7bd0d0dc0d228cde2fc3841c8973a2dde86bd50a4819f9737a22e12435f61d7459655029da390b63b8e6c3ca555b92a9c4c125a7c0bef5e6b051216414f1d49e -EBUILD memcached-1.6.24.ebuild 2869 BLAKE2B 17f3fd3f6fa7e3734a0a7c9fe7a0f80cc1147002842bf7918cc5c2bd00ae71a41849387436f0fd698198bba383bd35283780c52d29d45954d0f545ec22697b34 SHA512 7a0bc969aa426ff6ee1f693bb94b62755401e1ef8dcf367fb64fae0aac717ec59e8f38027e0697d35a357e311eccedb029a99c04dfc777bee33c1398b16b8434 +DIST memcached-1.6.27.tar.gz 1189608 BLAKE2B 056f9555dda758ebb46f62c7eb65712107b1e50b4e4e9696ad4962abdd584df0e0d398590b0e6bfabad33ca18f2a7596d9410d8b35fe069bce6f812ecedd3c35 SHA512 d9de26887339d456e1cace60bf5b2cc2a78231a52ec6f6f36ed7d3ad373eaf231419601be46e80963a3a0254638d03198141647f81fa530b85dbdc4a6071c4cd EBUILD memcached-1.6.25.ebuild 2869 BLAKE2B 17f3fd3f6fa7e3734a0a7c9fe7a0f80cc1147002842bf7918cc5c2bd00ae71a41849387436f0fd698198bba383bd35283780c52d29d45954d0f545ec22697b34 SHA512 7a0bc969aa426ff6ee1f693bb94b62755401e1ef8dcf367fb64fae0aac717ec59e8f38027e0697d35a357e311eccedb029a99c04dfc777bee33c1398b16b8434 EBUILD memcached-1.6.26.ebuild 2869 BLAKE2B 17f3fd3f6fa7e3734a0a7c9fe7a0f80cc1147002842bf7918cc5c2bd00ae71a41849387436f0fd698198bba383bd35283780c52d29d45954d0f545ec22697b34 SHA512 7a0bc969aa426ff6ee1f693bb94b62755401e1ef8dcf367fb64fae0aac717ec59e8f38027e0697d35a357e311eccedb029a99c04dfc777bee33c1398b16b8434 +EBUILD memcached-1.6.27.ebuild 2876 BLAKE2B 6492511f677ae751ec42bd0d8c01db45bb95a264fd9d3eb9c4639c185ed6b40a2696746b5527d9fd951b444ebf7041ee784f016e1a2261cc053932059b9aa007 SHA512 817edbb2ec16159672cf1bb9926a06325af8d1afe09ca52c7950cc6b67e7d1a3ef6e21850f1200a3afc97a7fb4ec0d43142250aff70ebc7ef3cf66eb3ad0cdba MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de diff --git a/net-misc/memcached/memcached-1.6.24.ebuild b/net-misc/memcached/memcached-1.6.27.ebuild index bd837580012f..9561a6bf3beb 100644 --- a/net-misc/memcached/memcached-1.6.24.ebuild +++ b/net-misc/memcached/memcached-1.6.27.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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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/moonlight/Manifest b/net-misc/moonlight/Manifest index 0351450774a3..7a6c7d1abc09 100644 --- a/net-misc/moonlight/Manifest +++ b/net-misc/moonlight/Manifest @@ -1,4 +1,4 @@ DIST MoonlightSrc-5.0.1.tar.gz 79820559 BLAKE2B ae67db6aab9e2104021e35b5bc4822a57a3b82a03f6b2bd1cc95e356833f163e9f6f30afc082dc8d1e4b120ef9ef7aeca2f30eec88502773020e0a6b48cbf0b1 SHA512 618d67afd4638e6c051850fc68b68fd313c9334300e35370b0b3741ec51e30da212633954b7ea47cc1f0644f5005cc06ecf861349418512919453d576f9acd60 -EBUILD moonlight-5.0.1-r2.ebuild 1802 BLAKE2B e00cae459764ac4304a4320fe99a50b8705ebf02edc715723fb1a3c05473b09bae71146c90279cf13171620ff040f89804bd2dffe3791423254eb55e5ec37c48 SHA512 4b61c059ae15707895801e778322e1e62a0bd35b84f7624ad1513de2c5f7cecb6391642aa936f4c520ea7b1361110419bf1d3ebb74ac85458f2db747cf7ba8d0 -EBUILD moonlight-9999.ebuild 1802 BLAKE2B e00cae459764ac4304a4320fe99a50b8705ebf02edc715723fb1a3c05473b09bae71146c90279cf13171620ff040f89804bd2dffe3791423254eb55e5ec37c48 SHA512 4b61c059ae15707895801e778322e1e62a0bd35b84f7624ad1513de2c5f7cecb6391642aa936f4c520ea7b1361110419bf1d3ebb74ac85458f2db747cf7ba8d0 +EBUILD moonlight-5.0.1-r3.ebuild 1808 BLAKE2B 8f2392c535e198200fa181b9874de371e598fd116305456b43d8563dab824df7f851aeba1f8345a9554f274c7d44704b41c705bea1db9eea3cd6663285d859e0 SHA512 6d5d563675710adbca6c4b10fafd16fd04a8c74c06362d064cd52c36166dce43eda0a6042d3f2aa89c79a7b2720215e26fc79b74b1adbdf3ce41cefd27a938be +EBUILD moonlight-9999.ebuild 1808 BLAKE2B 8f2392c535e198200fa181b9874de371e598fd116305456b43d8563dab824df7f851aeba1f8345a9554f274c7d44704b41c705bea1db9eea3cd6663285d859e0 SHA512 6d5d563675710adbca6c4b10fafd16fd04a8c74c06362d064cd52c36166dce43eda0a6042d3f2aa89c79a7b2720215e26fc79b74b1adbdf3ce41cefd27a938be MISC metadata.xml 853 BLAKE2B 606cde0ad1a8f2d919bd448d77e455c2b8dcb8adffb6bfde85f7419996125b72e8c8558b83070c49df7ce45eddc28176792b197727028e490c844a1267395361 SHA512 b78862b34dd5709a2a748c420de84b8610f480de7e51480ff724df18fcc7ffb7c69413f55c9b4e5a28b5508f3c1040cf09ca0e20b4db02192a376e00ef7fff5c diff --git a/net-misc/moonlight/moonlight-5.0.1-r2.ebuild b/net-misc/moonlight/moonlight-5.0.1-r3.ebuild index a6dc05e965aa..33e79bb06086 100644 --- a/net-misc/moonlight/moonlight-5.0.1-r2.ebuild +++ b/net-misc/moonlight/moonlight-5.0.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,7 @@ RDEPEND=" dev-qt/qtwidgets:5 media-libs/libglvnd media-libs/libpulse - media-libs/libsdl2[haptic,kms,joystick,sound,video] + media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video] media-libs/opus media-libs/sdl2-ttf media-video/ffmpeg:=[cuda?,libdrm?] diff --git a/net-misc/moonlight/moonlight-9999.ebuild b/net-misc/moonlight/moonlight-9999.ebuild index a6dc05e965aa..33e79bb06086 100644 --- a/net-misc/moonlight/moonlight-9999.ebuild +++ b/net-misc/moonlight/moonlight-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,7 @@ RDEPEND=" dev-qt/qtwidgets:5 media-libs/libglvnd media-libs/libpulse - media-libs/libsdl2[haptic,kms,joystick,sound,video] + media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video] media-libs/opus media-libs/sdl2-ttf media-video/ffmpeg:=[cuda?,libdrm?] diff --git a/net-misc/netdate/Manifest b/net-misc/netdate/Manifest index 7201b9c09e8b..46d35f22a65f 100644 --- a/net-misc/netdate/Manifest +++ b/net-misc/netdate/Manifest @@ -1,4 +1,4 @@ DIST netdate-1.2.tar.bz2 7516 BLAKE2B b044f8294716a5660cab8c77cc9bfccf0f606a89f8b4d73d93a760f69bcdb4e48aaad7b6c0fbf7a22468e1f3aa1f026647159270456a989d9df65c3af458e3db SHA512 a6c3dde42dfb886a01a137485b1a52f4cfb00150bec3a9603a7475405cecd621c5604fe66e2d3e4fd50feee18ac9d60423231a377fc5629e465530b16b0ce918 EBUILD netdate-1.2-r1.ebuild 474 BLAKE2B cb6ec0cfad3a10868c929cd314ea58c05b48cde86e49065b6b4ce7fc5bb819cdc0ec3a988e9ef7f9d6977728068e79fd4d2ef43d1ff8cf0488548a76b7a46aab SHA512 7514876da1d319339958e067ebea9e9f5aedb4bdbb811d90f0d201ff07b07109a1b9037b3b02eee4538b395bc9173bb2918e69aa4c40570f9d5d94c9b536f77b -EBUILD netdate-1.2-r2.ebuild 549 BLAKE2B 1acb10a1a6e6e01858ea7db9b06b00059ba6b658ba09e6e46d2127568b5881862956f1b32d1fdc6b24cba278df095f787d8f4f00542de977c5539a093be78ae5 SHA512 8e77f5f1cb38abfb32e197609ad472cb4dc86804dfd312c6109cdc3dcaccd0b36b0c7bceba3c12fe1b089921e24f5fe7da0f5371214972140f4ee95ed859fc45 +EBUILD netdate-1.2-r2.ebuild 546 BLAKE2B 984683bb702c1882890c010062342ea39be4e5d48611299300b2bd1809676e00f24d3f5b63002c5f0618705b25b985f7722fd621ba92ea16e7fe6c805d34c579 SHA512 b21de8b1e7f481c9061b06177eae8bc131af0fc7135fd96d02f704c787f744557d37d8014a326dd572899a18e39f793fca10808d04894f4621ec2a19f9b0b855 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2 diff --git a/net-misc/netdate/netdate-1.2-r2.ebuild b/net-misc/netdate/netdate-1.2-r2.ebuild index 832dd2e23b62..53aa311fc857 100644 --- a/net-misc/netdate/netdate-1.2-r2.ebuild +++ b/net-misc/netdate/netdate-1.2-r2.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm ~mips ~s390 ~sparc x86" DOCS=( README ) diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest index a72f725eeb61..9fd82ad1fa1a 100644 --- a/net-misc/netifrc/Manifest +++ b/net-misc/netifrc/Manifest @@ -1,6 +1,6 @@ DIST netifrc-0.7.7.tar.bz2 75823 BLAKE2B e2d99ac347e9a449b39981b1aa1585ff83d05af1bafe09f7e2e25954360df1e76f53ce4a5c8e08777ba45baf697a307697576835df4c4b4ae010ab84dbe8bb2b SHA512 995f89beece9e7ff0b558b466c06a476f22d3161f31622a232c382d81e74399aeb0a39cb4a95080829120c527a1a93757425671e2ca3639d8637e5e905ad3e80 DIST netifrc-0.7.8.tar.bz2 76239 BLAKE2B 501a2bcfaa2753187425cba31f01b2a644ae4d01da76e4bd3722b815b1fa743905728fd66ac9d56c915dba767723bd5df2c417706c8a0150628e61b6e0b86ffb SHA512 d483453058d3e8c3cb22e8eedea69e12ac5fe94449d35a2cd842d7e32603174a470a8a4e883ebf24a0f09374dbf1f4c0c0db5094ae2d2191bcc1c9c8356170ad EBUILD netifrc-0.7.7.ebuild 2122 BLAKE2B 2c045cc2c0455b04ffb6baf15b826ab6ac095494a8f3dc5417e8347f3b7036909a2f908847db11484ac022e213535ac1455938d37bf1a19d4372c2d0c28392aa SHA512 9e112a658ade100af58af534d08b0cd846e247ce6d9826477174e4987cf41265d796a572fa40f7d21f291691ef28eb9bf9068ddc51b79c1e32542421bb64a79a -EBUILD netifrc-0.7.8.ebuild 2130 BLAKE2B b8309ee98f568c70f6a66f5b59b8786da4cc9070b034e05820cdb923a5f795842afa9335bee2fe79748de4c0f16b94723342e7522e3eabcf55bf8df76ab24d62 SHA512 8a4c47e5e98e6f0eee105f1dd6aac1f8902a184bf55b4f9a99ad2210ad8ae959ff207a473e41a846119973d98b911006f29c01fca6619e5bf9b9f95a1601f43c +EBUILD netifrc-0.7.8.ebuild 2129 BLAKE2B 9c620bf090d1597979768d132288066a4db187efd9ccaae3dbe05585534e5f2c153ac0b002192f11de257d7c17f74e4643dc90c05b257fecf1809d2528a7beb2 SHA512 bc3964cbe215cc085ac47b6b357611563e33ea3f080fe401a632a2975b7cf0b80a4236b95a822b3db3046759864370e1fcf184997c8cafaa2dd286491bbfb06b EBUILD netifrc-9999.ebuild 2129 BLAKE2B 2f81ef8f54da84b6126004315a567947fc96ae91262184c3311d7b194a111f4ba7cdfa0db3d4c9e18290ef001a7390f9f5b6c5d991530c55f692ef9c33236b2f SHA512 ccaea5f035a25cdc97a22043f64a7f76539e4b773ca65a6d1a8ab56c0c4272d951061df967a78edbd7cdcadfc216dd662137d81dd5ae1928b80a16efcfcc3057 MISC metadata.xml 590 BLAKE2B c31ae830efc67c90566de9c4b3c4c7edaaea06f4e248295405d73e89e3fa61c925999e6cdfb89d37e1bd484442fe196c966ae256faa03355a31d331340b0f1ce SHA512 c1b6c24f5ee1cafde0e950fcbfa926f35529f991c1eb91436473d4d0ac8d338941b9b18bab62319fce712a3a14d04fd57019e433e584f4f2fc52a3591b8585f6 diff --git a/net-misc/netifrc/netifrc-0.7.8.ebuild b/net-misc/netifrc/netifrc-0.7.8.ebuild index 40e121512a2c..5357dd17292d 100644 --- a/net-misc/netifrc/netifrc-0.7.8.ebuild +++ b/net-misc/netifrc/netifrc-0.7.8.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 GPL-2" diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest index 8bd047987458..5f0e4830b184 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -5,11 +5,11 @@ AUX ntpd.rc-r3 491 BLAKE2B e91eb8921b60142d9f827abf7c2a4e4e48be423b3227cbe736433 AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0dba7f268febd10fa7599ef6b9bee30199ce10529d2d326719f5b376d301aabfef3beacecd4af813bcef1d6a65d61ab00996d72f1240f83ef8e3 SHA512 3e012ad70507f440ed3a4aca4886a96e40d49a0dd7c14572f664633a56139cb7767e07ee1bb5e8295fc32052914364660c928d11369b6f80193ae7e190e5a48e AUX ntpsec-1.2.2-logrotate.patch 663 BLAKE2B c5e8eca739909695b6fd6cf7e507acb8e49a8eb2eebbf2afe83733159b8240f563a22a7389ac58373c10df104ee5dd34c7aec40787200bd3d704e5f0273cfc42 SHA512 ccba1116fac3fcb8dc075c81f2d8ed24399b41b6718ae65ed042b0da8bf19c0a5259650323a9b1d6f0e5c44ae167874ccaca7cbdd50b38955b17a4a49840c863 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302 -DIST ntpsec-1.2.2.tar.gz 2710329 BLAKE2B 031412d0fc7ecb5aba73501e63f8d0c416b23fe69114dd32422b03b4827e1ac9c92a4dfeb2e7d074cf6fd410d00cf86632f241dffd22987e4c03b21d21d8693a SHA512 864afb72c4bd8bc439ee06d343893cf92b3893c26c972a7bd1ff2713f0ad1f50704b6d0c6f155e6373c9747efff3ea36097a590be0d53e1a7ea7f429ba409cd1 DIST ntpsec-1.2.2a.tar.gz 2710790 BLAKE2B b069433598697ab1e8110dbd005316a295d14c1e180fe0af2d19494bdff941d01234f0b4e9f38a150e27e450e1bd1f4dcf4535f9ff51c253670d11c5cb67382d SHA512 7a2cc04bde49800a745c74933e565a4764a22be484faffc5ea933231b74507af737a691cd0bb3aa024e81c083be0718c8d7b30dd152b0b0d386ae72fda426db9 DIST ntpsec-1.2.2a.tar.gz.asc 833 BLAKE2B ce21b020d2a8590b731fdd4c171041fadbd699d60b9e10b2dc548675eed2efc04b9d5ae75fa8f77cc9c8e55db0f609d1eee5c5f2f7c7d804e1b087eb9ea95e1d SHA512 c1b0c1c6b534b11ef172d5ab68ada47bbd9e3f0298400c684e8745447221db16e4f4de436f06b0f6ab374e437b0506853a3a3da2bbe17c148cdf7de62c769f28 -EBUILD ntpsec-1.2.2-r1.ebuild 4216 BLAKE2B 1878542ea91ae273da114e7a5992657e676808b681f91b13a82ff745a4549d6873e205e0e26c02ddedea2ab8896c02a952033adfd8e6818203b751c028d5533d SHA512 ce908ee199ceb561a7b450e6854ef3abc674ed8bf470d357e837d0fbb7b73ab06f8b9f20593ae47d4dedb8f31bb3f5509b2cfaab75ac7777c4a5877eb4288820 -EBUILD ntpsec-1.2.2.ebuild 4170 BLAKE2B c359af305fd9c7dfaee68b73a45277789d5253b0ca6aaf34da7e16a897de2689da7de78e72c38d60ebc583333116fe1e1f5ef361d100c474048000e7656c5128 SHA512 1a2b3332e25038ba639c5b1a41fdda289d8cb52a41a5576845a4b5ea2d153f761440e2204772113dbf4a21966ab9c8d076826248413b16500e67ba0e90f4aba8 +DIST ntpsec-1.2.3.tar.gz 2725081 BLAKE2B d39a4d08790949afb28b843739a410624a8d862bfc25afd4e6c7dc55be43e41f3c89823406c60fb911496e7a3db51d6fa83c8bcda9b9686708c36154c2fe9686 SHA512 6baecf32f499fc12c2ef0b44360072b61ab9e8b52ec7ead64ff43a27b5a57431db939d4ce1fad92d38def981f6256a1d8ede0c0cdc5abb50d861be729255eee2 +DIST ntpsec-1.2.3.tar.gz.asc 833 BLAKE2B f0d6a0b163a7f9214da6d6eb1982f87387a7087efb740ec146f55362381aa101a5a8e40c27f121ca6607c0a5c429b1e06ecaf9a9ab5392d836535430cf6575fa SHA512 17280e3092e7e9de0ddae0723637a261d3a740d916ce0f016c44c6010672cfe2fc39b45f86257cfa5bd29f1f11895f8bd583c76765c6484489027cbc82dbe6b2 EBUILD ntpsec-1.2.2a.ebuild 4400 BLAKE2B a8329fecac0ecaa5643dbcccbb77c6c3c3b944677f1c5bfb350e21a2d734b8f20862cc3b0fdc1c3135e8de4f75d11bcad523cb27b4f062af1839ba592738b387 SHA512 46b98f059d76924fda38340b6803935ec97ad9aa3dcd68d95f4913d7f733581e1253e322ee8357735ef6d9942482eeecbc3cc259e3511c94ff0ecbfbb87c2a93 -EBUILD ntpsec-9999.ebuild 4403 BLAKE2B d58b5734dd41bcf3fa3d2a5fb3a487bcacb8782c1e5ee16ab717de0cbfc4c09cf3dd4b07c5c2fe556b845c4ef390d38872bb808ab7281db7e5c0e4f7f14b73f4 SHA512 dbd1ddc69ae0c99fccadae12c9fd13f80633de9377a51e2af55ee88f553c3d27b94d3c1db48f3eedd5185d39dc296d57f918cbdfebd00c0379651765b4acd2b5 +EBUILD ntpsec-1.2.3.ebuild 4357 BLAKE2B 9ec09cbdebd9fb42cc1cb29f6bc83b5508fe672c851c96442147df5428b630f04ac6f745216cba80f7ed840304938f30815070f26aa52f51610e62b8ce972334 SHA512 793da62d08d511c1bc9c769de7d8eaa8ed7bfca9aea4cc1d285ab5c41b405627b54cbffe6c02e1dabaf7a25de6232e96dc12fff9b5ce0d8c91f41c3f2a84b9e6 +EBUILD ntpsec-9999.ebuild 4357 BLAKE2B 9ec09cbdebd9fb42cc1cb29f6bc83b5508fe672c851c96442147df5428b630f04ac6f745216cba80f7ed840304938f30815070f26aa52f51610e62b8ce972334 SHA512 793da62d08d511c1bc9c769de7d8eaa8ed7bfca9aea4cc1d285ab5c41b405627b54cbffe6c02e1dabaf7a25de6232e96dc12fff9b5ce0d8c91f41c3f2a84b9e6 MISC metadata.xml 1777 BLAKE2B e324b32f904e5f076331594aefa32e5174e917a78fb0e1ca0361a2a0cae8f7813637e044d6c351e3f1d07d01733062def59666b89f73d134a507332585f29ae9 SHA512 db03c0268e00fea3701979e30b3bb3b1677de9f2c6692c99eb78cf5a929ca39cb8f379add7ba6786f1ddbb80e1b9263ec46bf459706996c12f3fd38bbc9452ea diff --git a/net-misc/ntpsec/ntpsec-1.2.2.ebuild b/net-misc/ntpsec/ntpsec-1.2.2.ebuild deleted file mode 100644 index 0b9c2a939cc3..000000000000 --- a/net-misc/ntpsec/ntpsec-1.2.2.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE='threads(+)' -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 flag-o-matic waf-utils systemd toolchain-funcs - -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 - app-alternatives/yacc" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.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() { - tc-is-lto && filter-flags -fuse-linker-plugin - filter-lto - - 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|,$||'`" - - 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") - ) - - distutils-r1_src_configure -} - -python_configure() { - waf-utils_src_configure "${myconf[@]}" -} - -python_compile() { - waf-utils_src_compile --notests -} - -python_test() { - waf-utils_src_compile check -} - -src_install() { - distutils-r1_src_install - - # Install heat generating scripts - use heat && dosbin "${S}"/contrib/ntpheat{,usb} - - # Install the openrc files - newinitd "${FILESDIR}"/ntpd.rc-r3 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 -} - -python_install() { - waf-utils_src_install --notests - python_fix_shebang "${ED}" - python_optimize -} - -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-1.2.2-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.3.ebuild index 8dccc88c556e..ca1b744563fb 100644 --- a/net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.3.ebuild @@ -3,23 +3,34 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_EXT=1 +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE='threads(+)' DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 flag-o-matic waf-utils systemd toolchain-funcs +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" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ntpsec.asc + inherit verify-sig + SRC_URI=" + https://ftp.ntpsec.org/pub/releases/${P}.tar.gz + verify-sig? ( https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc ) + " KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )" fi DESCRIPTION="The NTP reference implementation, refactored" HOMEPAGE="https://www.ntpsec.org/" +LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" +SLOT="0" + NTPSEC_REFCLOCK=( oncore trimble truetime gpsd jjy generic spectracom shm pps hpgps zyfer arbiter nmea modem local @@ -27,30 +38,37 @@ NTPSEC_REFCLOCK=( 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 +IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early 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} +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} + 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 + ntpviz? ( + media-fonts/liberation-fonts + sci-visualization/gnuplot + ) +" +BDEPEND+=" + >=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets - app-alternatives/yacc" + app-alternatives/yacc +" PATCHES=( "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" @@ -74,7 +92,6 @@ src_prepare() { } src_configure() { - tc-is-lto && filter-flags -fuse-linker-plugin filter-lto local string_127="" @@ -97,7 +114,6 @@ src_configure() { #--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") @@ -138,7 +154,7 @@ src_install() { chmod 770 "${ED}"/var/lib/ntp keepdir /var/lib/ntp - # Install a log rotate script + # Install a logrotate script mkdir -pv "${ED}"/etc/logrotate.d cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index cc9e877c051b..ca1b744563fb 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_EXT=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE='threads(+)' DISTUTILS_USE_SETUPTOOLS=no @@ -38,7 +38,7 @@ NTPSEC_REFCLOCK=( IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} -IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice +IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early heat libbsd nist ntpviz samba seccomp smear" #ionice REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" # net-misc/pps-tools oncore,pps @@ -114,7 +114,6 @@ src_configure() { #--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") diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest index 43d07b4cce9a..d39d9bdbdb08 100644 --- a/net-misc/nx/Manifest +++ b/net-misc/nx/Manifest @@ -5,6 +5,6 @@ AUX nx-3.5.99.26-which.patch 1157 BLAKE2B 0118abda74ceffa96bbf7fc1518ca5073c3a51 AUX nx-3.5.99.27-which.patch 758 BLAKE2B 6d8841c80f086592365042d225128ebd897b118f5fdf6c573df2a845ae08d54e08f8c5c349a3a601325fb82f83bc5411262cc48b05f28a6ba24de685ab11a491 SHA512 3adca92c7e6aad36eec354f7a637c864e0ebba99535d6568c52e033ebd07ce1b026204f9b849889b324184f479ffe6195249c7d3affb1852934cca980b7c018c DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211 DIST nx-libs-3.5.99.27.tar.gz 11076330 BLAKE2B 713f6052a8405bd61916bc2c31cff1b3b14f63f78138a2d8a3c8d85170fede3d126071ef0e03fa267ef1533432f324992ed67edc86f922e3dda4f0cb40811045 SHA512 bfba1eea6f4debe90fa020276079027c3716daaff91bded72297ecab2a8c9f56d07630ca8bc9084c319d2c674304ad80131190ec1272c161c05221d6f19089d0 -EBUILD nx-3.5.99.26.ebuild 3778 BLAKE2B b80f3f4a4b02aa32c3ce9d5a99521187b3284f1d1d8d850ab915792dd6ab48552d38d41df5f83068cbdac27ab9a1c39c85110618196e3737946cd38505028c48 SHA512 3ffaff82921912897ac112ff569cbcabe3809a256134b51eb6b2eb7746b50ab26c9c3300a2cda860bedca175f31fc6d64ffc80e635a3cddea49863a79ffc35fd -EBUILD nx-3.5.99.27.ebuild 3520 BLAKE2B d109cf890afbb7e00eb022db10ebadc8b8f1191fe3e6ebba891083c854110299fcee21d8222bdf17d433d9b5f3593adec009d598491a5545f89d3233632cee6e SHA512 66d6730129efeaf8d2e91f7ab3b6476b7593afe3f62ed720b5a841b8c21e0e65328a19edcede62b1e3e419ad05364c882da2a76a8c85dd9ba74655e815e81636 +EBUILD nx-3.5.99.26.ebuild 3976 BLAKE2B 6828daf2673119018868dea0b46fc333aa0b646134fb90a81d1cbd5a7fcd5350f91706cabe677a8ade0146830ac9490d27a6fe5b1218573690ddcf3a7b7a6696 SHA512 1b069fbaaf9b797208de3268d126a0e4f11b7faf2bd79dc552b65cd066e9e4ad810d028e7ff7f5c87b6909244223c669e9ef4eb758968ee9a0fb1ba4e70bb0ff +EBUILD nx-3.5.99.27.ebuild 3718 BLAKE2B 5c3eaa3e1a308e9712079289b6db7681a25a8153f114a2917cc6d017d1375bb49e5e3e296ba8d31e602c1d2cb73888948690a6133a6d8932a5044637d4bc1d24 SHA512 37b2f9e526b240209a6ca504d0c8d7c01d8d7356fc523b8a2cf001f6f066f7a11aa8a8cacc7e36a63caf872be5e4c00a4fe6b49f73cfb5a0ae455b69736b2723 MISC metadata.xml 333 BLAKE2B 1b2843f4928b28b0b3abea2c4b7cf046c77d8c87363672f8516c7edab36597bd2ae831f23eecbec5c38029891bd5fa5bc0dc42a407e3d656ab6cfb098262f64a SHA512 77a92a8f8cec2c2a236544dc53e58fce7e0d399d9122042ddc6a097b58d013d04bad6e2ccaafcca11ce3c2e0ddd2d6aa479776e1e37539e40e3645ed20485bfd diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild index 01e20ce031b4..3a112d2be6bb 100644 --- a/net-misc/nx/nx-3.5.99.26.ebuild +++ b/net-misc/nx/nx-3.5.99.26.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="NX compression technology core libraries" HOMEPAGE="https://github.com/ArcticaProject/nx-libs" @@ -72,6 +72,13 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861680 + # + # inherited from libX11 vendored code. libX11 passes this flag already. + append-flags -fno-strict-aliasing + filter-lto + # From xorg-x11-6.9.0-r3.ebuild pushd nx-X11 || die HOSTCONF="config/cf/host.def" diff --git a/net-misc/nx/nx-3.5.99.27.ebuild b/net-misc/nx/nx-3.5.99.27.ebuild index e054f77bb1e5..60a90c7c8d28 100644 --- a/net-misc/nx/nx-3.5.99.27.ebuild +++ b/net-misc/nx/nx-3.5.99.27.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="NX compression technology core libraries" HOMEPAGE="https://github.com/ArcticaProject/nx-libs" @@ -66,6 +66,13 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861680 + # + # inherited from libX11 vendored code. libX11 passes this flag already. + append-flags -fno-strict-aliasing + filter-lto + # From xorg-x11-6.9.0-r3.ebuild pushd nx-X11 || die HOSTCONF="config/cf/host.def" diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest index 58e1b569a4a8..9dc13723b39d 100644 --- a/net-misc/nyx/Manifest +++ b/net-misc/nyx/Manifest @@ -1,3 +1,3 @@ DIST nyx-2.1.0.tar.gz 6908817 BLAKE2B e67305c0e2a066976cc828235bb364a238af2842251b466cc70bf8ad79138ffb5d6c598cf5900b777caf03ffefd0566e9eccfb65131ca0dc26670d71d8f9a756 SHA512 69a645cc811a1b1fbd9cf0501d8f23f1a52e0e92a0598097bb0c9efb040e1895e1dd431bad93be36db0e85ca7ac32ee5c866d50d2812069a39e5160b44575a37 -EBUILD nyx-2.1.0-r6.ebuild 832 BLAKE2B ca40d78c92e6d8ce88d5291843d301f1637bdcb76bff134f85c2a87bbc1b414583d61b3fd29caf49022783567fdbcb689108dd51b53ca77fed97146b4d67cea3 SHA512 5d66a24819f1af536a61ae1a475f55ca17303b567f9280bd4d5aa7a66716d04360ff38d2ac049886c32cbfaf4fbe5768072cf8fa70fe025a186474801edd5f1f +EBUILD nyx-2.1.0-r6.ebuild 832 BLAKE2B d256d6a5a4b4afda414c35acb20cae80e63e4d5f4c32da2896c91faed13a6727bf49759716a1e4472b3ded06c6d22b5907039f35b66307f95a49e0a8a9a03d07 SHA512 2f256c180ea34c25450af5325907e8cfe12b515621f4934235861f9f46b8dc7cc9f084afe2f4f10484e333d66baa90b8e405af7b1509d2b3e7e0023daead6fcf MISC metadata.xml 239 BLAKE2B 1fb9280aa15020a1e294df309888ce1474f4adf5c9bed6e57f351fad2020e5a6869773a66acc7c26e5dd6ae3c064929b8c65576476a1e01e8ab05f40a43cd404 SHA512 efe6d1b33faf5158bbae729e022bd2da7c687f26bad4df9bed9a4238e5265e83f39b17d4de66cc7ac492100de8eb2cbd22dd118174c7aafb027c2107617185fd diff --git a/net-misc/nyx/nyx-2.1.0-r6.ebuild b/net-misc/nyx/nyx-2.1.0-r6.ebuild index 4211aadc685b..11c917f7f5e2 100644 --- a/net-misc/nyx/nyx-2.1.0-r6.ebuild +++ b/net-misc/nyx/nyx-2.1.0-r6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{9..12} pypy3 ) PYTHON_REQ_USE='ncurses,sqlite(-)' DISTUTILS_USE_PEP517=setuptools diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 552df14fe858..626e2ad43391 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,7 +1,7 @@ -AUX openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch 415 BLAKE2B e29acfc416d7a84a19691a56cc7f8f6a71955b147d2f7d8686cfa391887040a66249312a321c02f9acc665dfdfcb04b129772f0e44ebdf1ff54853d439a39d7d SHA512 122d325267aa69e4c9520b396ba8608ab1ea77f651cb0078479bc60c938366632c4bc7b0d17b12ef7a13bb6a447b230122029dbed93b837c9698fc91a2822e11 AUX openssh-9.3_p1-disable-conch-interop-tests.patch 554 BLAKE2B f5f45c000ec26c1f783669c3447ea3c80c5c0f9b971b86ca1e79e99e906a90a519abb6b14db462f5766572e9759180719ea44f048ef5aa8efc37efb61d2b6ef7 SHA512 f35b15f1e8d0eb276d748ee14c71004c6599ddb124c33e2f84623bc9eb02bb4fd4680d25d0ba0289d6a723a526c95c9a56b30496bdaa565bae853bf3d1bab61f AUX openssh-9.3_p1-fix-putty-tests.patch 1691 BLAKE2B 8a92766bd2db65a4dab1254a356ecee65203e11179a499b40dfde623c642a0d6aa205490faabd50abfba5bbb4a9d3e1fa9427c42fd82883df1401b7a871979ea SHA512 4b27ece068d233e128dde2571a93ce6ff695ee975e5dcbef84b8c0923e84903494f980bbe38129cd9f83bb34e7a7940f8686a5b8f85d20e3e11c53b6d933196d AUX openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch 1647 BLAKE2B 9d55e9060e6eae041176bef27acc58d6026c8fb68c65c71c11c1acbe4e6840a63fba3dbc113a8981da66901717c1f3b4f2211a2cb322d3d4e5eba8c86f4e269c SHA512 d8fc604795d8bb4228ccbfe5714d5503bb1e0d63818d2fac65d533530d01fe4ce4fac0743b8b415f646322fec859b699fa7365beba8a42bd880d737b7c6bd7df +AUX openssh-9.6_p1-fix-xmss-c99.patch 696 BLAKE2B db9ad0e9340ee241d28310b438e90a909bea551fe136f2e6855f00067e63f3558a773005359454b14315dd46ac508397ad8f081b4aaae9f7ccf0bbc30b263d85 SHA512 1e7c2b7aec655ba312a9c0edb9db5f79323aace53f5531d69d60672e1f5bb329543558d8abea5e7a21cea1c438c5ae228f6e2a0fc39a78524b6f7f005b8011e3 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c @@ -12,6 +12,8 @@ DIST openssh-9.6p1.tar.gz 1857862 BLAKE2B dd7f6747fe89f7b386be4faaf7fc43398a9bf4 DIST openssh-9.6p1.tar.gz.asc 833 BLAKE2B 9363d02f85457aa90069020827306a2f49d8406e32f5ee1d231844648dd2ffa02fa9b7325b8677a11e46a0ba0d9ffc86d9c989435d691a02f5354a956c49f9f9 SHA512 aec5a5bd6ce480a8e5b5879dc55f8186aec90fe61f085aa92ad7d07f324574aa781be09c83b7443a32848d091fd44fb12c1842d49cee77afc351e550ffcc096d DIST openssh-9.7p1.tar.gz 1848766 BLAKE2B 520859fcbdf678808fc8515b64585ab9a90a8055fa869df6fbba3083cb7f73ddb81ed9ea981e131520736a8aed838f85ae68ca63406a410df61039913c5cb48b SHA512 0cafc17d22851605a4a5495a1d82c2b3fbbe6643760aad226dbf2a25b5f49d4375c3172833706ea3cb6c05d5d02a40feb9a7e790eae5c4570dd344a43e94ca55 DIST openssh-9.7p1.tar.gz.asc 833 BLAKE2B a95e952be48bd55a07d0a95a49dc06c326816c67b8b5d40bd3f64c28aa43122253817b8a088e7a3b8a190375ea39f9fc3400b22d035561f9643c1d32b5caef27 SHA512 e028978e4266de9ad513626b13d70249e4166923fc15f38751178e2b3522ff6ebb9a7ca7dc32d1bb42d42fb92adf9903dba1b734bec083010ed7323aadad8baf -EBUILD openssh-9.6_p1-r3.ebuild 13890 BLAKE2B ada79c2c62392ad259d3ddc7e5d92d67aeaba8b4e9be6063cdc33c29459f3225014012a19dc4513fc5d507377826da430bd8069155fb0e83c625b43f953bd40e SHA512 56ecdd20399d725e0dfc8bcdedace31751f3d01019316b8b39a9f2922cd02cabae47f65e0524cc4c57bd452e18e18636ba9ddfde9d379bb28258e75ef9b44645 -EBUILD openssh-9.7_p1-r2.ebuild 14066 BLAKE2B ada1b60519d235b78468cd5a0ab142e2bc4c897faa14b222025ce376dc4c7e5d6ebff8ac54ee2e8b8628b0a5ea6b5894908b1ae45aac7de11e40d780f009373b SHA512 76da8edc2524f830ffb5abc5a50fc8806f3907e3e197055b472e3c6f27bb3d7166c636616b3863b978a750d393d444559f6c6f690326ca809e6042cf753860f9 +EBUILD openssh-9.6_p1-r3.ebuild 13807 BLAKE2B 61ce712b91455496975c2f5daec0d50fc32dd677aee7612f7734c9a690724c2ae9d968b50a56216e765dc1aac289491e16a1e80856c3cfc745e0ab869d409ff2 SHA512 66cfc7769271649448389e2b25987ee1702d0a9bce45699e746374cd923065e7ff6d8b6df0616a3af80381e7963500512acee66995a6a5088b5bc49266ec2010 +EBUILD openssh-9.6_p1-r4.ebuild 13862 BLAKE2B 1b30cb07de4207d7589c1912ce723a2b72b0afa376db008abe25fffad2ddf8cce95f6b4a40cbfaf5a6302770503bb402f4fc535078a153bd0e97d70f77d5ac0f SHA512 bad36e36ac0f200b97f5bdca41040f12c89b677146dec6b5f9637f7a5b3d91d19afb42ef965cdc2c105866b56fda66b27c8f0fc2b3d5d3beded7462ad2c3ce67 +EBUILD openssh-9.7_p1-r2.ebuild 13983 BLAKE2B 7d6127c1c0660c549be4e2166e5322ac6a7b86f9e141571a4c14d152aec06b2dbc0837152f8e64c127a4604a4ef0fc0ec2efdf87ea1285cfd717eaccdfae102d SHA512 9f5d8ddc3d15043dc1de5aaa87cccea8d4151265582f52137675193210d8796f5b8baed53c8d2ee883a02a8009dc9e42b7024171d69637173b6011ee277fc81f +EBUILD openssh-9.7_p1-r3.ebuild 14030 BLAKE2B 0763b2e35a159bee5d8548ca1e0a553971db58108d56dc58a4b33e6072fa06b9f516909c9220a1e0740c4a4dd636e2ec265f5a19a32088eb63477feff38f2b66 SHA512 4e2d56e8320eab4dae7caa0bef36668ba91f5377871ef6bfbb884ab14794fd7ca2b348681d703566ad2dd6a357c1f842fbe253948ae59cbf605e3bd538757a2c MISC metadata.xml 1788 BLAKE2B d04d3030f70f3615522672fa56e684acaa67ddce8d16cce86ba8911fb8fc11ed152be012ecf560427d271868c4841a7422aaa644305947302d3ebab62bdb577d SHA512 bd328e3a33ce04b989149333db5f774f1b52540f12ef83b08b7fcf136ae2a3a9c83bef42c28991d3536249098ca0b9ffd21e583d93599580510d8619e9fd01ca diff --git a/net-misc/openssh/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch b/net-misc/openssh/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch deleted file mode 100644 index 7e9334a781d2..000000000000 --- a/net-misc/openssh/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -257,6 +257,15 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_statx - SC_DENY(__NR_statx, EACCES), - #endif -+#ifdef __NR_shmget -+ SC_DENY(__NR_shmget, EACCES), -+#endif -+#ifdef __NR_shmat -+ SC_DENY(__NR_shmat, EACCES), -+#endif -+#ifdef __NR_shmdt -+ SC_DENY(__NR_shmdt, EACCES), -+#endif - - /* Syscalls to permit */ - #ifdef __NR_brk diff --git a/net-misc/openssh/files/openssh-9.6_p1-fix-xmss-c99.patch b/net-misc/openssh/files/openssh-9.6_p1-fix-xmss-c99.patch new file mode 100644 index 000000000000..cf06b80cd5fa --- /dev/null +++ b/net-misc/openssh/files/openssh-9.6_p1-fix-xmss-c99.patch @@ -0,0 +1,20 @@ +xmss_hash.c: In function ‘core_hash_SHA2’: +xmss_hash.c:56:5: error: implicit declaration of function ‘SHA256’ [-Wimplicit-function-declaration] + 56 | SHA256(buf, inlen + keylen + n, out); + | ^~~~~~ +xmss_hash.c:61:7: error: implicit declaration of function ‘SHA512’ [-Wimplicit-function-declaration] + 61 | SHA512(buf, inlen + keylen + n, out); + | ^~~~~~ + +diff --git a/xmss_hash.c b/xmss_hash.c +index 70c126ae2..cb17de2af 100644 +--- a/xmss_hash.c ++++ b/xmss_hash.c +@@ -12,6 +12,7 @@ Public domain. + #include "xmss_hash_address.h" + #include "xmss_commons.h" + #include "xmss_hash.h" ++#include <openssl/sha.h> + + #include <stddef.h> + #ifdef HAVE_STDINT_H diff --git a/net-misc/openssh/openssh-9.6_p1-r3.ebuild b/net-misc/openssh/openssh-9.6_p1-r3.ebuild index 8156cd96d1b4..c944856ebe5b 100644 --- a/net-misc/openssh/openssh-9.6_p1-r3.ebuild +++ b/net-misc/openssh/openssh-9.6_p1-r3.ebuild @@ -78,7 +78,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch" "${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch" - "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" ) diff --git a/net-misc/openssh/openssh-9.6_p1-r4.ebuild b/net-misc/openssh/openssh-9.6_p1-r4.ebuild new file mode 100644 index 000000000000..8d611b8b20b5 --- /dev/null +++ b/net-misc/openssh/openssh-9.6_p1-r4.ebuild @@ -0,0 +1,390 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc +inherit user-info flag-o-matic autotools optfeature pam systemd toolchain-funcs verify-sig + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI=" + mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + 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(+)] ) + 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} + !net-misc/openssh-contrib + pam? ( >=sys-auth/pambase-20081028 ) + !prefix? ( sys-apps/shadow ) +" +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-openssh ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch" + "${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch" + "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" + "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch" +) + +pkg_pretend() { + local i enabled_eol_flags disabled_eol_flags + for i in hpn sctp X509; do + if has_version "net-misc/openssh[${i}]"; then + enabled_eol_flags+="${i}," + disabled_eol_flags+="-${i}," + fi + done + + if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then + # Skip for binary packages entirely because of environment saving, bug #907892 + [[ ${MERGE_TYPE} == binary ]] && return + + ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore." + ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality," + ewarn "since these USE flags required third-party patches that often trigger bugs" + ewarn "and are of questionable provenance." + ewarn + ewarn "If you must continue relying on this functionality, switch to" + ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your" + ewarn "world file first: 'emerge --deselect net-misc/openssh'" + ewarn + ewarn "In order to prevent loss of SSH remote login access, we will abort the build." + ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib" + ewarn "variant, when re-emerging you will have to set" + ewarn + ewarn " OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + + die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + 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_prepare() { + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + default + + # 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 fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # _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 + # optional at runtime; guarantee a known path + --with-xauth="${EPREFIX}"/usr/bin/xauth + + # --with-hardening adds the following in addition to flags we + # already set in our toolchain: + # * -ftrapv (which is broken with GCC anyway), + # * -ftrivial-auto-var-init=zero (which is nice, but not the end of + # the world to not have) + # * -fzero-call-used-regs=used (history of miscompilations with + # Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086, + # gcc PR104820, gcc PR104817, gcc PR110934)). + # + # Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK, + # so we cannot just disable -fzero-call-used-regs=used. + # + # Therefore, just pass --without-hardening, given it doesn't negate + # our already hardened toolchain defaults, and avoids adding flags + # which are known-broken in both Clang and GCC and haven't been + # proven reliable. + --without-hardening + + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with security-key security-key-builtin) + $(use_with ssl openssl) + $(use_with ssl ssl-engine) + ) + + if use elibc_musl; then + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) + myconf+=( --disable-utmp --disable-wtmp ) + fi + + # Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all + # bug #869839 (https://github.com/llvm/llvm-project/issues/57692) + tc-is-clang && myconf+=( --without-hardening ) + + 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 + ) + + dodir /etc/ssh/ssh_config.d /etc/ssh/sshd_config.d + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config || die + Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf" + EOF + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config || die + Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf" + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + # Send locale environment variables (bug #367017) + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM (bug #658540) + SendEnv COLORTERM + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts" + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/ssh_revoked_hosts || die + # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/ + ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + # Allow client to pass locale environment variables (bug #367017) + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM (bug #658540) + AcceptEnv COLORTERM + EOF + + if use pam ; then + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + UsePAM yes + # This interferes with PAM. + PasswordAuthentication no + # PAM can do its own handling of MOTD. + PrintMotd no + PrintLastLog no + EOF + fi + + if use livecd ; then + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + # Allow root login with password on livecds. + PermitRootLogin Yes + EOF + 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 ChangeLog CREDITS OVERVIEW README* TODO sshd_config + + diropts -m 0700 + dodir /etc/skel/.ssh + rmdir "${ED}"/var/empty || die + + systemd_dounit "${FILESDIR}"/sshd.socket + systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service + systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service' +} + +pkg_preinst() { + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then + show_ssl_warning=1 + fi +} + +pkg_postinst() { + # bug #139235 + optfeature "x11 forwarding" x11-apps/xauth + + 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 + if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then + ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to" + ewarn "'Restart=on-failure', which causes the service to automatically restart if it" + ewarn "terminates with an unclean exit code or signal. This feature is useful for most users," + ewarn "but it can increase the vulnerability of the system in the event of a future exploit." + ewarn "If you have a web-facing setup or are concerned about security, it is recommended to" + ewarn "set 'Restart=no' in your sshd unit file." + 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 +} diff --git a/net-misc/openssh/openssh-9.7_p1-r2.ebuild b/net-misc/openssh/openssh-9.7_p1-r2.ebuild index 3b0c7f2125a0..ce9e1d1a47c2 100644 --- a/net-misc/openssh/openssh-9.7_p1-r2.ebuild +++ b/net-misc/openssh/openssh-9.7_p1-r2.ebuild @@ -76,7 +76,6 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" ) diff --git a/net-misc/openssh/openssh-9.7_p1-r3.ebuild b/net-misc/openssh/openssh-9.7_p1-r3.ebuild new file mode 100644 index 000000000000..9bb9c924093a --- /dev/null +++ b/net-misc/openssh/openssh-9.7_p1-r3.ebuild @@ -0,0 +1,404 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc +inherit user-info flag-o-matic autotools optfeature pam systemd toolchain-funcs verify-sig + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI=" + mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + 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(+)] ) + 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} + !net-misc/openssh-contrib + pam? ( >=sys-auth/pambase-20081028 ) + !prefix? ( sys-apps/shadow ) +" +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-openssh ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" + "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch" +) + +pkg_pretend() { + local i enabled_eol_flags disabled_eol_flags + for i in hpn sctp X509; do + if has_version "net-misc/openssh[${i}]"; then + enabled_eol_flags+="${i}," + disabled_eol_flags+="-${i}," + fi + done + + if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then + # Skip for binary packages entirely because of environment saving, bug #907892 + [[ ${MERGE_TYPE} == binary ]] && return + + ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore." + ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality," + ewarn "since these USE flags required third-party patches that often trigger bugs" + ewarn "and are of questionable provenance." + ewarn + ewarn "If you must continue relying on this functionality, switch to" + ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your" + ewarn "world file first: 'emerge --deselect net-misc/openssh'" + ewarn + ewarn "In order to prevent loss of SSH remote login access, we will abort the build." + ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib" + ewarn "variant, when re-emerging you will have to set" + ewarn + ewarn " OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + + die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + 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_prepare() { + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + default + + # 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 fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # _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 + # optional at runtime; guarantee a known path + --with-xauth="${EPREFIX}"/usr/bin/xauth + + # --with-hardening adds the following in addition to flags we + # already set in our toolchain: + # * -ftrapv (which is broken with GCC anyway), + # * -ftrivial-auto-var-init=zero (which is nice, but not the end of + # the world to not have) + # * -fzero-call-used-regs=used (history of miscompilations with + # Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086, + # gcc PR104820, gcc PR104817, gcc PR110934)). + # + # Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK, + # so we cannot just disable -fzero-call-used-regs=used. + # + # Therefore, just pass --without-hardening, given it doesn't negate + # our already hardened toolchain defaults, and avoids adding flags + # which are known-broken in both Clang and GCC and haven't been + # proven reliable. + --without-hardening + + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with security-key security-key-builtin) + $(use_with ssl openssl) + $(use_with ssl ssl-engine) + ) + + if use elibc_musl; then + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) + myconf+=( --disable-utmp --disable-wtmp ) + fi + + # Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all + # bug #869839 (https://github.com/llvm/llvm-project/issues/57692) + tc-is-clang && myconf+=( --without-hardening ) + + econf "${myconf[@]}" +} + +tweak_ssh_configs() { + cat <<-EOF >> ssh_config.out || die + + Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf" + EOF + cat <<-EOF >> sshd_config.out || die + + Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf" + EOF +} + +create_config_dropins() { + 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 + ) + + mkdir -p "${WORKDIR}"/etc/ssh/ssh{,d}_config.d || die + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + # Send locale environment variables (bug #367017) + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM (bug #658540) + SendEnv COLORTERM + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts" + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_revoked_hosts || die + # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/ + ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + # Allow client to pass locale environment variables (bug #367017) + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM (bug #658540) + AcceptEnv COLORTERM + EOF + + if use pam ; then + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + UsePAM yes + # This interferes with PAM. + PasswordAuthentication no + # PAM can do its own handling of MOTD. + PrintMotd no + PrintLastLog no + EOF + fi + + if use livecd ; then + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + # Allow root login with password on livecds. + PermitRootLogin Yes + EOF + fi +} + +src_compile() { + default + tweak_ssh_configs + create_config_dropins +} + +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 +} + +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 + + doman contrib/ssh-copy-id.1 + dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config + + rmdir "${ED}"/var/empty || die + + systemd_dounit "${FILESDIR}"/sshd.socket + systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service + systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service' + + # Install dropins with explicit mode, bug 906638, 915840 + diropts -m0755 + insopts -m0644 + insinto /etc/ssh + doins -r "${WORKDIR}"/etc/ssh/ssh_config.d + doins "${WORKDIR}"/etc/ssh/ssh_revoked_hosts + diropts -m0700 + insopts -m0600 + doins -r "${WORKDIR}"/etc/ssh/sshd_config.d +} + +pkg_preinst() { + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then + show_ssl_warning=1 + fi +} + +pkg_postinst() { + # bug #139235 + optfeature "x11 forwarding" x11-apps/xauth + + 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 + if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then + ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to" + ewarn "'Restart=on-failure', which causes the service to automatically restart if it" + ewarn "terminates with an unclean exit code or signal. This feature is useful for most users," + ewarn "but it can increase the vulnerability of the system in the event of a future exploit." + ewarn "If you have a web-facing setup or are concerned about security, it is recommended to" + ewarn "set 'Restart=no' in your sshd unit file." + 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 +} diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index fdf2da39aeef..98af93425991 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,4 +1,3 @@ -AUX openvswitch-2.17.6-groff-1.23.0.patch 5162 BLAKE2B 3c6a097c25f4a1f9935a540ffbdb6af58d5d0abafac3d9493adfcaf97c1f2842dd0ad3adb4cb5bb9546ee7bd543853e62c90cabcc847920ba772ea5f68b38a16 SHA512 f7e80c1f8b03fef59c868bc7a7e9a4025c868ff71224fbd7c84ae84c657b3de3966bfd60613e71392c431e3057546075bb7c6245da0c1f0320929940603622f4 AUX openvswitch-2.17.8-gcc14-build-fix.patch 1338 BLAKE2B b7c89e2815c6ce948636dcbd4bf6a0976972bc96b4097cb657ed9006f9434a7a25a3f7b85c1c532a40925e0168b936efe7f116e3a36573a93039aa5637c84984 SHA512 da7970042a2a97defbcc4a76e5bff01285bc408ea80ebbdbbdbbcc30aa15727288bc97773fdd6d85635cdc536dee7ea31e47be697233bf341ccfad693c35e751 AUX openvswitch.tmpfiles 36 BLAKE2B b6e77e158bfa3ec2f67d66d449e1461ff13fb067d8d51084538938cf139d65406644e910663cb9297881eec10e87b3bf7ba15cf50e20a2d1e112c8f72f1f9b78 SHA512 8e9e0b8ba6fbd0a06eec91b985fd46a338823cd46b41521539627a57a9fbd5051be3875a24cc455742c08c006f91382b5e211e7c51f60bccb7f0b9dd2c55a280 AUX ovs-vswitchd-r1 428 BLAKE2B 202cf0694cb26e8a302b8a8e347f203ecfb0be5152841aa28a775f1e53a611296ef00f2197b3a91fc113993ef8e327991503484d852ad023e7e426b4aaa85018 SHA512 c41b31a856f66fa140781831f38635c696440bb93a816576256c4cdf71b872e573d742d29b9f494336735fd384d34722ba3304fa97d3c76fc82c2f6db869a233 @@ -8,8 +7,8 @@ AUX ovsdb-server-r1 847 BLAKE2B a9ced0d42fba15d4453f475de2bf521115fd507c11845508 AUX ovsdb-server-r3.service 809 BLAKE2B 5af3f3bc600cacc7c10d67760d314ceb8dbeba0f5ee2b438b720bbb653011978a376b925052e9bf262c7be58fc03f414d99cd842f8f6c001d2faf357d3580142 SHA512 62410b6292235caa2890c74712d2e5970bd20cd2e042f427b82b8eca61b07df4ff9e93ed852d6f486264147d797ccfc2c02603dc0b52aea8b27d0f0d65865e8c AUX ovsdb-server_conf2 580 BLAKE2B dfd1ece1fe4799439c097cf87175b6d6b331fce4a920cb7690d22c1410e7cce65a3c439d23b47fa1b1650b03eaf3ea1bb4e6f7d6a7e692b28403421461bc7dba SHA512 f9fed3b7cbad344e4e1e5abcaf117bbb56375122f84604781212f4b42f9853feb687fd5e33792f4221bdf48c1df4a9ca9e22e57f3dba50ba6ba6fddb31b10a06 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7 -DIST openvswitch-2.17.6.tar.gz 8092331 BLAKE2B 0564a332e8c876552a9a3a068f4e54d3f5d56428e277e32f188aba9626035818c900be45171964ddcb782166a5e5b3b8f3a2fb80d5ed9723b94c9e1ed7410544 SHA512 ff9d19a9101c9a18117a859150d391eecbd6a331e35da3f20a62acaac1febbfbad716874734f9bd0d304d635212884f9f617b944e79bb7e554ddd9e5c53645c8 DIST openvswitch-2.17.8.tar.gz 8097747 BLAKE2B d37ae60481255476d41aa94086f6a597107b23176f7ff47eeff9d85a5904da3685886663451317e0b9e512fb049b4024e291f320752aa90fe798ff08f49772c5 SHA512 c94685b67f9f25c81a590696d36c431fadf09c2504b06565011c2945ef242c5039508b312992597822f8ee274ce615ca58bc6bb2aa0a9cf1346bc2dcada70fa1 -EBUILD openvswitch-2.17.6.ebuild 5256 BLAKE2B 60504d26e5f14d6fbc986d901cd7843f94daf39185c59b92c027a5f7372fb0a8fc3479dc4662b6f01871b899d0968032b42905e88534307d33099ac2fd0d1c15 SHA512 8443172dade0e5a0f2bd0ec6af8e69269fde4473255477108c16db1540443664644ac456d3bf271002f5b4f20d169f837f7cf6858a8214f652f7e04e2efaa539 +DIST openvswitch-2.17.9.tar.gz 8136490 BLAKE2B cdb5ec81fb9ac04786fc1230d60c6c9bbf7ec2929cf5ab40bb1e0e7442480383d0ad8f24f14df4901cab8f39a6532445cf1810c9b9e3a779d7d15bfe35101a37 SHA512 b91212f9c10a208bca9d15cd5a219ae24b7e9bf8b5c8fdebc21cd9fa8229bc655f9f3591d79dd30c1a8212daed15d5a26bf9532b3496e3660bc8b62012f45636 EBUILD openvswitch-2.17.8.ebuild 5268 BLAKE2B 5f42a771aeae71d10e5af453f86e44c3b33511614b438cac6a7ede9c71bfffb41d305828a23170a6efc51a0efdb6bf713ad99689b3e9dc152211de734afeb36a SHA512 025747ed646b6e9ba61f9da57208a118a0b00ac73aa8d9f2013683cf5d34170a7187ef6fbd60938588bc464059d59d305837634a4afad4e454437f2012842c4d +EBUILD openvswitch-2.17.9-r1.ebuild 5217 BLAKE2B 7123809a5eb61300e3728d255ba10f6d2f3835ddc5a726d3a07b55c7ef7397468a4caecd1e921066ff2697cdcefeaf23073102cd0dd03df6b8146537304a1387 SHA512 7aa163c6b7a68270013c125d2c8a0489fef6aecff9387efe1d61eb11aaf10561ae6a0899c74e11766b4e80671fd4754b6f41069d1a1006a5f5836658924063e1 MISC metadata.xml 539 BLAKE2B c6a7e8b9ffb18bd32be27bb2ba301b4b8872a0c17eec6b110f89562d261614ca9bc1a5d89350ac05b6dc26d7536fd7aa1920326c7f55a0ecb4693bfc99986810 SHA512 d731202dfe79480263006596d7da8349a6831e05d75d5ebc9cce28818d02d5a52e81b350f5afb06279e91e5dc700763fb2975b28aad15bc3a0ea72b6264eba71 diff --git a/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch b/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch deleted file mode 100644 index 3035005ae52e..000000000000 --- a/net-misc/openvswitch/files/openvswitch-2.17.6-groff-1.23.0.patch +++ /dev/null @@ -1,145 +0,0 @@ -https://bugs.gentoo.org/910196 -https://github.com/openvswitch/ovs/commit/a45b3afbf82e1c1702d25a5097a25c45923c6fae -https://github.com/openvswitch/ovs/commit/6929485d318e08c11e8e98f7847d5cefcb36c21c -https://github.com/openvswitch/ovs/commit/93412e00e7a1f61c5eb4771d150bdbf504ff59aa - -From a45b3afbf82e1c1702d25a5097a25c45923c6fae Mon Sep 17 00:00:00 2001 -From: gordonwwang <gordonwwang@tencent.com> -Date: Thu, 17 Aug 2023 11:04:39 +0800 -Subject: [PATCH] ovs.tmac: Fix troff warning in versions above groff-1.23. - -When the compilation dependency is groff-1.23, the following message is -displayed in the compilation log, and the compilation fails: - - troff:vswitchd/ovs-vswitchd.8:1298: warning: cannot select font 'CW' - make[1]: *** [Makefile:6761: manpage-check] Error 1 - -CW font was removed and and now groff warns about non-existent font: - https://git.savannah.gnu.org/cgit/groff.git/commit/?id=d75ea8b2e283e37bd560e821fa4597065f36725f) - -Fix that by replacing CW with CR. CW supposed to be an alias of CR -anyway. - -Submitted-at: https://github.com/openvswitch/ovs/pull/416 -Co-authored-by: Xiaojie Chen <jackchanx@163.com> -Signed-off-by: Xiaojie Chen <jackchanx@163.com> -Signed-off-by: gordonwwang <gordonwwang@tencent.com> -Signed-off-by: Ilya Maximets <i.maximets@ovn.org> ---- - lib/ovs.tmac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/ovs.tmac b/lib/ovs.tmac -index 5f8f20afa4a..97b6fa3df76 100644 ---- a/lib/ovs.tmac -+++ b/lib/ovs.tmac -@@ -175,7 +175,7 @@ - . nr mE \\n(.f - . nf - . nh --. ft CW -+. ft CR - .. - . - . - -From 6929485d318e08c11e8e98f7847d5cefcb36c21c Mon Sep 17 00:00:00 2001 -From: Frode Nordahl <frode.nordahl@canonical.com> -Date: Mon, 21 Aug 2023 15:53:33 +0200 -Subject: [PATCH] docs: Add `nowarn` region option to tables. - -Starting with groff 1.23.0 a warning is produced if the tbl -preprocessor is not run. A side effect of enabling it is that -new warnings on table formatting is printed. - -As requested during the review [0] of a series [1] attempting to -address this, this patch makes use of the `nowarn` region option -as opposed to attempting to change the formatting. - -0: https://patchwork.ozlabs.org/project/openvswitch/patch/ZM00Wfa80rOb2oCA@riva.ucam.org/#3164177 -1: https://patchwork.ozlabs.org/project/openvswitch/list/?series=367378&state=* - -Reported-by: Lucas Nussbaum <lucas@debian.org> -Reported-at: https://bugs.debian.org/1042358 -Signed-off-by: Frode Nordahl <frode.nordahl@canonical.com> -Signed-off-by: Ilya Maximets <i.maximets@ovn.org> ---- - build-aux/extract-ofp-fields | 6 +++--- - lib/meta-flow.xml | 1 + - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields -index 8766995d9ab..7a9788be968 100755 ---- a/build-aux/extract-ofp-fields -+++ b/build-aux/extract-ofp-fields -@@ -578,7 +578,7 @@ def field_to_xml(field_node, f, body, summary): - body += [""".PP - \\fB%s Field\\fR - .TS --tab(;); -+tab(;),nowarn; - l lx. - """ % title] - -@@ -655,7 +655,7 @@ def group_xml_to_nroff(group_node, fields): - '.SH \"%s\"\n' % build.nroff.text_to_nroff(title.upper() + " FIELDS"), - '.SS "Summary:"\n', - '.TS\n', -- 'tab(;);\n', -+ 'tab(;),nowarn;\n', - 'l l l l l l l.\n', - 'Name;Bytes;Mask;RW?;Prereqs;NXM/OXM Support\n', - '\_;\_;\_;\_;\_;\_\n'] -@@ -665,7 +665,7 @@ def group_xml_to_nroff(group_node, fields): - return ''.join(content) - - def make_oxm_classes_xml(document): -- s = '''tab(;); -+ s = '''tab(;),nowarn; - l l l. - Prefix;Vendor;Class - \_;\_;\_ -diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml -index ff81fddc5e7..fe80ee930d0 100644 ---- a/lib/meta-flow.xml -+++ b/lib/meta-flow.xml -@@ -3517,6 +3517,7 @@ actions=clone(load:0->NXM_OF_IN_PORT[],output:123) - </p> - - <tbl> -+nowarn; - r r r r r. - Criteria OpenFlow 1.0 OpenFlow 1.1 OpenFlow 1.2+ NXM - \_ \_ \_ \_ \_ -From 93412e00e7a1f61c5eb4771d150bdbf504ff59aa Mon Sep 17 00:00:00 2001 -From: Colin Watson <cjwatson@ubuntu.com> -Date: Mon, 21 Aug 2023 15:53:34 +0200 -Subject: [PATCH] docs: Run tbl preprocessor in manpage-check rule. - -If we omit this, groff 1.23.0 warns: - - tbl preprocessor failed, or it or soelim was not run; table(s) likely - not rendered (TE macro called with TW register undefined) - -Reported-by: Lucas Nussbaum <lucas@debian.org> -Reported-at: https://bugs.debian.org/1042358 -Signed-off-by: Colin Watson <cjwatson@ubuntu.com> -Signed-off-by: Ilya Maximets <i.maximets@ovn.org> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index cb8076433e8..2a41e63ad90 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -368,7 +368,7 @@ ALL_LOCAL += manpage-check - manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS) - @error=false; \ - for manpage in $?; do \ -- LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \ -+ LANG=en_US.UTF-8 groff -t -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \ - if grep warning: $@.tmp; then error=:; fi; \ - rm -f $@.tmp; \ - done; \ - diff --git a/net-misc/openvswitch/openvswitch-2.17.6.ebuild b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild index ff783ad71bfb..1053a8bdd80b 100644 --- a/net-misc/openvswitch/openvswitch-2.17.6.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 MODULES_OPTIONAL_USE="modules" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools linux-mod python-single-r1 systemd tmpfiles +inherit autotools linux-mod-r1 python-single-r1 systemd tmpfiles DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org" @@ -14,14 +14,14 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="debug modules monitor +ssl unwind valgrind" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Check python/ovs/version.py in tarball for dev-python/ovs dep RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' - ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}] + ~dev-python/ovs-2.17.9[${PYTHON_USEDEP}] dev-python/twisted[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}] ') @@ -39,7 +39,6 @@ BDEPEND="virtual/pkgconfig PATCHES=( "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" - "${FILESDIR}/openvswitch-2.17.6-groff-1.23.0.patch" ) CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" @@ -51,7 +50,7 @@ pkg_setup() { CONFIG_CHECK+=" ~!OPENVSWITCH" kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" - linux-mod_pkg_setup + linux-mod-r1_pkg_setup else CONFIG_CHECK+=" ~OPENVSWITCH" linux-info_pkg_setup @@ -106,7 +105,7 @@ src_configure() { src_compile() { default - use modules && linux-mod_src_compile + use modules && linux-mod-r1_src_compile } src_install() { @@ -144,11 +143,11 @@ src_install() { insinto /etc/logrotate.d newins rhel/etc_logrotate.d_openvswitch openvswitch - use modules && linux-mod_src_install + use modules && linux-mod-r1_src_install } pkg_postinst() { - use modules && linux-mod_pkg_postinst + use modules && linux-mod-r1_pkg_postinst tmpfiles_process openvswitch.conf diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest index 8a153016de16..d8cbeed2b6ec 100644 --- a/net-misc/passt/Manifest +++ b/net-misc/passt/Manifest @@ -1,13 +1,11 @@ AUX Makefile-2024.03.20.patch 433 BLAKE2B 5e64a2a449806698bc812e38bfe46860e13a3bf64e1e6c7c96e3d43d8b30f1e6d6eedad8a89b500dced6ba81e8a8c0e7dfd74d889fed8dc1d7d7755d38e60156 SHA512 cbf5f29c96364438064ae65cc56501b1a5793530dedfeadf5184fa1a7df8c1b45786f39686e058178c2b7e58f0ae2aaa507fe986f01c4a6a6984276cd00c062e -DIST passt-2023.12.04.tar.xz 188136 BLAKE2B f1d72fbb4bbb25f6a11e9ff87a91cf9bac06e047b8cb9a8b40402ced1422c23b105fa7e64646698d38ad747efa449c34cfdaecf492a3e4984114cbcf60656cdc SHA512 febd9fa22363438b52b2688481183d81c22966e1775139fc559dbfa50437c9b00ba09800db867738d25fcea8ac05d4589b75dcd2d0c88eeffefc0598d4236001 -DIST passt-2023.12.30.tar.xz 188596 BLAKE2B 75712a7cb7a00fea20427979153090d938b8c7b0e3da61c83cabb3751786034df35ebbe8afbd991d582a680f55b12792547b68efa931a5576dc181040b31e5fd SHA512 4b19d191e2526bacc61bb8ab2964f5da4e0535656b094a7592f91d6b437c855a586fc772e2abd89138ff4f89aae12ade494c6e0fe7bee1502fe319215200d8f0 -DIST passt-2024.03.20.tar.xz 195332 BLAKE2B 1bed740ddd235f300a4233fb2024f155758809589f1fdd2174ab99a8a93dd16044ab41814b215d12eb1e557966a73a3754bbff2b9acd752b45b385edd88ba3c7 SHA512 3701820e539545771d0f867fe0b8977cb5967e7501413f717fed08d2d2c141f17d86ed7238177b4fb4cf4cfc01c6c9d07e3c218c34b48e0a5a1f2b2ce8a5b903 DIST passt-2024.03.26.tar.xz 195348 BLAKE2B d91e6ac1d50aae04ceb53a34341b545ff644ceccdfcfab461907050612d9d871f61591aac02ebddef9a607a9b39ce5017a2fc47c9189f85b9b9a70a30d010e4c SHA512 da771f8f334862f81702b22688c9d3552aefc2883b5a44c39156ff7a69f301cabf52fa0fb13f8695240db5411c498806d28d847fca8caff2bedb69d1a4b4e5a7 DIST passt-2024.04.05.tar.xz 195772 BLAKE2B 4c237aeda56455f948d4309624d171612d59fa7ec653e7f89c1aeb05c677ccbdeeaaf6e14c09cda1d5bc88a97fca57dbbe480095e9711045fbd381bd30fb644a SHA512 bf14689cb1c4780d4249562965ff9a5a0515756cbf5af4b531c17982a066f33001a65210959ff8da691ddaa75560ab5691c685a4c1a4b73e742a883d12d2a24b -EBUILD passt-2023.12.04.ebuild 707 BLAKE2B fe3b6c4c697e725c51b3cefec18e7501055c3abb0d2cb74d8b5983a73a6803ff2a5fafa2502b54725e4225072a5fa2dc6e0043524c89c6019d5380df79314aeb SHA512 0845a4d1dda79af28f08b2735297cd8fc515460df24fa9cf8d5d8653ffa3c20379e3ab5167b895fcd35b7f2068531aebe7c2e51fe9b86a65aa526f9a2cbf3306 -EBUILD passt-2023.12.30.ebuild 714 BLAKE2B afabcac34eb836f21812deeb1946d657a9bb7ed3e87868a2d50641ca8a21f43f869397f6ffe8736f66f96bf890f19f3c59f8f4c43956abfc9a0f8d17fa278b17 SHA512 e75a6066c5d13053047843c2bb0be917941d97305a53138e68dd6b5f758be01a623ca66c4d7dee37e14fc8fab212248d131cc1ccec049a506bc4ca0f679f2ec7 -EBUILD passt-2024.03.20.ebuild 842 BLAKE2B bdfd388a62cee3b064e5bdfd3f3960ff19fd505365469b3e5cc0d0148139b8dfb02020af67fda5be6e313faf1294a96ad6df106b8bf8b2fa01ee234285179bf7 SHA512 0c3f1480d9a325fba24471cd97a0030047d9f78261e93fc33429d6a56cb593f27828de96ddf5fd3cce547f0cfb95d5af8d5eae5331f9b29d9b565ac38ce94b27 +DIST passt-2024.04.26.tar.xz 196148 BLAKE2B f3a9b9d2a9fa42e0dd35894d4c92890af9935965ccfb3b1751c396080ab0482bd541fe22f09ae7b068f336f1e985b6905d2cc93987a17f243ba6ec97d880ee68 SHA512 f25b9bc695de555048f6a24ec9bb603ec6def0449227ce837b6e46f8cda5816c2450aa733257aaa349260b0b7c05b2d5580ad21010a1a45a74e9eb3027e37d98 +DIST passt-2024.05.10.tar.xz 195992 BLAKE2B 9f4b680daa8103c7de0c92c01824df74e1b221a48cf7724c2c09aae13a3575bdc529eeca01d5015095c51194045e1019bbdf38cc7ef2333d61eaa03b4e0249ae SHA512 04add1113ffbc98d61b7c63352899505d8f19bbdf937a0c025726813163ec7fc31abdb94c12ceefed9b49f18b388acc0687298bce8ba156bbb044d1b1bcdaee3 EBUILD passt-2024.03.26.ebuild 842 BLAKE2B 2d3a84c42100682fc7cf027c16545a8ccb811f943a43bad17d8c8f00dfcbb54c5ecd73bb8e0690165dfa896baa6a898e95aa0c57482ec878b2d5bb46c593a2ac SHA512 7155fef1d337530c70ec44bef45a6acf5dbc9f747953a77569db921324ea0e69c3d314144735af83f33feef97f148fabd96c89779c17837f7062bdb4288f3a32 EBUILD passt-2024.04.05.ebuild 842 BLAKE2B 8cd4f2806d61b2e4d567bea4ba90d629d43f518153b36e5f343690b4bb7e70a476c35ec89305bc1d701f202b18af64ab2c65574642d72e1cf037b43b5fada0e6 SHA512 f7bfb90004c0a78b0a7a68e01c9431581dc1ade39457c8957555a157862716b27b0a6a814fc499674a69642467a913e7915b2a7554dd57b8638045dc676c3ea4 -EBUILD passt-9999.ebuild 842 BLAKE2B 8cd4f2806d61b2e4d567bea4ba90d629d43f518153b36e5f343690b4bb7e70a476c35ec89305bc1d701f202b18af64ab2c65574642d72e1cf037b43b5fada0e6 SHA512 f7bfb90004c0a78b0a7a68e01c9431581dc1ade39457c8957555a157862716b27b0a6a814fc499674a69642467a913e7915b2a7554dd57b8638045dc676c3ea4 +EBUILD passt-2024.04.26.ebuild 842 BLAKE2B 37a59ee6ef1ad40cc3af87a8c4a565ba5aa06183a9802b9bfdf54cf2cfe578c94473fd0605379224d39b5c7763bd05664c00b22c74ab6e97be7a6056f7c8c4cf SHA512 784ecc5756ec3cda106b5c730317dd15947790b4f9910aa9026c46b8d1220592fd470727df93402acb21c2bc8795c12a1e9da45309ce9691e53fb423e69fab28 +EBUILD passt-2024.05.10.ebuild 842 BLAKE2B 94b37052fbc670b3f3d9a6aead0dee723bf7e2a44219ff1efd0dfa54caca078f935aa2c3371f8d13bac0add09e16d0fe97840ef07e9eeba735c3e75407bdb742 SHA512 7c62b8cea6099b8d743beecf6a0d70f6b5acd3f46a5d0d80eb3a58a74b233dd5e0446dcb704966fca3f701c852e54482ca7aae2ba15a5f174c2df7a38127ad5c +EBUILD passt-9999.ebuild 842 BLAKE2B 94b37052fbc670b3f3d9a6aead0dee723bf7e2a44219ff1efd0dfa54caca078f935aa2c3371f8d13bac0add09e16d0fe97840ef07e9eeba735c3e75407bdb742 SHA512 7c62b8cea6099b8d743beecf6a0d70f6b5acd3f46a5d0d80eb3a58a74b233dd5e0446dcb704966fca3f701c852e54482ca7aae2ba15a5f174c2df7a38127ad5c MISC metadata.xml 1410 BLAKE2B 415cf4ab3e0d993066251ff9e136ea4a5ef13fc50b838b5dd057784600b5fb89fecb411cc0d61d08459e34da7fe34097d22b8908240f3e46e6ff50f503aa7089 SHA512 85d756f5b8077fb0838e1881f9ef48f08ca8da1ca540d8677632c81d34765d6fb1483b3fdd0eead64467aa7872b1ca133745610736d0afc5a2b8223abacc1cb6 diff --git a/net-misc/passt/passt-2023.12.04.ebuild b/net-misc/passt/passt-2023.12.04.ebuild deleted file mode 100644 index 5683bd6f8693..000000000000 --- a/net-misc/passt/passt-2023.12.04.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" -HOMEPAGE="https://passt.top/" - -RELEASE_COMMIT="b86afe3" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://passt.top/passt" -else - SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" - S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - KEYWORDS="~amd64" -fi - -LICENSE="BSD GPL-2+" -SLOT="0" -IUSE="static" - -src_compile() { - [[ ${PV} != 9999* ]] && export VERSION="${PV}" - export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" - - emake $(usev static) -} diff --git a/net-misc/passt/passt-2024.03.20.ebuild b/net-misc/passt/passt-2024.04.26.ebuild index ed54ff64b6be..c73a0f7c146b 100644 --- a/net-misc/passt/passt-2024.03.20.ebuild +++ b/net-misc/passt/passt-2024.04.26.ebuild @@ -8,7 +8,7 @@ inherit toolchain-funcs DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" HOMEPAGE="https://passt.top/" -RELEASE_COMMIT="71dd405" +RELEASE_COMMIT="d03c4e2" if [[ ${PV} == 9999* ]]; then inherit git-r3 diff --git a/net-misc/passt/passt-2023.12.30.ebuild b/net-misc/passt/passt-2024.05.10.ebuild index cf2c6784ce85..9e4992ffaab0 100644 --- a/net-misc/passt/passt-2023.12.30.ebuild +++ b/net-misc/passt/passt-2024.05.10.ebuild @@ -3,10 +3,12 @@ EAPI=8 +inherit toolchain-funcs + DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" HOMEPAGE="https://passt.top/" -RELEASE_COMMIT="f091893" +RELEASE_COMMIT="7288448" if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -14,13 +16,22 @@ if [[ ${PV} == 9999* ]]; then else SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - KEYWORDS="~amd64 ~riscv" + KEYWORDS="~amd64 ~arm64 ~riscv" fi LICENSE="BSD GPL-2+" SLOT="0" IUSE="static" +PATCHES=( + "${FILESDIR}"/Makefile-2024.03.20.patch +) + +src_prepare() { + default + tc-export CC +} + src_compile() { [[ ${PV} != 9999* ]] && export VERSION="${PV}" export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" diff --git a/net-misc/passt/passt-9999.ebuild b/net-misc/passt/passt-9999.ebuild index e4201215e520..9e4992ffaab0 100644 --- a/net-misc/passt/passt-9999.ebuild +++ b/net-misc/passt/passt-9999.ebuild @@ -8,7 +8,7 @@ inherit toolchain-funcs DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" HOMEPAGE="https://passt.top/" -RELEASE_COMMIT="954589b" +RELEASE_COMMIT="7288448" if [[ ${PV} == 9999* ]]; then inherit git-r3 diff --git a/net-misc/pedro/Manifest b/net-misc/pedro/Manifest index c6434f8250ef..3b2e3aae2888 100644 --- a/net-misc/pedro/Manifest +++ b/net-misc/pedro/Manifest @@ -1,8 +1,5 @@ -AUX pedro-1.12-portage.patch 1816 BLAKE2B 715c6e17a31d86a3b947fb7be8bfead7e2c4c03daee3fefa203b0c6b3f7a4b77ff11b1537c2b1fd92e044191331b9be86a8b83dd9f05fecac64909e3d37262ab SHA512 a5ddccfb2a64baa6582d176803ce38b687a135d62f923d4779e3bfb4435eefe3a35742113ea05538534a8bc9c2244c66c0bdeafcb304568550b6b9821b6eeb18 AUX pedro-1.14-portage.patch 1538 BLAKE2B 059807a42653fe322a9a7822096973f19fd5c6102c1b7d7fd090d474786ce09f09cca966db4e98ba2bbaabb0d96e562de3cb8bd2aa22388bfe045ca66c36cdbc SHA512 1608a81642b27a07b39f33b88ec7d4903086b6be6d312b31259367553d95230fe2ce5b47297340f667f0ea82a85de14e583685ed3d2a33b6b1c19ddcedaab67d -DIST pedro-1.12.tgz 1181678 BLAKE2B ed882ab3dae0912519283229d10ff6f12ef4f623d72beaf22b8467e8072752fbd57836a0ebbad0f0ce3da1b4837049161bcb12673e3c38c94eb167e16c0c0a1e SHA512 936b2c6cac526d9d3c0e146b53dc65ed0508c6abd1b66c97656fa5b4011d7dd11912d1c0bf091a29b56e13c3e19ec3e0ad7760d44d4887b939699cdd2389c819 DIST pedro-1.14.tgz 1213309 BLAKE2B 104f3816d79534411ba5d78517a744d9a0bf892cf99a1c654a94b9041f4ff038c00d029b182b8f825cfe80cb9861e9440b4e73de3be1f74945a34dbaefb995e7 SHA512 ffe32c296c8325ea31a4bf5d937504e9076654253f19dea17b234f53ba62a4b96e8611cab1dbf545f30734cfd8924e4140b08956180886ac21849546b9ad0cad DIST pedro-manual-1.x.tar.gz 222863 BLAKE2B 085b118585808aced9217a8001080b589d9dad958ad14787f929a4808b10bb2be80ae7bc04c07b676e41aed9e2ec916215c5d15dda2317f71ecebbc7c1737d96 SHA512 87f8e07e3a687d12e366f1974398996f2346e417680ab534622f901c0c7e1efeb171f0c0dadad46b578122c9e98531570c303d2d3ce04b1cd8150816d6138f99 -EBUILD pedro-1.12.ebuild 1022 BLAKE2B 3400d3352b39418879fbd2f64bef187e059bf6ca532930a6e68f47967e13bd98a2d6661f2e2cdb4c707923a0f5c48ba87abaa9b30d78f168f0811f9ea4906f04 SHA512 3866d82975a2b23885a2c33fab507589bca244dd489452b97b864ff810c8ee4c86b2d100dce9bc453b098cf677dca5b7a0367448c407d29e26ed9c85b1a63a9b -EBUILD pedro-1.14.ebuild 1025 BLAKE2B 733a72d76a2a87022995cfd194a980cc487bf18b33545211634c69aec3b6f90d739c22a72a2321731c71fd553d4a07050e0fef95ff0d49531390389ca2759588 SHA512 fa268a0d7b1f5d109f8a7d079b257a155200294b0ed51f3366ae46d22f005b5d8d313d1788e61f6ad5375546fb9b691156c1a54c15a2a2d22a64067805390748 +EBUILD pedro-1.14.ebuild 1022 BLAKE2B 1f4f063e582a9b697756701055b448b8f886261b6617726f9069dfa1c63fc6d6c8831fff9069888fd662cd401770dda3c5c6ab7771d20fa26c307d62e9c3516e SHA512 fab5e5d4a7d0b59facd483af9bbe09d8ccd870633683ba82c7cb0c5b7df54ee44fb603aa89e25b3fb9aad5d9c576a29bdc8a9fa9fdbeb3aedb255c12ec6ba4ed MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/net-misc/pedro/files/pedro-1.12-portage.patch b/net-misc/pedro/files/pedro-1.12-portage.patch deleted file mode 100644 index 17b027cebdf0..000000000000 --- a/net-misc/pedro/files/pedro-1.12-portage.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- pedro-1.12.orig/configure.ac 2021-01-06 21:02:47.000000000 -0000 -+++ pedro-1.12/configure.ac 2021-05-31 18:52:32.205375746 -0000 -@@ -4,30 +4,31 @@ - AC_PROG_CC - AC_PROG_LEX - AC_PROG_INSTALL -+AM_PROG_AR - AC_PROG_RANLIB - #AC_PROG_LIBTOOL - PKG_CHECK_MODULES([GLIB],[glib-2.0 >= 2.12]) - AM_CONFIG_HEADER(config.h) - AC_CONFIG_MACRO_DIR([m4]) --CPPFLAGS="-DNDEBUG -O2 -g `pkg-config --cflags glib-2.0`" -+CPPFLAGS="`${PKG_CONFIG} --cflags glib-2.0`" - case "${host}" in -- *i686*) -+ *-mingw32*) - WIN32="yes" -- LDFLAGS="" -- #LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" -- LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" -+ #LDFLAGS="" -+ #LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" -+ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" - ;; - *x86*) - WIN32="no" -- LDFLAGS="" -- #LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" -- LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" -+ #LDFLAGS="" -+ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" -+ #LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" - ;; - *) - WIN32="no" -- #LDFLAGS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" -- LDFLAGS="" -- LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" -+ #LDFLAGS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" -+ #LDFLAGS="" -+ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" - ;; - esac - AC_OUTPUT(Makefile src/Makefile src/server/Makefile src/lib/Makefile src/examples/Makefile doc/Makefile) diff --git a/net-misc/pedro/pedro-1.12.ebuild b/net-misc/pedro/pedro-1.12.ebuild deleted file mode 100644 index e66bf2c9ece4..000000000000 --- a/net-misc/pedro/pedro-1.12.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools toolchain-funcs - -DESCRIPTION="Pedro is a subscription/notification communications system" -HOMEPAGE="https://staff.itee.uq.edu.au/pjr/HomePages/PedroHome.html" -SRC_URI="https://staff.itee.uq.edu.au/pjr/HomePages/PedroFiles/${P}.tgz - doc? ( https://dev.gentoo.org/~keri/distfiles/pedro/${PN}-manual-1.x.tar.gz )" -S="${WORKDIR}"/${P} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="doc examples" - -RDEPEND="dev-libs/glib:2" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-portage.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - tc-export PKG_CONFIG - - default -} - -src_install() { - default - - if use doc ; then - dodoc "${WORKDIR}"/${PN}.pdf - fi - - if use examples ; then - docinto examples - dodoc src/examples/*.{c,tcl} - - docinto examples/java_api - dodoc src/java_api/*.java - - docinto examples/python_api - dodoc src/python_api/*.py - fi -} diff --git a/net-misc/pedro/pedro-1.14.ebuild b/net-misc/pedro/pedro-1.14.ebuild index 19bf94c63701..44f6236944f0 100644 --- a/net-misc/pedro/pedro-1.14.ebuild +++ b/net-misc/pedro/pedro-1.14.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="doc examples" RDEPEND="dev-libs/glib:2" diff --git a/net-misc/qtm/Manifest b/net-misc/qtm/Manifest index f5e490134ac3..4a4b93bb3d52 100644 --- a/net-misc/qtm/Manifest +++ b/net-misc/qtm/Manifest @@ -2,4 +2,4 @@ AUX qtm-1.3.19-nomancompress.patch 1286 BLAKE2B 5503035fc1bda4a2043a1152925a3926 AUX qtm-1.3.19-qt-5.11.patch 757 BLAKE2B f0bc6f3858e7864efa343193d8519a1e83444e69e4532219077f5d3e852bbd4d0bf979023fadbb53d817d41e1632244baf9232434f8b274dcb6d0eec06070ec3 SHA512 c4e886726686ea2fbf785aaaafd1238affbe778f20a0b11cea98360570f52c421a6942b03f27fe57bc08894a93c92427920509a1efac8b23d502464b353e6df0 DIST qtm-1.3.19.tar.bz2 191559 BLAKE2B e193e75771f04b7ecf772a55305c5a0b923449570933c76716235912223417e1340462893b5c566a22c3d6689eb2fc66b7b41aa3148afcbbc4db65abfcc06545 SHA512 a56a5c1d6098213637806a8a8c3889bbfbd11cb5b1d568520197c6c21e51d99f95975359c18f63961aba945b58a5ce3abf3ff85f552a555b91965414934f9565 EBUILD qtm-1.3.19-r1.ebuild 1162 BLAKE2B 89f64148dca8604caaaade233aaf226d06cd37c4b22c00f6a34d2c6d590ddbe5aac5ed3a93e4ca325363eb5ea6d4c0488e4b7b520568e5e6278dfd1b60f85beb SHA512 b0ceb5c708479ebee99e4055179888708adb28319dcbb9f9de7fbf0427823f5ca86967a3f9dc492f29c8a3669b6d85d0b001297ab8efc309ff113e7d40f21072 -MISC metadata.xml 324 BLAKE2B c605d047438cef94922e01ef6632d09a9fe5ddeb11726dc782b6254eb09da425b7e63809d11d1eb5ed90633a237b335b1ce5f856f345e84715a2d69f4a14a38a SHA512 c53f73646c0742e3eea8cc3d0b7e545e4523ca03bc653a341f3deae65ca5977988df5198f55df029d19c5fbe3a7050095e3714c0f21f615db4df7ab4d4ebab9a +MISC metadata.xml 244 BLAKE2B 2e797df67baafe63483986073740a02b3c31bf1447cf57f118b011fd00aac2a9e5ee0d1f5e2e277c6871c8b1d4e057a37dabbd226e2a7d9c8dad1dc5ad08c5b7 SHA512 42eea86d792739c84f74fb56e5dd1cecc1055bcc7b5b22a9f0bf82f238d40c089ef96c5573f61080c2e90e60ea470b2ef907eeefe55078bcc21e2c8d09acade7 diff --git a/net-misc/qtm/metadata.xml b/net-misc/qtm/metadata.xml index c59a75f5deff..4ff4504747c1 100644 --- a/net-misc/qtm/metadata.xml +++ b/net-misc/qtm/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">catkin</remote-id> </upstream> diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index 9bbe49e1ab32..483059323e8f 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -2,7 +2,8 @@ AUX r8168-8.051.02-6.1-fix.patch 983 BLAKE2B 6c3ec1726f47ab51d702481a8e6817c2591 AUX r8168-8.051.02-6.4.10-fix.patch 436 BLAKE2B 840f5c356ae3e9862b0d346186ee6a6b9e03d4b7b54453f80f3131e2cb5047f9f7ea61fba4a6f99f8a4b413f6dfcf973efdaec7e706b05c08f2a129727ccaf79 SHA512 c4e9400c331b9500ff87a0f44855570d4c4b20f814fc0c82cd3e8e076833df8ff91e4c581640f1db07c9453611d515a28f5118eb1db9d4124be620c2c6149dcf DIST r8168-8.051.02.tar.bz2 115969 BLAKE2B 28b809c0330920ee0db7a8f8d41e178882531cd0a6793efeadd9670b1a9b5cbe903061073fd1d461f4234feb41249a244f9ef35cdbb780da498e5a6d6f1a5490 SHA512 2f29a413e7db2b7295ea0a970b3385de1dfd6e41e1820097355687daa5c8d155c1cf6115c72875bff4f366365579bffc81733469a62d76f437065b7e514387ca DIST r8168-8.052.01.tar.bz2 126861 BLAKE2B dccee164ea1151859752d525390a3786d31d445e05188a86d2d17c9cbd4435aac788dc5ca1350fcc719bba1c42bd358f39221666f8575d52a9cbf9c78b65c70d SHA512 ae90e108ba3eaaa1c8a639392b21ff98e71abdba514a19b2f286603fbdae69c88592380d9dacda2c10d711348797006a8b518383e4a0519d1bd26dc60266b4b5 +DIST r8168-8.053.00.tar.gz 169102 BLAKE2B 4be044fec5edb78d3050c66f92ffce56487347c171da6d0e29593584e23b173536e48a18ffaf47df4e99999867a65b658a0deace333948bb0d77cd0f5c619719 SHA512 c44a63b04eb5cfb2b8ae434b26098c96067f7a2d6193e206801236fa38832b4f20a0b1a05a374f1d7d5b7ce973d38b6f49744f8b029e22930ebbd2763fbc6440 EBUILD r8168-8.051.02-r1.ebuild 1002 BLAKE2B 5d95ea2cd2d1ced3a6a93288e5822ef282db5eb142aab6ab72094c2ecba8c9b30216503297be8d95e03a2b55d30b3ad9806f52ff08fafad459219182ef29eaac SHA512 c6d44bec0bb85eee47187467eaceb55a991e250dc3856f18a48da305e0e954e60c42c5197503100e3588bcbdb31b60a0e2f55eb641b5a808b1f6338e80f6f809 -EBUILD r8168-8.051.02.ebuild 1167 BLAKE2B 88d2d14ffa61f5136571725f24cb3ae1190c993c15335673d97d189aa55b3891f1e8e0227686870d1ca3a4fa67007a00eb1d6751010a1c32343ed0b3872a100f SHA512 44aa226134cb09a98f9567679ac9610e23449d90ee37f53da253c2effb04b82582895d6d290245e90304987e19c7a87760864a470b7cd7759d4395b010a07233 EBUILD r8168-8.052.01.ebuild 907 BLAKE2B a2dc38d67d93608e8865b2d8d27eadb791a67f27975af14cad4062eb541c9920d32e6870955293e59536aef57d5bcd775c15fcb334a25f499b05691ea7797a19 SHA512 55b9c91f1fe199f15871ce2f7c0749bcecafd769c5e33ea47d6f357c80ea93aa94428e9c05bd0a062277c4dda95c79fe7d8fd121bc75eac24a7e7f3e696ec360 +EBUILD r8168-8.053.00.ebuild 828 BLAKE2B 9477b8a383f7c2b52860df9bf29b197db5e1333472569e370068685258de294a3863a56b6117170eb2054fe8e49a612833dd4533075666f5b37c916ad6bdc30b SHA512 fe8fe1eecd00a8d79fcd0776298a2267a82e4af27b972797f201455821f9ac34e2f7cc7c1f4d76a91fc547a05e5dc79ab05db884ff93f5f69884444bf8b07722 MISC metadata.xml 577 BLAKE2B 0335cbfc902163abd4ffef0ad089b15ae7eaee15e41ed7760834d0329662a8ea0c66d68366a779265205557abe31bf3055b474f6bda7469e803a6240c3e68951 SHA512 f27ae61be558fe46b14fdf43a8d975c71cc900788761e6c5044eea6e8f80ddb6528b0d9d711844b6c8b45e58401a8736d08c40827fa0ceb99be32a3a0abd7086 diff --git a/net-misc/r8168/r8168-8.051.02.ebuild b/net-misc/r8168/r8168-8.051.02.ebuild deleted file mode 100644 index 8f0c5b529c63..000000000000 --- a/net-misc/r8168/r8168-8.051.02.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2023 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.19" 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." - -PATCHES=( - "${FILESDIR}/${PN}-8.051.02-6.1-fix.patch" - "${FILESDIR}/${P}-6.4.10-fix.patch" # bug 912242 -) - -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/r8168/r8168-8.053.00.ebuild b/net-misc/r8168/r8168-8.053.00.ebuild new file mode 100644 index 000000000000..c413c7299d97 --- /dev/null +++ b/net-misc/r8168/r8168-8.053.00.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/Download/List?cate_id=584" +SRC_URI="https://github.com/mtorromeo/${PN}/archive/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +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." + +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ) + + linux-mod-r1_src_compile +} diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest index 9e9052f83dfc..8b7f438feef4 100644 --- a/net-misc/rclone/Manifest +++ b/net-misc/rclone/Manifest @@ -4,7 +4,10 @@ DIST rclone-1.63.0-deps.tar.xz 297987608 BLAKE2B cfda8663ca32b36f5e56db74a724bde DIST rclone-1.63.0.tar.gz 16291884 BLAKE2B 540755808dd73fac061c481e2ea4f1ee241bcd55ccabda9b05343f2074f1672868c4246baff42471ecc7000455fe2c2a04c93578faa994aa0323e0033681bb38 SHA512 5f4590a5244d4eb1a51fc15a4ebef70941af94db8790d3ea1bd56b91f399f580b2cd1cc168c5d5e1fd9ee4bc4a3a4a908c8720aead8f8c24bcee3eacc6423ef3 DIST rclone-1.63.1-deps.tar.xz 298002884 BLAKE2B e9dc1dcd3240d4a649b26606109f4ceb9e4e03448da8d27a11c19ed0dc6df39569c3f4714194c3a62e3d80c7a22591ac392d4187df464a4cf203c6135438ec5b SHA512 fff9e6d8ec7721abfd6c95220163478cf1bb3c8fd551a4310641b1213c072ed853e3ca40fd4109ff642d621cc441434f93608af590bb1b07ac2854ddd1d54147 DIST rclone-1.63.1.tar.gz 16294505 BLAKE2B ccb83d5c748f8b68ba7eb7f5910f9b3e8e503407855b4bdd10d5feafaaa96bbf113305cb90952d05922a0ccae6e8efe88737271f4a193cf7a38f79820439c007 SHA512 fff03146ae7de4b47b883576b67852f9ff0558137ecb966300bd357c706d4b71c20ad0f87d0028c90b570d9351024f4ae8ddcce13333df1cabd0e76e08b29063 +DIST rclone-1.66.0-deps.tar.xz 367625224 BLAKE2B 244dc6c77315d1e1038b5e784deb55ca597ce728df34b0619a62ebd40524547a8e12c90f85385bf8515eb69f5cb07d5db6dbcb0de2c7a259edb1d934ce1eb747 SHA512 b238069636da506826deb99ddab869789bf7bda58d4eb47e47101c5011dd35dfd9a39f481f1c874d57a3330fa8b969fed2b98bb1d13ec8e79495f55403cf6001 +DIST rclone-1.66.0.tar.gz 17066102 BLAKE2B 587208635c2154782a9f3285c7972a567625120140d1b43096b572d19ab74ae9c7e12b485d6a74d88f1ef4bbce9656bea8f21c67c641227756dd48856a4da9a7 SHA512 955ed1457ebe7e6ac2288484109ba263601e147f767ce71b70e14ddcf3f97659d90704de094e4e83c0820267e0f41b1950fc3db534bb3577bcf27f0a2401eb84 EBUILD rclone-1.62.2-r1.ebuild 1104 BLAKE2B 505d0eb66a338c3303e20cc4047f4b59411152c3e8269a12db61802d62814f403d5c85877428e8937be0e0b0c770d6c7e67b6c9d8723c6feaf1e256b8d4f1dd0 SHA512 e17b70474989f184a72e8c656e15d2a7296a55ede71493ef10c85adba247baaee749d382faad820667cd0ecc192732b07771f1159ca2929a5d32f92dcdf4517a EBUILD rclone-1.63.0.ebuild 1106 BLAKE2B ea488103b1add2e7cb85778a011f25521747cbbca262d924b19e4589a2e5214084c185bc15b0428918c9591b63fff299baa4a3687b886c3855fb63f519b55c4e SHA512 4ad37681aea9afd7523913a4fe56a9b3ddc3314085a8964eb1097c0d4a71809219ee344a8fe3879d54989e0eeea3a051a3f11c24ac51985e637713e76df26921 -EBUILD rclone-1.63.1.ebuild 1106 BLAKE2B ea488103b1add2e7cb85778a011f25521747cbbca262d924b19e4589a2e5214084c185bc15b0428918c9591b63fff299baa4a3687b886c3855fb63f519b55c4e SHA512 4ad37681aea9afd7523913a4fe56a9b3ddc3314085a8964eb1097c0d4a71809219ee344a8fe3879d54989e0eeea3a051a3f11c24ac51985e637713e76df26921 -MISC metadata.xml 326 BLAKE2B d66b47f06b10f70e04c0bcae94cda45bbc562cf6c543454a02e34291039c395971fb0a2bae4e3022294a9fcdfe3c1936d67002317f2c467ea2a7a609b51908fd SHA512 570f1668212583dceec0166218b237aa934b67cca17d0a1029caaf66c3b47382233a8571857bffd0ff49ada70924ce9cd5b17c6124152862ba7422ee93e35f5e +EBUILD rclone-1.63.1.ebuild 1104 BLAKE2B b44f954688b4aea211812e31f62edb83eb501746167d9656a48394a35d4f31cd871f936a0fc086c393854011b299fb5d5ceb0785504439174da994639edc4d92 SHA512 b6e55378818f3527421d1720a84f723a6b67af45ced19c4f205bb6b80bbadfcbd15b57ecc962199871263e9340e1ffd5088b45785c7bf9bb1d7913b4f2681c8b +EBUILD rclone-1.66.0-r1.ebuild 1483 BLAKE2B 635fbf54022fa9243854913d12f696431ca6dc93f75cc223cc687dbd6ee40dd6d27de8bde28a478abff82244954fc6d25794ff9e4a86e5311876c64f07df6a5d SHA512 56a80fee745ba534f32b1bb6f0306ff01406c977f8eaf2c7acc5eb4b4df6e07a16aed8cf3cc20341283c2313216da182b27328c27351c496ca5011b547787dd4 +MISC metadata.xml 494 BLAKE2B 8c55f5c9c23f1f0d91a1c617b15839850edf6a1e1da2ce9f3c474c69770175a102be95500b37e384ad9d68b1931363d35d2e499ed38a918bbd13528116528c10 SHA512 7df01f2ac9a0fe8a048726c327ada07cdf3b332c202144e31dec4be9558c75819cb871425a70406e1b84df7a13cb7c8470cc6522b343a3efb4dc8b529687eb27 diff --git a/net-misc/rclone/metadata.xml b/net-misc/rclone/metadata.xml index 92b54863ba1f..77f51273cdf6 100644 --- a/net-misc/rclone/metadata.xml +++ b/net-misc/rclone/metadata.xml @@ -5,7 +5,12 @@ <email>perfinion@gentoo.org</email> <name>Jason Zaman</name> </maintainer> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> <upstream> + <bugs-to>https://gitlab.com/rclone/rclone/-/issues/</bugs-to> <remote-id type="github">rclone/rclone</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/rclone/rclone-1.63.1.ebuild b/net-misc/rclone/rclone-1.63.1.ebuild index 715bda67b36e..9087a250f9f2 100644 --- a/net-misc/rclone/rclone-1.63.1.ebuild +++ b/net-misc/rclone/rclone-1.63.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 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 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv 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 diff --git a/net-misc/rclone/rclone-1.66.0-r1.ebuild b/net-misc/rclone/rclone-1.66.0-r1.ebuild new file mode 100644 index 000000000000..b59ebe324c66 --- /dev/null +++ b/net-misc/rclone/rclone-1.66.0-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 check-reqs edo go-module + +DESCRIPTION="A program to sync files to and from various cloud storage providers" +HOMEPAGE="https://rclone.org/ + https://github.com/rclone/rclone/" +SRC_URI=" + https://github.com/rclone/rclone/archive/v${PV}.tar.gz + -> ${P}.tar.gz + https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz +" + +LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + +RDEPEND=" + sys-fs/fuse:3 +" + +CHECKREQS_DISK_BUILD="2500M" + +pkg_setup() { + check-reqs_pkg_setup +} + +src_compile() { + local go_ldflags=" + -X github.com/rclone/rclone/fs.Version=${PV} + " + local -a go_buildargs=( + -ldflags "${go_ldflags}" + -mod=readonly + -o ./ + ) + ego build "${go_buildargs[@]}" . + + edob ./rclone genautocomplete bash "${PN}.bash" + edob ./rclone genautocomplete zsh "${PN}.zsh" +} + +src_test() { + # Setting CI skips unreliable tests, see "fstest/testy/testy.go" + # "TestAddPlugin" and "TestRemovePlugin" fail. + local -x CI="true" + local -x RCLONE_CONFIG="/not_found" + + edob go test -mod=readonly -v -run "!Test.*Plugin" ./... +} + +src_install() { + exeinto /usr/bin + doexe "${PN}" + dosym -r "/usr/bin/${PN}" /usr/bin/mount.rclone + dosym -r "/usr/bin/${PN}" /usr/bin/rclonefs + + newbashcomp "${PN}.bash" "${PN}" + insinto /usr/share/zsh/site-functions + newins "${PN}.zsh" "_${PN}" + + doman "${PN}.1" + einstalldocs +} diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest index 96dd3e09af47..58e2e65286a5 100644 --- a/net-misc/rygel/Manifest +++ b/net-misc/rygel/Manifest @@ -1,5 +1,3 @@ -DIST rygel-0.42.4.tar.xz 1700196 BLAKE2B b83f9534c2294b88a180b20f90df6c43a220db83473429a41b034bfe3fff501f0f4e1f17deaa72001b8e3a886477f2c788dcf457463a275165652cc8c33da6e8 SHA512 b346e9ebfa6349c32b67557bef57bf7ddcf92782d112e875d64b7bd26718cbf89d7c5178b03defeba606ddfeb5bc94c685c10bdbd3fbd14f6942c72d96a9331a DIST rygel-0.42.5.tar.xz 1704072 BLAKE2B a00be296956def2bc90b978df5b8c4b23a122b9c30adfa66c634249b5daafe8d21de1cac40417095d72d42e80522ce58fe678a7f7780bd1e134aa2cd66f3d2bf SHA512 cd1aaff4e2eb2c25931197d70f518a30dab75604d62b9f071bc560570c352371d132a10caaf94956d34ecd24505ccd9a7b9f5bf324d544c676ca1f47b124f533 -EBUILD rygel-0.42.4.ebuild 2281 BLAKE2B f07335d8f5283116ee95142eecfa33eca960a463fcfef4b12422d9554ef51a97c8ec407ec108f2e3f9eca88852764a8bba737e072329e5e4decb2b3a6751b06b SHA512 e717acdf3126874357b6d3a888c25484c76371943bea0e91d4a0a196ca640da711eed7a34096cdce8bc1a4439884412ebca55863f154d5bc3f9e7b8269c81170 EBUILD rygel-0.42.5.ebuild 2281 BLAKE2B e7c83736c92ef9df602d71d2df9ff95cd42925995eafddb30e7a1de4d92f11f3b8c97592b8eaf6cd1f6e0b47dc0e0a9d5888b8ea117b48c0466c891f8765402d SHA512 9c98fc1e278b8d7edf8facda09cc8e5bd56b6adaf7192ea8a941368b9da73e7d15282b84bb888b1271efc7830022e31c626e6a50ef2a83b3b16c8fdf789fc182 MISC metadata.xml 518 BLAKE2B 789b1e692571138dfd93f177e22ae1f86ed20a96652c31d5012b4e691b101408eb6162e401be9661f23b8239a304e854044485a8de6f2e1db7b8ecd1e801dabc SHA512 7f956f2a41c6de314dbfc2f3b17de68857474fcbfb4fc43f3019cc713d899ebbb17fcddc613bae43e441242f6e730ddb188cf09a40bd22080e665e6f32212a63 diff --git a/net-misc/rygel/rygel-0.42.4.ebuild b/net-misc/rygel/rygel-0.42.4.ebuild deleted file mode 100644 index 53fd5ee1a17e..000000000000 --- a/net-misc/rygel/rygel-0.42.4.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson systemd vala xdg - -DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer" -HOMEPAGE="https://wiki.gnome.org/Projects/Rygel" - -LICENSE="LGPL-2.1+ CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode" -RESTRICT="!test? ( test )" - -# x11-libs/libX11 from qa-vdb -DEPEND=" - >=net-libs/gupnp-1.5.2:1.6=[vala] - >=dev-libs/libgee-0.8:0.8= - >=net-libs/gssdp-1.5.0:1.6=[vala] - >=dev-libs/glib-2.62.0:2 - >=dev-libs/libxml2-2.7:2 - >=net-libs/gupnp-av-0.14.1:=[vala] - >=media-libs/gupnp-dlna-0.9.4:2.0= - >=net-libs/libsoup-3:3.0 - sqlite? ( - >=dev-db/sqlite-3.5:3 - dev-libs/libunistring:= - ) - >=media-libs/gstreamer-1.20:1.0 - >=media-libs/gst-plugins-base-1.20:1.0 - media-libs/gstreamer-editing-services:1.0 - >=media-libs/libmediaart-0.7:2.0[vala] - media-plugins/gst-plugins-soup:1.0 - x11-libs/gdk-pixbuf:2 - >=sys-apps/util-linux-2.20 - x11-misc/shared-mime-info - introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) - tracker? ( app-misc/tracker:3=[vala(+)] ) - transcode? ( - media-libs/gst-plugins-bad:1.0 - media-plugins/gst-plugins-twolame:1.0 - media-plugins/gst-plugins-libav:1.0 - ) - gtk? ( >=x11-libs/gtk+-3.22:3 ) - - x11-libs/libX11 -" -RDEPEND="${DEPEND}" -BDEPEND=" - $(vala_depend) - app-text/docbook-xml-dtd:4.5 - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig -" -# Maintainer only -# app-text/docbook-xsl-stylesheets -# >=dev-lang/vala-0.36 -# dev-libs/libxslt - -src_prepare() { - vala_setup - default - # Disable test triggering call to gst-plugins-scanner which causes - # sandbox issues when plugins such as clutter are installed - #sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \ - # -i tests/rygel-playbin-renderer-test.c || die - - #default -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc api-docs) - -Dman_pages=true - -Dsystemd-user-units-dir=$(systemd_get_userunitdir) - -Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3") - -Dengines=gstreamer - -Dexamples=false - $(meson_use test tests) - -Dgstreamer=enabled - $(meson_feature gtk) - $(meson_feature introspection) - ) - meson_src_configure -} diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest index 80eef648e6f1..1e5edd80585b 100644 --- a/net-misc/sitecopy/Manifest +++ b/net-misc/sitecopy/Manifest @@ -6,7 +6,9 @@ AUX sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch 1671 BLAKE2 AUX sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch 555 BLAKE2B 6e51ed4d345fe29d56ec4ec2d4e03fef1779103bb5b1ca0bf9202c5274f1703a0dea8253492778c6d0626d1552bbfc1b1a14e1df5f2f14d458cd2f55521bc524 SHA512 28f27d6ccf526a6c4553236b840c2be9430e72ab1f338242737e06715ea01712d75ee030804a9a2df4d5c45728c5909343e4adf435636db968868e86e27551a0 AUX sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch 1628 BLAKE2B 51f63c89f259b5e3a9c28dab50d563472f8e85a07d11853b076123f58e8abd7eaaa5e8d8d34a5295d0577655069a6e9dc404740566000b7cb160bb4bdf3fb52d SHA512 cdd3abe65fbaadc52caa83641212fd96430df9ea8dfaf08568d63907df3cc87b48b9de0febde545b24722ba7e77c5a8fb4226d8a6dd696b87820dfc1d4fdb6d4 AUX sitecopy-0.16.6-32-neon-0.31.patch 346 BLAKE2B 7140d51c507ce81e568806e6c3ac3a00cadc0fcc00cfa55150de3718039365b7ca4c79f757331b639c1c182c979288a308241def2c7d03ac7d3b0e64091b6bc0 SHA512 87b2d063b463109351789c259c0d879a96144bf9c27c8a6bd3ddabd21b6b152d73a04a7311e3b17266b42b5c0f30028402b4a8e929154b867a055743a275623c +AUX sitecopy-0.16.6-33-c99-build-fix.patch 304 BLAKE2B 6bafbaec861af759dcc3de59ee17f78681c2872864a9aeefc20c3cca1c06740e62e90bf496af78ac6f030c8c923f1fef9372702378efed70c723783ffa981ec2 SHA512 3ed2a3e92271f7b85b1d12c478202c7dd19ca4d04a361fd43d123f903f9187b7cf44d3fbdff544ad8191b33856c4e1db618a7d71dca314d4263c65a46d03992d DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 BLAKE2B a5667dac3e81d4c34f97429d952d96d9c5ef813f9ac1eae021a9af795d939546cc77a2bc9831adffe74485a35f2b3fb8a9765a743cbf67198ba4dcc0fca9dd60 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965 DIST sitecopy-0.16.6.tar.gz 1022265 BLAKE2B b962f9ebd40da80d4ebb83ea5c7cd9acfcffc49d5c42de4103272f38a1bf4d1c050863fba2861f162c143ed9d082d44a50a1399a044fbbf4e3d9bf4a971b3800 SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734 EBUILD sitecopy-0.16.6-r2.ebuild 2031 BLAKE2B 2a0a279bfe2359f42ef82f728d3ed6331f1a1d0198148e183326e12a0dcad8a9e5b4bea59887eb1207f5c3a368c48e5d00460da52f0bdfeb93eb48eb066fd170 SHA512 b70a87ea91ff7f1a673bb2e173b61be38d36d1e4fef7ac40cb9a7fdd8048fed8caf8d2c6d0db53cd16a4efeb7561ece0a189366a63a2a3b6292e40e7e4bb3003 +EBUILD sitecopy-0.16.6-r3.ebuild 2092 BLAKE2B 302038aa33cdf50614d8711d2821ea60d2392940090ccc6ac5247535f25ca68db40abaa96b9917d94440be4c41ac24279535ed8ea7da1275aaa7ad0c640442c3 SHA512 cef75500702b7074cbf2264c737daf0e52c1e9893c0d8b0fecfbe7b27088375c0176d1e7495ad75faec5fc0d1c23b049ac52115a6992f47f0328de898f8bf39b MISC metadata.xml 612 BLAKE2B 0c206ae7b2894a24efa3c7bf0c98a6d8bc2a4eaae0a4015fd55d793e2cd2462a82c4a0ab4983de7f0dc3ee85eb216d997c73e1fd769d36814ce6393600ae0581 SHA512 026dabe1f9f701a737affa9da967118ab722d49f5ef289fd3ea55147b09326c7223711887c2c8258fcf9fdab775e24f687f773a732c502f602a53184de239dec diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch new file mode 100644 index 000000000000..59b8e089b5a4 --- /dev/null +++ b/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch @@ -0,0 +1,12 @@ +Bug: https://bugs.gentoo.org/921255 +--- a/src/ftp.c ++++ b/src/ftp.c +@@ -634,7 +634,7 @@ static int dtp_open_active(ftp_session *sess, const char *command) + char *a, *p; + int ret; + int listener; +- size_t alen; ++ socklen_t alen; + struct sockaddr_in addr; + + ret = ftp_open(sess); diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild new file mode 100644 index 000000000000..d309794b2639 --- /dev/null +++ b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools + +DESCRIPTION="Maintain remote web sites with ease" +HOMEPAGE=" http://www.manyfish.co.uk/sitecopy/" +SRC_URI="mirror://gentoo/${P}.tar.gz + https://dev.gentoo.org/~jstein/files/sitecopy-0.16.6-04-manpages-addition-fixes.patch" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="expat nls rsh ssl webdav xml zlib" + +RDEPEND=" + rsh? ( net-misc/netkit-rsh ) + >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] + <=net-libs/neon-0.32.9999[zlib?,ssl?,expat?] + xml? ( >=net-libs/neon-0.24.6:=[-expat] ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + # SiteCopy patches are being currently pulled & ported from + # http://ftp.debian.org/debian/pool/main/s/sitecopy/ + # Consider SiteCopy to be more or less being actively maintained by + # Debian maintainers, but GPL patches ported into Gentoo. + + eapply \ + "${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \ + "${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \ + "${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \ + "${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \ + "${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \ + "${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \ + "${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \ + "${FILESDIR}/sitecopy-0.16.6-32-neon-0.31.patch" \ + "${FILESDIR}/sitecopy-0.16.6-33-c99-build-fix.patch" \ + "${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch" + + # Source package uses incorrect '/usr/doc' for the doc folder. So use + # sed to correct this error. + sed -i -e "s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \ + Makefile.in || die "Documentation directory patching failed" + + mv configure.in configure.ac || die + eautoconf + eautomake +} + +src_configure() { + econf \ + $(use_with ssl ssl openssl) \ + $(use_enable webdav) \ + $(use_enable nls) \ + $(use_enable rsh) \ + $(use_with expat) \ + $(use_with xml libxml2 ) \ + --with-neon +} diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index f6fe08f2bdc5..ac9687b2296d 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -1,6 +1,8 @@ AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b AUX spice-gtk-0.42-libtool-export-symbols-fix.patch 2413 BLAKE2B afb7fb5763d28f9666e71ff55b3d66587922175bc518396a18cfe97544b3871185d51c170287508fc4a47e2ebc8ca0cf39ebdebb829b5213432eb15019a7e587 SHA512 df284e95f970149a75d87dbad6e06899e80f68721979f91b3246037b37e432e48beab832fe3d376814681f9e11611b9f4c3d3463f969f32c171879c2e6cd1c38 +AUX spice-gtk-0.42-lld17-fix.patch 5913 BLAKE2B 424f780a9e8386d9b7eacccc012e490cec4d62274d7d01269121f46c16eaa63a99280bd05adb36671151dc1ade3adffb44933546254812961e5633767662b613 SHA512 a6859c10cebd5be3e6661f5b2558e571f15d8d53fbb0bba3a40364632473043c6045e17f068d71135e4e61a9ea7d641f0aa0ca6eb6e0499f4aab168406e2b48e DIST spice-gtk-0.42.tar.xz 812776 BLAKE2B 406a2218d4ec0765173c911d6305cb0e043cd575c53ba51cbd53d922835b9d395873143f2388a5a02ee60ce617e32a1cb6a95008b67deec787fcf67da0d49736 SHA512 fd567e35f6d4ebfe6ef004f358dca4c41254336f55f7dd26cf67b62b2acb4866907186bd0526b7cb52b0c24020cdc8809251127498a8d357555bb0c5d3b8f137 EBUILD spice-gtk-0.42-r3.ebuild 3991 BLAKE2B 7363ae47a07944a1f84f74f00ec0dd0375968e5c51747ec0d383f821390a3ec94b3dc3b93f782f9e348836d395954a573158885aa3d094f385ea70fb67b2392b SHA512 2744690287e81f8614fe88444e3d2a468197e6ec78a375b44de3881a2f40ccbb3fe82edff9658d6e2d393bf504317eedfe5709c17a5acfdcbad69cb91b3f345c -EBUILD spice-gtk-9999.ebuild 3923 BLAKE2B d7ac20e48e55f4ba29037074a4e226b33597a50423b22d4c9e7ea437563eef2eeeaab8d843f229de844ea4734568ccdd827f7f3cf368d23ab4454259ce8f8da0 SHA512 bbc4ea378d3a483514bccf47d94cd1d8ee4a61735f4ff3301d8f606555a32365a84a18076837f54656300889fc558f5ca0542c218160e3d67e20e2b18d858c88 +EBUILD spice-gtk-0.42-r4.ebuild 4037 BLAKE2B 90374a9c5679beaabacef586d348db29618283c767abaa845c61f8ac7aac1f0f3b2e4419c7deddecd9e283748b1d9af43344155189b07cbd435a7cb6d9924d9c SHA512 386cbd38616d91107138c75e7ad7a079f43ecfc88ee90c956b4b74b9ec3118be0ac52591f847d0baf3718c962787309ee7881f51469fbff3aaa17697d307d2fc +EBUILD spice-gtk-9999.ebuild 3923 BLAKE2B 52e108cbd8a0f818123beb244ab8df538d9173a479d1f4ba27069e5a1a135736ae38905231259f721892c6a2d2216bab5bda34d137f15db17fcdd6064cf471d3 SHA512 f4681c903728c00a5406e60f5a9df363adc637977148b3cb87562cd5bd1f2526b904f564cbae4173e30aadcfae9c22c7bd21652cb3467ea28752cca6a98d3a91 MISC metadata.xml 878 BLAKE2B ed1c920773825632995e541e6bc7ec0b894005edcff41c90c2af4a47279db54bcc695b22e91e7aa3c1376cee6ed509f985cb7486a2f7d75e8b6ebbb8c6caa67b SHA512 308ea78d044e3c13ed40154b4835f202dc523fc8925aa3ad0304ddb6518a9c51437ebccc539998b8d55d6919649358a073b5c80a2e8dd0d8e82bb4e0ab6c6d0a diff --git a/net-misc/spice-gtk/files/spice-gtk-0.42-lld17-fix.patch b/net-misc/spice-gtk/files/spice-gtk-0.42-lld17-fix.patch new file mode 100644 index 000000000000..b6197fb15ba3 --- /dev/null +++ b/net-misc/spice-gtk/files/spice-gtk-0.42-lld17-fix.patch @@ -0,0 +1,167 @@ +https://gitlab.freedesktop.org/spice/spice-gtk/-/merge_requests/121 +https://bugs.gentoo.org/915210 + +From 7e87382b585a799ced543b0c3fd127b2a813285f Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio <freddy77@gmail.com> +Date: Fri, 23 Jun 2023 21:17:26 +0100 +Subject: [PATCH] Split symbol file in 2 files + +One file for spice-glib and another for spice-gtk. +This avoid having duplicate exports in the future. +spice_g_signal_connect_object, spice_util_get_debug, +spice_util_get_version_string, spice_util_set_debug and +spice_uuid_to_string are exported by both libraries to keep ABI +compatibility. + +Signed-off-by: Frediano Ziglio <freddy77@gmail.com> +--- + src/{map-file => map-file-glib} | 22 --------------------- + src/map-file-gtk | 35 +++++++++++++++++++++++++++++++++ + src/meson.build | 17 ++++++++++------ + 3 files changed, 46 insertions(+), 28 deletions(-) + rename src/{map-file => map-file-glib} (89%) + create mode 100644 src/map-file-gtk + +diff --git a/src/map-file b/src/map-file-glib +similarity index 89% +rename from src/map-file +rename to src/map-file-glib +index c0d8ca6e..ef0a31f3 100644 +--- a/src/map-file ++++ b/src/map-file-glib +@@ -31,18 +31,8 @@ spice_display_channel_get_primary; + spice_display_channel_get_type; + spice_display_channel_gl_draw_done; + spice_display_get_gl_scanout; +-spice_display_get_grab_keys; +-spice_display_get_pixbuf; + spice_display_get_primary; +-spice_display_get_type; + spice_display_gl_draw_done; +-spice_display_key_event_get_type; +-spice_display_keyboard_ungrab; +-spice_display_mouse_ungrab; +-spice_display_new; +-spice_display_new_with_monitor; +-spice_display_send_keys; +-spice_display_set_grab_keys; + spice_file_transfer_task_cancel; + spice_file_transfer_task_get_filename; + spice_file_transfer_task_get_progress; +@@ -52,17 +42,7 @@ spice_file_transfer_task_get_type; + spice_get_option_group; + spice_gl_scanout_free; + spice_gl_scanout_get_type; +-spice_grab_sequence_as_string; +-spice_grab_sequence_copy; +-spice_grab_sequence_free; +-spice_grab_sequence_get_type; +-spice_grab_sequence_new; +-spice_grab_sequence_new_from_string; + spice_g_signal_connect_object; +-spice_gtk_session_copy_to_guest; +-spice_gtk_session_get; +-spice_gtk_session_get_type; +-spice_gtk_session_paste_from_guest; + spice_inputs_button_press; + spice_inputs_button_release; + spice_inputs_channel_button_press; +@@ -185,8 +165,6 @@ spice_usb_device_manager_is_redirecting; + spice_usb_device_manager_allocate_device_for_file_descriptor; + spice_usb_device_manager_create_shared_cd_device; + spice_usb_device_manager_is_device_shared_cd; +-spice_usb_device_widget_get_type; +-spice_usb_device_widget_new; + spice_usbredir_channel_get_type; + spice_util_get_debug; + spice_util_get_version_string; +diff --git a/src/map-file-gtk b/src/map-file-gtk +new file mode 100644 +index 00000000..ca5dd446 +--- /dev/null ++++ b/src/map-file-gtk +@@ -0,0 +1,35 @@ ++SPICEGTK_1 { ++global: ++spice_display_get_grab_keys; ++spice_display_get_pixbuf; ++spice_display_get_type; ++spice_display_key_event_get_type; ++spice_display_keyboard_ungrab; ++spice_display_mouse_ungrab; ++spice_display_new; ++spice_display_new_with_monitor; ++spice_display_send_keys; ++spice_display_set_grab_keys; ++spice_grab_sequence_as_string; ++spice_grab_sequence_copy; ++spice_grab_sequence_free; ++spice_grab_sequence_get_type; ++spice_grab_sequence_new; ++spice_grab_sequence_new_from_string; ++spice_gtk_session_copy_to_guest; ++spice_gtk_session_get; ++spice_gtk_session_get_type; ++spice_gtk_session_paste_from_guest; ++spice_usb_device_widget_get_type; ++spice_usb_device_widget_new; ++ ++/* FIXME: remove the following 5 duplicated symbols in next ABI break */ ++spice_g_signal_connect_object; ++spice_util_get_debug; ++spice_util_get_version_string; ++spice_util_set_debug; ++spice_uuid_to_string; ++ ++local: ++*; ++}; +diff --git a/src/meson.build b/src/meson.build +index 852217ac..68fe7ab2 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -185,14 +185,20 @@ test_syms_path = meson.current_source_dir() / 'test-map-file' + test_version_script = '-Wl,--version-script=@0@'.format(test_syms_path) + spice_has_version_script = compiler.has_link_argument(test_version_script) + +-spice_client_glib_syms = files('map-file') +-spice_client_glib_syms_path = meson.current_source_dir() / 'map-file' +-spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path) +-if not spice_has_version_script ++if spice_has_version_script ++ spice_client_glib_syms = files('map-file-glib') ++ spice_client_gtk_syms = files('map-file-gtk') ++ spice_client_glib_syms_path = meson.current_source_dir() / 'map-file-glib' ++ spice_client_gtk_syms_path = meson.current_source_dir() / 'map-file-gtk' ++ spice_glib_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path) ++ spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_gtk_syms_path) ++else + if host_machine.system() == 'linux' + error('Version scripts should be supported on Linux') + endif + spice_client_glib_syms = [] ++ spice_client_gtk_syms = [] ++ spice_glib_version_script = [] + spice_gtk_version_script = [] + endif + +@@ -210,7 +216,7 @@ spice_client_glib_lib = library('spice-client-glib-2.0', spice_client_glib_sourc + version : spice_client_glib_so_version, + install : true, + include_directories : spice_gtk_include, +- link_args : [spice_gtk_version_script], ++ link_args : [spice_glib_version_script], + link_depends : spice_client_glib_syms, + dependencies : spice_glib_deps) + +@@ -377,7 +383,6 @@ if spice_gtk_has_gtk + # + # libspice-client-gtk.so + # +- spice_client_gtk_syms = spice_client_glib_syms + + # soversion + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +-- +GitLab + diff --git a/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild new file mode 100644 index 000000000000..677217bfee91 --- /dev/null +++ b/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{10..12} ) + +inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg + +DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" +HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git" + inherit git-r3 + + SPICE_PROTOCOL_VER=9999 +else + SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + + SPICE_PROTOCOL_VER=0.14.3 +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="gtk-doc +gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav" + +# TODO: +# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h +# * use external pnp.ids as soon as that means not pulling in gnome-desktop +RDEPEND=" + >=dev-libs/glib-2.46:2 + dev-libs/json-glib:0= + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + media-libs/gstreamer:1.0[introspection?] + media-libs/opus + media-libs/libjpeg-turbo:= + sys-libs/zlib + >=x11-libs/cairo-1.2 + >=x11-libs/pixman-0.17.7 + x11-libs/libX11 + gtk3? ( x11-libs/gtk+:3[introspection?] ) + introspection? ( dev-libs/gobject-introspection ) + dev-libs/openssl:= + lz4? ( app-arch/lz4 ) + policykit? ( + >=sys-auth/polkit-0.110-r1 + ) + sasl? ( dev-libs/cyrus-sasl ) + smartcard? ( app-emulation/qemu[smartcard] ) + usbredir? ( + sys-apps/hwdata + >=sys-apps/usbredir-0.4.2 + virtual/acl + virtual/libusb:1 + ) + webdav? ( + net-libs/phodav:3.0 + net-libs/libsoup:3.0 + ) +" +# TODO: spice-gtk has an automagic dependency on media-libs/libva without a +# configure knob. The package is relatively lightweight so we just depend +# on it unconditionally for now. It would be cleaner to transform this into +# a USE="vaapi" conditional and patch the buildsystem... +RDEPEND=" + ${RDEPEND} + amd64? ( media-libs/libva:= ) + arm64? ( media-libs/libva:= ) + x86? ( media-libs/libva:= ) +" +DEPEND=" + ${RDEPEND} + >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER} + valgrind? ( dev-debug/valgrind ) +" +BDEPEND=" + $(python_gen_any_dep ' + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ') + dev-perl/Text-CSV + dev-util/glib-utils + >=sys-devel/gettext-0.17 + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + vala? ( $(vala_depend) ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.42-libtool-export-symbols-fix.patch" + "${FILESDIR}/${PN}-0.42-lld17-fix.patch" +) + +python_check_deps() { + python_has_version "dev-python/six[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + + python_fix_shebang subprojects/keycodemapdb/tools/keymap-gen + + use vala && vala_setup +} + +src_configure() { + local emesonargs=( + $(meson_feature gtk-doc gtk_doc) + $(meson_feature gtk3 gtk) + $(meson_feature introspection) + $(meson_use mjpeg builtin-mjpeg) + $(meson_feature policykit polkit) + $(meson_feature lz4) + $(meson_feature sasl) + $(meson_feature smartcard) + $(meson_feature usbredir) + $(meson_feature vala vapi) + $(meson_use valgrind) + $(meson_feature webdav) + $(meson_feature wayland wayland-protocols) + ) + + if use elibc_musl; then + emesonargs+=( + -Dcoroutine=gthread + ) + fi + + if use usbredir; then + emesonargs+=( + -Dusb-acl-helper-dir=/usr/libexec + -Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids + ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + if use usbredir && use policykit; then + # bug #775554 (and bug #851657) + fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper + fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper + fi + + make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse +} diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild index 37eef00f49c0..5f81513a6c11 100644 --- a/net-misc/spice-gtk/spice-gtk-9999.ebuild +++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest index 50d6fce8b2ad..e6ce4cd2d1cc 100644 --- a/net-misc/sslh/Manifest +++ b/net-misc/sslh/Manifest @@ -1,8 +1,11 @@ AUX sslh.conf.d-2 621 BLAKE2B 095522c582be245f1e49018848be738a33eb722cd9be4bd8a0830bbfaa1c2e4018ff480b625349372cc35ec47a1b10069cb5fd6a3c22d7e957e782c888c70b55 SHA512 31d482af0b3626f4b2f669f74a08fa6b6dfc310a40ab332cc3907306bd2fa5321f92e0e76af72c2ea185142f0d485578817e738737917b9c1764079070297e67 AUX sslh.init.d-3 270 BLAKE2B 98cc6c6ccc37a6e8af6d0e84356779e0f304e3d6f45f9fff53c3d1c870ff6b03ac780c04c29e4dce7d6aa3e4cdce365fb54228600e7ce70d9d32691202a5ffb5 SHA512 b919ae318c789ba3e5dd0f5df665a7421be791e89074b07ee00c47b3fe12475562eb5675bbb168c86388902bf50069e0d6f3e804a14666563de07a0a71075ee0 +AUX sslh.service 661 BLAKE2B d6a94b992745a1282a6ac9ba3d95395f708f703b1a22a591c03092243d5e73f87c177685d4d469ed96ef439aead22e505ba2f479107e640c3434af6536c2b866 SHA512 4fa63d43159c3f3f66bdecd087caf6a2677619dcd8baa65e97593f70c334efa5d5835e98ecf9771ad28e624c2b69b3798f1025014f4a70de65610caff8917694 DIST sslh-1.22c.tar.gz 146954 BLAKE2B 1870623634b625bb98787be27444403555262f8a9782573c9ed116e65df9e4518c062ef2e2a40fe7bb550f811518ccc2149a23c36deef6c156911b4c42e27473 SHA512 f13560fbe74b5b08e9b360985d6afd27f2c7e157d220919162e354f3711b90f43bb81f9bda341fb21fef2651acd488f52e9a04dc2da28861540f579e7ca798c4 DIST sslh-2.1.1.tar.gz 212402 BLAKE2B fbde666b49e30950ff4c5c2f6aa563e538fd070ed0edecf2c19a85884379ea8a699488fd23e742c672656cc89b6911bdb764a0989f3b967ecc75aefe5634ea4b SHA512 f689394028ec25e16dd59a5f1aa4c18a760108f0acf23b4eb2ccf000dc09adf1428272c3e93f5b0012f9603076ab1408a3e1aca98adb3e69743d184cb898a9a4 +DIST sslh-2.1.2.tar.gz 214091 BLAKE2B 220841c7105032b02351b6073ffd994a22efb0241ebec96704bd2ec534197a19c366d925ebf07a494773e89d83df5f284567e34d419b887edb73545523abb71e SHA512 4f0b3c61e6153b912b11c49baba2df1a9df6732ea9fcdee628bf02043efc1b6505ac97eec97740c67d09f7d58a1bb79e0e06d949cb7fabcffa1fb91733372631 EBUILD sslh-1.22c-r1.ebuild 1902 BLAKE2B e99872913344bd8ded6857a29d3c9f9e182a17ef52876a1e7b239ffe734bc492ef5eb66dc55d49a6c4affd35cb664a9bddc94fcdbc8a8466c59e0d9bb844e79b SHA512 91e768617210ace3354b3a6a9c4da9a4c5a5e20d6d875556dfbe406a72465d8a4e951e73e5c7711a90bdfb79ae82faa724d808be94af16cf204e3b2a40302973 EBUILD sslh-2.1.1.ebuild 2068 BLAKE2B 6b5024971d2d6af50c2762c3a0decbc926ca4741db4cfa773c699430287d8417950675cfb6f6d6adc958885785578da9eb9e4014696c87283a73cb940e9485c9 SHA512 daefbbc40e2c6c637647800fa2a6213e0c89c08d9d3cdbdf8cc27d3da691f9b55e209e0e06255a12f371a11a16b0b95e6e45834b8faa563bbc2bfa12dffd7c6c -EBUILD sslh-9999.ebuild 2068 BLAKE2B 6b5024971d2d6af50c2762c3a0decbc926ca4741db4cfa773c699430287d8417950675cfb6f6d6adc958885785578da9eb9e4014696c87283a73cb940e9485c9 SHA512 daefbbc40e2c6c637647800fa2a6213e0c89c08d9d3cdbdf8cc27d3da691f9b55e209e0e06255a12f371a11a16b0b95e6e45834b8faa563bbc2bfa12dffd7c6c +EBUILD sslh-2.1.2.ebuild 1991 BLAKE2B eeee908e907f58de6bb368f05207f12382da4fed96d07e47fe9eaaf38f0df9e509d6c84b47a41cf3ea4affd3c01545b7dca08c344caca80fc2a09ac10a33b6e5 SHA512 af38950b07ebea651759cd235f3c4af2f8fe57e1732b3f6d8a4e12516ec295bf6bc3ac0dc6688b90f6e2704a7c87709674387eaac82f530ff1f313a7230341da +EBUILD sslh-9999.ebuild 1991 BLAKE2B eeee908e907f58de6bb368f05207f12382da4fed96d07e47fe9eaaf38f0df9e509d6c84b47a41cf3ea4affd3c01545b7dca08c344caca80fc2a09ac10a33b6e5 SHA512 af38950b07ebea651759cd235f3c4af2f8fe57e1732b3f6d8a4e12516ec295bf6bc3ac0dc6688b90f6e2704a7c87709674387eaac82f530ff1f313a7230341da MISC metadata.xml 482 BLAKE2B d2c26b25b184b90e3a7d85e81ceb0a0631fca8c267823a87f9302e91d40e80a31c23b184c572af1a32c5b02f86e62ec86efb7a39d5d2c01187e16dd6dc4e2f6c SHA512 3ba2f78c8498d79c318619ddf6e2b3ccd35821ead01dfd65bd2dbae95b1c7d66d7f16751221cceb1439db9629add3bb0538057feeacccc8caea3a0e5041e9184 diff --git a/net-misc/sslh/files/sslh.service b/net-misc/sslh/files/sslh.service new file mode 100644 index 000000000000..9d58362220f0 --- /dev/null +++ b/net-misc/sslh/files/sslh.service @@ -0,0 +1,28 @@ +# /etc/systemd/system/sslh.service +[Unit] +Description=SSL/SSH multiplexer (fork mode) for %I +After=network.target + +[Service] +EnvironmentFile=/etc/conf.d/sslh +ExecStart=/usr/sbin/sslh -f $DAEMON_OPTS +KillMode=process +#Hardening +PrivateTmp=true +CapabilityBoundingSet=CAP_NET_BIND_SERVICE +AmbientCapabilities=CAP_NET_BIND_SERVICE +SecureBits=noroot-locked +ProtectSystem=strict +ProtectHome=true +ProtectKernelModules=true +ProtectKernelTunables=true +ProtectControlGroups=true +MountFlags=private +NoNewPrivileges=true +PrivateDevices=true +RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX +MemoryDenyWriteExecute=true +DynamicUser=true + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/sslh/sslh-2.1.2.ebuild b/net-misc/sslh/sslh-2.1.2.ebuild new file mode 100644 index 000000000000..efb4eb40c48d --- /dev/null +++ b/net-misc/sslh/sslh-2.1.2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic systemd toolchain-funcs + +DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" +HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" + inherit git-r3 +else + KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86" + SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S=${WORKDIR}/${P} +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps libev systemd tcpd" + +RDEPEND="caps? ( sys-libs/libcap ) + dev-libs/libpcre2:= + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) + dev-libs/libconfig:= + libev? ( dev-libs/libev ) + >=dev-libs/libconfig-1.5:=" +DEPEND="${RDEPEND} + dev-lang/perl" + +RESTRICT="test" + +src_prepare() { + sed -i \ + -e '/MAN/s:| gzip -9 - >:>:' \ + -e '/MAN=sslh.8.gz/s:.gz::' \ + Makefile.in || die + default +} + +src_compile() { + append-lfs-flags + + # On older versions of GCC, the default gnu89 variant + # will reject within-for-loop initializers, bug #595426 + # Furthermore, we need to use the gnu variant (gnu99) instead + # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro + # to be defined. + append-cflags -std=gnu99 + + emake \ + CC="$(tc-getCC)" \ + USELIBCAP=$(usev caps) \ + USELIBEV=$(usev libev) \ + USELIBWRAP=$(usev tcpd) \ + USESYSTEMD=$(usev systemd) +} + +src_install() { + dosbin sslh-{fork,select} + if use libev; then + dosbin sslh-ev + dosym sslh-fork /usr/sbin/sslh + else + dosym sslh-fork /usr/sbin/sslh + fi + + doman ${PN}.8 + + dodoc ChangeLog README.md + + newinitd "${FILESDIR}"/sslh.init.d-3 sslh + newconfd "${FILESDIR}"/sslh.conf.d-2 sslh + + if use systemd; then + # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin + systemd_newunit "${FILESDIR}/sslh.service" sslh.service + exeinto /usr/lib/systemd/system-generators/ + doexe systemd-sslh-generator + fi +} diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild index 1a3dc9b9f8e3..efb4eb40c48d 100644 --- a/net-misc/sslh/sslh-9999.ebuild +++ b/net-misc/sslh/sslh-9999.ebuild @@ -76,8 +76,7 @@ src_install() { if use systemd; then # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin - sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die - systemd_newunit scripts/systemd.sslh.service sslh.service + systemd_newunit "${FILESDIR}/sslh.service" sslh.service exeinto /usr/lib/systemd/system-generators/ doexe systemd-sslh-generator fi diff --git a/net-misc/sunshine/Manifest b/net-misc/sunshine/Manifest index 5d324a14d8a1..32f2c1cc4630 100644 --- a/net-misc/sunshine/Manifest +++ b/net-misc/sunshine/Manifest @@ -1,6 +1,7 @@ AUX sunshine-0.22.0-nvcodec.patch 1009 BLAKE2B 4a2fd3dbd98b64fd6e259c94d218f9853404a4096448ace8153c86717524b7cde5295a00aed972eca73c4a4c3bf6101349e8e61ebcb5e657d59426f903fc8efd SHA512 77ba0e67da4a3c252c5a19041bf0822651de9670ffe7e5732298cc00c6ac8cced97d2a0e0487af0ddc035fdb74fee2593ef91c446bb1125525ba4103b7b95fa2 AUX sunshine-cross-cbs.patch 2020 BLAKE2B b57c6fe66707a86b35a70945ca9b9da9c4e8bb0bba8bd0d66e9ec9e3d15121cc4a193b56ea376ff3e244d652c18ac7504d687cefd54876afcf3cb54d8024c71b SHA512 95710af147509f8c93c875513c01a596fd62fe421495395dfeef41a6230d031e779277a9a2604c4d5dce788d6ecf77e667942d3ae2d6e675ef29db86e6519734 AUX sunshine-custom-ffmpeg.patch 7668 BLAKE2B 2fa8adf912791e8abf73f0ea173228318edb804584c1efbe15077d6b6e08f7e6cfaa4dacf5e02115325ebe9a0ef09b9e49d3e021d6220dff0b364c1bbcd0b7e4 SHA512 ace6b855edf21a91958d843bff730634c585a96c1f728c304e7b79ddacc96fdb767936fd5d8dd8f2df3347d12a25519e9d1511ada3828404b9440d8333bfc013 +AUX sunshine-find-npm.patch 3778 BLAKE2B 9862cb4f8926438a588275446d02a84e0341dcafacf7037338151eb0e3020a89aa8f583d52efcebca032fd8f87b12ff6f6545f288ae1431f84efd9bc6b381d18 SHA512 4ed7da0be9d8608e71fd17b8af7ef159920d9313278c0f7f21390144b510dbfa0b2a4433bca5664e507c6210e1f032c5c014448e85a44eba891df71fc316c2b9 DIST LizardByte-build-deps-2aafe061cd52a944cb3b5f86d1f25e9ad2a19bec.tar.gz 24171 BLAKE2B bcc8f1829eae4ba85a9cbdaca7876a4a52c979f3b8ef0f0a56876fcb171025544bd1997455c2b8fff59564deca433366ae03f14cbb0929f78c87f991b269156f SHA512 892184ec0ff321b2b7e2000dc605d1162955cb04ff259f6032f124f1ff50a1fe485e2cf2c0b735788f8615c9aba87ca040205599cb4b91881daa462a53340bd7 DIST LizardByte-tray-4d8b798cafdd11285af9409c16b5f792968e0045.tar.gz 1068346 BLAKE2B 6da778c6dc1efb1147363de239a4170dad23288322285b847ed86837b316162bce861b848b8371ea8562efbfa0d36dc6921e8a36da0a05740e3f6aa1da29fae1 SHA512 9c6535a6a3ba4489b5af0821a8c42bbb706259c10d70237bd3d3b31283a7e8ad0e3c2326a34c229d899389156909c36252a931ea47eef8daeb8b7c54b26e92cb DIST Simple-Web-Server-27b41f5ee154cca0fce4fe2955dd886d04e3a4ed.tar.bz2 63258 BLAKE2B e80a6cd92825038ca75b973281b676584f9e488b45b1f9c6ed526236c0a7188b97ae2bba9d7b5557893452dd1ba8778faff2ade840cc169d20b4cf0e51fc8394 SHA512 2eba1d8bd53bb3e29e51a72000918b44730f73b4df26824f25cb6a4860dd21f8aaa7f77124fb500ffe9601ebeca66d1c21a06cad239ed27481e9cae088afbd44 @@ -9,8 +10,8 @@ DIST moonlight-common-c-cbd0ec1b25edfb8ee8645fffa49ff95b6e04c70e.tar.gz 148691 B DIST moonlight-enet-04e27590670a87a7cd40f5a05cda97467e4e25a3.tar.gz 86434 BLAKE2B 8a5535843e4c650b945882abac1542bf8c79dc420607b88433d239aa5a17380f02e77bb8f1fcbe45dcb8ef894e6c9b4d940f4d3b34b956ce42d86f6a8ca5227a SHA512 6d2e9447e546489365b1fb563ed52664a91981717a3a3a9faa9600ab62be5ac09bd24ee9dd505833d31981ce6222f5ef430268a9f92aa83fa288b5b8d681e2aa DIST nanors-e9e242e98e27037830490b2a752895ca68f75f8b.tar.gz 194694 BLAKE2B 1effd7c0884ffd38b63d61a7872337797529ef2012f9de0950088a5004cb32a2fb2c14bcab2ec6719968864e5e6b9a67e96afa39466e2071bf4a0cd752ae4b29 SHA512 548be25650619a6c31944cd7a745fd40d5bc5008f2d7f91e0207a10b923764cb88fd2ddcb71eaed7c4863ec89b34d61011b666e292da071ac3b4429e4d7dd027 DIST sunshine-0.23.1.tar.gz 24503568 BLAKE2B 0c589f38a7d638c49af6385def2676de04af422f85d37228988bd7c822ffc006dbac0a1695e01527ac7a1d5ee28103cff00d78a97d57f61247772a6e6cc1fe18 SHA512 7a9150baf4ecdad1035666993c60744390e227ebeaf467447c53675dc0aecc7031cd9c9b253fbbbbac072f5592c3690c6acfde41f38d441497a17157417f1e16 -DIST sunshine-npm-cache-0.23.1.tar.xz 23477572 BLAKE2B 24674a6c6ebed1cc31e3fbee2ededef27c1c24cc7f1be63fba19023b1a6171b9e1a0e83363f7eabad1957a96eede471ae3df4df5e5ba66f5c80f57b56781bf52 SHA512 84ec1d393b1c2f333954bf0f5a42e491bf4d7ff2031c8065c56e06eb0eb7f7b750e2d2f6a1da321067212fdf55aa4c917b2ce0db7c957231821282a33966cd93 +DIST sunshine-assets-0.23.1.tar.xz 1269348 BLAKE2B 36dd00fbf4bb1bfa213d53fd9dc78ed1fee9e12efcfb138dbd54932c3f19447d832da506175a982be7564408e06b0699b0b7cb4b9811ab81b47e30681c915bab SHA512 9fe9e0ee29864faa0f67dd4d501d116be1476f2c7ec688646b91eb87cb38e9e9d2baecb8335df29075fd3f60bf05b900c20dcb8406306d68a62c30ff55d1b7aa DIST wlr-protocols-2b8d43325b7012cc3f9b55c08d26e50e42beac7d.tar.bz2 19708 BLAKE2B fe20f21ee8282d7afcdbb8f3863e50b217fb71e7814f404f288b0d09d30c9e30135769b12342d9e9126a8cb2ab35d6ced0c5562807d274b1d97224f5f3d02511 SHA512 7935b5089820304aa8cb0e1a8f4e0db6ccd5285973a3f3554ccc935dd88e379eb03c3b2dd199da97b6ff8dfbbbf124ca65fb1c12821a168d34bd7e26d8514edb -EBUILD sunshine-0.23.1.ebuild 11922 BLAKE2B 242515aeec5b2f71bf7a724737d683f5dc10300ec6b729926ccbf5ecb273bffd048f1f7ea4d1b3d708711355b9588aef2187112758c2ee6083fb593a91bcf2f3 SHA512 c4a9fc43fdd23c000c2fd07a2ecec60e62f013192c8e26d79af0f1c5620b43f1ee56c6967f21db5ee9781917af11895c02aef448f892b6332e7e3d21302aacc4 -EBUILD sunshine-9999.ebuild 11922 BLAKE2B 242515aeec5b2f71bf7a724737d683f5dc10300ec6b729926ccbf5ecb273bffd048f1f7ea4d1b3d708711355b9588aef2187112758c2ee6083fb593a91bcf2f3 SHA512 c4a9fc43fdd23c000c2fd07a2ecec60e62f013192c8e26d79af0f1c5620b43f1ee56c6967f21db5ee9781917af11895c02aef448f892b6332e7e3d21302aacc4 +EBUILD sunshine-0.23.1.ebuild 11943 BLAKE2B 4c9dfbf39d87da8cec615660c9d4c315a28692faed80bd67da952d3d6beeb2dc5a82f41277e37d712d9069384300a20ba5a7c3ecc3b74ab7b64ad1a87178d774 SHA512 bc5a654cec73c65b89b3c76eef78751de45711c91c47d0e1d4ede52ba31eb59fb91ce12778781ebd9de58bf29ab12194cd0d61d06a9922f2d7b7988899da4a4a +EBUILD sunshine-9999.ebuild 11866 BLAKE2B e263814754a6c873c8a3d5f72776518ce4637c0db84368c0ab050a969cce1c2325a574b41f1c9ebc4aebaedc81cde5b612626695a79e91fe6e6802d44d40ca01 SHA512 493d72e6bfe1e9fc394921ffd702239385f2595e35387a5a92bc4d7debb84dba13791c81149b1493debf9c115d401f2e4ed74aecc0131ab58b283037ba7502d3 MISC metadata.xml 880 BLAKE2B 656a3a283ae7504498d1a67cc343cfa614e21e0422c1076781164822809079eafe8e514d01182e977f7add5a28c4e7e09db985c8e4ea551eef1a1f92609488d9 SHA512 679f3c676ce568e8c0a8b816463c66d69055d0dba740c9065ce8feb36335981df65fff9d47f35e93f6b60337cc59f3da6ec3b83f9bb01905c73f912b50a0366d diff --git a/net-misc/sunshine/files/sunshine-find-npm.patch b/net-misc/sunshine/files/sunshine-find-npm.patch new file mode 100644 index 000000000000..ab25b4527b78 --- /dev/null +++ b/net-misc/sunshine/files/sunshine-find-npm.patch @@ -0,0 +1,92 @@ +From 66740900522f42564a2b0bd4e8a435ed24a61725 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 12 May 2024 17:26:14 +0100 +Subject: [PATCH] Unify asset building and use find_program to find NPM (#2522) + +--- + cmake/targets/common.cmake | 33 +++++++++++++++++++++------------ + cmake/targets/unix.cmake | 6 ------ + cmake/targets/windows.cmake | 6 ------ + 3 files changed, 21 insertions(+), 24 deletions(-) + +diff --git a/cmake/targets/common.cmake b/cmake/targets/common.cmake +index ee79528c..941ef0b7 100644 +--- a/cmake/targets/common.cmake ++++ b/cmake/targets/common.cmake +@@ -3,18 +3,6 @@ + + add_executable(sunshine ${SUNSHINE_TARGET_FILES}) + +-# Homebrew build fails the vite build if we set these environment variables +-# this block must be before the platform specific code +-if(${SUNSHINE_BUILD_HOMEBREW}) +- set(NPM_SOURCE_ASSETS_DIR "") +- set(NPM_ASSETS_DIR "") +- set(NPM_BUILD_HOMEBREW "true") +-else() +- set(NPM_SOURCE_ASSETS_DIR ${SUNSHINE_SOURCE_ASSETS_DIR}) +- set(NPM_ASSETS_DIR ${CMAKE_BINARY_DIR}) +- set(NPM_BUILD_HOMEBREW "") +-endif() +- + # platform specific target definitions + if(WIN32) + include(${CMAKE_MODULE_PATH}/targets/windows.cmake) +@@ -49,6 +37,27 @@ endif() + + target_compile_options(sunshine PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${SUNSHINE_COMPILE_OPTIONS}>;$<$<COMPILE_LANGUAGE:CUDA>:${SUNSHINE_COMPILE_OPTIONS_CUDA};-std=c++17>) # cmake-lint: disable=C0301 + ++# Homebrew build fails the vite build if we set these environment variables ++if(${SUNSHINE_BUILD_HOMEBREW}) ++ set(NPM_SOURCE_ASSETS_DIR "") ++ set(NPM_ASSETS_DIR "") ++ set(NPM_BUILD_HOMEBREW "true") ++else() ++ set(NPM_SOURCE_ASSETS_DIR ${SUNSHINE_SOURCE_ASSETS_DIR}) ++ set(NPM_ASSETS_DIR ${CMAKE_BINARY_DIR}) ++ set(NPM_BUILD_HOMEBREW "") ++endif() ++ ++#WebUI build ++find_program(NPM npm REQUIRED) ++add_custom_target(web-ui ALL ++ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" ++ COMMENT "Installing NPM Dependencies and Building the Web UI" ++ COMMAND "$<$<BOOL:${WIN32}>:cmd;/C>" "${NPM}" install ++ COMMAND "${CMAKE_COMMAND}" -E env "SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW}" "SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR}" "SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR}" "$<$<BOOL:${WIN32}>:cmd;/C>" "${NPM}" run build # cmake-lint: disable=C0301 ++ COMMAND_EXPAND_LISTS ++ VERBATIM) ++ + # tests + if(BUILD_TESTS) + add_subdirectory(tests) +diff --git a/cmake/targets/unix.cmake b/cmake/targets/unix.cmake +index 5527a987..047a0b3d 100644 +--- a/cmake/targets/unix.cmake ++++ b/cmake/targets/unix.cmake +@@ -1,8 +1,2 @@ + # unix specific target definitions + # put anything here that applies to both linux and macos +- +-#WebUI build +-add_custom_target(web-ui ALL +- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" +- COMMENT "Installing NPM Dependencies and Building the Web UI" +- COMMAND sh -c \"npm install && SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW} SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR} SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR} npm run build\") # cmake-lint: disable=C0301 +diff --git a/cmake/targets/windows.cmake b/cmake/targets/windows.cmake +index e429feaa..341d7c2e 100644 +--- a/cmake/targets/windows.cmake ++++ b/cmake/targets/windows.cmake +@@ -4,9 +4,3 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll") + find_library(ZLIB ZLIB1) + list(APPEND SUNSHINE_EXTERNAL_LIBRARIES + Wtsapi32.lib) +- +-#WebUI build +-add_custom_target(web-ui ALL +- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" +- COMMENT "Installing NPM Dependencies and Building the Web UI" +- COMMAND cmd /C "npm install && set \"SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR}\" && set \"SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR}\" && npm run build") # cmake-lint: disable=C0301 +-- +2.44.0 + diff --git a/net-misc/sunshine/sunshine-0.23.1.ebuild b/net-misc/sunshine/sunshine-0.23.1.ebuild index 7b106a011c0a..f700216a63b6 100644 --- a/net-misc/sunshine/sunshine-0.23.1.ebuild +++ b/net-misc/sunshine/sunshine-0.23.1.ebuild @@ -13,13 +13,10 @@ SWS_COMMIT="27b41f5ee154cca0fce4fe2955dd886d04e3a4ed" WLRP_COMMIT="2b8d43325b7012cc3f9b55c08d26e50e42beac7d" FFMPEG_VERSION="6.1.1" -# To make the node-modules tarball: +# To make the assets tarball: # PV= -# git fetch -# git checkout v$PV -# rm -rf node_modules npm_cache package-lock.json -# npm_config_cache="${PWD}"/npm_cache npm install --logs-max=0 --omit=optional -# XZ_OPT=-9 tar --xform="s:^:Sunshine-$PV/:" -Jcf /var/cache/distfiles/sunshine-npm-cache-$PV.tar.xz npm_cache package-lock.json +# EGIT_OVERRIDE_COMMIT_LIZARDBYTE_SUNSHINE=v$PV ebuild sunshine-9999.ebuild clean compile +# XZ_OPT=-9 tar --xform="s:^:Sunshine-$PV/:" -Jcf /var/cache/distfiles/sunshine-assets-$PV.tar.xz -C /var/tmp/portage/net-misc/sunshine-9999/work/sunshine-9999 assets/ if [[ ${PV} = 9999* ]]; then inherit git-r3 @@ -40,7 +37,7 @@ else https://gitlab.com/eidheim/Simple-Web-Server/-/archive/${SWS_COMMIT}/Simple-Web-Server-${SWS_COMMIT}.tar.bz2 https://gitlab.freedesktop.org/wlroots/wlr-protocols/-/archive/${WLRP_COMMIT}/wlr-protocols-${WLRP_COMMIT}.tar.bz2 https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.xz - https://dev.gentoo.org/~chewi/distfiles/${PN}-npm-cache-${PV}.tar.xz + https://dev.gentoo.org/~chewi/distfiles/${PN}-assets-${PV}.tar.xz " KEYWORDS="~amd64 ~arm64" S="${WORKDIR}/Sunshine-${PV}" @@ -181,6 +178,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-custom-ffmpeg.patch "${FILESDIR}"/${PN}-0.22.0-nvcodec.patch + "${FILESDIR}"/${PN}-find-npm.patch ) # Make this mess a bit simpler. @@ -188,7 +186,6 @@ CMAKE_IN_SOURCE_BUILD=1 # Make npm behave. export npm_config_audit=false -export npm_config_cache="${S}"/npm_cache export npm_config_color=false export npm_config_foreground_scripts=true export npm_config_loglevel=verbose @@ -353,6 +350,7 @@ src_configure() { -DSYSTEMD_USER_UNIT_INSTALL_DIR=$(systemd_get_userunitdir) -DUDEV_RULES_INSTALL_DIR=$(get_udevdir)/rules.d ) + [[ ${PV} = 9999* ]] || mycmakeargs+=( -DNPM="${BROOT}"/bin/true ) CMAKE_USE_DIR="${S}" cmake_src_configure } diff --git a/net-misc/sunshine/sunshine-9999.ebuild b/net-misc/sunshine/sunshine-9999.ebuild index 7b106a011c0a..daa9608b1d60 100644 --- a/net-misc/sunshine/sunshine-9999.ebuild +++ b/net-misc/sunshine/sunshine-9999.ebuild @@ -13,13 +13,10 @@ SWS_COMMIT="27b41f5ee154cca0fce4fe2955dd886d04e3a4ed" WLRP_COMMIT="2b8d43325b7012cc3f9b55c08d26e50e42beac7d" FFMPEG_VERSION="6.1.1" -# To make the node-modules tarball: +# To make the assets tarball: # PV= -# git fetch -# git checkout v$PV -# rm -rf node_modules npm_cache package-lock.json -# npm_config_cache="${PWD}"/npm_cache npm install --logs-max=0 --omit=optional -# XZ_OPT=-9 tar --xform="s:^:Sunshine-$PV/:" -Jcf /var/cache/distfiles/sunshine-npm-cache-$PV.tar.xz npm_cache package-lock.json +# EGIT_OVERRIDE_COMMIT_LIZARDBYTE_SUNSHINE=v$PV ebuild sunshine-9999.ebuild clean compile +# XZ_OPT=-9 tar --xform="s:^:Sunshine-$PV/:" -Jcf /var/cache/distfiles/sunshine-assets-$PV.tar.xz -C /var/tmp/portage/net-misc/sunshine-9999/work/sunshine-9999 assets/ if [[ ${PV} = 9999* ]]; then inherit git-r3 @@ -40,7 +37,7 @@ else https://gitlab.com/eidheim/Simple-Web-Server/-/archive/${SWS_COMMIT}/Simple-Web-Server-${SWS_COMMIT}.tar.bz2 https://gitlab.freedesktop.org/wlroots/wlr-protocols/-/archive/${WLRP_COMMIT}/wlr-protocols-${WLRP_COMMIT}.tar.bz2 https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.xz - https://dev.gentoo.org/~chewi/distfiles/${PN}-npm-cache-${PV}.tar.xz + https://dev.gentoo.org/~chewi/distfiles/${PN}-assets-${PV}.tar.xz " KEYWORDS="~amd64 ~arm64" S="${WORKDIR}/Sunshine-${PV}" @@ -179,7 +176,6 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-custom-ffmpeg.patch "${FILESDIR}"/${PN}-0.22.0-nvcodec.patch ) @@ -188,7 +184,6 @@ CMAKE_IN_SOURCE_BUILD=1 # Make npm behave. export npm_config_audit=false -export npm_config_cache="${S}"/npm_cache export npm_config_color=false export npm_config_foreground_scripts=true export npm_config_loglevel=verbose @@ -353,6 +348,7 @@ src_configure() { -DSYSTEMD_USER_UNIT_INSTALL_DIR=$(systemd_get_userunitdir) -DUDEV_RULES_INSTALL_DIR=$(get_udevdir)/rules.d ) + [[ ${PV} = 9999* ]] || mycmakeargs+=( -DNPM="${BROOT}"/bin/true ) CMAKE_USE_DIR="${S}" cmake_src_configure } diff --git a/net-misc/vmnet/Manifest b/net-misc/vmnet/Manifest index a09261fe886e..5a502b56413e 100644 --- a/net-misc/vmnet/Manifest +++ b/net-misc/vmnet/Manifest @@ -1,5 +1,6 @@ AUX vmnet-0.4-Fix-build-with-Clang-16.patch 745 BLAKE2B 65c71509f65c583d0b816b97599f1c0a913b7d97df6fc2ea9a8b31db588e281590493c0ea3e819af721549346b1cb9dbf0b632f2b8db84e894a71a3eb2e3e411 SHA512 e7966fb5d2650884606f156be84c77df08dc732fefde99567ba5c4cdb5f30311b5e6e6b8089abe9d3a6d8c3a022dd843a9d8b600dd848fb7d45a7371d358424d +AUX vmnet-0.4-replace-missing-musl-function.patch 454 BLAKE2B 934c9b35feb6231fb040944fb7c53be9688597e66c88adacc276e5235b269f731ad115abdbeb12c779e8a99a7a2a25120c573ac016b33d6bab359580c9ba0ca0 SHA512 e51f35d8596659d7250573506e0aea664255ef9bdf7dc8f918ef6ba6a7ca433d58e7ef50bff8a3fed68a29f244fef176c668551202ef6f52fc2836be63a0988c DIST vmnet-0.4.tar.gz 11362 BLAKE2B 5fdf7e44719752cf47d45d254f25b70343d479a1da0b28cd7fd56735aa67830335599d29664d785b4b21a219a58c48cf2c07f1eb635b126142dda226b6c21ce2 SHA512 b5872caf2d0eadd24323901aff527deb6c57b9286d03362c252b87cd84b7dd8db149b86636fbd4b499810caff41aa948fa7b1f2163159d4b665c2feae279375d DIST vmnet_0.4-1.diff.gz 5084 BLAKE2B 1388b8b8334b8d8d16ba920f201f7d7f59bf7202418817cd251689370cc97ce6c2c089a397dabcd96f65193358a4ec606fbfdc9061e876f7232303d0601be070 SHA512 d9518917d0c9ebb75ffe82f002c0c5375b3a932fdd31d2cb4818a9956d586fb0e1bfedc166cdad3ab7a5ead8109afdee2893c68fe69b426c57965648188de4af -EBUILD vmnet-0.4-r1.ebuild 1061 BLAKE2B 460911986f7729956e2b9417015f416166c2b62b399deb8c7061801083d5be687bbcf3495114da06ca6d95075113628f3427b0d61380509c6b6f0285b04c3e9d SHA512 e3da273a5f179dda9985e82f14268d3194b89057a06d42f37529bededf0131f4e4e064e1bd7136f1526bd14400ef84cabd307900227f4c90b6f07fa7912d190d +EBUILD vmnet-0.4-r2.ebuild 1150 BLAKE2B 0ed6f11fc0f9915ceddf0dd948e825239652becb3b27a95775d533469ec71c22e7af14ec879da7f95bcf18e5f810286381d8dedf189d8f5d0a95d1552ffbd474 SHA512 c15750ce4f599867b095ed0c017740b745a20d447f34ef77c9669444bb0342a0e09087bc9181d5ac9403cc55de5ca5a0d8cc7e131a18202cb0fa9442aa7efb4f MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2 diff --git a/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch b/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch new file mode 100644 index 000000000000..5c4fbb152e9e --- /dev/null +++ b/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch @@ -0,0 +1,20 @@ +diff -ru vmnet-0.4.orig/vmnet.c vmnet-0.4/vmnet.c +--- vmnet-0.4.orig/vmnet.c 2024-04-02 08:35:41.521216356 +0000 ++++ vmnet-0.4/vmnet.c 2024-04-02 08:37:34.760604906 +0000 +@@ -50,6 +50,7 @@ + */ + + #define _GNU_SOURCE ++#define _XOPEN_SOURCE 700 + #include <errno.h> + #include <fcntl.h> + #include <pwd.h> +@@ -197,7 +198,7 @@ + int master, slave; + char name[1024]; + +- master = getpt(); ++ master = posix_openpt(O_RDWR); + if (master < 0) { + return 0; + } diff --git a/net-misc/vmnet/vmnet-0.4-r1.ebuild b/net-misc/vmnet/vmnet-0.4-r2.ebuild index 1fadcfdf151c..573adbc16276 100644 --- a/net-misc/vmnet/vmnet-0.4-r1.ebuild +++ b/net-misc/vmnet/vmnet-0.4-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic +inherit flag-o-matic toolchain-funcs DESCRIPTION="A simple virtual networking program - SLIP over stdin/out" HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/" @@ -11,13 +11,14 @@ HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/" # So this might be better but it's a different filename # http://ftp.debian.org/debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz # We use the debian patch anyway -SRC_URI="ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz" +SRC_URI=" + ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz +" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc x86" -IUSE="" RDEPEND="sys-apps/net-tools" DEPEND="${RDEPEND}" @@ -25,11 +26,12 @@ DEPEND="${RDEPEND}" PATCHES=( "${WORKDIR}"/${P/-/_}-1.diff "${FILESDIR}"/${PN}-0.4-Fix-build-with-Clang-16.patch + "${FILESDIR}"/${PN}-0.4-replace-missing-musl-function.patch ) src_compile() { append-ldflags -Wl,-z,now - emake + emake CC="$(tc-getCC)" } src_install() { diff --git a/net-misc/vrrpd/Manifest b/net-misc/vrrpd/Manifest index c21ca6423c4d..dbcdeea6c227 100644 --- a/net-misc/vrrpd/Manifest +++ b/net-misc/vrrpd/Manifest @@ -1,4 +1,6 @@ AUX vrrpd-1.9-rollup.patch 820 BLAKE2B 4862766d23aa2811023c5f7a37fd3ed08f74701a6b434ae1d6ae84dd1aa72f31d599db6779edd6216fa0e1b499c701f0f442dce7ae150173b74b370e8a03a880 SHA512 20dd64876125707cb0cca6c45363a4db05a9472a0bec7bded2665229ee9db44a8429703294cf39b53a703fa9c66b6644e89edf98d1e87c090d763da2a3b07b7a +DIST vrrpd-1.15.tar.bz2 148430 BLAKE2B 787fa185ce64a0711403718b2627d9d2d8867ef3956090b93196f62d92428e0e02ee4440bc23fda46cdca70ca6693b76ed28a5e469a31e86fa4e36dc25c6a82a SHA512 4e7fa17e01d9b667f538204fbe84decea47ac7d84da8adf2e8e3bcf042d233a704a99347d3d97531993f2693c145ff54fb3ac346ade33f5d99cfbbac405ed784 DIST vrrpd-1.9.tar.gz 542249 BLAKE2B a412559be70791515c6b82639a8e1d5fc33954963fbf00aa3c549434ac0748b9d0ea657b2d02b1a3537a30742c18fe6d6db832a11c23b6989151c5f04c771d05 SHA512 8c719cabbd6a799e4e439dbb698af9d6e24cf2635cfbd71a204b46bd2b65c1384e53f130b663d0fcfc903d89080ff25d9c97ae4cd9f6b2434d5462cf678a306b +EBUILD vrrpd-1.15.ebuild 794 BLAKE2B 2addd7db108ed1f385813c2095019736a85396029eb21691f5a49df0c40bb44caa2cb32fdfb78ecbb548f4e038ba1bf6bacc68a6ca477adcf4057d7ac38ac65d SHA512 f58c6a9e8ec092fcac64c9c160fb856e7380804d0e81336a38f25e5ecae29a8055a3be125b113d9de97aa0b4b78a1e04db71e98b9a3f5416a844201e429c1f34 EBUILD vrrpd-1.9-r1.ebuild 904 BLAKE2B 55adba87adc1cc1204ca327847e2b492f35e03b10b1c5f56dcf740c78684788ec7dcfb335fde70510d2c17230c231d3d1185b4df831d4b9aef1c0705b21195d0 SHA512 f466c4a4318771247bbada8a8f70563f6c45af1c4b62602ea9757b959c1aa5c563fcc057a335ef83830b9ac93323b8398afa5848a208a0e78d7a9227367d98e5 -MISC metadata.xml 393 BLAKE2B 6d57b9c90d6314c40313182e349c083f87e1683bd00c0ad4002aac743c3a4dcb5f44f4f7dff6d62e280bc79ad70f20119beabde7670c2a1befdf5f7d0e2a6ee4 SHA512 67adeb2323ac9b77e43abcf795734e05be16089f77c978ad3e45ab9991d64f035dd43bf2e1417825af6931f446a0a2ba8e72a7bac4ebde7f52caf6215cd89853 +MISC metadata.xml 393 BLAKE2B 3032bbaddc57b00b15bd0e900f070ff650fdd5abc1993d9e73a3fecc0a9614f85889e55bf9a169c8972f2d14ebd8934610accab4562d6cf88ed4b3d20f3b1c43 SHA512 d05a4a62c6726e67ae195ae7536d261e4df770eb4325c8c9dbd217c84b5f545455a1b2d6e53aab2c2216f09d4468d029233ebf09961c112ff672df955a093f3f diff --git a/net-misc/vrrpd/metadata.xml b/net-misc/vrrpd/metadata.xml index f1c67d2187e4..ee849f0e1dd3 100644 --- a/net-misc/vrrpd/metadata.xml +++ b/net-misc/vrrpd/metadata.xml @@ -6,7 +6,7 @@ <name>Robin H. Johnson</name> </maintainer> <upstream> - <remote-id type="github">fredbcode/Vrrpd</remote-id> + <remote-id type="gitlab">fredbcode/Vrrpd</remote-id> <remote-id type="sourceforge">vrrpd</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/vrrpd/vrrpd-1.15.ebuild b/net-misc/vrrpd/vrrpd-1.15.ebuild new file mode 100644 index 000000000000..89e3f7fe5ba8 --- /dev/null +++ b/net-misc/vrrpd/vrrpd-1.15.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Virtual Router Redundancy Protocol Daemon" +HOMEPAGE="https://gitlab.com/fredbcode/Vrrpd/" +GITLAB_SHA1="a318281271973c7430cfa520b540585153454c4b" +SRC_URI="https://gitlab.com/fredbcode/Vrrpd/-/archive/v${PV}/${P}.tar.bz2" + +S="${WORKDIR}/Vrrpd-v${PV}-${GITLAB_SHA1}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_prepare() { + default + + # Don't hardcore GCC + sed -e '/CC=/d' -i Makefile || die + + emake mrproper +} + +src_compile() { + local myemakeargs=( + DBG_OPT="" + MACHINEOPT="${CFLAGS}" + PROF_OPT="${LDFLAGS}" + ) + + emake "${myemakeargs[@]}" +} + +src_install() { + dosbin vrrpd atropos + doman vrrpd.8 + dodoc FAQ Changes TODO scott_example README.md + dodoc doc/* +} diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest index 9cd1f32face2..a4ff9d15f8d5 100644 --- a/net-misc/xmrig/Manifest +++ b/net-misc/xmrig/Manifest @@ -1,9 +1,8 @@ AUX xmrig-6.12.2-nonotls.patch 578 BLAKE2B 4d71c8d35be47fd12a019d7b8cb6e1b8787e153ab543b9b1e4079c911671ff886042d90cd439552bf364208d9a4afcc7fe088b50598bbc20e347b532dfc92a2d SHA512 fea6041879c414a4fc6006a413b217801d674f7b5d849d95c119d07e191c5d7a5e99fb959d89974b68be9df132ff480f8492645ba6821b369444b102596b06f3 -AUX xmrig-6.18.1-gcc-13.patch 1910 BLAKE2B e3a097ef3d4999a84a9aa4edad1fd14dc7c62253b907d9642337859b08e41523783a642650b86fa48bd78939fff6b248aa2bffefbc07c3b8e842627a1f285531 SHA512 4182acc2fdc3949ae02319af7408ef6059a1803213a3cf0f5c1cd4df33b71a30aa6b871990ed767cb7e0ce061ee03e34bd1878ffcc1a301ebb7cbb36ebd41e3f AUX xmrig.service 946 BLAKE2B 1f3b28f8229183da528ac2b4279dd64b5c6f752720c6bdfe90fa9e127108623e4a577a274527249ee7a13969be97e9b1a4348f7c3e0798839d0ed3ee67b16188 SHA512 77da620627272113e7c77a090536b04cb5a89f4010060ffb21ea1c9edc50e0743f913a70e4fb612c23aeea2b8f1a3f9ce024a434076cf9498cce0b5f801faafa DIST xmrig-6.21.1.tar.gz 2416545 BLAKE2B 72ecdfc8c999aee91aef4f540211c5d5a6f1992c76211162a623e89391cedfcc2d5540f291d9915ee4180b83f58ef7f2eb1e3aff8dee49c72f41f90878d7ef62 SHA512 a9267708e61084db7116381adb2256a04c30eba0c84b571764cc73ccafc9276f55b6665529eb7b9c1785d582d0d280ced6ee7ca88a5e98f9bbdef2a9176a9794 DIST xmrig-6.21.3.tar.gz 2426720 BLAKE2B 11563169e51402313399109860e04dd13dfc9911504db571968d6a97112990ebb68a3019da836a4ac19a589c94ab4b5f2ebcbadce59452c278ea923e8abf475a SHA512 91e92f61e385b75715b0b00fcb772bf997f3db19ef47f43c4bda3662aec6276273551ac915a7a6eeef253deb8da5b0ec0b45e02f0b84211ab8f0f5a37f34c87e EBUILD xmrig-6.21.1.ebuild 1551 BLAKE2B e590f209544572f41c8ef3f9984791cedcf33d73626d47411eecaff54d3320111140de17da4790ab9a6a506ef7e58eb317d917840f6967b0b332870f5e4f37f8 SHA512 1046e575d34e47489533335121be7780f85a3fbd36669fb4d93e8344f24ae62f6fc82656c4927a537744942c384d2047cb28b134b925d735221845f151e0794c EBUILD xmrig-6.21.3.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81 EBUILD xmrig-9999.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81 -MISC metadata.xml 833 BLAKE2B ac0e7279af43dc7d8cefaf41d3cb02cc426080936eae5084b23011ef57be7162844d9d78edded1e2b18edd1cc90a03b0cb9fd52e834e79f195799b48fd2c20d6 SHA512 ce9293b9c560b227bf44f149010b259a86175a178a22b72187efa128dde1aa138928033e7cd7d9cee41313c083bb972248460f7a73d970e7fd1f74463e515c38 +MISC metadata.xml 719 BLAKE2B c8e2f6946503bafb5899f2b2ff022fb5e123cacd82ebd6ba2d983b5e8c94cc0ad35bc057a1b0147e0ce85701223abbe22464f8087c27453607cff278bc4fa860 SHA512 1611d29f42483a1aa4f1a3c438fd51a53473fdb0611bd428f068a9ae38e8a93c7cb278ecb834e4ae17957fdb2873461e7364267050ef1b776d534779166c824a diff --git a/net-misc/xmrig/files/xmrig-6.18.1-gcc-13.patch b/net-misc/xmrig/files/xmrig-6.18.1-gcc-13.patch deleted file mode 100644 index 1726c3b01523..000000000000 --- a/net-misc/xmrig/files/xmrig-6.18.1-gcc-13.patch +++ /dev/null @@ -1,70 +0,0 @@ -From bd14e6034ba2de0056278c3ad9923199b7f4d20f Mon Sep 17 00:00:00 2001 -From: Matthew Smith <matthew@gentoo.org> -Date: Mon, 20 Feb 2023 16:09:19 +0000 -Subject: [PATCH] Fix build with gcc 13 - -Now some header files are not included transistively with new -libstdc++. - -Bug: https://bugs.gentoo.org/895226 ---- a/src/backend/opencl/runners/OclBaseRunner.cpp -+++ b/src/backend/opencl/runners/OclBaseRunner.cpp -@@ -23,6 +23,9 @@ - */ - - -+#include <stdexcept> -+ -+ - #include "backend/opencl/runners/OclBaseRunner.h" - #include "backend/opencl/cl/OclSource.h" - #include "backend/opencl/OclCache.h" ---- a/src/backend/opencl/runners/OclCnRunner.cpp -+++ b/src/backend/opencl/runners/OclCnRunner.cpp -@@ -16,6 +16,9 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include <stdexcept> -+ -+ - #include "backend/opencl/runners/OclCnRunner.h" - #include "backend/opencl/kernels/Cn0Kernel.h" - #include "backend/opencl/kernels/Cn1Kernel.h" ---- a/src/backend/opencl/runners/OclKawPowRunner.cpp -+++ b/src/backend/opencl/runners/OclKawPowRunner.cpp -@@ -16,6 +16,9 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include <stdexcept> -+ -+ - #include "backend/opencl/runners/OclKawPowRunner.h" - #include "backend/common/Tags.h" - #include "3rdparty/libethash/ethash_internal.h" ---- a/src/backend/opencl/runners/OclRxJitRunner.cpp -+++ b/src/backend/opencl/runners/OclRxJitRunner.cpp -@@ -16,6 +16,9 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -+#include <stdexcept> -+ -+ - #include "backend/opencl/runners/OclRxJitRunner.h" - #include "backend/opencl/cl/rx/randomx_run_gfx803.h" - #include "backend/opencl/cl/rx/randomx_run_gfx900.h" ---- a/src/base/net/http/HttpResponse.h -+++ b/src/base/net/http/HttpResponse.h -@@ -21,6 +21,7 @@ - #define XMRIG_HTTPRESPONSE_H - - -+#include <cstdint> - #include <map> - #include <string> - --- -2.39.2 - diff --git a/net-misc/xmrig/metadata.xml b/net-misc/xmrig/metadata.xml index e7d991de9b98..daf9832980db 100644 --- a/net-misc/xmrig/metadata.xml +++ b/net-misc/xmrig/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>matthew@gentoo.org</email> - <name>Matthew Smith</name> - </maintainer> - <maintainer type="person"> <email>candrews@gentoo.org</email> <name>Craig Andrews</name> </maintainer> diff --git a/net-misc/ytmdl/Manifest b/net-misc/ytmdl/Manifest index 539e66e14c66..3b011de16d9f 100644 --- a/net-misc/ytmdl/Manifest +++ b/net-misc/ytmdl/Manifest @@ -2,5 +2,5 @@ AUX ytmdl-2023.11.26-data_files.patch 208 BLAKE2B 51cb77162812f798ce73d3d71d7a1a DIST ytmdl-2023.11.26.gh.tar.gz 1120208 BLAKE2B 145f8e24305f4978f1ed0655e5511c6b17b94ea23301309c31bbafaec60b2184216ef0866aed478eda95763ab4ec0cd43eac176acf849871e58c3505b09ea231 SHA512 df8ed294f0092d4078fba8b64abcd2524e0d8331a42dfee6e1869e3a418cf2d54f95d7c300d83e4392295ea4116ec989d418b0292b0895ef474bf93338a980e7 DIST ytmdl-2024.04.14.gh.tar.gz 1120264 BLAKE2B 018942cb9fa2534d225ba66e73e6b117581ce86cdc13b9bd3a39475dcde76d57fa97731264e3bf54863e0ab613a93861d51d7f0c678d332f029446cfaaa75820 SHA512 2d8b2e2189c6f0483dd32466f98281d8f173ad5d8a717ff9d828a7b08fc7f6313f108fb11da4b18ae66336c754c1c00f14010fe823c0a182387578db01795760 EBUILD ytmdl-2023.11.26-r1.ebuild 1645 BLAKE2B 32762cca3ee9918b8f206f10353242c41b22ab82ad6226c1e7f2038c2bf6773578c008dd5ecc26b48677f706354ff64ce073da8173e481d7592136625595f34b SHA512 b2b3b90c78bf4b6b07e38e1e625dd6e67ece37e64bc8e9bda10fc797651f2bf88a6b06841b1e0dd817185d0262bf41e88d93a1704c199904bab416c5ea25df1b -EBUILD ytmdl-2024.04.14.ebuild 1645 BLAKE2B 96462c1dfeabb5978dbbed84031339acfaabb4c3b523eb4f85ebf3f65200701018cf59ca3809f011af84574a5312e26ef35097cfe1ab66013b9545d801cf080a SHA512 e42eed2725161b02bd80d254ae13998e0bf91508e5152c9d5d2ae20a9def96a81146e8fc16eae9c617e77d200fc38a7140369ca3823f225de069be5bf6a12ff6 +EBUILD ytmdl-2024.04.14.ebuild 1644 BLAKE2B c1e84e395c0b1a1945987eeb4c3bda96c16aa45fbed1d32369e99eb6398d1cdf418f2c8c11a63eb513c22ab34791da0f259c039e94c94a6499fe52d8675debfe SHA512 d1f7a0134e07d90f2dd071447eaffe2fff6bf0833e4cfa6cf62c3fc8652bec1b0bc69f5e237c93cf68c5d3ec0492c1f789163b2bc98c52b8df7f0ec6e82f18ae MISC metadata.xml 450 BLAKE2B 9901cfebf346a8874315680cdef3ff19d49a84a812358aa122b99645ccde78f8c3b3ea42b1d16bdfcf9f670a694ebcbd9ce50cbcaefcef11c97eeee85264b442 SHA512 32a761ea39aaf5654523a09bfd5bfc6f4052cd35248439bb46175409085cb13b5fbb0097269785ae11df5701fa785ee564d756af5b00b4ab8112cdf3381f45e3 diff --git a/net-misc/ytmdl/ytmdl-2024.04.14.ebuild b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild index 605d4eb28f65..0d06867b5465 100644 --- a/net-misc/ytmdl/ytmdl-2024.04.14.ebuild +++ b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild @@ -20,7 +20,7 @@ else SRC_URI="https://github.com/deepjyoti30/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="MIT" |