diff options
Diffstat (limited to 'net-misc')
40 files changed, 916 insertions, 721 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex a099a24c4ba5..9bbb66af07c0 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 4fc0f5f53c7a..e21f97376fbf 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -9,8 +9,8 @@ DIST chrony-4.6.1.tar.gz 636076 BLAKE2B cc1299ba680eae158da9ebc6d4451ffc8b352b9b DIST chrony-4.6.1.tar.gz.asc 833 BLAKE2B 19e7359220beb93ede262cad7fec4963b15873510530690eefcdc28c69222ac40e41849487b9514665443dff888fbeeea1a2cbef0517da38a210a6573f4e9c99 SHA512 992b706636bf3a7eb6d502562a4990c9d8e20e5f3011d2cdb2ceb32220e9a1c2bfa6eca767212cee49b811823872602dc33f9e7201a7f9a93cc9c90e81b1db49 DIST chrony-4.6.tar.gz 631899 BLAKE2B b94e49aa5b9da2cde06d91b674a732a02eee552e88fa169877504cf75645a55dc78a0234a2356d35953b6204095a1c3e9973cc502cafdb6e92bb1231c74f8156 SHA512 84926b6c9eb90824ab98333412b001b18de9342dacb898d195ee8de52868b1945700a8b161de6b603c231460d290e02df6712c1dcb7f034ba45754b38466c8bd DIST chrony-4.6.tar.gz.asc 833 BLAKE2B 38d7402b5e8f2063dbe8a0f454ae87143a0a74d916d117270a7ed39e003eb7a5f816a37613c6ca1f2a1e8b14d94718d88b11c96090a5f5e855d64e552d112d95 SHA512 f735c1d52f1474d2af656e55d3a9abfd33b4ed706b983a393c7e3852b766b5179fe4098425ee7f32bb5db4a2e4170e8c5930cf63d20884be6c0eac338a3d26db -EBUILD chrony-4.5.ebuild 6899 BLAKE2B 865718c8230274ed9b735be67153bf4e963c4538a67291a34a3e50bdd5aee9d066228a2bf39e53bcb6b69913505b0d06cfe445f2adf3a977a18b18dd14503eb5 SHA512 e1f92a6d055bc9c522f913c1b1a3bdd25a8f64799c791884bfc8da600d917a8e245f7aec3338b8ffcc8642a781a61902615ed80237cabffdb947504a7a67e77d -EBUILD chrony-4.6.1.ebuild 6907 BLAKE2B c58c19c345b5621059fbd920e83c52f06387953d40c97f986e6b1adfb1a48e8b54a7914a63e3d31f9cfa5c2db93497a110d766d1887b69cba487a11d95af9a4c SHA512 23a2bff2c46d358aa40977c4b4fd101c6b4288513e1c0bc9d493cd0527e8524b352f7c86b3584a4128ec32f2d3a6d0b8acd0fbc252aa0b09feabda34da5c7311 -EBUILD chrony-4.6.ebuild 6899 BLAKE2B 865718c8230274ed9b735be67153bf4e963c4538a67291a34a3e50bdd5aee9d066228a2bf39e53bcb6b69913505b0d06cfe445f2adf3a977a18b18dd14503eb5 SHA512 e1f92a6d055bc9c522f913c1b1a3bdd25a8f64799c791884bfc8da600d917a8e245f7aec3338b8ffcc8642a781a61902615ed80237cabffdb947504a7a67e77d -EBUILD chrony-9999.ebuild 6907 BLAKE2B c58c19c345b5621059fbd920e83c52f06387953d40c97f986e6b1adfb1a48e8b54a7914a63e3d31f9cfa5c2db93497a110d766d1887b69cba487a11d95af9a4c SHA512 23a2bff2c46d358aa40977c4b4fd101c6b4288513e1c0bc9d493cd0527e8524b352f7c86b3584a4128ec32f2d3a6d0b8acd0fbc252aa0b09feabda34da5c7311 +EBUILD chrony-4.5.ebuild 6956 BLAKE2B 88eaad933c02308a9343d7fcb36b2b18e84c66c5a8773bcf8a0b039f4645107eb724bd2815311a5667db5d5e9d98aaa48f1852ce388bb761d562ebc385583d0c SHA512 75e0a7a311b6851e852b772d04f1ad325c8b5ccc2be215da3d7a0aa3a2152253a03b83859ac21895cdb1e0b50bece15b23d51adc025d5c680b70fc38a6c8f217 +EBUILD chrony-4.6.1.ebuild 6964 BLAKE2B c79eac287b2e9d53d5bca2dc8421ae7eebcbe75639714a3ebc6fff0d090509ff3e00a49a09983d53ae6e5e79856d6bfefd815edbc53a18184a9540c965427dea SHA512 f68938e5a7a68b92affb8cb0b9de220285e1dc1336e73a56b03bde31a76c6548d7b9199a294ea846cefb8949c098ed069d4b1f032afbc41b8b54e9513063cc2d +EBUILD chrony-4.6.ebuild 6956 BLAKE2B 88eaad933c02308a9343d7fcb36b2b18e84c66c5a8773bcf8a0b039f4645107eb724bd2815311a5667db5d5e9d98aaa48f1852ce388bb761d562ebc385583d0c SHA512 75e0a7a311b6851e852b772d04f1ad325c8b5ccc2be215da3d7a0aa3a2152253a03b83859ac21895cdb1e0b50bece15b23d51adc025d5c680b70fc38a6c8f217 +EBUILD chrony-9999.ebuild 6964 BLAKE2B c79eac287b2e9d53d5bca2dc8421ae7eebcbe75639714a3ebc6fff0d090509ff3e00a49a09983d53ae6e5e79856d6bfefd815edbc53a18184a9540c965427dea SHA512 f68938e5a7a68b92affb8cb0b9de220285e1dc1336e73a56b03bde31a76c6548d7b9199a294ea846cefb8949c098ed069d4b1f032afbc41b8b54e9513063cc2d 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 2af18d12b1e3..e33e867ea9c0 100644 --- a/net-misc/chrony/chrony-4.5.ebuild +++ b/net-misc/chrony/chrony-4.5.ebuild @@ -40,8 +40,6 @@ REQUIRED_USE=" DEPEND=" caps? ( - acct-group/ntp - acct-user/ntp sys-libs/libcap ) libtomcrypt? ( dev-libs/libtomcrypt:= ) @@ -54,9 +52,17 @@ DEPEND=" " RDEPEND=" ${DEPEND} + caps? ( + acct-group/ntp + acct-user/ntp + ) selinux? ( sec-policy/selinux-chronyd ) " BDEPEND=" + caps? ( + acct-group/ntp + acct-user/ntp + ) html? ( dev-ruby/asciidoctor ) nts? ( virtual/pkgconfig ) sechash? ( diff --git a/net-misc/chrony/chrony-4.6.1.ebuild b/net-misc/chrony/chrony-4.6.1.ebuild index b331e0bd29f6..7805861241c0 100644 --- a/net-misc/chrony/chrony-4.6.1.ebuild +++ b/net-misc/chrony/chrony-4.6.1.ebuild @@ -40,8 +40,6 @@ REQUIRED_USE=" DEPEND=" caps? ( - acct-group/ntp - acct-user/ntp sys-libs/libcap ) libtomcrypt? ( dev-libs/libtomcrypt:= ) @@ -54,9 +52,17 @@ DEPEND=" " RDEPEND=" ${DEPEND} + caps? ( + acct-group/ntp + acct-user/ntp + ) selinux? ( sec-policy/selinux-chronyd ) " BDEPEND=" + caps? ( + acct-group/ntp + acct-user/ntp + ) html? ( dev-ruby/asciidoctor ) nts? ( virtual/pkgconfig ) sechash? ( diff --git a/net-misc/chrony/chrony-4.6.ebuild b/net-misc/chrony/chrony-4.6.ebuild index 2af18d12b1e3..e33e867ea9c0 100644 --- a/net-misc/chrony/chrony-4.6.ebuild +++ b/net-misc/chrony/chrony-4.6.ebuild @@ -40,8 +40,6 @@ REQUIRED_USE=" DEPEND=" caps? ( - acct-group/ntp - acct-user/ntp sys-libs/libcap ) libtomcrypt? ( dev-libs/libtomcrypt:= ) @@ -54,9 +52,17 @@ DEPEND=" " RDEPEND=" ${DEPEND} + caps? ( + acct-group/ntp + acct-user/ntp + ) selinux? ( sec-policy/selinux-chronyd ) " BDEPEND=" + caps? ( + acct-group/ntp + acct-user/ntp + ) html? ( dev-ruby/asciidoctor ) nts? ( virtual/pkgconfig ) sechash? ( diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index b331e0bd29f6..7805861241c0 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -40,8 +40,6 @@ REQUIRED_USE=" DEPEND=" caps? ( - acct-group/ntp - acct-user/ntp sys-libs/libcap ) libtomcrypt? ( dev-libs/libtomcrypt:= ) @@ -54,9 +52,17 @@ DEPEND=" " RDEPEND=" ${DEPEND} + caps? ( + acct-group/ntp + acct-user/ntp + ) selinux? ( sec-policy/selinux-chronyd ) " BDEPEND=" + caps? ( + acct-group/ntp + acct-user/ntp + ) html? ( dev-ruby/asciidoctor ) nts? ( virtual/pkgconfig ) sechash? ( diff --git a/net-misc/clockspeed/Manifest b/net-misc/clockspeed/Manifest index 966603f6ffa8..3509334583ae 100644 --- a/net-misc/clockspeed/Manifest +++ b/net-misc/clockspeed/Manifest @@ -4,5 +4,5 @@ AUX ntpclockset 1100 BLAKE2B a84e6d6ec78e8d0e9be34640db9f18cb6a15dfe35c583b3f1af DIST clockspeed-0.62.tar.gz 25797 BLAKE2B 3e409b09dd426dbe33a1aa27e08313bafb5f682ce4fb42740b88841bad2a88b6095e3b0d178c3d2b0f338a99a8ede03e00e79ce09559dc136addfd1d1e1ceca3 SHA512 4dae1cfcfc5eb1398fd5a7642ff91987487d9828d314d4bd9f93cdadc60fe99889280a7f8e9192674ed19d246bd4a450ad32b1258e450216111c488074db7978 DIST leapsecs.dat.20081114 192 BLAKE2B 71113068e1fce9a11b9acba1527d90f6977302b6d8042fe83522fc2fea260a15b18226bc34cd84637b00d0e58a24c24d6f9ea537f1064b82655647ad4c58e0b6 SHA512 c85634ce30f40a03ae45983ee29483fe5859f291a0a69835dad1f50459327b212b8187a0c2c18c9a27fd74f2d69ed0d9a556349c8b2833b9a30107ed259aacc7 EBUILD clockspeed-0.62-r8.ebuild 1172 BLAKE2B bfa0f55f24646ec2c907176353fb95dc8a2c153f9a3c184321aea112b8266e9b4e9ea5512d0a3d86a0f6726bc9a6c282deb2767ef92e2e72327c6c4c37649cf5 SHA512 2896db7d033118923b45898265533cd54969b930c492e92be3eecb0a359a11efe66a6d7e84a9491f43789c27ffbd73bc9e822e4e9696a5573b0f9547f8c51106 -EBUILD clockspeed-0.62-r9.ebuild 1219 BLAKE2B 54a08e5f8f3f818d8edc9c7a913ff0127e23a9c44019219ba765a494aeebf84b1ac8d434bff5bc37e27992a37349d58334c8b47d550b8ae02885f1ad8bd5d28a SHA512 665a0c26765d8a791c28ae71b885f31430a34c071b98ef020a134abaceaaa23f3711d6d20a5c45371b41084a4720ab7a78440b771c2cd76b4c1031a25c8d6c72 +EBUILD clockspeed-0.62-r9.ebuild 1217 BLAKE2B 1523d3c118c9f18a5cf80002c90bedc873344eb927e8728ac94e25255bf98cd36b0908f6a224d9ac0b026324cfa0d529de45f924a9b17508abab5c160fdd63d1 SHA512 73c9941a8f1d91f0f8d0c13041a0b96d6e337edfeee3ba8cdb8329c8a494048ae8f75b14380ef14b9f1b99328c7a21444209ceccecd8a7500f4b22da8fa3b222 MISC metadata.xml 417 BLAKE2B e179a1dcedba9631104d1f58eef7293f9a6e21574983849740f1fb0593f784a6138ccd1940382caa175431fad97aa32dcb18ff183bd54418dccd0da0e0fd860c SHA512 2ee16f79a9b12ac2ba6455c5d19c06ce7fc9ad67b4a51b231fec0e5d57b3b3f57d4e2105686822c98ced5efa2a7f28a3bf5fb9d39dfd0929950bc9cfb55a235b diff --git a/net-misc/clockspeed/clockspeed-0.62-r9.ebuild b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild index 5607768def91..a605c46179f5 100644 --- a/net-misc/clockspeed/clockspeed-0.62-r9.ebuild +++ b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://cr.yp.to/clockspeed/${P}.tar.gz # http://cr.yp.to/distributors.html LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~mips ~x86" +KEYWORDS="amd64 ~mips x86" IUSE="static selinux" RESTRICT="mirror bindist test" diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index be8209cf0ce0..de90259e7c65 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -20,6 +20,6 @@ DIST curl-8.9.1.tar.xz.asc 488 BLAKE2B 437268f6e5ba5db73f205fd87f3ded1e5fc200e8b EBUILD curl-8.10.1.ebuild 11392 BLAKE2B c62287914b25282543b8000a8a82f2ff82e65cc274ce2aa38837d4b919dd7f5f19d5da5330155731a431398e2bab5058fbfcfad3b0965f77943244719899619f SHA512 f08d3e6f150ec8efb2e155248a895b68c3295034f3362f114fbae4937d0c404fb2007ed0cecbf8a3fab137b2c53cccdee509fae179271b5120f79f248cf26ff6 EBUILD curl-8.7.1-r4.ebuild 11261 BLAKE2B 0d1acdce1b58e97d83ee0e67ac0e145894a1bd19e23635649bec06bcd6a45e6487954b497992a7039243ca6860393d2b5115caf2d9edab1a3fbefc46451e2c6f SHA512 687aa43ec10a118f2d53d8532423bf3ffc6eb1ee60f509c3677cc4afcfe1f871b87e18fa5bd045fa86570ae4285432da59adb5f0b548e7da6ed46c9d8a9ad3e5 EBUILD curl-8.8.0-r1.ebuild 11487 BLAKE2B e97f24d529bd6d41556d0584f3bc296754d9ec04b9080bd8ca1dfdce1e12ddf7c50683f2a9c6249b85392f9fd988a3707c04e2ef2bf4a7956390a394cbca6831 SHA512 8c8b3b2ffc3a4c2bb8d83f0da258e3bb664a365c9fc29af387b33df079658c0ec6cd148a93fc36c34c990bf98637125db1826415d3c34887e60f9a6458e2bba4 -EBUILD curl-8.9.1-r1.ebuild 11437 BLAKE2B 5c15af12e413d1ffe706d8d2a8b4ed61122385bfebfa371df5aef1c7c9c98bdb92435654514269f5edb8e47da16b11debeb26ea3f4bb0373cb22bc830a34b987 SHA512 046129a10d26bc2107c105fbca816bf41efda10fce9caba0f7d6d909ae7933909db01c2a736848ba2c5b91dbd0fdfac35cc0ca344707a1fb0b226ff6254e6507 +EBUILD curl-8.9.1-r1.ebuild 11436 BLAKE2B 337069288e50cd94f75b2a749e26fb3ff294a1ec61030e19539bbfea814ac0f6bf94225aa299596ef5edc4003336a2eb89fdcb6f3f30a4602a51bc30ddde6d67 SHA512 c8ed815844fcfccb3b22b548a59ede8eaf06a49ab3b55754c499d0a5c7bf165a49d30cf50eaae6996ff3b308c5086aa95a890612fc6716b1ea19a2f67ed84b99 EBUILD curl-9999.ebuild 11392 BLAKE2B c62287914b25282543b8000a8a82f2ff82e65cc274ce2aa38837d4b919dd7f5f19d5da5330155731a431398e2bab5058fbfcfad3b0965f77943244719899619f SHA512 f08d3e6f150ec8efb2e155248a895b68c3295034f3362f114fbae4937d0c404fb2007ed0cecbf8a3fab137b2c53cccdee509fae179271b5120f79f248cf26ff6 MISC metadata.xml 2215 BLAKE2B aa0851849ffda831aeec7a6315d23892c35680ab42c0bc9a5662238e7b8289d5f48d5f2a60ab0bacba06f71271bf60d14958bfec029a048f732d22fdc60faded SHA512 7da9247a1bbb533ae0bdc919f5bd2ad7ed298a7f9e986dce6d2471cedeee9f1542a8ef79b1fdbca5a1a0d33194b99ff3d3f5c27054ac01a3f1e40a1e94d6c1b2 diff --git a/net-misc/curl/curl-8.9.1-r1.ebuild b/net-misc/curl/curl-8.9.1-r1.ebuild index 8e993f5f0233..cb175aa92671 100644 --- a/net-misc/curl/curl-8.9.1-r1.ebuild +++ b/net-misc/curl/curl-8.9.1-r1.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 ~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 ~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 38e6a3a9989a..1c7390e44099 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -8,7 +8,7 @@ DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 4afd08cf7377b2262d33bf3f7ac503e081572a7 DIST dhcpcd-10.0.8.tar.xz 272116 BLAKE2B 1bf27387c13f192c6216e2f1ecad06bfa82267d5d6e08ddaa123789699fe9154222c33b1aa1f603e65ae8dce510cb24d48e72701494e0793c766e81f024f8bc5 SHA512 8c9bcd49a828dbc1089f49b73decefb6d1c3ef47fecaae242b08e3bdc8c3c49540d1d3551ab879d58df0dca64dcc64d7a29c665d1b1ebbd72d6a52662529eea4 DIST dhcpcd-10.1.0.tar.xz 271660 BLAKE2B 9d47ae8b97ba082f980966a2c3f688c6a8addb10989c166dafebdb6491793815c4caddc3016334f6549923632fd01fc8ce0987eca31af01948b0f4a643f88b38 SHA512 25b3304471c85975e004f101fdd8dc6155065009e9d94719aadc6181717839c501d66740f002aa00acda73cce3c0d924f4241eed177688c4e794be301b059e04 DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee -EBUILD dhcpcd-10.0.10.ebuild 4928 BLAKE2B d091a9b7abdbca46dff1d9da2797a910719d62111e5a0a2f406e5c077096a389834e6e431c5d6dfdc267c774076390db736cd6e70bfd69adbeeec8c1285751ad SHA512 79abd5f89b642c6bb6acd07c8bbdf17c601f042e27592ab0c49bbbe7f64621aeabfaf2dc0e4551e6fbbd88be5905a14938b6c2fa77fdaf776cf5794ba8ee477d +EBUILD dhcpcd-10.0.10.ebuild 4927 BLAKE2B 3dbfb502559abb44bd51cc3f732ae5610c493fae91f1b16e60428ea3ef31922c3d2ec4e75a040b5826607e411c07604d675fc8762c8008ef79982a0adc1a91a9 SHA512 1e4404ce6a14ec4e0bddf7d3eb169fcc50dc91e85951955896380b4798d28a97b02c7b35ebc86453a70f2798d4e72ce6b363ecf212a679f39865fff46987003c EBUILD dhcpcd-10.0.6-r2.ebuild 4908 BLAKE2B bc0e0e9861b2be679817a74bd7ff749038dd04f8653d7ca13732602c3184ff9728b1b6efcfb411972e77e425f444cc01b084dc95cc4310e82da32667151e1d36 SHA512 480c9c9c4d74bd0ff52e3efb339d73abb2ba2b2fc8373e6f6f2aa2075d628d6e230b0d707f5bbaf6581b86759bc561c708bf962f1e6a6cfe07f53cf267e5269a EBUILD dhcpcd-10.0.6-r3.ebuild 5147 BLAKE2B 9fefbb6c238edf8124d7a015954f6e3aab60870fe91664c705d2df6ee5a8e9694b542cee7fece90927ebbdb50ff249d5cbc6c928eac9938475b36fbc07280ea7 SHA512 8a3b7fb39663b07481239d2de7d4b8d6449e38b7f8024c280c97cdbbf1da59a031c1d23ee24fbc9af37565efe67eb8c3bf56e64568f761e26ddada8a76bcf388 EBUILD dhcpcd-10.0.8.ebuild 5055 BLAKE2B 84dd290736fd5df2b1eee34233f906938928d2346e84e83893153db86a6bb66827913ff1e48eac5f47ff4d122a3c32e3782a977e7129c3e751d4466cb34d6ce3 SHA512 2905b9d6f5a8c12a801423972da34f6a0edf568ab48814b8d4cdfea9bc1e660d67444cd52162efc8cccabd3962d6be915c7bfb0dd69a4d1c501166d6f77a068c diff --git a/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild index 124741db8ce3..4a63060cb6be 100644 --- a/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild @@ -15,7 +15,7 @@ else 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~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" diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest index 9fba0eadee42..1965d1819040 100644 --- a/net-misc/dibbler/Manifest +++ b/net-misc/dibbler/Manifest @@ -6,6 +6,5 @@ AUX dibbler-client.service 134 BLAKE2B f425f3460ae1188b2a391e240dd8f64e3ed9b8114 AUX dibbler-relay 348 BLAKE2B c9a8d1f2b130e00e9d0f4ad517fc5256ec1d09cde6b66c8641cdf6b171b170944866842d76a4619f2294dd30de9670dc45775d16253e96a1ee4a668ece576285 SHA512 5eb62c4c7e9a4c5b558d0fed79a41b5a2db996349ab5ebfdff2f50d2bf0ba0e4293aab1a9bb089014aacaa3a502a7a13c14b3f3fe9510d1c0d91fca2b0674745 AUX dibbler-server 354 BLAKE2B 08b1177bbe9f3f1f1be809dd9f3617368257072e22ad6fe1e1a671429a2e488ac47d2902defd34b60b0adf9b6aaf0db119c8edb4c4ce8d510df8e0f0a8b260dd SHA512 3d2f1df6263e3373988d5ba75479a7bed16c3a363809fdde582afeebab0cda746c91d02f8a9535e15ed1095c098f4ab3721322092bc692e0403f8c46f16adcd5 DIST dibbler-1.0.1.tar.gz 4375118 BLAKE2B 1418a20ecf96f0793b25165d2790bb12aec0dc9ffbdf248f996f736e375f466a5853f698bc3da753dae57db4493a662cc8962e5d1fb6d9dd7c0c9d893128773e SHA512 2369d4a3ca50a1c60bd5a47bf4168d4c113e2fdcb1ae4d937a3bf226c057142f2e81f6c46bf4e1dfa9ca0d2e92f7f857572a4bfb0d0dd721c35efe762e6c3ea0 -EBUILD dibbler-1.0.1-r3.ebuild 1496 BLAKE2B 124983839c7e8d03d2dbfb2d2918a6a3a199103d023eab28f390ae642b03c7ba221997947f9854b502e3998e09fbe8709623e295fa83d7655f013e1d4bafaf28 SHA512 d63eac62060c52868894a978220ead74436e533a49d4ec439f137dbba40e637fab7efb065233ea303cba6d2f21d5d842f6bc336c8525d2dd740d7dfb4a913f60 -EBUILD dibbler-1.0.1-r4.ebuild 1583 BLAKE2B e09ca17bc70657d26517df03180fc02546944a365394de71327b32b4e4fe7875d381b3bdf847784120a4b8679d3e9b9121886a497d841457ca88896ee0febcec SHA512 21e100c592326650998ea9d44bf8336bd5036d870e622edb4070ec0c21c816f0dd6d727647ff9e0448f4a2a069315e6df88f4bd04c3f1e147e3f33eacf65452c +EBUILD dibbler-1.0.1-r4.ebuild 1581 BLAKE2B 70694f774c304384510d9e6c3ee1954b75137cefeb0b06ff442dbf768b033d297fea9ca673046f0e66a5cbfc0377b4194853485041bd04e922cf89e6d16573b5 SHA512 08cdcabd99b4ec15135b321ba56f09bca3f91c84ca0f24f79a1acd21083f97278d844aee3bf74b2a307a88ca209552d914004a6bc2e8a5088cc96de20394773e MISC metadata.xml 351 BLAKE2B 51aff11f362c4c0e745e34dbae88fcda3e9659536002bed0f2b4fd0cc6f41850be26c953a42192622e9a92876f1a0f2ec9859eadbbf8e580357bb370d81d3e12 SHA512 8f50b3f2c45a785458bc463af6e904de6649a3d4b4635dc63dddcbb37e8d792a4bc6dfc71fa8115aa62ad1521af692b1c57c4638429fc204f98c9423bf2f9eba diff --git a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild deleted file mode 100644 index 0568063a62b9..000000000000 --- a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic readme.gentoo-r1 systemd - -DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)" -HOMEPAGE="http://klub.com.pl/dhcpv6/" -SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~hppa ~mips x86" -IUSE="doc resolvconf" - -RDEPEND="resolvconf? ( virtual/resolvconf )" -DEPEND="${RDEPEND} - doc? ( dev-texlive/texlive-latexextra )" - -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch - "${FILESDIR}"/${P}-gnu-ism.patch - ) - -DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf -to suit your needs. They are stored in /etc/dibbler" - -src_configure() { - # ODR violations, bug #861611 - filter-lto - - # Uses removed 'register' keyword - append-cxxflags -std=c++14 - - econf $(use_enable resolvconf) -} - -src_compile() { - default - # devel documentation is broken and users should consult the online version - # http://klub.com.pl/dhcpv6/doxygen/ - use doc && emake -C doc/ user -} - -src_install() { - default - readme.gentoo_create_doc - - dosbin dibbler-{client,relay,server} - doman doc/man/*.8 - - insinto /etc/dibbler - doins doc/examples/*.conf - keepdir /var/lib/dibbler - - dodoc AUTHORS CHANGELOG RELNOTES TODO - use doc && dodoc doc/dibbler-user.pdf - - doinitd "${FILESDIR}"/dibbler-{client,relay,server} - systemd_dounit "${FILESDIR}"/dibbler-client.service -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-misc/dibbler/dibbler-1.0.1-r4.ebuild b/net-misc/dibbler/dibbler-1.0.1-r4.ebuild index fb3201a46045..84707e2e900e 100644 --- a/net-misc/dibbler/dibbler-1.0.1-r4.ebuild +++ b/net-misc/dibbler/dibbler-1.0.1-r4.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=7 @@ -10,7 +10,7 @@ SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~x86" +KEYWORDS="amd64 ~arm64 ~hppa ~mips x86" IUSE="doc resolvconf" RDEPEND="resolvconf? ( virtual/resolvconf )" diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index 5579558081ca..dab7f70aacf5 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -18,6 +18,6 @@ DIST dropbear-2024.86.tar.bz2 2306244 BLAKE2B 988e2cc03c123685c93ab8b1148b1844ce DIST dropbear-2024.86.tar.bz2.asc 833 BLAKE2B 5fc35fb4135f099c2204972d3fc365b01b2622eeadf4cf6093496176e5a4010c1fbe36056036fe370e1a1ffb05d86293e212d935a3b4c5d8b0005eae09423edc SHA512 b7dbae281b21d5d1dfbb311f6a94a2c1acd3ab44a3293baffa885194d24721ec8067e907b414ebc0b5d77bb32c511fcd5c31008b6622b946e8d253621012836f EBUILD dropbear-2022.83-r1.ebuild 4433 BLAKE2B 6cd0edb8789dcabbfaaed58db535ee6bca645ea687eb2e2d5f15d0fd16b370cdd1075d99960315492182065219b11823101db489233b8ea26392f0c4e9e41776 SHA512 61ab7e9ea1856586e8e15e4089be296a2d2730fe236ea3d07ddf2652ec3cf123d07ec782d0d7bb51e96ef537c09b4421f83a6ef04fa5253e4536740aa66f3854 EBUILD dropbear-2024.85-r1.ebuild 5062 BLAKE2B d6c63a168ef0e040794cca2cdbc4b77ad386bf34f3c6d3073d5d7fd30ebec8af213f709958e0832fc626e2c18bd38f5fcf1bca4b7573ffe28fa2c79555720af5 SHA512 033e4d740310b0ab6efd00ab1df08239058b613f31843aa679015755c25c75c8dfa248efe46ced583eb52fbe6f9c9d817936a9f4cbfb2f4de4e1ad6cfbd49ab3 -EBUILD dropbear-2024.85-r2.ebuild 5406 BLAKE2B a818f64c8f8cef6e88634b7bfcd32a044941cc75e096f1f59a6dcdb0ba84ce1b789f847413dcb18ad07f2a48d93ec876c488e1a9a25bbfeffb01bfed27608cb7 SHA512 be7e426b3b49a1d8af7a81212564caff0390beb9a30e056cfd12931808ec4f66b72d3377e4970f7e7a2673f26ba8cfa3ae5ff8e020323dd6fe79325bf3c66054 +EBUILD dropbear-2024.85-r2.ebuild 5404 BLAKE2B bce5d3ac239a165f356ecaa525b46030c3f31094220c8b43ceeea219a445d2314ba19a4d289eaf25ae00c8a5a65970d74b75a588a391f2adecef45ac0db70e11 SHA512 75040e4392091ea25db242997d04a3b894807699c58ecc6d7909bb5b1fad289b9d83de399c1f8154d8df21ce27bb095e71569b2f4f7a0bc63e901cc8ec6f5331 EBUILD dropbear-2024.86.ebuild 5558 BLAKE2B bab3a449dbdecc68138de6e0c40e0b1b4becdcfd9a805ce9cd2fcc42aef8970afb282147480b58f9eb11156dbfe09be02de7563238c2c53bd7ce52644145cd00 SHA512 b3a560c5f3d5edf7c63739940e058e9da37df3e5509bd38f0cc59977688b8007bed87773fa61d1fb27a90849ab27a46a6f7e0f9371b2776e4f6c4fa208fc3693 MISC metadata.xml 1866 BLAKE2B 820902b27de934f6d7f0edc5d9f8c7bccf5c5f51d0e81ebd13fb53d6ba9e385c924d4fd0a191096fb191c253800227ff6b30f7bd44edfb532307e7076f39df8f SHA512 8e073a34877f230207ef391084b99014db9482aec680a1b292ac95e3bade426ecf362092337b7fcb19091f273085a06ae81cfd7d5e69a46a28067ae68f615cd4 diff --git a/net-misc/dropbear/dropbear-2024.85-r2.ebuild b/net-misc/dropbear/dropbear-2024.85-r2.ebuild index e5e747699863..282d72502f91 100644 --- a/net-misc/dropbear/dropbear-2024.85-r2.ebuild +++ b/net-misc/dropbear/dropbear-2024.85-r2.ebuild @@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? ( LICENSE="MIT GPL-2" # (init script is GPL-2 #426056) SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib" RESTRICT="!test? ( test )" diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest index b43a896cdf59..57714a5d5631 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -3,7 +3,7 @@ DIST gallery-dl-1.27.5.gh.tar.gz 722422 BLAKE2B cd15c00549e9ed9605b39b76b271932c DIST gallery-dl-1.27.6.gh.tar.gz 730206 BLAKE2B 4b47cb50599d401e3b3edf726afbe175e82b1617397cdd9c0ce389f1e43b16ece6d94dc44a015e515bb3e397f52b11f863e56b12fccb3bedc8e5d9e39fd90bcc SHA512 a72c30e0c7e64fb7eb8fd2b5a8de0c0b1570b5c2fc13adaddeb0a1ce9e721b299132b2e7ebbf932155b8880283c1b3e2783e037151557a167a8664ef01cce0f8 DIST gallery-dl-1.27.7.gh.tar.gz 738516 BLAKE2B af29a40de14c392101c50698ae2199f64b458c8e5ab997982625773f21b069d5b3133c1a7897a743255962c5494e0536f36f4c4067872a06761a5a3a333e44ca SHA512 384c5a5c7dfac01ad48dbbe12750e5bec5814620bebd1d49866a9a3b6d64f7aac60e4173f737ed2678c6d57e372b6957cb747d28444981a4ddb7721bd4f9cff9 EBUILD gallery-dl-1.27.4.ebuild 1137 BLAKE2B 6bddf5d2f20b3d3d9b480e3e7fee9a1d16790ce228a9080a30cbe0849ad027965eb86c0fe629f60099d84dbd65ac6c59ddd79ed43ff9ee234b4d8099b8b4c124 SHA512 85b53fc950769856e4d17aa0a359004e10e3353c9c627669db03e9fb71beec64d499fc76a844d65c6ab079bdd1c57486448fe6ba1c5c44eb39b374893c6e5f13 -EBUILD gallery-dl-1.27.5.ebuild 1144 BLAKE2B 8ae03c0e61632d87295dfff8aa25382716fd107415260bf3142a6ec0c5c9601cd219c03696e0e97bb9d0efe4e26dccad3be782473122f68f6fa9186332cb66d3 SHA512 f5761a87af190e6e5e259ea4c4fdb3eae2762c09632016842e5a5a10147510b6960f34255cc3c5aa175b6fecaf2e74bc89ceb7c6beb853c05696457f0a8a7668 +EBUILD gallery-dl-1.27.5.ebuild 1137 BLAKE2B f572a713f9a7b56f6c167b8a9ead10cd4a702e3e5f2ba106bf2d2f238b5583b6ac3a59cdae6be7777d5e99a6155e392f20efe0ce99e17ee27b0076c7ec782a78 SHA512 b6b65910d0a220cbf1df9f92ec2ad4162dc2c70ec399cf1e7d1982faba7a0f81e7d22ef479dc8d468c32d4320b17555254fb0eb778bf455f0d9dc72128e08e3d EBUILD gallery-dl-1.27.6.ebuild 1144 BLAKE2B 8ae03c0e61632d87295dfff8aa25382716fd107415260bf3142a6ec0c5c9601cd219c03696e0e97bb9d0efe4e26dccad3be782473122f68f6fa9186332cb66d3 SHA512 f5761a87af190e6e5e259ea4c4fdb3eae2762c09632016842e5a5a10147510b6960f34255cc3c5aa175b6fecaf2e74bc89ceb7c6beb853c05696457f0a8a7668 EBUILD gallery-dl-1.27.7.ebuild 1167 BLAKE2B 9dd3c132317169d2e1d91c097399cbc6b70497472d7bba764133e43e81c5f89853779dde55e9dee71dfaa699ab1c79b72c91c27c9134b90cd7b16b8e1942cdd4 SHA512 70f0ed192f07d6cc9ac4bf58bdfeeae52ec16c5b3b7eb53ff435331bad41ccb3d2a968df714ef8ab1558bc78154245b1533063bfdd3a37f97e71c6d6444c9f58 EBUILD gallery-dl-9999.ebuild 1165 BLAKE2B 51e7568c9f9e34ffdb20055f96ca9b91ce2f6831ea304028c88c43dfd4fbda0ff8bbaa310553e73a1b73408c12c2633af18e09e53e0127034f257ab6d90c7cee SHA512 0948a7989105ff3df14ccb9b71aa3cce1e67e053e9e52ea6823afca40863ea8fd16a50d53fea4b2aff9020bf7db110bbf534a85fca184d730999835b305bcfac diff --git a/net-misc/gallery-dl/gallery-dl-1.27.5.ebuild b/net-misc/gallery-dl/gallery-dl-1.27.5.ebuild index c785e9eeb31f..c166188396ab 100644 --- a/net-misc/gallery-dl/gallery-dl-1.27.5.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.27.5.ebuild @@ -20,7 +20,7 @@ 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" + KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86" fi LICENSE="GPL-2" diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest index 8c12008d5b1b..089f6c2aa298 100644 --- a/net-misc/geomyidae/Manifest +++ b/net-misc/geomyidae/Manifest @@ -1,5 +1,3 @@ -DIST geomyidae-v0.34.tgz 22242 BLAKE2B bc25f50c49c10e5a04b83a12cdcd7546b33f6a7d93eab504122bcfb2fdacfbcb82205890d5fd999d1b8b681c65dc0ef0dc5f95ea2d56a795fa371031c4af43b8 SHA512 55b7845c8b9fbee70b2e2bd71d2e3bb8e34c3029a1ea410cb39750763c81d5c31af8c703f7b673aa28fbfd61dd7915300ed4ff22f94c8430ac754681bc30ce41 -DIST geomyidae-v0.69.tar.gz 34631 BLAKE2B a1d7e33d403df5d6bb4d5fdc0999fdcfa94da058dd5dc1c0f22c49b9cc1b06cf45fafdb839eb91dec78be0aa778e3a74bf26d8ffa5054d45e5c6e86918480ad4 SHA512 c66f751472c35107c2c91f1675ab40bf68da1d3d5742ec94125c8ecba54b2832e82c8106a3627da53216cf3802ae7900ef8457c383160614ecce2a07b318662a -EBUILD geomyidae-0.34-r1.ebuild 1092 BLAKE2B ac44156e892812b7c00ec072999f3c86a0d68f02c2b7dae9826778586d6486b9d0520627f2ccc89babaf2f310e8ced288e9893740c2be6a65861a89b2648cc70 SHA512 49a96889f0c256ad49eb7e7e6e424769ec40932551416ae89ebc23a19dbfa9b3e63257d354d1b4d5c056087a06d862feeec168750a57483500b8870ecf16ffcf -EBUILD geomyidae-0.69.ebuild 938 BLAKE2B c338eaa89241505ddb2e4079d2cafe72f01eee13674c9ea8c99fa1b8ee106ee93909094e93e770288bfab2c38337ac57ddf5c684b12f9b52466bb651adc9f62d SHA512 2eedcb6e80195eed604fda396f72170d398a20e6bffa114d9735e22c80f2e376beaf91719041a7c108e7b75d7dc643a145445027cb9db6c5404059115aa224fb +DIST geomyidae-v0.96.tar.gz 38373 BLAKE2B 30bc409e8a124a6375ef113919f6b78fcb59103243237e57951ee0cc2907adf9a45168e7ceed55cb29af09d83e96a2e8f6123ba4586e4f216dc1eb4eb8f031c9 SHA512 3c73baca4ae3a58dfc2b064c448ec7c1d34b110f8b88c301a4287d0565ad22ee1676a5cf18707771bb26352291f04586276d5dec74c10b66d3a1c340805afc91 +EBUILD geomyidae-0.96.ebuild 1023 BLAKE2B 96ad856de8713aab625a5aff1e81137b4f6373bc0d4958df9242cdc562d0c4166c818d62b8c8848a3340f1897c2c0a92058ff765c9f5f12c1ffaf08b6706094d SHA512 c44e619ffdb268fa2710e16d5f278e2885fd95cc7f46b4ea2d9005417c0d1072c0f0d14d0b5316e8ab62c91b788403214394c9e05c45a899f4a36a6ecdfa2912 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/net-misc/geomyidae/geomyidae-0.34-r1.ebuild b/net-misc/geomyidae/geomyidae-0.34-r1.ebuild deleted file mode 100644 index 36930da5891e..000000000000 --- a/net-misc/geomyidae/geomyidae-0.34-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A daemon to serve the gopher protocol" -HOMEPAGE="http://r-36.net/scm/geomyidae/" -SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tgz" -S="${WORKDIR}/${PN}-v${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -RDEPEND=" - acct-group/gopherd - acct-user/gopherd -" -DEPEND="${RDEPEND}" - -src_prepare() { - # enable verbose build - # respect CFLAGS - # remove /usr/lib from LDFLAGS, bug #731672 - sed -i \ - -e 's/@${CC}/${CC}/g' \ - -e '/CFLAGS/s/=/?=/' \ - -e '/GEOM_LDFLAGS/s:-L/usr/lib ::' \ - Makefile || die 'sed on Makefile failed' - # fix path for pid file - sed -i \ - -e 's:/var/run:/run:g' \ - rc.d/Gentoo.init.d || die - - eapply_user -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - dosbin ${PN} - - newinitd rc.d/Gentoo.init.d ${PN} - newconfd rc.d/Gentoo.conf.d ${PN} - - insinto /var/gopher - doins index.gph - fowners -R root.gopherd /var/gopher - fperms -R g=rX,o=rX /var/gopher - - doman ${PN}.8 - dodoc CGI README -} diff --git a/net-misc/geomyidae/geomyidae-0.69.ebuild b/net-misc/geomyidae/geomyidae-0.96.ebuild index 3bd6b1bc1db3..0ca0e14bb6b9 100644 --- a/net-misc/geomyidae/geomyidae-0.69.ebuild +++ b/net-misc/geomyidae/geomyidae-0.96.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="A daemon to serve the gopher protocol" -HOMEPAGE="http://r-36.net/scm/geomyidae/" +HOMEPAGE="https://r-36.net/scm/geomyidae/" SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tar.gz" S="${WORKDIR}/${PN}-v${PV}" @@ -15,12 +15,13 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" +BDEPEND="acct-group/gopherd" +DEPEND="dev-libs/libretls:0=" RDEPEND=" - acct-group/gopherd + ${BDEPEND} + ${DEPEND} acct-user/gopherd - dev-libs/libretls:0= " -DEPEND="${RDEPEND}" src_prepare() { # remove /usr/lib from LDFLAGS, bug #731672 @@ -32,6 +33,7 @@ src_prepare() { } src_compile() { + append-cflags -D_FILE_OFFSET_BITS=64 # bug 927733 emake CC="$(tc-getCC)" } diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 1b7ea4ba9ef0..09825f57e34f 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,5 +1,11 @@ -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 9.9_p1/0001-fix-utmpx-ifdef.patch 1319 BLAKE2B 7fef0934a923d7029a42184c615e3a33d20b2e35bf379ee94fe7ac87cecf62baf95a2d59c04e005a455ede3f00d00ee9537d3a55613cdf348f1b80d54033a97c SHA512 9419676d4fb4cffd1fa2f7783aee9821a481ca0c6a5db9c174013fa9e4658add128812b0a37634d4757ce6a0b4ce067540deec2f700e55849b744eee7f533dc9 +AUX 9.9_p1/0002-build-construct_utmp-when-USE_BTMP-is-set.patch 1288 BLAKE2B b4ec28fbd21f6a18744551197017deaba86edc2afbd8622049c9d5792ffde51fea540122fbe629480d1ac00941488baac99540b6b3dbfc23b599d7404baccd26 SHA512 41c34129787603de964730a1c1ec0bd4f09b78b62dae93fe388f5a5df5dbf76bb6b30c9460fba6958c55ab0c063d253dd7f7600329ffe0cb8af1e2c150d2b73c +AUX 9.9_p1/0003-gss-serv.c-needs-sys-param.h.patch 839 BLAKE2B 41d0da668de772168c8afd49b7482034e895de02453c7807396ba0e3c8995cd0440e18a4f6cee4531ea4441657a330f8230dad340601619225dbe8da3bcde7ac SHA512 eea92f16aa17bb63babec3cddd5e502087ef5d0e60492ecec43f1e37edb39e356b9320aedc0cbd88f91a8394f1a0df3c59e1b1916c0f7a64e859b03afb3b6ad5 +AUX 9.9_p1/0004-upstream-fix-regression-introduced-when-I-switched-t.patch 9646 BLAKE2B 6e66bf21ab8fbdf0a15df950b7948cd7bf59715e0052df5e024df23ff9f93cd9601a510dfe706a478dc0dbbc1fa5ec386720eaf8d613d0791aae1d60066ec95e SHA512 0bc88bd7ef34ea3949dd55037b77c9b15dea4f84c2f445bc211c21d9e0848b7f1263863d90791105afd41760aaac5ce4cc03d4f8fa100770c5b1530a54d4b21c +AUX 9.9_p1/0005-upstream-fix-previous-change-to-ssh_config-Match-whi.patch 2659 BLAKE2B c57bb2a508cb3a0ee3c930b02bfc8683c36f24f25f06499ac06a9dfbd7f46f45ba811a008cbefb4268822f6289026153e35212128ee3b05f837960e0926ea624 SHA512 bc46bd04d7e2347a3dac2ac10c94e62f0f1255f0bd32c6504f32fe27b38fc738608f8f8f1c5fcdfddd52c9bd9423caa77ab74a176750632712c98aa96f809078 +AUX 9.9_p1/0006-upstream-fix-ML-KEM768x25519-KEX-on-big-endian-syste.patch 3308 BLAKE2B 0be42a828227fc709bcfbf3edfd1730ceed47a4922ca91f7326133b59fb0f39d04d3c9d291f7c4eb5def7a2eb9fd3f49b25998aa8c69f1d055fa2f6eb3178e55 SHA512 169b3b3c867b2e151fc29058353a0371a6501d9c94c97b7e68bc939dada55e9952d561aafd372f4e6ab03002941b8db5b3ea71471e9da1fbcc3ca211ffab721d +AUX 9.9_p1/0007-upstream-explicitly-include-endian.h.patch 1238 BLAKE2B 72ad94fac5b753494de022fa6f6452f5b5bc1dccd6b6fc170335867867910ee51bfdb4a600716f1da97e06bc09e60335bfd98cebf0970273d662552736ec9636 SHA512 4f24e2b5a425622c244ba469f89165d474b35d4bdfd82ffa3bde335de2581c789e36a3f05d3476bdcd179fff5e8ff47a1f789c0cd00631be7191512989fb09ce +AUX 9.9_p1/0008-htole64-etc-for-systems-without-endian.h.patch 2186 BLAKE2B 12a0f652e3cfd7d739efdfdd40588a949eb2e107977f0fdce9fced131164e73dc6d859cb14dae73c1dcd9aa0841e109f43da513525a7b11305256eade378ebf7 SHA512 393b2240400294fa7d1bb83bc9714fdca087c94465ea1258637d6d7bc1ea4aea252472302d526e1212af3277fdf3b6e02d0aa87d02114d8877feed1c9c7427ba AUX openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch 1647 BLAKE2B 9d55e9060e6eae041176bef27acc58d6026c8fb68c65c71c11c1acbe4e6840a63fba3dbc113a8981da66901717c1f3b4f2211a2cb322d3d4e5eba8c86f4e269c SHA512 d8fc604795d8bb4228ccbfe5714d5503bb1e0d63818d2fac65d533530d01fe4ce4fac0743b8b415f646322fec859b699fa7365beba8a42bd880d737b7c6bd7df AUX openssh-9.6_p1-CVE-2024-6387.patch 508 BLAKE2B 592b671107692b2be1e181e0be60b693485b430355f77dd0da49ad63a26824efac82ac09d58d0ca6085b3af3204410a5433409dc880de91212870d3a520efb75 SHA512 86083f30781df293666442ab597a8c16f6e84581be4ea4371c32aeeac7efb985b78dcb8c9ae749b6747d196c7c90cd99cd946fea0cf990f06446a71ff9465858 AUX openssh-9.6_p1-chaff-logic.patch 696 BLAKE2B c4823f78e5cc381fb65e14512917965c0118490e5b430a28f0322fff013b7b0f40f8a0b664e748a3c1317776f22ed1411655c2fa52532c444741e8f600b582a7 SHA512 6a839546c618f00c297ac9b5b2ae46bd13ac495e5a093a3aa4d0cda81152db94706c4e9ce6b132a038e4febd05b7c19693c98ac91cc142073a06d9960efe29e4 @@ -7,6 +13,7 @@ AUX openssh-9.6_p1-fix-xmss-c99.patch 696 BLAKE2B db9ad0e9340ee241d28310b438e90a AUX openssh-9.7_p1-config-tweaks.patch 1032 BLAKE2B 52f20d412722b00a452b92c8b45a8884b3e8d76c05be45431de3c7a0401dcbbf4587b65703e28a389ee05066af73cb6c1845626342b059fac463dc2ea38d0535 SHA512 bfc39aa573dd3934bae2a496a8a730f99dd7d6217c4d6e146ca4c401151f5e803f704719f29213548c67db015ba9f4cae749dd7ee5bc3b8cee0395892abae01f AUX openssh-9.8_p1-inetd.patch 895 BLAKE2B 4e64abf32c0dd8ff9ad742bc2c230b9330b5994ecbc3f3c559f929e73992ea69d3085954cfa571c9a2ee33921d2eeeba5e7031808a87583003ca914e4927bbda SHA512 7a6f7c035ea0284deca7d5de30580d621b2ae3d6a51386a553f6adf7f6209b000a1da588f0c5b865c1d5e82f79f3d84d3409532d42e367702e99b321b08bf3fe AUX openssh-9.8_p1-musl-connect.patch 478 BLAKE2B da4043516412f5cc443c06c1f1bbd090a29408d774959e7f8cc84cc5fdacbfa927b4f89c53c9320334e7c715b6e9f24a8abff1d44adc5f0bc45b9c0432729cc8 SHA512 1953656561e952659fd38d8be96421945040c4cfb5e144bfccb77dd755adf72b6e1ca7751139bd6b20d1bafacab70c606b9e274aa7e091e437b6f399dc9e2352 +AUX openssh-9.9_p1-x-forwarding-slow.patch 2296 BLAKE2B 463f2cfb493e205bf421d5aa9f6cc70ed0e11ecd6debc629dd13bddf11b3c1d771a209ddca1513a221b3cbdca92ca7102dddf56d43d055376a8d329019ee2806 SHA512 c16f8fe16ab2f9eb86960b3b88fd063d85adb76452ad8290855e52270886aef865b385849bc0dfd95567b49e72529b8208493dba6cfd405e18a344a16f96c406 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 @@ -14,15 +21,14 @@ AUX sshd.service.1 298 BLAKE2B 7a4f2e2656096b09a8b435d393ea9b0a7bd10a2a9f0e9d9cf AUX sshd.service.2 282 BLAKE2B df9efc9bf73c0824bd0e290bf8e5ad442003461013fa30c18beddfa5760f257274aaaf045f845ee8700b780c8b792b02bb9e7d458d77fee48dbfb6da55b34563 SHA512 24c04f0608b478b3aa600a0bdfeb31b196bd9524fdd9c78bcbef5f603a797e17ffbf2ce503af707800b67d789b24fbe1ce15e87df58003752156709d497fca3b AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42 AUX sshd_at.service.1 163 BLAKE2B b5c77d69e3860d365ba96a5b2fe14514bda9425e170fc7f324dcaf95fb02756ef9c5c2658904e812232f40fac9a3c2f4abf61b9129038bde66bb7d3a992d2606 SHA512 fbfe0aed3a5e99f15dc68838975cc49a206d697fb3549d8b31db25617dc7b7b8dd2397d865d89f305d5da391cd56a69277c2215c4335fccb4dd6a9b95ba34e2f -DIST openssh-9.6p1.tar.gz 1857862 BLAKE2B dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd SHA512 0ebf81e39914c3a90d7777a001ec7376a94b37e6024baf3e972c58f0982b7ddef942315f5e01d56c00ff95603b4a20ee561ab918ecc55511df007ac138160509 -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 DIST openssh-9.8p1.tar.gz 1910393 BLAKE2B 3bf983c4ef5358054ed0104cd51d3e0069fbc2b80d8522d0df644d5508ec1d26a67bf061b1b5698d1cdf0d2cbba16b4cdca12a4ce30da24429094576a075e192 SHA512 95dec2f18e58eb47994f3de4430253e0665e185564b65088ca5f4108870e05feddef8cda8d3c0a4b75f18b98cc2c024df0e27de53b48c1a16da8da483cb8292a DIST openssh-9.8p1.tar.gz.asc 833 BLAKE2B 5291e8c03ab9a75acb44285cd7fc010f4a33551f142499624165dac708fc05a6d077df81555aa41037b45f6301e4e5db3161a7a23404473f8a233a877fc55cc3 SHA512 4df1f1be2c6ab7f3aebaedd0a773b0e8c8929abb30cd3415873ad55d012cfa113f792e888e5e772dd468c394aeb7e35d62893a514dbc0ab1a03acd79918657f7 -EBUILD openssh-9.6_p1-r3.ebuild 13801 BLAKE2B 4483277dc2e73669b743546e14df4ee7f1b062f8e53b18ffcc7b3fdc656285ab9281b392e07cece524962719d241f5947bacdf39f024e590c1106104e152f865 SHA512 26eee803341d795eff6dcd31de69cf0bcdaa24644afc9ab1bd30672a6dbda611e643e049013a6c6c5080060f020a909043ce729d664fb8c29a902de8683ed749 -EBUILD openssh-9.6_p1-r5.ebuild 13943 BLAKE2B 59a783eb88fdf1bf01c60aa9ee348831d981d3f0ada4fbcc3b7879f56255a12453999a1751fd999192d8dd408f3d623a72c5c707db09bb900ce477854048223e SHA512 cefaacbdf31d91bcd8323bf55811ed66f7fe7f170bbe85f45cdee683886470ae764b39c368225c39b84ec79661ec3289d1cbde2ab385ccdb72060d6ccce8b12b +DIST openssh-9.9p1.tar.gz 1964864 BLAKE2B 817d267e42b8be74a13e0cfd7999bdb4dab6355c7f62c1a4dd89adad310c5fb7fe3f17109ce1a36cd269a3639c1b8f1d18330c615ab3b419253ec027cfa20997 SHA512 3cc0ed97f3e29ecbd882eca79239f02eb5a1606fce4f3119ddc3c5e86128aa3ff12dc85000879fccc87b60e7d651cfe37376607ac66075fede2118deaa685d6d +DIST openssh-9.9p1.tar.gz.asc 833 BLAKE2B 0e19668eb5cadea0e7b06caf2bc2f4cee7e7656a780a128090dcdf2acc25c6e0e0fc7c4c83c95ffcd567cd03941ec772b0f5b273e6f79ff4e440e1d9f22bcdb7 SHA512 916e975c54eb68c0b2f0b0006522b241cbe54c4caa88d31537a6278490c93d9d732c2ab3a080ac084bf75cbdd5402901ec68583cbe7c7cde4a8e40e7a8b78c28 EBUILD openssh-9.7_p1-r6.ebuild 14116 BLAKE2B 423d6ab5e9af91f0996bb74e70984fbdc41f276e3364f35d9e1db39d2cd72582b8ca5192c67d07e57a6322289061e9e1ddcfc2cddcee9137cd7e79486157178a SHA512 fe3ceb2912f342fbd0ac9bd6229ddb4c00c0d7c0c0225763d68dfcd2dc69c128ae2cd5101bdac91a4baa179544b273708770dc63c686b2b9751d3391b2799239 EBUILD openssh-9.8_p1-r2.ebuild 15271 BLAKE2B d8d4f794f7e9b7f9e9d74acc813bb4860ccdf660c38a629cd4c3553e0ddcc2eabbd1dab7603ae06e4bbe031421083e0a4813c25ca38625989f0a74fb06620e24 SHA512 3b36919fce944984eeb9c21d6df80e3dd9a7c34846165a31e8c48652fb0c3428599b505147092e14aee3e6f5ac6b4ef37aabcb3a7300d3b04da6f32eb47e18a6 -EBUILD openssh-9.8_p1-r3.ebuild 15318 BLAKE2B f5ef6f1401564979934a99b1d3d3c58bd92a11bd4569af26ffe2e6528f8fe25e6d2c573cce2c04447910140b4b021b1edc082a4e7d20624bd60e7bcdd213f87b SHA512 6faa5cc80cfc2a18ddc86a0d7428fd903f0915dd897c5e11a341877d1e46211bcd59ec5034d5de01970d028b22a68977c324794c63f8a6d10bdc37845a6fef50 -MISC metadata.xml 1788 BLAKE2B d04d3030f70f3615522672fa56e684acaa67ddce8d16cce86ba8911fb8fc11ed152be012ecf560427d271868c4841a7422aaa644305947302d3ebab62bdb577d SHA512 bd328e3a33ce04b989149333db5f774f1b52540f12ef83b08b7fcf136ae2a3a9c83bef42c28991d3536249098ca0b9ffd21e583d93599580510d8619e9fd01ca +EBUILD openssh-9.8_p1-r3.ebuild 15367 BLAKE2B 89b1c96fc61495ca4ad07cf3250d0a41cfd483f45c4dd9dfda5dc60585c421790a4335e9dcbdbf3d7e58858737058f0cb453d5ec7edab4a7664780ff7395f0c0 SHA512 7c5e736e16421ca625b9df3fe59facefbbb0576f5f44a185eb0685425bd3c58c244e384e44fb91ceaf89e84eaee94813691e3c82d2b6a55102805506bea53f1f +EBUILD openssh-9.9_p1.ebuild 15564 BLAKE2B 3f8dc0f461af2d92c67ce8dbdd199f844a5585acc7c95237cdea669cdbbcc6da0441a7ab999b1460501a870de7180be1f6d3619b29847873ef434938789e33a9 SHA512 c3fa33708753f53866f5f54a0a468dbea3fda4dd1eb40c4becbdea44b9496a21609ddbb37fcf4540887ba5971c212ad1dcb7bb44bdd60fe614fbbc0c7376d82c +MISC metadata.xml 1967 BLAKE2B 9e586a4c515035bc31be950c3872c379e01dae2cc460239cde37b83d6ca8494d36d1e1f858195b34af76074a966278c323ab24ba5e78adfa70be297c1f21336f SHA512 83563c27789a4c12149f037d9318b66d6caf383a82f0f6f7025378bd2a3017d41ff96b5aea3d08e4407d85f3d1a089a51ae6c7fa3970c20b2d8d721962ddbf69 diff --git a/net-misc/openssh/files/9.9_p1/0001-fix-utmpx-ifdef.patch b/net-misc/openssh/files/9.9_p1/0001-fix-utmpx-ifdef.patch new file mode 100644 index 000000000000..80597517ddf5 --- /dev/null +++ b/net-misc/openssh/files/9.9_p1/0001-fix-utmpx-ifdef.patch @@ -0,0 +1,39 @@ +From 27996b32a8b0fe908effc469e5c7d496e40c6671 Mon Sep 17 00:00:00 2001 +Message-ID: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +From: Christoph Ostarek <christoph@zededa.com> +Date: Wed, 3 Jul 2024 12:46:59 +0200 +Subject: [PATCH 1/8] fix utmpx ifdef + +02e16ad95fb1f56ab004b01a10aab89f7103c55d did a copy-paste for +utmpx, but forgot to change the ifdef appropriately + +(cherry picked from commit c7fda601186ff28128cfe3eab9c9c0622de096e1) +--- + loginrec.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/loginrec.c b/loginrec.c +index 7460bb2c0..45f13dee8 100644 +--- a/loginrec.c ++++ b/loginrec.c +@@ -723,7 +723,7 @@ set_utmpx_time(struct logininfo *li, struct utmpx *utx) + void + construct_utmpx(struct logininfo *li, struct utmpx *utx) + { +-# ifdef HAVE_ADDR_V6_IN_UTMP ++# ifdef HAVE_ADDR_V6_IN_UTMPX + struct sockaddr_in6 *sa6; + # endif + memset(utx, '\0', sizeof(*utx)); +@@ -769,7 +769,7 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx) + if (li->hostaddr.sa.sa_family == AF_INET) + utx->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr; + # endif +-# ifdef HAVE_ADDR_V6_IN_UTMP ++# ifdef HAVE_ADDR_V6_IN_UTMPX + /* this is just a 128-bit IPv6 address */ + if (li->hostaddr.sa.sa_family == AF_INET6) { + sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa); +-- +2.47.0 + diff --git a/net-misc/openssh/files/9.9_p1/0002-build-construct_utmp-when-USE_BTMP-is-set.patch b/net-misc/openssh/files/9.9_p1/0002-build-construct_utmp-when-USE_BTMP-is-set.patch new file mode 100644 index 000000000000..814851b17c71 --- /dev/null +++ b/net-misc/openssh/files/9.9_p1/0002-build-construct_utmp-when-USE_BTMP-is-set.patch @@ -0,0 +1,40 @@ +From c606840894ca805472ddbd4ebad4b0a6f231ccb5 Mon Sep 17 00:00:00 2001 +Message-ID: <c606840894ca805472ddbd4ebad4b0a6f231ccb5.1730162536.git.sam@gentoo.org> +In-Reply-To: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +References: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +From: Damien Miller <djm@mindrot.org> +Date: Wed, 25 Sep 2024 11:13:05 +1000 +Subject: [PATCH 2/8] build construct_utmp() when USE_BTMP is set + +Fixes compile error on Void Linux/Musl + +(cherry picked from commit 2c12ae8cf9b0b7549ae097c4123abeda0ee63e5b) +--- + loginrec.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/loginrec.c b/loginrec.c +index 45f13dee8..7b1818b86 100644 +--- a/loginrec.c ++++ b/loginrec.c +@@ -614,7 +614,7 @@ line_abbrevname(char *dst, const char *src, int dstsize) + ** into account. + **/ + +-#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) ++#if defined(USE_BTMP) || defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN) + + /* build the utmp structure */ + void +@@ -698,7 +698,7 @@ construct_utmp(struct logininfo *li, + } + # endif + } +-#endif /* USE_UTMP || USE_WTMP || USE_LOGIN */ ++#endif /* USE_BTMP || USE_UTMP || USE_WTMP || USE_LOGIN */ + + /** + ** utmpx utility functions +-- +2.47.0 + diff --git a/net-misc/openssh/files/9.9_p1/0003-gss-serv.c-needs-sys-param.h.patch b/net-misc/openssh/files/9.9_p1/0003-gss-serv.c-needs-sys-param.h.patch new file mode 100644 index 000000000000..cac3a4140f7c --- /dev/null +++ b/net-misc/openssh/files/9.9_p1/0003-gss-serv.c-needs-sys-param.h.patch @@ -0,0 +1,30 @@ +From d1e0cfefc3a0f2d371f280d270e9ebc2188950c6 Mon Sep 17 00:00:00 2001 +Message-ID: <d1e0cfefc3a0f2d371f280d270e9ebc2188950c6.1730162536.git.sam@gentoo.org> +In-Reply-To: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +References: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +From: Damien Miller <djm@mindrot.org> +Date: Wed, 25 Sep 2024 11:15:45 +1000 +Subject: [PATCH 3/8] gss-serv.c needs sys/param.h + +From Void Linux + +(cherry picked from commit ff2cd1dd5711ff88efdf26662d6189d980439a1f) +--- + gss-serv.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gss-serv.c b/gss-serv.c +index 00e3d118b..025a118f8 100644 +--- a/gss-serv.c ++++ b/gss-serv.c +@@ -29,6 +29,7 @@ + #ifdef GSSAPI + + #include <sys/types.h> ++#include <sys/param.h> + + #include <stdarg.h> + #include <string.h> +-- +2.47.0 + diff --git a/net-misc/openssh/files/9.9_p1/0004-upstream-fix-regression-introduced-when-I-switched-t.patch b/net-misc/openssh/files/9.9_p1/0004-upstream-fix-regression-introduced-when-I-switched-t.patch new file mode 100644 index 000000000000..40583d31ca68 --- /dev/null +++ b/net-misc/openssh/files/9.9_p1/0004-upstream-fix-regression-introduced-when-I-switched-t.patch @@ -0,0 +1,296 @@ +From dda58ae078f4cba21c3b874e81f1d28121636985 Mon Sep 17 00:00:00 2001 +Message-ID: <dda58ae078f4cba21c3b874e81f1d28121636985.1730162536.git.sam@gentoo.org> +In-Reply-To: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +References: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +From: "djm@openbsd.org" <djm@openbsd.org> +Date: Wed, 25 Sep 2024 01:24:04 +0000 +Subject: [PATCH 4/8] upstream: fix regression introduced when I switched the + "Match" + +criteria tokeniser to a more shell-like one. Apparently the old tokeniser +(accidentally?) allowed "Match criteria=argument" as well as the "Match +criteria argument" syntax that we tested for. + +People were using this syntax so this adds back support for +"Match criteria=argument" + +bz3739 ok dtucker + +OpenBSD-Commit-ID: d1eebedb8c902002b75b75debfe1eeea1801f58a +(cherry picked from commit 66878e12a207fa9746dee3e2bdcca29b704cf035) +--- + misc.c | 23 +++++++++++++++++++++- + misc.h | 3 ++- + readconf.c | 28 ++++++++++++++++++++++----- + servconf.c | 57 ++++++++++++++++++++++++++++++++++++++++-------------- + 4 files changed, 89 insertions(+), 22 deletions(-) + +diff --git a/misc.c b/misc.c +index afdf5142e..1b4b55c50 100644 +--- a/misc.c ++++ b/misc.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: misc.c,v 1.196 2024/06/06 17:15:25 djm Exp $ */ ++/* $OpenBSD: misc.c,v 1.197 2024/09/25 01:24:04 djm Exp $ */ + /* + * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 2005-2020 Damien Miller. All rights reserved. +@@ -107,6 +107,27 @@ rtrim(char *s) + } + } + ++/* ++ * returns pointer to character after 'prefix' in 's' or otherwise NULL ++ * if the prefix is not present. ++ */ ++const char * ++strprefix(const char *s, const char *prefix, int ignorecase) ++{ ++ size_t prefixlen; ++ ++ if ((prefixlen = strlen(prefix)) == 0) ++ return s; ++ if (ignorecase) { ++ if (strncasecmp(s, prefix, prefixlen) != 0) ++ return NULL; ++ } else { ++ if (strncmp(s, prefix, prefixlen) != 0) ++ return NULL; ++ } ++ return s + prefixlen; ++} ++ + /* set/unset filedescriptor to non-blocking */ + int + set_nonblock(int fd) +diff --git a/misc.h b/misc.h +index 113403896..efecdf1ad 100644 +--- a/misc.h ++++ b/misc.h +@@ -1,4 +1,4 @@ +-/* $OpenBSD: misc.h,v 1.109 2024/06/06 17:15:25 djm Exp $ */ ++/* $OpenBSD: misc.h,v 1.110 2024/09/25 01:24:04 djm Exp $ */ + + /* + * Author: Tatu Ylonen <ylo@cs.hut.fi> +@@ -56,6 +56,7 @@ struct ForwardOptions { + char *chop(char *); + void rtrim(char *); + void skip_space(char **); ++const char *strprefix(const char *, const char *, int); + char *strdelim(char **); + char *strdelimw(char **); + int set_nonblock(int); +diff --git a/readconf.c b/readconf.c +index 3d9cc6dbb..de42fb6ff 100644 +--- a/readconf.c ++++ b/readconf.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: readconf.c,v 1.390 2024/09/15 00:57:36 djm Exp $ */ ++/* $OpenBSD: readconf.c,v 1.391 2024/09/25 01:24:04 djm Exp $ */ + /* + * Author: Tatu Ylonen <ylo@cs.hut.fi> + * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland +@@ -710,7 +710,7 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, + struct passwd *pw, const char *host_arg, const char *original_host, + int final_pass, int *want_final_pass, const char *filename, int linenum) + { +- char *arg, *oattrib, *attrib, *cmd, *host, *criteria; ++ char *arg, *oattrib, *attrib = NULL, *cmd, *host, *criteria; + const char *ruser; + int r, this_result, result = 1, attributes = 0, negate; + +@@ -731,7 +731,8 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, + + debug2("checking match for '%s' host %s originally %s", + full_line, host, original_host); +- while ((oattrib = attrib = argv_next(acp, avp)) != NULL) { ++ while ((oattrib = argv_next(acp, avp)) != NULL) { ++ attrib = xstrdup(oattrib); + /* Terminate on comment */ + if (*attrib == '#') { + argv_consume(acp); +@@ -777,9 +778,23 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, + this_result ? "" : "not ", oattrib); + continue; + } ++ ++ /* Keep this list in sync with below */ ++ if (strprefix(attrib, "host=", 1) != NULL || ++ strprefix(attrib, "originalhost=", 1) != NULL || ++ strprefix(attrib, "user=", 1) != NULL || ++ strprefix(attrib, "localuser=", 1) != NULL || ++ strprefix(attrib, "localnetwork=", 1) != NULL || ++ strprefix(attrib, "tagged=", 1) != NULL || ++ strprefix(attrib, "exec=", 1) != NULL) { ++ arg = strchr(attrib, '='); ++ *(arg++) = '\0'; ++ } else { ++ arg = argv_next(acp, avp); ++ } ++ + /* All other criteria require an argument */ +- if ((arg = argv_next(acp, avp)) == NULL || +- *arg == '\0' || *arg == '#') { ++ if (arg == NULL || *arg == '\0' || *arg == '#') { + error("Missing Match criteria for %s", attrib); + result = -1; + goto out; +@@ -856,6 +871,8 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, + criteria == NULL ? "" : criteria, + criteria == NULL ? "" : "\""); + free(criteria); ++ free(attrib); ++ attrib = NULL; + } + if (attributes == 0) { + error("One or more attributes required for Match"); +@@ -865,6 +882,7 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, + out: + if (result != -1) + debug2("match %sfound", result ? "" : "not "); ++ free(attrib); + free(host); + return result; + } +diff --git a/servconf.c b/servconf.c +index 89b8413e8..dd774f468 100644 +--- a/servconf.c ++++ b/servconf.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: servconf.c,v 1.418 2024/09/15 03:09:44 djm Exp $ */ ++/* $OpenBSD: servconf.c,v 1.419 2024/09/25 01:24:04 djm Exp $ */ + /* + * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland + * All rights reserved +@@ -1033,7 +1033,7 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, + int line, struct connection_info *ci) + { + int result = 1, attributes = 0, port; +- char *arg, *attrib; ++ char *arg, *attrib = NULL, *oattrib; + + if (ci == NULL) + debug3("checking syntax for 'Match %s'", full_line); +@@ -1047,7 +1047,8 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, + ci->laddress ? ci->laddress : "(null)", ci->lport); + } + +- while ((attrib = argv_next(acp, avp)) != NULL) { ++ while ((oattrib = argv_next(acp, avp)) != NULL) { ++ attrib = xstrdup(oattrib); + /* Terminate on comment */ + if (*attrib == '#') { + argv_consume(acp); /* mark all arguments consumed */ +@@ -1062,11 +1063,13 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, + *arg != '\0' && *arg != '#')) { + error("'all' cannot be combined with other " + "Match attributes"); +- return -1; ++ result = -1; ++ goto out; + } + if (arg != NULL && *arg == '#') + argv_consume(acp); /* consume remaining args */ +- return 1; ++ result = 1; ++ goto out; + } + /* Criterion "invalid-user" also has no argument */ + if (strcasecmp(attrib, "invalid-user") == 0) { +@@ -1078,11 +1081,26 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, + debug("matched invalid-user at line %d", line); + continue; + } ++ ++ /* Keep this list in sync with below */ ++ if (strprefix(attrib, "user=", 1) != NULL || ++ strprefix(attrib, "group=", 1) != NULL || ++ strprefix(attrib, "host=", 1) != NULL || ++ strprefix(attrib, "address=", 1) != NULL || ++ strprefix(attrib, "localaddress=", 1) != NULL || ++ strprefix(attrib, "localport=", 1) != NULL || ++ strprefix(attrib, "rdomain=", 1) != NULL) { ++ arg = strchr(attrib, '='); ++ *(arg++) = '\0'; ++ } else { ++ arg = argv_next(acp, avp); ++ } ++ + /* All other criteria require an argument */ +- if ((arg = argv_next(acp, avp)) == NULL || +- *arg == '\0' || *arg == '#') { ++ if (arg == NULL || *arg == '\0' || *arg == '#') { + error("Missing Match criteria for %s", attrib); +- return -1; ++ result = -1; ++ goto out; + } + if (strcasecmp(attrib, "user") == 0) { + if (ci == NULL || (ci->test && ci->user == NULL)) { +@@ -1105,7 +1123,8 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, + match_test_missing_fatal("Group", "user"); + switch (match_cfg_line_group(arg, line, ci->user)) { + case -1: +- return -1; ++ result = -1; ++ goto out; + case 0: + result = 0; + } +@@ -1141,7 +1160,8 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, + result = 0; + break; + case -2: +- return -1; ++ result = -1; ++ goto out; + } + } else if (strcasecmp(attrib, "localaddress") == 0){ + if (ci == NULL || (ci->test && ci->laddress == NULL)) { +@@ -1166,13 +1186,15 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, + result = 0; + break; + case -2: +- return -1; ++ result = -1; ++ goto out; + } + } else if (strcasecmp(attrib, "localport") == 0) { + if ((port = a2port(arg)) == -1) { + error("Invalid LocalPort '%s' on Match line", + arg); +- return -1; ++ result = -1; ++ goto out; + } + if (ci == NULL || (ci->test && ci->lport == -1)) { + result = 0; +@@ -1200,16 +1222,21 @@ match_cfg_line(const char *full_line, int *acp, char ***avp, + debug("user %.100s matched 'RDomain %.100s' at " + "line %d", ci->rdomain, arg, line); + } else { +- error("Unsupported Match attribute %s", attrib); +- return -1; ++ error("Unsupported Match attribute %s", oattrib); ++ result = -1; ++ goto out; + } ++ free(attrib); ++ attrib = NULL; + } + if (attributes == 0) { + error("One or more attributes required for Match"); + return -1; + } +- if (ci != NULL) ++ out: ++ if (ci != NULL && result != -1) + debug3("match %sfound", result ? "" : "not "); ++ free(attrib); + return result; + } + +-- +2.47.0 + diff --git a/net-misc/openssh/files/9.9_p1/0005-upstream-fix-previous-change-to-ssh_config-Match-whi.patch b/net-misc/openssh/files/9.9_p1/0005-upstream-fix-previous-change-to-ssh_config-Match-whi.patch new file mode 100644 index 000000000000..7495780afd43 --- /dev/null +++ b/net-misc/openssh/files/9.9_p1/0005-upstream-fix-previous-change-to-ssh_config-Match-whi.patch @@ -0,0 +1,70 @@ +From 3e95023995e1d0249febab2b804f51b7673e07de Mon Sep 17 00:00:00 2001 +Message-ID: <3e95023995e1d0249febab2b804f51b7673e07de.1730162536.git.sam@gentoo.org> +In-Reply-To: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +References: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +From: "djm@openbsd.org" <djm@openbsd.org> +Date: Thu, 26 Sep 2024 23:55:08 +0000 +Subject: [PATCH 5/8] upstream: fix previous change to ssh_config Match, which + broken on + +negated Matches; spotted by phessler@ ok deraadt@ + +OpenBSD-Commit-ID: b1c6acec66cd5bd1252feff1d02ad7129ced37c7 +(cherry picked from commit 19bcb2d90c6caf14abf386b644fb24eb7afab889) +--- + readconf.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/readconf.c b/readconf.c +index de42fb6ff..9f5592698 100644 +--- a/readconf.c ++++ b/readconf.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: readconf.c,v 1.391 2024/09/25 01:24:04 djm Exp $ */ ++/* $OpenBSD: readconf.c,v 1.392 2024/09/26 23:55:08 djm Exp $ */ + /* + * Author: Tatu Ylonen <ylo@cs.hut.fi> + * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland +@@ -710,7 +710,7 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, + struct passwd *pw, const char *host_arg, const char *original_host, + int final_pass, int *want_final_pass, const char *filename, int linenum) + { +- char *arg, *oattrib, *attrib = NULL, *cmd, *host, *criteria; ++ char *arg, *oattrib = NULL, *attrib = NULL, *cmd, *host, *criteria; + const char *ruser; + int r, this_result, result = 1, attributes = 0, negate; + +@@ -731,8 +731,8 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, + + debug2("checking match for '%s' host %s originally %s", + full_line, host, original_host); +- while ((oattrib = argv_next(acp, avp)) != NULL) { +- attrib = xstrdup(oattrib); ++ while ((attrib = argv_next(acp, avp)) != NULL) { ++ attrib = oattrib = xstrdup(attrib); + /* Terminate on comment */ + if (*attrib == '#') { + argv_consume(acp); +@@ -871,8 +871,8 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, + criteria == NULL ? "" : criteria, + criteria == NULL ? "" : "\""); + free(criteria); +- free(attrib); +- attrib = NULL; ++ free(oattrib); ++ oattrib = attrib = NULL; + } + if (attributes == 0) { + error("One or more attributes required for Match"); +@@ -882,7 +882,7 @@ match_cfg_line(Options *options, const char *full_line, int *acp, char ***avp, + out: + if (result != -1) + debug2("match %sfound", result ? "" : "not "); +- free(attrib); ++ free(oattrib); + free(host); + return result; + } +-- +2.47.0 + diff --git a/net-misc/openssh/files/9.9_p1/0006-upstream-fix-ML-KEM768x25519-KEX-on-big-endian-syste.patch b/net-misc/openssh/files/9.9_p1/0006-upstream-fix-ML-KEM768x25519-KEX-on-big-endian-syste.patch new file mode 100644 index 000000000000..7719f89aee63 --- /dev/null +++ b/net-misc/openssh/files/9.9_p1/0006-upstream-fix-ML-KEM768x25519-KEX-on-big-endian-syste.patch @@ -0,0 +1,99 @@ +From 3c10bf179b0029e0412e4b0fecf2e31d53b4ef08 Mon Sep 17 00:00:00 2001 +Message-ID: <3c10bf179b0029e0412e4b0fecf2e31d53b4ef08.1730162536.git.sam@gentoo.org> +In-Reply-To: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +References: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +From: "djm@openbsd.org" <djm@openbsd.org> +Date: Sun, 27 Oct 2024 02:06:01 +0000 +Subject: [PATCH 6/8] upstream: fix ML-KEM768x25519 KEX on big-endian systems; + spotted by + +jsg@ feedback/ok deraadt@ + +OpenBSD-Commit-ID: 26d81a430811672bc762687166986cad40d28cc0 +(cherry picked from commit 11f348196b3fb51c3d8d1f4f36db9d73f03149ed) +--- + libcrux_mlkem768_sha3.h | 8 +++++--- + mlkem768.sh | 17 ++++++++++++----- + 2 files changed, 17 insertions(+), 8 deletions(-) + +diff --git a/libcrux_mlkem768_sha3.h b/libcrux_mlkem768_sha3.h +index a82d60e83..b8ac1436f 100644 +--- a/libcrux_mlkem768_sha3.h ++++ b/libcrux_mlkem768_sha3.h +@@ -1,4 +1,5 @@ +-/* $OpenBSD: libcrux_mlkem768_sha3.h,v 1.1 2024/09/02 12:13:56 djm Exp $ */ ++/* $OpenBSD: libcrux_mlkem768_sha3.h,v 1.2 2024/10/27 02:06:01 djm Exp $ */ ++ + /* Extracted from libcrux revision 84c5d87b3092c59294345aa269ceefe0eb97cc35 */ + + /* +@@ -160,18 +161,19 @@ static inline void Eurydice_slice_to_array3(uint8_t *dst_tag, char *dst_ok, + // CORE STUFF (conversions, endianness, ...) + + static inline void core_num__u64_9__to_le_bytes(uint64_t v, uint8_t buf[8]) { ++ v = htole64(v); + memcpy(buf, &v, sizeof(v)); + } + static inline uint64_t core_num__u64_9__from_le_bytes(uint8_t buf[8]) { + uint64_t v; + memcpy(&v, buf, sizeof(v)); +- return v; ++ return le64toh(v); + } + + static inline uint32_t core_num__u32_8__from_le_bytes(uint8_t buf[4]) { + uint32_t v; + memcpy(&v, buf, sizeof(v)); +- return v; ++ return le32toh(v); + } + + static inline uint32_t core_num__u8_6__count_ones(uint8_t x0) { +diff --git a/mlkem768.sh b/mlkem768.sh +index 2fdc28312..3d12b2ed8 100644 +--- a/mlkem768.sh ++++ b/mlkem768.sh +@@ -1,9 +1,10 @@ + #!/bin/sh +-# $OpenBSD: mlkem768.sh,v 1.2 2024/09/04 05:11:33 djm Exp $ ++# $OpenBSD: mlkem768.sh,v 1.3 2024/10/27 02:06:01 djm Exp $ + # Placed in the Public Domain. + # + +-WANT_LIBCRUX_REVISION="origin/main" ++#WANT_LIBCRUX_REVISION="origin/main" ++WANT_LIBCRUX_REVISION="84c5d87b3092c59294345aa269ceefe0eb97cc35" + + FILES=" + libcrux/libcrux-ml-kem/cg/eurydice_glue.h +@@ -47,6 +48,7 @@ echo '#define KRML_NOINLINE __attribute__((noinline, unused))' + echo '#define KRML_HOST_EPRINTF(...)' + echo '#define KRML_HOST_EXIT(x) fatal_f("internal error")' + echo ++ + for i in $FILES; do + echo "/* from $i */" + # Changes to all files: +@@ -56,11 +58,16 @@ for i in $FILES; do + -e 's/[ ]*$//' \ + $i | \ + case "$i" in +- # XXX per-file handling goes here. ++ */libcrux-ml-kem/cg/eurydice_glue.h) ++ # Replace endian functions with versions that work. ++ perl -0777 -pe 's/(static inline void core_num__u64_9__to_le_bytes.*\n)([^}]*\n)/\1 v = htole64(v);\n\2/' | ++ perl -0777 -pe 's/(static inline uint64_t core_num__u64_9__from_le_bytes.*?)return v;/\1return le64toh(v);/s' | ++ perl -0777 -pe 's/(static inline uint32_t core_num__u32_8__from_le_bytes.*?)return v;/\1return le32toh(v);/s' ++ ;; + # Default: pass through. + *) +- cat +- ;; ++ cat ++ ;; + esac + echo + done +-- +2.47.0 + diff --git a/net-misc/openssh/files/9.9_p1/0007-upstream-explicitly-include-endian.h.patch b/net-misc/openssh/files/9.9_p1/0007-upstream-explicitly-include-endian.h.patch new file mode 100644 index 000000000000..d92d81f8d42c --- /dev/null +++ b/net-misc/openssh/files/9.9_p1/0007-upstream-explicitly-include-endian.h.patch @@ -0,0 +1,37 @@ +From f87403aba3e7926ab47f4c9a821300a705b070f2 Mon Sep 17 00:00:00 2001 +Message-ID: <f87403aba3e7926ab47f4c9a821300a705b070f2.1730162536.git.sam@gentoo.org> +In-Reply-To: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +References: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +From: "djm@openbsd.org" <djm@openbsd.org> +Date: Sun, 27 Oct 2024 02:06:59 +0000 +Subject: [PATCH 7/8] upstream: explicitly include endian.h + +OpenBSD-Commit-ID: 13511fdef7535bdbc35b644c90090013da43a318 +(cherry picked from commit fe8d28a7ebbaa35cfc04a21263627f05c237e460) +--- + kexmlkem768x25519.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/kexmlkem768x25519.c b/kexmlkem768x25519.c +index 679446e97..2b5d39608 100644 +--- a/kexmlkem768x25519.c ++++ b/kexmlkem768x25519.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: kexmlkem768x25519.c,v 1.1 2024/09/02 12:13:56 djm Exp $ */ ++/* $OpenBSD: kexmlkem768x25519.c,v 1.2 2024/10/27 02:06:59 djm Exp $ */ + /* + * Copyright (c) 2023 Markus Friedl. All rights reserved. + * +@@ -34,6 +34,9 @@ + #include <stdbool.h> + #include <string.h> + #include <signal.h> ++#ifdef HAVE_ENDIAN_H ++# include <endian.h> ++#endif + + #include "sshkey.h" + #include "kex.h" +-- +2.47.0 + diff --git a/net-misc/openssh/files/9.9_p1/0008-htole64-etc-for-systems-without-endian.h.patch b/net-misc/openssh/files/9.9_p1/0008-htole64-etc-for-systems-without-endian.h.patch new file mode 100644 index 000000000000..9799a82ea142 --- /dev/null +++ b/net-misc/openssh/files/9.9_p1/0008-htole64-etc-for-systems-without-endian.h.patch @@ -0,0 +1,66 @@ +From 88e0d4645af6e4d4fb1b0dd320b83dd83ca6e73c Mon Sep 17 00:00:00 2001 +Message-ID: <88e0d4645af6e4d4fb1b0dd320b83dd83ca6e73c.1730162536.git.sam@gentoo.org> +In-Reply-To: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +References: <27996b32a8b0fe908effc469e5c7d496e40c6671.1730162536.git.sam@gentoo.org> +From: Damien Miller <djm@mindrot.org> +Date: Sun, 27 Oct 2024 13:28:11 +1100 +Subject: [PATCH 8/8] htole64() etc for systems without endian.h + +(cherry picked from commit 33c5f384ae03a5d1a0bd46ca0fac3c62e4eaf784) +--- + configure.ac | 1 - + defines.h | 26 ++++++++++++++++++++++++++ + 2 files changed, 26 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 591d5a388..9053a9a2b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2013,7 +2013,6 @@ AC_CHECK_FUNCS([ \ + strtoll \ + strtoul \ + strtoull \ +- swap32 \ + sysconf \ + tcgetpgrp \ + timegm \ +diff --git a/defines.h b/defines.h +index ed860e78b..b02f2942a 100644 +--- a/defines.h ++++ b/defines.h +@@ -646,6 +646,32 @@ struct winsize { + # endif /* WORDS_BIGENDIAN */ + #endif /* BYTE_ORDER */ + ++#ifndef HAVE_ENDIAN_H ++# define openssh_swap32(v) \ ++ (uint32_t)(((uint32_t)(v) & 0xff) << 24 | \ ++ ((uint32_t)(v) & 0xff00) << 8 | \ ++ ((uint32_t)(v) & 0xff0000) >> 8 | \ ++ ((uint32_t)(v) & 0xff000000) >> 24) ++# define openssh_swap64(v) \ ++ (__uint64_t)((((__uint64_t)(v) & 0xff) << 56) | \ ++ ((__uint64_t)(v) & 0xff00ULL) << 40 | \ ++ ((__uint64_t)(v) & 0xff0000ULL) << 24 | \ ++ ((__uint64_t)(v) & 0xff000000ULL) << 8 | \ ++ ((__uint64_t)(v) & 0xff00000000ULL) >> 8 | \ ++ ((__uint64_t)(v) & 0xff0000000000ULL) >> 24 | \ ++ ((__uint64_t)(v) & 0xff000000000000ULL) >> 40 | \ ++ ((__uint64_t)(v) & 0xff00000000000000ULL) >> 56) ++# ifdef WORDS_BIGENDIAN ++# define le32toh(v) (openssh_swap32(v)) ++# define le64toh(v) (openssh_swap64(v)) ++# define htole64(v) (openssh_swap64(v)) ++# else ++# define le32toh(v) ((uint32_t)v) ++# define le64toh(v) ((uint64_t)v) ++# define htole64(v) ((uint64_t)v) ++# endif ++#endif ++ + /* Function replacement / compatibility hacks */ + + #if !defined(HAVE_GETADDRINFO) && (defined(HAVE_OGETADDRINFO) || defined(HAVE_NGETADDRINFO)) +-- +2.47.0 + diff --git a/net-misc/openssh/files/openssh-9.3_p1-disable-conch-interop-tests.patch b/net-misc/openssh/files/openssh-9.3_p1-disable-conch-interop-tests.patch deleted file mode 100644 index a5647ce9d8d3..000000000000 --- a/net-misc/openssh/files/openssh-9.3_p1-disable-conch-interop-tests.patch +++ /dev/null @@ -1,20 +0,0 @@ -Disable conch interop tests which are failing when called -via portage for yet unknown reason and because using conch -seems to be flaky (test is failing when using Python2 but -passing when using Python3). - -Bug: https://bugs.gentoo.org/605446 - ---- a/regress/conch-ciphers.sh -+++ b/regress/conch-ciphers.sh -@@ -3,6 +3,10 @@ - - tid="conch ciphers" - -+# https://bugs.gentoo.org/605446 -+echo "conch interop tests skipped due to Gentoo bug #605446" -+exit 0 -+ - if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then - echo "conch interop tests not enabled" - exit 0 diff --git a/net-misc/openssh/files/openssh-9.3_p1-fix-putty-tests.patch b/net-misc/openssh/files/openssh-9.3_p1-fix-putty-tests.patch deleted file mode 100644 index 9ac02c188000..000000000000 --- a/net-misc/openssh/files/openssh-9.3_p1-fix-putty-tests.patch +++ /dev/null @@ -1,57 +0,0 @@ -Make sure that host keys are already accepted before -running tests. - -https://bugs.gentoo.org/493866 - ---- a/regress/putty-ciphers.sh -+++ b/regress/putty-ciphers.sh -@@ -16,11 +16,17 @@ - - for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do - verbose "$tid: cipher $c" -+ rm -f ${COPY} - cp ${OBJ}/.putty/sessions/localhost_proxy \ - ${OBJ}/.putty/sessions/cipher_$c - echo "Cipher=$c" >> ${OBJ}/.putty/sessions/cipher_$c - -- rm -f ${COPY} -+ env HOME=$PWD echo "y" | ${PLINK} -load cipher_$c \ -+ -i ${OBJ}/putty.rsa2 "exit" -+ if [ $? -ne 0 ]; then -+ fail "failed to pre-cache host key" -+ fi -+ - env HOME=$PWD ${PLINK} -load cipher_$c -batch -i ${OBJ}/putty.rsa2 \ - cat ${DATA} > ${COPY} - if [ $? -ne 0 ]; then ---- a/regress/putty-kex.sh -+++ b/regress/putty-kex.sh -@@ -20,6 +20,12 @@ - ${OBJ}/.putty/sessions/kex_$k - echo "KEX=$k" >> ${OBJ}/.putty/sessions/kex_$k - -+ env HOME=$PWD echo "y" | ${PLINK} -load kex_$k \ -+ -i ${OBJ}/putty.rsa2 "exit" -+ if [ $? -ne 0 ]; then -+ fail "failed to pre-cache host key" -+ fi -+ - env HOME=$PWD ${PLINK} -load kex_$k -batch -i ${OBJ}/putty.rsa2 true - if [ $? -ne 0 ]; then - fail "KEX $k failed" ---- a/regress/putty-transfer.sh -+++ b/regress/putty-transfer.sh -@@ -26,6 +26,13 @@ - cp ${OBJ}/.putty/sessions/localhost_proxy \ - ${OBJ}/.putty/sessions/compression_$c - echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k -+ -+ env HOME=$PWD echo "y" | ${PLINK} -load compression_$c \ -+ -i ${OBJ}/putty.rsa2 "exit" -+ if [ $? -ne 0 ]; then -+ fail "failed to pre-cache host key" -+ fi -+ - env HOME=$PWD ${PLINK} -load compression_$c -batch \ - -i ${OBJ}/putty.rsa2 cat ${DATA} > ${COPY} - if [ $? -ne 0 ]; then diff --git a/net-misc/openssh/files/openssh-9.9_p1-x-forwarding-slow.patch b/net-misc/openssh/files/openssh-9.9_p1-x-forwarding-slow.patch new file mode 100644 index 000000000000..217062342da2 --- /dev/null +++ b/net-misc/openssh/files/openssh-9.9_p1-x-forwarding-slow.patch @@ -0,0 +1,66 @@ +https://bugzilla.mindrot.org/show_bug.cgi?id=3655 +https://github.com/openssh/openssh-portable/commit/fe6c6330c1a94c7a537efe9069853ce7a275c50a +https://bugs.gentoo.org/929191 + +From fe6c6330c1a94c7a537efe9069853ce7a275c50a Mon Sep 17 00:00:00 2001 +From: "djm@openbsd.org" <djm@openbsd.org> +Date: Sun, 13 Oct 2024 22:20:06 +0000 +Subject: [PATCH] upstream: don't start the ObscureKeystrokeTiming mitigations + if + +there has been traffic on a X11 forwarding channel recently. + +Should fix X11 forwarding performance problems when this setting is +enabled. Patch from Antonio Larrosa via bz3655 + +OpenBSD-Commit-ID: 820284a92eb4592fcd3d181a62c1b86b08a4a7ab +--- a/channels.c ++++ b/channels.c +@@ -5336,3 +5336,22 @@ x11_request_forwarding_with_spoofing(struct ssh *ssh, int client_session_id, + fatal_fr(r, "send x11-req"); + free(new_data); + } ++ ++/* ++ * Returns whether an x11 channel was used recently (less than a second ago) ++ */ ++int ++x11_channel_used_recently(struct ssh *ssh) { ++ u_int i; ++ Channel *c; ++ time_t lastused = 0; ++ ++ for (i = 0; i < ssh->chanctxt->channels_alloc; i++) { ++ c = ssh->chanctxt->channels[i]; ++ if (c == NULL || c->ctype == NULL || c->lastused == 0 || ++ strcmp(c->ctype, "x11-connection") != 0) ++ continue; ++ lastused = c->lastused; ++ } ++ return lastused != 0 && monotime() > lastused + 1; ++} +--- a/channels.h ++++ b/channels.h +@@ -382,6 +382,7 @@ int x11_connect_display(struct ssh *); + int x11_create_display_inet(struct ssh *, int, int, int, u_int *, int **); + void x11_request_forwarding_with_spoofing(struct ssh *, int, + const char *, const char *, const char *, int); ++int x11_channel_used_recently(struct ssh *ssh); + + /* channel close */ + +--- a/clientloop.c ++++ b/clientloop.c +@@ -659,9 +659,10 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout, + if (just_started) + return 1; + +- /* Don't arm output fd for poll until the timing interval has elapsed */ ++ /* Don't arm output fd for poll until the timing interval has elapsed... */ + if (timespeccmp(&now, &next_interval, <)) +- return 0; ++ /* ...unless there's x11 communicattion happening */ ++ return x11_channel_used_recently(ssh); + + /* Calculate number of intervals missed since the last check */ + n = (now.tv_sec - next_interval.tv_sec) * 1000LL * 1000 * 1000; diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml index da1b4330c4d7..8c35ff54c086 100644 --- a/net-misc/openssh/metadata.xml +++ b/net-misc/openssh/metadata.xml @@ -21,6 +21,11 @@ </longdescription> <use> <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag> + <flag name="legacy-ciphers"> + Enable support for deprecated, soon-to-be-dropped DSA keys. + + See https://marc.info/?l=openssh-unix-dev>m=170494903207436>w=2. + </flag> <flag name="livecd">Enable root password logins for live-cd environment.</flag> <flag name="security-key">Include builtin U2F/FIDO support</flag> <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag> diff --git a/net-misc/openssh/openssh-9.6_p1-r3.ebuild b/net-misc/openssh/openssh-9.6_p1-r3.ebuild deleted file mode 100644 index c0ac935c3c80..000000000000 --- a/net-misc/openssh/openssh-9.6_p1-r3.ebuild +++ /dev/null @@ -1,389 +0,0 @@ -# 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 ~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" -) - -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.8_p1-r3.ebuild b/net-misc/openssh/openssh-9.8_p1-r3.ebuild index 85ee1df6efcb..129f86bd6eb7 100644 --- a/net-misc/openssh/openssh-9.8_p1-r3.ebuild +++ b/net-misc/openssh/openssh-9.8_p1-r3.ebuild @@ -20,9 +20,9 @@ S="${WORKDIR}/${PARCH}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~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" +IUSE="abi_mips_n32 audit debug kerberos ldns legacy-ciphers libedit livecd pam +pie security-key selinux +ssl static test xmss" RESTRICT="!test? ( test )" @@ -199,6 +199,7 @@ src_configure() { $(use_with audit audit linux) $(use_with kerberos kerberos5 "${EPREFIX}"/usr) $(use_with ldns) + $(use_enable legacy-ciphers dsa-keys) $(use_with libedit) $(use_with pam) $(use_with pie) diff --git a/net-misc/openssh/openssh-9.6_p1-r5.ebuild b/net-misc/openssh/openssh-9.9_p1.ebuild index bfdeed1812a1..80a886b7ecc2 100644 --- a/net-misc/openssh/openssh-9.6_p1-r5.ebuild +++ b/net-misc/openssh/openssh-9.9_p1.ebuild @@ -3,6 +3,9 @@ EAPI=8 +# Remember to check the upstream release/stable branches for patches +# to backport! See https://marc.info/?l=openssh-unix-dev&m=172723798122122&w=2. + 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 @@ -20,9 +23,9 @@ S="${WORKDIR}/${PARCH}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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 ~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" +IUSE="abi_mips_n32 audit debug kerberos ldns legacy-ciphers libedit livecd pam +pie security-key selinux +ssl static test xmss" RESTRICT="!test? ( test )" @@ -76,12 +79,13 @@ BDEPEND=" " 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" - "${FILESDIR}/${PN}-9.6_p1-CVE-2024-6387.patch" - "${FILESDIR}/${PN}-9.6_p1-chaff-logic.patch" + "${FILESDIR}/${PN}-9.7_p1-config-tweaks.patch" + # Backports from upstream release branch + "${FILESDIR}/${PV}" + # Our own backports + "${FILESDIR}/${P}-x-forwarding-slow.patch" ) pkg_pretend() { @@ -200,6 +204,7 @@ src_configure() { $(use_with audit audit linux) $(use_with kerberos kerberos5 "${EPREFIX}"/usr) $(use_with ldns) + $(use_enable legacy-ciphers dsa-keys) $(use_with libedit) $(use_with pam) $(use_with pie) @@ -221,24 +226,7 @@ src_configure() { 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() { +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 @@ -249,15 +237,9 @@ tweak_ssh_configs() { 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 + mkdir -p "${WORKDIR}"/etc/ssh/ssh{,d}_config.d || die - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die # Send locale environment variables (bug #367017) SendEnv ${locale_vars[*]} @@ -265,16 +247,16 @@ tweak_ssh_configs() { SendEnv COLORTERM EOF - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + cat <<-EOF > "${WORKDIR}"/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 + 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 >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die # Allow client to pass locale environment variables (bug #367017) AcceptEnv ${locale_vars[*]} @@ -282,8 +264,13 @@ tweak_ssh_configs() { AcceptEnv COLORTERM EOF + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-subsystem.conf || die + # override default of no subsystems + Subsystem sftp ${EPREFIX}/usr/$(get_libdir)/misc/sftp-server + EOF + if use pam ; then - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die UsePAM yes # This interferes with PAM. PasswordAuthentication no @@ -294,13 +281,34 @@ tweak_ssh_configs() { fi if use livecd ; then - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + 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 + 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 @@ -312,18 +320,24 @@ src_install() { 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.service.2 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() { @@ -389,4 +403,40 @@ pkg_postinst() { 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 + + openssh_maybe_restart +} + +openssh_maybe_restart() { + local ver + declare -a versions + read -ra versions <<<"${REPLACING_VERSIONS}" + for ver in "${versions[@]}"; do + # Exclude 9.8_p1 because it didn't have the safety check + [[ ${ver} == 9.8_p1 ]] && break + + if [[ ${ver%_*} == "${PV%_*}" ]]; then + # No major version change has occurred + return + fi + done + + if [[ ${ROOT} ]]; then + return + elif [[ -d /run/systemd/system ]] && sshd -t >/dev/null 2>&1; then + ewarn "The ebuild will now attempt to restart OpenSSH to avoid" + ewarn "bricking the running instance. See bug #709748." + ebegin "Attempting to restart openssh via 'systemctl try-restart sshd'" + systemctl try-restart sshd + eend $? + elif [[ -d /run/openrc ]]; then + # We don't check for sshd -t here because the OpenRC init script + # has a stop_pre() which does checkconfig, i.e. we defer to it + # to give nicer output for a failed sanity check. + ewarn "The ebuild will now attempt to restart OpenSSH to avoid" + ewarn "bricking the running instance. See bug #709748." + ebegin "Attempting to restart openssh via 'rc-service -q --ifstarted --nodeps sshd restart'" + rc-service -q --ifstarted --nodeps sshd restart + eend $? + fi } diff --git a/net-misc/zsync/Manifest b/net-misc/zsync/Manifest index a7f3761d5d70..17dfafbedd43 100644 --- a/net-misc/zsync/Manifest +++ b/net-misc/zsync/Manifest @@ -2,6 +2,5 @@ AUX zsync-0.6.2-musl-off_t-fix.patch 326 BLAKE2B 9907bac0ca55ebae23318555a0b150f AUX zsync-0.6.2-zlib-1.2.3-support.patch 7069 BLAKE2B 841778a6495e1e0853965b8e7c6b8f2df51d98e73806f78197ac147a9ed57331e9b13d17dbc92f13c0dbc6887d145946ce5dcf769d51234aac9d40ade2d4fe7a SHA512 b572510cb135f97d63df6d49e3f07ce91c30926c91d1096f73d4577be754bcb37c8106ac51a1a0a651d9e77b971b4fdbdc82380b081b2065183ffa95930bcd47 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 DIST zsync-0.6.2.tar.bz2 245592 BLAKE2B 9e5a7538a2268d4d3042db44722546d2e76d69d28bd965a3674bf517b12429c4ac6dea86b022047d635163bfd7e71d7e332b5a831cbee7db2544b9ed56d3a4ee SHA512 56437594831f2320c532759805b5c51116c53c8848f14b54cfd9b76676d1d061abe7fc914264f496ed1c7922fbbd5b884166c855a2fb9eb1285f216e478c5f0d -EBUILD zsync-0.6.2-r2.ebuild 1078 BLAKE2B 15822b79f5e8a7c46624f8a12c7f466264689b609899af6a9d819062f1d4ef549c0267f5a02469f2c2648442c75f49c0971df59dde286680302ffff0ab6e3bb4 SHA512 8d4fd032dca7d9bb4de29aff16297ccca060c92fbd66d7bf81ae2612d7e888c04abc2e6e5847811c07801f4e9703bbdd6f9aa185d62ca9badc3c306f78564e61 EBUILD zsync-0.6.2-r3.ebuild 1139 BLAKE2B fade6f795770c982e95a019f85fd55326167a853399360f4a210604311e66e20c177a4a9f3c6f3232c26a22f51b18b83ee38ab0e921befcb934f6a8cc10adbca SHA512 ce00c18d12a9bee8a0a2373a43709c23269ac09c68d52896f01eb3715b445ba1ed37adf3fdb5865d566d483366af737f55e85d7f6ad38851d35cb0aa95b1f09c MISC metadata.xml 1324 BLAKE2B 6a0cf68e98964abcd423f9d5d9e293c5d4c152b1ed2fc98ab805927d2f0dcdda6a07e2a16bbe590bbbe23590e1fae99e4c618680d4db3864d7cec20b175a6656 SHA512 99151fb2267583e7f3174087a2758aebfcfbcb81196af87c7d4f84c847806f08ad35a361fbc3ade104a60fcd555b5110712b8569a9993bbfd0574992eb36704c diff --git a/net-misc/zsync/zsync-0.6.2-r2.ebuild b/net-misc/zsync/zsync-0.6.2-r2.ebuild deleted file mode 100644 index 1c720f6dd78f..000000000000 --- a/net-misc/zsync/zsync-0.6.2-r2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -ZLIB_PV=1.2.3 -ZLIB_P="zlib-${ZLIB_PV}" - -DESCRIPTION="Partial/differential file download client over HTTP using the rsync algorithm" -HOMEPAGE="http://zsync.moria.org.uk/" -SRC_URI=" - http://zsync.moria.org.uk/download/${P}.tar.bz2 - http://www.gzip.org/zlib/${ZLIB_P}.tar.bz2 - http://www.zlib.net/${ZLIB_P}.tar.bz2" -ZLIB_S="${WORKDIR}/${ZLIB_P}" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 x86" - -src_prepare() { - default - # Move old zlib-1.2.11 out the way - mv "${S}"/zlib zlib-1.2.11-modified || die - - cd "${ZLIB_S}" || die - # I am not sure how many other zlib patches we will need to port as well - # This covers the security vuln in 1.2.11 - eapply "${FILESDIR}"/${P}-${ZLIB_P}-support.patch - rm Makefile || die - - cd "${S}" || die - cp -a "${ZLIB_S}" "${ZLIB_P}-modified" || die - ln -s "${ZLIB_P}-modified" zlib || die - - eautoreconf -} - -src_install() { - dobin zsync zsyncmake - dodoc NEWS README - doman doc/zsync.1 doc/zsyncmake.1 -} |