diff options
Diffstat (limited to 'net-misc')
19 files changed, 76 insertions, 21 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex ad42961eb663..7b8b5be9efcb 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest index fe087f189ddc..3a969ecc40a0 100644 --- a/net-misc/linuxptp/Manifest +++ b/net-misc/linuxptp/Manifest @@ -6,5 +6,5 @@ AUX timemaster.service 234 BLAKE2B c59cfb10a85db09dc48830b166e6c3338949a2f12b417 DIST linuxptp-3.1.1.tgz 218784 BLAKE2B 5b46580a0e1b6e003f5f03e512c4f9b348c086f356fd47d3480da5e8223ba291fdb213798c696c37759896a99bccf21cd7e7daddce5aa5ed5701afb0e622a755 SHA512 c3c40987fe68480a8473097ebc3c506fb4f8f3b6456bbe637b2b3cb0b3e0182f1513b511fdc04b3607d5f7d8bd1bd22502bb86eb13f9fa4fa63a3331846b33ec DIST linuxptp-4.0.tgz 250862 BLAKE2B 2c790e35677ee443b39130459b51e9b7237ec780f6e9774028e3c956de6e962ae8272157bf5e6bea847a098654b8cf9621a907b57c38778d55383182ec2d63aa SHA512 763de5654f0426f2f489223e02fb3dd39a3a830751b366406657efe33bb923b5b38edada7b62de3efed6d257d5d386ece0d42a5eb92da5e5d443eac9b32e105d EBUILD linuxptp-3.1.1-r1.ebuild 1244 BLAKE2B 3d3fd5c5fd85addbaddfec4e4344722ac57bc9ebb91699c501ed0ce9e36e9f48eb45e63b0d4c049c7aa717b7ec2cbf6dfa46283df39b239a48086eb39a3f3aa6 SHA512 92dd2c98a1391bf8a6ce22d8bcd354f705a83e38352a1175c240770705fc0251f65bf8276282b08a53ec565bf5abba3264db4a59cb0c516f45260eb4228a550a -EBUILD linuxptp-4.0.ebuild 1241 BLAKE2B d7900407df59dd26f86588e2ee63ec6db597e5c7c50fe5078bf12faadf7eedc35fe2ec0eb2b0b5e65977a5a6ad850fe6bc91eb12cf35aa4c59192af240aea674 SHA512 3bea6af0e7d08bebe89d7bab08ff3559dd8b53ad6e5405b47f2e0b2f694b494a325bfe30d4634c3cc915bee769843b52de63cd15c814bb3875f34dd3f1103c00 +EBUILD linuxptp-4.0.ebuild 1240 BLAKE2B fe28e6be6b601885d0172ddde0ebb2dd9ce0cb74bae9df3b62a2b270ed1298cb18cadce448da2357fbf844001a2590df191ffffe1d1ade761e0b70dd47c77e41 SHA512 2abdbcbabbdc8b49c0447d2a5e1395f48cbf84df9f17865126ff228df64c5261ce98562082db7cf8deaa09b9b55967486b3f7b3370b506392456aa6f43ada823 MISC metadata.xml 434 BLAKE2B 6294b76d69b7459ff51a8b3f679ca7bfd940a70088eb53be6e15092465a3cb01f4a7b8b5430244b871321c320ec389ac1b05b239f3eef54e9284e881910e13cf SHA512 7f2fb3921793510144e823c70d1ac263297d3591055c680fc8192dd8402e8a763bc8de8882f9c441e060e23cebaa5e6c684873d82738a6ae8f54b6e027b5c837 diff --git a/net-misc/linuxptp/linuxptp-4.0.ebuild b/net-misc/linuxptp/linuxptp-4.0.ebuild index 482409416297..f121905d932c 100644 --- a/net-misc/linuxptp/linuxptp-4.0.ebuild +++ b/net-misc/linuxptp/linuxptp-4.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/v$(ver_cut 1-2)/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" DEPEND="elibc_musl? ( sys-libs/queue-standalone )" diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest index 42e533f8baca..d7051a913586 100644 --- a/net-misc/mosh/Manifest +++ b/net-misc/mosh/Manifest @@ -2,6 +2,6 @@ AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b AUX mosh-1.3.2-bind-misinterpret.patch 432 BLAKE2B 81bda9f9a2d63ed2f5298b399ec92435db12b1e2c57906a6a38267df2dc525d209ec8cb72591627dd58d0c0c79e5c878345d52976df7b3b8d7893447f34574a5 SHA512 d9068c169f5ecc7c64d424490bbe9c03bdd5ecf184ad4a28fe106c68cbf228641ad39e3cf4da061b1693318e5bb3b4f91365203693537021ed75b67fc494b7f8 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769 DIST mosh-1.4.0.tar.gz 393465 BLAKE2B 076b70742292dfd012aff70cc7d76eb6568ddd92600ce3f834dfdcb5064526dd3744e1672dd9fd5f172c70f501a6114b016aa8c8256a8168d2ae0a75dd8e7344 SHA512 38c11f52ff1e42965b50a22bf6de80b0fa8ebbff841d825e760abf69c788a2bf5f34e6f7fc047574d595118334eef9edf8da5520b52cdde3ac1a79d7ad70312e -EBUILD mosh-1.3.2-r3.ebuild 1507 BLAKE2B 10115565942c1b4bb81a7a87416e0219ccc0e9ed35c448c55c78a658da28946057f68075482c156b24c468450ed20523db5b53e66559a11d9d384ba3aa6adcd0 SHA512 af52e3002f15884a7c11d045c1d9e2a068ebdac8b3a4623d11242881a6502998032d9e6bff2699e5e2fa5d3ea7d4bfdfe1eeb6284757592bfa3b7c6eca638f8d -EBUILD mosh-1.4.0.ebuild 1943 BLAKE2B d8dc6984b78b24230a892c17eee04a08f3bfc082b856c6d275ae78fdab0b1896455a1325819f71ccbdd63e2ec5d49fc06c5210694a159e3d41827e744220dbf4 SHA512 a632ebaea982d724f8c844f9be1e833d68fda6d376f92ab0ab2c242a3a6a61430a0663694d03a06b5cae5316bd214195f277636a9daa085a939027799ab6f11b +EBUILD mosh-1.3.2-r3.ebuild 1577 BLAKE2B fda7bb7e2d6fdc7eca385412a6b03d3c32a5088e188e6343eabc9bb2812d38c2a8c0902c98d67d0e492fa7b9a5d514ffada9bcd5a243d47a98faa17694f500a1 SHA512 a1df5603a7f2d49ad3d7ec5123a6d6d19eae75d2479134c78a87dd329d9e114d5ea02340f78bdd2b99f2e556f9f714c45534c25ea60d73f73793869a3f6c9f98 +EBUILD mosh-1.4.0.ebuild 2013 BLAKE2B 7f5b105e0619b275b2b8bf83ce93eef12c1ac42b6ae97afc3c516c6439950d02969182a3522de36aad814b4fff4fdc08262e87d2857a1f9fd337f627cb6dece5 SHA512 95c6b7af6052be454c72d48f2a58a91366907e77e1625f5b24d2839f6c8851aea8d82316c0bfbab1e0890875d0feb658eda631a34c81778f1149b75ccbda8bc4 MISC metadata.xml 1308 BLAKE2B dd0adee201ba12f75e60f781f6642921c2bb64c19b8defb6cd175d48090c7ee083ae6dbcb73c87c080fdd47b28569adbfb3fe64dd2b6ed7d11b3d66be40e2205 SHA512 ef68cfe26d69a3ffa088d6b1efc142861f90d224d41f6b5e2c2536932ddeff6d1d036de0778d164d35a38c9d470d28ee761be08528c7f23a48072cf5d77a5f09 diff --git a/net-misc/mosh/mosh-1.3.2-r3.ebuild b/net-misc/mosh/mosh-1.3.2-r3.ebuild index bb82ed9190a5..3cda6f2836f5 100644 --- a/net-misc/mosh/mosh-1.3.2-r3.ebuild +++ b/net-misc/mosh/mosh-1.3.2-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools bash-completion-r1 +inherit autotools bash-completion-r1 flag-o-matic DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" HOMEPAGE="https://mosh.org" @@ -49,6 +49,9 @@ src_prepare() { } src_configure() { + # protobuf needs >=c++14 + append-cxxflags -std=gnu++14 + econf \ --disable-completion \ $(use_enable client) \ diff --git a/net-misc/mosh/mosh-1.4.0.ebuild b/net-misc/mosh/mosh-1.4.0.ebuild index 7f9a5b4d44c5..123086e09347 100644 --- a/net-misc/mosh/mosh-1.4.0.ebuild +++ b/net-misc/mosh/mosh-1.4.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools bash-completion-r1 +inherit autotools bash-completion-r1 flag-o-matic MY_P=${PN}-${PV/_rc/rc} DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" @@ -57,6 +57,9 @@ src_prepare() { src_configure() { MAKEOPTS+=" V=1" + # protobuf needs >=c++14 + append-cxxflags -std=gnu++14 + local myeconfargs=( # We install it ourselves in src_install --disable-completion diff --git a/net-misc/openssh-contrib/Manifest b/net-misc/openssh-contrib/Manifest index 29441c6c1ff2..17ae45a0fc01 100644 --- a/net-misc/openssh-contrib/Manifest +++ b/net-misc/openssh-contrib/Manifest @@ -10,6 +10,7 @@ AUX openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch 419 BLAKE2B c5ef82ed92da96213c84d AUX openssh-9.0_p1-X509-uninitialized-delay.patch 321 BLAKE2B 19bff0fc7ecdc6350f8e6bd30f36f30b455c65b7455fe8b1d481d8fa7cdfa7cc76719931857fe2c9730b05ae8fe3e7e05c538e743e055d6594dd2fc7c3f250ee SHA512 57798621a51a60abf6985391ec73dcafdb46de75c93579e23b786aa095d8eea29ebd9ab5987b951a136b15e60896332c9717c82b42e1c22b345444aedf17a9f5 AUX openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch 514 BLAKE2B d0dadfc57736cd4d2b04e46f5c0f6d5a1db1cfc7ee70d32afaa0f65269b82e66a72c46d33c9cbf7237f541a0485b25669cd2f4b34393e3a3ef0c9b4334092fe5 SHA512 f8badde54501340bde275951bc1cf653919bec02c760bf771308f10697b9ad2a483e30ae74ad124a737341f5c64657ab193a4d7fdf2baf24029b9447099da04b AUX openssh-9.3_p1-openssl-version-compat-check.patch 2588 BLAKE2B 635e9d4e0ca515d4da190075371b85b5c1885fd7d9b621d6f21399be0faf0be96e5e31875611392386b897f74087d75a00203a74c9f9ecf0be447bf354fcf4a2 SHA512 a27afa1b07a47f0ecf74d30ca85e7b4f8c79857c8019d274aeaed88b81149ce6241fd16f1023f14dbdc701e8c9d8671f6aadda2e21d620a47af8778b8531b991 +AUX openssh-9.3_p2-zlib-1.3.patch 671 BLAKE2B 44a974e83faaee7336898227bc6f14ff4ab6e8e91e2d8f61d22f45b4d73e57a79b505143620d3a910c6e7cea91ab406e10ffcf23a802f447843f5c2836e37c34 SHA512 d2e5992c783b46b4859501aa32aa7b0acc5ec9e512589e18faebfa8660c52a3ad9ffa3d5a4cd5ba9a5fadb7ab86e51c32714dd23325054b05fa07194bd86f7d7 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 @@ -31,12 +32,12 @@ DIST openssh-9.3p1.tar.gz 1856839 BLAKE2B 45578edf98bba3d23c7cefe60d8a7d3079e7c6 DIST openssh-9.3p1.tar.gz.asc 833 BLAKE2B e6533d64b117a400b76b90f71fa856d352dea57d91e4e89fa375429403ac0734cc0a2f075bc58c6bb4f40a8f9776735aa36bdb0bbf3880a2115cea787633e48b SHA512 6222378eb24a445c6c1db255392b405f5369b1af0e92f558d4ba05b0d83ab0d084cb8f4b91d7ae8636f333d970638a6635e2bc7af885135dd34992d87f2ef1f4 DIST openssh-9.3p2.tar.gz 1835850 BLAKE2B 38f8d4ada263112b318fafccabf0a33a004d8290a867434004eb3d37127c9bdabe6e0225fca9d6d68fb54338fec81dcc9313ca7c91d3a033311db44174dc9f6f SHA512 15b8c57aa120186f1d1c3c2b8dc6ffd26733e12f755a6b0a4255d9ec1815a61506275ff5723b4ac029e44bc2ad22852ac36e1101f292348fbfa79aa1a4cd3f35 DIST openssh-9.3p2.tar.gz.asc 833 BLAKE2B cfba3867d7f97cb2c904bd3ae111bd63e8a050464b66e3f3f22390839a153d57ef5819182f8ad99a6b520f27881143552dc64fccfc33dcc0483ffe1ef33a5a47 SHA512 759e512a36a3a62264803b517298a65c83e1daebd9867e28ea1ca4999c38539368815ccda86540a4f5d45fa79c539d8242995ba55f2918baf2a7404c105e337a -DIST openssh-9.4_p1-X509-glue-14.2.patch.xz 784 BLAKE2B b559cc7132a85baf8984088769be7f84c86ca2c5d91eba0412882615f86d0f405b3790c6dfb35111cab7150780b8b3ce2120e30a1f1d078f6308dfca47470ef6 SHA512 8faaba8444fd795a64d3ecb91ffea9e754d2688039dc8b5d8d085a91671860884c0fa1bd568d1ed62f2cd1f328564f2fb3e467e4288aa6e5a37024bcfa70522e +DIST openssh-9.4_p1-X509-glue-14.2.1.patch.xz 904 BLAKE2B 64dd3f145858d7d6b6625fa565a882f7ab43faf78233a2a78b7b13fc1d417ae67c675bebc09dd1343b3504af0c2c47a1fda6ac77a11238e1d2dabcdd394253e9 SHA512 542263bae6135c0493a16c63526da6b98cc425e01f2a1e332156bca4d3d7c7e91cfe1cd86f32c5f67097275eeb543b356faacad665c2a36c22843e2e00d19e10 DIST openssh-9.4_p1-hpn-15.2-X509-14.2-glue.patch.xz 5144 BLAKE2B 324dff4cccc027825b8400225cf322a6882caca30aa567a1bea405142ff9f9ed143b837ef8082011342ae6d22033c22e34499f930d0b9ca1e3c241cac7c15e99 SHA512 e63b2187d3f210ce897b6696b02a364f4f212c1290f7b9bbcceeb15325555427254c54366b7da059ce3cf99e595457e69d8edff4fcb7c18021c7530dea1df4bb -DIST openssh-9.4p1+x509-14.2.diff.gz 1219074 BLAKE2B ea31ef87a5a450c1e8785f4eeb27f2bfb7a2ac187e10c35dc814cdad139645e52a577b238dc8bcb9c2cb001ee6ab29d88fb056b4ff772b3660c5cf9fa4fc2380 SHA512 53cc58618f57e6011f0ae2484b56e8888f7fc971f39aaf248a0e0a4361e28d0e170a7d4e3b97efe7c5f2848d845cfe970b8511e876d2b9bcb1cecbf01bedd972 +DIST openssh-9.4p1+x509-14.2.1.diff.gz 1221969 BLAKE2B 67b06648aafd849fdcb4c54c4a841c46b6a97d53d7ebdefe6110aba7a0877833ebb2a8d22a1e51a748051f889ba08cc1501ea0e9e221fef2f5c0e8caad170983 SHA512 d90dc7bde008ab793d9f85f1b4b0687f1d084fdf2fc6cfd229748424ddcc4664f558be44fee73d72e88bc99e03a5dd1ec57138a82f77b82e0f65d14bd3ef545a DIST openssh-9.4p1.tar.gz 1845094 BLAKE2B d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53 SHA512 0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25 DIST openssh-9.4p1.tar.gz.asc 833 BLAKE2B 95eedd9356766e5d0ea1261da3dc4c7869f054b418c626fb35815a0aa655b1ddbf54436b437d98c4344b05c9196c8fa1f592eac07b3ccf08bd3e980f8b6955af SHA512 983b4ebaa3b98e70831ce686cb503270926c065163a2510eef0c5102ef50b6e665b889ee15ea8c0bd7c4bbddb19270f036e1d554a8212ef2c292f9c682c8631a -EBUILD openssh-contrib-9.3_p1.ebuild 18994 BLAKE2B afee1f257fbfd229f18bfa22e91a99444b747110a42adcc5710c724442bd50d8816c82e87566e4c57d5ec28cb6a12b04e2257694487edb39fc9e70833a559143 SHA512 70eaf3cadb5d79247d876878233392f5add412dd5a6a4a6840394dabb3021ca33a5a3ef730cdc8228f245ab0e9a3386c7517377ee47ad1c3d639606e18bbb5d4 -EBUILD openssh-contrib-9.3_p2.ebuild 17927 BLAKE2B cbcdb1bc84c18f3551d96750f5f50df126973b989c956f4c5750248e0f5e78b7a0880f78d24ed911185e428ea2cebd89647ede9680764a6ba289fc78f090f4d5 SHA512 cfee637d196c87f1ecd7eb062f4c04944c75149f19fd219728396b50cdc372c3666dfb56fe9b5e4daa66bba46758988afc624f59bd9cf4f342e4f1a340d1679a -EBUILD openssh-contrib-9.4_p1.ebuild 17794 BLAKE2B 075868a5c2bb6a3deea87f70880faac497a86f4677bff488a3c98751a4f7de846888f148c4a6c3709a8e478198fbeb3a6d52d1556abb7b8ccb53d095df590063 SHA512 9971d0d10a60111ddb3daa50e97acb9bd92828e63cb617667b218f32e33b6c0bd9c8f43b5bf1a1bf5e35632e5194925858370bc4b71a99ec192ee3141bd72fb1 +EBUILD openssh-contrib-9.3_p1.ebuild 19047 BLAKE2B 3a11afc10f49b5934c6ba5421b05602b340cf3e868310a17347ca03f6807e658ebdbc2bdcac3e374693a7c7abc085c3436c4867c8435ca6a970df928d0fd0021 SHA512 05a210f134a884ec34e9eefb86bec983fa62f2ee93b10267b1e0679566cc4144a59bfc5660f833cef42fab5934e22fee042589d348a71b3f3718120d53e389ec +EBUILD openssh-contrib-9.3_p2.ebuild 17980 BLAKE2B 0cbedde4a7b2df7a9381da583f4fb2171fe8198ba74506be4f86e8c263e792120cd5b72ea54aef625503fc85f1ba27464dbbf4d1c07d0553529a248c004923e8 SHA512 736504a0ba76c1c78ac2fbb067247e4e0f28afcb6b209a2eba3af80ebcae86c095ee2e54c08860013a95bd525003d8255c72d6d80b3b25f05c4f74fbb885c4af +EBUILD openssh-contrib-9.4_p1-r1.ebuild 17926 BLAKE2B 86b0a07db827100203cdbe2a1ee702e45698323c22a461b09e03989ec9ba1cca854772de25cadd24e87e1171c26e8ef80ac56e58bb6292b441fdc35783318415 SHA512 fba1a337706d2b1f901965c4149bdf57d0bc86c6e45c140b49d58cf6486d3c0d65f68c4d879a3a307038a8f2c39294f1d20207a532022415210de0a98fbb2bd7 MISC metadata.xml 2975 BLAKE2B 068d52ba2e5de0b696e7fe995e4c2a041206a59258f24704ca3a72fe1d85323c2aad7899f055b48a4045d6303491822c59f2b86b85fc428a26f8259ea583796a SHA512 83fef701188c00af53382b5099fc2ebf83c903c3edefc3d2cf6deb0a667c0d0d9531c18728eef9b5b703903d31fbdb55a68e5b76890ea090bc1d79fef3ae6b89 diff --git a/net-misc/openssh-contrib/files/openssh-9.3_p2-zlib-1.3.patch b/net-misc/openssh-contrib/files/openssh-9.3_p2-zlib-1.3.patch new file mode 100644 index 000000000000..f1336bbe0380 --- /dev/null +++ b/net-misc/openssh-contrib/files/openssh-9.3_p2-zlib-1.3.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/912766 +https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621 + +From cb4ed12ffc332d1f72d054ed92655b5f1c38f621 Mon Sep 17 00:00:00 2001 +From: Darren Tucker <dtucker@dtucker.net> +Date: Sat, 19 Aug 2023 07:39:08 +1000 +Subject: [PATCH] Fix zlib version check for 1.3 and future version. + +bz#3604. +--- a/configure.ac ++++ b/configure.ac +@@ -1464,7 +1464,7 @@ else + [[ + int a=0, b=0, c=0, d=0, n, v; + n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d); +- if (n != 3 && n != 4) ++ if (n < 1) + exit(1); + v = a*1000000 + b*10000 + c*100 + d; + fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v); + diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild index 26c886d2d198..460d83ab5935 100644 --- a/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild +++ b/net-misc/openssh-contrib/openssh-contrib-9.3_p1.ebuild @@ -125,6 +125,7 @@ PATCHES=( "${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019 "${FILESDIR}/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch" #834044 "${FILESDIR}/openssh-9.3_p1-openssl-version-compat-check.patch" + "${FILESDIR}/openssh-9.3_p2-zlib-1.3.patch" #912767 ) pkg_pretend() { diff --git a/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild index af6ba3f3e4ed..fce00a82a653 100644 --- a/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild +++ b/net-misc/openssh-contrib/openssh-contrib-9.3_p2.ebuild @@ -120,6 +120,7 @@ PATCHES=( "${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019 "${FILESDIR}/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch" #834044 "${FILESDIR}/openssh-9.3_p1-openssl-version-compat-check.patch" + "${FILESDIR}/openssh-9.3_p2-zlib-1.3.patch" #912767 ) pkg_pretend() { diff --git a/net-misc/openssh-contrib/openssh-contrib-9.4_p1.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.4_p1-r1.ebuild index 402849e5c957..19759e7eacee 100644 --- a/net-misc/openssh-contrib/openssh-contrib-9.4_p1.ebuild +++ b/net-misc/openssh-contrib/openssh-contrib-9.4_p1-r1.ebuild @@ -22,11 +22,12 @@ HPN_PATCHES=( HPN_GLUE_PATCH="openssh-9.3_p2-hpn-${HPN_VER}-glue.patch" HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}" -X509_VER="14.2" +X509_VER="14.2.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" X509_PATCH="${X509_PATCH/p2/p1}" X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch" -X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch" +#X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch" +X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER%.1}-glue.patch" DESCRIPTION="Port of OpenBSD's free SSH release with HPN/X509 patches" HOMEPAGE="https://www.openssh.com/" @@ -118,6 +119,7 @@ PATCHES=( "${FILESDIR}/openssh-8.0_p1-fix-putty-tests.patch" "${FILESDIR}/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" "${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019 + "${FILESDIR}/openssh-9.3_p2-zlib-1.3.patch" #912767 ) pkg_pretend() { diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 719b736bdfac..030dc193e6c2 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -5,6 +5,7 @@ AUX openssh-9.3_p1-fix-putty-tests.patch 1691 BLAKE2B 8a92766bd2db65a4dab1254a35 AUX openssh-9.3_p1-gss-use-HOST_NAME_MAX.patch 350 BLAKE2B 7baae8cf4140e7ace3486c5c1a34fecb8f8ce2dc2818f046645e11ac37fb87afb0d1bb15a5660e106b94867c24e22da72fbdc1c9255d2ce2ede164b9922a1484 SHA512 d5e13ec0ae1e7d73bfe15e7a0507730f92e4109ab5daa0d99c4d4a9800d3b8df19e26b56e0aa1b5cedb5635f40ef63d9806bb92ac4eb342a1e196e38380b1c13 AUX openssh-9.3_p1-openssl-ignore-status.patch 765 BLAKE2B 6ddc498cef115a38054eb8f1fddac34048b94592e54f8e31dc11717fe872f3d66a7e6877d2449102fbe18a0ee2a35732991abe946b1fe10abfa48bbec6871b26 SHA512 ab15d6dfdb8d59946684501f6f30ac0eb82676855b7b57f19f2027a7ada072f9062fcb96911111a50cfc3838492faddd282db381ec83d22462644ccddccf0ae7 AUX openssh-9.3_p1-openssl-version-compat-check.patch 2588 BLAKE2B 635e9d4e0ca515d4da190075371b85b5c1885fd7d9b621d6f21399be0faf0be96e5e31875611392386b897f74087d75a00203a74c9f9ecf0be447bf354fcf4a2 SHA512 a27afa1b07a47f0ecf74d30ca85e7b4f8c79857c8019d274aeaed88b81149ce6241fd16f1023f14dbdc701e8c9d8671f6aadda2e21d620a47af8778b8531b991 +AUX openssh-9.3_p2-zlib-1.3.patch 671 BLAKE2B 44a974e83faaee7336898227bc6f14ff4ab6e8e91e2d8f61d22f45b4d73e57a79b505143620d3a910c6e7cea91ab406e10ffcf23a802f447843f5c2836e37c34 SHA512 d2e5992c783b46b4859501aa32aa7b0acc5ec9e512589e18faebfa8660c52a3ad9ffa3d5a4cd5ba9a5fadb7ab86e51c32714dd23325054b05fa07194bd86f7d7 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 @@ -17,7 +18,7 @@ DIST openssh-9.3p2.tar.gz 1835850 BLAKE2B 38f8d4ada263112b318fafccabf0a33a004d82 DIST openssh-9.3p2.tar.gz.asc 833 BLAKE2B cfba3867d7f97cb2c904bd3ae111bd63e8a050464b66e3f3f22390839a153d57ef5819182f8ad99a6b520f27881143552dc64fccfc33dcc0483ffe1ef33a5a47 SHA512 759e512a36a3a62264803b517298a65c83e1daebd9867e28ea1ca4999c38539368815ccda86540a4f5d45fa79c539d8242995ba55f2918baf2a7404c105e337a DIST openssh-9.4p1.tar.gz 1845094 BLAKE2B d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53 SHA512 0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25 DIST openssh-9.4p1.tar.gz.asc 833 BLAKE2B 95eedd9356766e5d0ea1261da3dc4c7869f054b418c626fb35815a0aa655b1ddbf54436b437d98c4344b05c9196c8fa1f592eac07b3ccf08bd3e980f8b6955af SHA512 983b4ebaa3b98e70831ce686cb503270926c065163a2510eef0c5102ef50b6e665b889ee15ea8c0bd7c4bbddb19270f036e1d554a8212ef2c292f9c682c8631a -EBUILD openssh-9.3_p1-r1.ebuild 13404 BLAKE2B e90967abd981b984cabb0103e2137ced43b424de3e9bb26c1d7dac510566e167f6b88e0303dab44699a0ecac82ba438181c03a08330c3dd7f5dae108c4b81705 SHA512 6a12f83fb31479316e5573321beb82bab76752e2a01622c35073950edeeae819d791032056bf11fe5ea310a3cee0834e33cb814e87a8b3ad1dda9a4641702666 -EBUILD openssh-9.3_p2.ebuild 13528 BLAKE2B 730ded6f2bbb99f1856882edf535459e0e40769f9e28709f78b200a2261ffd9de611a1dc0615d60f6d7da45793ef25e9e9c02b1eabfb75bde447b3303a4e6299 SHA512 7b1144ce50bd7a20523581f4a7b4fca4887bf73ba9e21f92c1a080c87c72e7a5513703fff842faafb24aa42169f127071467e6dc3843721054fc92089f2bd70d -EBUILD openssh-9.4_p1.ebuild 13409 BLAKE2B d067d0b20771b4e1e8a3e807b72785ac8785ef090a63109a0b73997b186873b49969cee2690bd145b8c0cf430a1d527d327954a19f36a48ecb4471fd23df6acc SHA512 4102d0bec500270c15c8645ba75c06015fa325a9b0e49874c28ae099cab539cc4fbbe3c2ad9c9a46348954dd9acd9727be8015183c4d2b8785ecacb017a7c852 +EBUILD openssh-9.3_p1-r1.ebuild 13455 BLAKE2B c45a4531688d14c3ed766f721dcb5d9603e1594526cbfa3782b491c515313567db1b60cfaafce1360f52e191c72d85d1dc2ea84bcc6f89aba6eab13b6498380a SHA512 d55d36cd0737dedc7d32321c93bbea1ce31d3b50db006f42e25073e5b4d356dc5ebd0ea652fd501be724745d8a9e0771a9d79d61ea9c822525eabbd4498434e9 +EBUILD openssh-9.3_p2.ebuild 13579 BLAKE2B d14f223e710380fef225829f0b08cadb407571143b3d46a7ea2ab9b8c4fb003a6897c1138ce749c24b1b0bed896af83f35dd81d84d8d9bc52b903124d71ef5fe SHA512 47a05c7b8962891ede466c24f2e2bc635fa42317932fd0c6c857dbd80a835d196f7fd08ae3272507cfa16daa49bc2ba667dd4a1b35b36d4f039b9045c8b0353a +EBUILD openssh-9.4_p1.ebuild 13460 BLAKE2B afabbccdb249e44e3c85503967b3640214d94b2115571f769c60f88dabbefdefb173f7b66d1fd70a9b5f305d65551d6be9aa3b9060eb476851a1878a19b0362a SHA512 0daa0f528d715543c010b8721de201236f5c5ef26c8403e987c7542725ffe977bcb02d9e331235f92a771e12cd15797f605685d733ee7fda4cc807b9180426c4 MISC metadata.xml 1788 BLAKE2B d04d3030f70f3615522672fa56e684acaa67ddce8d16cce86ba8911fb8fc11ed152be012ecf560427d271868c4841a7422aaa644305947302d3ebab62bdb577d SHA512 bd328e3a33ce04b989149333db5f774f1b52540f12ef83b08b7fcf136ae2a3a9c83bef42c28991d3536249098ca0b9ffd21e583d93599580510d8619e9fd01ca diff --git a/net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch b/net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch new file mode 100644 index 000000000000..f1336bbe0380 --- /dev/null +++ b/net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/912766 +https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621 + +From cb4ed12ffc332d1f72d054ed92655b5f1c38f621 Mon Sep 17 00:00:00 2001 +From: Darren Tucker <dtucker@dtucker.net> +Date: Sat, 19 Aug 2023 07:39:08 +1000 +Subject: [PATCH] Fix zlib version check for 1.3 and future version. + +bz#3604. +--- a/configure.ac ++++ b/configure.ac +@@ -1464,7 +1464,7 @@ else + [[ + int a=0, b=0, c=0, d=0, n, v; + n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d); +- if (n != 3 && n != 4) ++ if (n < 1) + exit(1); + v = a*1000000 + b*10000 + c*100 + d; + fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v); + diff --git a/net-misc/openssh/openssh-9.3_p1-r1.ebuild b/net-misc/openssh/openssh-9.3_p1-r1.ebuild index e3184f35c252..2624fa94f0ee 100644 --- a/net-misc/openssh/openssh-9.3_p1-r1.ebuild +++ b/net-misc/openssh/openssh-9.3_p1-r1.ebuild @@ -88,6 +88,7 @@ PATCHES=( "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" "${FILESDIR}/${PN}-9.3_p1-gss-use-HOST_NAME_MAX.patch" #834044 "${FILESDIR}/${PN}-9.3_p1-openssl-version-compat-check.patch" + "${FILESDIR}/${PN}-9.3_p2-zlib-1.3.patch" #912766 ) pkg_pretend() { diff --git a/net-misc/openssh/openssh-9.3_p2.ebuild b/net-misc/openssh/openssh-9.3_p2.ebuild index 8e57bfe2061c..3013b70ed4bc 100644 --- a/net-misc/openssh/openssh-9.3_p2.ebuild +++ b/net-misc/openssh/openssh-9.3_p2.ebuild @@ -88,6 +88,7 @@ PATCHES=( "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" "${FILESDIR}/${PN}-9.3_p1-gss-use-HOST_NAME_MAX.patch" #834044 "${FILESDIR}/${PN}-9.3_p1-openssl-version-compat-check.patch" + "${FILESDIR}/${PN}-9.3_p2-zlib-1.3.patch" #912766 ) pkg_pretend() { diff --git a/net-misc/openssh/openssh-9.4_p1.ebuild b/net-misc/openssh/openssh-9.4_p1.ebuild index ec36f3445783..5d1ffb94eba4 100644 --- a/net-misc/openssh/openssh-9.4_p1.ebuild +++ b/net-misc/openssh/openssh-9.4_p1.ebuild @@ -86,6 +86,7 @@ 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.3_p2-zlib-1.3.patch" #912766 ) pkg_pretend() { diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest index 41f18301c822..70d0fd1d694f 100644 --- a/net-misc/wget2/Manifest +++ b/net-misc/wget2/Manifest @@ -1,7 +1,7 @@ AUX wget2-2.0.1-stdint.patch 573 BLAKE2B bd2f85fc234a6d019c10212bee2c636c9b428476b1b0fa7379e575f157dd18aa6cc8d6221be4f3a9fecac395e920b4d6efae04f933fbae0e0e0a79f10a0a14e4 SHA512 7098cf95f2b9c3af3eca65d365e66c06292037fa9093844b02561bd6e52f9d7c676167cb0175c9d56de145e1fb93906eb8509e89291c6f4250efab666b581fd5 AUX wget2-fix-build-issues-with-clang-16.patch 841 BLAKE2B 055c0e61566fa78360481f618dbcdc5fd65f853c94ac4b5d1e75e43a5be9b6295e9281c632635405eec840a79b6d106b30bf068d7577f21d8d087f6b102f39f1 SHA512 59c95329ee7f779be169c2a9032a36dd49e8c596967ba3a6d0dc12ba3cbd67dab8acccabff7d73126232ee60b699b84ee95253c17b39b47e049134b86700608a DIST wget2-2.0.1.tar.gz 3780748 BLAKE2B cc28c58ab59c28540259545d60b19d6c513725e856fce02690e40ab0818d213bd656de704bd6310650af7190d7d3265fee859eebab326ad441f7351213fce6d3 SHA512 7a4afebf87ecda9e7e2d1fb2861c220875a96bab7c7ead6397c7ac11b6effae80d80f71b57a58d6b91a6c849b9a9fd974ce620d3050f677dd0fc4bc05358b27e -EBUILD wget2-2.0.1-r3.ebuild 2126 BLAKE2B af9a29e617300020c65e92601c5b33a4fb3b955c0a9f7bdebfef1e7e8d7511a8312a5297973e63f47f9b5efb213a66f76de8d3172cad7db505ddbdaf4a4ab155 SHA512 10f834711efca9ed76b4efdeed537524aaacefb4c25300a0bc437b3e107d754cac9976dae00e0f08a4afea981cbd5beb73c9d938a24f3be96a1e65b4fa4b5ddf -EBUILD wget2-2.0.1-r4.ebuild 2159 BLAKE2B 263d8d0f357ffa3b9925036fdc8386c6cc0ffe4b5cee9d179d96fff75e99121cb3cf5a26e64da93f26f2aa780a92fbe6ee8577aed0dc751e7e9287833ce6fce5 SHA512 b64ec5071f2863991008b542f1b8a8ae73dd672050eb89a300253650d87dbb0e8f591e0a66db57fc6f98f048704158d14d92e0abca792d7640935a1943965bc5 +EBUILD wget2-2.0.1-r3.ebuild 2065 BLAKE2B 2ad2b0e9428a57e4669b31889075f3805dcf246b3f9dad5fe4eb02d7516e94e3b99026f7569c646f82b2e5476be8d7fe701650188292448556905e713ff5db6e SHA512 b796b8c27a8aa102388f23b755eea235ec9fddb6f739083bac2dbe48e16a45306854c8dc62d9f0b4fdf90f3cf3a3ccc0deb21e5b685e382f2390dbcfadd53ff5 +EBUILD wget2-2.0.1-r4.ebuild 2098 BLAKE2B da254adb63d7d6a526b69bd26352c8d2f4a283197fa3a0f3a0a95763b540083cf2178ed80043864cc7d1f5be424b9ea47081b54316747302a2bae4ff15e79f73 SHA512 22829778a8140d4745065aaf256666096379856cec830f4e93b70be93c453cc2161e532586589dd92ea0ca1f51c7e16319c39eb4da2e8c92663a8c8ef203b90a EBUILD wget2-9999.ebuild 2458 BLAKE2B 4e75262df94e6db8be002957a829714cfac0f03420ed6e453c5da65929ae00364938d066d0f5a707ed9631612d0638d10c527fcc37620c7fc6764534f79a3dee SHA512 20c2d157007f78069d9e04823717ff0efe10cdc4c9dc9a56ab91c696a73c2045b5f787531d68adfc3f8a96c126885a6c1039f71200381883dfd4c32542a88d7c MISC metadata.xml 827 BLAKE2B 707f4ea6684a3ae7180790983d3a622721106990e69e8855fde5c6442fade3ff8ff6ff006c7c310bb055a68a7e4ceb376d855393fa491ae6f41ad2e272072fd5 SHA512 7022b91c3c5eb59d3c5a0bc7a5f3f36b25ae766f866b253cdab284ce4c723f2860a82bc8042a9b761911bc80e4726a84893107e27e3cefe84fa2ad4fcbfd69b4 diff --git a/net-misc/wget2/wget2-2.0.1-r3.ebuild b/net-misc/wget2/wget2-2.0.1-r3.ebuild index 7963200843bb..560f1211dd2b 100644 --- a/net-misc/wget2/wget2-2.0.1-r3.ebuild +++ b/net-misc/wget2/wget2-2.0.1-r3.ebuild @@ -10,7 +10,6 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" # LGPL for libwget LICENSE="GPL-3+ LGPL-3+" SLOT="0/0" # subslot = libwget.so version -QA_PKGCONFIG_VERSION="2.1.0" # libwget pkg-config versioning KEYWORDS="~amd64 ~arm64 ~x86" IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test xattr zlib" diff --git a/net-misc/wget2/wget2-2.0.1-r4.ebuild b/net-misc/wget2/wget2-2.0.1-r4.ebuild index 981ce1c60b0c..034018c48ad3 100644 --- a/net-misc/wget2/wget2-2.0.1-r4.ebuild +++ b/net-misc/wget2/wget2-2.0.1-r4.ebuild @@ -10,7 +10,6 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" # LGPL for libwget LICENSE="GPL-3+ LGPL-3+" SLOT="0/0" # subslot = libwget.so version -QA_PKGCONFIG_VERSION="2.1.0" # libwget pkg-config versioning KEYWORDS="~amd64 ~arm64 ~x86" IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test xattr zlib" |