From a67cd6675142fbbe7b09fff2361f2961a9031451 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 7 Oct 2022 01:22:59 +0100 Subject: gentoo auto-resync : 07:10:2022 - 01:22:59 --- net-misc/Manifest.gz | Bin 55077 -> 55067 bytes net-misc/gerbera/Manifest | 4 +- net-misc/gerbera/gerbera-1.11.0-r1.ebuild | 91 ++++ net-misc/gerbera/gerbera-1.11.0.ebuild | 91 ---- net-misc/gerbera/gerbera-9999.ebuild | 2 +- net-misc/ices/Manifest | 4 +- net-misc/ices/files/ices-2.0.2-gettimeofday.patch | 15 + net-misc/ices/files/ices-2.0.2-libogg-test.patch | 17 + net-misc/ices/ices-2.0.2-r1.ebuild | 39 -- net-misc/ices/ices-2.0.2-r2.ebuild | 58 +++ net-misc/netkit-rsh/Manifest | 3 +- net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild | 3 +- net-misc/openssh/Manifest | 9 + .../openssh/files/openssh-9.1_p1-build-tests.patch | 13 + net-misc/openssh/openssh-9.1_p1.ebuild | 514 +++++++++++++++++++++ 15 files changed, 727 insertions(+), 136 deletions(-) create mode 100644 net-misc/gerbera/gerbera-1.11.0-r1.ebuild delete mode 100644 net-misc/gerbera/gerbera-1.11.0.ebuild create mode 100644 net-misc/ices/files/ices-2.0.2-gettimeofday.patch create mode 100644 net-misc/ices/files/ices-2.0.2-libogg-test.patch delete mode 100644 net-misc/ices/ices-2.0.2-r1.ebuild create mode 100644 net-misc/ices/ices-2.0.2-r2.ebuild create mode 100644 net-misc/openssh/files/openssh-9.1_p1-build-tests.patch create mode 100644 net-misc/openssh/openssh-9.1_p1.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index cdb42e5d2c59..4fa863a202ab 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest index 9b272905a025..640c35dcd0cd 100644 --- a/net-misc/gerbera/Manifest +++ b/net-misc/gerbera/Manifest @@ -2,6 +2,6 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417 DIST gerbera-1.11.0.tar.gz 4115178 BLAKE2B 1b5f28c4602f949459816f57555bfebbedbabc9681b3d0d9eb3d7742a9b273644cf9c10b411baeb3b0c4b5ea3c340d1c0d8d6035cb0e7f38ba0c40fae1c5cd1b SHA512 ae2b3342b3b57ce6d656d0ebadfd73b5f2764f2164314f6b0deac170a82e6861349c37732e6914454918112124038b221dbd4882001b5de51a49326432ccd70f -EBUILD gerbera-1.11.0.ebuild 2250 BLAKE2B e3f38550533ef8c46fdc2aaf517591f59630cfde94324f86c4cd216868d5dc90aba34c2a23bfc6aa30f3427492f3bc3a0b273a42ace409f3de9d63915d8fbec4 SHA512 eca156513eed726374128bf5342d669283770cea356f8a1bd320d016f458e92973f242a2c3d48016c3fac4e95cd29a63536014716a76ffabecd4fa075fcf9133 -EBUILD gerbera-9999.ebuild 2250 BLAKE2B e3f38550533ef8c46fdc2aaf517591f59630cfde94324f86c4cd216868d5dc90aba34c2a23bfc6aa30f3427492f3bc3a0b273a42ace409f3de9d63915d8fbec4 SHA512 eca156513eed726374128bf5342d669283770cea356f8a1bd320d016f458e92973f242a2c3d48016c3fac4e95cd29a63536014716a76ffabecd4fa075fcf9133 +EBUILD gerbera-1.11.0-r1.ebuild 2253 BLAKE2B 37f3614f4953b2b55b849e39d52da0947f19520feeeacf5cc3c5f821945dbde9a5bad88da16edb9ba1e5eb64160ebde5065f8cb8af830491be5697af91e835dd SHA512 08986ef245b8e44e91fa5ad1dc4fc675f33f8c98c33a1b5d52963c619197c1506684b5650952087b47080bc2eb4829efe4cb65770af8331413fb740e1d02712f +EBUILD gerbera-9999.ebuild 2253 BLAKE2B 37f3614f4953b2b55b849e39d52da0947f19520feeeacf5cc3c5f821945dbde9a5bad88da16edb9ba1e5eb64160ebde5065f8cb8af830491be5697af91e835dd SHA512 08986ef245b8e44e91fa5ad1dc4fc675f33f8c98c33a1b5d52963c619197c1506684b5650952087b47080bc2eb4829efe4cb65770af8331413fb740e1d02712f MISC metadata.xml 1205 BLAKE2B f0fbdc991782018368d65f2d5475ede1a1a0cb2a8a16de4e7c4ed7586057cac18a2d6fe9bb405c8267337e453b26c69e69042dac3bfd5ef858f23fa7c468ef2c SHA512 a231be2b6829fb2f59fa3e66c830a16358782c915e806bfbee919a6f7ebdf9d33d53aa6860814ba5a5c7251ce2562f313af592ab5fcda701a7673b334627b1a0 diff --git a/net-misc/gerbera/gerbera-1.11.0-r1.ebuild b/net-misc/gerbera/gerbera-1.11.0-r1.ebuild new file mode 100644 index 000000000000..62e65e66d68f --- /dev/null +++ b/net-misc/gerbera/gerbera-1.11.0-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake linux-info + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S="${WORKDIR}/${P}" +fi + +DESCRIPTION="UPnP Media Server" +HOMEPAGE="https://gerbera.io" + +LICENSE="GPL-2" +SLOT="0" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" + +RDEPEND=" + acct-user/gerbera + dev-db/sqlite + dev-libs/libebml:= + =net-libs/libupnp-1.14.12:=[ipv6(+),reuseaddr,-blocking-tcp] + sys-apps/util-linux + sys-libs/zlib + virtual/libiconv + curl? ( net-misc/curl ) + exif? ( media-libs/libexif ) + exiv2? ( media-gfx/exiv2 ) + ffmpeg? ( media-video/ffmpeg:= ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + javascript? ( dev-lang/duktape:= ) + lastfm? ( media-libs/lastfmlib ) + magic? ( sys-apps/file ) + matroska? ( media-libs/libmatroska:= ) + mysql? ( dev-db/mysql-connector-c ) + taglib? ( media-libs/taglib ) +" + +DEPEND="${RDEPEND}" + +CONFIG_CHECK="~INOTIFY_USER" + +src_configure() { + local mycmakeargs=( + -DWITH_AVCODEC=$(usex ffmpeg) + -DWITH_CURL=$(usex curl) + -DWITH_DEBUG=$(usex debug) + -DWITH_EXIF=$(usex exif) + -DWITH_EXIV2=$(usex exiv2) + -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) + -DWITH_INOTIFY=1 + -DWITH_JS=$(usex javascript) + -DWITH_LASTFM=$(usex lastfm) + -DWITH_MAGIC=$(usex magic) + -DWITH_MATROSKA=$(usex matroska) + -DWITH_MYSQL=$(usex mysql) + -DWITH_SYSTEMD=$(usex systemd) + -DWITH_TAGLIB=$(usex taglib) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN} + newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN} + + insinto /etc/${PN} + newins "${FILESDIR}"/${PN}-1.3.0.config config.xml + fperms 0640 /etc/${PN}/config.xml + fowners root:gerbera /etc/${PN}/config.xml +} + +pkg_postinst() { + if use mysql; then + elog "Gerbera has been built with MySQL support and needs" + elog "to be configured before being started. By default" + elog "SQLite will be used." + fi +} diff --git a/net-misc/gerbera/gerbera-1.11.0.ebuild b/net-misc/gerbera/gerbera-1.11.0.ebuild deleted file mode 100644 index 41b42b9fc921..000000000000 --- a/net-misc/gerbera/gerbera-1.11.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake linux-info - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${P}" -fi - -DESCRIPTION="UPnP Media Server" -HOMEPAGE="https://gerbera.io" - -LICENSE="GPL-2" -SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" - -RDEPEND=" - acct-user/gerbera - dev-db/sqlite - dev-libs/libebml:= - =net-libs/libupnp-1.14.12:=[ipv6,reuseaddr,-blocking-tcp] - sys-apps/util-linux - sys-libs/zlib - virtual/libiconv - curl? ( net-misc/curl ) - exif? ( media-libs/libexif ) - exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( media-video/ffmpeg:= ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - javascript? ( dev-lang/duktape:= ) - lastfm? ( media-libs/lastfmlib ) - magic? ( sys-apps/file ) - matroska? ( media-libs/libmatroska:= ) - mysql? ( dev-db/mysql-connector-c ) - taglib? ( media-libs/taglib ) -" - -DEPEND="${RDEPEND}" - -CONFIG_CHECK="~INOTIFY_USER" - -src_configure() { - local mycmakeargs=( - -DWITH_AVCODEC=$(usex ffmpeg) - -DWITH_CURL=$(usex curl) - -DWITH_DEBUG=$(usex debug) - -DWITH_EXIF=$(usex exif) - -DWITH_EXIV2=$(usex exiv2) - -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) - -DWITH_INOTIFY=1 - -DWITH_JS=$(usex javascript) - -DWITH_LASTFM=$(usex lastfm) - -DWITH_MAGIC=$(usex magic) - -DWITH_MATROSKA=$(usex matroska) - -DWITH_MYSQL=$(usex mysql) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TAGLIB=$(usex taglib) - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN} - newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN} - - insinto /etc/${PN} - newins "${FILESDIR}"/${PN}-1.3.0.config config.xml - fperms 0640 /etc/${PN}/config.xml - fowners root:gerbera /etc/${PN}/config.xml -} - -pkg_postinst() { - if use mysql; then - elog "Gerbera has been built with MySQL support and needs" - elog "to be configured before being started. By default" - elog "SQLite will be used." - fi -} diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild index 41b42b9fc921..62e65e66d68f 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.ebuild @@ -28,7 +28,7 @@ RDEPEND=" =net-libs/libupnp-1.14.12:=[ipv6,reuseaddr,-blocking-tcp] + >=net-libs/libupnp-1.14.12:=[ipv6(+),reuseaddr,-blocking-tcp] sys-apps/util-linux sys-libs/zlib virtual/libiconv diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest index b7f0a692d796..8cb866147ef7 100644 --- a/net-misc/ices/Manifest +++ b/net-misc/ices/Manifest @@ -1,4 +1,6 @@ +AUX ices-2.0.2-gettimeofday.patch 524 BLAKE2B 11cf4f70c587b54b997ee10e87932ebcc2a4a3ed9d20a9a0754286aee5b0543d2521c7d937f6aa1be4b061674c885b8284658c99e1171d3883985c955893b475 SHA512 8e1b7e34db13c44e12189f3a788805fbde07f0ed8b430ed7d9f26fe8bdd77acdaaddbcbec21daf4039b5a769e5b113458255bb2235584d3dc5219dec793b0242 +AUX ices-2.0.2-libogg-test.patch 495 BLAKE2B 3912ffb0e4a124a836a4f22d9238014dc0d8ef298cb5866bc04458707def42d52ed63f33646817454120fd47bfaad181ea05064d6d68baa0833307b0591a89de SHA512 d43a998890a8fce58b9cca5ffe7d19878d1dd2a9d88984bcbe90271c4d8b60ad49078195edcf84b9994cbaeaad95bfb30467776bc5a4bb9a38a91e8eab40c51e AUX ices.initd-r1 307 BLAKE2B 3dc8638cb74d79ab772c3618812fac27ab856f74e39c8e5b6a8dc211ffb842d474ff4177ab7e450f542011cbdf66d7bd1e956570cd77ae4768ee3f8375e0bfb1 SHA512 de3aa2919cb715c6036d1b993275560819528e8c6d616362e414e9bc6cf77a67393f68c1643ebfac1b43e8d3bf2ce3bde004894921d8bfdf66eb667fbaa7bae9 DIST ices-2.0.2.tar.bz2 293818 BLAKE2B d037c6ce6e5d009a12fd9d8efba321b87562a0d492a5191a93b3ff991c1252af1aaa21c41b8171d6eaa9f518712d893b187765cab5a7a9de3560231ec4315b67 SHA512 ff257b478a7237886ba59bf7d1a494ebd4c7c12fd74e8e10c00ea65710249ead1b5b1ae8d9540fab05f2e4486949c6e350f3da59a1d1bf261397ca257806b2c7 -EBUILD ices-2.0.2-r1.ebuild 835 BLAKE2B b3b27868fee36daa93078f030352758504ff9b60085fef4a1cbe73524c5ff2f7d83192832684f2f1f4bfe63f160daaeb884053796ca3a20804f0ed98a676705e SHA512 f95065d4985d16f908af3f15a316ef91705382e7de190464e0a63c851997f7fbfeb9896847cd7c85d8b8ddb661a1ad2122e0eebbd7d60635c796a57f86802855 +EBUILD ices-2.0.2-r2.ebuild 1056 BLAKE2B 0523357d4cc9ca020c523c7ec1a31f1fc88cfc28aab56612bb5a8c6328a63c8916a4f8b9402c2f8d218a9282afe6a44f3d797cc5832cacbfb4be694e02c47121 SHA512 ec36aa4e90b5e1e05a5ffb097356034da089c3b886c22fb8a5a585d0a642a742407f46454e0d91a6b53818e53384afaed2ade009ce0e8d32d8f1b2207c778b96 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701 diff --git a/net-misc/ices/files/ices-2.0.2-gettimeofday.patch b/net-misc/ices/files/ices-2.0.2-gettimeofday.patch new file mode 100644 index 000000000000..ba5e7ca1c4a5 --- /dev/null +++ b/net-misc/ices/files/ices-2.0.2-gettimeofday.patch @@ -0,0 +1,15 @@ +Uses gettimeofday but won't include sys/time.h without HAVE_SYS_TIME_H +leading to failure with -Werror=implicit-function-declaration (clang16). + +sys/timeb.h is for deprecated ftime() and should not be used. + +https://bugs.gentoo.org/870973 +--- a/configure.in ++++ b/configure.in +@@ -51,5 +51,5 @@ + dnl Checks for header files. + AC_HEADER_STDC +-AC_CHECK_HEADERS([stropts.h sys/timeb.h sys/select.h]) ++AC_CHECK_HEADERS([stropts.h sys/time.h sys/select.h]) + + dnl ================================================================ diff --git a/net-misc/ices/files/ices-2.0.2-libogg-test.patch b/net-misc/ices/files/ices-2.0.2-libogg-test.patch new file mode 100644 index 000000000000..78a334b93096 --- /dev/null +++ b/net-misc/ices/files/ices-2.0.2-libogg-test.patch @@ -0,0 +1,17 @@ +clang/lld will try to use the given -L/usr/lib + 32bit files and potentially +fail the the test on 64bit, carries on but leads to ogg underlinking. + +Quickfix, ideally this should use pkg-config and hard-fail if not found. + +https://bugs.gentoo.org/740794 +--- a/m4/ogg.m4 ++++ b/m4/ogg.m4 +@@ -24,8 +24,4 @@ + fi + +-XIPH_GCC_WARNING([-I$ogg_prefix/include],, +- [ OGG_CFLAGS="-I$ogg_prefix/include" +- OGG_LDFLAGS="-L$ogg_prefix/lib" +- ]) + AC_CACHE_CHECK([for libogg], xt_cv_lib_ogg, + [dnl diff --git a/net-misc/ices/ices-2.0.2-r1.ebuild b/net-misc/ices/ices-2.0.2-r1.ebuild deleted file mode 100644 index 001620dd1b72..000000000000 --- a/net-misc/ices/ices-2.0.2-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding" -HOMEPAGE="https://icecast.org/ices/" -SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc64 sparc x86" - -RDEPEND=" - acct-group/ices - acct-user/ices - dev-libs/libxml2 - >=media-libs/libshout-2 - >=media-libs/libvorbis-1 -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_configure() { - econf --sysconfdir=/etc/ices2 -} - -src_install() { - default - insinto /etc/ices2 - doins conf/*.xml - docinto html - dodoc doc/*.{html,css} - newinitd "${FILESDIR}"/ices.initd-r1 ices - keepdir /var/log/ices - fperms 660 /var/log/ices - fowners ices:ices /var/log/ices - rm -rf "${D}"/usr/share/ices -} diff --git a/net-misc/ices/ices-2.0.2-r2.ebuild b/net-misc/ices/ices-2.0.2-r2.ebuild new file mode 100644 index 000000000000..4f8c7a6de887 --- /dev/null +++ b/net-misc/ices/ices-2.0.2-r2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding" +HOMEPAGE="https://icecast.org/ices/" +SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ppc64 sparc x86" + +RDEPEND=" + acct-group/ices + acct-user/ices + dev-libs/libxml2 + media-libs/alsa-lib + media-libs/libogg + media-libs/libshout + media-libs/libvorbis" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-libogg-test.patch + "${FILESDIR}"/${P}-gettimeofday.patch +) + +src_prepare() { + default + + eautoreconf #740794,870973 +} + +src_configure() { + econf --sysconfdir="${EPREFIX}"/etc/ices2 +} + +src_install() { + default + + insinto /etc/ices2 + doins conf/*.xml + + docinto html + dodoc doc/*.{html,css} + + newinitd "${FILESDIR}"/ices.initd-r1 ices + + keepdir /var/log/ices + fperms 660 /var/log/ices + fowners ices:ices /var/log/ices + + rm -r "${ED}"/usr/share/ices || die +} diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest index 805f828eca7c..88a9b5078763 100644 --- a/net-misc/netkit-rsh/Manifest +++ b/net-misc/netkit-rsh/Manifest @@ -29,5 +29,6 @@ AUX rlogin.xinetd 282 BLAKE2B 35a5412dfc8836bc9f2906faabedd42b8f2647660df0ea2d49 AUX rsh.pamd-pambase 365 BLAKE2B bb469c2d31e70a8b448b0ed282b0d66e23f68daae5958ea6f43fedda6dd79682e58d3c8deb99c3d31a002fd6567d8bbb564e791b2b98b1a8e323365b90fd8efe SHA512 cbf7af64773b39254136d04e5195ac3737815ff7c033278b3bfd6173ec3a0ae569393c86d5def38da11072718c004a5aeb75733b1910ec9dc0125c72edaa915b AUX rsh.xinetd 279 BLAKE2B db403023417d537fb944c677553f71e782d80dfe08dc5f938815617350c91ee50dda082c632577ec1c37ca8b40de6441a5d5fe07d3799ef1cd1f4cdf0a8d9982 SHA512 3c6b29e51adf5766ba417ef85763d5c85384be653109e02df307ed61047eb4d4706980da56b121f3bcc63b74b842c5e8ecaaf2629d18e5d2723b3aac08e0282d DIST netkit-rsh-0.17.tar.gz 58268 BLAKE2B 7790a91f95c51f4aa538ad614e65ecba5a565e4761c7d8167f4d175bb8bcc27cb48b569f93064285dad983e602f03bcb816da58b02b54290adcd9cabe73cd88e SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218 -EBUILD netkit-rsh-0.17-r14.ebuild 1714 BLAKE2B 9c20bf9de9d0f38e4645783087874b2de2a61163b881f4f8beaadd3c33787ff7c1a2ed75486604b34180e94955cfc0e77b8f5a27174d64fb7581ba8ab39fe00c SHA512 a96f45e0413354c9793e519bd81680bc3ff9cd4cbb4dccb2261c2f8bb623978f60bef99b6a69930884fa5d6712b805868756e8263b5c2e55daf50674749afb88 +DIST rexec-1.5.tar.gz 18469 BLAKE2B cbb694520332a0768b8337e854baf232271a30ac328dcf4b8b16d28dc3710ad58173e135cb9eb9726b07709bcd78ef627cea550c98e00dc86bea7c64e52aa3d1 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a +EBUILD netkit-rsh-0.17-r14.ebuild 1748 BLAKE2B 31cd4788842bfec797578b72ddea46438e3d7af3a0f7051426124fd6259bbfe9a710de0e6e67e147d502d220831a7ce1e49c2a51cd1f3d554372b3196c8418f7 SHA512 df223bf545165e5f955a5260e3f972b56707bcc187ad9fbed843a6e35bfd152c657ab093951b8bd3c832721c4858e5b43e2fe1eb8bddd5f0ed2b6a9fbc2f705f MISC metadata.xml 397 BLAKE2B 17d84472dbc6d22eb4b046ddf6c8ed979d715c4d9172011d9251ddb76569dd4cfdfedce8cf07653783334f1423a915d35e48a3505a482f1fa27ff315ac10fd24 SHA512 c84f7eab56dc660367691638f3d75a11ac89d0cf5e68e36de635deb1e862ce0817849195379c9358783a38d7bf8f155276c80c6bc562d9944e46ae69eac81d98 diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild index 0f4ff2771838..c115df77f660 100644 --- a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild +++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild @@ -7,7 +7,8 @@ inherit pam toolchain-funcs fcaps DESCRIPTION="Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}" HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit" -SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${P}.tar.gz" +SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${P}.tar.gz + mirror://gentoo/rexec-1.5.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 9147c7e84ff4..60816c16337f 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -16,6 +16,7 @@ AUX openssh-9.0_p1-X509-glue-13.3.2.patch 2118 BLAKE2B 8d7211b713025dc2749b58907 AUX openssh-9.0_p1-X509-glue-13.4.1.patch 2118 BLAKE2B 171c776e8a1dc64dd63d0e471dd7064fb0360a4abdec7f03915246f07082341e6b505e7a5467aad25bd5282ab4a63a48405984317b12c1692d04f5427503a86b SHA512 7dc1c43e6f70a4c990dc3cf493f8a5b4fbdf1753f2d4bf474ba40adb656d843fcf72a4e076e6450e0488ada68758f9e2e0814a71388d552ce50d34c3692e573d AUX openssh-9.0_p1-X509-uninitialized-delay.patch 321 BLAKE2B 19bff0fc7ecdc6350f8e6bd30f36f30b455c65b7455fe8b1d481d8fa7cdfa7cc76719931857fe2c9730b05ae8fe3e7e05c538e743e055d6594dd2fc7c3f250ee SHA512 57798621a51a60abf6985391ec73dcafdb46de75c93579e23b786aa095d8eea29ebd9ab5987b951a136b15e60896332c9717c82b42e1c22b345444aedf17a9f5 AUX openssh-9.0_p1-implicit-func-decl-vsnprintf.patch 2071 BLAKE2B 412277bf109e93e785c2d81830d11697e1718992204177aa5048c4a86f0d62982a5a3af0f7b7ef92e3b506f6afe428953fe5e6cbe0f9a27a3fbc760d536d0fd9 SHA512 d42cd6da269e3d44da2230a3597808f522d73c8d8ddc15617b43dbd922587e6a90a81f686a816313330b02a53d0da517d563f134d6281adcc7d85d9666dd07b2 +AUX openssh-9.1_p1-build-tests.patch 529 BLAKE2B cb511de87f2483918d4a5b5ad267a5e3d1e579ed8c2a9e5d477c319091a66db1f62ff43e8dbf273d7b1a1b57e8acce59e06a7dfa85a977a890ec80ad025519c7 SHA512 87df8d4c722fbc0a65aac682199069dc530f81702e84352b689592a94acee8678b0a134e81ac57e1758d6b392c6b63bc21dab3d8c3effd6fe3ae41fb26dd3301 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 @@ -34,8 +35,16 @@ DIST openssh-9.0p1+x509-13.4.1.diff.gz 1146757 BLAKE2B 070d6bc23179a581e4fe79412 DIST openssh-9.0p1-sctp-1.2.patch.xz 6768 BLAKE2B 8a18aea57b0b3f8f0a641870f0cd1570c6cc48d1e28ef7261344918905e94a548d3a3acb6feb1c6ef13f0c6cacf2b845163cad2b96ab20cb9fc58a49aeb699c1 SHA512 d6aa5f32464d5f3e2e63e9ba82108f33bdaa890e2adf2ccc47ce0d672979fc67510d9dd7561b17eaba0c2f11a8eb565029b0ebff3b2d050e9e04e6143aedb8a3 DIST openssh-9.0p1.tar.gz 1822183 BLAKE2B 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2 SHA512 613ae95317e734868c6a60d9cc5af47a889baa3124bbdd2b31bb51dd6b57b136f4cfcb5604cca78a03bd500baab9b9b45eaf77e038b1ed776c86dce0437449a9 DIST openssh-9.0p1.tar.gz.asc 833 BLAKE2B e29ff08f10feee7347c02a7ce4b33b8d9c71a26656f0430a2511c25bc6b5006f1683d845826a68ff4eed068b30c911e273cb34e5b4880854d55a776415474019 SHA512 7b1445764058435d2fa8a9c7553643983650d4232036c088e46e44beeb538d32cba88f775b1be9da5f21a01d6caea59b3dc4714507781e9cb946546fa54f169f +DIST openssh-9.1_p1-X509-glue-13.5.patch.xz 1092 BLAKE2B 19da945547472048d01a6ec26f28cba11afe1a0590a115582d1e21a852b6b66589b091ab4440d57952200522318aeffb7d9404e53f9532ae80e47685c24c4097 SHA512 96de9f59bacfd99aa9ef03362d55d88b3eea0acc57a11fb72e5c612bfb0f5e48455b0a0d0add9a8a5524b9d4701f47db1ff7859f1d3c2a12947b27292961cbd5 +DIST openssh-9.1_p1-hpn-15.2-X509-glue.patch.xz 5504 BLAKE2B 776b467ddde16e268536c5632b028a32db22b26d7bc11e2a9fa6c8e29528be3eb781066d6b30fb2f561a73a24c34a29963fcd7c872aa92dc19d715d8ffbf2cbe SHA512 aa753da5f75d90165f5922ead1dd495a15a4c581360d5862ec6f802caea54055da8e308c1919efa8e78b31a7ea082f8693dda0ab84ccee414c562ec062c50fb1 +DIST openssh-9.1_p1-hpn-15.2-glue.patch.xz 3840 BLAKE2B 06fb14d8c6f52f1c6fae7971fc4da810c814d7b52063f8cc7e83356baa7ed70c84476c1d1cc896eba6d0d51813dc994e3c82278e66c04998431c8123a09fe7df SHA512 99c88c08fb384336a9680629bc04a89121780d64ee8b03ac164c4e446cc30b865004292e98516b6f857bd75e1b4393291427c046ffcabc1578629e6075636cbf +DIST openssh-9.1p1+x509-13.5.diff.gz 1213948 BLAKE2B 5663a1c865c80f590642bb855f7d7a17e71e0db099deb4cea5750cfe734bd506b70a1b266fccc2a58174ae2b1b96a7f1ced56382d5d7e741b07e46422b03f7e6 SHA512 70a1f12e98b8fa8170c208803ee482aea2fcf6b9e41ecada5fabaa0288ed5a32574f42a7b50718bb484978f3c65f50e55966c9f555a9de100dc8d695b9aec531 +DIST openssh-9.1p1-sctp-1.2.patch.xz 6772 BLAKE2B 8393c1ca5f0df7e4d490cef5c38d50d45da83a9c3f650e9af15d95825f9e682a6aaf6a0e85fc1704d41d6567aec8f0b34e43b20652e0141008ccdbe91426dfac SHA512 6750394d0fb7b7f93a0e4f94204e53277cc341c5b2427130559e443557dbb95f2e85a71cfe8d40cfa17dd015b0f3880f79a1f868374e60e94e8385c9b45acec5 +DIST openssh-9.1p1.tar.gz 1838747 BLAKE2B 287b6b1cc4858b27af88f4a4674670afff1fb5b99461892083393c53ef3747c5a0fcd90cba95d2c27465a919e00f7f42732c93af4f306665ba0393bbb7a534f5 SHA512 a1f02c407f6b621b1d0817d1a0c9a6839b67e416c84f3b76c63003b119035b24c19a1564b22691d1152e1d2d55f4dc7eb1af2d2318751e431a99c4efa77edc70 +DIST openssh-9.1p1.tar.gz.asc 833 BLAKE2B 83efe3c705f6a02c25a9fc9bac2a4efd77470598d9e0fcb86dff2d265c58cffec1afecad3621769b2bd78ac25884f0ee20ae9b311e895db93e3bb552dffd6e74 SHA512 47dc7295f9694250bcbb86d7ca0830a47da4f3df7795bb05ebaf1590284ccce5317022c536bea1b09bd2fa4d8013295cc0de287ebe3f9dc605582077e9f11ddd EBUILD openssh-8.9_p1-r2.ebuild 17076 BLAKE2B 6f236af760da98ff31643f2bf22560c65d7fc0b00a00502b84657739039663e230b78db2a0cc3cc02eea6fc3f030157bc22053955501ecaa055698eea5a70bca SHA512 4d2d05fc3a15318687d769c99b779bdc41998a5456650b7d174828e4d557711036d2def92f7f8465c9c4e38180e614f12462e58ca7e0653d7be7e242e4408bb5 EBUILD openssh-9.0_p1-r1.ebuild 16937 BLAKE2B 34b2fa4021a8f55c017af579bac3e07f20debc330450c56b0fe562bcf8822397fd527902fc5bed3f9f2a7c687ab96d67a33ce29a894eea641db154301d15e505 SHA512 de3849679d4440d2e2d69b68c2c2d5d01bf240aff3868dcae1d53b120468098f3dedebcefc826b0898ea8fcea61107a177e6c1df6f5ba54e600e2f41ae67d772 EBUILD openssh-9.0_p1-r2.ebuild 16929 BLAKE2B a218c0faba8bb8218841f2c621584bd7b381629a12620e27f54cb5c563fcd1d56a21b2f10be20b77c7492eb2d89be31c209fc250252be86cb88d427642123ebe SHA512 d7a865cbf8bd64fd4518966b43a4af8f3156cd125cb6b91a4d9a63ba1c02625155bd641f082056d753c5f84172c2965e3fc5e5376a6d68b72edf651c8f7b5d55 EBUILD openssh-9.0_p1-r6.ebuild 17510 BLAKE2B 6644aa9dc6140350767c1a78ad94ba27b62cbb3cedbd6521bfb16fb0dd3c1b37e9aeb6d227319482bae070701b93f1723c08c53858ede890fac0fc91d7846c91 SHA512 b34b3cbc2ef226a2dccb6ed7cb21529271aceb61c646f6d7bc290bd05cd5b211b76587ad5e957eb20af3e33b92129eef71495172c9327067ecbf7a4fc16ec71f +EBUILD openssh-9.1_p1.ebuild 17818 BLAKE2B 17281db2b9f94ae734a7a6b98e0ca1c0f8cf4a52e8f8e66cd21ba281ee13ce3a5ddadd973ab87016462500c2c564662b0995550734c5e32410acce61cb43dabd SHA512 76e8d1605552867fcdc8ce6fc78594e02010798ee043927299f8640a34cbab5bb9ccad970fbfc20d01d4526247d75d9a0103256b6e5181263b5632b62dd306b1 MISC metadata.xml 2047 BLAKE2B 87356343744e121075383ad94ba6b821d2db5c3f5af16745130078f939e53b6a83281c19b89f272d20509753bc734bfdd3aab024d72651c7d5c69df27b36841a SHA512 a5b69ff7fa94b00062e78eba36b6d321fd923d27e953fc24ae81d8e25040bebde9ccb8b1555912726eff2b39ee0256aee0da52359e326fb4b1edd394e4f1e406 diff --git a/net-misc/openssh/files/openssh-9.1_p1-build-tests.patch b/net-misc/openssh/files/openssh-9.1_p1-build-tests.patch new file mode 100644 index 000000000000..62f51a87823d --- /dev/null +++ b/net-misc/openssh/files/openssh-9.1_p1-build-tests.patch @@ -0,0 +1,13 @@ +diff --git a/openbsd-compat/regress/Makefile.in b/openbsd-compat/regress/Makefile.in +index dd8cdc4b7..c446f0aa2 100644 +--- a/openbsd-compat/regress/Makefile.in ++++ b/openbsd-compat/regress/Makefile.in +@@ -10,7 +10,7 @@ CFLAGS=@CFLAGS@ + CPPFLAGS=-I. -I.. -I../.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. @CPPFLAGS@ @DEFS@ + EXEEXT=@EXEEXT@ + LIBCOMPAT=../libopenbsd-compat.a +-LIBS=@LIBS@ ++LIBS=@LIBS@ -lssl -lcrypto + LDFLAGS=@LDFLAGS@ $(LIBCOMPAT) + + TESTPROGS=closefromtest$(EXEEXT) snprintftest$(EXEEXT) strduptest$(EXEEXT) \ diff --git a/net-misc/openssh/openssh-9.1_p1.ebuild b/net-misc/openssh/openssh-9.1_p1.ebuild new file mode 100644 index 000000000000..823f2305834f --- /dev/null +++ b/net-misc/openssh/openssh-9.1_p1.ebuild @@ -0,0 +1,514 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +# PV to USE for HPN patches +#HPN_PV="${PV^^}" +HPN_PV="8.5_P1" + +HPN_VER="15.2" +HPN_PATCHES=( + ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff + ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff + ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff +) +HPN_GLUE_PATCH="${PN}-9.1_p1-hpn-${HPN_VER}-glue.patch" + +SCTP_VER="1.2" +SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" + +X509_VER="13.5" +X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" +X509_GLUE_PATCH="${P}-X509-glue-${X509_VER}.patch" +X509_HPN_GLUE_PATCH="${PN}-9.1_p1-hpn-${HPN_VER}-X509-glue.patch" + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} + ${HPN_VER:+hpn? ( + $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") + https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz + )} + ${X509_PATCH:+X509? ( + https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} + https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_GLUE_PATCH}.xz + ${HPN_VER:+hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_HPN_GLUE_PATCH}.xz )} + )} + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) +" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + hpn? ( ssl ) + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + X509? ( !sctp ssl !xmss ) + xmss? ( ssl ) + test? ( ssl ) +" + +# tests currently fail with XMSS +REQUIRED_USE+="test? ( !xmss )" + +# Blocker on older gcc-config for bug #872416 +LIB_DEPEND=" + !=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) + virtual/libcrypt:=[static-libs(+)] + >=sys-libs/zlib-1.2.3:=[static-libs(+)] +" +RDEPEND=" + acct-group/sshd + acct-user/sshd + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( sys-libs/pam ) + kerberos? ( virtual/krb5 ) +" +DEPEND="${RDEPEND} + virtual/os-headers + kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) + static? ( ${LIB_DEPEND} ) +" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 ) + !prefix? ( sys-apps/shadow ) + X? ( x11-apps/xauth ) +" +# Weird dep construct for newer gcc-config for bug #872416 +BDEPEND=" + sys-devel/autoconf + virtual/pkgconfig + || ( + >=sys-devel/gcc-config-2.6 + >=sys-devel/clang-toolchain-symlinks-14-r1:14 + >=sys-devel/clang-toolchain-symlinks-15-r1:15 + >=sys-devel/clang-toolchain-symlinks-16-r1:* + ) + verify-sig? ( sec-keys/openpgp-keys-openssh ) +" + +PATCHES=( + "${FILESDIR}/${PN}-7.9_p1-include-stdlib.patch" + "${FILESDIR}/${PN}-8.7_p1-GSSAPI-dns.patch" #165444 integrated into gsskex + "${FILESDIR}/${PN}-6.7_p1-openssl-ignore-status.patch" + "${FILESDIR}/${PN}-7.5_p1-disable-conch-interop-tests.patch" + "${FILESDIR}/${PN}-8.0_p1-fix-putty-tests.patch" + "${FILESDIR}/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" + "${FILESDIR}/${PN}-8.9_p1-allow-ppoll_time64.patch" #834019 + "${FILESDIR}/${PN}-8.9_p1-gss-use-HOST_NAME_MAX.patch" #834044 + "${FILESDIR}/${PN}-9.1_p1-build-tests.patch" +) + +pkg_pretend() { + # this sucks, but i'd rather have people unable to `emerge -u openssh` + # than not be able to log in to their server any more + local missing=() + check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); } + check_feature hpn HPN_VER + check_feature sctp SCTP_PATCH + check_feature X509 X509_PATCH + if [[ ${#missing[@]} -ne 0 ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${missing[*]}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "Missing requested third party patch." + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." + fi +} + +src_unpack() { + default + + # We don't have signatures for HPN, X509, so we have to write this ourselves + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc} +} + +src_prepare() { + sed -i \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ + pathnames.h || die + + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + eapply "${PATCHES[@]}" + + [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches + + local PATCHSET_VERSION_MACROS=() + + if use X509 ; then + pushd "${WORKDIR}" &>/dev/null || die + eapply "${WORKDIR}/${X509_GLUE_PATCH}" + popd &>/dev/null || die + + eapply "${WORKDIR}"/${X509_PATCH%.*} + eapply "${FILESDIR}/${PN}-9.0_p1-X509-uninitialized-delay.patch" + + # We need to patch package version or any X.509 sshd will reject our ssh client + # with "userauth_pubkey: could not parse key: string is too large [preauth]" + # error + einfo "Patching package version for X.509 patch set ..." + sed -i \ + -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ + "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" + + einfo "Patching version.h to expose X.509 patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in X.509 patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) + fi + + if use sctp ; then + eapply "${WORKDIR}"/${SCTP_PATCH%.*} + + einfo "Patching version.h to expose SCTP patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ + "${S}"/version.h || die "Failed to sed-in SCTP patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) + + einfo "Disabling known failing test (cfgparse) caused by SCTP patch ..." + sed -i \ + -e "/\t\tcfgparse \\\/d" \ + "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" + fi + + if use hpn ; then + local hpn_patchdir="${T}/${P}-hpn${HPN_VER}" + mkdir "${hpn_patchdir}" || die + cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die + pushd "${hpn_patchdir}" &>/dev/null || die + eapply "${WORKDIR}/${HPN_GLUE_PATCH}" + use X509 && eapply "${WORKDIR}/${X509_HPN_GLUE_PATCH}" + use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch + popd &>/dev/null || die + + eapply "${hpn_patchdir}" + + use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch" + + einfo "Patching Makefile.in for HPN patch set ..." + sed -i \ + -e "/^LIBS=/ s/\$/ -lpthread/" \ + "${S}"/Makefile.in || die "Failed to patch Makefile.in" + + einfo "Patching version.h to expose HPN patch set ..." + sed -i \ + -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ + "${S}"/version.h || die "Failed to sed-in HPN patch version" + PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) + + if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + einfo "Disabling known non-working MT AES cipher per default ..." + + cat > "${T}"/disable_mtaes.conf <<- EOF + + # HPN's Multi-Threaded AES CTR cipher is currently known to be broken + # and therefore disabled per default. + DisableMTAES yes + EOF + sed -i \ + -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ + "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" + + sed -i \ + -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ + "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" + fi + fi + + if use X509 || use sctp || use hpn ; then + einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." + sed -i \ + -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ + "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" + + einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." + sed -i \ + -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ + "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" + + einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." + sed -i \ + -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ + "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" + fi + + sed -i \ + -e "/#UseLogin no/d" \ + "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" + + eapply_user #473004 + + # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox + sed -e '/\t\tpercent \\/ d' \ + -i regress/Makefile || die + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable PATH reset, trust what portage gives us #254615 + -e 's:^PATH=/:#PATH=/:' + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # The -ftrapv flag ICEs on hppa #505182 + use hppa && sed_args+=( + -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' + -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' + ) + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + use xmss && append-cflags -DWITH_XMSS + + if [[ ${CHOST} == *-solaris* ]] ; then + # Solaris' glob.h doesn't have things like GLOB_TILDE, configure + # doesn't check for this, so force the replacement to be put in + # place + append-cppflags -DBROKEN_GLOB + fi + + # use replacement, RPF_ECHO_ON doesn't exist here + [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty + --with-privsep-user=sshd + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + # We apply the sctp patch conditionally, so can't pass --without-sctp + # unconditionally else we get unknown flag warnings. + $(use sctp && use_with sctp) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(usex X509 '' "$(use_with security-key security-key-builtin)") + $(use_with ssl openssl) + $(use_with ssl ssl-engine) + $(use_with !elibc_Cygwin hardening) #659210 + ) + + if use elibc_musl; then + # musl defines bogus values for UTMP_FILE and WTMP_FILE + # https://bugs.gentoo.org/753230 + myconf+=( --disable-utmp --disable-wtmp ) + fi + + # 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[@]}" > "${ED}"/etc/ssh/sshd_config + + # Allow client to pass locale environment variables. #367017 + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM. #658540 + AcceptEnv COLORTERM + EOF + + # Then the client config. + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config + + # Send locale environment variables. #367017 + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM. #658540 + SendEnv COLORTERM + EOF + + if use pam ; then + sed -i \ + -e "/^#UsePAM /s:.*:UsePAM yes:" \ + -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ + -e "/^#PrintMotd /s:.*:PrintMotd no:" \ + -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ + "${ED}"/etc/ssh/sshd_config || die + fi + + if use livecd ; then + sed -i \ + -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ + "${ED}"/etc/ssh/sshd_config || die + fi +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd-r1.initd sshd + newconfd "${FILESDIR}"/sshd-r1.confd sshd + + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi + + tweak_ssh_configs + + doman contrib/ssh-copy-id.1 + dodoc CREDITS OVERVIEW README* TODO sshd_config + use hpn && dodoc HPN-README + use X509 || dodoc ChangeLog + + diropts -m 0700 + dodir /etc/skel/.ssh + rmdir "${ED}"/var/empty || die + + systemd_dounit "${FILESDIR}"/sshd.{service,socket} + systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' +} + +pkg_preinst() { + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then + show_ssl_warning=1 + fi +} + +pkg_postinst() { + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if ver_test "${old_ver}" -lt "5.8_p1"; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if ver_test "${old_ver}" -lt "7.0_p1"; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if ver_test "${old_ver}" -lt "7.6_p1"; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if ver_test "${old_ver}" -lt "7.7_p1"; then + elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." + elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" + elog "if you need to authenticate against LDAP." + elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." + fi + if ver_test "${old_ver}" -lt "8.2_p1"; then + ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" + ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" + ewarn "connection is generally safe." + fi + done + + if [[ -n ${show_ssl_warning} ]]; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi + + if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + elog "" + elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" + elog "and therefore disabled at runtime per default." + elog "Make sure your sshd_config is up to date and contains" + elog "" + elog " DisableMTAES yes" + elog "" + elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." + elog "" + fi +} -- cgit v1.2.3