Diff openssh-10.2_p1 with a openssh-10.4_p1-r1

/usr/portage/net-misc/openssh/openssh-10.4_p1-r1.ebuild 2026-09-03 20:03:05.299884381 +0300
1
# Copyright 1999-2025 Gentoo Authors
1
# Copyright 1999-2026 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI=8
......
14 14
PARCH=${P/_}
15 15

  
16 16
DESCRIPTION="Port of OpenBSD's free SSH release"
17
HOMEPAGE="https://www.openssh.com/"
17
HOMEPAGE="https://www.openssh.org/"
18 18
SRC_URI="
19 19
	mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
20 20
	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
......
23 23

  
24 24
LICENSE="BSD GPL-2"
25 25
SLOT="0"
26
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
26
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
27 27
# Probably want to drop ssl defaulting to on in a future version.
28
IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam security-key selinux +ssl static test"
28
IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam seccomp security-key selinux +ssl static test"
29 29

  
30 30
RESTRICT="!test? ( test )"
31 31

  
......
77 77
	"${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch"
78 78
	"${FILESDIR}/${PN}-9.7_p1-config-tweaks.patch"
79 79
	# Backports from upstream release branch
80
	#"${FILESDIR}/${PV}"
80
	"${FILESDIR}/${PV}"
81 81
	# Our own backports
82 82
)
83 83

  
......
206 206
		$(use_with selinux)
207 207
		$(use_with security-key security-key-builtin)
208 208
		$(use_with ssl openssl)
209
		$(use_with ssl ssl-engine)
210 209
	)
211 210

  
211
	if has_version "<dev-libs/openssl-4" ; then
212
		# bug #973058
213
		myconf+=( $(use_with ssl ssl-engine) )
214
	fi
215

  
212 216
	if use elibc_musl; then
213 217
		# musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230)
214 218
		myconf+=( --disable-utmp --disable-wtmp )
215 219
	fi
216 220

  
221
	if use kernel_linux; then
222
		# OpenSSH aborts if prctl(PR_SET_SECCOMP) fails (bug 980784)
223
		myconf+=( $(use_with seccomp sandbox seccomp_filter) )
224
	fi
225

  
217 226
	econf "${myconf[@]}"
218 227
}
219 228

  
......
304 313
	emake install-nokeys DESTDIR="${D}"
305 314
	fperms 600 /etc/ssh/sshd_config
306 315
	dobin contrib/ssh-copy-id
307
	newinitd "${FILESDIR}"/sshd-r1.initd sshd
308
	newconfd "${FILESDIR}"/sshd-r1.confd sshd
316
	newinitd "${FILESDIR}"/sshd-r2.initd sshd
317
	newconfd "${FILESDIR}"/sshd-r2.confd sshd
309 318
	exeinto /etc/user/init.d
310 319
	newexe "${FILESDIR}"/ssh-agent.initd ssh-agent
311 320

  
......
387 396
		ewarn "If you have a web-facing setup or are concerned about security, it is recommended to"
388 397
		ewarn "set 'Restart=no' in your sshd unit file."
389 398
	fi
399
	if ver_replacing -lt "10.2_p1-r1"; then
400
		ewarn "The sshd init script no longer greps for ListenAddress in the sshd config."
401
		ewarn "If you have configured the ListenAddress parameter, you may need to adjust"
402
		ewarn "init script dependencies via rc_need in /etc/conf.d/sshd."
403
	fi
390 404

  
391 405
	if [[ -n ${show_ssl_warning} ]]; then
392 406
		elog "Be aware that by disabling openssl support in openssh, the server and clients"
Thank you!