summaryrefslogtreecommitdiff
path: root/net-misc
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/Manifest.gzbin53356 -> 53366 bytes
-rw-r--r--net-misc/chrony/Manifest6
-rw-r--r--net-misc/chrony/chrony-4.5.ebuild272
-rw-r--r--net-misc/chrony/chrony-4.6.ebuild272
-rw-r--r--net-misc/geoipupdate/Manifest6
-rw-r--r--net-misc/geoipupdate/geoipupdate-4.9.0.ebuild44
-rw-r--r--net-misc/geoipupdate/geoipupdate-6.0.0.ebuild48
-rw-r--r--net-misc/openssh/Manifest5
-rw-r--r--net-misc/openssh/openssh-9.9_p1.ebuild439
-rw-r--r--net-misc/openssh/openssh-9.9_p2.ebuild2
-rw-r--r--net-misc/r8152/Manifest2
-rw-r--r--net-misc/r8152/r8152-2.19.2.ebuild54
-rw-r--r--net-misc/streamlink/Manifest2
-rw-r--r--net-misc/streamlink/streamlink-6.11.0.ebuild76
-rw-r--r--net-misc/sunshine/Manifest3
-rw-r--r--net-misc/sunshine/files/sunshine-0.23.1-amf.patch17
-rw-r--r--net-misc/sunshine/sunshine-0.23.1.ebuild3
17 files changed, 79 insertions, 1172 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 854e269b1ec8..b32eefab48c8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 1f63e2d09be4..f3822496e290 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -3,14 +3,8 @@ AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1
AUX chrony-4.2-systemd-gentoo.patch 538 BLAKE2B 70d3bb2a190aa2401ff566dd88d1cace1d3573261819d082863fe310bb16507fcc1497fd31ec24033cb9dbe8356aef416d91b36df6067fd37f4273e59bc4e330 SHA512 62e54e1c16380812b3cf11a84091e134401341a4a64dda806af1a52dfa4158912adc4c2524388956f67a44e095e893ed714a2eee15650080c38ce44d2bc279ec
AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea7106356083cf1a20bdb8fd4b85bd8cce8cf20ce6839e8788fedc1f94e912ec512193988f83283ceef86d6cfc7 SHA512 ab0bbd07c17e391d068c5a37d5f8d9c8fc2c42add2700869217a95784666bd3f23bebd70942cf11b42c124e0947f68c101153998e89bc61ccb71b30a0187cf0c
AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
-DIST chrony-4.5.tar.gz 620287 BLAKE2B e89665e6ff700805b41f89e9349d280579aebab31a30817512a165da939c8f39dc55ef9a17a50e3d7e298015620667638ab119901a71868a9188093606a95d32 SHA512 58a449e23186da799064b16ab16f799c1673296984b152b43e87c620d86e272c55365e83439d410fc89e4e0ba0befd7d5c625eac78a6665813b7ea75444f71b5
-DIST chrony-4.5.tar.gz.asc 833 BLAKE2B 7d680a4f5d86335b067b95cb900761615180701cabae5978d6f924063f7a43748534bb2e4f23cd9cd2e6919ed005014db6d396330fbfb5aa6d5f1c46f3c0c3a0 SHA512 05470e6cc34524fdab494f70cee71d46172b38bdd4acd8173ac79fdec12178239248880db474437690094aae7909002113289ac7f9305130c5e0a1d9364122cb
DIST chrony-4.6.1.tar.gz 636076 BLAKE2B cc1299ba680eae158da9ebc6d4451ffc8b352b9b0da47056e4ccd21495589d88ee9f8cb9ef8508e7c1a1b0a14b6679453a6d324111308a00888123a265eca788 SHA512 646ae08f2587366236796f2399d8ab3eb570979e0d82f5d13f5cec49939054c876cc93dc20c8d38e105fd3500e1720d05a223a15076783cd882d0de43afd9c7e
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 6956 BLAKE2B 88eaad933c02308a9343d7fcb36b2b18e84c66c5a8773bcf8a0b039f4645107eb724bd2815311a5667db5d5e9d98aaa48f1852ce388bb761d562ebc385583d0c SHA512 75e0a7a311b6851e852b772d04f1ad325c8b5ccc2be215da3d7a0aa3a2152253a03b83859ac21895cdb1e0b50bece15b23d51adc025d5c680b70fc38a6c8f217
EBUILD chrony-4.6.1.ebuild 6956 BLAKE2B 88eaad933c02308a9343d7fcb36b2b18e84c66c5a8773bcf8a0b039f4645107eb724bd2815311a5667db5d5e9d98aaa48f1852ce388bb761d562ebc385583d0c SHA512 75e0a7a311b6851e852b772d04f1ad325c8b5ccc2be215da3d7a0aa3a2152253a03b83859ac21895cdb1e0b50bece15b23d51adc025d5c680b70fc38a6c8f217
-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
deleted file mode 100644
index e33e867ea9c0..000000000000
--- a/net-misc/chrony/chrony-4.5.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="https://chrony-project.org/"
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://gitlab.com/chrony/chrony.git"
- inherit git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc
- inherit verify-sig
-
- SRC_URI="https://chrony-project.org/releases/${P/_/-}.tar.gz"
- SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
-
- if [[ ${PV} != *_pre* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86"
- fi
-fi
-
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux"
-# nettle > nss > libtomcrypt in configure
-REQUIRED_USE="
- sechash? ( || ( nettle nss libtomcrypt ) )
- nettle? ( !nss )
- nss? ( !nettle )
- libtomcrypt? ( !nettle !nss )
- !sechash? ( !nss )
- !sechash? ( !nts? ( !nettle ) )
-"
-
-DEPEND="
- caps? (
- sys-libs/libcap
- )
- libtomcrypt? ( dev-libs/libtomcrypt:= )
- nettle? ( dev-libs/nettle:= )
- nss? ( dev-libs/nss:= )
- nts? ( net-libs/gnutls:= )
- pps? ( net-misc/pps-tools )
- readline? ( dev-libs/libedit )
- seccomp? ( sys-libs/libseccomp )
-"
-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? (
- nettle? ( virtual/pkgconfig )
- nss? ( virtual/pkgconfig )
- )
-"
-
-if [[ ${PV} == 9999 ]] ; then
- # Needed for doc generation in 9999
- REQUIRED_USE+=" html"
- BDEPEND+="
- app-alternatives/yacc
- virtual/w3m
- "
-else
- BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
-fi
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
- "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
- # FP, checks with macro afterwards (bug #907877)
- recvmmsg
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
- doc/* examples/* || die
-
- cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
-}
-
-src_configure() {
- if ! use caps ; then
- sed -i \
- -e 's/ -u ntp//' \
- "${T}"/chronyd.conf examples/chronyd.service || die
- fi
-
- if ! use seccomp ; then
- sed -i \
- -e 's/ -F 2//' \
- "${T}"/chronyd.conf examples/chronyd.service || die
- fi
-
- tc-export CC PKG_CONFIG
-
- # Update from time to time with output from "date +%s"
- # on a system that is time-synced.
- export SOURCE_DATE_EPOCH=1607976314
-
- # Not an autotools generated script
- local myconf=(
- $(use_enable seccomp scfilter)
-
- $(usev !caps '--disable-linuxcaps')
- $(usev !cmdmon '--disable-cmdmon')
- $(usev debug '--enable-debug')
-
- # USE=readline here means "readline-like functionality"
- # chrony only supports libedit in terms of the library providing
- # it.
- $(usev !readline '--without-editline --disable-readline')
-
- $(usev !libtomcrypt '--without-tomcrypt')
- $(usev !nettle '--without-nettle')
- $(usev !nss '--without-nss')
- $(usev !ntp '--disable-ntp')
- $(usev !nts '--disable-nts')
- $(usev !nts '--without-gnutls')
- $(usev !phc '--disable-phc')
- $(usev !pps '--disable-pps')
- $(usev !refclock '--disable-refclock')
- $(usev !rtc '--disable-rtc')
- $(usev samba '--enable-ntp-signd')
- $(usev !sechash '--disable-sechash')
-
- --chronysockdir="${EPREFIX}/run/chrony"
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- --mandir="${EPREFIX}/usr/share/man"
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc/chrony"
- --with-hwclockfile="${EPREFIX}/etc/adjtime"
- --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-
- ${EXTRA_ECONF}
- )
-
- # Print the ./configure call
- edo ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
- if [[ ${PV} == 9999 ]] ; then
- # Uses w3m
- emake -C doc man txt
- fi
-
- emake all docs $(usev !html 'ADOC=true')
-}
-
-src_install() {
- default
-
- # Compatibility with other distributions who install to /etc/chrony.conf (bug #835461)
- dosym -r /etc/chrony/chrony.conf /etc/chrony.conf
-
- newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
- newconfd "${T}"/chronyd.conf chronyd
-
- insinto /etc/${PN}
- newins examples/chrony.conf.example1 chrony.conf
-
- docinto examples
- dodoc examples/*.example*
-
- newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
-
- if use html ; then
- docinto html
- dodoc doc/*.html
- fi
-
- keepdir /var/{lib,log}/chrony
-
- if use caps ; then
- # Prepare a directory for the chrony.drift file (a la ntpsec)
- # Ensures the environment is sane on new installs
- # bug #711058
- fowners -R ntp:ntp /var/{lib,log}/chrony
- fperms -R 770 /var/lib/chrony
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
- systemd_dounit examples/chronyd.service
- systemd_dounit examples/chrony-wait.service
- systemd_enable_ntpunit 50-chrony chronyd.service
-}
-
-pkg_preinst() {
- HAD_CAPS=0
- HAD_SECCOMP=0
- HAD_PRE_NEW_SECCOMP_LEVEL=0
-
- # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
- # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
- if has_version 'net-misc/chrony[caps]' ; then
- HAD_CAPS=1
- fi
-
- if has_version 'net-misc/chrony[seccomp]' ; then
- HAD_SECCOMP=1
- fi
-
- if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
- # This version introduced a new filter level: -F 2
- # It's a limited set of seccomp filters designed to be 'bare minimum'
- HAD_PRE_NEW_SECCOMP_LEVEL=1
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process chronyd.conf
-
- if [[ -n "${REPLACING_VERSIONS}" ]] ; then
- if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
- # bug #719876
- ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
- ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
- ewarn "This is necessary for chrony to drop privileges"
- elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
- ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
- fi
- fi
-
- # See bug #783915 for general discussion on enabling seccomp filtering
- # by default.
- local show_seccomp_enable_msg=0
-
- # Was seccomp disabled before and now enabled?
- if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
- show_seccomp_enable_msg=1
- fi
-
- # Are we coming from an old version without the new 'minimal' filter?
- # (-F 2)
- if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
- show_seccomp_enable_msg=1
- fi
-
- if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
- elog "To enable seccomp in a stricter mode, please modify:"
- elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC"
- elog "- systemctl edit chronyd for systemd"
- elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
- elog "By default, we now use -F 2 which is a baseline/minimal filter."
- fi
-}
diff --git a/net-misc/chrony/chrony-4.6.ebuild b/net-misc/chrony/chrony-4.6.ebuild
deleted file mode 100644
index e33e867ea9c0..000000000000
--- a/net-misc/chrony/chrony-4.6.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="https://chrony-project.org/"
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://gitlab.com/chrony/chrony.git"
- inherit git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc
- inherit verify-sig
-
- SRC_URI="https://chrony-project.org/releases/${P/_/-}.tar.gz"
- SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
-
- if [[ ${PV} != *_pre* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86"
- fi
-fi
-
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux"
-# nettle > nss > libtomcrypt in configure
-REQUIRED_USE="
- sechash? ( || ( nettle nss libtomcrypt ) )
- nettle? ( !nss )
- nss? ( !nettle )
- libtomcrypt? ( !nettle !nss )
- !sechash? ( !nss )
- !sechash? ( !nts? ( !nettle ) )
-"
-
-DEPEND="
- caps? (
- sys-libs/libcap
- )
- libtomcrypt? ( dev-libs/libtomcrypt:= )
- nettle? ( dev-libs/nettle:= )
- nss? ( dev-libs/nss:= )
- nts? ( net-libs/gnutls:= )
- pps? ( net-misc/pps-tools )
- readline? ( dev-libs/libedit )
- seccomp? ( sys-libs/libseccomp )
-"
-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? (
- nettle? ( virtual/pkgconfig )
- nss? ( virtual/pkgconfig )
- )
-"
-
-if [[ ${PV} == 9999 ]] ; then
- # Needed for doc generation in 9999
- REQUIRED_USE+=" html"
- BDEPEND+="
- app-alternatives/yacc
- virtual/w3m
- "
-else
- BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
-fi
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
- "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
- # FP, checks with macro afterwards (bug #907877)
- recvmmsg
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
- doc/* examples/* || die
-
- cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
-}
-
-src_configure() {
- if ! use caps ; then
- sed -i \
- -e 's/ -u ntp//' \
- "${T}"/chronyd.conf examples/chronyd.service || die
- fi
-
- if ! use seccomp ; then
- sed -i \
- -e 's/ -F 2//' \
- "${T}"/chronyd.conf examples/chronyd.service || die
- fi
-
- tc-export CC PKG_CONFIG
-
- # Update from time to time with output from "date +%s"
- # on a system that is time-synced.
- export SOURCE_DATE_EPOCH=1607976314
-
- # Not an autotools generated script
- local myconf=(
- $(use_enable seccomp scfilter)
-
- $(usev !caps '--disable-linuxcaps')
- $(usev !cmdmon '--disable-cmdmon')
- $(usev debug '--enable-debug')
-
- # USE=readline here means "readline-like functionality"
- # chrony only supports libedit in terms of the library providing
- # it.
- $(usev !readline '--without-editline --disable-readline')
-
- $(usev !libtomcrypt '--without-tomcrypt')
- $(usev !nettle '--without-nettle')
- $(usev !nss '--without-nss')
- $(usev !ntp '--disable-ntp')
- $(usev !nts '--disable-nts')
- $(usev !nts '--without-gnutls')
- $(usev !phc '--disable-phc')
- $(usev !pps '--disable-pps')
- $(usev !refclock '--disable-refclock')
- $(usev !rtc '--disable-rtc')
- $(usev samba '--enable-ntp-signd')
- $(usev !sechash '--disable-sechash')
-
- --chronysockdir="${EPREFIX}/run/chrony"
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- --mandir="${EPREFIX}/usr/share/man"
- --prefix="${EPREFIX}/usr"
- --sysconfdir="${EPREFIX}/etc/chrony"
- --with-hwclockfile="${EPREFIX}/etc/adjtime"
- --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-
- ${EXTRA_ECONF}
- )
-
- # Print the ./configure call
- edo ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
- if [[ ${PV} == 9999 ]] ; then
- # Uses w3m
- emake -C doc man txt
- fi
-
- emake all docs $(usev !html 'ADOC=true')
-}
-
-src_install() {
- default
-
- # Compatibility with other distributions who install to /etc/chrony.conf (bug #835461)
- dosym -r /etc/chrony/chrony.conf /etc/chrony.conf
-
- newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
- newconfd "${T}"/chronyd.conf chronyd
-
- insinto /etc/${PN}
- newins examples/chrony.conf.example1 chrony.conf
-
- docinto examples
- dodoc examples/*.example*
-
- newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
-
- if use html ; then
- docinto html
- dodoc doc/*.html
- fi
-
- keepdir /var/{lib,log}/chrony
-
- if use caps ; then
- # Prepare a directory for the chrony.drift file (a la ntpsec)
- # Ensures the environment is sane on new installs
- # bug #711058
- fowners -R ntp:ntp /var/{lib,log}/chrony
- fperms -R 770 /var/lib/chrony
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
- systemd_dounit examples/chronyd.service
- systemd_dounit examples/chrony-wait.service
- systemd_enable_ntpunit 50-chrony chronyd.service
-}
-
-pkg_preinst() {
- HAD_CAPS=0
- HAD_SECCOMP=0
- HAD_PRE_NEW_SECCOMP_LEVEL=0
-
- # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
- # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
- if has_version 'net-misc/chrony[caps]' ; then
- HAD_CAPS=1
- fi
-
- if has_version 'net-misc/chrony[seccomp]' ; then
- HAD_SECCOMP=1
- fi
-
- if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
- # This version introduced a new filter level: -F 2
- # It's a limited set of seccomp filters designed to be 'bare minimum'
- HAD_PRE_NEW_SECCOMP_LEVEL=1
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process chronyd.conf
-
- if [[ -n "${REPLACING_VERSIONS}" ]] ; then
- if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
- # bug #719876
- ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
- ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
- ewarn "This is necessary for chrony to drop privileges"
- elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
- ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
- fi
- fi
-
- # See bug #783915 for general discussion on enabling seccomp filtering
- # by default.
- local show_seccomp_enable_msg=0
-
- # Was seccomp disabled before and now enabled?
- if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
- show_seccomp_enable_msg=1
- fi
-
- # Are we coming from an old version without the new 'minimal' filter?
- # (-F 2)
- if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
- show_seccomp_enable_msg=1
- fi
-
- if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
- elog "To enable seccomp in a stricter mode, please modify:"
- elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC"
- elog "- systemctl edit chronyd for systemd"
- elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
- elog "By default, we now use -F 2 which is a baseline/minimal filter."
- fi
-}
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index cae6868f0ed1..76dba2c9ee6a 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,11 +1,5 @@
AUX geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch 944 BLAKE2B e81f8bcae03324288af919326e05f857caa7b9c768282e46b63bca6cb4bc25f1477a6ed0111d4ff8274cec21ef51977a439aacf002acdd6e910a12d05a0f8e15 SHA512 3838b2fde45be7c40b0ffe0a049be0e108aa0f0d80c2aa9806122a68511cac6d971be29af02722d8f5036c49a0ceb1cb0eee2b845cfe47151227abe081537a07
-DIST geoipupdate-4.9.0-deps.tar.xz 911156 BLAKE2B 136df3a0e94ab0934b48e8860b152edacffae093d26bdbe9593c24f540ce0d6cff215e4cf4ea158bd8dc9a9f3157d5634fea4d66315c5dbc537b42041d0625e6 SHA512 88579ba0e804d7dd9f6cab24d2ac01186f39c47f1ae79d395a77b0725d25e8675928ce34532506f164157cbce4fb2e947efbd2e66c23ed18d61bc67be74ce74d
-DIST geoipupdate-4.9.0.tar.gz 36646 BLAKE2B 9eb5e16c39e8c599d3b0fa60804f179d1fb726c44f9f4ed4ed6ff3b853c31c9dece809dcd690e14157f1290c4a9088e696e967f3baeeb7f2762638c70aad6b6a SHA512 29d0639fe636885b1527b4cb795332c103c011d028ada80eb7b07805d91f575554fc0b9fa9a506c644236a2ceab5509f54f0cc1a03a300480350c520484d959c
-DIST geoipupdate-6.0.0-deps.tar.xz 864256 BLAKE2B 6f9a7adf4bfef6c38a06b3f5e8b49362218dd8b698eec29921ac1d587094c49b26bc307924327600cb06327aae7171a6865cc79134eddee9e08004a82dfcbb84 SHA512 678ecb798b9b736a82d3e2b64c426e966408bbf3858a32e84dd142f0392444248c34c78dec07a5f8c0f04752c965c5cfb1602d96a541462e40a4c84039c71237
-DIST geoipupdate-6.0.0.tar.gz 46523 BLAKE2B ff14026acf39797f69b7cde527c826b78740a65ac4e0914cdffc6276473e3f4367e87e962dfa4634114b7f5b02c33a4a8e675518f4de85238a2342cb367c9f25 SHA512 2b2a6573b6af30ad1ad4c8ed3b97df41bba96212a0e6d90e4a92bd0615f02c9e989168ad56a651d8f35a7d2534e223de5a6f8a34d587f3c8a7a8e19f3b913ca4
DIST geoipupdate-6.1.0-deps.tar.xz 866588 BLAKE2B aabda8132d0f8866e3450b5c2f07dccc7b1555cac0a987fea48ffe3f07a8c66c72bb41ca1478d47f03cb61bd29a6183bd0621126222decc4e29b8525c3ba991e SHA512 4a03b35258dc77659471299fe119da1e435b1360df08b0b8a19f6374e3880c1c6153fcdb5146f74900ebf540c2c66a3007228f05b702f526ed9e75e01f51f98d
DIST geoipupdate-6.1.0.tar.gz 47557 BLAKE2B ef33058f8504c06dc2c2a350421866cd88a6b87624874cf6bd29d99c77637c3b99468a6ba615d71310e0c5d49d6ee2820d9a3841c1127437fa602864a014d77d SHA512 b20a3101fb055ed71fe999fe924b71f6d0eb76da8bc4444f7281a3deceac1ee7d1854f3d672b93edabf152cc69551933dd951419ab484259d47f56b243e568eb
-EBUILD geoipupdate-4.9.0.ebuild 1172 BLAKE2B b2f103b2a8ebb3c393941ee89ee1d9a65d9424e95394ccaa7274a8864849ed0f3577cfebf844ed33ec6fd3d6892511a20a2747fd413f4e0ff00d4ff7ebf3b721 SHA512 e35c5e850809341c25db52843ca9bf8531a7caa86d750607f32805ddb5e3c1018ac5d57616d50a0453b5addaa1f701bf8e363a667bfd0d1ef0f75c7e026700b2
-EBUILD geoipupdate-6.0.0.ebuild 1119 BLAKE2B 449e37ff1b7c580a417b2d574f1b8e7e23e43a70d8d682d3dd28bbb84e7ed4dc36f1b0cbb381dee6c5e5bf2dab4174937945e621da14e91a73de8d4ef0cffdd5 SHA512 95dcfa44e74b8ec4a0447aea2ee4fc2719b80d9e2ab4b64431c670065878bb872311937d7511fcf6b5a01b62294fa7cbe0bbd01a2b89f777cb9a35d39b1ba165
EBUILD geoipupdate-6.1.0.ebuild 1172 BLAKE2B 0fe1ab70dd3a4463434567746fab112d6c198428146adadc8580d0ebd588433b64b73066f83d3a1f933e929fceadbf8bf6f4d353b40d1d1ec717ca10f37fb041 SHA512 b12976cd0ea25d43bd64304f0c9f5c2b13659f7ad2d36cfa1ade893ad068468c72da5adaa2c6fa586c3254353b62b80405a62799131c964acb24ea456a4143e9
MISC metadata.xml 365 BLAKE2B fe03fdda21f1ab1dcbf3fe2263aabd4a567e0527a33f551a2c9e5883fc9738607705710f10125fd50127d71e86b6a935d955c12dfa588713b40adeb84001a4c0 SHA512 bbf7afa666726fb1b3b9ddc8a899a8fc404c141bdd1c2adc3a458c9a5b4b7b60697fcf3e43df8a5a4ce3cb96db46d92d0af2887bba7aa52d759171dd240c4415
diff --git a/net-misc/geoipupdate/geoipupdate-4.9.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.9.0.ebuild
deleted file mode 100644
index 2936adefa8da..000000000000
--- a/net-misc/geoipupdate/geoipupdate-4.9.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://github.com/maxmind/geoipupdate"
-SRC_URI="https://github.com/maxmind/geoipupdate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="ISC BSD BSD-2 MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ppc64 ~s390 x86"
-
-DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
-
-src_compile() {
- # Do not let these leak from outside into the package
- unset GOBIN GOPATH GOCODE
-
- # requires pandoc but the information is still in the distributed md files
- sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
- #sed -i -e 's/go build/go build -x/' Makefile || die
-
- # the horror, the horror ... but it's all automagic
- export CONFFILE=/etc/GeoIP.conf
- export DATADIR=/usr/share/GeoIP
- export VERSION=${PV}
-
- default
-}
-
-src_install() {
- dobin build/geoipupdate
-
- keepdir /usr/share/GeoIP
-
- insinto /etc
- doins build/GeoIP.conf
-
- einstalldocs
-}
diff --git a/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild b/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild
deleted file mode 100644
index eeedc3970bee..000000000000
--- a/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://github.com/maxmind/geoipupdate"
-SRC_URI="https://github.com/maxmind/geoipupdate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
-
-LICENSE="BSD MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-
-BDEPEND="dev-go/go-md2man"
-
-DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
-
-PATCHES=(
- "${FILESDIR}/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch"
-)
-
-src_compile() {
- # Do not let these leak from outside into the package
- unset GOBIN GOPATH GOCODE
-
- # the horror, the horror ... but it's all automagic
- export CONFFILE=/etc/GeoIP.conf
- export DATADIR=/usr/share/GeoIP
- export VERSION=${PV}
-
- default
-}
-
-src_install() {
- dobin build/geoipupdate
-
- keepdir /usr/share/GeoIP
-
- insinto /etc
- doins build/GeoIP.conf
-
- doman build/GeoIP.conf.5 build/geoipupdate.1
-
- einstalldocs
-}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 91376da72a0f..1356ac5e180a 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -21,12 +21,9 @@ AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6f
AUX sshd_at.service.1 163 BLAKE2B b5c77d69e3860d365ba96a5b2fe14514bda9425e170fc7f324dcaf95fb02756ef9c5c2658904e812232f40fac9a3c2f4abf61b9129038bde66bb7d3a992d2606 SHA512 fbfe0aed3a5e99f15dc68838975cc49a206d697fb3549d8b31db25617dc7b7b8dd2397d865d89f305d5da391cd56a69277c2215c4335fccb4dd6a9b95ba34e2f
DIST openssh-9.8p1.tar.gz 1910393 BLAKE2B 3bf983c4ef5358054ed0104cd51d3e0069fbc2b80d8522d0df644d5508ec1d26a67bf061b1b5698d1cdf0d2cbba16b4cdca12a4ce30da24429094576a075e192 SHA512 95dec2f18e58eb47994f3de4430253e0665e185564b65088ca5f4108870e05feddef8cda8d3c0a4b75f18b98cc2c024df0e27de53b48c1a16da8da483cb8292a
DIST openssh-9.8p1.tar.gz.asc 833 BLAKE2B 5291e8c03ab9a75acb44285cd7fc010f4a33551f142499624165dac708fc05a6d077df81555aa41037b45f6301e4e5db3161a7a23404473f8a233a877fc55cc3 SHA512 4df1f1be2c6ab7f3aebaedd0a773b0e8c8929abb30cd3415873ad55d012cfa113f792e888e5e772dd468c394aeb7e35d62893a514dbc0ab1a03acd79918657f7
-DIST openssh-9.9p1.tar.gz 1964864 BLAKE2B 817d267e42b8be74a13e0cfd7999bdb4dab6355c7f62c1a4dd89adad310c5fb7fe3f17109ce1a36cd269a3639c1b8f1d18330c615ab3b419253ec027cfa20997 SHA512 3cc0ed97f3e29ecbd882eca79239f02eb5a1606fce4f3119ddc3c5e86128aa3ff12dc85000879fccc87b60e7d651cfe37376607ac66075fede2118deaa685d6d
-DIST openssh-9.9p1.tar.gz.asc 833 BLAKE2B 0e19668eb5cadea0e7b06caf2bc2f4cee7e7656a780a128090dcdf2acc25c6e0e0fc7c4c83c95ffcd567cd03941ec772b0f5b273e6f79ff4e440e1d9f22bcdb7 SHA512 916e975c54eb68c0b2f0b0006522b241cbe54c4caa88d31537a6278490c93d9d732c2ab3a080ac084bf75cbdd5402901ec68583cbe7c7cde4a8e40e7a8b78c28
DIST openssh-9.9p2.tar.gz 1944499 BLAKE2B 1b5bc09482b3a807ccfee52c86c6be3c363acf0c8e774862e0ae64f76bfeb4ce7cf29b3ed2f99c04c89bb4977da0cf50a7a175b15bf1d9925de1e03c66f8306d SHA512 4c6d839aa3189cd5254c745f2bd51cd3f468b02f8e427b8d7a16b9ad017888a41178d2746dc51fb2d3fec5be00e54b9ab7c32c472ca7dec57a1dea4fc9840278
DIST openssh-9.9p2.tar.gz.asc 833 BLAKE2B 21d9ef3da2b54be47420327f1c724e38eef951ea11d646de81ac3ee2abf3d81f218424432cf5ac7d60cdae72e2190001f923dbdf5bed57f4a105ee1895261c9d SHA512 e7f9bc74d27e5cf8cbf4f5831fddd1d8ad00b03e51e7deb7f95ef17c5017ab7ce0116f4770374aaf6bd3a5f6013dab651a7651b21fa303d05ad6d14b537ab955
EBUILD openssh-9.8_p1-r3.ebuild 15365 BLAKE2B 51da05b6b53b1326871328aa14387f10794de1e643f18a14b9ecc51830d3ebbfa772d1402bd86d3a118d5be1fb0760e7f608ddd7cd93b960617ad86f5a66beb7 SHA512 f3e294a30591621c96acf1ab054b2f84801b8ad9eb0932597a6eeda7b3b0cc01560c21944954dc6d9da6f4eaafa34592def5a2a80c27c113e48fe194a986f83d
-EBUILD openssh-9.9_p1.ebuild 15405 BLAKE2B bfea4b4b5370bcd9b898624982a9950107163b3a2f1deca4182aaa3f31d02ca6bca89956f93887e503a25db3d5a58a960d4a6b68ec2a742943b5810808d8476d SHA512 ec64e2ef14a82fc94a99c33f5da19f2a3b255841b7ed982a936dc1dfd980fceaa8f3711d47a962e7dea1a6eb2fe8b1692159ad16786bc752c66cfa0749b9fbd9
EBUILD openssh-9.9_p2-r3.ebuild 15495 BLAKE2B c277036e9d462351c661e57e471497c3beef6204a91f1e73f10b4473929aa76329098a02dd1fc4fda35db81d32fb00d509d3317bdc138f37007bcc01ab0176e9 SHA512 c03866a6a83d20ab5a2683fb5f8a8a6039870adbc3d79bf2c1873fa3510c005f4a578e78121cd44584c1d49776ebca5df9f9c0da01a54587b656d8f3bf7a0759
-EBUILD openssh-9.9_p2.ebuild 15414 BLAKE2B 1b4986b3aac895dbef687db893d089aaaf195f9ba1a2e67791b319647e28772207d8df3d6ad269675a1f49bdb090d7d0a2e735925e3667cd8b2c9678a869dafa SHA512 513d6377fe02348b7b64b6f5065dcdb300ee309729ad52172c4cc16c09dadea36c48d169a2c3a6f8f74be0c64a4d8d94eed87c09fe943faa26c531a04f3d2707
+EBUILD openssh-9.9_p2.ebuild 15413 BLAKE2B 4cea0069b0038e1d0e4c25b3405801c77b4662438de7ffb42b87cc10591c4a73f414890f3f2c1051ecc00ab38744faad944865d3b3b467dc234659166f227644 SHA512 97166d8243f244fe939b68ed86541a5fdd44c6576552226fe3b720ee1cf60d268e8818184d7ea64986d2cedd3ecf9b9063a06fe074e91f48b0d35bc1e6936b8e
MISC metadata.xml 1967 BLAKE2B 9e586a4c515035bc31be950c3872c379e01dae2cc460239cde37b83d6ca8494d36d1e1f858195b34af76074a966278c323ab24ba5e78adfa70be297c1f21336f SHA512 83563c27789a4c12149f037d9318b66d6caf383a82f0f6f7025378bd2a3017d41ff96b5aea3d08e4407d85f3d1a089a51ae6c7fa3970c20b2d8d721962ddbf69
diff --git a/net-misc/openssh/openssh-9.9_p1.ebuild b/net-misc/openssh/openssh-9.9_p1.ebuild
deleted file mode 100644
index a3eebf352d63..000000000000
--- a/net-misc/openssh/openssh-9.9_p1.ebuild
+++ /dev/null
@@ -1,439 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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 eapi9-ver
-
-# 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 legacy-ciphers 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.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch"
- "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.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() {
- 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_enable legacy-ciphers dsa-keys)
- $(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[@]}"
-}
-
-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
- 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
- )
-
- mkdir -p "${WORKDIR}"/etc/ssh/ssh{,d}_config.d || die
-
- cat <<-EOF > "${WORKDIR}"/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 > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die
- RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts"
- EOF
-
- 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 > "${WORKDIR}"/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
-
- 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 > "${WORKDIR}"/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 > "${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
- 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
-
- doman contrib/ssh-copy-id.1
- dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-
- rmdir "${ED}"/var/empty || die
-
- systemd_dounit "${FILESDIR}"/sshd.socket
- 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() {
- if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
- show_ssl_warning=1
- fi
-}
-
-pkg_postinst() {
- # bug #139235
- optfeature "x11 forwarding" x11-apps/xauth
-
- if ver_replacing -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_replacing -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_replacing -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_replacing -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_replacing -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_replacing -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_replacing -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
-
- 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
-
- 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/openssh/openssh-9.9_p2.ebuild b/net-misc/openssh/openssh-9.9_p2.ebuild
index e4185459a149..558ddce64e9b 100644
--- a/net-misc/openssh/openssh-9.9_p2.ebuild
+++ b/net-misc/openssh/openssh-9.9_p2.ebuild
@@ -23,7 +23,7 @@ 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 legacy-ciphers libedit livecd pam +pie security-key selinux +ssl static test xmss"
diff --git a/net-misc/r8152/Manifest b/net-misc/r8152/Manifest
index dcefe1f789da..81ea056849d3 100644
--- a/net-misc/r8152/Manifest
+++ b/net-misc/r8152/Manifest
@@ -5,6 +5,8 @@ AUX r8152-2.17.1-kernel-6.9-fix.patch 4008 BLAKE2B 6566782e57e8b69a2cf183a0d63a9
AUX r8152-2.18.1-kernel-6.9-fix.patch 4559 BLAKE2B 1e0e00f3e04448eb40638b1d9f49d9da056354b9d54d5aab7e8a6390e81bf3c74eb4371c93a8a10bbb29ece92c0975759591daa234ad537ae713d28495e7b2e9 SHA512 0a84fb69f0bb17f1be2478f863be8f6203301a7a2714f0d478528f36e29e191c10f4d967527a30ad7d7aaef6a8c5b99e4f86be46f945408ed353da1a0c550570
DIST r8152-2.17.1.tar.bz2 75156 BLAKE2B 05b55ea17a579add9a9abee89db490685086bfe29aeea6cbfbdbb63a81dbee4d1cac151822c178e52febe4bee14a3b5deb20737f671fcdbc6dd6d01938b1d18c SHA512 e465b524ee8aaed12da8258195fb8a4c9fea0862812c1ab268e31ad6ec61444c4f4332d643124063b389fd1df7a271c6c057537d4cbe67188a1a2262b4793f42
DIST r8152-2.18.1.tar.gz 109919 BLAKE2B 59fa24b599a7378109e162689ef4ff305dc0d3a7f3bc77059d9e2f142e0b4fd01b38fcfdfe7bc1f3aa13805302522632e4305990133d53266d7c268e1f2284c0 SHA512 c99f482bd69b2263943bdb26a8fea40eed09ca21f8f42436937dc5c83239f0fe48a386ea4f2ddf90a193c808503a3709ea9637793d476774107c4757b56c4223
+DIST r8152-2.19.2.tar.gz 114855 BLAKE2B dfff65c8cf26d31be86d3a3a1cd761f248d40e67a64d42f355e0daf38f21213e0fdac8bb426ff86d761e3f47771662307426dcadee5b13863cac8ee082ba36a1 SHA512 d17ea523ad2cc8ad2dafd2b012cc134c492d79d878553681cf34c479ef063f6ff3a87ebeb02f29693f0a19e980b5bdb764d3bb79e8040bef6c18ae52ec9f15e7
EBUILD r8152-2.17.1.ebuild 1293 BLAKE2B 19c8c4a1507ce6722f552c2c566e449b06a3b114b5b04e89c9259832e23e03d4d655084ee0d2aaf55d862573a524f762e8afc997a36ac8e61873c6e9d0ecf005 SHA512 069a53b153ac5d61fdebd8bcaa1411b904002b46124e81799efa601ca7ceb2fb4200e49eec7d8818b1a5abda049460e08ba3bdc0d94358116c1b4224ee10dafb
EBUILD r8152-2.18.1.ebuild 1482 BLAKE2B 94d3e6793955c3d4237f776b838391406a60d9abde4f86d2ef41a7f279146d7fc49c24f31053abf384b43f5664708e0bbcd4f083142be3e675c2d0ed00caf435 SHA512 f6a69b77e1b6269a485ca921e7c6fbe3ce8028d9b94d5f7c1dcbfe8a6966171b7a7b4984637e0af951b1a46596d69adcf7637d8a74a8a2c5013c1a3c41469352
+EBUILD r8152-2.19.2.ebuild 1433 BLAKE2B 2356152af37b5f998d89034af9b3836467aa1105f2c2e40a96da1e99f1037b264438360ceb9cb40a42766caf166cc5391c6b57ffd1689cd4e59f9e71be484769 SHA512 e0a4a60e75535c625c32715c0a66047b1befa34af8ed324b44a9bdf7b7990ccb16965f0c56da99cd273fc8eda708327280d79a2df0f1ffeccb5ca0d06a28dbba
MISC metadata.xml 630 BLAKE2B 9eba92cbb6aad696ba4aa0a5e9b6184fd547d82e4afb0af7d10014eb2e2d54b3508b23caa25ad7d24aa4f44404178385d2b83d26c9b9950e38bdd46df27269e1 SHA512 7ef0ed605f1f667b05c7117204d6e079a4465c69fd99dd45470ebcd25c8bc39f2b812c94345a9641b73f996464a4df3bb85c82e84f82383d6a3de279e66aa038
diff --git a/net-misc/r8152/r8152-2.19.2.ebuild b/net-misc/r8152/r8152-2.19.2.ebuild
new file mode 100644
index 000000000000..d0a59f666be8
--- /dev/null
+++ b/net-misc/r8152/r8152-2.19.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1 udev
+
+DESCRIPTION="r8152 driver for Realtek USB FE / GBE / 2.5G Gaming Ethernet Family Controller"
+# Using github readme as homepage as the realtek page has changed location twice in six months.
+HOMEPAGE="https://github.com/jayofdoom/realtek-r8152-unchanged"
+SRC_URI="https://github.com/jayofdoom/realtek-r8152-unchanged/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/realtek-r8152-unchanged-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/udev"
+DEPEND="${RDEPEND}"
+
+IUSE="+center-tap-short"
+
+# Many of the patches are sourced from pull requests to
+# https://github.com/wget/realtek-r8152-linux/ -- we do not use this repo
+# as the official upstream as it does not keep a clear deliniation between
+# shipped realtek code and patches. It is the source used by the AUR package.
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch
+ "${FILESDIR}"/${PN}-2.16.3-asus-c5000-support.patch
+)
+
+src_compile() {
+ local modlist=( ${PN}=kernel/net/usb:. )
+ local modargs=(
+ KERNELDIR="${KV_OUT_DIR}"
+ CONFIG_CTAP_SHORT="$(usex center-tap-short on off)"
+ )
+
+ linux-mod-r1_src_compile
+}
+
+src_install() {
+ linux-mod-r1_src_install
+ udev_dorules 50-usb-realtek-net.rules
+}
+
+pkg_postinst() {
+ linux-mod-r1_pkg_postinst
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index a106a268b7f1..d93b61069806 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,7 +1,5 @@
-DIST streamlink-6.11.0.tar.gz 763094 BLAKE2B 7fb0a84088991bc5a7514e0a40d5c05d3a14da5cffbcb255c5e5767fcae8c745a6397cbe79b0b0fd5bebab32b0d8d6c015931af03e6eaa199b5ed9437d0f3a7e SHA512 e6d6e49d2df0aa76ebca76c0b3ada085eac59553423a5ccaa3d5cb62f6be0a679da36c4f78a3e1fea48b22144e705b8de9e46fc146c1c93889ef0c056d59fc7b
DIST streamlink-7.1.2.tar.gz 772724 BLAKE2B 0a5165e0ec33c127272e4f232fc0ee421bafc54147a1e99424bbbd45ebb41ee2d8bae4fa68e278c1ddf26e8bc9cfe401616e108a2a1fa93fa34d4561046028f4 SHA512 da552336700a0b7e391435aa3e369d0f8b2868a13e15dd5110869a67d164b6775f924fe09839c00bf9f5d9ce0935380ec8c0996fdc58b82c6bbe5e6c6f89ec04
DIST streamlink-7.1.3.tar.gz 772024 BLAKE2B 8635302f316b3988010aab4aad2a7becd2b0b92e34357510da783681b54c34eb859ba065c65d4904c294275df0ceaf11e5440c196e62d09400592f4a2a63d8b7 SHA512 77ec1f4fb00c3ba708593060c980d6a1bda0dcf7ca8b5583dd97025b5a48cba540ced776f3d146818daa7f1fa16d8d72854c14b2ca039680d9a16a039fdba268
-EBUILD streamlink-6.11.0.ebuild 2228 BLAKE2B 6be7b38c45e4fbfdf84dd1b3c484be767627cc4b27ace4728a5843ee3a9c97d60880a7cb0eefe8fb57c5105ff4a6db6dd0b5779e15a3a581782cec1ca566ad48 SHA512 93f1c9b0ed730c5a5d68703461a41f2d09f1facc536ce2aa77e641a9c667cdcc9b6609fc61ef52fd5c1a3e7b75056a5c661594d46d11a9f046e886c0e26c92f6
EBUILD streamlink-7.1.2.ebuild 2228 BLAKE2B 0291adcdd2820ba73fc2342a1691776f3a55d25a4910011219b6f489acbd02edc6afdcd613728bdfc526c28dbb0d038e088fcd6607483088efde0edd7ebbe177 SHA512 c0c45b76ab0b6665719970fb04314b54679791e7a43873772167e911238d51d12b7cdb1ea7835194ba39609bbe9d9401c02db04acac473710a4ed9bb09b4e8e2
EBUILD streamlink-7.1.3.ebuild 2229 BLAKE2B 666205f714c06a2a43913d627e919f0f29c65c686d3834cc898535397d3f75c2c1e7302269fc97e9b9277313697ae1dbfac5e01d2532595a827081ae6f917163 SHA512 9ade72e3de44ccbbc2794e46dd49cdc7c2d01ba54e01780f3ebdd62233936f0353b02cf82b1f32b4b72ce000c731d8920eb80dd367f76c1e6ca88b2ed2767940
EBUILD streamlink-9999.ebuild 2229 BLAKE2B 666205f714c06a2a43913d627e919f0f29c65c686d3834cc898535397d3f75c2c1e7302269fc97e9b9277313697ae1dbfac5e01d2532595a827081ae6f917163 SHA512 9ade72e3de44ccbbc2794e46dd49cdc7c2d01ba54e01780f3ebdd62233936f0353b02cf82b1f32b4b72ce000c731d8920eb80dd367f76c1e6ca88b2ed2767940
diff --git a/net-misc/streamlink/streamlink-6.11.0.ebuild b/net-misc/streamlink/streamlink-6.11.0.ebuild
deleted file mode 100644
index bc7ffb74e0d9..000000000000
--- a/net-misc/streamlink/streamlink-6.11.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
- inherit git-r3
-fi
-
-DISTUTILS_SINGLE_IMPL=1
-# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools
-# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE='xml(+),threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
-HOMEPAGE="https://streamlink.github.io/"
-
-if [[ ${PV} != 9999* ]]; then
- SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-fi
-
-LICENSE="BSD-2 Apache-2.0"
-SLOT="0"
-if [[ ${PV} != 9999* ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
-fi
-
-# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep
-RDEPEND="
- media-video/ffmpeg
- $(python_gen_cond_dep '
- dev-python/exceptiongroup[${PYTHON_USEDEP}]
- ' 3.10)
- $(python_gen_cond_dep '
- dev-python/certifi[${PYTHON_USEDEP}]
- || (
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/charset-normalizer[${PYTHON_USEDEP}]
- )
- >=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
- dev-python/isodate[${PYTHON_USEDEP}]
- >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
- >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}]
- dev-python/pycountry[${PYTHON_USEDEP}]
- >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
- >dev-python/pysocks-1.5.7[${PYTHON_USEDEP}]
- >=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
- >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
- ')
-"
-BDEPEND="
- $(python_gen_cond_dep '
- >=dev-python/setuptools-64[${PYTHON_USEDEP}]
- >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
- test? (
- >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
- dev-python/pytest-trio[${PYTHON_USEDEP}]
- dev-python/requests-mock[${PYTHON_USEDEP}]
- )
- ')
-"
-
-if [[ ${PV} == 9999* ]]; then
- RDEPEND+="
- $(python_gen_cond_dep '
- >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
- ')
- "
-fi
-
-distutils_enable_tests pytest
diff --git a/net-misc/sunshine/Manifest b/net-misc/sunshine/Manifest
index faafef7361f9..9977aa80986c 100644
--- a/net-misc/sunshine/Manifest
+++ b/net-misc/sunshine/Manifest
@@ -1,4 +1,5 @@
AUX sunshine-0.22.0-nvcodec.patch 1009 BLAKE2B 4a2fd3dbd98b64fd6e259c94d218f9853404a4096448ace8153c86717524b7cde5295a00aed972eca73c4a4c3bf6101349e8e61ebcb5e657d59426f903fc8efd SHA512 77ba0e67da4a3c252c5a19041bf0822651de9670ffe7e5732298cc00c6ac8cced97d2a0e0487af0ddc035fdb74fee2593ef91c446bb1125525ba4103b7b95fa2
+AUX sunshine-0.23.1-amf.patch 653 BLAKE2B 6d8190d6973845c7cd358bb7bdd8ce4d8bbd77f10db1aab622643d0af68f98ffef1d7f33accd41a812ada3004578c63af3ba0d4dac81ec7a7f2cdcbb8e08624b SHA512 770c4838d2cb2a1baa94e3f8f4b687875a07c4d4b1c8a9de479ddc5a8a1e0e36a2d48d029a252fea042dcf02e4a066965f5007417c9755741802c7a69d3a04b3
AUX sunshine-boost-1.86.patch 4552 BLAKE2B 776e429a13586a1ed8f32d33a9f5144c615784d874ada8da0516c875e8c8bbd84a9410c2f3375da62f412d35ad4c7e6db780b902091a18087500c877455a29e1 SHA512 e546433459663de0542da644775f9adbb78485674629c211c5ff4dea493b766f85bbfc3e13a601e15a31427db476242cbfe00ca05acf2de0dd4d29ccc012cdf5
AUX sunshine-boost-1.87.patch 3402 BLAKE2B f471770c2f8799b66116ffdce223d7438ac8042f39589a4a1464e2f7323e3442d08a75bdf8e62648fd20936d817fc68883d8abc371600db06501aa25c4bdbea1 SHA512 e2f433372dcd8b92a49388f250461dc122592193ea6143295943acae65545d2b7a45abc4e0a9c3068bdfda38591781f5b006986209de43d6dbffbee3afc1782f
AUX sunshine-cross-cbs.patch 2020 BLAKE2B b57c6fe66707a86b35a70945ca9b9da9c4e8bb0bba8bd0d66e9ec9e3d15121cc4a193b56ea376ff3e244d652c18ac7504d687cefd54876afcf3cb54d8024c71b SHA512 95710af147509f8c93c875513c01a596fd62fe421495395dfeef41a6230d031e779277a9a2604c4d5dce788d6ecf77e667942d3ae2d6e675ef29db86e6519734
@@ -15,6 +16,6 @@ DIST nanors-e9e242e98e27037830490b2a752895ca68f75f8b.tar.gz 194694 BLAKE2B 1effd
DIST sunshine-0.23.1.tar.gz 24503568 BLAKE2B 0c589f38a7d638c49af6385def2676de04af422f85d37228988bd7c822ffc006dbac0a1695e01527ac7a1d5ee28103cff00d78a97d57f61247772a6e6cc1fe18 SHA512 7a9150baf4ecdad1035666993c60744390e227ebeaf467447c53675dc0aecc7031cd9c9b253fbbbbac072f5592c3690c6acfde41f38d441497a17157417f1e16
DIST sunshine-assets-0.23.1.tar.xz 1269348 BLAKE2B 36dd00fbf4bb1bfa213d53fd9dc78ed1fee9e12efcfb138dbd54932c3f19447d832da506175a982be7564408e06b0699b0b7cb4b9811ab81b47e30681c915bab SHA512 9fe9e0ee29864faa0f67dd4d501d116be1476f2c7ec688646b91eb87cb38e9e9d2baecb8335df29075fd3f60bf05b900c20dcb8406306d68a62c30ff55d1b7aa
DIST wlr-protocols-2b8d43325b7012cc3f9b55c08d26e50e42beac7d.tar.bz2 19708 BLAKE2B fe20f21ee8282d7afcdbb8f3863e50b217fb71e7814f404f288b0d09d30c9e30135769b12342d9e9126a8cb2ab35d6ced0c5562807d274b1d97224f5f3d02511 SHA512 7935b5089820304aa8cb0e1a8f4e0db6ccd5285973a3f3554ccc935dd88e379eb03c3b2dd199da97b6ff8dfbbbf124ca65fb1c12821a168d34bd7e26d8514edb
-EBUILD sunshine-0.23.1.ebuild 12066 BLAKE2B 2a34d31936dd231b39e012ee6317b27e8bc14924c68396347c08f4c90392f50d6369b96091f833b6c843b9947c31236fc62368fd4aaf0aec696eb33c8c4e3ac0 SHA512 b76882b3349b187e4fad478d0671299980470e3c7c077ffe1eb7bfc45268179cf8aa3c9512c6604fb7032e8d768ae9c4285de1d6c91c4e48e77b24e0f85eeeaa
+EBUILD sunshine-0.23.1.ebuild 12096 BLAKE2B 3a3f9bbd504463f8a59997f054054c7a02ed7f036b69289263d69644bc7ea7ff91d2bd76bc674f2543d97e442556f657cd4bc49d5d3e5f79d8871f1d5fbd6944 SHA512 19860e649f454d983a4da152c94d58e0c762c483b008c8176fd99f869c6e5a881fadbcd9b36d621e9d87304c821e7a6333c3a2c8e0d939da8b40fd4a289e9e8e
EBUILD sunshine-9999.ebuild 12178 BLAKE2B 28891233f8e0e23a36fca10bfb66cc28826a8f312817c5e5617191df17e7299d50bbadd6fd1b66602940db4193545292e8aacb5ab611bdc299f73921a4f6e8bc SHA512 ec982e0369d7bdb241b035202414d0a41ce82da255a1a23b4918daa419ddd768ef9f663c8fc790ddc06e7b7e20ceec2bbb7ce7003c256e69d436d461e4e4ea35
MISC metadata.xml 880 BLAKE2B 656a3a283ae7504498d1a67cc343cfa614e21e0422c1076781164822809079eafe8e514d01182e977f7add5a28c4e7e09db985c8e4ea551eef1a1f92609488d9 SHA512 679f3c676ce568e8c0a8b816463c66d69055d0dba740c9065ce8feb36335981df65fff9d47f35e93f6b60337cc59f3da6ec3b83f9bb01905c73f912b50a0366d
diff --git a/net-misc/sunshine/files/sunshine-0.23.1-amf.patch b/net-misc/sunshine/files/sunshine-0.23.1-amf.patch
new file mode 100644
index 000000000000..b08fcc1e2515
--- /dev/null
+++ b/net-misc/sunshine/files/sunshine-0.23.1-amf.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/950686
+https://github.com/LizardByte/Sunshine/commit/7dd836dab63e15db54f18ed2b64cb394aa30c308#diff-6b2f0a449fdefd8930e23ef0dcd752beec69242e1303d77653f047c5e0766385
+
+diff --git a/src/config.cpp b/src/config.cpp
+index 6a9e1cec..366e2b2a 100644
+--- a/src/config.cpp
++++ b/src/config.cpp
+@@ -100,6 +100,9 @@ namespace config {
+ #define AMF_VIDEO_ENCODER_CABAC 1
+ #define AMF_VIDEO_ENCODER_CALV 2
+ #else
++ #ifdef _GLIBCXX_USE_C99_INTTYPES
++ #undef _GLIBCXX_USE_C99_INTTYPES
++ #endif
+ #include <AMF/components/VideoEncoderAV1.h>
+ #include <AMF/components/VideoEncoderHEVC.h>
+ #include <AMF/components/VideoEncoderVCE.h>
diff --git a/net-misc/sunshine/sunshine-0.23.1.ebuild b/net-misc/sunshine/sunshine-0.23.1.ebuild
index 60f295db98ea..7f36ef4e6b00 100644
--- a/net-misc/sunshine/sunshine-0.23.1.ebuild
+++ b/net-misc/sunshine/sunshine-0.23.1.ebuild
@@ -162,7 +162,7 @@ RDEPEND="
DEPEND="
${CDEPEND}
- <media-libs/amf-headers-1.4.35
+ media-libs/amf-headers
=media-libs/nv-codec-headers-12*
wayland? ( dev-libs/wayland-protocols )
"
@@ -178,6 +178,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-custom-ffmpeg.patch
"${FILESDIR}"/${PN}-0.22.0-nvcodec.patch
+ "${FILESDIR}"/${PN}-0.23.1-amf.patch
"${FILESDIR}"/${PN}-find-npm.patch
"${FILESDIR}"/${PN}-miniupnpc.patch
"${FILESDIR}"/${PN}-boost-1.86.patch