summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/bird/Manifest1
-rw-r--r--net-misc/bird/bird-2.16.1.ebuild87
-rw-r--r--net-misc/clockspeed/clockspeed-0.62-r8.ebuild44
-rw-r--r--net-misc/clockspeed/clockspeed-0.62-r9.ebuild4
-rw-r--r--net-misc/curl/Manifest6
-rw-r--r--net-misc/curl/curl-8.10.1-r2.ebuild (renamed from net-misc/curl/curl-8.10.1-r1.ebuild)4
-rw-r--r--net-misc/curl/curl-8.11.1-r2.ebuild (renamed from net-misc/curl/curl-8.11.1-r1.ebuild)6
-rw-r--r--net-misc/curl/curl-8.12.0.ebuild (renamed from net-misc/curl/curl-8.11.0.ebuild)28
-rw-r--r--net-misc/curl/curl-8.8.0-r1.ebuild387
-rw-r--r--net-misc/curl/curl-8.9.1-r2.ebuild (renamed from net-misc/curl/curl-8.9.1-r1.ebuild)4
-rw-r--r--net-misc/curl/curl-9999.ebuild21
-rw-r--r--net-misc/curl/files/curl-prefix-4.patch35
-rw-r--r--net-misc/curl/metadata.xml1
-rw-r--r--net-misc/dropbear/dropbear-2024.86-r1.ebuild4
-rw-r--r--net-misc/dropbox/Manifest8
-rw-r--r--net-misc/dropbox/dropbox-209.4.3661.ebuild109
-rw-r--r--net-misc/dropbox/dropbox-212.4.5767.ebuild109
-rw-r--r--net-misc/dropbox/dropbox-214.4.5217.ebuild6
-rw-r--r--net-misc/dropbox/dropbox-215.4.7202.ebuild (renamed from net-misc/dropbox/dropbox-211.4.6008.ebuild)4
-rw-r--r--net-misc/dropbox/dropbox-216.4.4420.ebuild (renamed from net-misc/dropbox/dropbox-213.4.4597.ebuild)2
-rw-r--r--net-misc/dropbox/dropbox-217.4.4417.ebuild (renamed from net-misc/dropbox/dropbox-210.4.4854.ebuild)2
-rw-r--r--net-misc/electrum/Manifest1
-rw-r--r--net-misc/electrum/electrum-4.5.8-r1.ebuild118
-rw-r--r--net-misc/electrum/electrum-4.5.8-r2.ebuild4
-rw-r--r--net-misc/ena-driver/Manifest1
-rw-r--r--net-misc/ena-driver/ena-driver-2.13.2.ebuild30
-rw-r--r--net-misc/ethflop/ethflop-20191003-r2.ebuild45
-rw-r--r--net-misc/ethflop/ethflop-20240916.ebuild63
-rw-r--r--net-misc/ethflop/files/ethflop-20191003-makefile.patch13
-rw-r--r--net-misc/freerdp/Manifest2
-rw-r--r--net-misc/freerdp/freerdp-3.11.1.ebuild199
-rw-r--r--net-misc/frr/Manifest6
-rw-r--r--net-misc/frr/frr-10.0.3.ebuild149
-rw-r--r--net-misc/frr/frr-10.1.2.ebuild (renamed from net-misc/frr/frr-10.0.2.ebuild)5
-rw-r--r--net-misc/frr/frr-10.2.1.ebuild (renamed from net-misc/frr/frr-10.1.1.ebuild)5
-rw-r--r--net-misc/frr/frr-9.1.3.ebuild146
-rw-r--r--net-misc/gallery-dl/Manifest6
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.28.2.ebuild4
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.28.3.ebuild (renamed from net-misc/gallery-dl/gallery-dl-1.27.7.ebuild)8
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.28.4.ebuild (renamed from net-misc/gallery-dl/gallery-dl-1.28.0.ebuild)8
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.28.5.ebuild (renamed from net-misc/gallery-dl/gallery-dl-1.28.1.ebuild)8
-rw-r--r--net-misc/gerbera/Manifest1
-rw-r--r--net-misc/gerbera/gerbera-2.2.0.ebuild90
-rw-r--r--net-misc/gerbera/gerbera-2.3.0-r1.ebuild4
-rw-r--r--net-misc/gnome-connections/Manifest2
-rw-r--r--net-misc/gnome-connections/gnome-connections-47.0.ebuild (renamed from net-misc/gnome-connections/gnome-connections-45.0-r2.ebuild)4
-rw-r--r--net-misc/gnome-remote-desktop/Manifest2
-rw-r--r--net-misc/gnome-remote-desktop/gnome-remote-desktop-47.1.ebuild (renamed from net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-r1.ebuild)26
-rw-r--r--net-misc/gnome-remote-desktop/metadata.xml3
-rw-r--r--net-misc/hurl/metadata.xml2
-rw-r--r--net-misc/icaclient/Manifest3
-rw-r--r--net-misc/icaclient/icaclient-24.11.0.85.ebuild (renamed from net-misc/icaclient/icaclient-23.5.0.58.ebuild)23
-rw-r--r--net-misc/icaclient/metadata.xml1
-rw-r--r--net-misc/kio-zeroconf-common/Manifest2
-rw-r--r--net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.1.ebuild (renamed from net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.0.ebuild)2
-rw-r--r--net-misc/kio-zeroconf/Manifest3
-rw-r--r--net-misc/kio-zeroconf/kio-zeroconf-24.12.1.ebuild (renamed from net-misc/kio-zeroconf/kio-zeroconf-24.12.0.ebuild)4
-rw-r--r--net-misc/kio-zeroconf/kio-zeroconf-24.12.2.ebuild28
-rw-r--r--net-misc/lldpd/Manifest1
-rw-r--r--net-misc/lldpd/lldpd-1.0.19.ebuild111
-rw-r--r--net-misc/megatools/Manifest1
-rw-r--r--net-misc/megatools/megatools-1.11.0.ebuild6
-rw-r--r--net-misc/megatools/megatools-1.11.1.ebuild6
-rw-r--r--net-misc/megatools/megatools-1.11.2.ebuild35
-rw-r--r--net-misc/megatools/metadata.xml3
-rw-r--r--net-misc/memcached/memcached-1.6.27.ebuild4
-rw-r--r--net-misc/mptcpd/mptcpd-0.13.ebuild2
-rw-r--r--net-misc/netkit-timed/files/netkit-timed-0.17-accept-build-flags.patch23
-rw-r--r--net-misc/netkit-timed/files/netkit-timed-0.17-c23-port.patch65
-rw-r--r--net-misc/netkit-timed/files/netkit-timed-0.17-c99-port.patch44
-rw-r--r--net-misc/netkit-timed/netkit-timed-0.17-r12.ebuild39
-rw-r--r--net-misc/netsed/netsed-1.3-r1.ebuild4
-rw-r--r--net-misc/nextcloud-client/Manifest1
-rw-r--r--net-misc/nextcloud-client/nextcloud-client-3.15.3.ebuild122
-rw-r--r--net-misc/nx/files/nx-3.5.99.26-gcc14-32bit.patch51
-rw-r--r--net-misc/nx/nx-3.5.99.26.ebuild4
-rw-r--r--net-misc/nx/nx-3.5.99.27.ebuild4
-rw-r--r--net-misc/ofono/Manifest2
-rw-r--r--net-misc/ofono/ofono-2.14.ebuild (renamed from net-misc/ofono/ofono-2.3.ebuild)5
-rw-r--r--net-misc/openssh/openssh-9.8_p1-r3.ebuild4
-rw-r--r--net-misc/openssh/openssh-9.9_p1.ebuild4
-rw-r--r--net-misc/passt/passt-2024.09.06.ebuild4
-rw-r--r--net-misc/portspoof/portspoof-1.3-r1.ebuild4
-rw-r--r--net-misc/portspoof/portspoof-9999.ebuild4
-rw-r--r--net-misc/r8168/r8168-8.054.00.ebuild4
-rw-r--r--net-misc/rclone/Manifest4
-rw-r--r--net-misc/rclone/rclone-1.69.0.ebuild (renamed from net-misc/rclone/rclone-1.68.1.ebuild)10
-rw-r--r--net-misc/remmina/Manifest1
-rw-r--r--net-misc/remmina/remmina-1.4.39.ebuild104
-rw-r--r--net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12084.patch132
-rw-r--r--net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12085.patch17
-rw-r--r--net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-1.patch200
-rw-r--r--net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-2.patch26
-rw-r--r--net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-1.patch39
-rw-r--r--net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-2.patch36
-rw-r--r--net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12088.patch60
-rw-r--r--net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-1.patch166
-rw-r--r--net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-2.patch34
-rw-r--r--net-misc/rsync/rsync-3.3.0-r2.ebuild (renamed from net-misc/rsync/rsync-3.2.7-r4.ebuild)14
-rw-r--r--net-misc/rsync/rsync-3.3.0.ebuild201
-rw-r--r--net-misc/rygel/Manifest2
-rw-r--r--net-misc/rygel/rygel-0.44.1.ebuild (renamed from net-misc/rygel/rygel-0.42.5.ebuild)10
-rw-r--r--net-misc/seafile-client/Manifest1
-rw-r--r--net-misc/seafile-client/seafile-client-8.0.9.ebuild55
-rw-r--r--net-misc/seafile/Manifest1
-rw-r--r--net-misc/seafile/seafile-8.0.9-r2.ebuild62
-rw-r--r--net-misc/smb4k/Manifest1
-rw-r--r--net-misc/smb4k/smb4k-3.2.90.ebuild77
-rw-r--r--net-misc/smb4k/smb4k-3.2.92.ebuild4
-rw-r--r--net-misc/socat/socat-1.8.0.1.ebuild4
-rw-r--r--net-misc/streamlink/Manifest2
-rw-r--r--net-misc/streamlink/streamlink-7.1.2.ebuild (renamed from net-misc/streamlink/streamlink-7.1.1.ebuild)2
-rw-r--r--net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.90.ebuild18
-rw-r--r--net-misc/tigervnc/Manifest2
-rw-r--r--net-misc/tigervnc/tigervnc-1.14.90.ebuild237
-rw-r--r--net-misc/trurl/Manifest2
-rw-r--r--net-misc/trurl/trurl-0.16-r1.ebuild (renamed from net-misc/trurl/trurl-0.16.ebuild)9
-rw-r--r--net-misc/trurl/trurl-9999.ebuild6
-rw-r--r--net-misc/tuba/Manifest1
-rw-r--r--net-misc/tuba/tuba-0.9.1.ebuild76
-rw-r--r--net-misc/ubridge/Manifest1
-rw-r--r--net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch36
-rw-r--r--net-misc/ubridge/ubridge-0.9.18.ebuild47
-rw-r--r--net-misc/ubridge/ubridge-0.9.19-r1.ebuild (renamed from net-misc/ubridge/ubridge-0.9.19.ebuild)14
-rw-r--r--net-misc/websocat/Manifest4
-rw-r--r--net-misc/websocat/websocat-1.14.0.ebuild (renamed from net-misc/websocat/websocat-1.12.0-r1.ebuild)23
-rw-r--r--net-misc/x2goclient/Manifest1
-rw-r--r--net-misc/x2goclient/x2goclient-4.1.2.2-r1.ebuild62
-rw-r--r--net-misc/yt-dlp/Manifest4
-rw-r--r--net-misc/yt-dlp/yt-dlp-2025.01.15.ebuild (renamed from net-misc/yt-dlp/yt-dlp-2024.12.23.ebuild)2
-rw-r--r--net-misc/yt-dlp/yt-dlp-2025.01.26.ebuild (renamed from net-misc/yt-dlp/yt-dlp-2024.12.13.ebuild)2
131 files changed, 2526 insertions, 1736 deletions
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 3be63b711736..2711273ac973 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -2,3 +2,4 @@ DIST bird-2.0.10.tar.gz 1276546 BLAKE2B 21e1dde7d38d836c761eb13067b6aacdfc66211c
DIST bird-2.0.11.tar.gz 1301502 BLAKE2B 0761bd50b3b0338ecf2a6325f61f90db9f92324ed814de2ec6b360c6f5a7e12d6ae4ae9b73a11ddede0e6c8fd1d15bea1b62076c38c937ae281f10a8bc2d1cbf SHA512 aaab11b4faf7d0c0afc3c4e3480f24ab6e0037b209aee969192eea57bef698073da5fa9155ef43d999ed91cbe3cd87acb95aa08fa03f2525c5c7653a0589dcf6
DIST bird-2.0.12.tar.gz 1307984 BLAKE2B ca00574bb8e508255afb90e0d65f4e1763880699cff9877731d072efc48944b9f9ac77b35bb7ffd7b780e8e8b1c2eacdc38ee273353817c53723e7972fb5f0d6 SHA512 b5e1235210e500511955c009456710dd12d6ea747825806a6d35a9de5f2f984d9a45fa541d45dd5e353f87f4d61bf1d4612cb6058769e905e4ef6b414ab4212f
DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
+DIST bird-2.16.1.tar.gz 1433936 BLAKE2B 80698f6e009662ec944831b869538fb3d74e405f94841cfdd372143b0b6ee6db85e8f136e607574a188e8b1794f2da8b59a9fb2629600bae4ddb1c6e5505a464 SHA512 7eccc9ada56f0f151237e7dacaea968526058dbadc36257adfc2f307876237b7267239cb5f3ee6a01832834dc81f9f54000c1550ae200b69f97da8e748f6af70
diff --git a/net-misc/bird/bird-2.16.1.ebuild b/net-misc/bird/bird-2.16.1.ebuild
new file mode 100644
index 000000000000..b669d6aa4a22
--- /dev/null
+++ b/net-misc/bird/bird-2.16.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools fcaps
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
+HOMEPAGE="https://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~x86 ~x64-macos"
+IUSE="+client custom-cflags debug libssh"
+
+RDEPEND="
+ client? (
+ sys-libs/ncurses:=
+ sys-libs/readline:=
+ )
+ filecaps? (
+ acct-group/bird
+ acct-user/bird
+ )
+ libssh? ( net-libs/libssh:= )"
+BDEPEND="
+ app-alternatives/yacc
+ app-alternatives/lex
+ sys-devel/m4
+"
+
+FILECAPS=(
+ CAP_NET_ADMIN usr/sbin/bird
+ CAP_NET_BIND_SERVICE usr/sbin/bird
+ CAP_NET_RAW usr/sbin/bird
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # This export makes compilation and test phases verbose
+ export VERBOSE=1
+
+ local myargs=(
+ --localstatedir="${EPREFIX}/var"
+ $(use_enable client)
+ $(use_enable debug)
+ $(use_enable libssh)
+ )
+
+ # lto must be enabled by default as bird is mono-threaded and use several
+ # optimisations to be fast, as it may very likely be exposed to several
+ # thounsand BGP updates per seconds
+ # Although, we make it possible to deactivate it if wanted
+ # We force the value of the whole cflags var instead of only lto because of
+ # upstream commit 404e8261 (configure.ac: properly evaluate ac_test_CFLAGS)
+ use custom-cflags && myargs+=( bird_cflags_default=no ) || \
+ myargs+=( bird_cflags_default=yes )
+
+ econf "${myargs[@]}"
+}
+
+src_install() {
+ if use client; then
+ dobin birdc
+ fi
+
+ dobin birdcl
+ dosbin bird
+
+ newinitd "${FILESDIR}/initd-${PN}-2" ${PN}
+ newconfd "${FILESDIR}/confd-${PN}-2" ${PN}
+
+ dodoc doc/bird.conf.example
+}
+
+pkg_postinst() {
+ if use filecaps; then
+ einfo "If you want to run bird as non-root, edit"
+ einfo "'${EROOT}/etc/conf.d/bird' and set BIRD_GROUP and BIRD_USER with"
+ einfo "the wanted username."
+ fi
+}
diff --git a/net-misc/clockspeed/clockspeed-0.62-r8.ebuild b/net-misc/clockspeed/clockspeed-0.62-r8.ebuild
deleted file mode 100644
index 29bf5a916bca..000000000000
--- a/net-misc/clockspeed/clockspeed-0.62-r8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Simple Network Time Protocol (NTP) client"
-HOMEPAGE="https://cr.yp.to/clockspeed.html"
-
-# this is the trailing part of the name for the latest leapseconds file.
-LEAPSECONDS_DATE="20081114"
-
-SRC_URI="https://cr.yp.to/clockspeed/${P}.tar.gz
- https://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat."$LEAPSECONDS_DATE""
-
-# http://cr.yp.to/distributors.html
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="static selinux"
-RESTRICT="mirror bindist test"
-
-DEPEND="sys-apps/groff"
-RDEPEND="net-dns/djbdns"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
- echo "$(tc-getCC) ${CFLAGS} ${ASFLAGS}" > conf-cc || die
- use static && append-ldflags -static
- echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-}
-
-src_install() {
- dobin clockspeed clockadd clockview sntpclock taiclock taiclockd
- dosbin "${FILESDIR}"/ntpclockset
-
- doman *.1
- dodoc BLURB CHANGES INSTALL README THANKS TODO
-
- insinto /var/lib/clockspeed
- newins "${DISTDIR}"/leapsecs.dat."$LEAPSECONDS_DATE" leapsecs.dat
-}
diff --git a/net-misc/clockspeed/clockspeed-0.62-r9.ebuild b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild
index a605c46179f5..ff6856a5012e 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r9.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,7 @@ LICENSE="public-domain"
SLOT="0"
KEYWORDS="amd64 ~mips x86"
IUSE="static selinux"
-RESTRICT="mirror bindist test"
+RESTRICT="test"
DEPEND="sys-apps/groff"
RDEPEND="net-dns/djbdns"
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index d4b9c62c3d69..24f5ecbff777 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,10 +1,8 @@
DIST curl-8.10.1.tar.xz 2726748 BLAKE2B bfdfa24f6d652884044c5e8eea5d70daad651b46255c99c9df502f9595a2dcbf8c4034446becf9e87f8e8a3f397a8fda29ab3e0d6020ac0dae62dd42b8136b78 SHA512 f1c7a12492dcfb8ba08be69b96a83ce9074592cbaa6b95c72b3c16fc58ad35e9f9deec7b72baca7d360d013b0b1c7ea38bd4edae464903ac67aa3c76238d8c6c
DIST curl-8.10.1.tar.xz.asc 488 BLAKE2B 8e8f2b628d4e8964a76c1c43c5557aacbfc2d2dbc51be8a0fa1b157c257f15f29aedba842cba7cb270c4adcf0b4a5d9c8b0b3d49633c48b061fb3e1472303d66 SHA512 21d6d560c027efc9e3e5db182a77501d6376442221ba910df817e2ec980bee44a9fe2afc698205f8d5e8313ae47915a341d60206a46b46e816d73ee357a894ac
-DIST curl-8.11.0.tar.xz 2750684 BLAKE2B 3db13ed558bee332e07e1eab878b5ecae14cd049c115eea3a25fcb78cf28aadfe577dc224df75b62844529994ec478a9a74fed5c9bae338f809d231420ae5d0a SHA512 3a642d421e0a5c09ecb681bea18498f2c6124e9af4d8afdc074dfb85a9b0211d8972ade9cf00ab44b5dfed9303262cd83551dd3b5e0976d11fc19da3c4a0987e
-DIST curl-8.11.0.tar.xz.asc 488 BLAKE2B 5d91dc654d6a62c66e344ca92676b42e7a49f437e14f9fb714f7ae64a266d24d9bb7006b4512fc323459072ff0d9e05f627e494f34f845eadbedbd83acacc2ce SHA512 71073dde48e8f0013e392eb88bf70f6b8a4a4f0c955a3fb56db98e74aa10acc1004e2a0483f30be082e61b59a76fa75ae1d90545ace7c6b07bca8164078375f0
DIST curl-8.11.1.tar.xz 2751236 BLAKE2B a87ec2c78c5d6daf44eee4cf8e3ed124849d067f6c63145205fda18f33ddd3adce386058ead8f9b713f8e595f5e059acd13479eb00edc226247aabd3c2234112 SHA512 7c7c47a49505575b610c56b455f0919ea5082a993bf5483eeb258ead167aadb87078d626b343b417dcfc5439c53556425c8fb4fe3b01b53a87b47c01686a3e57
DIST curl-8.11.1.tar.xz.asc 488 BLAKE2B 53d58ebb8ab722d8394b7ce94b646c876324cd89b3e47d9129bddcfbb6db338c1dbe93a5e72a25caf7be9ddd450c2b0832cfee17beb8ba701bdeefe653235d53 SHA512 c09bedb67e83fb8ca3ad73c5bd0d92fed7fc2c26dbe5a71cccb193fd151c7219713241a9fe74baefcd1d008cfafba78142bf04cec24dd4a88d67179184d35824
-DIST curl-8.8.0.tar.xz 2748860 BLAKE2B c14903bad4cbd1752a5335afa6bcc78be1a484692fce0e0a6c2061963e0e6b4e56defb8332cef32d0dbddb481ad0443b71faf3a52a6e9d945c89ecbce373d2a3 SHA512 9d2c0d3a0d8f6c31ba4fabe48f801910f886fde43dc198dc4213708d6967ed5e040a1bb7348aa1cb126577ee508a3ec36fe65256d027d861d6ffb70f6383967a
-DIST curl-8.8.0.tar.xz.asc 488 BLAKE2B d80c0ff357b344d7ec2b975a92f1eeb7557993b61a69e7adaaeab89c9b5a53ddade5104fe1a0ad260145db9c90fc0aae36dfc22320492db6696f290da9ff675b SHA512 37b501770225dff6b1e7bde1157f556f10ec1c597fcbbb5c8b8c370efb97a3a70f585f2f5c201b96380d68466696474a5f65a07da59b704678d6927567d25359
+DIST curl-8.12.0.tar.xz 2777552 BLAKE2B b38c7465a38f6bbdc6daa1e8a27dc810f970c9172ddf532881e83965e1fa6001beff1bf358e5138e1a0ae1121d877f6a5a4f38ef7ea7e03c8b06dc46fbf24022 SHA512 ed35f0020541050ce387f4ba80f9e87562ececd99082da1bae85840dee81c49b86a4a55909e15fcbf4eb116106a796c29a9b2678dee11326f80db75992c6edc5
+DIST curl-8.12.0.tar.xz.asc 488 BLAKE2B 8977dabab96b6f188e8b16497e7a4e589f05b5512a9bc6ec0ee36797615c720b9cb5c34bc90df6ee037d898b8fa7f708ad2b2ff789163adcb5308a2e0d7cf9df SHA512 8526554ffb2187b48b6a4c6a0d4a8c73d484ef3ce4c3791add0e759baf953ac7ae0b2f88d688365b1f09c5745198611fa1761aa14d02ddf52823c4ff238779cd
DIST curl-8.9.1.tar.xz 2782364 BLAKE2B 6e38e20e2b03ab5bfbb8d9797442dfdd9644fc80d7b1f7c1efb1f44e0d730524e82ccf7413b2c6f4555bd61ae42f91ec7c0201e2c0d563811c85164aa234aada SHA512 a0fe234402875db194aad4e4208b7e67e7ffc1562622eea90948d4b9b0122c95c3dde8bbe2f7445a687cb3de7cb09f20e5819d424570442d976aa4c913227fc7
DIST curl-8.9.1.tar.xz.asc 488 BLAKE2B 437268f6e5ba5db73f205fd87f3ded1e5fc200e8bf63a83cdb7e21dfbf2f4a4620e598cd0bf5d8fa1548ade08d45b386599542cd988df46a238b85790409f42e SHA512 18acd58436d70900ab6912b84774da2c451b9dbfc83d6d00f85bbbe7894b67075918e58956fdb753fcc1486e4f10caa31139d7c68b037d7c83dc2e9c2fae9f9b
diff --git a/net-misc/curl/curl-8.10.1-r1.ebuild b/net-misc/curl/curl-8.10.1-r2.ebuild
index 15453a09b464..fefabb8b133a 100644
--- a/net-misc/curl/curl-8.10.1-r1.ebuild
+++ b/net-misc/curl/curl-8.10.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -106,7 +106,7 @@ RDEPEND="
)
mbedtls? (
app-misc/ca-certificates
- net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+ net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
)
openssl? (
>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
diff --git a/net-misc/curl/curl-8.11.1-r1.ebuild b/net-misc/curl/curl-8.11.1-r2.ebuild
index ddd74bc97377..1c959b004fb5 100644
--- a/net-misc/curl/curl-8.11.1-r1.ebuild
+++ b/net-misc/curl/curl-8.11.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ else
https://curl.se/download/${P}.tar.xz
verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
LICENSE="BSD curl ISC test? ( BSD-4 )"
@@ -106,7 +106,7 @@ RDEPEND="
)
mbedtls? (
app-misc/ca-certificates
- net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+ net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
)
openssl? (
>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
diff --git a/net-misc/curl/curl-8.11.0.ebuild b/net-misc/curl/curl-8.12.0.ebuild
index 35717336263a..f8c605501860 100644
--- a/net-misc/curl/curl-8.11.0.ebuild
+++ b/net-misc/curl/curl-8.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -106,7 +106,7 @@ RDEPEND="
)
mbedtls? (
app-misc/ca-certificates
- net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+ net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
)
openssl? (
>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
@@ -156,15 +156,8 @@ QA_CONFIG_IMPL_DECL_SKIP=(
)
PATCHES=(
- "${FILESDIR}/${PN}-prefix-3.patch"
+ "${FILESDIR}/${PN}-prefix-4.patch"
"${FILESDIR}/${PN}-respect-cflags-3.patch"
- "${FILESDIR}/${P}-cmdline-ech-docs.patch"
- "${FILESDIR}/${P}-curl-libssh-ipv6-brackets.patch"
- "${FILESDIR}/${P}-mbedtls-global-init.patch"
- "${FILESDIR}/${P}-setopt-http_content_decoding.patch"
- "${FILESDIR}/${P}-cookie-case-sensitive.patch"
- "${FILESDIR}/${P}-duphandle-init-netrc.patch"
- "${FILESDIR}/${P}-netrc-large-file.patch"
)
src_prepare() {
@@ -277,15 +270,12 @@ multilib_src_configure() {
--enable-socketpair
--disable-sspi
$(use_enable static-libs static)
- --enable-pthreads
- --enable-threaded-resolver
--disable-versioned-symbols
--without-amissl
--without-bearssl
$(use_with brotli)
--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
$(use_with http2 nghttp2)
- --without-hyper
$(use_with idn libidn2)
$(use_with kerberos gssapi "${EPREFIX}"/usr)
--without-libgsasl
@@ -321,9 +311,17 @@ multilib_src_configure() {
)
fi
- if [[ ${CHOST} == *mingw* ]] ; then
+ # Since 8.12.0 adns/c-ares and the threaded resolver are mutually exclusive
+ # This is in support of some work to enable `httpsrr` to use adns and the rest
+ # of curl to use the threaded resolver; we'll just make `httpsrr` conditional on adns
+ # when the time comes.
+ if use adns; then
myconf+=(
- --disable-pthreads
+ --disable-threaded-resolver
+ )
+ else
+ myconf+=(
+ --enable-threaded-resolver
)
fi
diff --git a/net-misc/curl/curl-8.8.0-r1.ebuild b/net-misc/curl/curl-8.8.0-r1.ebuild
deleted file mode 100644
index 71a852bab339..000000000000
--- a/net-misc/curl/curl-8.8.0-r1.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should subscribe to the 'curl-distros' ML for backports etc
-# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
-# https://lists.haxx.se/listinfo/curl-distros
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
-inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.se/"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/curl/curl.git"
-else
- SRC_URI="
- https://curl.se/download/${P}.tar.xz
- verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
- "
- KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-LICENSE="BSD curl ISC test? ( BSD-4 )"
-SLOT="0"
-IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3"
-IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
-# These select the default SSL implementation
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl provider can be enabled
-# The default ssl provider needs its USE satisfied
-# nghttp3 = https://bugs.gentoo.org/912029
-REQUIRED_USE="
- ssl? (
- ^^ (
- curl_ssl_gnutls
- curl_ssl_mbedtls
- curl_ssl_openssl
- curl_ssl_rustls
- )
- )
- curl_ssl_gnutls? ( gnutls )
- curl_ssl_mbedtls? ( mbedtls )
- curl_ssl_openssl? ( openssl )
- curl_ssl_rustls? ( rustls )
- nghttp3? (
- !openssl
- alt-svc )
-"
-
-# cURL's docs and CI/CD are great resources for confirming supported versions
-# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
-# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
-# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
-# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2)
-# However 'supported' vs 'works' are two entirely different things; be sane but
-# don't be afraid to require a later version.
-
-RDEPEND="
- >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
- adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
- http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
- idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
- nghttp3? (
- >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}]
- >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
- )
- psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
- ssl? (
- gnutls? (
- app-misc/ca-certificates
- >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
- dev-libs/nettle:=[${MULTILIB_USEDEP}]
- )
- mbedtls? (
- app-misc/ca-certificates
- net-libs/mbedtls:=[${MULTILIB_USEDEP}]
- )
- openssl? (
- >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
- )
- rustls? (
- >=net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}]
- )
- )
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- dev-lang/perl
- virtual/pkgconfig
- test? (
- sys-apps/diffutils
- http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
- nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
- )
- verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/curl-config
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
- __builtin_available
- closesocket
- CloseSocket
- getpass_r
- ioctlsocket
- IoctlSocket
- mach_absolute_time
- setmode
- _fseeki64
- # custom AC_LINK_IFELSE code fails to link even without -Werror
- OSSL_QUIC_client_method
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-prefix-2.patch
- "${FILESDIR}"/${PN}-respect-cflags-3.patch
- "${FILESDIR}"/${P}-install-manpage.patch
- "${FILESDIR}"/${P}-mbedtls.patch
- "${FILESDIR}"/${P}-multi_wait-timeout.patch
-)
-
-src_prepare() {
- default
-
- eprefixify curl-config.in
- eautoreconf
-}
-
-multilib_src_configure() {
- # We make use of the fact that later flags override earlier ones
- # So start with all ssl providers off until proven otherwise
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
- local myconf=()
-
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
- if use ssl; then
- myconf+=( --without-gnutls --without-mbedtls --without-rustls )
-
- if use gnutls; then
- multilib_is_native_abi && einfo "SSL provided by gnutls"
- myconf+=( --with-gnutls )
- fi
- if use mbedtls; then
- multilib_is_native_abi && einfo "SSL provided by mbedtls"
- myconf+=( --with-mbedtls )
- fi
- if use openssl; then
- multilib_is_native_abi && einfo "SSL provided by openssl"
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
- fi
- if use rustls; then
- multilib_is_native_abi && einfo "SSL provided by rustls"
- myconf+=( --with-rustls )
- fi
- if use curl_ssl_gnutls; then
- multilib_is_native_abi && einfo "Default SSL provided by gnutls"
- myconf+=( --with-default-ssl-backend=gnutls )
- elif use curl_ssl_mbedtls; then
- multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
- myconf+=( --with-default-ssl-backend=mbedtls )
- elif use curl_ssl_openssl; then
- multilib_is_native_abi && einfo "Default SSL provided by openssl"
- myconf+=( --with-default-ssl-backend=openssl )
- elif use curl_ssl_rustls; then
- multilib_is_native_abi && einfo "Default SSL provided by rustls"
- myconf+=( --with-default-ssl-backend=rustls )
- else
- eerror "We can't be here because of REQUIRED_USE."
- die "Please file a bug, hit impossible condition w/ USE=ssl handling."
- fi
-
- else
- myconf+=( --without-ssl )
- einfo "SSL disabled"
- fi
-
- # These configuration options are organized alphabetically
- # within each category. This should make it easier if we
- # ever decide to make any of them contingent on USE flags:
- # 1) protocols first. To see them all do
- # 'grep SUPPORT_PROTOCOLS configure.ac'
- # 2) --enable/disable options second.
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
- # 3) --with/without options third.
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
- myconf+=(
- $(use_enable alt-svc)
- --enable-basic-auth
- --enable-bearer-auth
- --enable-digest-auth
- --enable-kerberos-auth
- --enable-negotiate-auth
- --enable-aws
- --enable-dict
- --disable-ech
- --enable-file
- $(use_enable ftp)
- $(use_enable gopher)
- $(use_enable hsts)
- --enable-http
- $(use_enable imap)
- $(use_enable ldap)
- $(use_enable ldap ldaps)
- --enable-ntlm
- $(use_enable pop3)
- --enable-rt
- --enable-rtsp
- $(use_enable samba smb)
- $(use_with ssh libssh2)
- $(use_enable smtp)
- $(use_enable telnet)
- $(use_enable tftp)
- --enable-tls-srp
- $(use_enable adns ares)
- --enable-cookies
- --enable-dateparse
- --enable-dnsshuffle
- --enable-doh
- --enable-symbol-hiding
- --enable-http-auth
- --enable-ipv6
- --enable-largefile
- --enable-manual
- --enable-mime
- --enable-netrc
- $(use_enable progress-meter)
- --enable-proxy
- --enable-socketpair
- --disable-sspi
- $(use_enable static-libs static)
- --enable-pthreads
- --enable-threaded-resolver
- --disable-versioned-symbols
- --without-amissl
- --without-bearssl
- $(use_with brotli)
- --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
- $(use_with http2 nghttp2)
- --without-hyper
- $(use_with idn libidn2)
- $(use_with kerberos gssapi "${EPREFIX}"/usr)
- --without-libgsasl
- $(use_with psl libpsl)
- --without-msh3
- $(use_with nghttp3)
- $(use_with nghttp3 ngtcp2)
- --without-quiche
- $(use_with rtmp librtmp)
- --without-schannel
- --without-secure-transport
- --without-test-caddy
- --without-test-httpd
- --without-test-nghttpx
- $(use_enable websockets)
- --without-winidn
- --without-wolfssl
- --with-zlib
- $(use_with zstd)
- --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
- )
-
- if use debug; then
- myconf+=(
- --enable-debug
- )
- fi
-
- if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then
- myconf+=(
- --with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
- )
- fi
-
- if [[ ${CHOST} == *mingw* ]] ; then
- myconf+=(
- --disable-pthreads
- )
- fi
-
- ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
- if ! multilib_is_native_abi; then
- # Avoid building the client (we just want libcurl for multilib)
- sed -i -e '/SUBDIRS/s:src::' Makefile || die
- sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
- fi
-
- # Fix up the pkg-config file to be more robust.
- # https://github.com/curl/curl/issues/864
- local priv=() libs=()
- # We always enable zlib.
- libs+=( "-lz" )
- priv+=( "zlib" )
- if use http2; then
- libs+=( "-lnghttp2" )
- priv+=( "libnghttp2" )
- fi
- if use nghttp3; then
- libs+=( "-lnghttp3" "-lngtcp2" )
- priv+=( "libnghttp3" "libngtcp2" )
- fi
- if use ssl && use curl_ssl_openssl; then
- libs+=( "-lssl" "-lcrypto" )
- priv+=( "openssl" )
- fi
- grep -q Requires.private libcurl.pc && die "need to update ebuild"
- libs=$(printf '|%s' "${libs[@]}")
- sed -i -r \
- -e "/^Libs.private/s:(${libs#|})( |$)::g" \
- libcurl.pc || die
- echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
-}
-
-multilib_src_compile() {
- default
-
- if multilib_is_native_abi; then
- # Shell completions
- ! tc-is-cross-compiler && emake -C scripts
- fi
-}
-
-# There is also a pytest harness that tests for bugs in some very specific
-# situations; we can rely on upstream for this rather than adding additional test deps.
-multilib_src_test() {
- # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
- # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
- # -v: verbose
- # -a: keep going on failure (so we see everything which breaks, not just 1st test)
- # -k: keep test files after completion
- # -am: automake style TAP output
- # -p: print logs if test fails
- # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
- # or just read https://github.com/curl/curl/tree/master/tests#run.
- # Note: we don't run the testsuite for cross-compilation.
- # Upstream recommend 7*nproc as a starting point for parallel tests, but
- # this ends up breaking when nproc is huge (like -j80).
- # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
- # as most gentoo users don't have an 'ip6-localhost'
- multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi; then
- # Shell completions
- ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -type f -name '*.la' -delete || die
- rm -rf "${ED}"/etc/ || die
-}
-
-pkg_postinst() {
- if use debug; then
- ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
- ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
- ewarn "hic sunt dracones; you have been warned."
- fi
-}
diff --git a/net-misc/curl/curl-8.9.1-r1.ebuild b/net-misc/curl/curl-8.9.1-r2.ebuild
index 6f36295d7391..0648465d5677 100644
--- a/net-misc/curl/curl-8.9.1-r1.ebuild
+++ b/net-misc/curl/curl-8.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -106,7 +106,7 @@ RDEPEND="
)
mbedtls? (
app-misc/ca-certificates
- net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+ net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
)
openssl? (
>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index 09179eadd2f2..f8c605501860 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -106,7 +106,7 @@ RDEPEND="
)
mbedtls? (
app-misc/ca-certificates
- net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+ net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
)
openssl? (
>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
@@ -156,7 +156,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
)
PATCHES=(
- "${FILESDIR}/${PN}-prefix-3.patch"
+ "${FILESDIR}/${PN}-prefix-4.patch"
"${FILESDIR}/${PN}-respect-cflags-3.patch"
)
@@ -270,15 +270,12 @@ multilib_src_configure() {
--enable-socketpair
--disable-sspi
$(use_enable static-libs static)
- --enable-pthreads
- --enable-threaded-resolver
--disable-versioned-symbols
--without-amissl
--without-bearssl
$(use_with brotli)
--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
$(use_with http2 nghttp2)
- --without-hyper
$(use_with idn libidn2)
$(use_with kerberos gssapi "${EPREFIX}"/usr)
--without-libgsasl
@@ -314,9 +311,17 @@ multilib_src_configure() {
)
fi
- if [[ ${CHOST} == *mingw* ]] ; then
+ # Since 8.12.0 adns/c-ares and the threaded resolver are mutually exclusive
+ # This is in support of some work to enable `httpsrr` to use adns and the rest
+ # of curl to use the threaded resolver; we'll just make `httpsrr` conditional on adns
+ # when the time comes.
+ if use adns; then
myconf+=(
- --disable-pthreads
+ --disable-threaded-resolver
+ )
+ else
+ myconf+=(
+ --enable-threaded-resolver
)
fi
diff --git a/net-misc/curl/files/curl-prefix-4.patch b/net-misc/curl/files/curl-prefix-4.patch
new file mode 100644
index 000000000000..796b67fd927f
--- /dev/null
+++ b/net-misc/curl/files/curl-prefix-4.patch
@@ -0,0 +1,35 @@
+From f18f4362d7ca60fb12248a559dab26aea330771c Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Wed, 5 Feb 2025 17:27:11 +1000
+Subject: [PATCH] Update prefix patch for 8.12.0
+
+Signed-off-by: Matt Jolly <kangie@gentoo.org>
+---
+ curl-config.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/curl-config.in b/curl-config.in
+index 55184167b..df31fdb46 100644
+--- a/curl-config.in
++++ b/curl-config.in
+@@ -141,7 +141,7 @@ while test "$#" -gt 0; do
+ ;;
+
+ --cflags)
+- if test "X@includedir@" = 'X/usr/include'; then
++ if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
+ echo '@LIBCURL_PC_CFLAGS@'
+ else
+ echo "@LIBCURL_PC_CFLAGS@ -I@includedir@"
+@@ -149,7 +149,7 @@ while test "$#" -gt 0; do
+ ;;
+
+ --libs)
+- if test "X@libdir@" != 'X/usr/lib' -a "X@libdir@" != 'X/usr/lib64'; then
++ if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
+ curllibdir="-L@libdir@ "
+ else
+ curllibdir=''
+--
+2.48.0
+
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 884608c7c1f5..b3581ad82856 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -17,7 +17,6 @@
<flag name="hsts">Enable HTTP Strict Transport Security</flag>
<flag name="imap">Enable Internet Message Access Protocol support</flag>
<flag name="mbedtls">Enable mbedtls ssl backend</flag>
- <flag name="nghttp3">Enable HTTP/3 support using <pkg>net-libs/nghttp3</pkg></flag>
<flag name="http3">Enable HTTP/3 support</flag>
<flag name="openssl">Enable openssl ssl backend</flag>
<flag name="pop3">Enable Post Office Protocol 3 support</flag>
diff --git a/net-misc/dropbear/dropbear-2024.86-r1.ebuild b/net-misc/dropbear/dropbear-2024.86-r1.ebuild
index c5f61a79f77c..8a3b5b39b477 100644
--- a/net-misc/dropbear/dropbear-2024.86-r1.ebuild
+++ b/net-misc/dropbear/dropbear-2024.86-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="bsdpty legacy-ciphers minimal multicall pam +shadow static +syslog test +test-async zlib"
RESTRICT="!test? ( test )"
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 8de118df2785..266bfbea10fb 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,7 +1,5 @@
DIST dropbox-icon.svg 574 BLAKE2B a73a0906b5b03dc3214010736164fcdbceb6d91463ed95133b5117277cd635c8a77ec3e7ca8338538e5a6a2c4a23f3ef0186184bc1dc770b3c7f3a219f00faa6 SHA512 cd7ad8fea652f0713a00e7fbd88d6c22949dde216040f2ba7c903db70cb6c5c9ec85202831c0863c3bb2cf339b4ea0c6731d7b2d56750b63a4f36160815e4346
-DIST dropbox-lnx.x86_64-209.4.3661.tar.gz 117384855 BLAKE2B 509c1e3b8eab3e44b6b713988b7bebc83f9ee62c94100fceb163496d5b419c4caaf933f9646e21ad996a303140639b7de44b2a52fac942adc23a1973a86149ab SHA512 769c3063f87732ecc82e44e1de7ffa581d313fbdecf2230304730ab58da0e4a0bf284e3188897d066c961a5e25316c481b47d46e6dc015a5b974ade7074a4b54
-DIST dropbox-lnx.x86_64-210.4.4854.tar.gz 117607664 BLAKE2B 402717c16c063de5b506826cdf2862eab009e3b8c28eda64deebc7dc9637947c1d46dec183a99bab3353257e1ca118e4fe72f390537175038a0b25eb7adc8a6a SHA512 4331999d87e7326dd6a60bb1aebce94326e776a595f6222bd9238a4225139b84324bde6215162aece0eb87868e1e6320092ba40d6fff684dbdc39535dc5426b4
-DIST dropbox-lnx.x86_64-211.4.6008.tar.gz 113807403 BLAKE2B 893e8e7480b44551b79581172d908f7caa76fe8df54704f0fff3bb02bd0885ca07f0feb3a8cb70f7f21abdc9534204acf95d9ffa62b72bda3ca17ef9b9a271ac SHA512 e734581117dcc78c72cb925316a88def7d094b04058b6753d498fc258a82bddb9a920e546c92ddd441d9ed0e9b8e6109c4924e2a14da1414166dec7c26a651ce
-DIST dropbox-lnx.x86_64-212.4.5767.tar.gz 113020508 BLAKE2B ac8ee381a4e28f84cdb1103e30bf2e1f2e948340e62811381961d90c3b49886133b0a64c62f06de0fb17d1e753b3bb854518ec1e94f779dcdd351dff1f349ba4 SHA512 c2d827794186be2ff40bc58048885e21a360410d8a00b142ae184e72a0982a50a02a1ab02cdad38957e66413b020bd08c41d86da6818b30694b1ad21316ae3fb
-DIST dropbox-lnx.x86_64-213.4.4597.tar.gz 112310334 BLAKE2B 24d94630e755fdafe56c37f0963acf4a35f19da85ed1616434d1dafe152b0b51a883932978b9aa946a088ad6eb9f166658812fbefa61e916da1902c85b483e30 SHA512 6646a444bd1bd22656aad9f13a713ab04373307e0cdc32fea1bfe2115cd10f781a0816894790033d2b39f841711312693d4df6feeb696a3f805fcb50eac32a0f
DIST dropbox-lnx.x86_64-214.4.5217.tar.gz 112333087 BLAKE2B e787a4a26e7f5cdf26aea10d1d13799751231534a94893e39a2537a1bb85c64dba4b5ace222885c5b754bf7a27c49c5b0433551854b3395e5b67cf00300a79db SHA512 0cd69a509909592073e00a784e71a4a38c15441b8ca9a39167e5701a08c3d8d7f1e7bdec90b4211dc6ab0ca79f35f77f2a9f734a1c23bff63b81068b51cce163
+DIST dropbox-lnx.x86_64-215.4.7202.tar.gz 112251332 BLAKE2B 8c9ad1d79e71bc8ad1e2a91453333d5b002196f0a309a7505e4fc0fa82704654f21e5896f1082a1d85acc7ef67c9edbc9c80f6b16d655772f0aafbaa56f5353c SHA512 711327f51d7d6a176607dc7704ca5358885c9546ac476b34d0d1dbe293f50baac139f442dc694a50e842ba08a9312ea81fc73921d7d1dd4bf26407ac5cb06acf
+DIST dropbox-lnx.x86_64-216.4.4420.tar.gz 111371085 BLAKE2B 2b9bb495576e78fc0265927cc8f43b8e52a14c2c424e32e53fdce001ceaa540fff923ce4cf43f3840ab9b137ea8de0e830b7c036cb776a85d9f3525076ad7475 SHA512 dcc166b70e476e5c0ae5528c096d4a9715a3c22dc298a3787389152acb0f1a0e4abe6102ced8f0013df84e4af87819234a1d8a3c2c4950de1e6f90849faa53fe
+DIST dropbox-lnx.x86_64-217.4.4417.tar.gz 111286253 BLAKE2B a4f5f5f07dcd48c1bf30814e6a5e2ae47fd812ec81ec569666906ab59e12448cee7ac5f8aafe01c64b8aafb4c5c95234cfde319f08e8cd9f26f74c1f4d4f1dcb SHA512 2628e43bc31c7e4c4cb00071f6dbb4e9d57b3c7e41f0975eeb5c3beedb9b8d5cf4571317f28a09b65bcaaf5942b3a398c9e32c006b188f74a9baa0fa8bfb10a9
diff --git a/net-misc/dropbox/dropbox-209.4.3661.ebuild b/net-misc/dropbox/dropbox-209.4.3661.ebuild
deleted file mode 100644
index 3f3f937a4064..000000000000
--- a/net-misc/dropbox/dropbox-209.4.3661.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
- https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz
- https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
- X? (
- x11-themes/hicolor-icon-theme
- )
- selinux? ( sec-policy/selinux-dropbox )
- app-arch/bzip2
- dev-libs/glib:2
- dev-libs/libffi-compat:6
- media-libs/fontconfig
- media-libs/freetype
- net-misc/wget
- sys-libs/zlib
- sys-libs/ncurses-compat:5
- virtual/opengl
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libxcb
-"
-
-src_unpack() {
- unpack ${A}
- mkdir -p "${S}" || die
- mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
- mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
- rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
- rmdir .dropbox-dist || die
-}
-
-src_prepare() {
- default
- # we supply all of these in RDEPEND
- rm -vf libGL.so.1 libX11* libffi.so.6 || die
- # some of these do not appear to be used
- rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
- PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \
- wmctrl libdrm.so.2 libpopt.so.0 || die
- if use X ; then
- mv images/hicolor/16x16/status "${T}" || die
- else
- rm -vrf images || die
- fi
- patchelf --set-rpath '$ORIGIN' \
- apex._apex.*.so \
- nucleus_python.*.so \
- tprt.*.so \
- || die
- pax-mark cm dropbox
- mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
- local targetdir="/opt/dropbox"
-
- insinto "${targetdir}"
- doins -r *
- fperms a+x "${targetdir}"/{dropbox,dropboxd}
- dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
- if use X; then
- doicon -s 16 -c status "${T}"/status
- newicon -s scalable "${DISTDIR}/dropbox-icon.svg" dropbox.svg
- fi
-
- make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
- newinitd "${FILESDIR}"/dropbox.initd dropbox
- newconfd "${FILESDIR}"/dropbox.conf dropbox
- systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
- dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
- einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
- einfo " your user's home directory. To prevent this, run the following as"
- einfo " each user who will run dropbox:"
- einfo ""
- einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-212.4.5767.ebuild b/net-misc/dropbox/dropbox-212.4.5767.ebuild
deleted file mode 100644
index 9aafe425d4d6..000000000000
--- a/net-misc/dropbox/dropbox-212.4.5767.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
- https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz
- https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
- X? (
- x11-themes/hicolor-icon-theme
- )
- selinux? ( sec-policy/selinux-dropbox )
- app-arch/bzip2
- dev-libs/glib:2
- dev-libs/libffi-compat:6
- media-libs/fontconfig
- media-libs/freetype
- net-misc/wget
- sys-libs/zlib
- sys-libs/ncurses-compat:5
- virtual/opengl
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libxcb
-"
-
-src_unpack() {
- unpack ${A}
- mkdir -p "${S}" || die
- mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
- mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
- rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
- rmdir .dropbox-dist || die
-}
-
-src_prepare() {
- default
- # we supply all of these in RDEPEND
- rm -vf libGL.so.1 libX11* libffi.so.6 || die
- # some of these do not appear to be used
- rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
- PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \
- wmctrl libdrm.so.2 libpopt.so.0 || die
- if use X ; then
- mv images/hicolor/16x16/status "${T}" || die
- else
- rm -vrf images || die
- fi
- patchelf --set-rpath '$ORIGIN' \
- apex._apex.*.so \
- nucleus_python.*.so \
- tprt.*.so \
- || die
- pax-mark cm dropbox
- mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
- local targetdir="/opt/dropbox"
-
- insinto "${targetdir}"
- doins -r *
- fperms a+x "${targetdir}"/{dropbox,dropboxd}
- dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
- if use X; then
- doicon -s 16 -c status "${T}"/status
- newicon -s scalable "${DISTDIR}/dropbox-icon.svg" dropbox.svg
- fi
-
- make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
- newinitd "${FILESDIR}"/dropbox.initd dropbox
- newconfd "${FILESDIR}"/dropbox.conf dropbox
- systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
- dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
- einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
- einfo " your user's home directory. To prevent this, run the following as"
- einfo " each user who will run dropbox:"
- einfo ""
- einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-214.4.5217.ebuild b/net-misc/dropbox/dropbox-214.4.5217.ebuild
index 9aafe425d4d6..1cc4d0f0e51e 100644
--- a/net-misc/dropbox/dropbox-214.4.5217.ebuild
+++ b/net-misc/dropbox/dropbox-214.4.5217.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
IUSE="selinux X"
RESTRICT="mirror strip"
@@ -101,6 +101,8 @@ src_install() {
}
pkg_postinst() {
+ xdg_pkg_postinst
+
einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
einfo " your user's home directory. To prevent this, run the following as"
einfo " each user who will run dropbox:"
diff --git a/net-misc/dropbox/dropbox-211.4.6008.ebuild b/net-misc/dropbox/dropbox-215.4.7202.ebuild
index 9aafe425d4d6..8bce8f921402 100644
--- a/net-misc/dropbox/dropbox-211.4.6008.ebuild
+++ b/net-misc/dropbox/dropbox-215.4.7202.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -101,6 +101,8 @@ src_install() {
}
pkg_postinst() {
+ xdg_pkg_postinst
+
einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
einfo " your user's home directory. To prevent this, run the following as"
einfo " each user who will run dropbox:"
diff --git a/net-misc/dropbox/dropbox-213.4.4597.ebuild b/net-misc/dropbox/dropbox-216.4.4420.ebuild
index 9aafe425d4d6..afc5b3e0496e 100644
--- a/net-misc/dropbox/dropbox-213.4.4597.ebuild
+++ b/net-misc/dropbox/dropbox-216.4.4420.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-misc/dropbox/dropbox-210.4.4854.ebuild b/net-misc/dropbox/dropbox-217.4.4417.ebuild
index 9aafe425d4d6..afc5b3e0496e 100644
--- a/net-misc/dropbox/dropbox-210.4.4854.ebuild
+++ b/net-misc/dropbox/dropbox-217.4.4417.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 9e7b75f0e532..f19fb3a98b4b 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,3 +1,2 @@
DIST Electrum-4.5.8.tar.gz 13752500 BLAKE2B e8995e98c90dde3ae758df7e2a959d33c91ddddba5c950e24b3ca2d216f3aaa06e2186db02240f739ac76778affcc952671e7bde3e6bf86ff0f2f9a820e60ac6 SHA512 ccf45dc5e3a615d446e0714ddaa9ef74b96829bdf9a5236e18efff5f014ca18c48502a375ec98c9bc170f1db69e846b7015ca715b9cac8d77afde9f1939bc403
DIST Electrum-4.5.8.tar.gz.asc 2499 BLAKE2B a2cd9a2ab2b071bd5fea37bc9aa8a42bae68671d850d762753955bb43be562e25a4d3bdefcd3d7c1840e5e19e16237d7516a110d759733f73c0d66a67f9703f5 SHA512 f15a7b68fa2039f75d99729a34c207f31181afeb865db7cf5b27b68f9a7a4054e9d7ea46bda39fa3441cc6d1c798ae0c797dfdf1c178d2121ba2aff3b434d09a
-DIST electrum-4.5.8.gh.tar.gz 5896794 BLAKE2B a58a62adfdfe9d3f033033f9120e697cb2c2441076abfc7e914ad7185b9bbe63d81e2c305b80ab57cd0649274f9077f3c4ae59d6236a0bb23ad6838553186894 SHA512 0e7b15747fcce94ad60f068c013a5f6051402b049bb63493179768f6a4c6cb7b8d1b7b1750861afd89f7ed6a83313dee6d40022098ed2dbb9897fbf31e978350
diff --git a/net-misc/electrum/electrum-4.5.8-r1.ebuild b/net-misc/electrum/electrum-4.5.8-r1.ebuild
deleted file mode 100644
index 66b8a007568a..000000000000
--- a/net-misc/electrum/electrum-4.5.8-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="
- https://electrum.org/
- https://github.com/spesmilo/electrum/
-"
-SRC_URI="
- https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- <dev-libs/libsecp256k1-0.6
- >=dev-python/aiohttp-socks-0.8.4[${PYTHON_USEDEP}]
- =dev-python/aiorpcx-0.23*[${PYTHON_USEDEP}]
- >=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- >=dev-python/dnspython-2[${PYTHON_USEDEP}]
- dev-python/jsonpatch[${PYTHON_USEDEP}]
- dev-python/pbkdf2[${PYTHON_USEDEP}]
- dev-python/pyperclip[${PYTHON_USEDEP}]
- dev-python/pysocks[${PYTHON_USEDEP}]
- dev-python/qrcode[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=dev-python/protobuf-3.20[${PYTHON_USEDEP}]
- qrcode? ( media-gfx/zbar[v4l] )
- qt5? (
- dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}]
- )
- ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
- test? (
- dev-python/pyaes[${PYTHON_USEDEP}]
- dev-python/pycryptodome[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
- # test for qml/PyQt6 GUI that doesn't work anyway
- tests/test_qml_types.py
-)
-
-src_prepare() {
- # use backwards-compatible cryptodome API
- sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
- # make qdarkstyle dep optional
- sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
-
- # remove upper bounds from deps
- sed -i -e 's:,<[0-9.]*::' contrib/requirements/requirements.txt || die
-
- local bestgui
- if use qt5; then
- bestgui=qt
- elif use ncurses; then
- bestgui=text
- else
- bestgui=stdio
- fi
- sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
- eapply_user
-
- xdg_environment_reset
- distutils-r1_src_prepare
-}
-
-src_install() {
- dodoc RELEASE-NOTES
- distutils-r1_src_install
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-
- local v
- for v in ${REPLACING_VERSIONS}; do
- ver_test "${v}" -ge 4.3.4 && return
- done
-
- ewarn "If you are new to BitCoin, please be aware that:"
- ewarn "1. Cryptocurrencies are volatile. BTC has been subject to rapid"
- ewarn " changes of value in the past."
- ewarn "2. Cryptocurrency ownership is determined solely by the access to"
- ewarn " the private key. If the key is lost or stolen, BTC are unrevocably"
- ewarn " lost."
- ewarn "3. Proof-of-work based cryptocurrencies have negative environmental"
- ewarn " impact. BTC mining is consuming huge amounts of electricity."
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.5.8-r2.ebuild b/net-misc/electrum/electrum-4.5.8-r2.ebuild
index e7eecb79c2c5..2292dd969bdc 100644
--- a/net-misc/electrum/electrum-4.5.8-r2.ebuild
+++ b/net-misc/electrum/electrum-4.5.8-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
PYTHON_REQ_USE="ncurses?"
inherit distutils-r1 verify-sig xdg-utils
@@ -25,7 +25,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cli ncurses qrcode +qt5"
REQUIRED_USE="|| ( cli ncurses qt5 )"
diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest
index c93f616f6ee2..c9ad76157e2f 100644
--- a/net-misc/ena-driver/Manifest
+++ b/net-misc/ena-driver/Manifest
@@ -1 +1,2 @@
DIST ena-driver-2.13.0-linux.tar.gz 1450959 BLAKE2B 3536d976505de48f64ad33bb30269dbc090631e862c68c250f9452e5537018f86ecb93fa2272a812172c9145d33ecef7e82a1cee3cf86db53f520f6e2b3d3545 SHA512 2be761afae1374ab5d8043d01d8521c21c944d8e6830b0cf24dea6e51a4b2e1751d5521ad261af9eebca819c9c15ebcec5a84b51af505df7bc9cd99ef0350939
+DIST ena-driver-2.13.2-linux.tar.gz 1468215 BLAKE2B e5f4cba68b77b2c9b971771f548ad62d555838d6f8c88dc33282fc2498df3e7e9503f8aa346999652e4b3102c4dc1981d2e8e21587c9f1201aef7b6c3c03c761 SHA512 c4c20fe3ad79496ef99c2137855b5842a8dab18e936eca890509a70c66832892f4a13c7cb7cf15546525226eaddbc632ce45a296656fbf36414bb67929a928aa
diff --git a/net-misc/ena-driver/ena-driver-2.13.2.ebuild b/net-misc/ena-driver/ena-driver-2.13.2.ebuild
new file mode 100644
index 000000000000..9c3884dfcf29
--- /dev/null
+++ b/net-misc/ena-driver/ena-driver-2.13.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver"
+HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html"
+SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> ${P}-linux.tar.gz"
+S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="app-arch/unzip"
+
+CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB"
+DOCS=(
+ README.rst
+ RELEASENOTES.md
+ ENA_Linux_Best_Practices.rst
+)
+
+src_compile() {
+ local modlist=( ena=net )
+ local modargs=( CONFIG_MODULE_SIG=n BUILD_KERNEL="${KV_FULL}" )
+ linux-mod-r1_src_compile
+}
diff --git a/net-misc/ethflop/ethflop-20191003-r2.ebuild b/net-misc/ethflop/ethflop-20191003-r2.ebuild
deleted file mode 100644
index 714882673aba..000000000000
--- a/net-misc/ethflop/ethflop-20191003-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="A network-backed floppy emulator for DOS"
-HOMEPAGE="http://ethflop.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="tsr"
-
-BDEPEND="
- app-arch/unzip
- tsr? ( dev-lang/nasm )
-"
-
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
-
-src_compile() {
- tc-export CC
- default
-
- use tsr && emake tsr
-}
-
-src_install() {
- dobin ethflopd
-
- if use tsr; then
- insinto /usr/share/ethflop
- doins ethflop.com
- fi
-
- newinitd "${FILESDIR}"/ethflopd.initd ethflopd
- newconfd "${FILESDIR}"/ethflopd.confd ethflopd
- systemd_newunit "${FILESDIR}"/ethflopd.service-r1 ethflopd.service
-
- dodoc ethflop.txt
-}
diff --git a/net-misc/ethflop/ethflop-20240916.ebuild b/net-misc/ethflop/ethflop-20240916.ebuild
deleted file mode 100644
index 772d9062cd8a..000000000000
--- a/net-misc/ethflop/ethflop-20240916.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV_TSR="20240920"
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="A network-backed floppy emulator for DOS"
-HOMEPAGE="https://ethflop.sourceforge.net/"
-SRC_URI="
- https://ethflop.sourceforge.net/${PN}d-${PV}-src.tar.gz
- tsr? ( https://ethflop.sourceforge.net/${PN}-${MY_PV_TSR}-src.zip )
-"
-S="${WORKDIR}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tsr"
-RESTRICT="test"
-
-BDEPEND="
- app-arch/unzip
- tsr? ( dev-lang/nasm )
-"
-
-PATCHES="${FILESDIR}/${PN}-20240916-makefile.patch"
-
-src_prepare() {
- default
- mv Makefile.linux Makefile || die
- # Files are shipped uppercase, but need to be lowercase
- if use tsr; then
- for file in *.ASM *.SH; do
- mv ${file} ${file,,} || die
- done
- chmod +x build.sh || die
- fi
-}
-
-src_compile() {
- tc-export CC
- default
-
- if use tsr; then
- ./build.sh || die
- fi
-}
-
-src_install() {
- dobin ethflopd
-
- if use tsr; then
- insinto /usr/share/ethflop
- doins ethflop.com
- fi
-
- newinitd "${FILESDIR}"/ethflopd.initd ethflopd
- newconfd "${FILESDIR}"/ethflopd.confd ethflopd
- systemd_newunit "${FILESDIR}"/ethflopd.service-r1 ethflopd.service
-}
diff --git a/net-misc/ethflop/files/ethflop-20191003-makefile.patch b/net-misc/ethflop/files/ethflop-20191003-makefile.patch
deleted file mode 100644
index 7005dfdbb44b..000000000000
--- a/net-misc/ethflop/files/ethflop-20191003-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile 2019-10-03 23:02:15.000000000 +0200
-+++ b/Makefile 2019-10-15 08:31:49.541999473 +0200
-@@ -14,8 +14,8 @@
- #CFLAGS = -O2 -Wall -std=gnu89 -pedantic -Wextra -Wformat-security -D_FORTIFY_SOURCE=1 -Weverything -Wno-padded
-
- # production
--CC = gcc
--CFLAGS = -O2 -std=gnu89
-+CC ?= gcc
-+CFLAGS ?= -O2 -std=gnu89
-
- all: ethflopd
-
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 2ad5e772117b..17cbfb8f6d13 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,5 +1,7 @@
DIST freerdp-2.11.7.tar.gz 7337520 BLAKE2B ad579b4c36d96a17ccceb26c4c34124a050c05c49c05e2d8b4fd46789929dd4581d26aad88de7a3b3e6ecdd330b9b2ac2d45616537c1c635d10706f14a36f5ca SHA512 e1b4ac112090f2364ef2c360453f91b4643680cad75785cb214b48ebbc78c5eeca9fa8fe9f84f241a70825eefb5273e4e380483a5cdc86c92aa6ac1eb22c188e
DIST freerdp-2.11.7.tar.gz.asc 228 BLAKE2B a374c22ada6da59fb66fcb8021d5bb27545df0c0875b929766dc9b468e9fbfb4a79b1c38b2dbf5c44f925fd44305b1798e5ede0e6726a85c98cac96ceb8020f2 SHA512 18a1b8f18bba14e0156e5eca8fad28efdadd2f87fa29221629ffd9cf53f74606392de0df0e11ae41809fad0509c87462ee29d1e01e9df0dfe08b29832378be76
+DIST freerdp-3.11.1.tar.gz 10371756 BLAKE2B 7617527de506b05b1f7020835daa400a169fb41ba1a81acf792aef384ef60d4248500c13d9c8bd421e32fc60c56c3243f56916a71ef310992555ffb2babe0a77 SHA512 e0c04a5667218b8598c19debe4c3cb7e4bf4a736b0bd2f798dbc656e5434f54eea2b52734629865b9bbe4c2b7ad5c70ec9c913680d9b31924bfff8fd59c84b7f
+DIST freerdp-3.11.1.tar.gz.asc 228 BLAKE2B 08d3226e2a6599e818fed9054c1a1330a8694e44250561009c2df73a7df16e1768b1dd1c0ceb7461d722351db5cb28b6b9f93db43cf0c6cc1d0cefc4a898be19 SHA512 307983fc2e7759a8fa763b1f99aa6b9d09a51e0537fa89c70faaa4868ed8a4a7d72b8f273e55ef7dfb8a6fe3435307e9ff5af60cd1638d583b76a7e6480f310a
DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1 SHA512 b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5
DIST freerdp-3.6.3.tar.gz 10199503 BLAKE2B ff4c76a7f2d808db09d22b6cf79caaa1f1aff58c25d37d853d4244cf4b8d0f522cb3ad384c6284544a08e2092277e7b4ee8a6f9fa61bb24319d7c5d08aebfdc7 SHA512 e92b839bdaaed99f05c3ab883a864fb3a18a01b5e173317b1cf8210ad16cbf25f2133b8893dec9f9d3a92b0a2fbcb0230f549e1632ade0394b5c8ea0f7331e1e
DIST freerdp-3.6.3.tar.gz.asc 228 BLAKE2B 4ea04f0d662afef34d61f06d36f3bd6f872f2a7cd8095df581f489306d88a761921a0a93325bdd4c5a627a1c47c612652697b9dc3338ebe0ea952a65b0783cc7 SHA512 6568362c2ad1032925e7dfcd04977c56a58e661b8eacc79d6d2ad77bb9e56d3dff3f13d004d50a88827aa9ccbd2f56c1019a53e18bf35856dbec81acba1dc142
diff --git a/net-misc/freerdp/freerdp-3.11.1.ebuild b/net-misc/freerdp/freerdp-3.11.1.ebuild
new file mode 100644
index 000000000000..98ac9fc8efaf
--- /dev/null
+++ b/net-misc/freerdp/freerdp-3.11.1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+ case ${PV} in
+ 2.*) EGIT_BRANCH="stable-2.0";;
+ esac
+else
+ inherit verify-sig
+ MY_P=${P/_/-}
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
+ verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )"
+ VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="https://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+BDEPEND+="
+ virtual/pkgconfig
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+"
+COMMON_DEPEND="
+ dev-libs/openssl:0=
+ sys-libs/zlib:0
+ aad? ( dev-libs/cJSON )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ usb? (
+ virtual/libudev:0=
+ sys-apps/util-linux:0=
+ dev-libs/dbus-glib:0=
+ virtual/libusb:1=
+ )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ xinerama? ( x11-libs/libXinerama )
+ xv? ( x11-libs/libXv )
+ )
+ ffmpeg? ( media-video/ffmpeg:0= )
+ !ffmpeg? (
+ x11-libs/cairo:0=
+ )
+ fuse? ( sys-fs/fuse:3 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ X? ( x11-libs/libXrandr )
+ )
+ icu? ( dev-libs/icu:0= )
+ jpeg? ( media-libs/libjpeg-turbo:0= )
+ kerberos? ( virtual/krb5 )
+ openh264? ( media-libs/openh264:0= )
+ pulseaudio? ( media-libs/libpulse )
+ sdl? (
+ media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)]
+ media-libs/sdl2-ttf
+ )
+ server? (
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ xinerama? ( x11-libs/libXinerama )
+ )
+ )
+ smartcard? ( sys-apps/pcsc-lite )
+ systemd? ( sys-apps/systemd:0= )
+ client? (
+ wayland? (
+ dev-libs/wayland
+ x11-libs/libxkbcommon
+ )
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libxkbfile
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ !net-misc/freerdp:0
+ client? ( !net-misc/freerdp:2[client] )
+ server? ( !net-misc/freerdp:2[server] )
+ smartcard? ( app-crypt/p11-kit )
+"
+
+option() {
+ usex "$1" ON OFF
+}
+
+option_client() {
+ if use client; then
+ option "$1"
+ else
+ echo OFF
+ fi
+}
+
+run_for_testing() {
+ if use test; then
+ local BUILD_DIR="${WORKDIR}/${P}_testing"
+ "$@"
+ fi
+}
+
+src_configure() {
+ # bug #881695
+ filter-lto
+ freerdp_configure -DBUILD_TESTING=OFF
+ run_for_testing freerdp_configure -DBUILD_TESTING=ON
+}
+
+freerdp_configure() {
+ local mycmakeargs=(
+ -Wno-dev
+
+ # https://bugs.gentoo.org/927037
+ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
+
+ -DCHANNEL_URBDRC=$(option usb)
+ -DWITH_AAD=$(option aad)
+ -DWITH_ALSA=$(option alsa)
+ -DWITH_CCACHE=OFF
+ -DWITH_CLIENT=$(option client)
+ -DWITH_CLIENT_SDL=$(option sdl)
+ -DWITH_SAMPLE=OFF
+ -DWITH_CUPS=$(option cups)
+ -DWITH_DEBUG_ALL=$(option debug)
+ -DWITH_MANPAGES=ON
+ -DWITH_FFMPEG=$(option ffmpeg)
+ -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
+ -DWITH_SWSCALE=$(option ffmpeg)
+ -DWITH_CAIRO=$(option !ffmpeg)
+ -DWITH_DSP_FFMPEG=$(option ffmpeg)
+ -DWITH_FUSE=$(option fuse)
+ -DWITH_GSTREAMER_1_0=$(option gstreamer)
+ -DWITH_JPEG=$(option jpeg)
+ -DWITH_KRB5=$(option kerberos)
+ -DWITH_NEON=$(option cpu_flags_arm_neon)
+ -DWITH_OPENH264=$(option openh264)
+ -DWITH_OSS=OFF
+ -DWITH_PCSC=$(option smartcard)
+ -DWITH_PKCS11=$(option smartcard)
+ -DWITH_PULSE=$(option pulseaudio)
+ -DWITH_SERVER=$(option server)
+ -DWITH_LIBSYSTEMD=$(option systemd)
+ -DWITH_UNICODE_BUILTIN=$(option !icu)
+ -DWITH_VALGRIND_MEMCHECK=$(option valgrind)
+ -DWITH_X11=$(option X)
+ -DWITH_XINERAMA=$(option xinerama)
+ -DWITH_XV=$(option xv)
+ -DWITH_WAYLAND=$(option_client wayland)
+ -DWITH_WEBVIEW=OFF
+ -DWITH_WINPR_TOOLS=$(option server)
+
+ "$@"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ run_for_testing cmake_src_compile
+}
+
+src_test() {
+ local myctestargs=( -E TestBacktrace )
+ has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect )
+ run_for_testing cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+ mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die
+}
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index e2f0cbddbb95..d1c46796993b 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,3 +1,5 @@
-DIST frr-10.0.2.tar.gz 10968487 BLAKE2B 420503f25e2e40ce9f53cbb04416ba6d2fd8c7c0958f2d42391d7b534e0547e9ee429ad419cb87a06331efa75603bac1a8439844fe6a478f3b5513e656cab726 SHA512 d37373faab6b004b2bb3d99bee76a4a620ef9dcacfeadb9bbea611cb01ece869467583cde656715d50912b44a84da27103da9b2e76da8bcec9c95436ac45393c
-DIST frr-10.1.1.tar.gz 11044980 BLAKE2B 32e50394c35712bc4799cae23c369aca6307d92b20a52ca9c2264b9ee82798d4372816cf87fc6e5c00c14d7aa85b08d3560f7ef6e0d72dd2a2ad231f8f7e3841 SHA512 c555bafc7437e8ba0216bd9cc7e0a432af4c9877255ab4ffdd97a0b7626eb3c9022051b91f6cd5d27d06531f6edef84742b67169ebbc040b8a904e58712cb654
+DIST frr-10.0.3.tar.gz 10968934 BLAKE2B 18ef81af21b9ca2861dd66c7c3d4ec7faa2ba322793d1a7d4f16e967be01f0776b82e7cffb70ba289770008ad64f44117fb108ba4f88fdcb444483e89deac6ac SHA512 ca2011d720d1069a574dc4a5d87c07b7a9556d1eac7078d5f4a2eed1bac458eea41b5f1c3d0a6df78fe3fae0dab45ce5b701b60534cb219919f67ee4e22bd1a5
+DIST frr-10.1.2.tar.gz 11046539 BLAKE2B db983becc4c00256cfc87032252f85f763d9acfdc5eb8488206b32fe8caddfb8e9371808d929cb708b4df1a32d2a2df148d036f3eef98ff432812ae6a865d539 SHA512 257844687c0132819bedf559a527217d4c01abfa6b98c787f18f24e5006a53d9d3e561b22ab36631d691ba53d3f206c1d52d8020cb1b962d7ad117b159f674c6
+DIST frr-10.2.1.tar.gz 11178677 BLAKE2B 8bcc8ccf8febee1012d94a9f3de40cc177bec1af464cd935303df8859a72607d03e5f9030f05bed5d56a7a413a0029479f538b3c0b35acc4a66295b4229f6be1 SHA512 8544280a0c536e8688cbf2811d96cdc2fa3413f662013bb1b58cb02d4d56a08d98e870b39e477f6b0294e6aceb5dcc99c5facdeee165ce7597c2150ebb79101e
DIST frr-9.1.2.tar.gz 10790677 BLAKE2B dfa4967ee0e0bbecea016b9deeb70b1c1b9e409469de145050602608dddd41857be946e8df5c8a594dfaf6a124729af55d7ce4483e6fe6edc41125f09d9dabd2 SHA512 e0ed613090140ece181bff077a7067a00a5fca648ec6627c02d815060087497c68712c1ba244fa1534cdbcef49db92bd9432545d05027dc4b04db4f423726882
+DIST frr-9.1.3.tar.gz 10790704 BLAKE2B e8e68aa7bd4c4c9e01d82c2ef2788fb66fad0332000fc61bcc094af22628a09ce4dc28d41891a4a48e8493a6377f9fa02c5b782cf8a989fd7f54484ecb24e0eb SHA512 5f07ae1dcea2bca8de30dba97011de999a08cebdd1b2dd05f1eb24c4dbde2746a51de54867d77a6b5a205c8d13636589e0513c360d453143fd64802d5956a682
diff --git a/net-misc/frr/frr-10.0.3.ebuild b/net-misc/frr/frr-10.0.3.ebuild
new file mode 100644
index 000000000000..c4bf6cacfc21
--- /dev/null
+++ b/net-misc/frr/frr-10.0.3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit autotools pam python-single-r1 systemd
+
+DESCRIPTION="The FRRouting Protocol Suite"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
+# FRR tarballs have weird format.
+S="${WORKDIR}/frr-${P}"
+
+LICENSE="GPL-2+"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="doc fpm grpc nhrp ospfapi pam rpki snmp test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ acct-user/frr
+ dev-libs/json-c:0=
+ dev-libs/protobuf-c:0=
+ >=net-libs/libyang-2.1.128
+ sys-libs/libcap
+ sys-libs/readline:0=
+ virtual/libcrypt:=
+ grpc? ( net-libs/grpc:= )
+ nhrp? ( net-dns/c-ares:0= )
+ pam? ( sys-libs/pam )
+ rpki? ( >=net-libs/rtrlib-0.8.0[ssh] )
+ snmp? ( net-analyzer/net-snmp:= )
+"
+BDEPEND="
+ sys-devel/flex
+ app-alternatives/yacc
+ doc? ( dev-python/sphinx )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ elibc_musl? ( sys-libs/queue-standalone )
+ test? (
+ $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+ dev-util/cunit
+ )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
+ "${FILESDIR}"/${PN}-8.4.1-logrotate.patch
+ "${FILESDIR}"/${PN}-9.1-mimic-gnu-basename-api-for-non-glibc.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ mallinfo # No functional impact.
+ mallinfo2
+)
+
+src_prepare() {
+ default
+
+ python_fix_shebang tools
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ LEX=flex
+ --with-pkg-extra-version="-gentoo"
+ --enable-configfile-mask=0640
+ --enable-logfile-mask=0640
+ --libdir="${EPREFIX}"/usr/lib/frr
+ --sbindir="${EPREFIX}"/usr/lib/frr
+ --libexecdir="${EPREFIX}"/usr/lib/frr
+ --sysconfdir="${EPREFIX}"/etc/frr
+ --localstatedir="${EPREFIX}"/run/frr
+ --with-moduledir="${EPREFIX}"/usr/lib/frr/modules
+ --enable-user=frr
+ --enable-group=frr
+ --enable-vty-group=frr
+ --enable-multipath=64
+ $(use_enable doc)
+ $(use_enable fpm)
+ $(use_enable grpc)
+ $(use_enable kernel_linux realms)
+ $(use_enable nhrp nhrpd)
+ $(usex ospfapi '--enable-ospfclient' '' '' '')
+ $(use_enable rpki)
+ $(use_enable snmp)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+
+ use doc && emake -C doc html
+}
+
+src_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ default
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+
+ # Install user documentation if asked
+ use doc && dodoc -r doc/user/_build/html
+
+ # Create configuration directory with correct permissions
+ # Create logs directory with the correct permissions
+ diropts -ofrr -gfrr -m0775
+ keepdir /var/log/frr /etc/frr
+
+ # Install the default configuration files
+ insinto /etc/frr
+ doins tools/etc/frr/{vtysh.conf,frr.conf,daemons}
+
+ # Fix permissions/owners.
+ fowners frr:frr /etc/frr/{vtysh.conf,frr.conf,daemons}
+ fperms 640 /etc/frr/{vtysh.conf,frr.conf,daemons}
+
+ # Install logrotate configuration
+ insinto /etc/logrotate.d
+ newins redhat/frr.logrotate frr
+
+ # Install PAM configuration file
+ use pam && newpamd "${FILESDIR}"/frr.pam frr
+
+ # Install init scripts
+ systemd_dounit tools/frr.service
+ newinitd "${FILESDIR}"/frr-openrc-v2 frr
+
+ # Conflict files, installed by net-libs/libsmi, bug #758383
+ # Files from frr seems to be newer.
+ rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+ rm "${ED}"/usr/share/yang/ietf-netconf.yang || die
+ rm "${ED}"/usr/share/yang/ietf-netconf-with-defaults.yang || die
+ rm "${ED}"/usr/share/yang/ietf-netconf-acm.yang || die
+}
diff --git a/net-misc/frr/frr-10.0.2.ebuild b/net-misc/frr/frr-10.1.2.ebuild
index 63a5e4f8de35..6e1d6a35e541 100644
--- a/net-misc/frr/frr-10.0.2.ebuild
+++ b/net-misc/frr/frr-10.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit autotools pam python-single-r1 systemd
DESCRIPTION="The FRRouting Protocol Suite"
@@ -49,7 +49,6 @@ DEPEND="
"
RDEPEND="
${COMMON_DEPEND}
- $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
"
PATCHES=(
diff --git a/net-misc/frr/frr-10.1.1.ebuild b/net-misc/frr/frr-10.2.1.ebuild
index 63a5e4f8de35..6e1d6a35e541 100644
--- a/net-misc/frr/frr-10.1.1.ebuild
+++ b/net-misc/frr/frr-10.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit autotools pam python-single-r1 systemd
DESCRIPTION="The FRRouting Protocol Suite"
@@ -49,7 +49,6 @@ DEPEND="
"
RDEPEND="
${COMMON_DEPEND}
- $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
"
PATCHES=(
diff --git a/net-misc/frr/frr-9.1.3.ebuild b/net-misc/frr/frr-9.1.3.ebuild
new file mode 100644
index 000000000000..271bab6bccbd
--- /dev/null
+++ b/net-misc/frr/frr-9.1.3.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit autotools pam python-single-r1 systemd
+
+DESCRIPTION="The FRRouting Protocol Suite"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
+# FRR tarballs have weird format.
+S="${WORKDIR}/frr-${P}"
+
+LICENSE="GPL-2+"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc fpm grpc nhrp ospfapi pam rpki snmp test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ acct-user/frr
+ dev-libs/json-c:0=
+ dev-libs/protobuf-c:0=
+ >=net-libs/libyang-2.0.0
+ <net-libs/libyang-2.1.111
+ sys-libs/libcap
+ sys-libs/readline:0=
+ virtual/libcrypt:=
+ grpc? ( net-libs/grpc:= )
+ nhrp? ( net-dns/c-ares:0= )
+ pam? ( sys-libs/pam )
+ rpki? ( >=net-libs/rtrlib-0.8.0[ssh] )
+ snmp? ( net-analyzer/net-snmp:= )
+"
+BDEPEND="
+ sys-devel/flex
+ app-alternatives/yacc
+ doc? ( dev-python/sphinx )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ elibc_musl? ( sys-libs/queue-standalone )
+ test? (
+ $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+ dev-util/cunit
+ )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
+ "${FILESDIR}"/${PN}-8.4.1-logrotate.patch
+ "${FILESDIR}"/${PN}-9.1-mimic-gnu-basename-api-for-non-glibc.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ mallinfo # No functional impact.
+ mallinfo2
+)
+
+src_prepare() {
+ default
+
+ python_fix_shebang tools
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ LEX=flex
+ --with-pkg-extra-version="-gentoo"
+ --enable-configfile-mask=0640
+ --enable-logfile-mask=0640
+ --libdir="${EPREFIX}"/usr/lib/frr
+ --sbindir="${EPREFIX}"/usr/lib/frr
+ --libexecdir="${EPREFIX}"/usr/lib/frr
+ --sysconfdir="${EPREFIX}"/etc/frr
+ --localstatedir="${EPREFIX}"/run/frr
+ --with-moduledir="${EPREFIX}"/usr/lib/frr/modules
+ --enable-user=frr
+ --enable-group=frr
+ --enable-vty-group=frr
+ --enable-multipath=64
+ $(use_enable doc)
+ $(use_enable fpm)
+ $(use_enable grpc)
+ $(use_enable kernel_linux realms)
+ $(use_enable nhrp nhrpd)
+ $(usex ospfapi '--enable-ospfclient' '' '' '')
+ $(use_enable rpki)
+ $(use_enable snmp)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+
+ use doc && emake -C doc html
+}
+
+src_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ default
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+
+ # Install user documentation if asked
+ use doc && dodoc -r doc/user/_build/html
+
+ # Create configuration directory with correct permissions
+ # Create logs directory with the correct permissions
+ diropts -ofrr -gfrr -m0775
+ keepdir /var/log/frr /etc/frr
+
+ # Install the default configuration files
+ insinto /etc/frr
+ doins tools/etc/frr/{vtysh.conf,frr.conf,daemons}
+
+ # Fix permissions/owners.
+ fowners frr:frr /etc/frr/{vtysh.conf,frr.conf,daemons}
+ fperms 640 /etc/frr/{vtysh.conf,frr.conf,daemons}
+
+ # Install logrotate configuration
+ insinto /etc/logrotate.d
+ newins redhat/frr.logrotate frr
+
+ # Install PAM configuration file
+ use pam && newpamd "${FILESDIR}"/frr.pam frr
+
+ # Install init scripts
+ systemd_dounit tools/frr.service
+ newinitd "${FILESDIR}"/frr-openrc-v2 frr
+
+ # Conflict files, installed by net-libs/libsmi, bug #758383
+ rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+}
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 0713b940a00e..71ae448e05a4 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,4 +1,4 @@
-DIST gallery-dl-1.27.7.gh.tar.gz 738516 BLAKE2B af29a40de14c392101c50698ae2199f64b458c8e5ab997982625773f21b069d5b3133c1a7897a743255962c5494e0536f36f4c4067872a06761a5a3a333e44ca SHA512 384c5a5c7dfac01ad48dbbe12750e5bec5814620bebd1d49866a9a3b6d64f7aac60e4173f737ed2678c6d57e372b6957cb747d28444981a4ddb7721bd4f9cff9
-DIST gallery-dl-1.28.0.gh.tar.gz 766066 BLAKE2B d99cff290ea3b4c1e32a77a1eb3c751b51a8741402a50586edb3d029b36bd7178358fb0541452538cde6fb75029dfb6839d02602a8d869e8ae0406914fa13e90 SHA512 2e1a49ea4db7ba7576ac62a1518d1bb54110720c53ebda3bb9ef272422d7ccbb742b60dd49cd5d5830cb89d67dce849d355f0972030b27d337577d7e622a0998
-DIST gallery-dl-1.28.1.gh.tar.gz 768090 BLAKE2B 865f2ab4844202bd7643090783d173637d8eb1c58426074e012e44350a564ee44ff59a034533164306f89ba320bafb81ad91691dfda539c29ea6ab8359ed0d7f SHA512 438e03476dd9f8c551368c1de51911cf26de74e174f34f59579f8293d41112ca269cfd2f44a9eb7c0e012cfbb36beef8bd85aac0415147da518ed14d8009fc69
DIST gallery-dl-1.28.2.gh.tar.gz 774891 BLAKE2B 4abbcffa26f3ef15abc2385f5d84b7e11075e26751ce6cd2c9ee621530a21d55fe0f3356bcc0c022389f66189051d9baba3cf5e9867488f95bc9a6cb63e739d3 SHA512 4a7b7c11f98e333038640f0fc422aa0148a73f2163ff41f2778000499d33eafe2257ae143198b936627272ee281a3f14e458aa977094f24fea5751de68982251
+DIST gallery-dl-1.28.3.gh.tar.gz 713131 BLAKE2B 0d5776b3a643bb58018bed427fca4d5dc0a892d601fdf58c2546cdbe014cf9a76d959fd54ce3ca38b919b9b54181158d2e0c3c183f4238cb3928eaac08d5063f SHA512 7390745f5bda7fa2864a113cf5484aeb28949a89e51847534941c19eaed8c971398411c5b70d12c3443c0b1af208e62e92c67f499deb3f0aa31b1f5d46b572e7
+DIST gallery-dl-1.28.4.gh.tar.gz 783110 BLAKE2B 954fcff7f65b6c835aba935ca3707987729cecbaeab8b99387280a661c3440f110bbd7e71c6d2d6e655825f99ef18f1dd803fd934c2b4cd0316dd597515f84d7 SHA512 eb0810dfdbd4eed5d7586af7649e4d72a98f4ed3060448a749c9cd17a3dfde1688782bbfd29738e551324b75dc4a0d2c8134539f5e4356bcfe4532694a67d690
+DIST gallery-dl-1.28.5.gh.tar.gz 787201 BLAKE2B 54023e19ed9dde897fe921595adc7cacd06a2e9b226957ea19e242bbcffdb6ecde64017906cc30b1551d559cccdaab3268e2fa8d2018a77992c866b52f219bf6 SHA512 877b4d3e29634625d89e28744a53f132c198399a309d2d912c022661a9961d67062b8f344a2f345dcfe4f3dfef549d3c4293f1d334e65bb0f636b826e3eb921c
diff --git a/net-misc/gallery-dl/gallery-dl-1.28.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.28.2.ebuild
index 254956362b1d..0b041cbbf2d3 100644
--- a/net-misc/gallery-dl/gallery-dl-1.28.2.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.28.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,7 +20,7 @@ else
SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
-> ${P}.gh.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
diff --git a/net-misc/gallery-dl/gallery-dl-1.27.7.ebuild b/net-misc/gallery-dl/gallery-dl-1.28.3.ebuild
index f8c14c22a279..4689de7ec568 100644
--- a/net-misc/gallery-dl/gallery-dl-1.27.7.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.28.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-DISTUTILS_USE_PEP517="setuptools"
PYTHON_COMPAT=( python3_{12..13} )
PYTHON_REQ_USE="sqlite,ssl,xml(+)"
+DISTUTILS_USE_PEP517="setuptools"
inherit distutils-r1 optfeature
@@ -34,13 +34,13 @@ distutils_enable_tests unittest
src_prepare() {
# Tests against real servers, some tests always fail and some are subject to change.
- rm test/test_extractor.py test/test_results.py || die
+ rm ./test/test_{extractor,results}.py || die
distutils-r1_src_prepare
}
python_compile_all() {
- emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
+ emake PYTHON="${EPYTHON}" ./data/completion/{,_}gallery-dl man
}
pkg_postinst() {
diff --git a/net-misc/gallery-dl/gallery-dl-1.28.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.28.4.ebuild
index 254956362b1d..8bb9fcbbb941 100644
--- a/net-misc/gallery-dl/gallery-dl-1.28.0.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.28.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-DISTUTILS_USE_PEP517="setuptools"
PYTHON_COMPAT=( python3_{12..13} )
PYTHON_REQ_USE="sqlite,ssl,xml(+)"
+DISTUTILS_USE_PEP517="setuptools"
inherit distutils-r1 optfeature
@@ -34,13 +34,13 @@ distutils_enable_tests unittest
src_prepare() {
# Tests against real servers, some tests always fail and some are subject to change.
- rm test/test_extractor.py test/test_results.py || die
+ rm ./test/test_{extractor,results}.py || die
distutils-r1_src_prepare
}
python_compile_all() {
- emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
+ emake PYTHON="${EPYTHON}" ./data/completion/{,_}gallery-dl man
}
pkg_postinst() {
diff --git a/net-misc/gallery-dl/gallery-dl-1.28.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.28.5.ebuild
index 254956362b1d..8bb9fcbbb941 100644
--- a/net-misc/gallery-dl/gallery-dl-1.28.1.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.28.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-DISTUTILS_USE_PEP517="setuptools"
PYTHON_COMPAT=( python3_{12..13} )
PYTHON_REQ_USE="sqlite,ssl,xml(+)"
+DISTUTILS_USE_PEP517="setuptools"
inherit distutils-r1 optfeature
@@ -34,13 +34,13 @@ distutils_enable_tests unittest
src_prepare() {
# Tests against real servers, some tests always fail and some are subject to change.
- rm test/test_extractor.py test/test_results.py || die
+ rm ./test/test_{extractor,results}.py || die
distutils-r1_src_prepare
}
python_compile_all() {
- emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
+ emake PYTHON="${EPYTHON}" ./data/completion/{,_}gallery-dl man
}
pkg_postinst() {
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 7c0422512ce0..bab5d5bf5adb 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1,2 +1 @@
-DIST gerbera-2.2.0.tar.gz 6138157 BLAKE2B eab6008696cf353c50468a686509ed82381375e7b5e5a5a1b38bfcad6e275ca69885df7a8df7ebdf5bb407f7e7ec9401c27e09fbca55ec61ef15c415439b7148 SHA512 6e11d3e40c9a95d278ce4c6f0c914a27fed250e9202bb81c0f539d06622738bfa5b2156ca6bd061872e276858eb203f626c997ddc00810f9d816f4ff9198c97e
DIST gerbera-2.3.0.tar.gz 6255947 BLAKE2B bf1d418574fa315cbae91b4174940f78312c95ad91c30bc9b3714915a9204e7c5968b78de03fc63239d4b3f80a488633b737d3a9bfef86263b6c1a7564435ec0 SHA512 5326a22a244ef572a7a825193f0a8595fd4125295e4d9c7d329966e6d0b2995a48c48b75d1b02e809e2423839709d736e34be0329c5028f23c9af69906dcfae7
diff --git a/net-misc/gerbera/gerbera-2.2.0.ebuild b/net-misc/gerbera/gerbera-2.2.0.ebuild
deleted file mode 100644
index d0cc50445400..000000000000
--- a/net-misc/gerbera/gerbera-2.2.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake linux-info
-
-DESCRIPTION="UPnP Media Server"
-HOMEPAGE="https://gerbera.io"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${P}"
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib"
-
-RDEPEND="
- acct-user/gerbera
- dev-db/sqlite
- dev-libs/libebml:=
- dev-libs/libfmt:=
- dev-libs/pugixml
- dev-libs/spdlog:=
- net-libs/libupnp:=[ipv6(+),reuseaddr,-blocking-tcp]
- sys-apps/util-linux
- sys-libs/zlib
- virtual/libiconv
- curl? ( net-misc/curl )
- exif? ( media-libs/libexif )
- exiv2? ( media-gfx/exiv2:= )
- ffmpeg? ( media-video/ffmpeg:= )
- ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
- javascript? ( dev-lang/duktape:= )
- magic? ( sys-apps/file )
- matroska? ( media-libs/libmatroska:= )
- mysql? ( dev-db/mysql-connector-c:= )
- taglib? ( media-libs/taglib )
-"
-
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_AVCODEC=$(usex ffmpeg)
- -DWITH_CURL=$(usex curl)
- -DWITH_DEBUG=$(usex debug)
- -DWITH_EXIF=$(usex exif)
- -DWITH_EXIV2=$(usex exiv2)
- -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer)
- -DWITH_INOTIFY=ON
- -DWITH_JS=$(usex javascript)
- -DWITH_LASTFM=OFF
- -DWITH_MAGIC=$(usex magic)
- -DWITH_MATROSKA=$(usex matroska)
- -DWITH_MYSQL=$(usex mysql)
- -DWITH_SYSTEMD=$(usex systemd)
- -DWITH_TAGLIB=$(usex taglib)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN}
- newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN}
-
- insinto /etc/${PN}
- newins "${FILESDIR}"/${PN}-1.3.0.config config.xml
- fperms 0640 /etc/${PN}/config.xml
- fowners root:gerbera /etc/${PN}/config.xml
-}
-
-pkg_postinst() {
- if use mysql; then
- elog "Gerbera has been built with MySQL support and needs"
- elog "to be configured before being started. By default"
- elog "SQLite will be used."
- fi
-}
diff --git a/net-misc/gerbera/gerbera-2.3.0-r1.ebuild b/net-misc/gerbera/gerbera-2.3.0-r1.ebuild
index 9df56fb6b3d4..95212eae79de 100644
--- a/net-misc/gerbera/gerbera-2.3.0-r1.ebuild
+++ b/net-misc/gerbera/gerbera-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]]; then
else
SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P}"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
fi
LICENSE="GPL-2"
diff --git a/net-misc/gnome-connections/Manifest b/net-misc/gnome-connections/Manifest
index d5d5f9a9762a..11b586777182 100644
--- a/net-misc/gnome-connections/Manifest
+++ b/net-misc/gnome-connections/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-connections-45.0.tar.xz 4009108 BLAKE2B 10f3f98df6fd6a090c226192229c3eeba7d707c1a109eaaf3a6427b9eadd375a136da9f089b904b66d9e94f27b9b6f982f1c0392ac9eb00936f46450b48bfbf6 SHA512 a2c5f8cd3076fc370cdd34f909bd02d07b9391a606133a46d17a5fd92644ee971c7dddb09674d660a462b9f0d99e83ef2b595095173274e54bbdc0f8411fffe4
DIST gnome-connections-46.0.tar.xz 4036956 BLAKE2B f7f797353c57d615761b3048d5b2f50f21a6dd3245de9ab201317da10116f807cb9b301aec660165206ec61de42b4328debf5190e5d97e4c9e550af6edefe45a SHA512 7c57d2aa581abc6862f2509ed530d089019465ec2a54bc26e9736cf79d4d839a0fc62bb2ac931aa395cd576326a1d7b7c181e741cb943f836904d92ad41871cd
+DIST gnome-connections-47.0.tar.xz 4049064 BLAKE2B ac6f02bab1be6310d25782c36ea9b7cd2c308993e585e075ae602d27e3c71672bc3ed1f724500e9143e696eb3ca0272e9f42cf09d3cc9520310e6d213f4d6c0c SHA512 ed21325a0cafbd8a7c0de41e8ff960637ba831f38baf3d28392176e11626997adcaa65e3d63f08486c7a6f2a59e69beaadcf21578a54764386482ca1f5c417cb
diff --git a/net-misc/gnome-connections/gnome-connections-45.0-r2.ebuild b/net-misc/gnome-connections/gnome-connections-47.0.ebuild
index de42f7e3e3c6..b4e927031847 100644
--- a/net-misc/gnome-connections/gnome-connections-45.0-r2.ebuild
+++ b/net-misc/gnome-connections/gnome-connections-47.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,7 +24,7 @@ DEPEND="
>=dev-libs/libxml2-2.7.8
app-crypt/libsecret[vala]
- >=net-misc/freerdp-2.0.0:2=
+ >=net-misc/freerdp-2.0.0:=
"
RDEPEND="${DEPEND}"
BDEPEND="
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index c4c90d690a54..7fb119b992c4 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-remote-desktop-45.1.tar.xz 213504 BLAKE2B 78dd348cf15b677f52ca327ac824b2bd5276d53e7b6578bef0634e00e81993c1a1802ee861a31527af03351e6640cc9fcdc5f86fd44f20ec56138837dd9f05b6 SHA512 4572fefa03ee433783c822cf0405bd17b645f3aa08e8d88c04165859fd30643d612e5d7516a64ded8c1a0d2007026d6df877930b5ea127d7e1e939c1bb60f379
DIST gnome-remote-desktop-46.3.tar.xz 273304 BLAKE2B dd959c0fabf183afd0be39da84f344589d5f5a6defaa298141bba4aeb3a39b253c962095efe35e425c106ae7126ddf2b3c8bba79b43054e26d0e0ff61c8e5ce5 SHA512 4e12ef3156eae8a1770646dd10235f0950ca34bd60bd8358958fe98696c2eb3af9ed9a2ad37239de9b4f25e0991bb7248a1d0f89e4b67c34430d5980064d4319
+DIST gnome-remote-desktop-47.1.tar.xz 283864 BLAKE2B 17c70fe8b5642d9abb77e1fee12328ea9c2f1ada146f39b374432441de44c37f190dfaf2d420403d676478b466e89fa43b47d25ad080e1f7d69e4afa8c0dd01d SHA512 072d4064d23976eaf76a3293c313a6e121a33ab5ab5aa9557e6065579b72cfeae3e070db705c9d1d07dbb9fd5633ab5014aa1d4f022bc0b9a15ee2120589b75c
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-r1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-47.1.ebuild
index 61bc7a28c45c..907fcb0f88c6 100644
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-r1.ebuild
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-47.1.ebuild
@@ -1,45 +1,45 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit gnome.org gnome2-utils meson systemd xdg
+inherit gnome.org gnome2-utils meson systemd tmpfiles xdg
-DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+DESCRIPTION="Remote desktop server which allows you to connect to your machine remotely"
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
-IUSE="aac doc +rdp systemd +vnc"
-REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )"
+IUSE="doc +rdp systemd +vnc"
+REQUIRED_USE="|| ( rdp vnc )"
RESTRICT="test" # Tests run xvfb-run directly
DEPEND="
x11-libs/cairo
x11-libs/libdrm
>=media-libs/libepoxy-1.4
- >=dev-libs/glib-2.68:2
- >=dev-libs/libei-1.0.901
+ >=dev-libs/glib-2.75:2
+ >=dev-libs/libei-1.2.0
x11-libs/libnotify
app-crypt/libsecret
>=media-video/pipewire-0.3.49:=
app-crypt/tpm2-tss:=
rdp? (
>=media-libs/nv-codec-headers-11.1.5.0
- >=net-misc/freerdp-2.10.0:2=[server]
+ >=net-misc/freerdp-3.1.0:=[server]
>=sys-fs/fuse-3.9.1:3
+ >=sys-auth/polkit-122
>=x11-libs/libxkbcommon-1.0.0
-
- aac? (
- media-libs/fdk-aac:=
- )
+ media-libs/fdk-aac:=
)
vnc? (
net-libs/libvncserver
)
"
RDEPEND="${DEPEND}
+ acct-user/gnome-remote-desktop
+ acct-group/gnome-remote-desktop
x11-wm/mutter[screencast]
"
BDEPEND="
@@ -55,7 +55,6 @@ BDEPEND="
src_configure() {
local emesonargs=(
$(meson_use doc man)
- $(meson_use aac fdk_aac)
$(meson_use rdp)
$(meson_use vnc)
$(meson_use systemd)
@@ -66,6 +65,7 @@ src_configure() {
}
pkg_postinst() {
+ tmpfiles_process "${PN}-tmpfiles.conf"
xdg_pkg_postinst
gnome2_schemas_update
}
diff --git a/net-misc/gnome-remote-desktop/metadata.xml b/net-misc/gnome-remote-desktop/metadata.xml
index a1a029905dfd..2e7d80f07e20 100644
--- a/net-misc/gnome-remote-desktop/metadata.xml
+++ b/net-misc/gnome-remote-desktop/metadata.xml
@@ -5,9 +5,6 @@
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
- <use>
- <flag name="aac">Use <pkg>media-libs/fdk-aac</pkg> for audio output redirection of the RDP backend</flag>
- </use>
<upstream>
<remote-id type="gnome-gitlab">GNOME/gnome-remote-desktop</remote-id>
</upstream>
diff --git a/net-misc/hurl/metadata.xml b/net-misc/hurl/metadata.xml
index cb7dbfdc6787..d76c4f2e9988 100644
--- a/net-misc/hurl/metadata.xml
+++ b/net-misc/hurl/metadata.xml
@@ -3,7 +3,7 @@
<pkgmetadata>
<maintainer type="person">
<email>arsen@gentoo.org</email>
- <description>Arsen Arsenović</description>
+ <name>Arsen Arsenović</name>
</maintainer>
<upstream>
<remote-id type="github">Orange-OpenSource/hurl</remote-id>
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 4415444a1c3c..6cc3dd76d522 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -1,5 +1,4 @@
-DIST linuxx64-23.5.0.58.tar.gz 449048746 BLAKE2B d0a70dbb29addc5da8f4ca32582eb210ef56cbbab21efa61ea19ae45ae12fcc59b080f0f30fdc5d1ed02169b5084a49ca265f7bfa9dde813809847f06b319046 SHA512 f695a4fed73b6bff30eb16f8c159799c7a7b4c17f088959f24c17fc4a51208c1354c19df1e22b9b975f8fcb13f6775ea1dca15dd149ea186d8aeee47f3830441
DIST linuxx64-23.7.0.17.tar.gz 363012535 BLAKE2B 77e1fa1fb71d98840ebeebb444e86797a5514597dd1059cf19ed0a6240c05a68c13019350e26e6b52f96802a3eba4cb1a42ba20e85756aebed80e7e235a76089 SHA512 e25665ae8937c4a03382473df8f92b0227d6f07cad663ce71d4a90430014cc6630fb5593d688e6b59b7c65eaafeb3e258fc2f04f0d80573938dcb9d173a4ccab
+DIST linuxx64-24.11.0.85.tar.gz 440589375 BLAKE2B eba5970b4a6c99aa7ce76d04a58f5d3cf45885dd9f6aa332bbb4457c472bf58f3b2204779d75bb705c2381938af60f55e77d5d43471e56b6b9c789e9b5d1cf64 SHA512 426dc72a903d1d902c0fda3c2590a9e659ff1a6c5206d19a80d0f7d4905e3810a9be3318a6972598f2a175333f6d9737501460c30dc4f27899fcd1fec20eaa43
DIST linuxx64-24.2.0.65.tar.gz 398188196 BLAKE2B 6869cb6ab3b53d7ca1020c2a504bdf071c871daff1601e21b32f50b299b7b81c9159f248ee0be9370241b119dc49f1a01038f81f623c323a25ba6ce8ec9c975c SHA512 312a32fc6b5ba1c8af5449ca71b024d02966521915ab94ed7ee580c9bf4782afdb383dc855a14c83181311e0eb2329654a1493afdb55ca49640510e348666cd3
-DIST linuxx86-23.5.0.58.tar.gz 152642143 BLAKE2B 8ea722aecfb7e6588701646ed5dec1d1591a8c36986fda25c85ece50313cd1eddefb22ae58be8f1ea2edbfdf9fa725e73182f0745b0494df890008d65065ed08 SHA512 8cad203451b26920d66fb3b1bb794d74f8ab76dd24d76408f51d60278786b59fe2d83f0e6c4a2eb6741a4e1d534b9739513224e0f27ba903a9266f81e439a51f
DIST linuxx86-23.7.0.17.tar.gz 66184043 BLAKE2B 8e408ce26d75172cdd80d7bd9e1ef7aa8b855a7028673f00fd0aef6a42ca57ec8f11f894ecafb76a4e7b69c6cea922551ca9d4615aea436348ae2dbabc92e127 SHA512 e91a6205bb59e2d41075a5b5e0898cc0710a84ed7582ed2f053a3a83345daba1f437864c6e8111e80aabf19bc5b5d82b0fb6096948c166027a0f9fea183b883a
diff --git a/net-misc/icaclient/icaclient-23.5.0.58.ebuild b/net-misc/icaclient/icaclient-24.11.0.85.ebuild
index be7ca6568279..48b7caabf498 100644
--- a/net-misc/icaclient/icaclient-23.5.0.58.ebuild
+++ b/net-misc/icaclient/icaclient-24.11.0.85.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,13 +7,12 @@ inherit desktop wrapper xdg-utils
DESCRIPTION="ICA Client for Citrix Presentation servers"
HOMEPAGE="https://www.citrix.com/"
-SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
- x86? ( linuxx86-${PV}.tar.gz )"
+SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )"
LICENSE="icaclient"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx usb"
+KEYWORDS="-* ~amd64"
+IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx usb selfservice"
RESTRICT="mirror strip fetch"
ICAROOT="/opt/Citrix/ICAClient"
@@ -55,7 +54,6 @@ RDEPEND="
>=app-accessibility/at-spi2-core-2.46.0:2
app-crypt/libsecret
dev-libs/glib:2
- dev-libs/libxml2
media-fonts/font-adobe-100dpi
media-fonts/font-cursor-misc
media-fonts/font-misc-ethiopic
@@ -69,12 +67,12 @@ RDEPEND="
media-libs/libogg
media-libs/libpng
media-libs/libpulse
+ media-libs/libva
media-libs/libvorbis
media-libs/mesa
media-libs/speex
media-libs/speexdsp
net-libs/libsoup:2.4
- net-libs/webkit-gtk:4
sys-apps/util-linux
llvm-runtimes/libcxx
llvm-runtimes/libcxxabi
@@ -99,6 +97,11 @@ RDEPEND="
${BDEPEND}
!hdx? ( !media-plugins/hdx-realtime-media-engine )
usb? ( virtual/libudev )
+ selfservice? (
+ dev-libs/libxml2
+ net-libs/webkit-gtk:4.1
+ dev-libs/xerces-c
+ )
"
pkg_nofetch() {
@@ -134,8 +137,8 @@ src_prepare() {
if use usb; then
# inspired by debian usb support package postinst
sed -i -e 's/^[ \t]*VirtualDriver[ \t]*=.*$/&, GenericUSB/' module.ini || die
- sed -i -e '/\[ICA 3.0\]/a\GenericUSB=on' module.ini || true
- echo "[GenericUSB]" >> module.ini || true
+ sed -i -e '/\[ICA 3.0\]/a\GenericUSB=on' module.ini || die
+ echo "[GenericUSB]" >> module.ini
echo "DriverName=VDGUSB.DLL" >> module.ini
fi
@@ -282,7 +285,7 @@ src_install() {
pkg_preinst() {
# previous versions of the ebuild created that and left it around
# we own it now and avoid conflict warnings with this
- rm -f "${ROOT}${ICAROOT}/config/module.ini"
+ rm -f "${ROOT}${ICAROOT}/config/module.ini" || die
}
pkg_postinst() {
diff --git a/net-misc/icaclient/metadata.xml b/net-misc/icaclient/metadata.xml
index 2e136fc44c0a..067b86638f24 100644
--- a/net-misc/icaclient/metadata.xml
+++ b/net-misc/icaclient/metadata.xml
@@ -7,5 +7,6 @@
<use>
<flag name="hdx">Install and enable hdx-realtime-media-engine plugin</flag>
<flag name="usb">Allow connecting USB devices to virtual desktops</flag>
+ <flag name="selfservice">Install and enable the self-service component</flag>
</use>
</pkgmetadata>
diff --git a/net-misc/kio-zeroconf-common/Manifest b/net-misc/kio-zeroconf-common/Manifest
index a6a070c5641b..a20663f7a7e6 100644
--- a/net-misc/kio-zeroconf-common/Manifest
+++ b/net-misc/kio-zeroconf-common/Manifest
@@ -1,2 +1,2 @@
DIST kio-zeroconf-24.08.3.tar.xz 44896 BLAKE2B 28e0acfbc943c4942e65e87a6d5f10dccbd17d61372b592d7167a1de0103fa54007b399036531897a942ced0e6dcd9cd26a757dda9244d6dc643cf9c57d1d2e8 SHA512 5b88d06d998702556bb0f2c533b12c289f039ed7803e9785f224b21509bf5dd4de2e17c3c6cddfa70bd374aab6b9c63a8d2b24e8019e2a4d33b8a8b0412007c5
-DIST kio-zeroconf-24.12.0.tar.xz 44888 BLAKE2B 0fc277660d95dc311263e0ba06f114586295931dc70d4be0118970e409ae7edb4c8d5a16004fd6200bf737312f8077dd24fa3b6fea0ba0a12243411fd42b76aa SHA512 7810a69260c2eddbccf4fa7988fae7532c970b6e620785c7b2eb067e79ad02158cbb706777e1112fdeacbbca09201b56541becff4521577aa2c0bf8184d3d898
+DIST kio-zeroconf-24.12.1.tar.xz 44872 BLAKE2B 930e5af21fa4afe9a7b965e5b2f7dd90a3eb88767534e3098d88715c5d51a5339673ef057f40f1f40bd1235b1843b67571bc10a2e2431895b2368273006c35ce SHA512 51bae186c3720a69850890774f87c787368c9dcc7325e2edbc37ccc8606acd0ef5f9d6d686d4740091e72d05b7fafe54243e93e763b59d6902f836a55bb7e091
diff --git a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.0.ebuild b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.1.ebuild
index 4ab4638c9e5a..92a86b37d0f6 100644
--- a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.0.ebuild
+++ b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest
index a6a070c5641b..0e1203f44f2a 100644
--- a/net-misc/kio-zeroconf/Manifest
+++ b/net-misc/kio-zeroconf/Manifest
@@ -1,2 +1,3 @@
DIST kio-zeroconf-24.08.3.tar.xz 44896 BLAKE2B 28e0acfbc943c4942e65e87a6d5f10dccbd17d61372b592d7167a1de0103fa54007b399036531897a942ced0e6dcd9cd26a757dda9244d6dc643cf9c57d1d2e8 SHA512 5b88d06d998702556bb0f2c533b12c289f039ed7803e9785f224b21509bf5dd4de2e17c3c6cddfa70bd374aab6b9c63a8d2b24e8019e2a4d33b8a8b0412007c5
-DIST kio-zeroconf-24.12.0.tar.xz 44888 BLAKE2B 0fc277660d95dc311263e0ba06f114586295931dc70d4be0118970e409ae7edb4c8d5a16004fd6200bf737312f8077dd24fa3b6fea0ba0a12243411fd42b76aa SHA512 7810a69260c2eddbccf4fa7988fae7532c970b6e620785c7b2eb067e79ad02158cbb706777e1112fdeacbbca09201b56541becff4521577aa2c0bf8184d3d898
+DIST kio-zeroconf-24.12.1.tar.xz 44872 BLAKE2B 930e5af21fa4afe9a7b965e5b2f7dd90a3eb88767534e3098d88715c5d51a5339673ef057f40f1f40bd1235b1843b67571bc10a2e2431895b2368273006c35ce SHA512 51bae186c3720a69850890774f87c787368c9dcc7325e2edbc37ccc8606acd0ef5f9d6d686d4740091e72d05b7fafe54243e93e763b59d6902f836a55bb7e091
+DIST kio-zeroconf-24.12.2.tar.xz 44892 BLAKE2B 6d5ef0c4fa562f6b8b3369559e82c39586b994c10ea789fb08e3a279799a27a3439967c1a00e364f93a8ad1650b237905eea1a2edfcf2a2f548fa4a8e90e5737 SHA512 2ef720546ede42281b02451d3e3215b097a99dc9f7eead612fa2dcb1bc5678d7d5da393e398be8d667aabd7f71b2adccdc0288479fccf719d432034945453953
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.12.0.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.12.1.ebuild
index 1c51d9b1efb0..0513a063cc46 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.12.0.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.12.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=6.5.0
+KFMIN=6.7.0
QTMIN=6.7.2
inherit ecm gear.kde.org
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.12.2.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.12.2.ebuild
new file mode 100644
index 000000000000..152ce4e902b7
--- /dev/null
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.12.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.7.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus]
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kdnssd-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+ !<net-misc/kio-zeroconf-23.08.5-r2:5
+ !net-misc/kio-zeroconf-common
+"
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 96161893a88d..d28d40ac2a46 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1 +1,2 @@
DIST lldpd-1.0.18.tar.gz 1988691 BLAKE2B 37ee156013ab9ceaee06d10025fe0b76e26ebafef7a8254866347db8e6b316805a49d0f9f2ba330bb5f863336e95983214c9c9fb453e2290e9be0c47808504c7 SHA512 c8734221767cd879c98ea3ee6fa80e1dce2f8470a97b0f757cfe7ef8fe2adaf878fdedcda896cf65e1af980634f2ab312588658fb85f89c6d5b6cc9d2da52045
+DIST lldpd-1.0.19.tar.gz 1987102 BLAKE2B 8303683af56492027a5610240d9c5007ce2a6653dbe6b8f5ce5e28089dac4c06c8716ad96ed5dda31af4a29e10abbbe675ec5cf29b639a1c17db24698e318715 SHA512 128a664de09fb91fd1cab4070e3a9cf2705d91f57e956f6953f431f17fcf21ce3f12b89a536e66057ef456840cfd0c2ac5102ec9736f2856586d7a64751cfb67
diff --git a/net-misc/lldpd/lldpd-1.0.19.ebuild b/net-misc/lldpd/lldpd-1.0.19.ebuild
new file mode 100644
index 000000000000..cc14c4a59beb
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.19.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd bash-completion-r1 autotools tmpfiles
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://lldpd.github.io/"
+SRC_URI="https://github.com/lldpd/lldpd/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+ seccomp sonmp snmp static-libs test readline valgrind xml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/lldpd
+ acct-user/lldpd
+ dev-libs/libbsd
+ >=dev-libs/libevent-2.1.11:=
+ sys-libs/readline:0=
+ seccomp? ( sys-libs/libseccomp:= )
+ snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
+ xml? ( dev-libs/libxml2:= )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/check )
+ valgrind? ( dev-debug/valgrind )
+"
+BDEPEND="virtual/pkgconfig
+ doc? (
+ graph? ( app-text/doxygen[dot,doc] )
+ !graph? ( app-text/doxygen )
+ )
+"
+
+REQUIRED_USE="
+ graph? ( doc )
+ test? ( snmp sanitizers )
+"
+
+# tests need root
+RESTRICT+=" test"
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+
+ econf \
+ --cache-file="${S}"/config.cache \
+ --without-embedded-libevent \
+ --with-privsep-user=${PN} \
+ --with-privsep-group=${PN} \
+ --with-privsep-chroot=/run/${PN} \
+ --with-lldpd-ctl-socket=/run/${PN}.socket \
+ --with-lldpd-pid-file=/run/${PN}.pid \
+ $(use_enable cdp) \
+ $(use_enable doc doxygen-doc) \
+ $(use_enable doc doxygen-man) \
+ $(use_enable doc doxygen-pdf) \
+ $(use_enable doc doxygen-html) \
+ $(use_enable dot1) \
+ $(use_enable dot3) \
+ $(use_enable edp) \
+ $(use_enable fdp) \
+ $(use_enable graph doxygen-dot) \
+ $(use_enable lldpmed) \
+ $(use_enable old-kernel oldies) \
+ $(use_enable sonmp) \
+ $(use_enable static-libs static) \
+ $(use_with readline) \
+ $(use_enable sanitizers) \
+ $(use_with seccomp) \
+ $(use_with snmp) \
+ $(use_with xml)
+}
+
+src_compile() {
+ emake
+ use doc && emake doxygen-doc
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ find "${D}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+ newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+ newbashcomp src/client/completion/lldpcli lldpcli
+
+ use doc && dodoc -r doxygen/html
+
+ insinto /etc
+ doins "${FILESDIR}/lldpd.conf"
+ keepdir /etc/${PN}.d
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
+
+pkg_postinst() {
+ tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest
index 6c8dca9544dc..d3d8000ee20f 100644
--- a/net-misc/megatools/Manifest
+++ b/net-misc/megatools/Manifest
@@ -1,2 +1,3 @@
DIST megatools-1.11.0.20220519.tar.gz 105567 BLAKE2B 2f878568bb21a554d15bf6d68dfe27b8ba3d10cd9a4645e6082473e911940a0500d7becd0e4e7a72404f60759aaaaa5cb2780c6b176f722fb4fd57269570f4e2 SHA512 5c379a5a8da150d6d95a84f6bcf0c9be5b725c2c0e799e8d1e3358ac6081579eacc853f6b3d369c06006d3bdb3917dc20cf39ca5c69f153dc38de9daab74cea1
DIST megatools-1.11.1.20230212.tar.gz 105339 BLAKE2B b4bc57fa009d8f500e0360c60284198ed2ae30d4580f82826fa6ef6230c5f627d265a1300dbbca76837acc83bf10e8ba73ea404dcb64bf09e15730877714c639 SHA512 8d96533c6ae117f38e095b16f4c3241a9170397174befaff9caf81b598addbe60c89c05d29b20efead462a8f263f799107653cab1ad429ab2ba2fe0dc4fbbb39
+DIST megatools-1.11.2.20250127.tar.gz 105322 BLAKE2B d57c7d5f3aa60c57729dcdba423023014c2b653fc58566a5154112ee8d97f83f83f61409c13e270ab2abde6a05e5bb498078b0017320ff239e98189751557a97 SHA512 57900e4ced65c338df39e3781bf6cc159f04998659c431db7aa4dfb552f4101a5587a63a763e0270c32cbb271c4044f647ab9212720e9815fb80f77c4f2dddf8
diff --git a/net-misc/megatools/megatools-1.11.0.ebuild b/net-misc/megatools/megatools-1.11.0.ebuild
index e9edcdae3798..0790fa2b10c3 100644
--- a/net-misc/megatools/megatools-1.11.0.ebuild
+++ b/net-misc/megatools/megatools-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,8 +8,8 @@ inherit meson
MY_P="${P}.20220519"
DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
-HOMEPAGE="https://megatools.megous.com"
-SRC_URI="https://megatools.megous.com/builds/${MY_P}.tar.gz"
+HOMEPAGE="https://xff.cz/megatools/"
+SRC_URI="https://xff.cz/megatools/builds/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
diff --git a/net-misc/megatools/megatools-1.11.1.ebuild b/net-misc/megatools/megatools-1.11.1.ebuild
index 6313dae1c214..6091640aa219 100644
--- a/net-misc/megatools/megatools-1.11.1.ebuild
+++ b/net-misc/megatools/megatools-1.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,8 +8,8 @@ inherit meson
MY_P="${P}.20230212"
DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
-HOMEPAGE="https://megatools.megous.com"
-SRC_URI="https://megatools.megous.com/builds/${MY_P}.tar.gz"
+HOMEPAGE="https://xff.cz/megatools/"
+SRC_URI="https://xff.cz/megatools/builds/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
diff --git a/net-misc/megatools/megatools-1.11.2.ebuild b/net-misc/megatools/megatools-1.11.2.ebuild
new file mode 100644
index 000000000000..369cc4aeef1e
--- /dev/null
+++ b/net-misc/megatools/megatools-1.11.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+MY_P="${P}.20250127"
+
+DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
+HOMEPAGE="https://xff.cz/megatools/"
+SRC_URI="https://xff.cz/megatools/builds/builds/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/openssl:0=
+ net-libs/glib-networking[ssl]
+ net-misc/curl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-text/asciidoc
+ virtual/pkgconfig
+"
+
+src_install() {
+ meson_src_install
+
+ rm -r "${ED}/usr/share/doc/${PN}" || die
+}
diff --git a/net-misc/megatools/metadata.xml b/net-misc/megatools/metadata.xml
index 4a33f270c218..f45708ba3850 100644
--- a/net-misc/megatools/metadata.xml
+++ b/net-misc/megatools/metadata.xml
@@ -11,7 +11,4 @@ a command line of your desktop or server.
Mega website can be found at http://mega.co.nz.
</longdescription>
- <upstream>
- <remote-id type="github">megous/megatools</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/net-misc/memcached/memcached-1.6.27.ebuild b/net-misc/memcached/memcached-1.6.27.ebuild
index bc9b19386913..f9c94759a23f 100644
--- a/net-misc/memcached/memcached-1.6.27.ebuild
+++ b/net-misc/memcached/memcached-1.6.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/mptcpd/mptcpd-0.13.ebuild b/net-misc/mptcpd/mptcpd-0.13.ebuild
index 5ff4a416cd0b..010c52df6d4c 100644
--- a/net-misc/mptcpd/mptcpd-0.13.ebuild
+++ b/net-misc/mptcpd/mptcpd-0.13.ebuild
@@ -34,7 +34,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/intel/mptcpd.git"
else
SRC_URI="https://github.com/intel/mptcpd/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
fi
CONFIG_CHECK="MPTCP"
diff --git a/net-misc/netkit-timed/files/netkit-timed-0.17-accept-build-flags.patch b/net-misc/netkit-timed/files/netkit-timed-0.17-accept-build-flags.patch
new file mode 100644
index 000000000000..c72452ff0fdc
--- /dev/null
+++ b/net-misc/netkit-timed/files/netkit-timed-0.17-accept-build-flags.patch
@@ -0,0 +1,23 @@
+was sed -i -e '/^LDFLAGS=/d' configure || die "sed configure"
+--- a/configure 2024-05-09 06:02:18.884496589 -0000
++++ b/configure 2024-05-09 06:02:26.304490777 -0000
+@@ -115,7 +115,6 @@
+ echo 'no'
+ fi
+
+-LDFLAGS=
+ LIBS=
+
+ rm -f __conftest*
+was sed -i -e "s|ar -cruv|\${AR} -cruv|g" timed/lib/Makefile || die
+--- a/timed/lib/Makefile 2024-05-09 06:02:18.886496588 -0000
++++ b/timed/lib/Makefile 2024-05-09 06:02:31.568486653 -0000
+@@ -7,7 +7,7 @@
+ OBJS = byteorder.o measure.o cksum.o
+
+ libtimed.a: $(OBJS)
+- ar -cruv $@ $^
++ ${AR} -cruv $@ $^
+
+ install: ;
+ clean:
diff --git a/net-misc/netkit-timed/files/netkit-timed-0.17-c23-port.patch b/net-misc/netkit-timed/files/netkit-timed-0.17-c23-port.patch
new file mode 100644
index 000000000000..ad0410db4421
--- /dev/null
+++ b/net-misc/netkit-timed/files/netkit-timed-0.17-c23-port.patch
@@ -0,0 +1,65 @@
+#bug https://bugs.gentoo.org/715776
+#bug https://bugs.gentoo.org/919876
+and general port to C23
+--- a/configure
++++ b/configure
+@@ -134,6 +100,7 @@
+
+ echo -n 'Checking for BSD signal semantics... '
+ cat <<EOF >__conftest.c
++#define _DEFAULT_SOURCE
+ #include <unistd.h>
+ #include <signal.h>
+ int count=0;
+--- a/timed/lib/cksum.c
++++ b/timed/lib/cksum.c
+@@ -41,6 +41,7 @@
+ #ident "$Revision: 1.4 $"
+ #endif
+
++#define _DEFAULT_SOURCE
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include "timed-extern.h"
+--- a/timed/timed/globals.h
++++ b/timed/timed/globals.h
+@@ -37,6 +37,7 @@
+ #ident "$Revision: 1.5 $"
+ #endif
+
++#define _DEFAULT_SOURCE
+ #include <sys/param.h>
+ #include <sys/time.h>
+ #include <sys/socket.h>
+--- a/timed/timedc/cmds.c
++++ b/timed/timedc/cmds.c
+@@ -41,6 +41,7 @@
+ #ident "$Revision: 1.11 $"
+ #endif
+
++#define _DEFAULT_SOURCE
+ #include "timedc.h"
+ #include <string.h>
+ #include <sys/file.h>
+--- a/timed/timedc/timedc.c
++++ b/timed/timedc/timedc.c
+@@ -45,6 +45,7 @@
+ #ident "$Revision: 1.8 $"
+ #endif
+
++#define _DEFAULT_SOURCE
+ #include "timedc.h"
+ #include <string.h>
+ #include <signal.h>
+--- a/timed/timed/networkdelta.c
++++ b/timed/timed/networkdelta.c
+@@ -40,8 +40,8 @@
+ #ifdef sgi
+ #ident "$Revision: 1.4 $"
+ #endif
+-#include <math.h>
+ #include "globals.h"
++#include <math.h>
+
+ static long median(float, float*, long*, long*, unsigned int);
+
diff --git a/net-misc/netkit-timed/files/netkit-timed-0.17-c99-port.patch b/net-misc/netkit-timed/files/netkit-timed-0.17-c99-port.patch
new file mode 100644
index 000000000000..f46408049b14
--- /dev/null
+++ b/net-misc/netkit-timed/files/netkit-timed-0.17-c99-port.patch
@@ -0,0 +1,44 @@
+Simple port to C99
+#bug https://bugs.gentoo.org/919876
+--- a/timed/lib/measure.c
++++ b/timed/lib/measure.c
+@@ -75,7 +75,7 @@ measure(u_long maxmsec, /* wait this many msec at most */
+ struct sockaddr_in *xaddr,
+ int doprint) /* print complaints on stderr */
+ {
+- size_t length;
++ socklen_t length;
+ int measure_status;
+ int rcvcount, trials = 0;
+ int cc, count;
+--- a/timed/timed/correct.c
++++ b/timed/timed/correct.c
+@@ -165,7 +165,7 @@ adjclock(struct timeval *corr)
+ }
+ } else {
+ syslog(LOG_WARNING,
+- "clock correction %d sec too large to adjust",
++ "clock correction %ld sec too large to adjust",
+ adj.tv_sec);
+ (void) gettimeofday(&now, 0);
+ timevaladd(&now, corr);
+--- a/timed/timed/networkdelta.c
++++ b/timed/timed/networkdelta.c
+@@ -40,7 +40,7 @@ char nd_rcsid[] =
+ #ifdef sgi
+ #ident "$Revision: 1.4 $"
+ #endif
+-
++#include <math.h>
+ #include "globals.h"
+
+ static long median(float, float*, long*, long*, unsigned int);
+@@ -238,7 +238,7 @@ median(float a, /* initial guess for the median */
+ (long)a, pass, npts);
+ return a;
+ }
+- eps = AFAC*abs(aa - a);
++ eps = AFAC*fabsf(aa - a);
+ *eps_ptr = eps;
+ a = aa;
+ }
diff --git a/net-misc/netkit-timed/netkit-timed-0.17-r12.ebuild b/net-misc/netkit-timed/netkit-timed-0.17-r12.ebuild
new file mode 100644
index 000000000000..eb70db4a45ed
--- /dev/null
+++ b/net-misc/netkit-timed/netkit-timed-0.17-r12.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Netkit - timed: Time daemon"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit"
+SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+ "${FILESDIR}/0.17-CFLAG-DEF-fix.patch"
+ "${FILESDIR}/0.17-timed-opt-parsing.patch"
+ "${FILESDIR}/${P}-c99-port.patch"
+ "${FILESDIR}/${P}-accept-build-flags.patch"
+ "${FILESDIR}/${P}-c23-port.patch"
+)
+
+src_configure() {
+ tc-export AR
+ # Note this is not an autoconf configure script. econf fails
+ append-flags -DCLK_TCK=CLOCKS_PER_SEC
+ ./configure --prefix=/usr --with-c-compiler="$(tc-getCC)" || die "bad configure"
+}
+
+src_install() {
+ dosbin timed/timed/timed
+ doman timed/timed/timed.8
+ dosbin timed/timedc/timedc
+ doman timed/timedc/timedc.8
+ einstalldocs
+
+ newinitd "${FILESDIR}"/timed.rc6 timed
+}
diff --git a/net-misc/netsed/netsed-1.3-r1.ebuild b/net-misc/netsed/netsed-1.3-r1.ebuild
index 417929a0f491..a5cf3661a43b 100644
--- a/net-misc/netsed/netsed-1.3-r1.ebuild
+++ b/net-misc/netsed/netsed-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="http://silicone.homelinux.org/release/netsed/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 2d005594575b..c37489c91c1a 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,3 +1,4 @@
DIST nextcloud-client-3.14.4.tar.gz 13813595 BLAKE2B 310bbf9b8024bb8688bffe65d6993d63d95260f26565998bd1cd734a49bdd5a6d4fc152ee51968d5e705c6440c24c7571f1079ba13fc5d8492cdd57ad57ebe0d SHA512 8de91b288507d13e7dd2c64112f0540f4664ad2a0b02525d5ff5b187dc7eb9af61a40d9f65320284241bb620cf2dcc648ecfe6090d3d09c0dbb865504026b11e
DIST nextcloud-client-3.15.2-fix-macosvfs-file-sharing.png.patch 727 BLAKE2B 77d87c47caa28c0d60afdef161c05a365d953e31e7331fd4b07adfe232ddd04a6108ad325a25befe961862dccb118c251239b84cfb63f1c72c205df31055ad69 SHA512 d4d8928aa63b7e174c7fe8099d349a5779e8be1b1a71dfecfded9f971533ba677fc85013c53c7cafdc05e1aed81820c6ef3b5e7c3f6a5cae62fc284a2a9371db
DIST nextcloud-client-3.15.2.tar.gz 15671238 BLAKE2B ea98587f4183d42d3e6ace54c0cd8b2208e7e21bfbb2385af84c8688b2d5464171f90e287302c5d6081b234b8cbec4e2b05635d1385a2980f133bba7127a6203 SHA512 982b74d57954440496f973781aa6a719d316b3651fecbb5da4d4b211dda0574094b2ba35f83c6afe2e67c7be095528e0cf8544e9214e8d9db445f1ab95c8c256
+DIST nextcloud-client-3.15.3.tar.gz 15683038 BLAKE2B 535b6f8fc70cbfb63c5c87f09f31da943df5e6dd9d218d2289beda51f6d10eec2e99a4bd1efe4f9b4b373c54414ec4c3b36a9e6968134733b7fe942ea2d26099 SHA512 bf451681c352c75290c92780a84c37456ec199890081f6e7f0f1b14e302c4e14a1998a0fa90e7b4702325a1f447a7538bec58e9021c2269bcf04f9275925b365
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.15.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.15.3.ebuild
new file mode 100644
index 000000000000..c0e60352d63e
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.15.3.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="
+ https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz
+ -> ${P}.tar.gz
+ https://github.com/nextcloud/desktop/commit/49a7c8d7874643da2550793877115c7f3dbd2d05.patch
+ -> ${PN}-3.15.2-fix-macosvfs-file-sharing.png.patch
+"
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="doc dolphin nautilus test webengine"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-db/sqlite-3.34:3
+ dev-libs/glib:2
+ >=dev-libs/openssl-1.1.0:0=
+ >=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
+ dev-qt/qt5compat:6
+ >=dev-qt/qtbase-6.6.0:6[dbus,gui,network,sql,sqlite,ssl,widgets]
+ dev-qt/qtdeclarative:6[widgets]
+ dev-qt/qtsvg:6
+ dev-qt/qtwebsockets:6
+ kde-frameworks/karchive:6
+ kde-frameworks/kguiaddons:6
+ net-libs/libcloudproviders
+ sys-libs/zlib
+ dolphin? (
+ kde-frameworks/kcoreaddons:6
+ kde-frameworks/kio:6
+ )
+ nautilus? ( dev-python/nautilus-python )
+ webengine? ( dev-qt/qtwebengine:6[widgets] )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-qt/qtbase:6[concurrent,xml]
+ || (
+ gnome-base/librsvg
+ media-gfx/inkscape
+ )
+ doc? (
+ dev-python/sphinx
+ dev-tex/latexmk
+ dev-texlive/texlive-latexextra
+ virtual/latex-base
+ )
+ test? (
+ dev-util/cmocka
+ )
+"
+BDEPEND="
+ dev-qt/qttools:6[linguist]
+ dolphin? ( >=kde-frameworks/extra-cmake-modules-5.106.0 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
+ # https://github.com/nextcloud/desktop/pull/7383
+ "${FILESDIR}"/${PN}-3.14.2-doc-fix.patch
+ # https://github.com/nextcloud/desktop/pull/7691
+ "${DISTDIR}"/${PN}-3.15.2-fix-macosvfs-file-sharing.png.patch
+)
+
+src_prepare() {
+ # Keep tests in ${T}
+ sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+ # The image under images/building/path.png does no longer
+ # exist. This is already fixed upstream and can be dropped on the
+ # next bump
+ sed -i '/images\/building\/path.png/d' doc/building.rst || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+ -DBUILD_UPDATER=OFF
+ $(cmake_use_find_package doc Sphinx)
+ $(cmake_use_find_package doc PdfLatex)
+ -DBUILD_WITH_WEBENGINE=$(usex webengine)
+ -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+ -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ TEST_VERBOSE=1 virtx cmake_src_test
+}
+
+src_compile() {
+ local compile_targets=(all)
+ if use doc; then
+ compile_targets+=(doc doc-man)
+ fi
+ cmake_src_compile ${compile_targets[@]}
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if ! has_version -r "dev-libs/qtkeychain[keyring]"; then
+ elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag."
+ elog "Please consider enabling the 'keyring' USE flag. Otherwise you may"
+ elog "have to authenticate manually every time you start the nextlcoud client."
+ elog "See https://bugs.gentoo.org/912844 for more information."
+ fi
+}
diff --git a/net-misc/nx/files/nx-3.5.99.26-gcc14-32bit.patch b/net-misc/nx/files/nx-3.5.99.26-gcc14-32bit.patch
new file mode 100644
index 000000000000..c641b033f956
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.26-gcc14-32bit.patch
@@ -0,0 +1,51 @@
+Bugs: https://bugs.gentoo.org/927780
+https://github.com/ArcticaProject/nx-libs/pull/1087
+
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Wed, 15 Jan 2025 22:03:00 +0000
+Subject: [PATCH] dix: Fix a warning about GetTimeInMillis return value in
+ XFont2.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Ported over from XOrg Server:
+
+ commit e1ccd0fa0e1081edf8a2c69ce6e8e3f67a4aecba
+ Author: Emma Anholt <emma@anholt.net>
+ Date: Mon May 7 16:46:15 2018 -0700
+
+ dix: Fix a warning about GetTimeInMillis return value in XFont2.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+This resolves the following issue when built with GCC-14 (and beyond):
+
+ ../../dix/dixfonts.c: At top level:
+ ../../dix/dixfonts.c:2485:27: error: initialization of âuint32_t (*)(void)â {aka âunsigned int (*)(void)â} from incompatible pointer type âCARD32 (*)(void)â {aka âlong unsigned int (*)(void)â} [-Wincompatible-pointer-types]
+ 2485 | .get_time_in_millis = GetTimeInMillis,
+ |
+--- a/nx-X11/programs/Xserver/dix/dixfonts.c
++++ b/nx-X11/programs/Xserver/dix/dixfonts.c
+@@ -2471,6 +2471,11 @@ remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bo
+ RemoveFontWakeup(fpe);
+ }
+
++static uint32_t wrap_time_in_millis(void)
++{
++ return GetTimeInMillis();
++}
++
+ #ifdef HAS_XFONT2
+ static const xfont2_client_funcs_rec xfont2_client_funcs = {
+ .version = XFONT2_CLIENT_FUNCS_VERSION,
+@@ -2482,7 +2487,7 @@ static const xfont2_client_funcs_rec xfont2_client_funcs = {
+ .get_client_resolutions = get_client_resolutions,
+ .get_default_point_size = get_default_point_size,
+ .get_new_font_client_id = get_new_font_client_id,
+- .get_time_in_millis = GetTimeInMillis,
++ .get_time_in_millis = wrap_time_in_millis,
+ .init_fs_handlers = _init_fs_handlers,
+ .register_fpe_funcs = register_fpe_funcs,
+ .remove_fs_handlers = _remove_fs_handlers,
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 3a112d2be6bb..c08c5941821d 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -50,6 +50,8 @@ PATCHES=(
"${FILESDIR}/${PN}-3.5.99.26-riscv64-support.patch"
"${FILESDIR}/${PN}-3.5.99.26-musl.patch"
"${FILESDIR}/${PN}-3.5.99.26-which.patch"
+ # https://github.com/ArticaProject/nx-libs/pull/1087
+ "${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch"
)
src_prepare() {
diff --git a/net-misc/nx/nx-3.5.99.27.ebuild b/net-misc/nx/nx-3.5.99.27.ebuild
index 60a90c7c8d28..095b3d048849 100644
--- a/net-misc/nx/nx-3.5.99.27.ebuild
+++ b/net-misc/nx/nx-3.5.99.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -44,6 +44,8 @@ S="${WORKDIR}/nx-libs-${PV}"
PATCHES=(
"${FILESDIR}/${PN}-3.5.99.26-musl.patch"
"${FILESDIR}/${PN}-3.5.99.27-which.patch"
+ # https://github.com/ArcticaProject/nx-libs/pull/1087
+ "${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch"
)
src_prepare() {
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 3d4f5395c13a..97555b8701b7 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -1,3 +1,3 @@
DIST ofono-2.1.tar.xz 1097624 BLAKE2B 574293a73061470eec322df7fa62d581e8e8d2c5b81e896bff52173a986733f448686186bc0400ccf256fb931e26a1fef6a664dafa8f64935f936c9347e4a054 SHA512 7227939c488c2a62f640d5a8279e0698935aa1df5a2a349e195df9a8d9d9123c73a7f1177aae022b4c805d266c24a9770784193100adffa45f6c36a3ed847bb1
-DIST ofono-2.3.tar.xz 1216872 BLAKE2B e32ea09dbc8f0aa2ca3f322ffc34d9f9d06d862792b05a0f96ddba4ebe4038199ab40a4065582d68a35d2a5725646626bc36c8f9e83d89a42be8d76271144751 SHA512 0c53c2c441d28f89140192fe808769b3b27ef1ebf75e9ee9f9bfa53d0d102a47d11fcb364077ca88cdc598e8368924f477024b44a2adf795efe40b52ffe92dce
+DIST ofono-2.14.tar.xz 1311452 BLAKE2B 96f3875d9a2f515f14b5b6b6b5576e38338fd4a4912c5c7ea2c9ab8ed0e2791e4d22b591f5eb3ed9ccc1cd133174cbc3787b7d57e9bd6161fd03ad1a1e3f17f2 SHA512 77466c9155753130465748660df66473ca13afee59441a27f3d7dde653e632fb142af294aa2272ea14ce9d4845b68b5e2d4a58a9534555819c92fe161b4ff893
DIST ofono-2.9.tar.xz 1302044 BLAKE2B d468c179ead13ab75b5e9872c671bea3c5f7cd59242516ba432c323aefc423ea18fd401a236a7abacf0ff0f2c74c8921828496b8a74269a1dc246f893c89036b SHA512 181f4aad276ea5c5888c6b89187e27b65d42f002d1dd72091f377033bda82bada17364c49773d4a1fd62ea7940d27d7f796da561595b606abbf4b4ec220ae031
diff --git a/net-misc/ofono/ofono-2.3.ebuild b/net-misc/ofono/ofono-2.14.ebuild
index 69e1ff1a5624..dc5af0dc80f3 100644
--- a/net-misc/ofono/ofono-2.3.ebuild
+++ b/net-misc/ofono/ofono-2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="+atmodem bluetooth +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
+IUSE="+atmodem bluetooth +datafiles doc dundee examples +isimodem +phonesim +qmimodem tools +udev upower"
REQUIRED_USE="dundee? ( bluetooth )"
@@ -37,7 +37,6 @@ src_configure() {
$(use_enable dundee) \
$(use_enable bluetooth) \
$(use_enable phonesim) \
- $(use_enable provision) \
$(use_enable qmimodem) \
$(use_enable tools) \
$(use_enable examples test) \
diff --git a/net-misc/openssh/openssh-9.8_p1-r3.ebuild b/net-misc/openssh/openssh-9.8_p1-r3.ebuild
index 026cf4390af9..8c01a4e3a880 100644
--- a/net-misc/openssh/openssh-9.8_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-9.8_p1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,7 +20,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/openssh/openssh-9.9_p1.ebuild b/net-misc/openssh/openssh-9.9_p1.ebuild
index 80a886b7ecc2..53c02164c5aa 100644
--- a/net-misc/openssh/openssh-9.9_p1.ebuild
+++ b/net-misc/openssh/openssh-9.9_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -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/passt/passt-2024.09.06.ebuild b/net-misc/passt/passt-2024.09.06.ebuild
index e3ed4b3ca17e..fbff0b525899 100644
--- a/net-misc/passt/passt-2024.09.06.ebuild
+++ b/net-misc/passt/passt-2024.09.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
else
SRC_URI="https://passt.top/passt/snapshot/passt-${MY_PV}.tar.xz -> ${PF}.tar.xz"
S="${WORKDIR}/${PN}-${MY_PV}"
- KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+ KEYWORDS="amd64 arm64 ~loong ~riscv"
fi
LICENSE="BSD GPL-2+"
diff --git a/net-misc/portspoof/portspoof-1.3-r1.ebuild b/net-misc/portspoof/portspoof-1.3-r1.ebuild
index 7eec0c399ab3..4ec6ba0b6396 100644
--- a/net-misc/portspoof/portspoof-1.3-r1.ebuild
+++ b/net-misc/portspoof/portspoof-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
inherit flag-o-matic
DESCRIPTION="return SYN+ACK for every port connection attempt"
-HOMEPAGE="http://portspoof.org/"
+HOMEPAGE="https://drk1wi.github.io/portspoof/"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
diff --git a/net-misc/portspoof/portspoof-9999.ebuild b/net-misc/portspoof/portspoof-9999.ebuild
index 7eec0c399ab3..4ec6ba0b6396 100644
--- a/net-misc/portspoof/portspoof-9999.ebuild
+++ b/net-misc/portspoof/portspoof-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
inherit flag-o-matic
DESCRIPTION="return SYN+ACK for every port connection attempt"
-HOMEPAGE="http://portspoof.org/"
+HOMEPAGE="https://drk1wi.github.io/portspoof/"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
diff --git a/net-misc/r8168/r8168-8.054.00.ebuild b/net-misc/r8168/r8168-8.054.00.ebuild
index 5cb149094196..321cdf54b112 100644
--- a/net-misc/r8168/r8168-8.054.00.ebuild
+++ b/net-misc/r8168/r8168-8.054.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mtorromeo/${PN}/archive/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="use-firmware"
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 13a2e2d722ab..737839a3a3a5 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,4 +1,4 @@
-DIST rclone-1.68.0-deps.tar.xz 313382892 BLAKE2B 5dbf928d1a9ee4eccd796c5d083da1fefc115af9b087072708fa5a9e98a5bc74f824e922c1cad8f132c2549d4c335877c4fa78f8842a1732972bbe862b0bba28 SHA512 e32a8489ab822648f26b47e58ef7a7a1f3776ee08b585a642a21e02b31095ddef22b068e97cf21545e6a806b467d4d5e79eab4ae31da9ccf238d7735ca6dc35f
-DIST rclone-1.68.1.tar.gz 17452992 BLAKE2B 34e16868cc84b80becd4403ceae925c3c20d0989383c563b58a46190fec983f1949572643843509a060afefa4808c3b8865335681529203a91c3bb5201d9888d SHA512 8f98e569c0959dfa407621d35acb552e6a5f5b409d2f1d89efd116d746f2a6a742e0bebf8f298ba189d7f187fc4c79d285e7db28e52d5d9e7517d5e0a6aa7fc9
DIST rclone-1.68.2-deps.tar.xz 313358984 BLAKE2B e57d4036e37b041b1c1c34b377683f32a10b6ed147f9a290c223bf1935ef78455ef307bb804ae93dc8577943d858104bcc77eecd6f797875ff7ebb298e95470c SHA512 14cef2b92e6114f902ede83ee502ab50952322ddf1147488eea53f7dc0f80b53d52e3cca49de72efce9b4859d7f915bb1434d87d2061dc56a1ac6148da1d8819
DIST rclone-1.68.2.tar.gz 17456579 BLAKE2B 9b8a3cd10690104ef262bac99d676997be1e5aad19172b6536b74a73c5d15bf6d67b0550ed6dcc8c4406d4082de11b5f8e6bcf92c9fdde61b140c0edbe095c23 SHA512 02baef752b8537ef5de05c51ce556ee76aee62c6835dc2f0cb6a8ebf0837d524dee1ed69136fb8319511a248d6776e36e53038138bf245f19aa66ea2aac6815c
+DIST rclone-1.69.0-deps.tar.xz 273636708 BLAKE2B c78c7e411f0b73fe7679d87c5ef5222e161d5b0fd01dc70f56480d59072d4247eabaaed229be326a130195e3cb3bf5efa8133a374cd7c0ef78ee6e9827aa69c9 SHA512 d02143d9b99096579262065f785afbf0cca123356a44123e9cdb724eef741cfa72691979e5735389dcd073e7a680814814ba1eaf6a94b10d14eda762d1571c3e
+DIST rclone-1.69.0.gh.tar.gz 16939883 BLAKE2B ec65092e661297397419443ee678c7bb7c6c1ee19ff12cfd8c50f071df8542592f04c7fa56e83a34a9c2a3e52a2f87d1ef58d577fee35f8cfa7491cad5d67fd7 SHA512 0a1d544fc12d020cf71ed788481185c178e6d79919f2e7e73014704714e70e4efec84fc126f19b1be284cc7f1f381fbb5ee9f78c472ba993529a8db2d19898b4
diff --git a/net-misc/rclone/rclone-1.68.1.ebuild b/net-misc/rclone/rclone-1.69.0.ebuild
index 5db2aba89a31..f3146e24b8c9 100644
--- a/net-misc/rclone/rclone-1.68.1.ebuild
+++ b/net-misc/rclone/rclone-1.69.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,13 +10,13 @@ HOMEPAGE="https://rclone.org/
https://github.com/rclone/rclone/"
SRC_URI="
https://github.com/rclone/rclone/archive/v${PV}.tar.gz
- -> ${P}.tar.gz
- https://dev.gentoo.org/~xgqt/distfiles/deps/${PN}-1.68.0-deps.tar.xz
+ -> ${P}.gh.tar.gz
+ https://dev.gentoo.org/~xgqt/distfiles/deps/${PN}-1.69.0-deps.tar.xz
"
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
RDEPEND="
sys-fs/fuse:3
@@ -37,7 +37,7 @@ src_compile() {
-mod=readonly
-o ./
)
- ego build "${go_buildargs[@]}" .
+ ego build "${go_buildargs[@]}"
edob ./rclone genautocomplete bash "${PN}.bash"
edob ./rclone genautocomplete zsh "${PN}.zsh"
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 899a29aa6b22..58c78ffffdf0 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -2,3 +2,4 @@ DIST Remmina-ecb29e7830037dd3ee618472c80b5e8eaecf1ce0.tar.bz2 2152678 BLAKE2B 20
DIST Remmina-v1.4.35.tar.bz2 2150047 BLAKE2B 3ba730cd4009a797ee7d66bbe4390e9db221ee5cf0b008e0eb3df4a992d7260ddc65983c8c34d1aa1bb2190ed1104653e269369565d7e4eecaf3078ffc84330c SHA512 36dc419b4473c71f6b3e53338f4a3cf7a1fe60534ea0dce375b4c9fd00cd9d8a618c4376be4d031bdee1eed8b4aade4538a6cc414629ef6dde41cdcd513a6d36
DIST Remmina-v1.4.36.tar.bz2 2153190 BLAKE2B 0d29adcb84b7c72ae2f2468e0ef56e6f16f49a0ff2774cf59df699cf721aabdabbde91799d9266295f30fa5789d33f4aab450924aa5a325aa3f1315332dd7d4e SHA512 bdf3604849238ca2e61b6f35bbfba1df5eedf1c2374897a565f1a1e0b76a285be93700d92a6912d33d73ab745fb412856ee14fd0eab3feec492bf1b5aa35bc38
DIST Remmina-v1.4.37.tar.bz2 2154629 BLAKE2B 113fcb53818526914ce5b867c1e41ed3703d28961037127444b66e2167d53512d330fa8c6eb0fe13b61f26b6eb43c5bb58d9b158f42897ae4081a8f0bc3481d0 SHA512 09db30823d4ffb61627cee01469e431b88575aa4370e39f9e4d1d384e3196c815206f01f3eeb8bc58df3e90d01bec38c271d81a8ea20cb4e44dd34d6e30d6706
+DIST Remmina-v1.4.39.tar.bz2 2155021 BLAKE2B 632c8c4e764117fef73a0fe330df74f9426ef691ea5315d8a02cc90437fdd41f2917de88a0e7f9501f62607d2bdc8fb81647c54ede33a506ac7fd915f931768c SHA512 b1e6b2f56eb4f4e236d78a2967374c4199250702d7301c9ab0878709ee8df8a1a8a1dcb0e74d78de51e52ccb087a2f92bd7b79e0f57a5266bfbf050aa8f555d7
diff --git a/net-misc/remmina/remmina-1.4.39.ebuild b/net-misc/remmina/remmina-1.4.39.ebuild
new file mode 100644
index 000000000000..c74329094808
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.39.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake python-single-r1 xdg
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${PN^}-v${PV}"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf X"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) || ( X wayland )"
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ dev-libs/json-glib
+ dev-libs/libpcre2
+ dev-libs/libsodium:=
+ dev-libs/openssl:0=
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3[X?,wayland?]
+ X? (
+ x11-libs/libX11
+ x11-libs/libxkbfile
+ )
+ appindicator? ( dev-libs/libayatana-appindicator )
+ crypt? ( dev-libs/libgcrypt:0= )
+ keyring? ( app-crypt/libsecret )
+ gvnc? ( net-libs/gtk-vnc )
+ kwallet? ( kde-frameworks/kwallet:5 )
+ python? ( ${PYTHON_DEPS} )
+ rdp? ( net-misc/freerdp:3=
+ cups? ( net-print/cups:= ) )
+ spice? ( net-misc/spice-gtk[gtk3] )
+ ssh? ( net-libs/libssh:0=[sftp]
+ x11-libs/vte:2.91 )
+ vnc? ( net-libs/libvncserver[jpeg] )
+ webkit? ( net-libs/webkit-gtk:4.1 )
+ zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ spice? ( app-emulation/spice-protocol )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ xdg_environment_reset
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
+ -DWITH_AVAHI=$(usex zeroconf)
+ -DWITH_CUPS=$(usex cups)
+ -DWITH_EXAMPLES=$(usex examples)
+ -DWITH_FREERDP=$(usex rdp)
+ -DWITH_FREERDP3=ON
+ -DWITH_GCRYPT=$(usex crypt)
+ -DWITH_GETTEXT=$(usex nls)
+ -DWITH_ICON_CACHE=OFF
+ -DWITH_KF5WALLET=$(usex kwallet)
+ -DWITH_LIBSECRET=$(usex keyring)
+ -DWITH_LIBSSH=$(usex ssh)
+ -DWITH_LIBVNCSERVER=$(usex vnc)
+ -DWITH_PYTHONLIBS=$(usex python ON OFF)
+ -DWITH_SPICE=$(usex spice)
+ -DWITH_TRANSLATIONS=$(usex nls)
+ -DWITH_UPDATE_DESKTOP_DB=OFF
+ -DWITH_VTE=$(usex ssh)
+ -DWITH_WWW=$(usex webkit)
+ -DWITH_X2GO=OFF
+ # when this feature is stable, add python eclass usage to optionally enable
+ -DWITH_PYTHON=OFF
+ )
+ cmake_src_configure
+}
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12084.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12084.patch
new file mode 100644
index 000000000000..c4479ef8a80f
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12084.patch
@@ -0,0 +1,132 @@
+https://bugs.gentoo.org/948106
+
+Backport provided by Red Hat on the VINCE case.
+diff --git a/io.c b/io.c
+index a99ac0e..bb60eec 100644
+--- a/io.c
++++ b/io.c
+@@ -55,6 +55,7 @@ extern int read_batch;
+ extern int compat_flags;
+ extern int protect_args;
+ extern int checksum_seed;
++extern int xfer_sum_len;
+ extern int daemon_connection;
+ extern int protocol_version;
+ extern int remove_source_files;
+@@ -1977,7 +1978,7 @@ void read_sum_head(int f, struct sum_struct *sum)
+ exit_cleanup(RERR_PROTOCOL);
+ }
+ sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f);
+- if (sum->s2length < 0 || sum->s2length > MAX_DIGEST_LEN) {
++ if (sum->s2length < 0 || sum->s2length > xfer_sum_len) {
+ rprintf(FERROR, "Invalid checksum length %d [%s]\n",
+ sum->s2length, who_am_i());
+ exit_cleanup(RERR_PROTOCOL);
+diff --git a/match.c b/match.c
+index cdb30a1..36e78ed 100644
+--- a/match.c
++++ b/match.c
+@@ -232,7 +232,7 @@ static void hash_search(int f,struct sum_struct *s,
+ done_csum2 = 1;
+ }
+
+- if (memcmp(sum2,s->sums[i].sum2,s->s2length) != 0) {
++ if (memcmp(sum2, sum2_at(s, i), s->s2length) != 0) {
+ false_alarms++;
+ continue;
+ }
+@@ -252,7 +252,7 @@ static void hash_search(int f,struct sum_struct *s,
+ if (i != aligned_i) {
+ if (sum != s->sums[aligned_i].sum1
+ || l != s->sums[aligned_i].len
+- || memcmp(sum2, s->sums[aligned_i].sum2, s->s2length) != 0)
++ || memcmp(sum2, sum2_at(s, aligned_i), s->s2length) != 0)
+ goto check_want_i;
+ i = aligned_i;
+ }
+@@ -271,7 +271,7 @@ static void hash_search(int f,struct sum_struct *s,
+ if (sum != s->sums[i].sum1)
+ goto check_want_i;
+ get_checksum2((char *)map, l, sum2);
+- if (memcmp(sum2, s->sums[i].sum2, s->s2length) != 0)
++ if (memcmp(sum2, sum2_at(s, i), s->s2length) != 0)
+ goto check_want_i;
+ /* OK, we have a re-alignment match. Bump the offset
+ * forward to the new match point. */
+@@ -290,7 +290,7 @@ static void hash_search(int f,struct sum_struct *s,
+ && (!updating_basis_file || s->sums[want_i].offset >= offset
+ || s->sums[want_i].flags & SUMFLG_SAME_OFFSET)
+ && sum == s->sums[want_i].sum1
+- && memcmp(sum2, s->sums[want_i].sum2, s->s2length) == 0) {
++ && memcmp(sum2, sum2_at(s, want_i), s->s2length) == 0) {
+ /* we've found an adjacent match - the RLL coder
+ * will be happy */
+ i = want_i;
+diff --git a/rsync.c b/rsync.c
+index cd288f5..b130aba 100644
+--- a/rsync.c
++++ b/rsync.c
+@@ -437,7 +437,10 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr, cha
+ */
+ void free_sums(struct sum_struct *s)
+ {
+- if (s->sums) free(s->sums);
++ if (s->sums) {
++ free(s->sums);
++ free(s->sum2_array);
++ }
+ free(s);
+ }
+
+diff --git a/rsync.h b/rsync.h
+index d3709fe..0f9e277 100644
+--- a/rsync.h
++++ b/rsync.h
+@@ -958,12 +958,12 @@ struct sum_buf {
+ uint32 sum1; /**< simple checksum */
+ int32 chain; /**< next hash-table collision */
+ short flags; /**< flag bits */
+- char sum2[SUM_LENGTH]; /**< checksum */
+ };
+
+ struct sum_struct {
+ OFF_T flength; /**< total file length */
+ struct sum_buf *sums; /**< points to info for each chunk */
++ char *sum2_array; /**< checksums of length xfer_sum_len */
+ int32 count; /**< how many chunks */
+ int32 blength; /**< block_length */
+ int32 remainder; /**< flength % block_length */
+@@ -982,6 +982,8 @@ struct map_struct {
+ int status; /* first errno from read errors */
+ };
+
++#define sum2_at(s, i) ((s)->sum2_array + ((size_t)(i) * xfer_sum_len))
++
+ #define NAME_IS_FILE (0) /* filter name as a file */
+ #define NAME_IS_DIR (1<<0) /* filter name as a dir */
+ #define NAME_IS_XATTR (1<<2) /* filter name as an xattr */
+diff --git a/sender.c b/sender.c
+index 3d4f052..2bbff2f 100644
+--- a/sender.c
++++ b/sender.c
+@@ -31,6 +31,7 @@ extern int log_before_transfer;
+ extern int stdout_format_has_i;
+ extern int logfile_format_has_i;
+ extern int want_xattr_optim;
++extern int xfer_sum_len;
+ extern int csum_length;
+ extern int append_mode;
+ extern int copy_links;
+@@ -94,10 +95,11 @@ static struct sum_struct *receive_sums(int f)
+ return(s);
+
+ s->sums = new_array(struct sum_buf, s->count);
++ s->sum2_array = new_array(char, (size_t)s->count * xfer_sum_len);
+
+ for (i = 0; i < s->count; i++) {
+ s->sums[i].sum1 = read_int(f);
+- read_buf(f, s->sums[i].sum2, s->s2length);
++ read_buf(f, sum2_at(s, i), s->s2length);
+
+ s->sums[i].offset = offset;
+ s->sums[i].flags = 0;
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12085.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12085.patch
new file mode 100644
index 000000000000..d841ad0716dc
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12085.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/948106
+
+Backport provided by Red Hat on the VINCE case.
+diff --git a/match.c b/match.c
+index 36e78ed..dfd6af2 100644
+--- a/match.c
++++ b/match.c
+@@ -147,6 +147,9 @@ static void hash_search(int f,struct sum_struct *s,
+ int more;
+ schar *map;
+
++ // prevent possible memory leaks
++ memset(sum2, 0, sizeof sum2);
++
+ /* want_i is used to encourage adjacent matches, allowing the RLL
+ * coding of the output to work more efficiently. */
+ want_i = 0;
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-1.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-1.patch
new file mode 100644
index 000000000000..b0ab88e8c106
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-1.patch
@@ -0,0 +1,200 @@
+https://bugs.gentoo.org/948106
+
+Backport provided by Red Hat on the VINCE case.
+diff --git a/receiver.c b/receiver.c
+index 6b4b369..8031b8f 100644
+--- a/receiver.c
++++ b/receiver.c
+@@ -66,6 +66,7 @@ extern char sender_file_sum[MAX_DIGEST_LEN];
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
+ extern filter_rule_list daemon_filter_list;
+ extern OFF_T preallocated_len;
++extern int fuzzy_basis;
+
+ extern struct name_num_item *xfer_sum_nni;
+ extern int xfer_sum_len;
+@@ -551,6 +552,8 @@ int recv_files(int f_in, int f_out, char *local_name)
+ progress_init();
+
+ while (1) {
++ const char *basedir = NULL;
++
+ cleanup_disable();
+
+ /* This call also sets cur_flist. */
+@@ -716,28 +719,34 @@ int recv_files(int f_in, int f_out, char *local_name)
+ fnamecmp = get_backup_name(fname);
+ break;
+ case FNAMECMP_FUZZY:
++ if (fuzzy_basis == 0) {
++ rprintf(FERROR_XFER, "rsync: refusing malicious fuzzy operation for %s\n", xname);
++ exit_cleanup(RERR_PROTOCOL);
++ }
+ if (file->dirname) {
+- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, file->dirname, xname);
+- fnamecmp = fnamecmpbuf;
+- } else
+- fnamecmp = xname;
++ basedir = file->dirname;
++ }
++ fnamecmp = xname;
+ break;
+ default:
+ if (fnamecmp_type > FNAMECMP_FUZZY && fnamecmp_type-FNAMECMP_FUZZY <= basis_dir_cnt) {
+ fnamecmp_type -= FNAMECMP_FUZZY + 1;
+ if (file->dirname) {
+- stringjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+- basis_dir[fnamecmp_type], "/", file->dirname, "/", xname, NULL);
+- } else
+- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], xname);
++ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], file->dirname);
++ basedir = fnamecmpbuf;
++ } else {
++ basedir = basis_dir[fnamecmp_type];
++ }
++ fnamecmp = xname;
+ } else if (fnamecmp_type >= basis_dir_cnt) {
+ rprintf(FERROR,
+ "invalid basis_dir index: %d.\n",
+ fnamecmp_type);
+ exit_cleanup(RERR_PROTOCOL);
+- } else
+- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], fname);
+- fnamecmp = fnamecmpbuf;
++ } else {
++ basedir = basis_dir[fnamecmp_type];
++ fnamecmp = fname;
++ }
+ break;
+ }
+ if (!fnamecmp || (daemon_filter_list.head
+@@ -760,7 +769,7 @@ int recv_files(int f_in, int f_out, char *local_name)
+ }
+
+ /* open the file */
+- fd1 = do_open(fnamecmp, O_RDONLY, 0);
++ fd1 = secure_relative_open(basedir, fnamecmp, O_RDONLY, 0);
+
+ if (fd1 == -1 && protocol_version < 29) {
+ if (fnamecmp != fname) {
+@@ -771,14 +780,20 @@ int recv_files(int f_in, int f_out, char *local_name)
+
+ if (fd1 == -1 && basis_dir[0]) {
+ /* pre-29 allowed only one alternate basis */
+- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+- basis_dir[0], fname);
+- fnamecmp = fnamecmpbuf;
++ basedir = basis_dir[0];
++ fnamecmp = fname;
+ fnamecmp_type = FNAMECMP_BASIS_DIR_LOW;
+- fd1 = do_open(fnamecmp, O_RDONLY, 0);
++ fd1 = secure_relative_open(basedir, fnamecmp, O_RDONLY, 0);
+ }
+ }
+
++ if (basedir) {
++ // for the following code we need the full
++ // path name as a single string
++ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basedir, fnamecmp);
++ fnamecmp = fnamecmpbuf;
++ }
++
+ one_inplace = inplace_partial && fnamecmp_type == FNAMECMP_PARTIAL_DIR;
+ updating_basis_or_equiv = one_inplace
+ || (inplace && (fnamecmp == fname || fnamecmp_type == FNAMECMP_BACKUP));
+diff --git a/syscall.c b/syscall.c
+index d92074a..47c5ea5 100644
+--- a/syscall.c
++++ b/syscall.c
+@@ -33,6 +33,8 @@
+ #include <sys/syscall.h>
+ #endif
+
++#include "ifuncs.h"
++
+ extern int dry_run;
+ extern int am_root;
+ extern int am_sender;
+@@ -712,3 +714,82 @@ int do_open_nofollow(const char *pathname, int flags)
+
+ return fd;
+ }
++
++/*
++ open a file relative to a base directory. The basedir can be NULL,
++ in which case the current working directory is used. The relpath
++ must be a relative path, and the relpath must not contain any
++ elements in the path which follow symlinks (ie. like O_NOFOLLOW, but
++ applies to all path components, not just the last component)
++
++ The relpath must also not contain any ../ elements in the path
++*/
++int secure_relative_open(const char *basedir, const char *relpath, int flags, mode_t mode)
++{
++ if (!relpath || relpath[0] == '/') {
++ // must be a relative path
++ errno = EINVAL;
++ return -1;
++ }
++ if (strncmp(relpath, "../", 3) == 0 || strstr(relpath, "/../")) {
++ // no ../ elements allowed in the relpath
++ errno = EINVAL;
++ return -1;
++ }
++
++#if !defined(O_NOFOLLOW) || !defined(O_DIRECTORY)
++ // really old system, all we can do is live with the risks
++ if (!basedir) {
++ return open(relpath, flags, mode);
++ }
++ char fullpath[MAXPATHLEN];
++ pathjoin(fullpath, sizeof fullpath, basedir, relpath);
++ return open(fullpath, flags, mode);
++#else
++ int dirfd = AT_FDCWD;
++ if (basedir != NULL) {
++ dirfd = openat(AT_FDCWD, basedir, O_RDONLY | O_DIRECTORY);
++ if (dirfd == -1) {
++ return -1;
++ }
++ }
++ int retfd = -1;
++
++ char *path_copy = my_strdup(relpath, __FILE__, __LINE__);
++ if (!path_copy) {
++ return -1;
++ }
++
++ for (const char *part = strtok(path_copy, "/");
++ part != NULL;
++ part = strtok(NULL, "/"))
++ {
++ int next_fd = openat(dirfd, part, O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
++ if (next_fd == -1 && errno == ENOTDIR) {
++ if (strtok(NULL, "/") != NULL) {
++ // this is not the last component of the path
++ errno = ELOOP;
++ goto cleanup;
++ }
++ // this could be the last component of the path, try as a file
++ retfd = openat(dirfd, part, flags | O_NOFOLLOW, mode);
++ goto cleanup;
++ }
++ if (next_fd == -1) {
++ goto cleanup;
++ }
++ if (dirfd != AT_FDCWD) close(dirfd);
++ dirfd = next_fd;
++ }
++
++ // the path must be a directory
++ errno = EINVAL;
++
++cleanup:
++ free(path_copy);
++ if (dirfd != AT_FDCWD) {
++ close(dirfd);
++ }
++ return retfd;
++#endif // O_NOFOLLOW, O_DIRECTORY
++}
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-2.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-2.patch
new file mode 100644
index 000000000000..ae0a85bc4a5d
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12086-2.patch
@@ -0,0 +1,26 @@
+https://github.com/RsyncProject/rsync/pull/707
+
+From 4e9b6476325eb08931025d719cfc3ff2c94d2b23 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 15 Jan 2025 15:59:17 +0100
+Subject: [PATCH] Fix build on ancient glibc without openat(AT_FDCWD
+
+Fixes: https://github.com/RsyncProject/rsync/issues/701
+---
+ syscall.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/syscall.c b/syscall.c
+index 8cea2900..34a9bba0 100644
+--- a/syscall.c
++++ b/syscall.c
+@@ -734,7 +734,7 @@ int secure_relative_open(const char *basedir, const char *relpath, int flags, mo
+ return -1;
+ }
+
+-#if !defined(O_NOFOLLOW) || !defined(O_DIRECTORY)
++#if !defined(O_NOFOLLOW) || !defined(O_DIRECTORY) || !defined(AT_FDCWD)
+ // really old system, all we can do is live with the risks
+ if (!basedir) {
+ return open(relpath, flags, mode);
+
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-1.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-1.patch
new file mode 100644
index 000000000000..2328f3c0f6eb
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-1.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/948106
+
+Backport provided by Red Hat on the VINCE case.
+diff --git a/flist.c b/flist.c
+index 464d556..087f9da 100644
+--- a/flist.c
++++ b/flist.c
+@@ -2584,6 +2584,19 @@ struct file_list *recv_file_list(int f, int dir_ndx)
+ init_hard_links();
+ #endif
+
++ if (inc_recurse && dir_ndx >= 0) {
++ if (dir_ndx >= dir_flist->used) {
++ rprintf(FERROR_XFER, "rsync: refusing invalid dir_ndx %u >= %u\n", dir_ndx, dir_flist->used);
++ exit_cleanup(RERR_PROTOCOL);
++ }
++ struct file_struct *file = dir_flist->files[dir_ndx];
++ if (file->flags & FLAG_GOT_DIR_FLIST) {
++ rprintf(FERROR_XFER, "rsync: refusing malicious duplicate flist for dir %d\n", dir_ndx);
++ exit_cleanup(RERR_PROTOCOL);
++ }
++ file->flags |= FLAG_GOT_DIR_FLIST;
++ }
++
+ flist = flist_new(0, "recv_file_list");
+ flist_expand(flist, FLIST_START_LARGE);
+
+diff --git a/rsync.h b/rsync.h
+index 0f9e277..b9a7101 100644
+--- a/rsync.h
++++ b/rsync.h
+@@ -84,6 +84,7 @@
+ #define FLAG_DUPLICATE (1<<4) /* sender */
+ #define FLAG_MISSING_DIR (1<<4) /* generator */
+ #define FLAG_HLINKED (1<<5) /* receiver/generator (checked on all types) */
++#define FLAG_GOT_DIR_FLIST (1<<5)/* sender/receiver/generator - dir_flist only */
+ #define FLAG_HLINK_FIRST (1<<6) /* receiver/generator (w/FLAG_HLINKED) */
+ #define FLAG_IMPLIED_DIR (1<<6) /* sender/receiver/generator (dirs only) */
+ #define FLAG_HLINK_LAST (1<<7) /* receiver/generator */
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-2.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-2.patch
new file mode 100644
index 000000000000..dd4c7fb87a74
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12087-2.patch
@@ -0,0 +1,36 @@
+https://github.com/RsyncProject/rsync/pull/705
+
+From efb85fd8db9e8f74eb3ab91ebf44f6ed35e3da5b Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 15 Jan 2025 15:10:24 +0100
+Subject: [PATCH] Fix FLAG_GOT_DIR_FLIST collission with FLAG_HLINKED
+
+fixes commit 688f5c379a43 (Refuse a duplicate dirlist.)
+
+Fixes: https://github.com/RsyncProject/rsync/issues/702
+Fixes: https://github.com/RsyncProject/rsync/issues/697
+---
+ rsync.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rsync.h b/rsync.h
+index 9be1297b..479ac484 100644
+--- a/rsync.h
++++ b/rsync.h
+@@ -84,7 +84,6 @@
+ #define FLAG_DUPLICATE (1<<4) /* sender */
+ #define FLAG_MISSING_DIR (1<<4) /* generator */
+ #define FLAG_HLINKED (1<<5) /* receiver/generator (checked on all types) */
+-#define FLAG_GOT_DIR_FLIST (1<<5)/* sender/receiver/generator - dir_flist only */
+ #define FLAG_HLINK_FIRST (1<<6) /* receiver/generator (w/FLAG_HLINKED) */
+ #define FLAG_IMPLIED_DIR (1<<6) /* sender/receiver/generator (dirs only) */
+ #define FLAG_HLINK_LAST (1<<7) /* receiver/generator */
+@@ -93,6 +92,7 @@
+ #define FLAG_SKIP_GROUP (1<<10) /* receiver/generator */
+ #define FLAG_TIME_FAILED (1<<11)/* generator */
+ #define FLAG_MOD_NSEC (1<<12) /* sender/receiver/generator */
++#define FLAG_GOT_DIR_FLIST (1<<13)/* sender/receiver/generator - dir_flist only */
+
+ /* These flags are passed to functions but not stored. */
+
+
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12088.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12088.patch
new file mode 100644
index 000000000000..422a45e2c03e
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12088.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/948106
+
+Backport provided by Red Hat on the VINCE case.
+diff --git a/testsuite/unsafe-byname.test b/testsuite/unsafe-byname.test
+index 75e7201..d2e318e 100644
+--- a/testsuite/unsafe-byname.test
++++ b/testsuite/unsafe-byname.test
+@@ -40,7 +40,7 @@ test_unsafe ..//../dest from/dir unsafe
+ test_unsafe .. from/file safe
+ test_unsafe ../.. from/file unsafe
+ test_unsafe ..//.. from//file unsafe
+-test_unsafe dir/.. from safe
++test_unsafe dir/.. from unsafe
+ test_unsafe dir/../.. from unsafe
+ test_unsafe dir/..//.. from unsafe
+
+diff --git a/util1.c b/util1.c
+index da50ff1..f260d39 100644
+--- a/util1.c
++++ b/util1.c
+@@ -1318,7 +1318,14 @@ int handle_partial_dir(const char *fname, int create)
+ *
+ * "src" is the top source directory currently applicable at the level
+ * of the referenced symlink. This is usually the symlink's full path
+- * (including its name), as referenced from the root of the transfer. */
++ * (including its name), as referenced from the root of the transfer.
++ *
++ * NOTE: this also rejects dest names with a .. component in other
++ * than the first component of the name ie. it rejects names such as
++ * a/b/../x/y. This needs to be done as the leading subpaths 'a' or
++ * 'b' could later be replaced with symlinks such as a link to '.'
++ * resulting in the link being transferred now becoming unsafe
++ */
+ int unsafe_symlink(const char *dest, const char *src)
+ {
+ const char *name, *slash;
+@@ -1328,6 +1335,23 @@ int unsafe_symlink(const char *dest, const char *src)
+ if (!dest || !*dest || *dest == '/')
+ return 1;
+
++ // reject destinations with /../ in the name other than at the start of the name
++ const char *dest2 = dest;
++ while (strncmp(dest2, "../", 3) == 0) {
++ dest2 += 3;
++ while (*dest2 == '/') {
++ // allow for ..//..///../foo
++ dest2++;
++ }
++ }
++ if (strstr(dest2, "/../"))
++ return 1;
++
++ // reject if the destination ends in /..
++ const size_t dlen = strlen(dest);
++ if (dlen > 3 && strcmp(&dest[dlen-3], "/..") == 0)
++ return 1;
++
+ /* find out what our safety margin is */
+ for (name = src; (slash = strchr(name, '/')) != 0; name = slash+1) {
+ /* ".." segment starts the count over. "." segment is ignored. */
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-1.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-1.patch
new file mode 100644
index 000000000000..527da2046125
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-1.patch
@@ -0,0 +1,166 @@
+https://bugs.gentoo.org/948106
+
+Backport provided by Red Hat on the VINCE case.
+diff --git a/checksum.c b/checksum.c
+index cb21882..66e8089 100644
+--- a/checksum.c
++++ b/checksum.c
+@@ -406,7 +406,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum)
+ int32 remainder;
+ int fd;
+
+- fd = do_open(fname, O_RDONLY, 0);
++ fd = do_open_checklinks(fname);
+ if (fd == -1) {
+ memset(sum, 0, file_sum_len);
+ return;
+diff --git a/flist.c b/flist.c
+index 087f9da..1783253 100644
+--- a/flist.c
++++ b/flist.c
+@@ -1390,7 +1390,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+
+ if (copy_devices && am_sender && IS_DEVICE(st.st_mode)) {
+ if (st.st_size == 0) {
+- int fd = do_open(fname, O_RDONLY, 0);
++ int fd = do_open_checklinks(fname);
+ if (fd >= 0) {
+ st.st_size = get_device_size(fd, fname);
+ close(fd);
+diff --git a/generator.c b/generator.c
+index 110db28..3f13bb9 100644
+--- a/generator.c
++++ b/generator.c
+@@ -1798,7 +1798,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+
+ if (write_devices && IS_DEVICE(sx.st.st_mode) && sx.st.st_size == 0) {
+ /* This early open into fd skips the regular open below. */
+- if ((fd = do_open(fnamecmp, O_RDONLY, 0)) >= 0)
++ if ((fd = do_open_nofollow(fnamecmp, O_RDONLY)) >= 0)
+ real_sx.st.st_size = sx.st.st_size = get_device_size(fd, fnamecmp);
+ }
+
+@@ -1867,7 +1867,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ }
+
+ /* open the file */
+- if (fd < 0 && (fd = do_open(fnamecmp, O_RDONLY, 0)) < 0) {
++ if (fd < 0 && (fd = do_open_checklinks(fnamecmp)) < 0) {
+ rsyserr(FERROR, errno, "failed to open %s, continuing",
+ full_fname(fnamecmp));
+ pretend_missing:
+diff --git a/receiver.c b/receiver.c
+index 8031b8f..edfbb21 100644
+--- a/receiver.c
++++ b/receiver.c
+@@ -775,7 +775,7 @@ int recv_files(int f_in, int f_out, char *local_name)
+ if (fnamecmp != fname) {
+ fnamecmp = fname;
+ fnamecmp_type = FNAMECMP_FNAME;
+- fd1 = do_open(fnamecmp, O_RDONLY, 0);
++ fd1 = do_open_nofollow(fnamecmp, O_RDONLY);
+ }
+
+ if (fd1 == -1 && basis_dir[0]) {
+diff --git a/sender.c b/sender.c
+index 2bbff2f..a4d46c3 100644
+--- a/sender.c
++++ b/sender.c
+@@ -350,7 +350,7 @@ void send_files(int f_in, int f_out)
+ exit_cleanup(RERR_PROTOCOL);
+ }
+
+- fd = do_open(fname, O_RDONLY, 0);
++ fd = do_open_checklinks(fname);
+ if (fd == -1) {
+ if (errno == ENOENT) {
+ enum logcode c = am_daemon && protocol_version < 28 ? FERROR : FWARNING;
+diff --git a/syscall.c b/syscall.c
+index 47c5ea5..c55ae5f 100644
+--- a/syscall.c
++++ b/syscall.c
+@@ -45,6 +45,8 @@ extern int preallocate_files;
+ extern int preserve_perms;
+ extern int preserve_executability;
+ extern int open_noatime;
++extern int copy_links;
++extern int copy_unsafe_links;
+
+ #ifndef S_BLKSIZE
+ # if defined hpux || defined __hpux__ || defined __hpux
+@@ -793,3 +795,21 @@ cleanup:
+ return retfd;
+ #endif // O_NOFOLLOW, O_DIRECTORY
+ }
++
++/*
++ varient of do_open/do_open_nofollow which does do_open() if the
++ copy_links or copy_unsafe_links options are set and does
++ do_open_nofollow() otherwise
++
++ This is used to prevent a race condition where an attacker could be
++ switching a file between being a symlink and being a normal file
++
++ The open is always done with O_RDONLY flags
++ */
++int do_open_checklinks(const char *pathname)
++{
++ if (copy_links || copy_unsafe_links) {
++ return do_open(pathname, O_RDONLY, 0);
++ }
++ return do_open_nofollow(pathname, O_RDONLY);
++}
+diff --git a/t_unsafe.c b/t_unsafe.c
+index 010cac5..e10619a 100644
+--- a/t_unsafe.c
++++ b/t_unsafe.c
+@@ -28,6 +28,9 @@ int am_root = 0;
+ int am_sender = 1;
+ int read_only = 0;
+ int list_only = 0;
++int copy_links = 0;
++int copy_unsafe_links = 0;
++
+ short info_levels[COUNT_INFO], debug_levels[COUNT_DEBUG];
+
+ int
+diff --git a/tls.c b/tls.c
+index e6b0708..858f8f1 100644
+--- a/tls.c
++++ b/tls.c
+@@ -49,6 +49,9 @@ int list_only = 0;
+ int link_times = 0;
+ int link_owner = 0;
+ int nsec_times = 0;
++int safe_symlinks = 0;
++int copy_links = 0;
++int copy_unsafe_links = 0;
+
+ #ifdef SUPPORT_XATTRS
+
+diff --git a/trimslash.c b/trimslash.c
+index 1ec928c..f2774cd 100644
+--- a/trimslash.c
++++ b/trimslash.c
+@@ -26,6 +26,8 @@ int am_root = 0;
+ int am_sender = 1;
+ int read_only = 1;
+ int list_only = 0;
++int copy_links = 0;
++int copy_unsafe_links = 0;
+
+ int
+ main(int argc, char **argv)
+diff --git a/util1.c b/util1.c
+index f260d39..d84bc41 100644
+--- a/util1.c
++++ b/util1.c
+@@ -365,7 +365,7 @@ int copy_file(const char *source, const char *dest, int tmpfilefd, mode_t mode)
+ int len; /* Number of bytes read into `buf'. */
+ OFF_T prealloc_len = 0, offset = 0;
+
+- if ((ifd = do_open(source, O_RDONLY, 0)) < 0) {
++ if ((ifd = do_open_nofollow(source, O_RDONLY)) < 0) {
+ int save_errno = errno;
+ rsyserr(FERROR_XFER, errno, "open %s", full_fname(source));
+ errno = save_errno;
diff --git a/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-2.patch b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-2.patch
new file mode 100644
index 000000000000..2a3add75e0a9
--- /dev/null
+++ b/net-misc/rsync/files/3.3.0/rsync-3.3.0-CVE-2024-12747-2.patch
@@ -0,0 +1,34 @@
+https://github.com/RsyncProject/rsync/pull/706
+
+From f923b19fd85039a2b0e908391074872334646d51 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 15 Jan 2025 15:48:04 +0100
+Subject: [PATCH] Fix use-after-free in generator
+
+full_fname() will free the return value in the next call so we need to
+duplicate it before passing it to rsyserr.
+
+Fixes: https://github.com/RsyncProject/rsync/issues/704
+---
+ generator.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/generator.c b/generator.c
+index 3f13bb95..b56fa569 100644
+--- a/generator.c
++++ b/generator.c
+@@ -2041,8 +2041,12 @@ int atomic_create(struct file_struct *file, char *fname, const char *slnk, const
+
+ if (!skip_atomic) {
+ if (do_rename(tmpname, fname) < 0) {
++ char *full_tmpname = strdup(full_fname(tmpname));
++ if (full_tmpname == NULL)
++ out_of_memory("atomic_create");
+ rsyserr(FERROR_XFER, errno, "rename %s -> \"%s\" failed",
+- full_fname(tmpname), full_fname(fname));
++ full_tmpname, full_fname(fname));
++ free(full_tmpname);
+ do_unlink(tmpname);
+ return 0;
+ }
+
diff --git a/net-misc/rsync/rsync-3.2.7-r4.ebuild b/net-misc/rsync/rsync-3.3.0-r2.ebuild
index a747693763f0..7fbdb2af33fe 100644
--- a/net-misc/rsync/rsync-3.2.7-r4.ebuild
+++ b/net-misc/rsync/rsync-3.3.0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# Uncomment when introducing a patch which touches configure
RSYNC_NEEDS_AUTOCONF=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit flag-o-matic prefix python-single-r1 systemd
DESCRIPTION="File transfer program to keep remote files into sync"
@@ -77,9 +77,8 @@ else
fi
PATCHES=(
- "${FILESDIR}"/${P}-flist-memcmp-ub.patch
- "${FILESDIR}"/${P}-fortify-source-3.patch
- "${FILESDIR}"/${PN}-3.2.7-ipv6-configure-c99.patch
+ # Temporary just for the bug #948106 CVE fixes
+ "${FILESDIR}"/3.3.0
)
pkg_setup() {
@@ -114,6 +113,9 @@ src_prepare() {
}
src_configure() {
+ # Should be fixed upstream in next release (>3.3.0) (bug #943745)
+ append-cflags $(test-flags-CC -std=gnu17)
+
local myeconfargs=(
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
--without-included-popt
@@ -149,7 +151,7 @@ src_install() {
dodoc NEWS.md README.md TODO tech_report.tex
insinto /etc
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+ newins "${FILESDIR}"/rsyncd.conf-3.2.7-r5 rsyncd.conf
insinto /etc/logrotate.d
newins "${FILESDIR}"/rsyncd.logrotate rsyncd
diff --git a/net-misc/rsync/rsync-3.3.0.ebuild b/net-misc/rsync/rsync-3.3.0.ebuild
deleted file mode 100644
index 8c66b403fc31..000000000000
--- a/net-misc/rsync/rsync-3.3.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Uncomment when introducing a patch which touches configure
-RSYNC_NEEDS_AUTOCONF=1
-PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic prefix python-single-r1 systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
- inherit autotools git-r3
-
- REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc
- inherit verify-sig
-
- if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
- inherit autotools
- fi
-
- if [[ ${PV} == *_pre* ]] ; then
- SRC_DIR="src-previews"
- else
- SRC_DIR="src"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
- fi
-
- SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
- verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
- S="${WORKDIR}"/${P/_/}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
-REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
-REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-libs/popt-1.5
- acl? ( virtual/acl )
- examples? (
- ${PYTHON_DEPS}
- dev-lang/perl
- )
- lz4? ( app-arch/lz4:= )
- rrsync? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/bracex[${PYTHON_USEDEP}]
- ')
- )
- ssl? ( dev-libs/openssl:= )
- system-zlib? ( sys-libs/zlib )
- xattr? ( kernel_linux? ( sys-apps/attr ) )
- xxhash? ( >=dev-libs/xxhash-0.8 )
- zstd? ( >=app-arch/zstd-1.4:= )
- iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- examples? ( ${PYTHON_DEPS} )
- rrsync? ( ${PYTHON_DEPS} )
-"
-
-if [[ ${PV} == *9999 ]] ; then
- BDEPEND+=" ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/commonmark[${PYTHON_USEDEP}]
- ')"
-else
- BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
-fi
-
-pkg_setup() {
- # - USE=examples needs Python itself at runtime, but nothing else
- # - 9999 needs commonmark at build time
- if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- default
-
- sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac
-
- if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
- eaclocal -I m4
- eautoconf -o configure.sh
- eautoheader && touch config.h.in
- fi
-
- if use examples || use rrsync; then
- python_fix_shebang support/
- fi
-
- if [[ -f rrsync.1 ]]; then
- # If the pre-build rrsync.1 man page exists, then link to it
- # from support/rrsync.1 to avoid rsync's build system attempting
- # re-creating the man page (bug #883049).
- ln -s ../rrsync.1 support/rrsync.1 || die
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
- --without-included-popt
- --enable-ipv6
- $(use_enable acl acl-support)
- $(use_enable iconv)
- $(use_enable lz4)
- $(use_with rrsync)
- $(use_enable ssl openssl)
- $(use_with !system-zlib included-zlib)
- $(use_enable xattr xattr-support)
- $(use_enable xxhash)
- $(use_enable zstd)
- )
-
- # https://github.com/WayneD/rsync/pull/428
- if is-flagq -fsanitize=undefined ; then
- sed -E -i \
- -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \
- byteorder.h || die
- append-flags -DCAREFUL_ALIGNMENT
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
- newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
- dodoc NEWS.md README.md TODO tech_report.tex
-
- insinto /etc
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
- # Install stunnel helpers
- if use stunnel ; then
- emake DESTDIR="${D}" install-ssl-daemon
- fi
-
- # Install the useful contrib scripts
- if use examples ; then
- # The 'rrsync' script is installed conditionally via the 'rrysnc'
- # USE flag, and not via the 'examples' USE flag.
- rm support/rrsync* || die
-
- exeinto /usr/share/rsync
- doexe support/*
-
- rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
- fi
-
- eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
- systemd_newunit packaging/systemd/rsync.service rsyncd.service
-}
-
-pkg_postinst() {
- if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
- "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
- ewarn "You have disabled chroot support in your rsyncd.conf. This"
- ewarn "is a security risk which you should fix. Please check your"
- ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
- fi
-
- if use stunnel ; then
- einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
- einfo
- einfo "You maybe have to update the certificates configured in"
- einfo "${EROOT}/etc/stunnel/rsync.conf"
- fi
-
- if use system-zlib ; then
- ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
- ewarn "using the --compress option."
- ewarn
- ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
- ewarn "and the --compress option, add --new-compress (-zz)."
- ewarn
- ewarn "For syncing the portage tree, add:"
- ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
- fi
-}
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index 450c69141a2c..0569f9355718 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,2 +1,2 @@
-DIST rygel-0.42.5.tar.xz 1704072 BLAKE2B a00be296956def2bc90b978df5b8c4b23a122b9c30adfa66c634249b5daafe8d21de1cac40417095d72d42e80522ce58fe678a7f7780bd1e134aa2cd66f3d2bf SHA512 cd1aaff4e2eb2c25931197d70f518a30dab75604d62b9f071bc560570c352371d132a10caaf94956d34ecd24505ccd9a7b9f5bf324d544c676ca1f47b124f533
DIST rygel-0.42.6.tar.xz 1709832 BLAKE2B 3f93f830c05561be235b3aa1f1d5fed30d1fda94422345b129747b3c35d4d4a88a320af5f2eae293c8126b1a7b94a24c9a1c00c60fb60745ee3614eb1e559bfd SHA512 c388a16ef68a36c2de8f7280ea2cec179872e009686697c81d984cc723b143c9880c335ca6a26394e6d60cf4e4294e692122fd76cb2ac72adfb9a53f7805c239
+DIST rygel-0.44.1.tar.xz 1704696 BLAKE2B 24483708f42d27e2e70c914373cfb89a477255c69a62e2a3c425807f05232446961c126c821bca424318ecd179a2d36c27beb75e07e821db6ba9622b62a107c4 SHA512 afb3332499d3ef2b2d737cdd860c9b3137bac76abcc2ca1030cdf8f1d49ac9665d4dcdcace4ca8e39f92e913369329d60bc6833db63f6e8bfff73ec7385d35ca
diff --git a/net-misc/rygel/rygel-0.42.5.ebuild b/net-misc/rygel/rygel-0.44.1.ebuild
index 2e511bf9e740..0b188ba55218 100644
--- a/net-misc/rygel/rygel-0.42.5.ebuild
+++ b/net-misc/rygel/rygel-0.44.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,11 +6,11 @@ EAPI=8
inherit gnome.org meson systemd vala xdg
DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
+HOMEPAGE="https://gnome.pages.gitlab.gnome.org/rygel/"
LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
RESTRICT="!test? ( test )"
@@ -23,7 +23,7 @@ DEPEND="
>=dev-libs/libxml2-2.7:2
>=net-libs/gupnp-av-0.14.1:=[vala]
>=media-libs/gupnp-dlna-0.9.4:2.0=
- >=net-libs/libsoup-3:3.0
+ >=net-libs/libsoup-3.2.0:3.0
sqlite? (
>=dev-db/sqlite-3.5:3
dev-libs/libunistring:=
@@ -75,7 +75,7 @@ src_configure() {
$(meson_use gtk-doc api-docs)
-Dman_pages=true
-Dsystemd-user-units-dir=$(systemd_get_userunitdir)
- -Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3")
+ -Dplugins=gst-launch$(use sqlite && echo ",media-export")$(use tracker && echo ",tracker3")
-Dengines=gstreamer
-Dexamples=false
$(meson_use test tests)
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 6014a70f8943..991dc398112c 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,2 +1 @@
-DIST seafile-client-8.0.9.tar.gz 11716754 BLAKE2B 2087d2b31ce4696fdaaaa723da7a353c54ebebef86c84b62146d806692066165d0499f5fd6d3be108130d28c297020eafc3497be03131c8a8751f34f33eece90 SHA512 d0b55883f8d00138c092309994047652c6a5aa8b66182f83b6c852f1721794d9d8125da5fba282e9efdb92a0a97a55ecd6e225ab6a7916718a05ea2b7f4bd944
DIST seafile-client-9.0.3.tar.gz 11718581 BLAKE2B cb2cecc9b02df4edb7b7191fd609ee5bc3548849c68b3c0cd8f59641bd0716791c2272633c0ba0f4f7b374a1302fd81a8f1396736961cb4e6e4ef1dd8db82c85 SHA512 c2d77c5f9407fd6d4ce3dfd47044de83a3c3e0bbbd1b66f1566ad54a8aa5391f51f70c7e094f16216a653a5ef0e9b8de1025ee56ce56c496c31c87983fbee4d7
diff --git a/net-misc/seafile-client/seafile-client-8.0.9.ebuild b/net-misc/seafile-client/seafile-client-8.0.9.ebuild
deleted file mode 100644
index 54a7323dc84f..000000000000
--- a/net-misc/seafile-client/seafile-client-8.0.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream is moving tags repeatedly, then we use commit hash.
-RELEASE_COMMIT="5701514e89114b97795d4cfcbc3b59a1fd2f91e8"
-
-inherit xdg cmake
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="shibboleth test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/jansson:=
- dev-libs/openssl:=
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- >=net-libs/libsearpc-3.2.0_p1
- ~net-misc/seafile-${PV}
- sys-libs/zlib
- virtual/opengl
- elibc_musl? ( sys-libs/fts-standalone )
- shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
- "${FILESDIR}/${PN}-8.0.6-select-qt5.patch"
- "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
-)
-
-S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
- -DBUILD_TESTING="$(usex test)"
- )
- # 863554
- use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" )
- cmake_src_configure
-}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index ed2334a2a495..f68e701ab4fd 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,2 +1 @@
-DIST seafile-8.0.9.gh.tar.gz 740920 BLAKE2B c62c7ccea536934a92166db5d2acea45b65f5508c1e5d4f70749c922c12d29da11bc2265203c91e87fe0096cc3f4b6ec4f6125b538a4de88725583871b05e67e SHA512 c4621ea4c08fcd9c5d4cf683152f7504c37212272b5a9535da869de846b71a7f5e9a72c5544f9b7487ad8025a6cdf2866c15788828cc27937209d8242fc13cb8
DIST seafile-9.0.3.tar.gz 752618 BLAKE2B fc03756934ed36bf6706250e8a41a8d069a4cf0d69fcb76a44acd3a134a80e0705e72cfa1b8e44d1d4cf01e7f94e5781da3e3af88fc9f2cc4cfccbc8ecc15e11 SHA512 07312e56d642de63a5621870d6fe5ff42a0545d5b7def020dabdd36c9a06500c86801a02138de9e3dc6ff16cfdda43b59d651a08395207e108692cfa61db027f
diff --git a/net-misc/seafile/seafile-8.0.9-r2.ebuild b/net-misc/seafile/seafile-8.0.9-r2.ebuild
deleted file mode 100644
index f44fa93c9cb2..000000000000
--- a/net-misc/seafile/seafile-8.0.9-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-# Upstream is moving tags repeatedly, then we use commit hash.
-# (Please file a bug upstream if this happens!)
-#RELEASE_COMMIT="6bd36a957573eda6a53f3d1bc538dbfc001aa9fd"
-
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
-#SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz"
-#S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-SRC_URI="https://github.com/haiwen/seafile/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/openssl:=
- dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/jansson:=
- dev-libs/libevent:=
- net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
- net-misc/curl
- sys-apps/util-linux
- sys-libs/zlib
- elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
- $(vala_depend)"
-
-pkg_setup() {
- python-single-r1_pkg_setup
- vala_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- # Remove unnecessary .la files
- find "${ED}" -name '*.la' -delete || die
- python_fix_shebang "${ED}"/usr/bin/seaf-cli
-}
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 5644a6a438ed..ae73797d935f 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,2 +1 @@
-DIST smb4k-3.2.90.tar.xz 4454108 BLAKE2B 78a0aea75bc6f94438968369a43a1288da9cc9e43c5d0bc676621789c4fa779b5925cdfc2fd098c0c6a8b32629f9461294b37d3990579cc425939a1ee0b201f9 SHA512 27eae38add622bdf7a29c87da1266d394d7de45584988d393444afe48048de391c8ae0a822db26e817de970ece48de9969b4c7d96d8e4b46a1ed1d9c5d71b5dd
DIST smb4k-3.2.92.tar.xz 4638924 BLAKE2B 9271d1be02136d51c28a24c2ac2a76de5708baffe76cd97e48867bce35f8f3988f63965d4bcff0f7a03b9f8e7a05af63578dd24b094e10553317a220fda3524e SHA512 a2010667454c5c0d24757c96fadb8a7d672eef201bc399dc99d9031c9b847a878545834422b7de2f5627eabaa8e5d0235da2f41da68e9178f7ee4eb431c878e8
diff --git a/net-misc/smb4k/smb4k-3.2.90.ebuild b/net-misc/smb4k/smb4k-3.2.90.ebuild
deleted file mode 100644
index cdcc38020584..000000000000
--- a/net-misc/smb4k/smb4k-3.2.90.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://apps.kde.org/smb4k/
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="https://downloads.sourceforge.net/${PN}/Development/${P}.tar.xz"
- KEYWORDS="amd64 arm64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+discovery plasma"
-
-DEPEND="
- >=dev-libs/qtkeychain-0.14.2:=[qt6(+)]
- >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
- >=dev-qt/qtdeclarative-${QTMIN}:6
- >=kde-frameworks/kauth-${KFMIN}:6
- >=kde-frameworks/kcompletion-${KFMIN}:6
- >=kde-frameworks/kconfig-${KFMIN}:6
- >=kde-frameworks/kconfigwidgets-${KFMIN}:6
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/kcrash-${KFMIN}:6
- >=kde-frameworks/kdbusaddons-${KFMIN}:6
- >=kde-frameworks/kdnssd-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kiconthemes-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
- >=kde-frameworks/kjobwidgets-${KFMIN}:6
- >=kde-frameworks/knotifications-${KFMIN}:6
- >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
- >=kde-frameworks/kwallet-${KFMIN}:6
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
- >=kde-frameworks/kwindowsystem-${KFMIN}:6
- >=kde-frameworks/kxmlgui-${KFMIN}:6
- >=kde-frameworks/solid-${KFMIN}:6
- net-fs/samba[cups]
- discovery? (
- >=net-libs/kdsoap-2.2.0:=[qt6(+)]
- >=net-libs/kdsoap-ws-discovery-client-0.4.0
- )
-"
-RDEPEND="${DEPEND}
- !${CATEGORY}/${PN}:5
- plasma? (
- >=kde-frameworks/kirigami-${KFMIN}:6
- kde-plasma/libplasma:6
- )
-"
-
-src_configure() {
- local mycmakeargs=(
- -DSMB4K_WITH_WS_DISCOVERY=$(usex discovery)
- -DSMB4K_INSTALL_PLASMOID=$(usex plasma)
- )
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- elog "Users of Samba 4.7 and above please note that for the time being,"
- elog "the following setting has to be added to or changed in the [global]"
- elog "section of the smb.conf file:"
- elog
- elog "[global]"
- elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.2.92.ebuild b/net-misc/smb4k/smb4k-3.2.92.ebuild
index 6ef6c2969e89..00db4178a447 100644
--- a/net-misc/smb4k/smb4k-3.2.92.ebuild
+++ b/net-misc/smb4k/smb4k-3.2.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="https://downloads.sourceforge.net/${PN}/Development/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+ KEYWORDS="amd64 arm64 ~riscv ~x86"
fi
LICENSE="GPL-2"
diff --git a/net-misc/socat/socat-1.8.0.1.ebuild b/net-misc/socat/socat-1.8.0.1.ebuild
index 956b49fe571c..2d9c8f3c989b 100644
--- a/net-misc/socat/socat-1.8.0.1.ebuild
+++ b/net-misc/socat/socat-1.8.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="ipv6 readline ssl tcpd"
DEPEND="
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index e8bea8c2d5f5..10d287c7ff54 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,2 +1,2 @@
DIST streamlink-6.11.0.tar.gz 763094 BLAKE2B 7fb0a84088991bc5a7514e0a40d5c05d3a14da5cffbcb255c5e5767fcae8c745a6397cbe79b0b0fd5bebab32b0d8d6c015931af03e6eaa199b5ed9437d0f3a7e SHA512 e6d6e49d2df0aa76ebca76c0b3ada085eac59553423a5ccaa3d5cb62f6be0a679da36c4f78a3e1fea48b22144e705b8de9e46fc146c1c93889ef0c056d59fc7b
-DIST streamlink-7.1.1.tar.gz 771209 BLAKE2B 812e2ddfda1780b72c03c1aac1fb1ab4f0cc9d0b347d2a6a2ff8d2e6a627e51d3920a63b46d8074525a1003cd1a9e10f6f6e6b75423ba436a754e9bb97ce795e SHA512 f379ecfb1aaf7962ee082b2526497678c8f10c0accba1aab72776ed5cd16a67e61ae52643028c5fb770bfc0a309e28d8dc88a8aec7e7e20c0f3388b103a4b71c
+DIST streamlink-7.1.2.tar.gz 772724 BLAKE2B 0a5165e0ec33c127272e4f232fc0ee421bafc54147a1e99424bbbd45ebb41ee2d8bae4fa68e278c1ddf26e8bc9cfe401616e108a2a1fa93fa34d4561046028f4 SHA512 da552336700a0b7e391435aa3e369d0f8b2868a13e15dd5110869a67d164b6775f924fe09839c00bf9f5d9ce0935380ec8c0996fdc58b82c6bbe5e6c6f89ec04
diff --git a/net-misc/streamlink/streamlink-7.1.1.ebuild b/net-misc/streamlink/streamlink-7.1.2.ebuild
index 38bb73a0d640..1822f3313d84 100644
--- a/net-misc/streamlink/streamlink-7.1.1.ebuild
+++ b/net-misc/streamlink/streamlink-7.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.90.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.90.ebuild
new file mode 100644
index 000000000000..2e6cd6b87324
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.90.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XSERVER_VERSION="21.1.15"
+
+DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
+HOMEPAGE="https://tigervnc.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+ ~net-misc/tigervnc-${PV}[server]
+ =x11-base/xorg-server-${XSERVER_VERSION%.*}*
+"
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 3cccbb4f57dd..6f9e98885706 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,2 +1,4 @@
DIST tigervnc-1.14.1.tar.gz 2097932 BLAKE2B 44593837154e019562f63cad54afaa41d1af7a5199988571002019dc60af193162a54b4c3f4e57a3cef2c824253bec5d83f029ba489a7f5459873255b1968cba SHA512 d7a6cff4a3a1e4c30e2dbd6e17ad2d76145e76f5c1a93abbaf32b1c488377a4eaf936d4e8a24a97863948138ba40031c862f9da1c1cd427da35ebffa8eaa4f31
+DIST tigervnc-1.14.90.tar.gz 2106976 BLAKE2B 02c9509580790a65d76c05067f132a8ac7a834e02f4d46910f235dd55deba995630e74a8dd2e81b7d77bc7ee2f5ccbfbb565aee8f3bf0d15d8c532d366819e69 SHA512 c842f1beb0610a8dc039136592cf4acd8d2ef42f7681c44f98c4ec57c35dd759cb98ad7e8462852a1c85ee8f7f63e3283909e30cc52de6c30b602235f4ffafd2
DIST xorg-server-21.1.14.tar.xz 5016608 BLAKE2B b64ff9bbcd1d1c632b588800acb1531d6295a52347294d323d684a7149a4f803fb38357a102d715525511c8bb8554daf2e71c28149ccb650b1c7c1990351f53e SHA512 833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973
+DIST xorg-server-21.1.15.tar.xz 5009756 BLAKE2B a7d5df70a4af98b903a306850a169879cf083b2c811f6e75e1e916f85441214541f7c9fa0e0089c4bf08c67597166d97ea194c6a0a511948568120e579d1104f SHA512 677bbec81ecdd1d14e1d289a00c40249988985ec636e5473b30c4f63bad03a6cc5f9168cea94969e1550370eee8863595bc9c064c3d218a96123afc7567bf363
diff --git a/net-misc/tigervnc/tigervnc-1.14.90.ebuild b/net-misc/tigervnc/tigervnc-1.14.90.ebuild
new file mode 100644
index 000000000000..ef7fe09fa151
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.14.90.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.15"
+XSERVER_PATCH_VERSION="21"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="https://tigervnc.org"
+SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+ SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
+REQUIRED_USE="
+ dri3? ( drm )
+ java? ( viewer )
+ opengl? ( server )
+ || ( server viewer )
+"
+
+# TODO: sys-libs/libselinux
+# <fltk-1.4: https://github.com/TigerVNC/tigervnc/pull/1887#issuecomment-2545662546
+COMMON_DEPEND="
+ dev-libs/gmp:=
+ dev-libs/nettle:=
+ media-libs/libjpeg-turbo:=
+ sys-libs/zlib:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/pixman
+ gnutls? ( net-libs/gnutls:= )
+ nls? ( virtual/libiconv )
+ server? (
+ dev-libs/openssl:0=
+ sys-libs/pam
+ x11-libs/libXau
+ x11-libs/libxcvt
+ x11-libs/libXdamage
+ x11-libs/libXdmcp
+ x11-libs/libXfixes
+ x11-libs/libXfont2
+ x11-libs/libXtst
+ x11-libs/pixman
+ x11-apps/xauth
+ x11-apps/xinit
+ x11-apps/xkbcomp
+ x11-apps/xsetroot
+ x11-misc/xkeyboard-config
+ dri3? (
+ media-libs/mesa[opengl]
+ x11-libs/libxshmfence
+ )
+ opengl? ( media-libs/libglvnd[X] )
+ !net-misc/turbovnc[server]
+ )
+ viewer? (
+ media-video/ffmpeg:=
+ <x11-libs/fltk-1.4:1=
+ x11-libs/libXi
+ x11-libs/libXrender
+ !net-misc/turbovnc[viewer]
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.8:* )
+ server? ( dev-lang/perl )
+"
+DEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jdk-1.8:* )
+ drm? ( x11-libs/libdrm )
+ server? (
+ media-fonts/font-util
+ x11-base/xorg-proto
+ x11-libs/libXi
+ x11-libs/libxkbfile
+ x11-libs/libXrender
+ x11-libs/xtrans
+ x11-misc/util-macros
+ opengl? ( media-libs/mesa )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+ # Restore Java viewer
+ "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+ "${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
+ "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+ "${FILESDIR}"/${PN}-1.14.1-pam.patch
+)
+
+src_unpack() {
+ if [[ ${PV} == *9999 ]]; then
+ git-r3_src_unpack
+ use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ if use server; then
+ cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+ fi
+
+ cmake_src_prepare
+
+ if use server; then
+ cd unix/xserver || die
+ eapply ../xserver${XSERVER_PATCH_VERSION}.patch
+ eautoreconf
+ sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die
+
+ if use drm; then
+ cd "${WORKDIR}" && \
+ sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+ fi
+ fi
+}
+
+src_configure() {
+ if use arm || use hppa; then
+ append-flags "-fPIC"
+ fi
+
+ local mycmakeargs=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_NLS=$(usex nls)
+ -DBUILD_JAVA=$(usex java)
+ -DBUILD_SERVER=$(usex server)
+ -DBUILD_VIEWER=$(usex viewer)
+ )
+
+ cmake_src_configure
+
+ if use server; then
+ cd unix/xserver || die
+ econf \
+ $(use_enable opengl glx) \
+ $(use_enable drm libdrm) \
+ --disable-config-hal \
+ --disable-config-udev \
+ --disable-devel-docs \
+ --disable-dri \
+ $(use_enable dri3) \
+ --disable-glamor \
+ --disable-kdrive \
+ --disable-libunwind \
+ --disable-linux-acpi \
+ --disable-record \
+ --disable-selective-werror \
+ --disable-static \
+ --disable-unit-tests \
+ --disable-xephyr \
+ $(use_enable xinerama) \
+ --disable-xnest \
+ --disable-xorg \
+ --disable-xvfb \
+ --disable-xwin \
+ --enable-dri2 \
+ --with-pic \
+ --without-dtrace \
+ --with-sha1=libcrypto
+ fi
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use server; then
+ # deps of the vnc module and the module itself
+ local d subdirs=(
+ fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+ damageext miext Xi xkb composite dix mi os present hw/vnc
+ )
+ for d in "${subdirs[@]}"; do
+ emake -C unix/xserver/"${d}"
+ done
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ if use server; then
+ emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+ rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+
+ newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN}
+
+ systemd_douserunit unix/vncserver/vncserver@.service
+
+ # install vncserver to /usr/bin too, see bug #836620
+ dosym -r /usr/libexec/vncserver /usr/bin/vncserver
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && {
+ elog 'OpenRC users: please migrate to one service per display as documented here:'
+ elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:'
+ elog
+ }
+
+ use server && {
+ elog 'PLEASE NOTE:'
+ elog ' The default config directory is now ${XDG_CONFIG_HOME}/tigervnc or'
+ elog ' ~/.config/tigervnc instead of ~/.vnc'
+ elog
+ }
+
+ local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+ use server && \
+ optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
+ optfeature_header "Install any additional display manager package:" && \
+ optfeature "proper session support" ${OPTIONAL_DM}
+}
diff --git a/net-misc/trurl/Manifest b/net-misc/trurl/Manifest
index 7b709110ceaf..285f2c40663a 100644
--- a/net-misc/trurl/Manifest
+++ b/net-misc/trurl/Manifest
@@ -1 +1 @@
-DIST trurl-0.16.tar.gz 54414 BLAKE2B ace93c0ec54e81131bed91a78092bb5a2768a92cf2dee763f29327221a2b5ac3f657c7500e1f1cb895a29c1dd73500c15140eaadede72a6ee57a31d7ebe5c414 SHA512 4411769ba36109dc0e0c27ff605b7b6eb9dc9da3ab53290dc0049f44d853f7363699a9e22716dbf4c2d912f5c0c1556ea0d14f55475f44b48ea2e320b00a75e7
+DIST trurl-0.16-tmp.tar.gz 59327 BLAKE2B d349cf57eb4ad048a9d4a15aac0d0f9e6e577f379eb97b21530d2e080d78e1cb333aca7625805e0e6e555f356bad985e0961c43d499d02b9369b505b8c8d2757 SHA512 da4f7afd4a0685037549543ece23ad30d8f98ed9613d9050cbb269524ea4242d097bf74f7642c386d664eb2f24aff910f3cae9c8efda0e6a4f6a2a644a8c82f2
diff --git a/net-misc/trurl/trurl-0.16.ebuild b/net-misc/trurl/trurl-0.16-r1.ebuild
index 0818842536b1..227ea49cde7b 100644
--- a/net-misc/trurl/trurl-0.16.ebuild
+++ b/net-misc/trurl/trurl-0.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,9 +13,10 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/curl/trurl"
inherit git-r3
else
- SRC_URI="https://github.com/curl/trurl/archive/refs/tags/${P}.tar.gz"
- S="${WORKDIR}"/${PN}-${P}
-
+ ## Temporary workaround for trurl-0.16.gz already existing as a different
+ ## file in mirrors.
+ SRC_URI="https://github.com/curl/trurl/releases/download/${P}/${P}.tar.gz -> ${P}-tmp.tar.gz" ##
+ #SRC_URI="https://github.com/curl/trurl/releases/download/${P}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64"
fi
diff --git a/net-misc/trurl/trurl-9999.ebuild b/net-misc/trurl/trurl-9999.ebuild
index 0818842536b1..001952499158 100644
--- a/net-misc/trurl/trurl-9999.ebuild
+++ b/net-misc/trurl/trurl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,9 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://github.com/curl/trurl"
inherit git-r3
else
- SRC_URI="https://github.com/curl/trurl/archive/refs/tags/${P}.tar.gz"
- S="${WORKDIR}"/${PN}-${P}
-
+ SRC_URI="https://github.com/curl/trurl/releases/download/${P}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64"
fi
diff --git a/net-misc/tuba/Manifest b/net-misc/tuba/Manifest
index f4c3c98ab68d..e035134408d1 100644
--- a/net-misc/tuba/Manifest
+++ b/net-misc/tuba/Manifest
@@ -1 +1,2 @@
DIST Tuba-0.8.4.gh.tar.gz 1803987 BLAKE2B 9ec1647bc255a3cef37293fc86f81eed534f4a313e3ec0ab81318766972ed01100b30afcc05448f5344637da08962bb72dc2eb5d44fc0561ce1a61c48b9b8b5d SHA512 8484cdb898174958c1e79ddfd6fab9e74693bca19d1eddde504679d1074cac986580dcf2e2c98fa13ab54fec2a4ffc25b1977bc6e62f1b3a524a6810b2ac268f
+DIST Tuba-0.9.1.gh.tar.gz 2137594 BLAKE2B 1df526b4340896d367243eeee534b923554cf039368e851d82faa178b2d2bb43dc84612f0af209f4ded6e7902c47026dd2305b82159d8d92323810075c7daa43 SHA512 4c80fb98902359f9f8b59665ea580e477885d5de66e1d5640b67766fde49805702eababed4600b13afd6e8a16b5dbdc9b2391b0c8271eebdef70152c1b60f7a4
diff --git a/net-misc/tuba/tuba-0.9.1.ebuild b/net-misc/tuba/tuba-0.9.1.ebuild
new file mode 100644
index 000000000000..09c732985f1f
--- /dev/null
+++ b/net-misc/tuba/tuba-0.9.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson optfeature vala
+
+MY_P=${P^}
+DESCRIPTION="Browse the Fediverse (GTK client)"
+HOMEPAGE="
+ https://tuba.geopjr.dev/
+ https://github.com/GeopJr/Tuba/
+"
+SRC_URI="
+ https://github.com/GeopJr/Tuba/archive/v${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+# TODO: optional dep on libspelling-1
+DEPEND="
+ app-crypt/libsecret[introspection,vala]
+ >=dev-libs/glib-2.76.0:2
+ dev-libs/icu:=
+ >=dev-libs/json-glib-1.4.4[introspection]
+ >=dev-libs/libgee-0.8.5:0.8[introspection]
+ dev-libs/libxml2
+ >=gui-libs/gtk-4.13.4:4[gstreamer,introspection]
+ >=gui-libs/libadwaita-1.6:1[introspection,vala]
+ >=gui-libs/gtksourceview-5.6.0:5[introspection,vala]
+ media-libs/gstreamer[introspection]
+ net-libs/libsoup:3.0[introspection,vala]
+"
+RDEPEND="
+ ${DEPEND}
+"
+BDEPEND="
+ $(vala_depend)
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local emesonargs=(
+ # disable calling updaters (see pkg_post*)
+ -Ddistro=true
+ # not packaged
+ -Dclapper=false
+ )
+
+ vala_setup
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ dosym dev.geopjr.Tuba /usr/bin/tuba
+}
+
+pkg_postinst() {
+ optfeature "WebP image support" gui-libs/gdk-pixbuf-loader-webp
+
+ gnome2_schemas_update
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest
index 5cf3d291486a..e0c9e79c5f09 100644
--- a/net-misc/ubridge/Manifest
+++ b/net-misc/ubridge/Manifest
@@ -1,2 +1 @@
-DIST ubridge-0.9.18.tar.gz 64340 BLAKE2B 7ac540ccf180adc8bf0bb0d440d6a0335626181ba680f7f94cea43d6b6b70745cd64f8ee8048aa1621b7407fea83cf03039147ffe38236e70970c014771ab09b SHA512 f2c9e9d0242f61363a3f4ce6f1acf4013245ff0854a7f64c96d6b8737bd3cc505a38aaf43a0928e2a5a88bcd39f786e00fab68748ad56770d18d713005750c60
DIST ubridge-0.9.19.tar.gz 66911 BLAKE2B c9de0485b84fa7cb78edb6651f0022c6e3f3d6e62aa2e1c56927c62d540ae1efaee25225bc7eb843ad688b7bd0aa39eb8a2ff1015a5c01f2d23d5a798b21ff14 SHA512 b693a64569ba17fcb40f8a7894fcc205efba17fc3103150bb6f1d7a8a165505c88251e75f56d003f4c4337e97bffa57b5948156e42d01a2938b8d969a088ff32
diff --git a/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch b/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch
deleted file mode 100644
index 4d4825f477aa..000000000000
--- a/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur a/Makefile b/Makefile
---- a/Makefile 2019-05-20 10:02:14.000000000 +0300
-+++ b/Makefile 2019-05-20 10:32:04.972039000 +0300
-@@ -67,7 +67,7 @@
-
- ifeq ($(SYSTEM_INIPARSER),1)
- CFLAGS += -DUSE_SYSTEM_INIPARSER
-- LIBS += -liniparser
-+ LIBS += -liniparser4
- else
- SRC += src/iniparser/iniparser.c \
- src/iniparser/dictionary.c
-diff -ur a/src/parse.h b/src/parse.h
---- a/src/parse.h 2019-05-20 10:02:14.000000000 +0300
-+++ b/src/parse.h 2019-05-20 10:32:04.968039000 +0300
-@@ -24,7 +24,7 @@
- #include "ubridge.h"
-
- #ifdef USE_SYSTEM_INIPARSER
--#include <iniparser.h>
-+#include <iniparser4/iniparser.h>
- #else
- #include "iniparser/iniparser.h"
- #endif
-diff -ur a/src/ubridge.c b/src/ubridge.c
---- a/src/ubridge.c 2019-05-20 10:02:14.000000000 +0300
-+++ b/src/ubridge.c 2019-05-20 10:32:04.968039000 +0300
-@@ -26,7 +26,7 @@
- #include <pthread.h>
-
- #ifdef USE_SYSTEM_INIPARSER
--#include <iniparser.h>
-+#include <iniparser4/iniparser.h>
- #else
- #include "iniparser/iniparser.h"
- #endif
diff --git a/net-misc/ubridge/ubridge-0.9.18.ebuild b/net-misc/ubridge/ubridge-0.9.18.ebuild
deleted file mode 100644
index adfeeba6492c..000000000000
--- a/net-misc/ubridge/ubridge-0.9.18.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps toolchain-funcs
-
-DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
-HOMEPAGE="https://github.com/GNS3/ubridge"
-SRC_URI="https://github.com/GNS3/ubridge/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3+"
-
-RDEPEND="
- acct-group/ubridge
- dev-libs/iniparser:4=
- net-libs/libpcap"
-
-DEPEND="${RDEPEND}"
-
-# Bugs: https://bugs.gentoo.org/647588
-# https://github.com/GNS3/ubridge/issues/60
-PATCHES=( "${FILESDIR}/${PN}-0.9.16_add_slotted_iniparser-4.1+_support.patch" )
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- SYSTEM_INIPARSER=1
-}
-
-src_install() {
- exeinto /usr/bin
- exeopts -m 710 -g ubridge
- doexe ubridge
-
- dodoc README.rst
-}
-
-pkg_postinst() {
- fcaps -g ubridge -m 4710 -M 0710 cap_net_raw,cap_net_admin \
- "${EROOT}"/usr/bin/ubridge
-
- einfo "\nNOTE: To read packets from the network interfaces with ubridge as"
- einfo "normal user you have to add trusted users to the \"ubridge\" group.\n"
-}
diff --git a/net-misc/ubridge/ubridge-0.9.19.ebuild b/net-misc/ubridge/ubridge-0.9.19-r1.ebuild
index 5c359bef8f37..f2b58fb26ca2 100644
--- a/net-misc/ubridge/ubridge-0.9.19.ebuild
+++ b/net-misc/ubridge/ubridge-0.9.19-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit fcaps toolchain-funcs
+inherit fcaps flag-o-matic toolchain-funcs
DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
HOMEPAGE="https://github.com/GNS3/ubridge"
@@ -15,16 +15,16 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
acct-group/ubridge
- dev-libs/iniparser:4=
+ >=dev-libs/iniparser-4.1-r2:=
net-libs/libpcap"
DEPEND="${RDEPEND}"
-# Bugs: https://bugs.gentoo.org/647588
-# https://github.com/GNS3/ubridge/issues/60
-PATCHES=( "${FILESDIR}/${PN}-0.9.16_add_slotted_iniparser-4.1+_support.patch" )
-
src_compile() {
+ # iniparser.pc only exists in >=4.2 and it changes headers location
+ has_version '>=dev-libs/iniparser-4.2' &&
+ append-cflags $($(tc-getPKG_CONFIG) --cflags iniparser || die)
+
emake \
CC="$(tc-getCC)" \
SYSTEM_INIPARSER=1
diff --git a/net-misc/websocat/Manifest b/net-misc/websocat/Manifest
index 4e05ed20d233..e9cf56fef6a6 100644
--- a/net-misc/websocat/Manifest
+++ b/net-misc/websocat/Manifest
@@ -1,4 +1,4 @@
-DIST websocat-1.12.0-crates.tar.xz 24777476 BLAKE2B 39d3162438d4941db1de46f0a904ea0d7557c5da377679c1310215e5d6a05f062b601512f56acc9161fc6cdd306c9e41d16bd7c7db14c9da2c73fcc6fb0fd377 SHA512 c3e471b92ef7a2cd30e8627c53436c8e49ef061c7e939be1583c5fc66718580798328f9d453676e79807284309873f5c82dcc6d8b3f263f71596c57de38cb9a2
-DIST websocat-1.12.0.tar.gz 165961 BLAKE2B e83675c1bd421add00a3a2409b51e98edacb52c018b3f617cc78808e14d8a2af0a7ce9d6db1a6ebc740a6c620213e70fb3dda91c2f8a9bcd9e93d05c8043b313 SHA512 043e175d557fee92d381ed1f1aa510056e1d59d0bd25c8f1cc9bf78c3ef59e9e76c5ac283f6bf4e8c9563365cd57deaf5e6f3b0040e6d680a9e8dc80ad931610
DIST websocat-1.13.0-crates.tar.xz 26849464 BLAKE2B d7be9a8db3c1774d7ed607d5ec5cdf6435fa9f2ac4dca7c23d7dc5c858f0301b103794707fec036318ef1287faa9ecdc795385439a71d7bbce28f2e746841ddd SHA512 2fc155c69c0c115e8c8298e9756bb92b905982b5212bd51ce82032babf145cef79451ca981c2378caf1b54980ef12b491c6d324bc6915bca63cfd23ef9fa1152
DIST websocat-1.13.0.tar.gz 175990 BLAKE2B 287e869538246d9d5c62080aeb1627b0e8155585553800c0d639e2a8bebf9b4d65e3df35ff424c48076cdccbe79b54a15119793ae22cf68d1ce1774c0e795236 SHA512 119cb6d0c226ed4f1df86a42a26903ba8465db30e5d0908d4a28601a58636e9a906fbb44d2d811ec9b25103a8c48b4ccea8b31f2f61854d062bc436ac6afac78
+DIST websocat-1.14.0-crates.tar.xz 19274384 BLAKE2B 6da1d79f8820c5830c7d4ad5ef31523412f74241d087d707c2795cf1e42cf8b9011e81f4f6de04588e8f63042ee14ed0c01f554ebef1568ce3278430eb7215dc SHA512 f2ff7181225eb6c789f36dc0b7074d843e5b2b2c4f2682887846b68aff20865b917705d1ec4a3f04ae6711a1f0ca639be824b5adc4cd8aca5467fbe9dc69846f
+DIST websocat-1.14.0.tar.gz 159157 BLAKE2B 166b1205a4af1fc8cfc4fb2b2075b3fcea852a13e8a7bcd7a04a602f4bcbbde660d61841bbc84188891461a81974346721e5f64cbf33c055e9d7e0544c00ab84 SHA512 e9b583545408387bba90a92034a7a03038990f9b1ed2e68dd0414388c00542ec3f1190f09242b66cb73f336e723013a57a4e0d7bad8c691aa4af305d561ddadd
diff --git a/net-misc/websocat/websocat-1.12.0-r1.ebuild b/net-misc/websocat/websocat-1.14.0.ebuild
index 95fa03089c59..39df4258640f 100644
--- a/net-misc/websocat/websocat-1.12.0-r1.ebuild
+++ b/net-misc/websocat/websocat-1.14.0.ebuild
@@ -1,38 +1,29 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
CRATES=""
-
inherit cargo
DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions"
HOMEPAGE="https://github.com/vi/websocat"
-SRC_URI="
- https://github.com/vi/websocat/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~arthurzam/distfiles/net-misc/${PN}/${P}-crates.tar.xz
- ${CARGO_CRATE_URIS}"
+SRC_URI="https://github.com/vi/websocat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/net-misc/${PN}/${P}-crates.tar.xz"
LICENSE="MIT"
# Dependent crate licenses
-LICENSE+="
- Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
- Unicode-DFS-2016
-"
+LICENSE+=" Apache-2.0 BSD-2 BSD ISC MIT Unicode-DFS-2016"
SLOT="0"
KEYWORDS="~amd64"
IUSE="ssl"
RESTRICT+=" test"
RDEPEND="
- ssl? (
- dev-libs/openssl:0=
- )
-"
-DEPEND="
- ${RDEPEND}
+ ssl? ( dev-libs/openssl:0= )
"
+DEPEND="${RDEPEND}"
+
QA_FLAGS_IGNORED="/usr/bin/websocat"
src_configure() {
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 79e5b123b893..a04385815566 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,2 +1 @@
-DIST x2goclient-4.1.2.2.tar.gz 2576404 BLAKE2B 2a29f73516282af119cc4ea0a511c29156cdb71564adcdbf307f60298b87c2a7eee0ca121a3e165a63c110130c2704b49b90b3b9abc6a39b6105b1f22ac5afd0 SHA512 85e6db6a34629512be64376883c205d8bf0696c4697cf216970b57a91ffe68dcf7f38bfda0d396c104602f6991b596c5fb0934e75fa4a93f7d0e41c2b3f5ac4d
DIST x2goclient-4.1.2.3.tar.gz 2582072 BLAKE2B ee167d7f8b293220ce5d9a315dc11997ba9cf8bc5c9840155888ddbf816d18a39553659ccd363619f6198d1e7ebadc9932327082ddfc2bb83970df61ada86778 SHA512 1bd59efaaf560bf36dad979cbb67cf90df13943688e1259e86d441ba17677d523ad1f69061d2f65b0ca8eee9e7d00ee242e95c555b4446d72f37acef70a9b435
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.2-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.2-r1.ebuild
deleted file mode 100644
index 4c7734b4d5fb..000000000000
--- a/net-misc/x2goclient/x2goclient-4.1.2.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg
-
-DESCRIPTION="The X2Go Qt client"
-HOMEPAGE="https://wiki.x2go.org/doku.php"
-SRC_URI="https://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ldap"
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- >=net-libs/libssh-0.7.5-r2
- net-print/cups
- x11-libs/libXpm
- ldap? ( net-nds/openldap:= )"
-RDEPEND="${DEPEND}
- net-misc/nx"
-BDEPEND="dev-qt/linguist-tools:5"
-
-CLIENT_BUILD="${WORKDIR}"/${P}.client_build
-PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
-
-src_prepare() {
- default
-
- if ! use ldap; then
- sed -e "s/-lldap//" -i x2goclient.pro || die
- sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
- fi
-}
-
-src_configure() {
- eqmake5 "${S}"/x2goclient.pro
-}
-
-src_install() {
- dobin ${PN}
-
- local size
- for size in 16 32 48 64 128 ; do
- doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
- done
- newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
-
- insinto /usr/share/pixmaps
- doins res/img/icons/${PN}.xpm
-
- domenu desktop/${PN}.desktop
- doman man/man?/*
-}
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index c4fa6a87ee08..d64f5c432099 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,2 +1,2 @@
-DIST yt-dlp-2024.12.13.tar.gz 5813833 BLAKE2B ead14c4922e74e75dcdabe63ed5bb4a91e7d30a3b475acad63c03320a5958190118a886c88a7f5424ed6b7cbb9115c2368b41737b1ad99165f925c3f6a38275b SHA512 369cb303a4bf14b8e872ea3315478c943bc13741eaa4ee1d219df0d5e89d1c46992577acb8530c592e4278da1af7969a25417972c2ca55d84ee0f8e7e25c31b4
-DIST yt-dlp-2024.12.23.tar.gz 5817118 BLAKE2B 99df0c13661d5768bb38545d59ba982365ca62a26c90f7217793b9a386ad932164e4e166c20cb05449cf56950324a56ee3aea56a2fb1fa5258dc8e0872e2e784 SHA512 8b068ebb88fc7339f685dfe999a1814f43098c16bd89033154f872e53e6743090c210ac5cb5cdd783ebd947ac33ecb749b08bbec9c7d7dc41da3424968666ee8
+DIST yt-dlp-2025.01.15.tar.gz 5819696 BLAKE2B f846d9bc7dec85667dc6ded40b9307731889fe1736920a40367de8f3ec3b1127f630d437792654baf21a2d83a3cd59757341cb6fbfe95f4b614e650d061c231d SHA512 20786cb0d16e58dc9fb2b2e35852b496862d79dfa42ebf92e430161c89863fc1d6247a2c1f9220e8555b20ea60ffbabb3e0d81521df98e47677f56ad1f4a68a1
+DIST yt-dlp-2025.01.26.tar.gz 5827713 BLAKE2B 4c305ef5832334b4e21f6f65661392226cfa3c73627153db613f60ef9e8de10b1b795c1d12f81ffd5be435302c8622e0a6bf1a17297db3b3d7b7da957c524723 SHA512 dd3d29f46d897a5595248cb27a9e99447f2638afa449716a96b6712c6cfb53180201e9a6927c09a69eb6d704b8a47d9171c9fb13a674c87b79da0d473bc8bf50
diff --git a/net-misc/yt-dlp/yt-dlp-2024.12.23.ebuild b/net-misc/yt-dlp/yt-dlp-2025.01.15.ebuild
index 3de67e0bfb4a..213369c3ecb0 100644
--- a/net-misc/yt-dlp/yt-dlp-2024.12.23.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2025.01.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-misc/yt-dlp/yt-dlp-2024.12.13.ebuild b/net-misc/yt-dlp/yt-dlp-2025.01.26.ebuild
index 3de67e0bfb4a..213369c3ecb0 100644
--- a/net-misc/yt-dlp/yt-dlp-2024.12.13.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2025.01.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8