From 06a2593561b5f8054db8d68aa94b4338d2dd2bf6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Aug 2023 00:14:05 +0100 Subject: gentoo auto-resync : 15:08:2023 - 00:14:05 --- net-misc/Manifest.gz | Bin 54296 -> 54297 bytes net-misc/eventd/Manifest | 2 +- net-misc/eventd/eventd-0.29.0-r1.ebuild | 110 ----- net-misc/eventd/eventd-0.29.0-r2.ebuild | 103 +++++ net-misc/openssh-contrib/Manifest | 6 + .../openssh-contrib/openssh-contrib-9.4_p1.ebuild | 504 +++++++++++++++++++++ 6 files changed, 614 insertions(+), 111 deletions(-) delete mode 100644 net-misc/eventd/eventd-0.29.0-r1.ebuild create mode 100644 net-misc/eventd/eventd-0.29.0-r2.ebuild create mode 100644 net-misc/openssh-contrib/openssh-contrib-9.4_p1.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index ef606b0cafb6..b83fe06148b5 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest index 883434505ebd..2dceac20e754 100644 --- a/net-misc/eventd/Manifest +++ b/net-misc/eventd/Manifest @@ -1,3 +1,3 @@ DIST eventd-0.29.0.tar.xz 196276 BLAKE2B 5d9fd352df65a8bb00e6bf1f7600dadc1bf3d3c98ed02eb3ad3cb6148dc8370dd2bc2ecda7e2b8f60d90b7adebb2187490bb6c934bc0bf8b5d0cd38bb26a8c36 SHA512 32407049df0abba68eb6310a86f8c6ec42774bd55934e5927d92f9eb75fc11f32e790904641a0113d8668c66591a0a82246b3240ba1a9517b243301bb96227b8 -EBUILD eventd-0.29.0-r1.ebuild 2624 BLAKE2B 5d967ee2a64345248d300268dd8fc9cc40c1b3d9adbe32a16261c3c89ef6bf5fb28e616307b139fb060b7bf39ef2ac4389da26e710b03fbc5480db218d7fe8f7 SHA512 22f4b7daf5f5a4d671d546782174fb356be5bff9dfb61a580e02da285ef71d0e48a0ca62f41a665b76aa12ce3dd3f16cf5b038319830d6f59d41bf0d3e120ef7 +EBUILD eventd-0.29.0-r2.ebuild 2503 BLAKE2B 1278141b2dc4be50b84197cceadd3a31ab65d28e16f07393d40d712507a8e66ed286822d07ebeee37f7162884186cee355df1874b1f04fd0e118598e99316ba0 SHA512 159024e231111587be3a73c6cad4638ff7bd26438af6eb631ae32963d797bfd450fcd0e53b53102cec4af8017a518125ede70dd2ca86bf154a4bdb6a2364dc06 MISC metadata.xml 908 BLAKE2B 070d6de6db62dbfecb990dde8a928f4bafe44f25c208f1136a600992c90a7978787df0f77f1ed82cdc203430d428fc4371136ab13ee5672090f6cbd6cf13bf40 SHA512 db11d00d0d0d04b2265340fcf4d28d73ed053135a8c7e40b6f1fbb6c22c23a9cf777c0ba40540d38de103c04744cc4354abf0134fdb3c325e8a733179794073d diff --git a/net-misc/eventd/eventd-0.29.0-r1.ebuild b/net-misc/eventd/eventd-0.29.0-r1.ebuild deleted file mode 100644 index 0733249e9b62..000000000000 --- a/net-misc/eventd/eventd-0.29.0-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info meson systemd - -DESCRIPTION="A small daemon to act on remote or local events" -HOMEPAGE="https://www.eventd.org/" -SRC_URI="https://www.eventd.org/download/eventd/${P}.tar.xz" - -LICENSE="GPL-3+ LGPL-3+ ISC MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification - pulseaudio purple speech systemd test upnp webhook websocket +X zeroconf" - -RESTRICT="!test? ( test )" -REQUIRED_USE=" - X? ( notification ) - fbcon? ( notification ) - notification? ( || ( X fbcon ) ) - test? ( websocket ) -" - -COMMON_DEPEND=" - dev-libs/glib:2 - sys-apps/util-linux - x11-libs/libxkbcommon - introspection? ( dev-libs/gobject-introspection ) - libcanberra? ( media-libs/libcanberra ) - libnotify? ( x11-libs/gdk-pixbuf:2 ) - notification? ( - gnome-base/librsvg - x11-libs/cairo - x11-libs/pango - x11-libs/gdk-pixbuf:2 - X? ( - x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb:=[xkb(+)] - x11-libs/xcb-util - x11-libs/xcb-util-wm - ) - ) - pulseaudio? ( - media-libs/libpulse - media-libs/libsndfile - ) - purple? ( net-im/pidgin ) - speech? ( app-accessibility/speech-dispatcher ) - systemd? ( sys-apps/systemd:= ) - upnp? ( >=net-libs/gssdp-1.2:0= ) - webhook? ( net-libs/libsoup:3.0 ) - websocket? ( net-libs/libsoup:3.0 ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND=" - ${COMMON_DEPEND} - fbcon? ( virtual/os-headers ) -" -RDEPEND=" - ${COMMON_DEPEND} - net-libs/glib-networking[ssl] -" -BDEPEND=" - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - virtual/pkgconfig -" - -pkg_setup() { - if use ipv6; then - CONFIG_CHECK=$(usex test 'IPV6' '~IPV6') - linux-info_pkg_setup - fi -} - -src_configure() { - # wayland disabled due to missing dep in ::gentoo, wayland-wall - local emesonargs=( - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - -Ddbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" - -Dnd-wayland=false - -Dvapi=false - $(meson_feature websocket) - $(meson_feature zeroconf dns-sd) - $(meson_feature upnp ssdp) - $(meson_use ipv6) - $(meson_use systemd) - $(meson_use notification notification-daemon) - $(meson_use X nd-xcb) - $(meson_use fbcon nd-fbdev) - $(meson_use purple im) - $(meson_use pulseaudio sound) - $(meson_use speech tts) - $(meson_use webhook) - $(meson_use libnotify) - $(meson_use libcanberra) - $(meson_use introspection gobject-introspection) - $(meson_use debug debug-output) - ) - - meson_src_configure -} - -src_test() { - EVENTD_TESTS_TMP_DIR="${T}" meson_src_test -} diff --git a/net-misc/eventd/eventd-0.29.0-r2.ebuild b/net-misc/eventd/eventd-0.29.0-r2.ebuild new file mode 100644 index 000000000000..0c6729f4ee5b --- /dev/null +++ b/net-misc/eventd/eventd-0.29.0-r2.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info meson systemd + +DESCRIPTION="A small daemon to act on remote or local events" +HOMEPAGE="https://www.eventd.org/" +SRC_URI="https://www.eventd.org/download/eventd/${P}.tar.xz" + +LICENSE="GPL-3+ LGPL-3+ ISC MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug fbcon +introspection libcanberra libnotify +notification + pulseaudio purple speech systemd test upnp webhook websocket +X zeroconf" + +RESTRICT="!test? ( test )" +REQUIRED_USE=" + X? ( notification ) + fbcon? ( notification ) + notification? ( || ( X fbcon ) ) + test? ( websocket ) +" + +COMMON_DEPEND=" + dev-libs/glib:2 + sys-apps/util-linux + x11-libs/libxkbcommon + introspection? ( dev-libs/gobject-introspection ) + libcanberra? ( media-libs/libcanberra ) + libnotify? ( x11-libs/gdk-pixbuf:2 ) + notification? ( + gnome-base/librsvg + x11-libs/cairo + x11-libs/pango + x11-libs/gdk-pixbuf:2 + X? ( + x11-libs/cairo[X,xcb(+)] + x11-libs/libxcb:=[xkb(+)] + x11-libs/xcb-util + x11-libs/xcb-util-wm + ) + ) + pulseaudio? ( + media-libs/libpulse + media-libs/libsndfile + ) + purple? ( net-im/pidgin ) + speech? ( app-accessibility/speech-dispatcher ) + systemd? ( sys-apps/systemd:= ) + upnp? ( net-libs/gssdp:1.6= ) + webhook? ( net-libs/libsoup:3.0 ) + websocket? ( net-libs/libsoup:3.0 ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND=" + ${COMMON_DEPEND} + fbcon? ( virtual/os-headers ) +" +RDEPEND=" + ${COMMON_DEPEND} + net-libs/glib-networking[ssl] +" +BDEPEND=" + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig +" + +src_configure() { + # wayland disabled due to missing dep in ::gentoo, wayland-wall + local emesonargs=( + -Dsystemduserunitdir="$(systemd_get_userunitdir)" + -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" + -Ddbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" + -Dnd-wayland=false + -Dvapi=false + $(meson_feature websocket) + $(meson_feature zeroconf dns-sd) + $(meson_feature upnp ssdp) + -Dipv6=true + $(meson_use systemd) + $(meson_use notification notification-daemon) + $(meson_use X nd-xcb) + $(meson_use fbcon nd-fbdev) + $(meson_use purple im) + $(meson_use pulseaudio sound) + $(meson_use speech tts) + $(meson_use webhook) + $(meson_use libnotify) + $(meson_use libcanberra) + $(meson_use introspection gobject-introspection) + $(meson_use debug debug-output) + ) + + meson_src_configure +} + +src_test() { + EVENTD_TESTS_TMP_DIR="${T}" meson_src_test +} diff --git a/net-misc/openssh-contrib/Manifest b/net-misc/openssh-contrib/Manifest index 7a21291f42f0..29441c6c1ff2 100644 --- a/net-misc/openssh-contrib/Manifest +++ b/net-misc/openssh-contrib/Manifest @@ -31,6 +31,12 @@ DIST openssh-9.3p1.tar.gz 1856839 BLAKE2B 45578edf98bba3d23c7cefe60d8a7d3079e7c6 DIST openssh-9.3p1.tar.gz.asc 833 BLAKE2B e6533d64b117a400b76b90f71fa856d352dea57d91e4e89fa375429403ac0734cc0a2f075bc58c6bb4f40a8f9776735aa36bdb0bbf3880a2115cea787633e48b SHA512 6222378eb24a445c6c1db255392b405f5369b1af0e92f558d4ba05b0d83ab0d084cb8f4b91d7ae8636f333d970638a6635e2bc7af885135dd34992d87f2ef1f4 DIST openssh-9.3p2.tar.gz 1835850 BLAKE2B 38f8d4ada263112b318fafccabf0a33a004d8290a867434004eb3d37127c9bdabe6e0225fca9d6d68fb54338fec81dcc9313ca7c91d3a033311db44174dc9f6f SHA512 15b8c57aa120186f1d1c3c2b8dc6ffd26733e12f755a6b0a4255d9ec1815a61506275ff5723b4ac029e44bc2ad22852ac36e1101f292348fbfa79aa1a4cd3f35 DIST openssh-9.3p2.tar.gz.asc 833 BLAKE2B cfba3867d7f97cb2c904bd3ae111bd63e8a050464b66e3f3f22390839a153d57ef5819182f8ad99a6b520f27881143552dc64fccfc33dcc0483ffe1ef33a5a47 SHA512 759e512a36a3a62264803b517298a65c83e1daebd9867e28ea1ca4999c38539368815ccda86540a4f5d45fa79c539d8242995ba55f2918baf2a7404c105e337a +DIST openssh-9.4_p1-X509-glue-14.2.patch.xz 784 BLAKE2B b559cc7132a85baf8984088769be7f84c86ca2c5d91eba0412882615f86d0f405b3790c6dfb35111cab7150780b8b3ce2120e30a1f1d078f6308dfca47470ef6 SHA512 8faaba8444fd795a64d3ecb91ffea9e754d2688039dc8b5d8d085a91671860884c0fa1bd568d1ed62f2cd1f328564f2fb3e467e4288aa6e5a37024bcfa70522e +DIST openssh-9.4_p1-hpn-15.2-X509-14.2-glue.patch.xz 5144 BLAKE2B 324dff4cccc027825b8400225cf322a6882caca30aa567a1bea405142ff9f9ed143b837ef8082011342ae6d22033c22e34499f930d0b9ca1e3c241cac7c15e99 SHA512 e63b2187d3f210ce897b6696b02a364f4f212c1290f7b9bbcceeb15325555427254c54366b7da059ce3cf99e595457e69d8edff4fcb7c18021c7530dea1df4bb +DIST openssh-9.4p1+x509-14.2.diff.gz 1219074 BLAKE2B ea31ef87a5a450c1e8785f4eeb27f2bfb7a2ac187e10c35dc814cdad139645e52a577b238dc8bcb9c2cb001ee6ab29d88fb056b4ff772b3660c5cf9fa4fc2380 SHA512 53cc58618f57e6011f0ae2484b56e8888f7fc971f39aaf248a0e0a4361e28d0e170a7d4e3b97efe7c5f2848d845cfe970b8511e876d2b9bcb1cecbf01bedd972 +DIST openssh-9.4p1.tar.gz 1845094 BLAKE2B d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53 SHA512 0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25 +DIST openssh-9.4p1.tar.gz.asc 833 BLAKE2B 95eedd9356766e5d0ea1261da3dc4c7869f054b418c626fb35815a0aa655b1ddbf54436b437d98c4344b05c9196c8fa1f592eac07b3ccf08bd3e980f8b6955af SHA512 983b4ebaa3b98e70831ce686cb503270926c065163a2510eef0c5102ef50b6e665b889ee15ea8c0bd7c4bbddb19270f036e1d554a8212ef2c292f9c682c8631a EBUILD openssh-contrib-9.3_p1.ebuild 18994 BLAKE2B afee1f257fbfd229f18bfa22e91a99444b747110a42adcc5710c724442bd50d8816c82e87566e4c57d5ec28cb6a12b04e2257694487edb39fc9e70833a559143 SHA512 70eaf3cadb5d79247d876878233392f5add412dd5a6a4a6840394dabb3021ca33a5a3ef730cdc8228f245ab0e9a3386c7517377ee47ad1c3d639606e18bbb5d4 EBUILD openssh-contrib-9.3_p2.ebuild 17927 BLAKE2B cbcdb1bc84c18f3551d96750f5f50df126973b989c956f4c5750248e0f5e78b7a0880f78d24ed911185e428ea2cebd89647ede9680764a6ba289fc78f090f4d5 SHA512 cfee637d196c87f1ecd7eb062f4c04944c75149f19fd219728396b50cdc372c3666dfb56fe9b5e4daa66bba46758988afc624f59bd9cf4f342e4f1a340d1679a +EBUILD openssh-contrib-9.4_p1.ebuild 17794 BLAKE2B 075868a5c2bb6a3deea87f70880faac497a86f4677bff488a3c98751a4f7de846888f148c4a6c3709a8e478198fbeb3a6d52d1556abb7b8ccb53d095df590063 SHA512 9971d0d10a60111ddb3daa50e97acb9bd92828e63cb617667b218f32e33b6c0bd9c8f43b5bf1a1bf5e35632e5194925858370bc4b71a99ec192ee3141bd72fb1 MISC metadata.xml 2975 BLAKE2B 068d52ba2e5de0b696e7fe995e4c2a041206a59258f24704ca3a72fe1d85323c2aad7899f055b48a4045d6303491822c59f2b86b85fc428a26f8259ea583796a SHA512 83fef701188c00af53382b5099fc2ebf83c903c3edefc3d2cf6deb0a667c0d0d9531c18728eef9b5b703903d31fbdb55a68e5b76890ea090bc1d79fef3ae6b89 diff --git a/net-misc/openssh-contrib/openssh-contrib-9.4_p1.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.4_p1.ebuild new file mode 100644 index 000000000000..402849e5c957 --- /dev/null +++ b/net-misc/openssh-contrib/openssh-contrib-9.4_p1.ebuild @@ -0,0 +1,504 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig + +# Make it more portable between straight releases +# and _p? releases. +MY_P=${P/-contrib/} +PARCH=${MY_P/_} + +# PV to USE for HPN patches +#HPN_PV="${PV^^}" +HPN_PV="8.5_P1" + +HPN_VER="15.2" +HPN_PATCHES=( + openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff + openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff +) +HPN_GLUE_PATCH="openssh-9.3_p2-hpn-${HPN_VER}-glue.patch" +HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}" + +X509_VER="14.2" +X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" +X509_PATCH="${X509_PATCH/p2/p1}" +X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch" +X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch" + +DESCRIPTION="Port of OpenBSD's free SSH release with HPN/X509 patches" +HOMEPAGE="https://www.openssh.com/" +SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + ${HPN_VER:+hpn? ( + $(printf "mirror://sourceforge/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" "${HPN_PATCHES[@]}") + https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz + )} + ${X509_VER:+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="~amd64" +# 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 security-key selinux +ssl static test X X509 xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + hpn? ( ssl ) + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + X509? ( ssl !xmss ) + xmss? ( ssl ) + test? ( ssl ) +" + +# tests currently fail with XMSS +REQUIRED_USE+="test? ( !xmss )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + net-libs/ldns[ecdsa(+),ssl(+)] + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + 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=" + !net-misc/openssh + 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}/openssh-7.9_p1-include-stdlib.patch" + "${FILESDIR}/openssh-8.7_p1-GSSAPI-dns.patch" #165444 integrated into gsskex + "${FILESDIR}/openssh-6.7_p1-openssl-ignore-status.patch" + "${FILESDIR}/openssh-7.5_p1-disable-conch-interop-tests.patch" + "${FILESDIR}/openssh-8.0_p1-fix-putty-tests.patch" + "${FILESDIR}/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" + "${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019 +) + +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 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}/openssh-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 hpn ; then + local hpn_patchdir="${T}/openssh-${PV}-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}" + 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 + # Before re-enabling, check https://bugs.gentoo.org/354113#c6 + # and be sure to have tested it. + 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 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 + + 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 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 + --with-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) + $(usex X509 '' "$(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 + # 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/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 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.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() { + 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 + + 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