diff options
Diffstat (limited to 'net-misc')
135 files changed, 3238 insertions, 1923 deletions
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest index 34f8759cd4ba..6170429acef8 100644 --- a/net-misc/anydesk/Manifest +++ b/net-misc/anydesk/Manifest @@ -1,2 +1,2 @@ -DIST anydesk-6.3.2-amd64.tar.gz 7039607 BLAKE2B dfc628baef862bddb944b02d39c3e270a0ac4dbe88704099f8b9022e7e758a367093432b78e86bcc1d9432fabe1c2842c4e811e59541433cb75a9734e09cff08 SHA512 a0fac07d6beb085666f4414f592b5b26b0f699ebc0b1ad5a587317a0c46b0f92a8d3b3e2e0ab08ce9e6c4c1c15789f8396158cc87075e623e32ce714ad071612 DIST anydesk-6.3.3-amd64.tar.gz 7048124 BLAKE2B 6b97a60709337e01e70f11cfe4a82d71465961de99bc075c900d0f656427502fa6543c68b9dcd30cb4a3091ba0bd10b3b1bea0ea0e7792ef51a76b376d1ffe29 SHA512 4819ee1a7420fed503c743601a8e4e5000150e176b1d695e34c8ffb5da2475ca2ccd6f5024c9d011661e7e0f133a592bcfc19a2e32ba2ffd9a92f701b0eb929f +DIST anydesk-6.4.0-amd64.tar.gz 8391102 BLAKE2B e0e18b0315d1472bd4479b48052f4617f29d4d8efb9bd61d8e6dac0368302369868703ffaad999c34b648157500e3ce441ea99d7bf54649b8c26d54cb193bbc2 SHA512 15daac65fd26af3abb8916cc545d9b58715cb807ad550908537af32cf152faa2d61d2005cf46de376b64117be93e3562a820eebb1d8f16f9a8f5dd0d21144b6b diff --git a/net-misc/anydesk/anydesk-6.3.2.ebuild b/net-misc/anydesk/anydesk-6.4.0.ebuild index 8da50cec7b3c..bff859751dd7 100644 --- a/net-misc/anydesk/anydesk-6.3.2.ebuild +++ b/net-misc/anydesk/anydesk-6.4.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" @@ -7,27 +7,24 @@ inherit desktop optfeature systemd xdg-utils DESCRIPTION="Feature rich multi-platform remote desktop application" HOMEPAGE="https://anydesk.com" -SRC_URI="https://download.anydesk.com/linux/${P}-amd64.tar.gz - https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz" +SRC_URI="https://download.anydesk.com/linux/${P}-amd64.tar.gz" # OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB" SLOT="0" KEYWORDS="-* ~amd64" -# x11-libs/gtkglext is required and cannot be mitigated: https://bugs.gentoo.org/868255 RDEPEND=" app-accessibility/at-spi2-core:2 dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freetype:2 - media-libs/glu - media-libs/libglvnd + media-libs/harfbuzz + sys-apps/dbus sys-auth/polkit x11-libs/cairo x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/gtkglext + x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libXdamage diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index ca133e55e628..93505071dcbd 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -1,7 +1,8 @@ DIST asterisk-18.25.0.tar.gz 28546882 BLAKE2B 5cef5db83063387f4786d94be442164a8fb2b9ec3292af453dadd8ed094622142762bfdfadd8d0ba14fe8734a7f822c559ed47ea4e017c2cba4e970dc4a80528 SHA512 8646f65cac366a674674558d4ca59166956bdc5258c16454aaeff28e445b256fe16c144d6e1dedcd401c7577bff1aac69aae735557ea0082c93ff5322f978f56 -DIST asterisk-18.26.0.tar.gz 28564898 BLAKE2B 4298a65af3b1dd286014e7d6e5121403fb2f50e1903fa4a3f8013bd1df4f2e33779ce3f13bd63f083bff0d2dbb873f234d1989b20a7b143f61f914fc81c3d57a SHA512 6f62440e43795a1650c542857059afc1006edd4c5b0247d3e3c2529489195eae01a22826ed291172c738f12fab70e59e6072fa18d6e1d824fe0b92b51b0f7e63 -DIST asterisk-20.10.0.tar.gz 28309321 BLAKE2B 4efcf72c378b31a722643c6b92863354d8e07f2d700a5fccfec14f842cf912c626181e8f73482858a7bd0c74802ed3fd359ee046aeec4af21a92e6c23d05a741 SHA512 b05a65423f6a203f3fca712fc8ee2c008deabfdaf05f1cd56b8bd0ffc1d1805c4dea58e4267d224f47777fbc1bcdc8aabe71cbe1e86e6e98fa597f08ac087cce -DIST asterisk-20.11.0.tar.gz 28333128 BLAKE2B e6762ca5bf8c36b1778c34b2ef341e02508401623e11f3c21fcd16d3f302d22c84bef76c720e1d728d37718a24840c7236b09e5f8bf326e11798cbd8005771db SHA512 0138ad7692c53dd9605331c0fb77905e8c62e91a6763a0ae2cea8d55d7e3854b9209c3962ec365a313d40f9b3abd417a37680a0ed7cc259b30cf2417b417f12b -DIST asterisk-21.6.0.tar.gz 26385465 BLAKE2B e5dd588d9aa2ce6aaee11761db6a962d6c5a1fdba15e73b7b0f7591d07ce0d958ea483165c9a528d98f0a0975ad2ef13188d34f882ad6b46e29568d4a16a4195 SHA512 7c5a309f540a4bbbd1d0bcde274fa6c4cd26e55bdfa3b99719f6d1e516597a43c2bed3d8fd1779746078f68e99da41946dd11447f2d8d6c982fa0df3c7b3783a -DIST asterisk-22.0.0.tar.gz 26196468 BLAKE2B 1bb1253157c906a9680b1a7264ae634a23e6232101e5c6daf065b7a541844862ae811965ea58f706f599c06c65777660611ccee71dd821bf662471b617662965 SHA512 fa2c530a81f7351369229b2a36ac229a75d7a1ce8c3cdae0340be331979246ecee1e4f90c31fb6bc645cc2066280d40e2385027aedc6bd2c205426b2164e1fc5 -DIST asterisk-22.1.0.tar.gz 26220194 BLAKE2B df7fa0acaa564e052d0d6bf0277b76787085ebe7886d40dd9287e3ac91731106b45c48dc630731d50d4a2af3e250831e74e9a7f1676d0d4f0325b2aa6f262e9a SHA512 d54fe119cfa591f13e7f77bd50ee59b9a7065ff24c011311aafc7ae5247acbae808cbbc35e1e92b208c331c6fbdacf3f6cc6f6981592400ee85cbe70b9e8ac58 +DIST asterisk-18.26.1.tar.gz 28565082 BLAKE2B 6136b24494b24930e3d10dc49b689533eca330b906e59be02a31202ae4e3534e75d0e29ed29016330c68802fcea0ff0487c874ac4e5553073bdc091557393e17 SHA512 798d849d2518094ec9d11f351baba045c5a9ed39267dd3c62010103a8907a2fa0c35ab1edd234a12df575f716c1fdf5d23ee2ee86028863283160ff608f5db66 +DIST asterisk-20.11.1.tar.gz 28332999 BLAKE2B 9f12f915cfdb7ef763301bf9b1e521ec976ec92afd7b9ccc34516062ea7a3b1b1350d610e83d16dbb248beb3273919d08738308ba284f947df127baa182b4680 SHA512 55d5074ef687b236ef05a50e9b8364b638c566c648b95cc57268f1c8b82bfa674ee0258fed13b9339303201f73c08145624dd2f5d77e65927b05d1e271d75f4f +DIST asterisk-20.12.0.tar.gz 28395184 BLAKE2B 689d69c877cefce6d12f036e67c32b8c4a0740c8bc14f33c4b4f64bdd5b1d8ac2545d3c63e9251a56d0ccc4f991bdb352d7171812ce33673e493080aeeb58b2e SHA512 8dcda2980e0bef7fdde4b18d5f805bf5a2871687c790b4e2bca120b432dfbf43ccbfe61949c6042417e1895fed5a40f0db9c5de0f871a2c3be35882f8009f98c +DIST asterisk-21.6.1.tar.gz 26386191 BLAKE2B 49c920570504db0334b5a6645d1799a70f9a18d38a60d5ad6088605d5be2f66df35eff4980ca2261a53af761a0ae235e39c910b5d8a2d43aaf881ae7d6778f26 SHA512 ff548f7f5d1732e15c8af335aeb84e1dd18da8d47cf88df2a9e5873de7c0e4e8085e5db2f7224fa0d03ce1e1cb6bb2e6753194ce060dbc475682e4f86d4b95c2 +DIST asterisk-21.7.0.tar.gz 26447766 BLAKE2B a56577d1538f746f4e6ff9eb08cc55a4451bc4a49b8c56fc6495e47b4f059b9cac672d7847381f07ff6d14f3e6ebd81bcc1e3221aeb8a173f065edf6a5ddbac3 SHA512 2f9d52daeff51a309995379f3c89473e8318980ddecacc5c0dbb90be7219727fabe46ba1fdcea245b101f8ee8c6115e9f49b8de83921e589eb6d620168868001 +DIST asterisk-22.1.1.tar.gz 26220027 BLAKE2B 1c28266295de0f8846c57f3a4e3b27dbc9070cf3a28e4990d427e5c9696772032e0bedc7d93bc5283aa4a7cbba158e290b582e0b82eb0585f6ca874c27af4bc4 SHA512 3cc2ed6061d781f21bfc9b5ba203de809069b99023c963be43c55260241dc59ae1478732fea4f09fc74539b4473a579327518565c277b35da4b89cebaa3633b7 +DIST asterisk-22.2.0.tar.gz 26281301 BLAKE2B f19ad6edf2af7d7deb7fffa7f1cc43169885aa16579dece035a1ada9cd81c93caab8623ea5d9fde3e2def3e6a1a5711251b8200ae4eae6fe6c42dba5da2af765 SHA512 01d3f144a0f2ed1415bd081aba97ab9bd7800ee635232cb6064d6a0db18c9055487272e28f3d54dd5b66b3b12a5de62ebb604e74e44e9f94be2d2f0c93628dd0 diff --git a/net-misc/asterisk/asterisk-18.25.0.ebuild b/net-misc/asterisk/asterisk-18.25.0.ebuild deleted file mode 100644 index f68bc6f85b5e..000000000000 --- a/net-misc/asterisk/asterisk-18.25.0.ebuild +++ /dev/null @@ -1,371 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..4} ) - -inherit autotools linux-info lua-single toolchain-funcs - -DESCRIPTION="Asterisk: A Modular Open Source PBX System" -HOMEPAGE="https://www.asterisk.org/" -SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0/${PV%%.*}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -IUSE_VOICEMAIL_STORAGE=( - voicemail_storage_odbc - voicemail_storage_imap -) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" -IUSE_EXPAND="VOICEMAIL_STORAGE" -REQUIRED_USE="gtalk? ( xmpp ) - lua? ( ${LUA_REQUIRED_USE} ) - voicemail_storage_odbc? ( odbc ) -" - -PATCHES=( - "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" -) - -DEPEND="acct-user/asterisk - acct-group/asterisk - dev-db/sqlite:3 - dev-libs/popt - >=dev-libs/jansson-2.11:= - dev-libs/libedit - dev-libs/libxml2:2 - dev-libs/libxslt - sys-apps/util-linux - sys-libs/zlib - virtual/libcrypt:= - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - calendar? ( - net-libs/neon:= - dev-libs/libical:= - dev-libs/iksemel - ) - caps? ( sys-libs/libcap ) - blocks? ( sys-libs/blocksruntime ) - cluster? ( sys-cluster/corosync ) - codec2? ( media-libs/codec2:= ) - curl? ( net-misc/curl ) - freetds? ( dev-db/freetds ) - gtalk? ( dev-libs/iksemel ) - http? ( dev-libs/gmime:2.6 ) - iconv? ( virtual/libiconv ) - ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap:= ) - lua? ( ${LUA_DEPS} ) - mysql? ( dev-db/mysql-connector-c:= ) - newt? ( dev-libs/newt ) - odbc? ( dev-db/unixODBC ) - pjproject? ( >=net-libs/pjproject-2.12:= ) - portaudio? ( media-libs/portaudio ) - postgres? ( dev-db/postgresql:* ) - radius? ( net-dialup/freeradius-client ) - snmp? ( net-analyzer/net-snmp:= ) - span? ( media-libs/spandsp ) - speex? ( - media-libs/libogg - media-libs/speex - media-libs/speexdsp - ) - srtp? ( net-libs/libsrtp:0 ) - ssl? ( - dev-libs/openssl:0= - ) - systemd? ( sys-apps/systemd ) - !systemd? ( !sys-apps/systemd ) - unbound? ( net-dns/unbound ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - voicemail_storage_imap? ( net-libs/c-client[ssl=] ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${DEPEND} - net-misc/asterisk-core-sounds - net-misc/asterisk-extra-sounds - net-misc/asterisk-moh-opsound - selinux? ( sec-policy/selinux-asterisk ) - syslog? ( virtual/logger )" -PDEPEND="net-misc/asterisk-base" - -BDEPEND="dev-libs/libxml2:2 - virtual/pkgconfig" - -QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" - -ast_make() { - local make_args=( - "NOISY_BUILD=yes" - "ASTDBDIR=\$(ASTDATADIR)/astdb" - "ASTVARRUNDIR=/run/asterisk" - "ASTCACHEDIR=/var/cache/asterisk" - "OPTIMIZE=" - "DEBUG=" - "CONFIG_SRC=configs/samples" - "CONFIG_EXTEN=.sample" - "AST_FORTIFY_SOURCE=" - ) - - emake "${make_args[@]}" "$@" -} - -pkg_pretend() { - CONFIG_CHECK="~!NF_CONNTRACK_SIP" - local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users - have reported that this module dropped critical SIP packets in their deployments. You - may want to disable it if you see such problems." - check_extra_config - - [[ "${MERGE_TYPE}" == binary ]] && return - - if tc-is-clang; then - use blocks || die "CC=clang requires USE=blocks" - else - use blocks && die "USE=blocks can only be used with CC=clang" - fi -} - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \ - AC_CONFIG_SUBDIRS=menuselect eautoreconf -} - -src_configure() { - local vmst - local copt cstate - local myconf=( - LUA_VERSION="${ELUA#lua}" - --localstatedir="/var" - --with-crypto - --with-gsm=internal - --with-popt - --with-z - --with-libedit - --without-jansson-bundled - --without-pjproject-bundled - $(use_with caps cap) - $(use_with codec2) - $(use_with lua lua) - $(use_with http gmime) - $(use_with newt) - $(use_with pjproject) - $(use_with portaudio) - $(use_with ssl) - $(use_with unbound) - ) - econf "${myconf[@]}" - - ast_menuselect() { - menuselect/menuselect "$@" menuselect.makeopts || die "menuselect $* failed." - } - - _use_select() { - local state=$(use "$1" && echo enable || echo disable) - local x - shift # remove use from parameters - - for x; do - ast_menuselect --${state} "$x" - done - } - - # Blank out sounds/sounds.xml file to prevent - # asterisk from installing sounds files (we pull them in via - # asterisk-{core,extra}-sounds and asterisk-moh-opsound. - >sounds/sounds.xml || die "Unable to blank out sounds/sounds.xml" - - # That NATIVE_ARCH chatter really is quite bothersome - sed -i 's/NATIVE_ARCH=/&0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" - - # Compile menuselect binary for optional components - ast_make menuselect.makeopts - - # Disable astdb2* tools. We've been on sqlite long enough - # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) - ast_menuselect --disable astdb2sqlite3 - ast_menuselect --disable astdb2bdb - - # Disable BUILD_NATIVE (bug #667498) - ast_menuselect --disable build_native - - # Broken functionality is forcibly disabled (bug #360143) - ast_menuselect --disable chan_misdn - ast_menuselect --disable chan_ooh323 - - # Utility set is forcibly enabled (bug #358001) - ast_menuselect --enable smsq - ast_menuselect --enable streamplayer - ast_menuselect --enable aelparse - ast_menuselect --enable astman - - # this is connected, otherwise it would not find - # ast_pktccops_gate_alloc symbol - ast_menuselect --enable chan_mgcp - ast_menuselect --enable res_pktccops - - # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available - ast_menuselect --enable pbx_dundi - ast_menuselect --enable func_aes - ast_menuselect --enable chan_iax2 - - # SQlite3 is now the main database backend, enable related features - ast_menuselect --enable cdr_sqlite3_custom - ast_menuselect --enable cel_sqlite3_custom - - # Disable conversion tools (which fails to compile in some cases). - ast_menuselect --disable astdb2bdb - - # The others are based on USE-flag settings - _use_select alsa chan_alsa - _use_select bluetooth chan_mobile - _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} - _use_select cluster res_corosync - _use_select codec2 codec_codec2 - _use_select curl func_curl res_config_curl res_curl - _use_select deprecated app_macro - _use_select freetds {cdr,cel}_tds - _use_select gtalk chan_motif - _use_select http res_http_post - _use_select iconv func_iconv - _use_select ilbc codec_ilbc format_ilbc - _use_select ldap res_config_ldap - _use_select lua pbx_lua - _use_select mysql app_mysql cdr_mysql res_config_mysql - _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - _use_select oss chan_oss - _use_select postgres {cdr,cel}_pgsql res_config_pgsql - _use_select radius {cdr,cel}_radius - _use_select snmp res_snmp - _use_select span res_fax_spandsp - _use_select speex {codec,func}_speex - _use_select speex format_ogg_speex - _use_select srtp res_srtp - _use_select statsd res_statsd res_{endpoint,chan}_stats - _use_select syslog cdr_syslog - _use_select vorbis format_ogg_vorbis - _use_select xmpp res_xmpp - - # Voicemail storage ... - ast_menuselect --enable app_voicemail - for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do - if use "${vmst#+}"; then - ast_menuselect --enable "app_voicemail_${vmst##*_}" - fi - done - - if use debug; then - for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do - ast_menuselect --enable "${o}" - done - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do - cstate=--enable - [[ "${copt}" == -* ]] && cstate=--disable - ebegin "Custom option ${copt#[-+]} ${cstate:2}d" - ast_menuselect ${cstate} "${copt#[-+]}" - eend $? - done - fi -} - -src_compile() { - ast_make -} - -src_install() { - local d - - dodir "/usr/$(get_libdir)/pkgconfig" - - diropts -m 0750 -o root -g asterisk - dodir /etc/asterisk - - ast_make install install-headers install-configs "DESTDIR=${D}" - - fowners asterisk: /var/lib/asterisk/astdb - - if use radius; then - insinto /etc/radiusclient/ - doins contrib/dictionary.digium - fi - - # keep directories - diropts -m 0750 -o asterisk -g root - keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} - diropts -m 0750 -o asterisk -g asterisk - keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - - # Reset diropts else dodoc uses it for doc installations. - diropts -m0755 - - # install the upgrade documentation - dodoc README* BUGS CREDITS - - # install extra documentation - use doc && dodoc doc/*.{txt,pdf} - - # Asterisk installs a few folders that's empty by design, - # but still required. This finds them, and marks them for - # portage. - while read d <&3; do - keepdir "${d#${ED}}" - done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" - else - local my_replacing=() x - for x in ${REPLACING_VERSIONS}; do - [[ $(ver_cut 1 ${x}) != $(ver_cut 1) ]] && - my_replacing+=( $(ver_cut 1 ${x}) ) - done - if [[ "${#my_replacing}" -gt 0 ]]; then - my_replacing="${my_replacing[*]}" - my_replacing="${my_replacing// /, }" - [[ "${my_replacing}" = *", "* ]] && - my_replacing="${my_replacing%, *} or ${my_replacing##*, }" - elog "You are updating from Asterisk ${my_replacing}, you should reference the upgrade document:" - elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" - elog "Assistance also available on Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" - fi - fi - - if use deprecated; then - ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." - ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" - ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" - fi - - if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then - ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" - ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" - ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" - ewarn "steps to migrate:" - ewarn "1. /etc/init.d/asterisk stop" - ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" - ewarn "3. /etc/init.d/asterisk start" - ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." - fi -} diff --git a/net-misc/asterisk/asterisk-18.26.0.ebuild b/net-misc/asterisk/asterisk-18.26.1.ebuild index 89eea860eb11..f7ce14b7ffd2 100644 --- a/net-misc/asterisk/asterisk-18.26.0.ebuild +++ b/net-misc/asterisk/asterisk-18.26.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/asterisk/asterisk-20.11.0.ebuild b/net-misc/asterisk/asterisk-20.11.1.ebuild index fcfbb84357a7..c31c1a288417 100644 --- a/net-misc/asterisk/asterisk-20.11.0.ebuild +++ b/net-misc/asterisk/asterisk-20.11.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/asterisk/asterisk-20.10.0-r1.ebuild b/net-misc/asterisk/asterisk-20.12.0.ebuild index fcfbb84357a7..c31c1a288417 100644 --- a/net-misc/asterisk/asterisk-20.10.0-r1.ebuild +++ b/net-misc/asterisk/asterisk-20.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 diff --git a/net-misc/asterisk/asterisk-22.1.0.ebuild b/net-misc/asterisk/asterisk-21.6.1.ebuild index 1812ee48dec1..03bea0177c90 100644 --- a/net-misc/asterisk/asterisk-22.1.0.ebuild +++ b/net-misc/asterisk/asterisk-21.6.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/asterisk/asterisk-21.6.0.ebuild b/net-misc/asterisk/asterisk-21.7.0.ebuild index 1812ee48dec1..03bea0177c90 100644 --- a/net-misc/asterisk/asterisk-21.6.0.ebuild +++ b/net-misc/asterisk/asterisk-21.7.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 diff --git a/net-misc/asterisk/asterisk-22.0.0-r1.ebuild b/net-misc/asterisk/asterisk-22.1.1.ebuild index 1812ee48dec1..03bea0177c90 100644 --- a/net-misc/asterisk/asterisk-22.0.0-r1.ebuild +++ b/net-misc/asterisk/asterisk-22.1.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/asterisk/asterisk-22.2.0.ebuild b/net-misc/asterisk/asterisk-22.2.0.ebuild new file mode 100644 index 000000000000..03bea0177c90 --- /dev/null +++ b/net-misc/asterisk/asterisk-22.2.0.ebuild @@ -0,0 +1,358 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} blocks bluetooth calendar +caps cluster codec2 curl debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:= ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_CONFIG_IMPL_DECL_SKIP=( + htonll + ntohll +) +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +ast_make() { + local make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" + ) + + emake "${make_args[@]}" "$@" +} + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + local myconf=( + LUA_VERSION="${ELUA#lua}" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + ) + + econf "${myconf[@]}" + + ast_menuselect() { + menuselect/menuselect "$@" menuselect.makeopts || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + local x + shift # remove use from parameters + + for x; do + ast_menuselect --${state} "$x" + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >sounds/sounds.xml || die "Unable to blank out sounds/sounds.xml" + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/&0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + ast_make menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + ast_menuselect --disable astdb2sqlite3 + ast_menuselect --disable astdb2bdb + + # Disable BUILD_NATIVE (bug #667498) + ast_menuselect --disable build_native + + # Broken functionality is forcibly disabled (bug #360143) + ast_menuselect --disable chan_ooh323 + + # Utility set is forcibly enabled (bug #358001) + ast_menuselect --enable smsq + ast_menuselect --enable streamplayer + ast_menuselect --enable aelparse + ast_menuselect --enable astman + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + ast_menuselect --enable pbx_dundi + ast_menuselect --enable func_aes + ast_menuselect --enable chan_iax2 + + # SQlite3 is now the main database backend, enable related features + ast_menuselect --enable cdr_sqlite3_custom + ast_menuselect --enable cel_sqlite3_custom + + # Disable conversion tools (which fails to compile in some cases). + ast_menuselect --disable astdb2bdb + + # The others are based on USE-flag settings + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + ast_menuselect --enable app_voicemail + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + ast_menuselect --enable "app_voicemail_${vmst##*_}" + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + ast_menuselect --enable "${o}" + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + ast_menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + ast_make +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + ast_make install install-headers install-configs "DESTDIR=${D}" + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + dodoc README* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + else + local my_replacing=() x + for x in ${REPLACING_VERSIONS}; do + [[ $(ver_cut 1 ${x}) != $(ver_cut 1) ]] && + my_replacing+=( $(ver_cut 1 ${x}) ) + done + if [[ "${#my_replacing}" -gt 0 ]]; then + my_replacing="${my_replacing[*]}" + my_replacing="${my_replacing// /, }" + [[ "${my_replacing}" = *", "* ]] && + my_replacing="${my_replacing%, *} or ${my_replacing##*, }" + elog "You are updating from Asterisk ${my_replacing}, you should reference the upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Assistance also available on Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index d4b9c62c3d69..1300283d4409 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,10 +1,10 @@ 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.12.1.tar.xz 2768160 BLAKE2B 2b3e3d91041881c0951ad470736266105d3b9720440b808fe382baa493a30075aba52eb1d329fb1f148e27cd76290d82e121e7f4abf695f215456a10e26ade3e SHA512 88915468fa1bb7256e3dd6c9d058ada6894faa1e3e7800c7d9bfee3e8be4081ae57e7f2bf260c5342b709499fc4302ddc2d7864e25bfa3300fa07f118a3de603 +DIST curl-8.12.1.tar.xz.asc 488 BLAKE2B 2a6563609c9f7ada84ca2c7048ad9406809eef4cc958760d2ab3d1b7be58d26247e579bd025870609e80ebb00295026aae30614b84e3a81bdf3ed3dbd0f5ed70 SHA512 41fc5582935090d13940d86974fdea3ea901dd5dab156c16029a87f811d2535172c59dc8dc366f2ffc37bcf85accbecb5aa765bc7b83c2991a3ef402bf25af69 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.11.1-r2.ebuild b/net-misc/curl/curl-8.11.1-r2.ebuild index 96c0bc7723d3..1c959b004fb5 100644 --- a/net-misc/curl/curl-8.11.1-r2.ebuild +++ b/net-misc/curl/curl-8.11.1-r2.ebuild @@ -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 )" diff --git a/net-misc/curl/curl-8.11.0-r1.ebuild b/net-misc/curl/curl-8.12.0-r1.ebuild index 256378637261..7acb873fe0b5 100644 --- a/net-misc/curl/curl-8.11.0-r1.ebuild +++ b/net-misc/curl/curl-8.12.0-r1.ebuild @@ -156,15 +156,9 @@ 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" + "${FILESDIR}/${P}-multi.patch" ) src_prepare() { @@ -277,15 +271,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 +312,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-r2.ebuild b/net-misc/curl/curl-8.12.1.ebuild index 89b07c74c60e..f8c605501860 100644 --- a/net-misc/curl/curl-8.8.0-r2.ebuild +++ b/net-misc/curl/curl-8.12.1.ebuild @@ -21,21 +21,30 @@ 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 )" 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" +IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3" +IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp +websockets zstd" +# These select the default tls implementation / which quic impl to use +IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 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 +# Only one default ssl / quic provider can be enabled +# The default provider needs its USE satisfied +# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day. +# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e REQUIRED_USE=" + quic? ( + ^^ ( + curl_quic_openssl + curl_quic_ngtcp2 + ) + http3 + ssl + ) ssl? ( ^^ ( curl_ssl_gnutls @@ -44,36 +53,49 @@ REQUIRED_USE=" curl_ssl_rustls ) ) + curl_quic_openssl? ( + curl_ssl_openssl + quic + !gnutls + !mbedtls + !rustls + ) + curl_quic_ngtcp2? ( + curl_ssl_gnutls + quic + !mbedtls + !openssl + !rustls + ) curl_ssl_gnutls? ( gnutls ) curl_ssl_mbedtls? ( mbedtls ) curl_ssl_openssl? ( openssl ) curl_ssl_rustls? ( rustls ) - nghttp3? ( - !openssl - alt-svc ) + http3? ( alt-svc quic ) " # 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) +# - https://github.com/curl/curl/blob/master/.github/workflows/http3-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. - +# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time. 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}] ) + http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] ) + http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] ) + idn? ( >=net-dns/libidn2-2.0.0:=[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}] ) + quic? ( + curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] ) + curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] ) + ) rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) ssl? ( @@ -90,7 +112,7 @@ RDEPEND=" >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] ) rustls? ( - >=net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}] + >=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}] ) ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) @@ -104,12 +126,12 @@ BDEPEND=" test? ( sys-apps/diffutils http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) - nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + http3? ( 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} ) +DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) MULTILIB_WRAPPED_HEADERS=( /usr/include/curl/curlbuild.h @@ -134,11 +156,8 @@ QA_CONFIG_IMPL_DECL_SKIP=( ) 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 + "${FILESDIR}/${PN}-prefix-4.patch" + "${FILESDIR}/${PN}-respect-cflags-3.patch" ) src_prepare() { @@ -251,22 +270,20 @@ 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 $(use_with psl libpsl) --without-msh3 - $(use_with nghttp3) - $(use_with nghttp3 ngtcp2) + $(use_with http3 nghttp3) + $(use_with curl_quic_ngtcp2 ngtcp2) + $(use_with curl_quic_openssl openssl-quic) --without-quiche $(use_with rtmp librtmp) --without-schannel @@ -288,15 +305,23 @@ multilib_src_configure() { ) fi - if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + if use test && multilib_is_native_abi && ( use http2 || use http3 ); then myconf+=( --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" ) 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-threaded-resolver + ) + else myconf+=( - --disable-pthreads + --enable-threaded-resolver ) fi @@ -308,30 +333,6 @@ multilib_src_configure() { 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() { @@ -349,7 +350,7 @@ 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) + # -a: keep going on failure (so we see everything that breaks, not just 1st test) # -k: keep test files after completion # -am: automake style TAP output # -p: print logs if test fails diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild index 5a37525caae2..f8c605501860 100644 --- a/net-misc/curl/curl-9999.ebuild +++ b/net-misc/curl/curl-9999.ebuild @@ -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-8.12.0-multi.patch b/net-misc/curl/files/curl-8.12.0-multi.patch new file mode 100644 index 000000000000..b9405af8da5b --- /dev/null +++ b/net-misc/curl/files/curl-8.12.0-multi.patch @@ -0,0 +1,136 @@ +https://github.com/curl/curl/issues/16236#issuecomment-2645385845 +https://github.com/curl/curl/commit/242a1439e7d8cdb72ae6a2fa2e705e2d9a2b7501 + + +--- a/lib/setopt.c ++++ b/lib/setopt.c +@@ -1584,10 +1584,6 @@ static CURLcode setopt_pointers(struct Curl_easy *data, CURLoption option, + if(data->share->hsts == data->hsts) + data->hsts = NULL; + #endif +-#ifdef USE_SSL +- if(data->share->ssl_scache == data->state.ssl_scache) +- data->state.ssl_scache = data->multi ? data->multi->ssl_scache : NULL; +-#endif + #ifdef USE_LIBPSL + if(data->psl == &data->share->psl) + data->psl = data->multi ? &data->multi->psl : NULL; +@@ -1628,10 +1624,6 @@ static CURLcode setopt_pointers(struct Curl_easy *data, CURLoption option, + data->hsts = data->share->hsts; + } + #endif +-#ifdef USE_SSL +- if(data->share->ssl_scache) +- data->state.ssl_scache = data->share->ssl_scache; +-#endif + #ifdef USE_LIBPSL + if(data->share->specifier & (1 << CURL_LOCK_DATA_PSL)) + data->psl = &data->share->psl; +--- a/lib/transfer.c ++++ b/lib/transfer.c +@@ -567,12 +567,6 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) + #endif + data->state.httpreq = data->set.method; + +-#ifdef USE_SSL +- if(!data->state.ssl_scache) +- /* There was no ssl session cache set via a share, use the multi one */ +- data->state.ssl_scache = data->multi->ssl_scache; +-#endif +- + data->state.requests = 0; + data->state.followlocation = 0; /* reset the location-follow counter */ + data->state.this_is_a_follow = FALSE; /* reset this */ +--- a/lib/urldata.h ++++ b/lib/urldata.h +@@ -1199,7 +1199,6 @@ struct UrlState { + curl_prot_t first_remote_protocol; + + int retrycount; /* number of retries on a new connection */ +- struct Curl_ssl_scache *ssl_scache; /* TLS session pool */ + int os_errno; /* filled in with errno whenever an error occurs */ + long followlocation; /* redirect counter */ + int requests; /* request counter: redirects + authentication retakes */ +--- a/lib/vtls/vtls_scache.c ++++ b/lib/vtls/vtls_scache.c +@@ -82,6 +82,17 @@ struct Curl_ssl_scache { + long age; + }; + ++static struct Curl_ssl_scache *cf_ssl_scache_get(struct Curl_easy *data) ++{ ++ struct Curl_ssl_scache *scache = NULL; ++ /* If a share is present, its ssl_scache has preference over the multi */ ++ if(data->share && data->share->ssl_scache) ++ scache = data->share->ssl_scache; ++ else if(data->multi && data->multi->ssl_scache) ++ scache = data->multi->ssl_scache; ++ return scache; ++} ++ + static void cf_ssl_scache_clear_session(struct Curl_ssl_session *s) + { + if(s->sdata) { +@@ -792,7 +803,7 @@ CURLcode Curl_ssl_scache_put(struct Curl_cfilter *cf, + const char *ssl_peer_key, + struct Curl_ssl_session *s) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data); + CURLcode result; + DEBUGASSERT(ssl_config); +@@ -826,7 +837,7 @@ CURLcode Curl_ssl_scache_take(struct Curl_cfilter *cf, + const char *ssl_peer_key, + struct Curl_ssl_session **ps) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + struct Curl_ssl_scache_peer *peer = NULL; + struct Curl_llist_node *n; +@@ -870,7 +881,7 @@ CURLcode Curl_ssl_scache_add_obj(struct Curl_cfilter *cf, + void *sobj, + Curl_ssl_scache_obj_dtor *sobj_free) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + struct Curl_ssl_scache_peer *peer = NULL; + CURLcode result; +@@ -898,7 +909,7 @@ bool Curl_ssl_scache_get_obj(struct Curl_cfilter *cf, + const char *ssl_peer_key, + void **sobj) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + struct Curl_ssl_scache_peer *peer = NULL; + CURLcode result; +@@ -924,7 +935,7 @@ void Curl_ssl_scache_remove_all(struct Curl_cfilter *cf, + struct Curl_easy *data, + const char *ssl_peer_key) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + struct Curl_ssl_scache_peer *peer = NULL; + CURLcode result; +@@ -1021,7 +1032,7 @@ CURLcode Curl_ssl_session_import(struct Curl_easy *data, + const unsigned char *shmac, size_t shmac_len, + const unsigned char *sdata, size_t sdata_len) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct Curl_ssl_scache_peer *peer = NULL; + struct Curl_ssl_session *s = NULL; + bool locked = FALSE; +@@ -1092,7 +1103,7 @@ CURLcode Curl_ssl_session_export(struct Curl_easy *data, + curl_ssls_export_cb *export_fn, + void *userptr) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct Curl_ssl_scache_peer *peer; + struct dynbuf sbuf, hbuf; + struct Curl_llist_node *n; 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/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 6e03948d6ca6..e52a026af897 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,4 +1,2 @@ -DIST dhcpcd-10.0.10.tar.xz 272732 BLAKE2B 2ecf52009f3fd4442863e1927a8d9e777ee6f34ff4d50a6f1e67821fb23fd12221df1e3a0a04ea0874df8feac15785772b4aa75af407f74448e442db36410e30 SHA512 87c836731637c134a95ea91d9a3d5c682e6e7f3340961f2995fc84931ff9b2a4c0073aca872a98738dc76005eb1159c42f1044fb0998891386784df299786349 -DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 4afd08cf7377b2262d33bf3f7ac503e081572a7c1ffd53b285842a92d99d88fae44e7e6384134bbe1eb839001f822fa7fb43718c42f9e8e6d11a05ec66fa2fc6 SHA512 403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004 -DIST dhcpcd-10.0.8.tar.xz 272116 BLAKE2B 1bf27387c13f192c6216e2f1ecad06bfa82267d5d6e08ddaa123789699fe9154222c33b1aa1f603e65ae8dce510cb24d48e72701494e0793c766e81f024f8bc5 SHA512 8c9bcd49a828dbc1089f49b73decefb6d1c3ef47fecaae242b08e3bdc8c3c49540d1d3551ab879d58df0dca64dcc64d7a29c665d1b1ebbd72d6a52662529eea4 DIST dhcpcd-10.1.0.tar.xz 271660 BLAKE2B 9d47ae8b97ba082f980966a2c3f688c6a8addb10989c166dafebdb6491793815c4caddc3016334f6549923632fd01fc8ce0987eca31af01948b0f4a643f88b38 SHA512 25b3304471c85975e004f101fdd8dc6155065009e9d94719aadc6181717839c501d66740f002aa00acda73cce3c0d924f4241eed177688c4e794be301b059e04 +DIST dhcpcd-10.2.0.tar.xz 274896 BLAKE2B 0b209f253e6462cc176ffef749228fc3b82474ee4baa2c468277b58abea9541282a2a96633e88641c46e3e9a612049f574009dd42f00f86334e655b10c234e81 SHA512 d2414ae8ff292e04a9d7060d523b5975e996fb921c481d198c5b6804fd73c6fc6edd806faf24788eacd8a2125e80528db8844865178b65a3acf29d3d264a3bff diff --git a/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild deleted file mode 100644 index da71fc81b647..000000000000 --- a/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" -else - MY_P="${P/_alpha/-alpha}" - MY_P="${MY_P/_beta/-beta}" - MY_P="${MY_P/_rc/-rc}" - SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" - -LICENSE="BSD-2 BSD ISC MIT" -SLOT="0" -IUSE="debug +embedded ipv6 privsep +udev" - -DEPEND="udev? ( virtual/udev )" -RDEPEND=" - ${DEPEND} - privsep? ( - acct-group/dhcpcd - acct-user/dhcpcd - ) -" - -QA_CONFIG_IMPL_DECL_SKIP=( - # These don't exist on Linux/glibc (bug #900264) - memset_explicit - memset_s - setproctitle - strtoi - consttime_memequal - SHA256_Init - hmac -) - -PATCHES=( - "${FILESDIR}"/${PN}-10.0.6-rebinding.patch - "${FILESDIR}"/${PN}-10.0.6-crash.patch -) - -src_configure() { - local myeconfargs=( - --dbdir="${EPREFIX}/var/lib/dhcpcd" - --libexecdir="${EPREFIX}/lib/dhcpcd" - --localstatedir="${EPREFIX}/var" - --prefix="${EPREFIX}" - --with-hook=ntp.conf - $(use_enable debug) - $(use_enable embedded) - $(use_enable ipv6) - $(use_enable privsep) - $(usex elibc_glibc '--with-hook=yp.conf' '') - --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") - $(usex privsep '--privsepuser=dhcpcd' '') - $(usex udev '' '--without-dev --without-udev') - CC="$(tc-getCC)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - keepdir /var/lib/dhcpcd - newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd - systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service -} - -pkg_postinst() { - local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - - local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT}"/etc/dhcpcd.duid - local new_duid="${dbdir}"/duid - if [[ -e "${old_old_duid}" ]] ; then - # Upgrade the duid file to the new format if needed - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" - fi - - # Move the duid to /etc, a more sensible location - if [[ ! -e "${old_duid}" ]] ; then - cp -p "${old_old_duid}" "${new_duid}" - fi - old_files+=( "${old_old_duid}" ) - fi - - # dhcpcd-7 moves the files out of /etc - if [[ -e "${old_duid}" ]] ; then - if [[ ! -e "${new_duid}" ]] ; then - cp -p "${old_duid}" "${new_duid}" - fi - old_files+=( "${old_duid}" ) - fi - local old_secret="${EROOT}"/etc/dhcpcd.secret - local new_secret="${dbdir}"/secret - if [[ -e "${old_secret}" ]] ; then - if [[ ! -e "${new_secret}" ]] ; then - cp -p "${old_secret}" "${new_secret}" - fi - old_files+=( "${old_secret}" ) - fi - - # dhcpcd-7 renames some files in /var/lib/dhcpcd - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic - local new_rdm="${dbdir}"/rdm_monotonic - if [[ -e "${old_rdm}" ]] ; then - if [[ ! -e "${new_rdm}" ]] ; then - cp -p "${old_rdm}" "${new_rdm}" - fi - old_files+=( "${old_rdm}" ) - fi - local lease= - for lease in "${dbdir}"/dhcpcd-*.lease*; do - [[ -f "${lease}" ]] || continue - old_files+=( "${lease}" ) - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") - [[ -e "${dbdir}/${new_lease}" ]] && continue - cp "${lease}" "${dbdir}/${new_lease}" - done - - # Warn about removing stale files - if [[ -n "${old_files[@]}" ]] ; then - elog - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT}/etc to ${dbdir}" - elog "and copied leases in ${dbdir} to new files with the dhcpcd-" - elog "prefix dropped." - elog - elog "You should remove these files if you don't plan on reverting" - elog "to an older version:" - local old_file= - for old_file in ${old_files[@]}; do - elog " ${old_file}" - done - fi - - if [ -z "${REPLACING_VERSIONS}" ]; then - elog - elog "dhcpcd has zeroconf support active by default." - elog "This means it will always obtain an IP address even if no" - elog "DHCP server can be contacted, which will break any existing" - elog "failover support you may have configured in your net configuration." - elog "This behaviour can be controlled with the noipv4ll configuration" - elog "file option or the -L command line switch." - elog "See the dhcpcd and dhcpcd.conf man pages for more details." - - elog - elog "Dhcpcd has duid enabled by default, and this may cause issues" - elog "with some dhcp servers. For more information, see" - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" - fi - - if ! has_version net-dns/bind-tools; then - elog - elog "If you activate the lookup-hostname hook to look up your hostname" - elog "using the dns, you need to install net-dns/bind-tools." - fi -} diff --git a/net-misc/dhcpcd/dhcpcd-10.0.8.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.8.ebuild deleted file mode 100644 index ba52c3873ac8..000000000000 --- a/net-misc/dhcpcd/dhcpcd-10.0.8.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" -else - MY_P="${P/_alpha/-alpha}" - MY_P="${MY_P/_beta/-beta}" - MY_P="${MY_P/_rc/-rc}" - SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" - -LICENSE="BSD-2 BSD ISC MIT" -SLOT="0" -IUSE="debug +embedded ipv6 privsep +udev" - -DEPEND=" - app-crypt/libmd - udev? ( virtual/udev ) -" -RDEPEND=" - ${DEPEND} - privsep? ( - acct-group/dhcpcd - acct-user/dhcpcd - ) -" - -QA_CONFIG_IMPL_DECL_SKIP=( - # These don't exist on Linux/glibc (bug #900264) - memset_explicit - memset_s - setproctitle - strtoi - consttime_memequal - SHA256_Init - hmac - # These may exist on some glibc versions, but the checks fail due to - # -Werror / undefined reference no matter what. bug #924825 - arc4random - arc4random_uniform -) - -PATCHES=( - "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch -) - -src_configure() { - local myeconfargs=( - --dbdir="${EPREFIX}/var/lib/dhcpcd" - --libexecdir="${EPREFIX}/lib/dhcpcd" - --localstatedir="${EPREFIX}/var" - --prefix="${EPREFIX}" - --with-hook=ntp.conf - $(use_enable debug) - $(use_enable embedded) - $(use_enable ipv6) - $(use_enable privsep) - $(usex elibc_glibc '--with-hook=yp.conf' '') - --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") - $(usex privsep '--privsepuser=dhcpcd' '') - $(usex udev '' '--without-dev --without-udev') - CC="$(tc-getCC)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - keepdir /var/lib/dhcpcd - newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd - systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service -} - -pkg_postinst() { - local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - - local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT}"/etc/dhcpcd.duid - local new_duid="${dbdir}"/duid - if [[ -e "${old_old_duid}" ]] ; then - # Upgrade the duid file to the new format if needed - if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then - sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" - fi - - # Move the duid to /etc, a more sensible location - if [[ ! -e "${old_duid}" ]] ; then - cp -p "${old_old_duid}" "${new_duid}" - fi - old_files+=( "${old_old_duid}" ) - fi - - # dhcpcd-7 moves the files out of /etc - if [[ -e "${old_duid}" ]] ; then - if [[ ! -e "${new_duid}" ]] ; then - cp -p "${old_duid}" "${new_duid}" - fi - old_files+=( "${old_duid}" ) - fi - local old_secret="${EROOT}"/etc/dhcpcd.secret - local new_secret="${dbdir}"/secret - if [[ -e "${old_secret}" ]] ; then - if [[ ! -e "${new_secret}" ]] ; then - cp -p "${old_secret}" "${new_secret}" - fi - old_files+=( "${old_secret}" ) - fi - - # dhcpcd-7 renames some files in /var/lib/dhcpcd - local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic - local new_rdm="${dbdir}"/rdm_monotonic - if [[ -e "${old_rdm}" ]] ; then - if [[ ! -e "${new_rdm}" ]] ; then - cp -p "${old_rdm}" "${new_rdm}" - fi - old_files+=( "${old_rdm}" ) - fi - local lease= - for lease in "${dbdir}"/dhcpcd-*.lease*; do - [[ -f "${lease}" ]] || continue - old_files+=( "${lease}" ) - local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") - [[ -e "${dbdir}/${new_lease}" ]] && continue - cp "${lease}" "${dbdir}/${new_lease}" - done - - # Warn about removing stale files - if [[ -n "${old_files[@]}" ]] ; then - elog - elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT}/etc to ${dbdir}" - elog "and copied leases in ${dbdir} to new files with the dhcpcd-" - elog "prefix dropped." - elog - elog "You should remove these files if you don't plan on reverting" - elog "to an older version:" - local old_file= - for old_file in ${old_files[@]}; do - elog " ${old_file}" - done - fi - - if [ -z "${REPLACING_VERSIONS}" ]; then - elog - elog "dhcpcd has zeroconf support active by default." - elog "This means it will always obtain an IP address even if no" - elog "DHCP server can be contacted, which will break any existing" - elog "failover support you may have configured in your net configuration." - elog "This behaviour can be controlled with the noipv4ll configuration" - elog "file option or the -L command line switch." - elog "See the dhcpcd and dhcpcd.conf man pages for more details." - - elog - elog "Dhcpcd has duid enabled by default, and this may cause issues" - elog "with some dhcp servers. For more information, see" - elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" - fi - - if ! has_version net-dns/bind-tools; then - elog - elog "If you activate the lookup-hostname hook to look up your hostname" - elog "using the dns, you need to install net-dns/bind-tools." - fi -} diff --git a/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild b/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild index 4a63060cb6be..6eed4698ead9 100644 --- a/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.1.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 @@ -15,7 +15,7 @@ else SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" @@ -54,6 +54,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch + "${FILESDIR}"/${P}-seccomp-glibc-2.41.patch ) src_configure() { diff --git a/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild b/net-misc/dhcpcd/dhcpcd-10.2.0.ebuild index 06b17e02b53a..c3595a4f780e 100644 --- a/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.2.0.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 systemd toolchain-funcs +inherit systemd optfeature toolchain-funcs if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -53,9 +53,8 @@ QA_CONFIG_IMPL_DECL_SKIP=( ) PATCHES=( - "${FILESDIR}"/${PN}-10.0.6-rebinding.patch - "${FILESDIR}"/${PN}-10.0.6-crash.patch "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch + "${FILESDIR}"/${P}-no-ipv6-build.patch ) src_configure() { @@ -170,9 +169,5 @@ pkg_postinst() { elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" fi - if ! has_version net-dns/bind-tools; then - elog - elog "If you activate the lookup-hostname hook to look up your hostname" - elog "using the dns, you need to install net-dns/bind-tools." - fi + optfeature "lookup-hostname hook" net-dns/bind-tools } diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch deleted file mode 100644 index 5b61e3ca37ef..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://github.com/NetworkConfiguration/dhcpcd/issues/179 -https://github.com/NetworkConfiguration/dhcpcd/issues/283 -https://bugzilla.redhat.com/2262996 -https://github.com/NetworkConfiguration/dhcpcd/commit/727c78f503d456875e2a3cee7609288b537d9d25 - -From 727c78f503d456875e2a3cee7609288b537d9d25 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com> -Date: Fri, 16 Feb 2024 17:15:35 +0100 -Subject: [PATCH] Move dhcp(v4) packet size check earlier (#295) - -dhcp_handlebootp handled zero sized packets correctly, but -dhcp_redirect_dhcp did not have such protection. Move size check before -both of them. Size when called from dhcp_packet is checked by -is_packet_udp_bootp call. Only dhcp_recvmsg needs earlier checking to be -added. - -Fixes #283 ---- a/src/dhcp.c -+++ b/src/dhcp.c -@@ -3532,12 +3532,6 @@ dhcp_handlebootp(struct interface *ifp, struct bootp *bootp, size_t len, - { - size_t v; - -- if (len < offsetof(struct bootp, vend)) { -- logerrx("%s: truncated packet (%zu) from %s", -- ifp->name, len, inet_ntoa(*from)); -- return; -- } -- - /* Unlikely, but appeases sanitizers. */ - if (len > FRAMELEN_MAX) { - logerrx("%s: packet exceeded frame length (%zu) from %s", -@@ -3670,6 +3664,13 @@ dhcp_recvmsg(struct dhcpcd_ctx *ctx, struct msghdr *msg) - logerr(__func__); - return; - } -+ -+ if (iov->iov_len < offsetof(struct bootp, vend)) { -+ logerrx("%s: truncated packet (%zu) from %s", -+ ifp->name, iov->iov_len, inet_ntoa(from->sin_addr)); -+ return; -+ } -+ - state = D_CSTATE(ifp); - if (state == NULL) { - /* Try re-directing it to another interface. */ diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch deleted file mode 100644 index 6457368f1150..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.gentoo.org/920652#c2 -https://github.com/NetworkConfiguration/dhcpcd/commit/8ab7ca1eb4e9bb797d6e6d955c83d8a82f69a663 - -From 8ab7ca1eb4e9bb797d6e6d955c83d8a82f69a663 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Sun, 24 Dec 2023 12:07:25 +0000 -Subject: [PATCH] DHCP: DECLINE address on ARP defend failure - -Also, drop the lease. -This should get us a new address from the DHCP server when we -re-enter DISCOVER to avoid looping on the same address and fail -again. ---- - src/dhcp.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/dhcp.c b/src/dhcp.c -index 014ce6cf..a58e1db2 100644 ---- a/src/dhcp.c -+++ b/src/dhcp.c -@@ -1944,7 +1944,11 @@ dhcp_expire(void *arg) - static void - dhcp_decline(struct interface *ifp) - { -+ struct dhcp_state *state = D_STATE(ifp); - -+ // Set the expired state so we send over BPF as this could be -+ // an address defence failure. -+ state->added |= STATE_EXPIRED; - send_message(ifp, DHCP_DECLINE, NULL); - } - #endif -@@ -2098,8 +2102,12 @@ static void - dhcp_arp_defend_failed(struct arp_state *astate) - { - struct interface *ifp = astate->iface; -+ struct dhcp_state *state = D_STATE(ifp); - -+ if (!(ifp->options->options & (DHCPCD_INFORM | DHCPCD_STATIC))) -+ dhcp_decline(ifp); - dhcp_drop(ifp, "EXPIRED"); -+ dhcp_unlink(ifp->ctx, state->leasefile); - dhcp_start1(ifp); - } - #endif - diff --git a/net-misc/dhcpcd/files/dhcpcd-10.1.0-seccomp-glibc-2.41.patch b/net-misc/dhcpcd/files/dhcpcd-10.1.0-seccomp-glibc-2.41.patch new file mode 100644 index 000000000000..6b69b47176d2 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-10.1.0-seccomp-glibc-2.41.patch @@ -0,0 +1,28 @@ +https://github.com/NetworkConfiguration/dhcpcd/commit/e9e40400003db2e4f12dba85acabbaf2212a520f + +From e9e40400003db2e4f12dba85acabbaf2212a520f Mon Sep 17 00:00:00 2001 +From: Scott Shambarger <devel@shambarger.net> +Date: Sat, 7 Dec 2024 16:37:28 +0000 +Subject: [PATCH] linux: Allow the __NR_rt_sigprocmask syscall + +Fixes recent glibc changes to getrandom() used by arc4random(). +Fixes #421. +--- + src/privsep-linux.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 8357904c..e3485a2e 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -409,6 +409,9 @@ static struct sock_filter ps_seccomp_filter[] = { + #ifdef __NR_recvmsg + SECCOMP_ALLOW(__NR_recvmsg), + #endif ++#ifdef __NR_rt_sigprocmask ++ SECCOMP_ALLOW(__NR_rt_sigprocmask), ++#endif + #ifdef __NR_rt_sigreturn + SECCOMP_ALLOW(__NR_rt_sigreturn), + #endif + diff --git a/net-misc/dhcpcd/files/dhcpcd-10.2.0-no-ipv6-build.patch b/net-misc/dhcpcd/files/dhcpcd-10.2.0-no-ipv6-build.patch new file mode 100644 index 000000000000..c9f426d913c0 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-10.2.0-no-ipv6-build.patch @@ -0,0 +1,110 @@ +https://bugs.gentoo.org/949688 +https://github.com/NetworkConfiguration/dhcpcd/commit/7f70a6a4e6e19703e705881da958e8a1d42d27ec + +From 7f70a6a4e6e19703e705881da958e8a1d42d27ec Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Thu, 13 Feb 2025 00:32:43 +0000 +Subject: [PATCH] Address some build options + +Fixes #458. +--- a/src/dhcp.c ++++ b/src/dhcp.c +@@ -3068,7 +3068,7 @@ dhcp_handledhcp(struct interface *ifp, struct bootp *bootp, size_t bootp_len, + struct dhcp_state *state = D_STATE(ifp); + struct if_options *ifo = ifp->options; + struct dhcp_lease *lease = &state->lease; +- uint8_t type, tmp; ++ uint8_t type; + struct in_addr addr; + unsigned int i; + char *msg; +@@ -3079,6 +3079,9 @@ dhcp_handledhcp(struct interface *ifp, struct bootp *bootp, size_t bootp_len, + const uint8_t *auth; + size_t auth_len; + #endif ++#ifdef IPV4LL ++ uint8_t tmp; ++#endif + #ifdef IN_IFF_DUPLICATED + struct ipv4_addr *ia; + #endif +--- a/src/if-options.c ++++ b/src/if-options.c +@@ -655,8 +655,6 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo, + uint8_t *request, *require, *no, *reject; + struct dhcp_opt **dop, *ndop; + size_t *dop_len, dl, odl; +- struct vivco *vivco; +- const struct vivco *vivco_endp = ifo->vivco + ifo->vivco_len; + struct group *grp; + #ifdef AUTH + struct token *token; +@@ -665,16 +663,22 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo, + struct group grpbuf; + #endif + #ifdef DHCP6 +- size_t sl; + struct if_ia *ia; + uint8_t iaid[4]; ++#endif ++#if defined(DHCP6) || ((defined(INET) || defined(INET6)) && !defined(SMALL)) ++ size_t sl; ++#endif + #ifndef SMALL +- struct in6_addr in6addr; ++#ifdef DHCP6 + struct if_sla *sla, *slap; ++#endif ++ struct vivco *vivco; ++ const struct vivco *vivco_endp = ifo->vivco + ifo->vivco_len; ++ struct in6_addr in6addr; + struct vsio **vsiop = NULL, *vsio; + size_t *vsio_lenp = NULL, opt_max, opt_header; + struct vsio_so *vsio_so; +-#endif + #endif + + dop = NULL; +@@ -2951,11 +2955,11 @@ free_options(struct dhcpcd_ctx *ctx, struct if_options *ifo) + struct rt *rt; + #endif + struct dhcp_opt *opt; +- struct vivco *vo; + #ifdef AUTH + struct token *token; + #endif + #ifndef SMALL ++ struct vivco *vo; + struct vsio *vsio; + struct vsio_so *vsio_so; + #endif +--- a/src/ipv6.c ++++ b/src/ipv6.c +@@ -626,7 +626,7 @@ ipv6_deletedaddr(struct ipv6_addr *ia) + #endif + + #if !defined(DHCP6) || (!defined(PRIVSEP) && defined(SMALL)) +- UNUSED(ia) ++ UNUSED(ia); + #endif + } + +--- a/src/privsep-inet.c ++++ b/src/privsep-inet.c +@@ -215,6 +215,7 @@ ps_inet_startcb(struct ps_process *psp) + return ret; + } + ++#if defined(INET) || defined(DHCP6) + static bool + ps_inet_validudp(struct msghdr *msg, uint16_t sport, uint16_t dport) + { +@@ -233,6 +234,7 @@ ps_inet_validudp(struct msghdr *msg, uint16_t sport, uint16_t dport) + } + return true; + } ++#endif + + #ifdef INET6 + static bool + diff --git a/net-misc/dropbear/dropbear-2024.86-r1.ebuild b/net-misc/dropbear/dropbear-2024.86-r1.ebuild index c5f61a79f77c..b8238c8ac945 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 1e27bf51eec2..266bfbea10fb 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -2,3 +2,4 @@ DIST dropbox-icon.svg 574 BLAKE2B a73a0906b5b03dc3214010736164fcdbceb6d91463ed95 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-217.4.4417.ebuild b/net-misc/dropbox/dropbox-217.4.4417.ebuild new file mode 100644 index 000000000000..afc5b3e0496e --- /dev/null +++ b/net-misc/dropbox/dropbox-217.4.4417.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2025 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/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 09ca3fcc853b..2292dd969bdc 100644 --- a/net-misc/electrum/electrum-4.5.8-r2.ebuild +++ b/net-misc/electrum/electrum-4.5.8-r2.ebuild @@ -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 c9ad76157e2f..a4cd968ef64e 100644 --- a/net-misc/ena-driver/Manifest +++ b/net-misc/ena-driver/Manifest @@ -1,2 +1 @@ -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.0.ebuild b/net-misc/ena-driver/ena-driver-2.13.0.ebuild deleted file mode 100644 index 3d3ab17ac267..000000000000 --- a/net-misc/ena-driver/ena-driver-2.13.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2024 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/Manifest b/net-misc/ethflop/Manifest deleted file mode 100644 index bcca07b75bf9..000000000000 --- a/net-misc/ethflop/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST ethflop-20191003.zip 29858 BLAKE2B e5a4068d45c398d6c7bfd08299b57566c3d30bea4ef79692cae065adb61f3c41fd3ed568260e82e19d90e17c7b6d92c0698bb7f7c40edea9d44804a7a61e18ae SHA512 808e65d45e2ff74380bc2f1a31b7bb59fdca4acdf44eb7f60deef9aa0976462ddc64982e8a7b7c225d7f88e11a33dfcdf73fd7169f942018976d4d086e7ec477 -DIST ethflop-20240920-src.zip 22250 BLAKE2B d644c2e2cec9a6d0d303c38412833ff46c26a572138e7bbfbac55437895deb36e843685ee25e5797b7dacb2842b6c7896e6f9e4d819154f1cd2f1a95ca10b721 SHA512 6dc84b1db4fd6a83037c1f1395da5cc4bf5f43b9650f64d20c05fef4ceccdca1661e890a96f85e7a96ee94ee89b1d96994bfbe8d048a8f7d690e53f21ebde518 -DIST ethflopd-20240916-src.tar.gz 55737 BLAKE2B 8b6a886829f1f7c19c95965b48182c66da04d6f5364ff0cc1b820db62794f33e64900c9df6e7584a0ee3190d70121c7d52853f1d54bf9977e9f0fa7af6e2dfbd SHA512 b442dc4f0be8357cc406c0f67aa4234bebfb648c42342b0858ee06d162386323e2fa89d1d7d54d327b07c10f50bc5452958fdd8b41066a8bece08e4a65aa59c3 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/ethflop/files/ethflop-20240916-makefile.patch b/net-misc/ethflop/files/ethflop-20240916-makefile.patch deleted file mode 100644 index ffa255868da7..000000000000 --- a/net-misc/ethflop/files/ethflop-20240916-makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.linux -+++ b/Makefile.linux -@@ -16,7 +16,7 @@ - all: ethflopd
-
- ethflopd: ui_posix.c core.c
-- $(CC) $(CFLAGS) -o ethflopd ui_posix.c core.c
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o ethflopd ui_posix.c core.c
-
- clean:
- rm -f ethflopd *.o
diff --git a/net-misc/ethflop/files/ethflopd.confd b/net-misc/ethflop/files/ethflopd.confd deleted file mode 100644 index a727dae4c726..000000000000 --- a/net-misc/ethflop/files/ethflopd.confd +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Network interface, which should be used for serving floppy images -INTERFACE="lo" - -# Storage directory, from where floppy images are being served -STORAGEDIR="/tmp" diff --git a/net-misc/ethflop/files/ethflopd.initd b/net-misc/ethflop/files/ethflopd.initd deleted file mode 100644 index d00c63f980ae..000000000000 --- a/net-misc/ethflop/files/ethflopd.initd +++ /dev/null @@ -1,11 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -name="ethflopd daemon" -command="/usr/bin/ethflopd" -command_args="${INTERFACE} ${STORAGEDIR}" - -depend() { - need net -} diff --git a/net-misc/ethflop/files/ethflopd.service-r1 b/net-misc/ethflop/files/ethflopd.service-r1 deleted file mode 100644 index 39fa29a52171..000000000000 --- a/net-misc/ethflop/files/ethflopd.service-r1 +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=ethflopd daemon -After=network-online.target - -[Service] -EnvironmentFile=/etc/conf.d/ethflopd -ExecStart=/usr/bin/ethflopd lo /tmp - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/ethflop/metadata.xml b/net-misc/ethflop/metadata.xml deleted file mode 100644 index e4b008939e75..000000000000 --- a/net-misc/ethflop/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>conikost@gentoo.org</email> - <name>Conrad Kostecki</name> - </maintainer> - <longdescription> - ethflop is a DOS TSR that emulates a floppy disk drive. - The emulated (virtual) floppy disk is, in fact, stored on a Linux server as a floppy image. - All the communication between ethflop (the TSR) and ethflopd (the Linux daemon) is exchanged over raw Ethernet. - No need for any network configuration - the DOS PC only needs to have some kind of Ethernet adapter - (physical or emulated, for example through PLIP) and a suitable packet driver. - The Linux server and the DOS PC must be connected to a common Ethernet segment (same LAN). - </longdescription> - <use> - <flag name="tsr">Build the TSR program for DOS, which acts as a client.</flag> - </use> - <upstream> - <remote-id type="sourceforge">ethflop</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/fatrat/Manifest b/net-misc/fatrat/Manifest deleted file mode 100644 index c3370706abde..000000000000 --- a/net-misc/fatrat/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST fatrat-1.2.0_beta2_p20161204.tar.gz 4988560 BLAKE2B e55b841bd5741fe81eab79847dddf084a0b193215b791c341d705d840d1658bb7978e53c3de65c23c7c1ac839b29abfceb3b71bcbb124746e841c5fb31ecba14 SHA512 d3a9816cc53fd93ef2ccd3fb5896dde5846382d40e30dc687a14379e6048f8ffc27b40c2b5c3977c6bccc912dcb054426c84c016c319174e2c2a440f9a588063 diff --git a/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild b/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild deleted file mode 100644 index c82928e3267c..000000000000 --- a/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -SNAPSHOT="14a1a146df76d70c44dcc38363848a5b41a364d5" -inherit cmake xdg-utils - -DESCRIPTION="Qt5-based download/upload manager" -HOMEPAGE="http://fatrat.dolezel.info/" -SRC_URI="https://github.com/LubosD/fatrat/tarball/${SNAPSHOT} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bittorrent +curl doc nls xmpp" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - bittorrent? ( - dev-qt/qtwebengine:5[widgets] - >=net-libs/libtorrent-rasterbar-1.1.1 - ) - curl? ( >=net-misc/curl-7.18.2 ) - doc? ( dev-qt/qthelp:5 ) - xmpp? ( net-libs/gloox ) -" -DEPEND="${RDEPEND} - dev-libs/boost -" - -S="${WORKDIR}/LubosD-${PN}-14a1a14" - -PATCHES=( - "${FILESDIR}/${PN}-1.2.0_beta2_p20150803-build.patch" - "${FILESDIR}/${P}-qt-5.15.patch" -) - -src_configure() { - local mycmakeargs=( - -DWITH_BITTORRENT="$(usex bittorrent ON OFF)" - -DWITH_CURL="$(usex curl ON OFF)" - -DWITH_DOCUMENTATION="$(usex doc ON OFF)" - -DWITH_NLS="$(usex nls ON OFF)" - -DWITH_JABBER="$(usex xmpp ON OFF)" - -DWITH_WEBINTERFACE=OFF - ) - cmake_src_configure -} - -pkg_postinst() { - # optional runtime dep - if ! has_version dev-libs/geoip; then - elog "If you want GeoIP support, emerge dev-libs/geoip." - fi - - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20150803-build.patch b/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20150803-build.patch deleted file mode 100644 index f38604e8588d..000000000000 --- a/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20150803-build.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -127,10 +127,6 @@ - ADD_DEFINITIONS(-DDEBUG_BUILD) - ADD_DEFINITIONS(-DNDEBUG) - ADD_DEFINITIONS(-Wall) --else(CMAKE_BUILD_TYPE MATCHES Debug) -- ADD_DEFINITIONS(-ggdb) -- ADD_DEFINITIONS(-DNDEBUG) -- ADD_DEFINITIONS(-Wall) - endif(CMAKE_BUILD_TYPE MATCHES Debug) - - CHECK_INCLUDE_FILES(sys/epoll.h HAVE_SYS_EPOLL_H) diff --git a/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch b/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch deleted file mode 100644 index def09bbd7673..000000000000 --- a/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/util/BalloonTip.cpp b/src/util/BalloonTip.cpp -index c20c0ee..67b5284 100644 ---- a/src/util/BalloonTip.cpp -+++ b/src/util/BalloonTip.cpp -@@ -2,6 +2,7 @@ - * Based on Qt source code - */ - -+#include <QPainterPath> - #include "BalloonTip.h" - #include <QLabel> - #include <QPushButton> diff --git a/net-misc/fatrat/metadata.xml b/net-misc/fatrat/metadata.xml deleted file mode 100644 index 30e017e14716..000000000000 --- a/net-misc/fatrat/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="bittorrent">Use the bittorrent protocol via <pkg>net-libs/libtorrent-rasterbar</pkg>.</flag> - </use> - <upstream> - <remote-id type="github">LubosD/fatrat</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index 2ad5e772117b..b01e52e29b26 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,5 +1,9 @@ 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.12.0.tar.gz 10385447 BLAKE2B c3b3681f6f246e98a8bd1957897580ae009be463bdf48babb56477da1e05989223d7879bb09751f3ae55f81c3f464312b2ced9848a2f08a46d59c10bd75082c6 SHA512 010310a498c739b8e4fd205903451d6317421efead5ff6a3bda5cd8aa6f16d5f5510253379b562b53e3460595c1027783aa2ce562703e83c1b0ccca5543e20f1 +DIST freerdp-3.12.0.tar.gz.asc 228 BLAKE2B eb2983f23ebd1d7765d32270bd2172d17935e442e0acea8d80b6d5cd05bc5c900c7de75efccf7404779508db67c4da95e8263613c3d3f54c09bbbb361a51060f SHA512 7a264b76018dcfb6736d7fcdeb5c07a967a417014ee7ce896b8a7acd356455ce5e9a860906c76ff22babb98f3b8f4ebfd2c518f5d7eb73daa1b670a3a0641b11 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/files/freerdp-3.12.0-cmake.patch b/net-misc/freerdp/files/freerdp-3.12.0-cmake.patch new file mode 100644 index 000000000000..e28d2762c6f4 --- /dev/null +++ b/net-misc/freerdp/files/freerdp-3.12.0-cmake.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/949919 +https://github.com/FreeRDP/FreeRDP/issues/11212 + +From 358c36486f419ee09441cf7d53409c31debb54c9 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Tue, 18 Feb 2025 20:00:11 +0100 +Subject: [PATCH] [cmake] fix missing include + +--- + cmake/CompilerSanitizerOptions.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cmake/CompilerSanitizerOptions.cmake b/cmake/CompilerSanitizerOptions.cmake +index b128cd8b7ff6..7c3da6cc2153 100644 +--- a/cmake/CompilerSanitizerOptions.cmake ++++ b/cmake/CompilerSanitizerOptions.cmake +@@ -1,4 +1,5 @@ + include(CMakeDependentOption) ++include(CheckIncludeFiles) + + cmake_dependent_option( + WITH_VALGRIND_MEMCHECK "Compile with valgrind helpers." OFF diff --git a/net-misc/freerdp/freerdp-3.11.1-r1.ebuild b/net-misc/freerdp/freerdp-3.11.1-r1.ebuild new file mode 100644 index 000000000000..7604fb6710cd --- /dev/null +++ b/net-misc/freerdp/freerdp-3.11.1-r1.ebuild @@ -0,0 +1,201 @@ +# 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 + use debug || append-cppflags -DNDEBUG + 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_VERBOSE_WINPR_ASSERT=$(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/freerdp/freerdp-3.12.0.ebuild b/net-misc/freerdp/freerdp-3.12.0.ebuild new file mode 100644 index 000000000000..3908b6b5e4c7 --- /dev/null +++ b/net-misc/freerdp/freerdp-3.12.0.ebuild @@ -0,0 +1,205 @@ +# 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 ) +" + +PATCHES=( + "${FILESDIR}"/freerdp-3.12.0-cmake.patch +) + +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 + use debug || append-cppflags -DNDEBUG + 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_VERBOSE_WINPR_ASSERT=$(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/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 5907f28cdfca..7604fb6710cd 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2024 Gentoo Authors +# Copyright 2011-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -130,6 +130,7 @@ run_for_testing() { src_configure() { # bug #881695 filter-lto + use debug || append-cppflags -DNDEBUG freerdp_configure -DBUILD_TESTING=OFF run_for_testing freerdp_configure -DBUILD_TESTING=ON } @@ -150,6 +151,7 @@ freerdp_configure() { -DWITH_SAMPLE=OFF -DWITH_CUPS=$(option cups) -DWITH_DEBUG_ALL=$(option debug) + -DWITH_VERBOSE_WINPR_ASSERT=$(option debug) -DWITH_MANPAGES=ON -DWITH_FFMPEG=$(option ffmpeg) -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON 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.2.ebuild b/net-misc/frr/frr-10.0.3.ebuild index cd06f42a6e40..c4bf6cacfc21 100644 --- a/net-misc/frr/frr-10.0.2.ebuild +++ b/net-misc/frr/frr-10.0.3.ebuild @@ -3,7 +3,7 @@ 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.1.2.ebuild index 63a5e4f8de35..6e1d6a35e541 100644 --- a/net-misc/frr/frr-10.1.1.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.2.1.ebuild b/net-misc/frr/frr-10.2.1.ebuild new file mode 100644 index 000000000000..6e1d6a35e541 --- /dev/null +++ b/net-misc/frr/frr-10.2.1.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-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/gallery-dl-1.28.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.28.3.ebuild index 8bb9fcbbb941..4689de7ec568 100644 --- a/net-misc/gallery-dl/gallery-dl-1.28.3.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.28.3.ebuild @@ -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.28.4.ebuild b/net-misc/gallery-dl/gallery-dl-1.28.4.ebuild index 8bb9fcbbb941..4689de7ec568 100644 --- a/net-misc/gallery-dl/gallery-dl-1.28.4.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.28.4.ebuild @@ -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/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/kea/kea-2.4.0-r1.ebuild b/net-misc/kea/kea-2.4.0-r1.ebuild index 72c97487d6f6..0fa23efd041e 100644 --- a/net-misc/kea/kea-2.4.0-r1.ebuild +++ b/net-misc/kea/kea-2.4.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 @@ -10,7 +10,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" HOMEPAGE="https://www.isc.org/kea/" -PYTHON_COMPAT=( python3_{8..12} ) +PYTHON_COMPAT=( python3_{11..12} ) inherit autotools fcaps flag-o-matic python-single-r1 systemd tmpfiles diff --git a/net-misc/kea/kea-2.4.1.ebuild b/net-misc/kea/kea-2.4.1.ebuild index 72c97487d6f6..0fa23efd041e 100644 --- a/net-misc/kea/kea-2.4.1.ebuild +++ b/net-misc/kea/kea-2.4.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 @@ -10,7 +10,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" HOMEPAGE="https://www.isc.org/kea/" -PYTHON_COMPAT=( python3_{8..12} ) +PYTHON_COMPAT=( python3_{11..12} ) inherit autotools fcaps flag-o-matic python-single-r1 systemd tmpfiles diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index 72c97487d6f6..0fa23efd041e 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-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 @@ -10,7 +10,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" HOMEPAGE="https://www.isc.org/kea/" -PYTHON_COMPAT=( python3_{8..12} ) +PYTHON_COMPAT=( python3_{11..12} ) inherit autotools fcaps flag-o-matic python-single-r1 systemd tmpfiles diff --git a/net-misc/kio-zeroconf-common/Manifest b/net-misc/kio-zeroconf-common/Manifest index a20663f7a7e6..7159fe6477b0 100644 --- a/net-misc/kio-zeroconf-common/Manifest +++ b/net-misc/kio-zeroconf-common/Manifest @@ -1,2 +1 @@ DIST kio-zeroconf-24.08.3.tar.xz 44896 BLAKE2B 28e0acfbc943c4942e65e87a6d5f10dccbd17d61372b592d7167a1de0103fa54007b399036531897a942ced0e6dcd9cd26a757dda9244d6dc643cf9c57d1d2e8 SHA512 5b88d06d998702556bb0f2c533b12c289f039ed7803e9785f224b21509bf5dd4de2e17c3c6cddfa70bd374aab6b9c63a8d2b24e8019e2a4d33b8a8b0412007c5 -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.1.ebuild b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.1.ebuild deleted file mode 100644 index 92a86b37d0f6..000000000000 --- a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="false" -KDE_ORG_NAME="${PN/-common/}" -KFMIN=5.115.0 -inherit ecm-common gear.kde.org - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - -RDEPEND=" - !<net-misc/kio-zeroconf-23.08.5-r2:5 - !<net-misc/kio-zeroconf-24.08.0-r1:6 -" - -ECM_INSTALL_FILES=( - kdedmodule/org.kde.kdnssd.xml:\${KDE_INSTALL_DBUSINTERFACEDIR} - kioworker/zeroconf.desktop:\${KDE_INSTALL_DATADIR}/remoteview - org.kde.kio_zeroconf.metainfo.xml:\${KDE_INSTALL_METAINFODIR} -) diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest index a20663f7a7e6..5348a918a026 100644 --- a/net-misc/kio-zeroconf/Manifest +++ b/net-misc/kio-zeroconf/Manifest @@ -1,2 +1,2 @@ DIST kio-zeroconf-24.08.3.tar.xz 44896 BLAKE2B 28e0acfbc943c4942e65e87a6d5f10dccbd17d61372b592d7167a1de0103fa54007b399036531897a942ced0e6dcd9cd26a757dda9244d6dc643cf9c57d1d2e8 SHA512 5b88d06d998702556bb0f2c533b12c289f039ed7803e9785f224b21509bf5dd4de2e17c3c6cddfa70bd374aab6b9c63a8d2b24e8019e2a4d33b8a8b0412007c5 -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.1.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.12.2.ebuild index 0513a063cc46..152ce4e902b7 100644 --- a/net-misc/kio-zeroconf/kio-zeroconf-24.12.1.ebuild +++ b/net-misc/kio-zeroconf/kio-zeroconf-24.12.2.ebuild @@ -23,17 +23,6 @@ DEPEND=" >=kde-frameworks/kio-${KFMIN}:6 " RDEPEND="${DEPEND} - >=net-misc/${PN}-common-${PV} + !<net-misc/kio-zeroconf-23.08.5-r2:5 + !net-misc/kio-zeroconf-common " - -# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5 -ECM_REMOVE_FROM_INSTALL=( - /usr/share/dbus-1/interfaces/org.kde.kdnssd.xml - /usr/share/remoteview/zeroconf.desktop - /usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml -) - -src_prepare() { - ecm_src_prepare - ecm_punt_po_install -} diff --git a/net-misc/lyricwikia/Manifest b/net-misc/lyricwikia/Manifest deleted file mode 100644 index b152649fc851..000000000000 --- a/net-misc/lyricwikia/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST lyricwikia-0.1.11.tar.gz 5571 BLAKE2B 1e2fb5400b4c0ed07d419e577e3c12c6b8eca749ce1a5b7dea51d6d055979722b82d003eac20402da873d3011d1b444c0783935adbc01ec99dd6079b234e6bc7 SHA512 53ff9a2837ccc10be62c2a92240e9849a9c88b7979f8058deff87ce6eda6e98e39fb86c78052de9a885db679cd87a6c5749af2f9502d3316fbbf2c0796718805 diff --git a/net-misc/lyricwikia/files/lyricwikia-0.1.11-skip-online-test.patch b/net-misc/lyricwikia/files/lyricwikia-0.1.11-skip-online-test.patch deleted file mode 100644 index 5ca24dd4d4bc..000000000000 --- a/net-misc/lyricwikia/files/lyricwikia-0.1.11-skip-online-test.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/tests/test_get_lyrics.py b/tests/test_get_lyrics.py -index 5b1bb74..634ca55 100644 ---- a/tests/test_get_lyrics.py -+++ b/tests/test_get_lyrics.py -@@ -26,6 +26,6 @@ def test_returnLyricsNotFound(): - assert len(responses.calls) == 1 - - --def test_integration(): -- lyrics = get_lyrics('Led Zeppelin', 'Stairway to Heaven') -- assert 'lady' in lyrics.lower() -+# def test_integration(): -+# lyrics = get_lyrics('Led Zeppelin', 'Stairway to Heaven') -+# assert 'lady' in lyrics.lower() diff --git a/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild b/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild deleted file mode 100644 index e75202fdafa6..000000000000 --- a/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 - -DESCRIPTION="Python API to get song lyrics from LyricWikia" -HOMEPAGE="https://github.com/enricobacis/lyricwikia" -SRC_URI="https://github.com/enricobacis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="test? ( dev-python/responses[${PYTHON_USEDEP}] )" - -RDEPEND=" - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] -" - -PATCHES="${FILESDIR}/${P}-skip-online-test.patch" - -distutils_enable_tests pytest - -python_prepare_all() { - # do not depend on deprecated dep - sed -i -e '/pytest-runner/d' setup.py || die - - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - - # rename the executable to avoid file conflict with net-im/lyrics-in-terminal - find "${D}" -name 'lyrics' -execdir mv {} lyricwikia \; || die -} - -pkg_postinst() { - elog "Note that access to LyricWikia through this API (and products that use this API) should comply to the LyricWikia terms of use" - elog "" - elog "LyricWikia is now offline, this package is provided solely for the purpose of satisfying media-video/vidify's dependencies" -} diff --git a/net-misc/lyricwikia/lyricwikia-0.1.11-r2.ebuild b/net-misc/lyricwikia/lyricwikia-0.1.11-r2.ebuild deleted file mode 100644 index e5c93282a1f9..000000000000 --- a/net-misc/lyricwikia/lyricwikia-0.1.11-r2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 - -DESCRIPTION="Python API to get song lyrics from LyricWikia" -HOMEPAGE="https://github.com/enricobacis/lyricwikia" -SRC_URI="https://github.com/enricobacis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="test? ( dev-python/responses[${PYTHON_USEDEP}] )" - -RDEPEND=" - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] -" - -PATCHES="${FILESDIR}/${P}-skip-online-test.patch" - -distutils_enable_tests pytest - -python_prepare_all() { - # do not depend on deprecated dep - sed -i -e '/pytest-runner/d' setup.py || die - - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - - # rename the executable to avoid file conflict with net-im/lyrics-in-terminal - find "${D}" -name 'lyrics' -execdir mv {} lyricwikia \; || die -} - -pkg_postinst() { - elog "Note that access to LyricWikia through this API (and products that use this API) should comply to the LyricWikia terms of use" - elog "" - elog "LyricWikia is now offline, this package is provided solely for the purpose of satisfying media-video/vidify's dependencies" -} diff --git a/net-misc/lyricwikia/metadata.xml b/net-misc/lyricwikia/metadata.xml deleted file mode 100644 index 4c3bd46031cc..000000000000 --- a/net-misc/lyricwikia/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> - -<pkgmetadata> - <maintainer type="person"> - <email>nowa@gentoo.org</email> - <name>Nowa Ammerlaan</name> - </maintainer> - <stabilize-allarches/> - <upstream> - <remote-id type="github">enricobacis/lyricwikia</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest index 6c8dca9544dc..a524554aa485 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 +DIST megatools-1.11.3.20250203.tar.gz 105347 BLAKE2B be8541091181c2fcb685b9ff1c81d5bd3a7fe8c65148e0327ccbbe412b89221c122b5dcd507dd07163d0695678a0a11fd0f8c4d7ec8c8a2b2719137fc8cbf5de SHA512 5e50eeb21a8f9010e2cc1e65abb2f21172cbcabdf8cadfb7d4a2c6e582d5c705b20aac7abe502280e878c8f75ee2b24b25b73f51c174c85134c41919c7626925 +DIST megatools-1.11.3.20250203.tar.gz.asc 228 BLAKE2B 23cacc5f9cd7c045e9038c43c7105504165de28be07ff86fe54116cd87619d890ac937d3e4f5d959370473e02bc898f582892d590de3a7b7149f1b7bc30904d4 SHA512 75e2530081800261444fd38449f02d0099316e462c3675f8f9231836d21b6cc6c13ae0a198c80295a3831c173b6cd29cbfb21414f5c4acb0667871eb1c35056b diff --git a/net-misc/megatools/megatools-1.11.1.ebuild b/net-misc/megatools/megatools-1.11.2.ebuild index 6313dae1c214..369cc4aeef1e 100644 --- a/net-misc/megatools/megatools-1.11.1.ebuild +++ b/net-misc/megatools/megatools-1.11.2.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit meson -MY_P="${P}.20230212" +MY_P="${P}.20250127" 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/builds/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" diff --git a/net-misc/megatools/megatools-1.11.0.ebuild b/net-misc/megatools/megatools-1.11.3.ebuild index e9edcdae3798..b0a339f682d8 100644 --- a/net-misc/megatools/megatools-1.11.0.ebuild +++ b/net-misc/megatools/megatools-1.11.3.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit meson +inherit meson verify-sig -MY_P="${P}.20220519" +MY_P="${P}.20250203" 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/builds/${MY_P}.tar.gz + verify-sig? ( https://xff.cz/megatools/builds/builds/${MY_P}.tar.gz.asc )" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" @@ -25,9 +26,12 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" app-text/asciidoc + verify-sig? ( sec-keys/openpgp-keys-ondrejjirman ) virtual/pkgconfig " +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ondrejjirman.asc + src_install() { meson_src_install 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 f9c94759a23f..6dd8292b6ec1 100644 --- a/net-misc/memcached/memcached-1.6.27.ebuild +++ b/net-misc/memcached/memcached-1.6.27.ebuild @@ -37,6 +37,10 @@ PATCHES=( "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" ) +QA_CONFIG_IMPL_DECL_SKIP=( + htonll +) + src_prepare() { default diff --git a/net-misc/memcached/memcached-1.6.31.ebuild b/net-misc/memcached/memcached-1.6.31.ebuild index 79b68d40687f..967fec8252b5 100644 --- a/net-misc/memcached/memcached-1.6.31.ebuild +++ b/net-misc/memcached/memcached-1.6.31.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,10 @@ PATCHES=( "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" ) +QA_CONFIG_IMPL_DECL_SKIP=( + htonll +) + src_prepare() { default diff --git a/net-misc/netkit-rsh/files/netkit-rsh-0.17-c99.patch b/net-misc/netkit-rsh/files/netkit-rsh-0.17-c99.patch new file mode 100644 index 000000000000..3ddec052ae2f --- /dev/null +++ b/net-misc/netkit-rsh/files/netkit-rsh-0.17-c99.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/935500 +--- a/configure ++++ b/configure +@@ -344,6 +344,7 @@ rm -f __conftest* + + echo -n 'Checking for crypt... ' + cat <<EOF >__conftest.c ++#include <unistd.h> + int main() { crypt("aa", "bb"); } + + EOF +@@ -370,6 +371,7 @@ rm -f __conftest* + + echo -n 'Checking for rexec... ' + cat <<EOF >__conftest.c ++#include <netdb.h> + int main() { rexec(0, 0, 0, 0, 0, 0); } + + EOF +@@ -397,6 +399,7 @@ rm -f __conftest* + + echo -n 'Checking for forkpty... ' + cat <<EOF >__conftest.c ++#include <pty.h> + int main() { forkpty(0, 0, 0, 0); } + + EOF +--- a/rlogind/auth.c ++++ b/rlogind/auth.c +@@ -136,7 +136,7 @@ int auth_checkauth(const char *remoteuser, const char *host, + return -1; + } + +- pam_get_item(pamh, PAM_USER, &ln); ++ pam_get_item(pamh, PAM_USER, (const void**) &ln); + if (!ln || !*ln) { + /* + * Authentication wasn't adequate for requirements. diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild index 7e39a37e7032..312f306d9549 100644 --- a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild +++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.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=7 @@ -24,6 +24,7 @@ BDEPEND="app-arch/xz-utils" PATCHES=( "${FILESDIR}"/patches/ + "${FILESDIR}"/${PN}-0.17-c99.patch ) FILECAPS=( cap_net_bind_service usr/bin/r{cp,login,sh} ) 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/nx/files/nx-3.5.99.26-clang-bind.patch b/net-misc/nx/files/nx-3.5.99.26-clang-bind.patch new file mode 100644 index 000000000000..112268b33b75 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.99.26-clang-bind.patch @@ -0,0 +1,17 @@ +Fix: + +Loop.cpp:4224:34: error: invalid operands to binary expression ('__bind<int &, sockaddr *&, unsigned int &>' and 'int') + +https://github.com/ArcticaProject/nx-libs/issues/1044 +https://bugs.gentoo.org/930440 +--- a/nxcomp/src/Loop.cpp ++++ b/nxcomp/src/Loop.cpp +@@ -4221,7 +4221,7 @@ + goto SetupSocketError; + } + +- if (bind(newFD, addr, addrlen) == -1) ++ if (::bind(newFD, addr, addrlen) == -1) + { + nxfatal << "Loop: PANIC! Call to bind failed for " << label + << ". Error is " << EGET() 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/files/nx-3.5.99.26-gcc14-access.patch b/net-misc/nx/files/nx-3.5.99.26-gcc14-access.patch new file mode 100644 index 000000000000..44afd9232434 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.99.26-gcc14-access.patch @@ -0,0 +1,28 @@ +Bugs: https://bugs.gentoo.org/934131 +https://gitlab.freedesktop.org/xorg/xserver/-/commit/0ddcd8785199c08d9bded3c767a3b1227c670999 + +Backport from XOrg server: + + commit 0ddcd8785199c08d9bded3c767a3b1227c670999 + Author: Joaquim Monteiro <joaquim.monteiro@protonmail.com> + Date: Sun, 23 Jun 2024 21:17:25 +0100 + + [PATCH 1/2] os: Fix assignment with incompatible pointer type + + struct hostent->h_addr_list is of type char**, not const char**. + GCC considers this an error when in C99 mode or later. + + Signed-off-by: Joaquim Monteiro <joaquim.monteiro@protonmail.com> + Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1572> + +--- a/nx-X11/programs/Xserver/os/access.c ++++ b/nx-X11/programs/Xserver/os/access.c +@@ -1941,7 +1941,7 @@ + char hostname[SI_HOSTNAME_MAXLEN]; + int f, hostaddrlen; + void * hostaddr; +- const char **addrlist; ++ char **addrlist; + + if (siAddrLen >= sizeof(hostname)) + return FALSE; diff --git a/net-misc/nx/files/nx-3.5.99.26-musl.patch b/net-misc/nx/files/nx-3.5.99.26-musl.patch index 738b7a2469aa..2c2030e4a9b4 100644 --- a/net-misc/nx/files/nx-3.5.99.26-musl.patch +++ b/net-misc/nx/files/nx-3.5.99.26-musl.patch @@ -1,43 +1,8 @@ -diff -uNr a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h ---- a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h 2021-02-04 07:34:56.000000000 -0600 -+++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h 2023-03-16 13:55:33.983114692 -0600 -@@ -62,9 +62,6 @@ - #include <stdlib.h> - #include <stdio.h> - #include <string.h> --#if defined(__linux__) && defined(__i386__) --#include <fpu_control.h> --#endif - #endif - #include <float.h> - #include <stdarg.h> -diff -uNr a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c ---- a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c 2021-02-04 07:34:56.000000000 -0600 -+++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c 2023-03-16 13:56:25.569122176 -0600 -@@ -1169,20 +1169,6 @@ - static GLboolean initialized = GL_FALSE; - if (!initialized) { - init_sqrt_table(); -- --#if defined(_FPU_GETCW) && defined(_FPU_SETCW) -- { -- const char *debug = _mesa_getenv("MESA_DEBUG"); -- if (debug && _mesa_strcmp(debug, "FP")==0) { -- /* die on FP exceptions */ -- fpu_control_t mask; -- _FPU_GETCW(mask); -- mask &= ~(_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM -- | _FPU_MASK_OM | _FPU_MASK_UM); -- _FPU_SETCW(mask); -- } -- } --#endif - initialized = GL_TRUE; - } - -diff -uNr a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c ---- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c 2021-02-04 07:34:56.000000000 -0600 -+++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c 2023-03-16 13:57:30.694956647 -0600 +https://bugs.gentoo.org/713418 +Backport from Xorg: https://gitlab.freedesktop.org/xorg/xserver/-/commit/6634ffc4d26846dcf892f27682f9021f6d9956a9 + +--- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c ++++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -40,14 +40,7 @@ #include <sys/types.h> diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild index 3a112d2be6bb..255ff13f8658 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 @@ -7,6 +7,7 @@ inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="NX compression technology core libraries" HOMEPAGE="https://github.com/ArcticaProject/nx-libs" SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-libs-${PV}.tar.gz" +S="${WORKDIR}/nx-libs-${PV}" LICENSE="GPL-2" SLOT="0" @@ -41,8 +42,6 @@ BDEPEND="virtual/pkgconfig RDEPEND+=" selinux? ( sec-policy/selinux-nx )" -S="${WORKDIR}/nx-libs-${PV}" - PATCHES=( # https://github.com/ArcticaProject/nx-libs/pull/1012 "${FILESDIR}/${PN}-3.5.99.26-binutils-2.36.patch" @@ -50,6 +49,11 @@ 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/ArcticaProject/nx-libs/pull/1087 + "${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch" + "${FILESDIR}/${PN}-3.5.99.26-gcc14-access.patch" + # https://github.com/ArcticaProject/nx-libs/issues/1044 + "${FILESDIR}/${PN}-3.5.99.26-clang-bind.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..d4ef7e951c9a 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 @@ -8,6 +8,7 @@ DESCRIPTION="NX compression technology core libraries" HOMEPAGE="https://github.com/ArcticaProject/nx-libs" SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-libs-${PV}.tar.gz" +S="${WORKDIR}/nx-libs-${PV}" LICENSE="GPL-2" SLOT="0" @@ -39,11 +40,14 @@ BDEPEND="virtual/pkgconfig x11-misc/gccmakedep x11-misc/imake" -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" + "${FILESDIR}/${PN}-3.5.99.26-gcc14-access.patch" + # https://github.com/ArcticaProject/nx-libs/issues/1044 + "${FILESDIR}/${PN}-3.5.99.26-clang-bind.patch" ) src_prepare() { diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 6417c6188e01..d4a77468b7fe 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -4,3 +4,5 @@ DIST openssh-9.8p1.tar.gz 1910393 BLAKE2B 3bf983c4ef5358054ed0104cd51d3e0069fbc2 DIST openssh-9.8p1.tar.gz.asc 833 BLAKE2B 5291e8c03ab9a75acb44285cd7fc010f4a33551f142499624165dac708fc05a6d077df81555aa41037b45f6301e4e5db3161a7a23404473f8a233a877fc55cc3 SHA512 4df1f1be2c6ab7f3aebaedd0a773b0e8c8929abb30cd3415873ad55d012cfa113f792e888e5e772dd468c394aeb7e35d62893a514dbc0ab1a03acd79918657f7 DIST openssh-9.9p1.tar.gz 1964864 BLAKE2B 817d267e42b8be74a13e0cfd7999bdb4dab6355c7f62c1a4dd89adad310c5fb7fe3f17109ce1a36cd269a3639c1b8f1d18330c615ab3b419253ec027cfa20997 SHA512 3cc0ed97f3e29ecbd882eca79239f02eb5a1606fce4f3119ddc3c5e86128aa3ff12dc85000879fccc87b60e7d651cfe37376607ac66075fede2118deaa685d6d DIST openssh-9.9p1.tar.gz.asc 833 BLAKE2B 0e19668eb5cadea0e7b06caf2bc2f4cee7e7656a780a128090dcdf2acc25c6e0e0fc7c4c83c95ffcd567cd03941ec772b0f5b273e6f79ff4e440e1d9f22bcdb7 SHA512 916e975c54eb68c0b2f0b0006522b241cbe54c4caa88d31537a6278490c93d9d732c2ab3a080ac084bf75cbdd5402901ec68583cbe7c7cde4a8e40e7a8b78c28 +DIST openssh-9.9p2.tar.gz 1944499 BLAKE2B 1b5bc09482b3a807ccfee52c86c6be3c363acf0c8e774862e0ae64f76bfeb4ce7cf29b3ed2f99c04c89bb4977da0cf50a7a175b15bf1d9925de1e03c66f8306d SHA512 4c6d839aa3189cd5254c745f2bd51cd3f468b02f8e427b8d7a16b9ad017888a41178d2746dc51fb2d3fec5be00e54b9ab7c32c472ca7dec57a1dea4fc9840278 +DIST openssh-9.9p2.tar.gz.asc 833 BLAKE2B 21d9ef3da2b54be47420327f1c724e38eef951ea11d646de81ac3ee2abf3d81f218424432cf5ac7d60cdae72e2190001f923dbdf5bed57f4a105ee1895261c9d SHA512 e7f9bc74d27e5cf8cbf4f5831fddd1d8ad00b03e51e7deb7f95ef17c5017ab7ce0116f4770374aaf6bd3a5f6013dab651a7651b21fa303d05ad6d14b537ab955 diff --git a/net-misc/openssh/openssh-9.9_p1.ebuild b/net-misc/openssh/openssh-9.9_p1.ebuild index f7d0bb0f9fee..53c02164c5aa 100644 --- a/net-misc/openssh/openssh-9.9_p1.ebuild +++ b/net-misc/openssh/openssh-9.9_p1.ebuild @@ -23,7 +23,7 @@ S="${WORKDIR}/${PARCH}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # Probably want to drop ssl defaulting to on in a future version. IUSE="abi_mips_n32 audit debug kerberos ldns legacy-ciphers libedit livecd pam +pie security-key selinux +ssl static test xmss" diff --git a/net-misc/openssh/openssh-9.9_p2.ebuild b/net-misc/openssh/openssh-9.9_p2.ebuild new file mode 100644 index 000000000000..811d22c7ae92 --- /dev/null +++ b/net-misc/openssh/openssh-9.9_p2.ebuild @@ -0,0 +1,442 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Remember to check the upstream release/stable branches for patches +# to backport! See https://marc.info/?l=openssh-unix-dev&m=172723798122122&w=2. + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc +inherit user-info flag-o-matic autotools optfeature pam systemd toolchain-funcs verify-sig + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI=" + mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit debug kerberos ldns legacy-ciphers libedit livecd pam +pie security-key selinux +ssl static test xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + xmss? ( ssl ) + test? ( ssl ) +" + +# tests currently fail with XMSS +REQUIRED_USE+="test? ( !xmss )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + net-libs/ldns[ecdsa(+),ssl(+)] + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) + virtual/libcrypt:=[static-libs(+)] + >=sys-libs/zlib-1.2.3:=[static-libs(+)] +" +RDEPEND=" + acct-group/sshd + acct-user/sshd + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( sys-libs/pam ) + kerberos? ( virtual/krb5 ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers + kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) + static? ( ${LIB_DEPEND} ) +" +RDEPEND=" + ${RDEPEND} + !net-misc/openssh-contrib + pam? ( >=sys-auth/pambase-20081028 ) + !prefix? ( sys-apps/shadow ) +" +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-openssh ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" + "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch" + "${FILESDIR}/${PN}-9.7_p1-config-tweaks.patch" + # Backports from upstream release branch + #"${FILESDIR}/${PV}" + # Our own backports + "${FILESDIR}/${PN}-9.9_p1-x-forwarding-slow.patch" +) + +pkg_pretend() { + local i enabled_eol_flags disabled_eol_flags + for i in hpn sctp X509; do + if has_version "net-misc/openssh[${i}]"; then + enabled_eol_flags+="${i}," + disabled_eol_flags+="-${i}," + fi + done + + if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then + # Skip for binary packages entirely because of environment saving, bug #907892 + [[ ${MERGE_TYPE} == binary ]] && return + + ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore." + ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality," + ewarn "since these USE flags required third-party patches that often trigger bugs" + ewarn "and are of questionable provenance." + ewarn + ewarn "If you must continue relying on this functionality, switch to" + ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your" + ewarn "world file first: 'emerge --deselect net-misc/openssh'" + ewarn + ewarn "In order to prevent loss of SSH remote login access, we will abort the build." + ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib" + ewarn "variant, when re-emerging you will have to set" + ewarn + ewarn " OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + + die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." + fi +} + +src_prepare() { + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + default + + # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox + sed -e '/\t\tpercent \\/ d' \ + -i regress/Makefile || die + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + use xmss && append-cflags -DWITH_XMSS + + if [[ ${CHOST} == *-solaris* ]] ; then + # Solaris' glob.h doesn't have things like GLOB_TILDE, configure + # doesn't check for this, so force the replacement to be put in + # place + append-cppflags -DBROKEN_GLOB + fi + + # use replacement, RPF_ECHO_ON doesn't exist here + [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty + --with-privsep-user=sshd + # optional at runtime; guarantee a known path + --with-xauth="${EPREFIX}"/usr/bin/xauth + + # --with-hardening adds the following in addition to flags we + # already set in our toolchain: + # * -ftrapv (which is broken with GCC anyway), + # * -ftrivial-auto-var-init=zero (which is nice, but not the end of + # the world to not have) + # * -fzero-call-used-regs=used (history of miscompilations with + # Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086, + # gcc PR104820, gcc PR104817, gcc PR110934)). + # + # Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK, + # so we cannot just disable -fzero-call-used-regs=used. + # + # Therefore, just pass --without-hardening, given it doesn't negate + # our already hardened toolchain defaults, and avoids adding flags + # which are known-broken in both Clang and GCC and haven't been + # proven reliable. + --without-hardening + + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + $(use_with ldns) + $(use_enable legacy-ciphers dsa-keys) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with security-key security-key-builtin) + $(use_with ssl openssl) + $(use_with ssl ssl-engine) + ) + + if use elibc_musl; then + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) + myconf+=( --disable-utmp --disable-wtmp ) + fi + + # Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all + # bug #869839 (https://github.com/llvm/llvm-project/issues/57692) + tc-is-clang && myconf+=( --without-hardening ) + + econf "${myconf[@]}" +} + +create_config_dropins() { + local locale_vars=( + # These are language variables that POSIX defines. + # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 + LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME + + # These are the GNU extensions. + # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html + LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE + ) + + mkdir -p "${WORKDIR}"/etc/ssh/ssh{,d}_config.d || die + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + # Send locale environment variables (bug #367017) + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM (bug #658540) + SendEnv COLORTERM + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts" + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_revoked_hosts || die + # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/ + ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + # Allow client to pass locale environment variables (bug #367017) + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM (bug #658540) + AcceptEnv COLORTERM + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-subsystem.conf || die + # override default of no subsystems + Subsystem sftp ${EPREFIX}/usr/$(get_libdir)/misc/sftp-server + EOF + + if use pam ; then + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + UsePAM yes + # This interferes with PAM. + PasswordAuthentication no + # PAM can do its own handling of MOTD. + PrintMotd no + PrintLastLog no + EOF + fi + + if use livecd ; then + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + # Allow root login with password on livecds. + PermitRootLogin Yes + EOF + fi +} + +src_compile() { + default + create_config_dropins +} + +src_test() { + local tests=( compat-tests ) + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + ewarn "user, so we will run a subset only." + tests+=( interop-tests ) + else + tests+=( tests ) + fi + + local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 + mkdir -p "${HOME}"/.ssh || die + emake -j1 "${tests[@]}" </dev/null +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd-r1.initd sshd + newconfd "${FILESDIR}"/sshd-r1.confd sshd + + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi + + doman contrib/ssh-copy-id.1 + dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config + + rmdir "${ED}"/var/empty || die + + systemd_dounit "${FILESDIR}"/sshd.socket + systemd_newunit "${FILESDIR}"/sshd.service.2 sshd.service + systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service' + + # Install dropins with explicit mode, bug 906638, 915840 + diropts -m0755 + insopts -m0644 + insinto /etc/ssh + doins -r "${WORKDIR}"/etc/ssh/ssh_config.d + doins "${WORKDIR}"/etc/ssh/ssh_revoked_hosts + diropts -m0700 + insopts -m0600 + doins -r "${WORKDIR}"/etc/ssh/sshd_config.d +} + +pkg_preinst() { + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then + show_ssl_warning=1 + fi +} + +pkg_postinst() { + # bug #139235 + optfeature "x11 forwarding" x11-apps/xauth + + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if ver_test "${old_ver}" -lt "5.8_p1"; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if ver_test "${old_ver}" -lt "7.0_p1"; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if ver_test "${old_ver}" -lt "7.6_p1"; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if ver_test "${old_ver}" -lt "7.7_p1"; then + elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." + elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" + elog "if you need to authenticate against LDAP." + elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." + fi + if ver_test "${old_ver}" -lt "8.2_p1"; then + ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" + ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" + ewarn "connection is generally safe." + fi + if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then + ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to" + ewarn "'Restart=on-failure', which causes the service to automatically restart if it" + ewarn "terminates with an unclean exit code or signal. This feature is useful for most users," + ewarn "but it can increase the vulnerability of the system in the event of a future exploit." + ewarn "If you have a web-facing setup or are concerned about security, it is recommended to" + ewarn "set 'Restart=no' in your sshd unit file." + fi + done + + if [[ -n ${show_ssl_warning} ]]; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi + + openssh_maybe_restart +} + +openssh_maybe_restart() { + local ver + declare -a versions + read -ra versions <<<"${REPLACING_VERSIONS}" + for ver in "${versions[@]}"; do + # Exclude 9.8_p1 because it didn't have the safety check + [[ ${ver} == 9.8_p1 ]] && break + + if [[ ${ver%_*} == "${PV%_*}" ]]; then + # No major version change has occurred + return + fi + done + + if [[ ${ROOT} ]]; then + return + elif [[ -d /run/systemd/system ]] && sshd -t >/dev/null 2>&1; then + ewarn "The ebuild will now attempt to restart OpenSSH to avoid" + ewarn "bricking the running instance. See bug #709748." + ebegin "Attempting to restart openssh via 'systemctl try-restart sshd'" + systemctl try-restart sshd + eend $? + elif [[ -d /run/openrc ]]; then + # We don't check for sshd -t here because the OpenRC init script + # has a stop_pre() which does checkconfig, i.e. we defer to it + # to give nicer output for a failed sanity check. + ewarn "The ebuild will now attempt to restart OpenSSH to avoid" + ewarn "bricking the running instance. See bug #709748." + ebegin "Attempting to restart openssh via 'rc-service -q --ifstarted --nodeps sshd restart'" + rc-service -q --ifstarted --nodeps sshd restart + eend $? + fi +} diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest index 1d442d008a7e..b9a85aeb96fc 100644 --- a/net-misc/passt/Manifest +++ b/net-misc/passt/Manifest @@ -5,3 +5,4 @@ DIST passt-2024.05.10.tar.xz 195992 BLAKE2B 9f4b680daa8103c7de0c92c01824df74e1b2 DIST passt-2024.06.07.tar.xz 198360 BLAKE2B 378d4b18f245309fde54b244ffc435afb417d9d9711247234632ba0ae8dea35cac639c7674e6a6be008a678262af74a1dbe960477088d0b75045e6372d329488 SHA512 103955058c9a4e83264d3f65e3ff6d1a5e8a83b15f2fc73cba45101304fe79ab3c449ce2dc6add398a27f9d6556d5f902cf083223ed5e27228a0bbb506559cf0 DIST passt-2024.08.21-r1.tar.xz 209692 BLAKE2B 1b6b540f64528e375e6f0cfd90cec788b2b2281f7ab6dbe0f6df933757dcc4f37e154b2cd8e9e00adbc2b647a044fca05f2c48f49d05c0443c396831a2e13754 SHA512 ec09210b471377cc9f3d0044c97924834fadcfed7523aaab2f6c0fddb2d3d098c0730d1573e7c44963334d33dba5fbf660b0b222d4c71fab27cebf8edb52abf1 DIST passt-2024.09.06.tar.xz 210976 BLAKE2B 7c59d715a80bc9df2f0c85aef3f2cb2c2517941326cfecfe683770ebebc7815422db9f76e9ffbe17850441f0ffdcdfaa0602bd69af9dd8046cddb0dce131f255 SHA512 a9e7c0c7945759a65859c7cdaa0603f9805ff1efbe82496f1e638b3ce387b4ecc3828c2b1f100ed49332a1456a62a87ac9f8b4c62ce0599da423875f026da243 +DIST passt-2025.01.21.tar.xz 237504 BLAKE2B 80aafe2fbf5ba8d4065fe99a892102e2c8d18ce82ef4cee3970deeb6d07cb89d40084cf4b90c7747dbb69e3895ad254872faad394b311950412cc89b9eae819d SHA512 e2e23040f05b65e666a7ccbbaa54621a575bdc22e21e518aa17dcfdebd82e95af49feadd20d58536f99b990428d404d6d2c64c34433353a4ac1656bf76bab6c6 diff --git a/net-misc/passt/passt-2025.01.21.ebuild b/net-misc/passt/passt-2025.01.21.ebuild new file mode 100644 index 000000000000..371941c87892 --- /dev/null +++ b/net-misc/passt/passt-2025.01.21.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" +HOMEPAGE="https://passt.top/" + +RELEASE_COMMIT="4f2c8e7" +MY_PV="${PV//./_}.${RELEASE_COMMIT}" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://passt.top/passt" +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" +fi + +LICENSE="BSD GPL-2+" +SLOT="0" +IUSE="static" + +src_prepare() { + default + tc-export CC +} + +src_compile() { + [[ ${PV} != 9999* ]] && export VERSION="${PV}" + export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${PF}" + + emake $(usev static) +} diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index 5d0216061559..433a1c91f67e 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,3 +1,3 @@ DIST r8168-8.051.02.tar.bz2 115969 BLAKE2B 28b809c0330920ee0db7a8f8d41e178882531cd0a6793efeadd9670b1a9b5cbe903061073fd1d461f4234feb41249a244f9ef35cdbb780da498e5a6d6f1a5490 SHA512 2f29a413e7db2b7295ea0a970b3385de1dfd6e41e1820097355687daa5c8d155c1cf6115c72875bff4f366365579bffc81733469a62d76f437065b7e514387ca -DIST r8168-8.053.00.tar.gz 169102 BLAKE2B 4be044fec5edb78d3050c66f92ffce56487347c171da6d0e29593584e23b173536e48a18ffaf47df4e99999867a65b658a0deace333948bb0d77cd0f5c619719 SHA512 c44a63b04eb5cfb2b8ae434b26098c96067f7a2d6193e206801236fa38832b4f20a0b1a05a374f1d7d5b7ce973d38b6f49744f8b029e22930ebbd2763fbc6440 DIST r8168-8.054.00.tar.gz 170346 BLAKE2B d237f8158434b86f123ad54615b3b7079ee54e066baf80304d19c9fcec247ebafb348340a01260f15692341add349ae6daf0f2ac4ad7953f16f804861c3a4480 SHA512 31b64c39ab3d4b8077e3a9880e20fdbfeee99e5fc3e26327d27085c2f97862ffa33af5d5c0ff7624c1216fa9230282ed835600c17ad4a6de8a87f29661156bbf +DIST r8168-8.055.00.tar.gz 170917 BLAKE2B fc29066debac6d45f279f65a13e9dc812d270ec779f900acdc24a47dc94efd4ce65fb1d34553ff520ff9384382108b8fa14153bba70dbe58ad0eb8da2e39d30e SHA512 fb004b9921b75d984e847c9ac41fba58924f868485110dc4a8bc01933ec503f8a405b258d1c25f0884b1670aa0be4f4f250e36a176f31b4023032dc1c93577bb diff --git a/net-misc/r8168/metadata.xml b/net-misc/r8168/metadata.xml index 465ce5403e32..5968d1ccbd07 100644 --- a/net-misc/r8168/metadata.xml +++ b/net-misc/r8168/metadata.xml @@ -9,6 +9,15 @@ RTL8111B RTL8168B RTL8111 RTL8168 RTL8111C RTL8111CP RTL8111D(L) RTL8168C RTL8111DP RTL8111E RTL8168E RTL8111F RTL8411</longdescription> <use> + <flag name="down-speed-100">Reduce speed to 100 Mbps in WOL-only modes</flag> + <flag name="eee">Enable Energy-Efficient Ethernet by default</flag> + <flag name="giga-lite">Enable support of 'Giga Lite' (500 Mbps over just two CAT5 pairs) by default</flag> + <flag name="hw-acceleration">Enable use of hardware acceleration by default. HW acceleration may cause problems on Realtek NICs!</flag> + <flag name="multi-tx-q">Enable Multiple Tx Queue ('RSS' for sending)</flag> + <flag name="rss">Enable Receive Side Scaling (RSS)</flag> + <flag name="s5-keep-mac">Keep set MAC address in S5 (switched off) by default</flag> <flag name="use-firmware">Enable support for automatic firmware loading</flag> + <flag name="wol">Enable Wake-On-LAN by default</flag> + <flag name="wol-s5">Enable start from S5 (switched off) by Wake-On-LAN by default</flag> </use> </pkgmetadata> diff --git a/net-misc/r8168/r8168-8.053.00.ebuild b/net-misc/r8168/r8168-8.055.00.ebuild index 940d0ae9f3df..056afbf2755b 100644 --- a/net-misc/r8168/r8168-8.053.00.ebuild +++ b/net-misc/r8168/r8168-8.055.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,22 +11,30 @@ 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" +IUSE="down-speed-100 hw-acceleration +eee +giga-lite multi-tx-q rss s5-keep-mac +wol-s5 use-firmware +wol" CONFIG_CHECK="~!R8169" WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." -PATCHES=( "${FILESDIR}"/${PN}-8.053.00-kernel-6.9.patch ) - src_compile() { local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) local modargs=( # Build parameters KERNELDIR="${KV_OUT_DIR}" - # Configuration settings + # Code build options + ENABLE_RSS_SUPPORT=$(usex rss y n) + ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + CONFIG_DOWN_SPEED_100=$(usex down-speed-100 y n) + # Driver defaults + CONFIG_SOC_LAN=$(usex hw-acceleration y n) + ENABLE_EEE=$(usex eee y n) + ENABLE_GIGA_LITE=$(usex giga-lite y n) + DISABLE_WOL_SUPPORT=$(usex wol n y) + ENABLE_S5WOL=$(usex wol-s5 y n) + ENABLE_S5_KEEP_CURR_MAC=$(usex s5-keep-mac y n) ) linux-mod-r1_src_compile diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest index 737839a3a3a5..175dc9fc7bdc 100644 --- a/net-misc/rclone/Manifest +++ b/net-misc/rclone/Manifest @@ -2,3 +2,5 @@ DIST rclone-1.68.2-deps.tar.xz 313358984 BLAKE2B e57d4036e37b041b1c1c34b377683f3 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 +DIST rclone-v1.69.1-vendor.tar.gz 13831747 BLAKE2B 327c38cf386232b40963c89158c289705906760d97440e79e943a8c33d84366806e83604de0c69855c14b4ef2144f1a812ac3906e8dda896fd191dde36faa9ee SHA512 bd7c9b634bd8d165339ded0c38c5dea995f8eb13a9d9a6315ce375b8a5c09d2024bd504f6a8721294922c241db73c5159fb7c4f84de69f2a67b57fb43b9cf84a +DIST rclone-v1.69.1.tar.gz 16906745 BLAKE2B 2b701cacd169c1519a5e67199fa7c7b5938137b7baab1db276b70e4ac7c0e303e8ef1870a691a0534b399b89eff3a6f4d8d7930f1a3bebd175be1e47e4e9a8b8 SHA512 355a2295b0478de84475889663d7e7fb818f840c983e812e67de205eed725f1b2f00d667e66c0cec82a18af363dd7986a0f2cdd0ace4a2c81ffe167457238d3a diff --git a/net-misc/rclone/metadata.xml b/net-misc/rclone/metadata.xml index 08aec66404f8..62bbd6e959ea 100644 --- a/net-misc/rclone/metadata.xml +++ b/net-misc/rclone/metadata.xml @@ -12,5 +12,6 @@ <upstream> <bugs-to>https://github.com/rclone/rclone/issues/</bugs-to> <remote-id type="github">rclone/rclone</remote-id> + <changelog>https://rclone.org/changelog</changelog> </upstream> </pkgmetadata> diff --git a/net-misc/rclone/rclone-1.69.1.ebuild b/net-misc/rclone/rclone-1.69.1.ebuild new file mode 100644 index 000000000000..bbc13c2acf76 --- /dev/null +++ b/net-misc/rclone/rclone-1.69.1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit shell-completion check-reqs edo go-module + +DESCRIPTION="A program to sync files to and from various cloud storage providers" +HOMEPAGE="https://rclone.org/ + https://github.com/rclone/rclone/" +SRC_URI=" + https://github.com/rclone/rclone/releases/download/v${PV}/rclone-v${PV}.tar.gz + https://github.com/rclone/rclone/releases/download/v${PV}/rclone-v${PV}-vendor.tar.gz +" +S=${WORKDIR}/rclone-v${PV} + +LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + +RDEPEND=" + sys-fs/fuse:3 +" + +CHECKREQS_DISK_BUILD="2500M" + +pkg_setup() { + check-reqs_pkg_setup +} + +src_unpack() { + mkdir -p "${S}" || die + ln -s "../vendor" "${S}/vendor" || die + + go-module_src_unpack +} + +src_compile() { + local go_ldflags=" + -X github.com/rclone/rclone/fs.Version=${PV} + " + local -a go_buildargs=( + -ldflags "${go_ldflags}" + -mod=vendor + -o ./ + ) + ego build "${go_buildargs[@]}" + + edob ./rclone genautocomplete bash "${PN}.bash" + edob ./rclone genautocomplete zsh "${PN}.zsh" + edob ./rclone genautocomplete fish "${PN}.fish" +} + +src_test() { + # Setting CI skips unreliable tests, see "fstest/testy/testy.go" + # "TestAddPlugin" and "TestRemovePlugin" fail. + local -x CI="true" + local -x RCLONE_CONFIG="/not_found" + + ego test -mod=vendor -v -run "!Test.*Plugin" ./... +} + +src_install() { + exeinto /usr/bin + doexe "${PN}" + dosym -r "/usr/bin/${PN}" /usr/bin/mount.rclone + dosym -r "/usr/bin/${PN}" /usr/bin/rclonefs + + newbashcomp "${PN}.bash" "${PN}" + newzshcomp "${PN}.zsh" "_${PN}" + newfishcomp "${PN}.fish" "${PN}" + + doman "${PN}.1" + einstalldocs +} diff --git a/net-misc/scponly/files/scponly-4.8-C23.patch b/net-misc/scponly/files/scponly-4.8-C23.patch new file mode 100644 index 000000000000..113451e75aab --- /dev/null +++ b/net-misc/scponly/files/scponly-4.8-C23.patch @@ -0,0 +1,26 @@ +diff -ru a/helper.c b/helper.c +--- a/helper.c 2025-01-10 17:16:03.332900358 +0400 ++++ b/helper.c 2025-01-10 17:17:24.801652374 +0400 +@@ -1,7 +1,9 @@ + /* + * helper functions for scponly + */ ++#define _DEFAULT_SOURCE /* for strsep */ + #include <stdio.h> /* io */ ++#include <strings.h> /* for bzero */ + #include <string.h> /* for str* */ + #include <sys/types.h> /* for stat, getpwuid */ + #include <sys/stat.h> /* for stat */ +diff -ru a/scponly.c b/scponly.c +--- a/scponly.c 2025-01-10 17:16:03.332900358 +0400 ++++ b/scponly.c 2025-01-10 17:18:13.274524840 +0400 +@@ -6,7 +6,8 @@ + * + * see CONTRIB for additional credits + */ +- ++ ++#define _DEFAULT_SOURCE /* for seteuid */ + #include <stdio.h> /* io */ + #include <string.h> /* for str* */ + #include <sys/types.h> /* for fork, wait, stat */ diff --git a/net-misc/scponly/metadata.xml b/net-misc/scponly/metadata.xml index 3beb7f62de5b..995af96bb41e 100644 --- a/net-misc/scponly/metadata.xml +++ b/net-misc/scponly/metadata.xml @@ -32,5 +32,6 @@ </use> <upstream> <remote-id type="sourceforge">scponly</remote-id> + <remote-id type="github">scponly/scponly</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/scponly/scponly-4.8-r8.ebuild b/net-misc/scponly/scponly-4.8-r9.ebuild index 93ddd8138d29..2d6d02714439 100644 --- a/net-misc/scponly/scponly-4.8-r8.ebuild +++ b/net-misc/scponly/scponly-4.8-r9.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=7 +EAPI=8 -inherit readme.gentoo-r1 toolchain-funcs +inherit readme.gentoo-r1 toolchain-funcs autotools DESCRIPTION="A tiny pseudoshell which only permits scp and sftp" HOMEPAGE="https://github.com/scponly/scponly" @@ -32,18 +32,25 @@ PATCHES=( "${FILESDIR}/${P}-rsync.patch" "${FILESDIR}/${P}-gcc4.4.0.patch" "${FILESDIR}/${P}-sftp-server-path.patch" + "${FILESDIR}/${P}-C23.patch" ) +src_prepare() { + default + + # bug #900316 + eautoreconf +} + src_configure() { CFLAGS="${CFLAGS} ${LDFLAGS}" econf \ - --with-sftp-server="/usr/$(get_libdir)/misc/sftp-server" \ --disable-restrictive-names \ $(use_enable chroot chrooted-binary) \ - $(use_enable chroot chrooted-checkdir) \ + $(use_enable chroot chroot-checkdir) \ $(use_enable winscp winscp-compat) \ $(use_enable gftp gftp-compat) \ $(use_enable scp scp-compat) \ - $(use_enable sftp sftp) \ + $(use_with sftp sftp-server "/usr/$(get_libdir)/misc/sftp-server") \ $(use_enable quota quota-compat) \ $(use_enable passwd passwd-compat) \ $(use_enable rsync rsync-compat) \ diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest index 5644a6a438ed..c1195639cdce 100644 --- a/net-misc/smb4k/Manifest +++ b/net-misc/smb4k/Manifest @@ -1,2 +1,2 @@ -DIST smb4k-3.2.90.tar.xz 4454108 BLAKE2B 78a0aea75bc6f94438968369a43a1288da9cc9e43c5d0bc676621789c4fa779b5925cdfc2fd098c0c6a8b32629f9461294b37d3990579cc425939a1ee0b201f9 SHA512 27eae38add622bdf7a29c87da1266d394d7de45584988d393444afe48048de391c8ae0a822db26e817de970ece48de9969b4c7d96d8e4b46a1ed1d9c5d71b5dd DIST smb4k-3.2.92.tar.xz 4638924 BLAKE2B 9271d1be02136d51c28a24c2ac2a76de5708baffe76cd97e48867bce35f8f3988f63965d4bcff0f7a03b9f8e7a05af63578dd24b094e10553317a220fda3524e SHA512 a2010667454c5c0d24757c96fadb8a7d672eef201bc399dc99d9031c9b847a878545834422b7de2f5627eabaa8e5d0235da2f41da68e9178f7ee4eb431c878e8 +DIST smb4k-4.0.0.tar.xz 4852924 BLAKE2B 9539c2f02941d038a7bfb5fbc57162dedc3205f4a3249dce74eb9035133b4bc4efbd93a3eed4f1b8af862e6f4e1507630f366127110bd063e7b9016ff642ff5b SHA512 c856d3532f6c604caf1d58741928172d6ee23c725b9bc7c1e2c2071b61e478b47ff567f36b12ae970636e4ffb55915b5a6572c8e0402fd71d40415204c475d85 diff --git a/net-misc/smb4k/smb4k-3.2.90.ebuild b/net-misc/smb4k/smb4k-4.0.0.ebuild index cdcc38020584..beda7bf1a865 100644 --- a/net-misc/smb4k/smb4k-3.2.90.ebuild +++ b/net-misc/smb4k/smb4k-4.0.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 @@ -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/smbc/files/0001-Fix-signal-handlers.patch b/net-misc/smbc/files/0001-Fix-signal-handlers.patch new file mode 100644 index 000000000000..3e4ece3bef0c --- /dev/null +++ b/net-misc/smbc/files/0001-Fix-signal-handlers.patch @@ -0,0 +1,104 @@ +From 1d9dc54aea5a36aa43ce3bb5d5a013121fbd25ab Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 12 Feb 2025 16:04:02 +0000 +Subject: [PATCH 1/2] Fix signal handlers + +They need to take an argument but we don't use it. + +Signed-off-by: Sam James <sam@gentoo.org> +--- + src/smbc.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/smbc.c b/src/smbc.c +index 41a3d28..86349d0 100644 +--- a/src/smbc.c ++++ b/src/smbc.c +@@ -251,9 +251,9 @@ void RwinRedrawWithData(); + void RcompareTwoIndexFile(int RfdNew, int RfdOld, int RfdMessage); + int RtryDownloadUpload(); + void RtryLockFileAndCreateIndexFile(); +-void RsigAlarm(); +-void RsigTerm(); +-void RsigSEGV(); ++void RsigAlarm(int unused); ++void RsigTerm(int unused); ++void RsigSEGV(int unused); + char *RgetSmallPath(char *Rhost); + + //------------------------------------------------------------- +@@ -1196,7 +1196,7 @@ RmanageList() + { + if (!RdownloadListTmp) { + RDBG("smbc: RmanageList RpaintList - error expected next record\n"); +- RsigTerm(); ++ RsigTerm(0); + } + mvwhline(RwinCol1, ++Rk, 0, 32, 1); + mvwhline(RwinCol2, Rk, 0, 32, 1); +@@ -1354,7 +1354,7 @@ RmanageList() + } + + void +- RsigAlarmManageWindow() ++ RsigAlarmManageWindow(int unused) + { + RDBG("RmanageList : RsigAlarmManageWindow alarm\n"); + RdoWindowResizeDownloadList(); +@@ -5543,7 +5543,7 @@ RcreateFindListIndex(int Isave, char *Igroup, char *Ihost, char *Ipath, char *Id + } + + void +-RsigTerm() ++RsigTerm(int unused) + { + int Ri; + +@@ -5602,7 +5602,7 @@ RsigTerm() + } + + void +-RsigCHLD() ++RsigCHLD(int unused) + { + waitpid(RchildId, NULL, WNOHANG); + } +@@ -6393,7 +6393,7 @@ RsendWinpopupInput(char *RgroupInput) + } + + void +-RsigSEGV() ++RsigSEGV(int unused) + { + int Rres = errno; + +@@ -6404,7 +6404,7 @@ RsigSEGV() + RDBG("\n"); + RDBG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + Rerror = 1; +- RsigTerm(); ++ RsigTerm(0); + exit(Rres); + } + +@@ -6819,7 +6819,7 @@ RtryDownloadUpload() + } + + void +-RsigAlarm() ++RsigAlarm(int unused) + { + char RinsertChar = 1; + +@@ -8220,7 +8220,7 @@ RDBG("smbc: main 100\n"); + Rfree(RfileNameMessagePrim); + Rfree(RsmbcLockFile); + RDBG("----stop 2----\n"); +- RsigTerm(); ++ RsigTerm(0); + RfreeDebug(); + return(0); + } +-- +2.48.1 + diff --git a/net-misc/smbc/files/0002-Fix-Wformat-security.patch b/net-misc/smbc/files/0002-Fix-Wformat-security.patch new file mode 100644 index 000000000000..357856b0516d --- /dev/null +++ b/net-misc/smbc/files/0002-Fix-Wformat-security.patch @@ -0,0 +1,150 @@ +From 0f514db1868a34839a673257543a00383a5183df Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 12 Feb 2025 16:07:23 +0000 +Subject: [PATCH 2/2] Fix -Wformat-security + +Signed-off-by: Sam James <sam@gentoo.org> +--- + src/dulist.c | 2 +- + src/fnet.c | 14 +++++++------- + src/smbc.c | 16 ++++++++-------- + 3 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/src/dulist.c b/src/dulist.c +index 23c0024..c353acc 100644 +--- a/src/dulist.c ++++ b/src/dulist.c +@@ -200,7 +200,7 @@ RShowAllItemsFromDUlist(int RnrDulist) + Rstraddtoend(&RstrT, "/"); + Rstraddtoend(&RstrT, Rdls->filename); + Rstraddtoend(&RstrT, "\n"); +- printf(to_scr(RstrT)); ++ printf("%s", to_scr(RstrT)); + Rfree(RstrT); + RfreeOneTTdownloadAndGoToFirst(&Rdls); + } +diff --git a/src/fnet.c b/src/fnet.c +index cc401af..7c35d2e 100644 +--- a/src/fnet.c ++++ b/src/fnet.c +@@ -184,7 +184,7 @@ void + refreshw(WINDOW *win, char *buf) + { + werase(win); +- mvwprintw(win, 1, 1, buf); ++ mvwprintw(win, 1, 1, "%s", buf); + } + + int +@@ -407,7 +407,7 @@ RmvwprintwCenter(WINDOW *win, int i, char *str) + int y, x; + + getmaxyx(win, y, x); +- mvwprintw(win, i, x/2-strlen(str)/2, str); ++ mvwprintw(win, i, x/2-strlen(str)/2, "%s", str); + wrefresh(win); + } + +@@ -427,7 +427,7 @@ refreshTxtInWin(WINDOW *win, int y, int x, char *buf, int winSize, int startidx, + wattron(win, COLOR_PAIR(colorPair)); + mvwhline(win, y, x+xDelta, ' ', winSize-xDelta); + wattron(win, attr); +- mvwprintw(win, y, x+xDelta, str+startidx); ++ mvwprintw(win, y, x+xDelta, "%s", str+startidx); + wattroff(win, attr); + if (colorPair != -1) + wattroff(win, COLOR_PAIR(colorPair)); +@@ -474,7 +474,7 @@ refreshTxtInWinCursor(WINDOW *win, int y, int x, char *buf, int winSize, int sta + Rstr = strdup(Rbuf+startidx); + Rstr[xCursor-startidx] = 0; + RDBG("fnet refreshTxtInWinCursor 1: Rstr = \""); RDBG(Rstr); RDBG("\"\n"); +- mvwprintw(win, y, x, Rstr); ++ mvwprintw(win, y, x, "%s", Rstr); + Rprinted = strlen(Rstr); + Rfree(Rstr); + +@@ -500,7 +500,7 @@ refreshTxtInWinCursor(WINDOW *win, int y, int x, char *buf, int winSize, int sta + RDBG("fnet refreshTxtInWinCursor 23\n"); + } + RDBG("fnet refreshTxtInWinCursor 29: Rstr = \""); RDBG(Rstr); RDBG("\"\n"); +- mvwprintw(win, y, x+Rprinted, Rstr); ++ mvwprintw(win, y, x+Rprinted, "%s", Rstr); + Rfree(Rstr); + wattroff(win, A_REVERSE); + Rprinted++; +@@ -514,7 +514,7 @@ refreshTxtInWinCursor(WINDOW *win, int y, int x, char *buf, int winSize, int sta + if (winSize-Rprinted < strlen(Rstr)) + Rstr[winSize-Rprinted] = 0; + RDBG("fnet refreshTxtInWinCursor 3: Rstr = \""); RDBG(Rstr); RDBG("\"\n"); +- mvwprintw(win, y, x+Rprinted, Rstr); ++ mvwprintw(win, y, x+Rprinted, "%s", Rstr); + Rfree(Rstr); + } + +@@ -929,7 +929,7 @@ Rmvwprintw(WINDOW *win, int y, int x, const char *fmt) + } + RDBG("fnet: RmvwprintwAddPercent fmt = |"); RDBG((char *)fmt); RDBG("|\n"); + RDBG("fnet: RmvwprintwAddPercent Rc1 = |"); RDBG(Rc1); RDBG("|\n"); +- mvwprintw(win, y, x, Rc1); ++ mvwprintw(win, y, x, "%s", Rc1); + Ri = strlen(Rc1); + Rfree(Rc1); + RDBG("fnet: RmvwprintwAddPercent end\n"); +diff --git a/src/smbc.c b/src/smbc.c +index 86349d0..d2fbb07 100644 +--- a/src/smbc.c ++++ b/src/smbc.c +@@ -2174,7 +2174,7 @@ RwinRedraw() + mvwhline(RwinLeftTop, 0, 0, 0, RxHalf-2); + mvwhline(RwinRightTop, 0, 0, 0, RxHalf-2); + mvwprintw(RwinHead, 0, 0,"Samba Commander %s", VERSION); +- mvwprintw(RwinHead, 0, RmainWinX-Rstrlen(Rm108), Rm108); ++ mvwprintw(RwinHead, 0, RmainWinX-Rstrlen(Rm108), "%s", Rm108); + mvwhline(RwinLeft, 2, 1, 0, RxHalf-2); + mvwhline(RwinLeft, 2, 1, 0, RxHalf-2); + mvwvline(RwinLeftList, 0, 1, 0, RmainWinY-6); +@@ -3615,9 +3615,9 @@ RreadRcfile() + Rstraddtoend(&Rfile, "/.smbc/smbcrc"); + if (access(Rfile, F_OK) != 0) + { +- printf(Rm242, Rfile); +- printf(Rm243); +- printf(Rm244); ++ printf("%s", Rm242, Rfile); ++ printf("%s", Rm243); ++ printf("%s", Rm244); + return; + } + Rfd = open(Rfile, O_RDONLY); +@@ -5575,8 +5575,8 @@ RsigTerm(int unused) + endwin(); + if (!Ri) + { +- printf(Rm156); +- printf(Rm157); ++ printf("%s", Rm156); ++ printf("%s", Rm157); + } + if ((RmainWinX < 80) || (RmainWinY < 25)) + printf(Rm158, RmainWinX, RmainWinY); +@@ -5589,7 +5589,7 @@ RsigTerm(int unused) + if (Rerror) + { + printf("**********************************************************\n"); +- printf(Rm159); ++ printf("%s", Rm159); + printf("**********************************************************\n"); + } + +@@ -6990,7 +6990,7 @@ main(int argc,char *argv[]) + { + fprintf(stderr, Rm175, errno); + if (errno == 2) +- fprintf(stderr, Rm176); ++ fprintf(stderr, "%s", Rm176); + exit(0); + } + +-- +2.48.1 + diff --git a/net-misc/smbc/smbc-1.2.2-r3.ebuild b/net-misc/smbc/smbc-1.2.2-r4.ebuild index 67bb75f96311..6799dc8a4a58 100644 --- a/net-misc/smbc/smbc-1.2.2-r3.ebuild +++ b/net-misc/smbc/smbc-1.2.2-r4.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 @@ -15,17 +15,22 @@ KEYWORDS="~amd64 ~ppc ~x86" IUSE="nls debug" BDEPEND="virtual/pkgconfig" -DEPEND="dev-libs/popt +DEPEND=" + dev-libs/popt net-fs/samba - sys-libs/ncurses - nls? ( sys-devel/gettext )" + sys-libs/ncurses:= + nls? ( sys-devel/gettext ) +" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${P}-cflags.patch +PATCHES=( + "${FILESDIR}"/${P}-cflags.patch "${FILESDIR}"/${P}-size_t.patch "${FILESDIR}"/${P}-samba4-includes.patch "${FILESDIR}"/${P}-multiple-definitions-gcc10.patch "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/0001-Fix-signal-handlers.patch + "${FILESDIR}"/0002-Fix-Wformat-security.patch ) src_prepare() { diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest index 10d287c7ff54..eaed89193841 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1,2 +1,3 @@ DIST streamlink-6.11.0.tar.gz 763094 BLAKE2B 7fb0a84088991bc5a7514e0a40d5c05d3a14da5cffbcb255c5e5767fcae8c745a6397cbe79b0b0fd5bebab32b0d8d6c015931af03e6eaa199b5ed9437d0f3a7e SHA512 e6d6e49d2df0aa76ebca76c0b3ada085eac59553423a5ccaa3d5cb62f6be0a679da36c4f78a3e1fea48b22144e705b8de9e46fc146c1c93889ef0c056d59fc7b DIST streamlink-7.1.2.tar.gz 772724 BLAKE2B 0a5165e0ec33c127272e4f232fc0ee421bafc54147a1e99424bbbd45ebb41ee2d8bae4fa68e278c1ddf26e8bc9cfe401616e108a2a1fa93fa34d4561046028f4 SHA512 da552336700a0b7e391435aa3e369d0f8b2868a13e15dd5110869a67d164b6775f924fe09839c00bf9f5d9ce0935380ec8c0996fdc58b82c6bbe5e6c6f89ec04 +DIST streamlink-7.1.3.tar.gz 772024 BLAKE2B 8635302f316b3988010aab4aad2a7becd2b0b92e34357510da783681b54c34eb859ba065c65d4904c294275df0ceaf11e5440c196e62d09400592f4a2a63d8b7 SHA512 77ec1f4fb00c3ba708593060c980d6a1bda0dcf7ca8b5583dd97025b5a48cba540ced776f3d146818daa7f1fa16d8d72854c14b2ca039680d9a16a039fdba268 diff --git a/net-misc/streamlink/streamlink-7.1.3.ebuild b/net-misc/streamlink/streamlink-7.1.3.ebuild new file mode 100644 index 000000000000..bea32382bb39 --- /dev/null +++ b/net-misc/streamlink/streamlink-7.1.3.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" + inherit git-r3 +fi + +DISTUTILS_SINGLE_IMPL=1 +# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools +# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7 +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE='xml(+),threads(+)' +inherit distutils-r1 + +DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" +HOMEPAGE="https://streamlink.github.io/" + +if [[ ${PV} != 9999* ]]; then + SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" +fi + +LICENSE="BSD-2 Apache-2.0" +SLOT="0" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep +RDEPEND=" + media-video/ffmpeg + $(python_gen_cond_dep ' + dev-python/exceptiongroup[${PYTHON_USEDEP}] + ' 3.10) + $(python_gen_cond_dep ' + dev-python/certifi[${PYTHON_USEDEP}] + || ( + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] + ) + >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] + dev-python/isodate[${PYTHON_USEDEP}] + >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] + >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] + dev-python/pycountry[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] + >dev-python/pysocks-1.5.7[${PYTHON_USEDEP}] + >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] + >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/setuptools-64[${PYTHON_USEDEP}] + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + test? ( + >=dev-python/freezegun-1.5.0[${PYTHON_USEDEP}] + dev-python/pytest-trio[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] + ) + ') +" + +if [[ ${PV} == 9999* ]]; then + RDEPEND+=" + $(python_gen_cond_dep ' + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + ') + " +fi + +distutils_enable_tests pytest diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild index 38bb73a0d640..bea32382bb39 100644 --- a/net-misc/streamlink/streamlink-9999.ebuild +++ b/net-misc/streamlink/streamlink-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 @@ -58,7 +58,7 @@ BDEPEND=" >=dev-python/setuptools-64[${PYTHON_USEDEP}] >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] test? ( - >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] + >=dev-python/freezegun-1.5.0[${PYTHON_USEDEP}] dev-python/pytest-trio[${PYTHON_USEDEP}] dev-python/requests-mock[${PYTHON_USEDEP}] ) 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.15.0.ebuild index 2e6cd6b87324..2e6cd6b87324 100644 --- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.14.90.ebuild +++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.15.0.ebuild diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 6f9e98885706..dd726675e899 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,4 +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 tigervnc-1.15.0.tar.gz 2126369 BLAKE2B c8646860884ae8fec7f81d9e87967bb279e7bf7ebcc69973660ed827f5a1cf6d8700a70a364e9099e68779b6dfb168242db2afa428f5cfc11784020696261191 SHA512 0b550296b5bd06ac9d63ce10861ff54d24e79b6ac1551d80e9b81845fa873d85bfd684112c66d86188c9c61fdffb9421ea8696c1c7fd15a24fb1bf6bfe6a5e05 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.15.0.ebuild index ef7fe09fa151..182341e8300f 100644 --- a/net-misc/tigervnc/tigervnc-1.14.90.ebuild +++ b/net-misc/tigervnc/tigervnc-1.15.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 CMAKE_IN_SOURCE_BUILD=1 -inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg +inherit autotools cmake eapi9-ver flag-o-matic java-pkg-opt-2 optfeature systemd xdg XSERVER_VERSION="21.1.15" XSERVER_PATCH_VERSION="21" @@ -216,7 +216,7 @@ src_install() { pkg_postinst() { xdg_pkg_postinst - use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && { + use server && ver_replacing -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 diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild index e6b48ddae8b5..fc3969c4f12e 100644 --- a/net-misc/tigervnc/tigervnc-9999.ebuild +++ b/net-misc/tigervnc/tigervnc-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# 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 +inherit autotools cmake eapi9-ver flag-o-matic java-pkg-opt-2 optfeature systemd xdg XSERVER_VERSION="21.1.14" XSERVER_PATCH_VERSION="21" @@ -215,7 +215,7 @@ src_install() { pkg_postinst() { xdg_pkg_postinst - use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && { + use server && ver_replacing -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 diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 27b3c0d34028..222845e7f31e 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,2 +1,4 @@ -DIST turbovnc-3.1.3.tar.gz 9041525 BLAKE2B c1ce3685caf457aeab76a9ae3bf02aa03f8e0bf48af7eb99ccfdfffc3fb9ae4f0a2b2c082103fc721c5e1674dfbdd0b2df072c08696b927be4487a06d1dd6c2a SHA512 34929fbb02c047796f278ebd55cfb4a4361ae9b260e224990e493a2af69403ea1a4563459464b4df771a3bafb601ac6569f58e3fc04c45366b3dc61af7db38eb -DIST turbovnc-3.1.3.tar.gz.sig 543 BLAKE2B f9a7361238338830e914824b221648628b8d716a5427fb95b0b2027ab9d0edd9454394759fbea74d6ba8ba74e314d325564fd879b561aa6568be2776f4e15a70 SHA512 357c08ada0ac295488a54c0c1b3f81645b492e2a849e88be491a4a2373aae7925a236e2fbc38fe3361361f52540550516fd0671cc8d02b9cb3b8c3b6c66a2379 +DIST turbovnc-3.1.4.tar.gz 9047653 BLAKE2B 70023b5e036913e9828e07d2f1f56a73649c79eabfa4fe11c8fa5b826be057b3b1486b6d7d5f3a44b8c69f3478562ceffebe7be303830d5b7636dabef6b19b0b SHA512 b9d2f2b7f2e0c2d9485b85f55a762bd6e36f72db64d6bcace48100502624e2b805baee373fa1f7d0aa7b82623cc8d73b350adfbe87ce20357217722831d0d109 +DIST turbovnc-3.1.4.tar.gz.sig 543 BLAKE2B 8e76eacf7564671c179a6769859ec19c63d4839a7529bdc49e7a66cd4b45d452e61f45df78670ce3e314e44d3cb1fce234bda53b5ff1120931b8e2f9d892b610 SHA512 e63fc61caea3a385d51b9c0ddba47091c7a463ec684cd62433c3d47cb6cbcef72c84d92d0498f747b192bd962e5701a805d1277588b030a4743772ac90c32d5d +DIST turbovnc-3.1.90.tar.gz 5487295 BLAKE2B a3e8867d0fa2bfbd3b4013142d502fd9cb48d14262beb252ab82f04128ce55b0936d4f72cb75cc6a5906bcf73ec26fff690921f137c0eae71c97cbab034b3f9e SHA512 141fc55d89271e12b979a2b78b3560124e9bf9007bdfb1c5d6e551312fff34b3207e2b08965cf2ab4dd18cab644b4ec26a43939dc61de666f7ba87f1aa98e685 +DIST turbovnc-3.1.90.tar.gz.sig 543 BLAKE2B 24b6df39866baa9eb5d30fc6dec58edb532bca2fb048416ab1af349542c13b150774d705d6239226bf8bde3e7cbc66700508496d9b531b00b39d2c61d23721d5 SHA512 38075dbd73572849671a7a4087e5ddeac5a0b231fa658b6e6965faf1b17de6b94e3579c5ae66bd74b044909b3ade8bf45d395318d777e10437ccf6160a6fe918 diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml index 5c1cfb86ec9a..e7e552c66855 100644 --- a/net-misc/turbovnc/metadata.xml +++ b/net-misc/turbovnc/metadata.xml @@ -14,6 +14,7 @@ By The VirtualGL Project. </longdescription> <use> + <flag name="dri3">Build with DRI3 support</flag> <flag name="server">Build the server (vncserver, Xvnc)</flag> <flag name="viewer">Build the viewer (vncviewer)</flag> </use> diff --git a/net-misc/turbovnc/turbovnc-3.1.3.ebuild b/net-misc/turbovnc/turbovnc-3.1.4.ebuild index 48280a488651..c44ffe0fd5ca 100644 --- a/net-misc/turbovnc/turbovnc-3.1.3.ebuild +++ b/net-misc/turbovnc/turbovnc-3.1.4.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/turbovnc/turbovnc-3.2_beta1.ebuild b/net-misc/turbovnc/turbovnc-3.2_beta1.ebuild new file mode 100644 index 000000000000..e0bf420e377d --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.2_beta1.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_OPT_USE=viewer +inherit cmake desktop java-pkg-opt-2 optfeature verify-sig + +MY_PV=${PV/_/} +# Upstream's version 3.2beta1 is 3.1.90 +INTERNAL_PV=3.1.90 + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/" +SRC_URI=" + https://github.com/TurboVNC/turbovnc/releases/download/${MY_PV}/turbovnc-${INTERNAL_PV}.tar.gz + verify-sig? ( https://github.com/TurboVNC/turbovnc/releases/download/${MY_PV}/turbovnc-${INTERNAL_PV}.tar.gz.sig ) +" +S="${WORKDIR}"/${PN}-${INTERNAL_PV} + +LICENSE="GPL-2" +SLOT="0" +IUSE="dri3 +server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" + +COMMON_DEPEND=" + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-misc/xkeyboard-config + server? ( + media-libs/libjpeg-turbo:= + sys-libs/pam + virtual/opengl + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/pixman + dri3? ( + media-libs/mesa[opengl] + x11-libs/libxshmfence + ) + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] + ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + viewer? ( >=virtual/jre-17:* ) +" + +# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 +# but cmake will look for them, so add them here +DEPEND=" + ${COMMON_DEPEND} + media-libs/mesa + x11-libs/xtrans + viewer? ( >=virtual/jdk-17:* ) + server? ( + app-arch/bzip2 + media-libs/freetype + x11-libs/libfontenc + ) +" + +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) +" + +PATCHES=( + "${FILESDIR}"/"${PN}"-3.0.90-fix-musl-compilation.patch +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vgl-turbovnc.asc + +#879797 - BSD functions +QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy ) + +pkg_pretend() { + if use ssl && ! use server; then + einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused" + fi +} + +src_prepare() { + use viewer && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTVNC_BUILDVIEWER=$(usex viewer) + -DTVNC_BUILDSERVER=$(usex server) + -DTVNC_BUILDWEBSERVER=$(usex server) + ) + + if use server ; then + mycmakeargs+=( + -DTVNC_ZLIBNG=ON + -DTVNC_DRI3=$(usex dri3) + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + if use ssl ; then + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=OpenSSL + -DTVNC_DLOPENSSL=OFF + ) + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + fi + + if use viewer ; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" + fi + + cmake_src_configure +} + +src_compile() { + # would need sys-libs/zlib-ng[compat] to unbundle this + use server && cmake_build unix/Xvnc/lib/zlib-ng + + cmake_src_compile +} + +src_install() { + cmake_src_install + + if use viewer; then + java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar + + # replace upstream bash wrapper with the Gentoo one to choose the right javavm + rm "${ED}"/usr/bin/vncviewer + java-pkg_dolauncher vncviewer --jar VncViewer.jar \ + --java_args "-server -Djava.library.path=\"${EPREFIX}\"/usr/share/turbovnc/classes" + + make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png + fi + + # Don't install incompatible init script + if use server; then + rm -r "${ED}"/etc/init.d/ || die + rm -r "${ED}"/etc/sysconfig/ || die + fi + + # Conflicts with x11-base/xorg-server + find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die + + einstalldocs +} + +pkg_postinst() { + use server && optfeature "dbus support" sys-apps/dbus +} diff --git a/net-misc/unison/unison-2.53.7-r1.ebuild b/net-misc/unison/unison-2.53.7-r1.ebuild index f50d2cc3f428..5e85cd56eff5 100644 --- a/net-misc/unison/unison-2.53.7-r1.ebuild +++ b/net-misc/unison/unison-2.53.7-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 @@ -17,7 +17,7 @@ else SRC_URI="https://github.com/bcpierce00/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" fi LICENSE="GPL-2" diff --git a/net-misc/vrrpd/Manifest b/net-misc/vrrpd/Manifest index ff0f05077753..98bc25022fa0 100644 --- a/net-misc/vrrpd/Manifest +++ b/net-misc/vrrpd/Manifest @@ -1,2 +1,3 @@ DIST vrrpd-1.15.tar.bz2 148430 BLAKE2B 787fa185ce64a0711403718b2627d9d2d8867ef3956090b93196f62d92428e0e02ee4440bc23fda46cdca70ca6693b76ed28a5e469a31e86fa4e36dc25c6a82a SHA512 4e7fa17e01d9b667f538204fbe84decea47ac7d84da8adf2e8e3bcf042d233a704a99347d3d97531993f2693c145ff54fb3ac346ade33f5d99cfbbac405ed784 +DIST vrrpd-1.18.tar.bz2 242752 BLAKE2B bf6dc9481bdaf8988953c5344295738f7163a3499b53d039a318e423f8d1c955a42b54415d376a71e1a5a3eb4f413bb9e9fafef22dc00afa151dd99f007e9261 SHA512 d0fe53960ad7dc79457f92bbc78fd9a7d6d3c4406a26af55dfb50d8589fec0daae364945fe2e642650eb41ef06f85c85735ac9438a84fa486675eb2edc875344 DIST vrrpd-1.9.tar.gz 542249 BLAKE2B a412559be70791515c6b82639a8e1d5fc33954963fbf00aa3c549434ac0748b9d0ea657b2d02b1a3537a30742c18fe6d6db832a11c23b6989151c5f04c771d05 SHA512 8c719cabbd6a799e4e439dbb698af9d6e24cf2635cfbd71a204b46bd2b65c1384e53f130b663d0fcfc903d89080ff25d9c97ae4cd9f6b2434d5462cf678a306b diff --git a/net-misc/vrrpd/vrrpd-1.18.ebuild b/net-misc/vrrpd/vrrpd-1.18.ebuild new file mode 100644 index 000000000000..f1af88957240 --- /dev/null +++ b/net-misc/vrrpd/vrrpd-1.18.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Virtual Router Redundancy Protocol Daemon" +HOMEPAGE="https://gitlab.com/fredbcode/Vrrpd/" +GITLAB_SHA1="4fdb0d95fd6a09a229a31e975b01271f6245ab5b" +SRC_URI="https://gitlab.com/fredbcode/Vrrpd/-/archive/v${PV}/${P}.tar.bz2" + +S="${WORKDIR}/Vrrpd-v${PV}-${GITLAB_SHA1}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_prepare() { + default + + # Don't hardcore GCC + sed -e '/CC=/d' -i Makefile || die + + emake mrproper +} + +src_compile() { + local myemakeargs=( + DBG_OPT="" + MACHINEOPT="${CFLAGS}" + PROF_OPT="${LDFLAGS}" + ) + + emake "${myemakeargs[@]}" +} + +src_install() { + dosbin vrrpd atropos + doman vrrpd.8 + dodoc FAQ Changes TODO scott_example README.md + dodoc doc/* +} 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 d64f5c432099..83a797341215 100644 --- a/net-misc/yt-dlp/Manifest +++ b/net-misc/yt-dlp/Manifest @@ -1,2 +1 @@ -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 +DIST yt-dlp-2025.02.19.tar.gz 5842393 BLAKE2B e35716ceb51739668ed1b9f263d643ef33de3fd4ed38d21cc02971f3f454484814b57f370730a91ea8e2c21995027b8f2e13caf6a41bbdfd0798f8856416d124 SHA512 91179c08f6d3eafc8b796671f513b7908a53632b2c926293bbe887cbb3843c6dc80c80de90a7f892b98e6dd5b77daeea10f02e5a2ee078855ce78227e4c9be4a diff --git a/net-misc/yt-dlp/yt-dlp-2025.01.26.ebuild b/net-misc/yt-dlp/yt-dlp-2025.01.26.ebuild deleted file mode 100644 index 213369c3ecb0..000000000000 --- a/net-misc/yt-dlp/yt-dlp-2025.01.26.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( pypy3 python3_{10..13} ) -inherit bash-completion-r1 distutils-r1 optfeature wrapper - -DESCRIPTION="youtube-dl fork with additional features and fixes" -HOMEPAGE="https://github.com/yt-dlp/yt-dlp/" -SRC_URI=" - https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz - -> ${P}.tar.gz -" -S=${WORKDIR}/${PN} - -LICENSE="Unlicense" -SLOT="0" -# note that yt-dlp bumps are typically done straight-to-stable (unless there -# was major/breaking changes) given website changes breaks it on a whim -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos" - -RDEPEND=" - dev-python/pycryptodome[${PYTHON_USEDEP}] - !net-misc/youtube-dl[-yt-dlp(-)] -" - -distutils_enable_tests pytest - -python_test() { - local EPYTEST_DESELECT=( - # fails with FEATURES=network-sandbox - test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout - # fails with FEATURES=distcc, bug #915614 - test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\] - ) - - epytest -m 'not download' -} - -python_install_all() { - dodoc README.md Changelog.md supportedsites.md - doman yt-dlp.1 - - dobashcomp completions/bash/yt-dlp - - insinto /usr/share/fish/vendor_completions.d - doins completions/fish/yt-dlp.fish - - insinto /usr/share/zsh/site-functions - doins completions/zsh/_yt-dlp - - rm -r "${ED}"/usr/share/doc/yt_dlp || die - - make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl" -} - -pkg_postinst() { - optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg - has_version media-video/atomicparsley || # allow fallback but don't advertise - optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen - optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage - - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed' - elog 'as "youtube-dl". This is strictly for compatibility and it is' - elog 'recommended to use "yt-dlp" directly, it may be removed in the future.' - fi -} diff --git a/net-misc/yt-dlp/yt-dlp-2025.01.15.ebuild b/net-misc/yt-dlp/yt-dlp-2025.02.19.ebuild index 213369c3ecb0..db37821e73bc 100644 --- a/net-misc/yt-dlp/yt-dlp-2025.01.15.ebuild +++ b/net-misc/yt-dlp/yt-dlp-2025.02.19.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( pypy3 python3_{10..13} ) +PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} ) inherit bash-completion-r1 distutils-r1 optfeature wrapper DESCRIPTION="youtube-dl fork with additional features and fixes" @@ -34,6 +34,10 @@ python_test() { test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout # fails with FEATURES=distcc, bug #915614 test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\] + # needs (optional) websockets-15 which is not stable yet, and + # it is not considered a big issue if websockets tests fails + # as not even advertised as a optfeature, so just skip for now + test/test_websockets.py::TestWebsSocketRequestHandlerConformance::test_verify_cert\[Websockets\] ) epytest -m 'not download' diff --git a/net-misc/yt-dlp/yt-dlp-9999.ebuild b/net-misc/yt-dlp/yt-dlp-9999.ebuild index 2fb96ada27eb..e6e7a5d4cb47 100644 --- a/net-misc/yt-dlp/yt-dlp-9999.ebuild +++ b/net-misc/yt-dlp/yt-dlp-9999.ebuild @@ -1,10 +1,10 @@ -# 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=hatchling -PYTHON_COMPAT=( pypy3 python3_{10..13} ) +PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} ) inherit bash-completion-r1 distutils-r1 git-r3 optfeature wrapper DESCRIPTION="youtube-dl fork with additional features and fixes" diff --git a/net-misc/zssh/files/zssh-1.5c-C23.patch b/net-misc/zssh/files/zssh-1.5c-C23.patch new file mode 100644 index 000000000000..50fa9ec176d0 --- /dev/null +++ b/net-misc/zssh/files/zssh-1.5c-C23.patch @@ -0,0 +1,178 @@ +Fix compilation errors with GCC-14 and C23 +https://bugs.gentoo.org/875242 +https://bugs.gentoo.org/898974 +and also fold linking with ncurces[tinfo] from sed to configure.ac +https://bugs.gentoo.org/527036 +diff -ru a/configure.in b/configure.in +--- a/configure.in 2025-01-08 21:48:25.202798412 +0400 ++++ b/configure.in 2025-01-08 21:50:36.184060767 +0400 +@@ -5,7 +5,7 @@ + EXTRA_DEPS="" + EXTRA_LIBS="" + EXTRA_CFLAGS="" +-TERMCAP_LIB="" ++TINFO_LIB="" + + dnl Check configure arguments + AC_MSG_CHECKING(whether to use libreadline for cmd-line editing) +@@ -65,8 +65,8 @@ + if test -z "$fakereadline"; then + + dnl libtermcap (or (n)curses) is only needed by libreadline +- BASH_CHECK_LIB_TERMCAP +- LIBS="$LIBS $TERMCAP_LIB" ++ BASH_CHECK_LIB_TINFO ++ LIBS="$LIBS $TINFO_LIB" + + dnl check for readline headers + AC_CHECK_HEADERS(readline/readline.h readline/history.h, , +@@ -127,7 +127,7 @@ + AC_SUBST(EXTRA_DEPS) + AC_SUBST(EXTRA_CFLAGS) + AC_SUBST(EXTRA_LIBS) +-AC_SUBST(TERMCAP_LIB) ++AC_SUBST(TINFO_LIB) + + AC_OUTPUT(Makefile fake_readline/Makefile test/Makefile) + +diff -ru a/completion.c b/completion.c +--- a/completion.c 2025-01-08 21:55:33.535386179 +0400 ++++ b/completion.c 2025-01-08 21:59:46.899959311 +0400 +@@ -41,7 +41,8 @@ + /* Tell the GNU Readline library how to complete. We want to try to complete + on command names if this is the first word in the line, or on filenames + if not. */ +-void initialize_readline() ++void ++initialize_readline (void) + { + #ifdef DEBUG + printf("Using readline library version: %s\n", rl_library_version); +@@ -53,7 +54,7 @@ + so that if zssh_completion() fails nothing is completed */ + rl_completion_entry_function = fake_generator; + /* Tell the completer that we want a crack first. */ +- rl_attempted_completion_function = (CPPFunction *) zssh_completion; ++ rl_attempted_completion_function = zssh_completion; + + } + +@@ -62,10 +63,8 @@ + the word to complete. We can use the entire contents of rl_line_buffer + in case we want to do some simple parsing. Return the array of matches, + or NULL if there aren't any. */ +-char **zssh_completion(text, start, end) +-char *text; +-int start; +-int end; ++char ** ++zssh_completion (const char *text, int start, int end) + { + char **matches; + +@@ -89,9 +88,8 @@ + /* Generator function for command completion. STATE lets us know whether + to start from scratch; without any state (i.e. STATE == 0), then we + start at the top of the list. */ +-char *command_generator(text, state) +-const char *text; +-int state; ++char * ++command_generator (const char *text, int state) + { + static int list_index, len; + char *name; +@@ -123,9 +121,8 @@ + to start from scratch; without any state (i.e. STATE == 0), then we + start at the top of the list. */ + #if 0 +-char *tilde_generator(text, state) +-char *text; +-int state; ++char * ++tilde_generator (char *text, int state) + { + struct passwd *pwd; + static int len; +@@ -154,9 +151,8 @@ + } + #endif /* 0 */ + +-char *fake_generator(text, state) +-const char *text; +-int state; ++char * ++fake_generator (const char *text, int state) + { + return (0); + } +diff -ru a/fun.h b/fun.h +--- a/fun.h 2025-01-08 21:55:33.531386202 +0400 ++++ b/fun.h 2025-01-08 22:00:12.795813473 +0400 +@@ -1,7 +1,7 @@ + + /* completion.c */ + void initialize_readline(void); +-char **zssh_completion(char *text, int start, int end); ++char **zssh_completion(const char *text, int start, int end); + char *command_generator(const char *text, int state); + char *tilde_generator(char *text, int state); + char *fake_generator(const char *text, int state); +diff -ru a/init.c b/init.c +--- a/init.c 2025-01-08 21:55:33.535386179 +0400 ++++ b/init.c 2025-01-08 21:58:35.526361264 +0400 +@@ -90,7 +90,8 @@ + exit (0); + } + +-void usage() ++void ++usage (void) + { + printf("\ + Usage: zssh [zssh options] [--] [ssh options]\n\ +@@ -143,7 +144,8 @@ + * ^@ -> C-Space + * ^X -> C-x + */ +-char *escape_help() ++char * ++escape_help (void) + { + static char str[40]; + +@@ -154,9 +156,8 @@ + return (str); + } + +-void command_line_options(argc,argv) +-int *argc; +-char ***argv; ++void ++command_line_options (int *argc, char ***argv) + { + int ac = *argc; + char **av = *argv; +@@ -213,9 +214,8 @@ + } + + +-void init(argc,argv) +-int *argc; +-char ***argv; ++void ++init (int *argc, char ***argv) + { + char *str; + +diff -ru a/zssh.h b/zssh.h +--- a/zssh.h 2025-01-08 21:55:33.535386179 +0400 ++++ b/zssh.h 2025-01-08 21:57:02.938882687 +0400 +@@ -45,6 +45,7 @@ + #include <utmp.h> + #include <signal.h> + #include <ctype.h> ++#include <pty.h> + + /*#include <term.h> alpha */ + diff --git a/net-misc/zssh/zssh-1.5c-r2.ebuild b/net-misc/zssh/zssh-1.5c-r3.ebuild index 3d3cfc636134..ac5836450a27 100644 --- a/net-misc/zssh/zssh-1.5c-r2.ebuild +++ b/net-misc/zssh/zssh-1.5c-r3.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 toolchain-funcs +inherit toolchain-funcs autotools DESCRIPTION="SSH wrapper enabling zmodem up/download in ssh" HOMEPAGE="https://zssh.sourceforge.net/" @@ -11,30 +11,35 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="nls readline" -DEPEND="readline? ( - sys-libs/ncurses:0 - sys-libs/readline:0 - )" -RDEPEND="${DEPEND} - net-dialup/lrzsz - virtual/openssh" +DEPEND=" + readline? ( + sys-libs/ncurses:= + sys-libs/readline:= + ) +" +RDEPEND=" + ${DEPEND} + net-dialup/lrzsz[nls?] + virtual/openssh +" + +PATCHES=( + "${FILESDIR}/${PN}-1.5a-gentoo-include.diff" + "${FILESDIR}/${P}-C23.patch" +) src_prepare() { - eapply "${FILESDIR}/${PN}-1.5a-gentoo-include.diff" + default - # Fix linking with sys-libs/ncurses[tinfo], bug #527036 - sed -i -e 's/-ltermcap/-ltinfo/g' configure || die - - eapply_user + eautoreconf } src_configure() { tc-export AR CC RANLIB econf \ - $(use_enable nls) \ $(use_enable readline) } |