summaryrefslogtreecommitdiff
path: root/net-misc
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/Manifest.gzbin55264 -> 55425 bytes
-rw-r--r--net-misc/asterisk-g729/Manifest7
-rw-r--r--net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild (renamed from net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9.ebuild)7
-rw-r--r--net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild (renamed from net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9.ebuild)7
-rw-r--r--net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild68
-rw-r--r--net-misc/asterisk-opus/Manifest7
-rw-r--r--net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild (renamed from net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0.ebuild)5
-rw-r--r--net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild (renamed from net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0.ebuild)5
-rw-r--r--net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild49
-rw-r--r--net-misc/asterisk/Manifest16
-rw-r--r--net-misc/asterisk/asterisk-13.38.2-r3.ebuild (renamed from net-misc/asterisk/asterisk-16.16.2-r1.ebuild)46
-rw-r--r--net-misc/asterisk/asterisk-16.17.0.ebuild319
-rw-r--r--net-misc/asterisk/asterisk-16.18.0-r1.ebuild (renamed from net-misc/asterisk/asterisk-16.16.2.ebuild)4
-rw-r--r--net-misc/asterisk/asterisk-16.18.0.ebuild318
-rw-r--r--net-misc/asterisk/asterisk-18.2.2.ebuild363
-rw-r--r--net-misc/asterisk/asterisk-18.3.0.ebuild362
-rw-r--r--net-misc/asterisk/asterisk-18.4.0-r1.ebuild (renamed from net-misc/asterisk/asterisk-18.4.0.ebuild)1
-rw-r--r--net-misc/asterisk/files/asterisk-13.38.2-r3-func_lock-fix-races.patch421
-rw-r--r--net-misc/asterisk/files/asterisk-16.18.0-r1-func_lock-fix-races.patch177
-rw-r--r--net-misc/chrony/Manifest2
-rw-r--r--net-misc/chrony/chrony-4.0-r2.ebuild2
-rw-r--r--net-misc/curl/Manifest9
-rw-r--r--net-misc/curl/curl-7.74.0-r2.ebuild286
-rw-r--r--net-misc/curl/curl-7.74.0-r4.ebuild289
-rw-r--r--net-misc/curl/curl-7.75.0.ebuild290
-rw-r--r--net-misc/curl/curl-7.77.0.ebuild (renamed from net-misc/curl/curl-7.76.0.ebuild)6
-rw-r--r--net-misc/dhcp/Manifest2
-rw-r--r--net-misc/dhcp/dhcp-4.4.2_p1.ebuild277
-rw-r--r--net-misc/dhcpcd/Manifest9
-rw-r--r--net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild150
-rw-r--r--net-misc/dhcpcd/dhcpcd-9.3.4.ebuild158
-rw-r--r--net-misc/dhcpcd/dhcpcd-9.4.0.ebuild153
-rw-r--r--net-misc/dhcpcd/files/dhcpcd-9.3.4-include_termios.patch22
-rw-r--r--net-misc/dhcpcd/files/dhcpcd.initd17
-rw-r--r--net-misc/dhcpcd/files/dhcpcd.service15
-rw-r--r--net-misc/dleyna-server/Manifest5
-rw-r--r--net-misc/dleyna-server/dleyna-server-0.6.0.ebuild43
-rw-r--r--net-misc/dleyna-server/dleyna-server-0.7.0.ebuild2
-rw-r--r--net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch71
-rw-r--r--net-misc/dropbox/Manifest3
-rw-r--r--net-misc/dropbox/dropbox-123.4.4832.ebuild105
-rw-r--r--net-misc/frr/Manifest2
-rw-r--r--net-misc/frr/frr-7.5.1-r3.ebuild (renamed from net-misc/frr/frr-7.5.1-r2.ebuild)1
-rw-r--r--net-misc/gallery-dl/Manifest8
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.17.3.ebuild (renamed from net-misc/gallery-dl/gallery-dl-1.17.1.ebuild)0
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.17.4.ebuild (renamed from net-misc/gallery-dl/gallery-dl-1.17.2.ebuild)0
-rw-r--r--net-misc/iperf/Manifest2
-rw-r--r--net-misc/iperf/iperf-3.10.ebuild40
-rw-r--r--net-misc/lyricwikia/Manifest4
-rw-r--r--net-misc/lyricwikia/files/lyricwikia-0.1.11-skip-online-test.patch14
-rw-r--r--net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild48
-rw-r--r--net-misc/lyricwikia/metadata.xml10
-rw-r--r--net-misc/mikutter/Manifest2
-rw-r--r--net-misc/mikutter/mikutter-4.1.5.ebuild123
-rw-r--r--net-misc/modemmanager/Manifest6
-rw-r--r--net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild132
-rw-r--r--net-misc/modemmanager/modemmanager-1.16.2.ebuild128
-rw-r--r--net-misc/modemmanager/modemmanager-1.16.4.ebuild2
-rw-r--r--net-misc/netopeer2/Manifest6
-rw-r--r--net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild (renamed from net-misc/netopeer2/netopeer2-1.1.70.ebuild)8
-rw-r--r--net-misc/netopeer2/netopeer2-2.0.0.ebuild (renamed from net-misc/netopeer2/netopeer2-1.1.53.ebuild)6
-rw-r--r--net-misc/networkmanager/Manifest13
-rw-r--r--net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch12
-rw-r--r--net-misc/networkmanager/files/networkmanager-1.28.0-dhcpcd9.patch265
-rw-r--r--net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch58
-rw-r--r--net-misc/networkmanager/metadata.xml6
-rw-r--r--net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild329
-rw-r--r--net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild349
-rw-r--r--net-misc/networkmanager/networkmanager-1.30.2.ebuild349
-rw-r--r--net-misc/networkmanager/networkmanager-1.30.4.ebuild2
-rw-r--r--net-misc/nextcloud-client/Manifest6
-rw-r--r--net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild2
-rw-r--r--net-misc/nextcloud-client/nextcloud-client-3.2.1.ebuild92
-rw-r--r--net-misc/nextcloud-client/nextcloud-client-3.2.2.ebuild92
-rw-r--r--net-misc/ntpsec/Manifest6
-rw-r--r--net-misc/ntpsec/ntpsec-1.1.9.ebuild2
-rw-r--r--net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild2
-rw-r--r--net-misc/ntpsec/ntpsec-9999.ebuild2
-rw-r--r--net-misc/openssh/Manifest20
-rw-r--r--net-misc/openssh/files/openssh-8.2_p1-GSSAPI-dns.patch359
-rw-r--r--net-misc/openssh/files/openssh-8.4_p1-X509-glue-12.6.patch34
-rw-r--r--net-misc/openssh/files/openssh-8.4_p1-fix-ssh-copy-id.patch30
-rw-r--r--net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-X509-glue.patch129
-rw-r--r--net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-glue.patch94
-rw-r--r--net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-sctp-glue.patch18
-rw-r--r--net-misc/openssh/openssh-8.4_p1-r3.ebuild515
-rw-r--r--net-misc/openssh/openssh-8.5_p1.ebuild512
-rw-r--r--net-misc/openssh/openssh-8.6_p1-r1.ebuild2
-rw-r--r--net-misc/pedro/Manifest6
-rw-r--r--net-misc/pedro/files/pedro-1.12-portage.patch45
-rw-r--r--net-misc/pedro/pedro-1.12.ebuild58
-rw-r--r--net-misc/pedro/pedro-1.6-r1.ebuild (renamed from net-misc/pedro/pedro-1.6.ebuild)10
-rw-r--r--net-misc/radvd/Manifest2
-rw-r--r--net-misc/radvd/radvd-2.19-r1.ebuild (renamed from net-misc/radvd/radvd-2.19.ebuild)2
-rw-r--r--net-misc/remmina/Manifest2
-rw-r--r--net-misc/remmina/remmina-1.4.17.ebuild100
-rw-r--r--net-misc/rsync/Manifest7
-rw-r--r--net-misc/rsync/files/rsyncd.logrotate2
-rw-r--r--net-misc/rsync/rsync-3.2.3-r2.ebuild146
-rw-r--r--net-misc/rsync/rsync-3.2.3-r4.ebuild (renamed from net-misc/rsync/rsync-3.2.3-r3.ebuild)2
-rw-r--r--net-misc/rsync/rsync-9999.ebuild2
-rw-r--r--net-misc/rygel/Manifest4
-rw-r--r--net-misc/rygel/rygel-0.38.4.ebuild81
-rw-r--r--net-misc/rygel/rygel-0.40.1.ebuild2
-rw-r--r--net-misc/streamlink/Manifest4
-rw-r--r--net-misc/streamlink/streamlink-2.0.0.ebuild4
-rw-r--r--net-misc/streamlink/streamlink-9999.ebuild4
-rw-r--r--net-misc/sysrepo/Manifest7
-rw-r--r--net-misc/sysrepo/files/sysrepo-2.0.1-cmake.patch12
-rw-r--r--net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild (renamed from net-misc/sysrepo/sysrepo-1.4.104.ebuild)7
-rw-r--r--net-misc/sysrepo/sysrepo-2.0.1.ebuild (renamed from net-misc/sysrepo/sysrepo-1.4.122.ebuild)4
-rw-r--r--net-misc/wget/Manifest5
-rw-r--r--net-misc/wget/files/wget-1.21-avoid_bashisms.patch26
-rw-r--r--net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch11
-rw-r--r--net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch30
-rw-r--r--net-misc/wget/wget-1.21-r1.ebuild128
-rw-r--r--net-misc/you-get/Manifest8
-rw-r--r--net-misc/you-get/you-get-0.4.1432.ebuild23
-rw-r--r--net-misc/you-get/you-get-0.4.1520.ebuild2
-rw-r--r--net-misc/you-get/you-get-0.4.1525.ebuild (renamed from net-misc/you-get/you-get-0.4.1500.ebuild)0
120 files changed, 1880 insertions, 6806 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 83da583669e8..d12d8cf91b95 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest
index ee945b4f87d4..e2a9fb124c7b 100644
--- a/net-misc/asterisk-g729/Manifest
+++ b/net-misc/asterisk-g729/Manifest
@@ -6,6 +6,9 @@ DIST codec_g729a-13.0_3.1.9-x86_32.tar.gz 411156 BLAKE2B 179c77d32d1f8ac3314813a
DIST codec_g729a-13.0_3.1.9-x86_64.tar.gz 478364 BLAKE2B 49136479e1bd139fcb22130868575d5be7d6784081307679cfeee16951f6a303b5328a62c23a0ade506f2df0527b275bd198560dacd59ba5b9ba237095622778 SHA512 5fa2dca977ca1dcbf3019fc86c3edc91fd561c814bfa9a5202680b7a581f03faa1705a4392a70409f9cd30a4379691b609f0f572030972cbe432cad435314951
DIST codec_g729a-16.0_3.1.9-x86_32.tar.gz 476772 BLAKE2B e1a7b8baefc551f16618fded2663acfb825a7eabcccc7ca844792e6179bac5b9ac2e0f4c387e3b2861347c6deb5db13f41ecd265c2261dbb65756890d976f4f7 SHA512 cddf46f369b0922a5569961688fcd4fb840bcce3a5573549d8a3a3e6150e20cd7c18e32ea07edc10150dd409763504ab50fad5d884fb33a49d624e4ebe0afd10
DIST codec_g729a-16.0_3.1.9-x86_64.tar.gz 475819 BLAKE2B d738dccb1e94ae5458b72de7f52d3bb9964f3be993efe44f615bc06b0c17638ac743dd0465a68c172f339d888ceac35b54babadd217c13b028575c3b1e5aa94b SHA512 f6c60c66fce03ea5ce02301dc9c8b5a93fefbc60089980401cd1fee58357b2c03ab2b12eb50df82d2f3a25613e37c1bb370a319cf0a36c92983ef98aa137429d
-EBUILD asterisk-g729-13.0.3.1.9.ebuild 1877 BLAKE2B 8260fcfcf662c57229a95306689c8a243911df527f36e309500168bccb05d7cb86ed598cebd86ab9ec0687ff80c0dafd0bd39b7d37cd317dc9b59b2e8ee3b534 SHA512 0b6c3122741cff44b4d3494c6bbf09b25b2657ef74f1886ecd8cda34c63041d295a68be2f7631ac154ca3ffe5c06d949ff32803e7160b1546ff7e5086e0db9a4
-EBUILD asterisk-g729-16.0.3.1.9.ebuild 1822 BLAKE2B 2b4b37e2bb698709c0584b4473e3b47426c6e84e92e5f76c33aadde4fd1545a7f37c167e9e393f9e9732d30608c7e6a6f711c31d3ec77b1f94057e943833a8c6 SHA512 47de616999a25657435abb2ac96fb438344903fba37f98c99ecbcb191c78675060574c56c5c0318e92ae1b8e0ca4ddec829c0cf65cb2b553a46354029cab7b69
+DIST codec_g729a-18.0_3.1.9-x86_32.tar.gz 476626 BLAKE2B 7a8a0a763fcae579ac4be2891c691e7e540881cfd723a2c25af0c0f67499fde24a3d786d9ec9dddb6ee70e77973d71af6538d52963ff33b41d1940c8b506266d SHA512 bb223c03185d33107dc3cfa9393fe07950ae3a5825e1a347e26d06e9ffb8bfbc7ba350cb1e072dd52eaa6ded5a98e53dec9be8d8c55d89f0c816058a2f6bb247
+DIST codec_g729a-18.0_3.1.9-x86_64.tar.gz 475817 BLAKE2B ef45f1edab67b1fdb57d11340d2b3885c72d9f09f00fdccfdaa8674d61cf95ddf8ace223f29049e1e700f0bdcabd824ffbfa5382e492a1e0d0a47e1ab030d606 SHA512 12bbd2bcef0b7138d0ef261b6b1265f803526ce3c4ec371be830267e01e0e674150f17169742fe72737291b162136ea5224b320b655112cbc10fa207733c7f54
+EBUILD asterisk-g729-13.0.3.1.9-r1.ebuild 1854 BLAKE2B 65f08ff0e67608db2f87e73f50cf70f2bbe97a75a81ed31429eec21f1dd7662edd6fc885ff312c7977ac97c241fd84a3a0869c849f283a315ee7a37a708c8ec3 SHA512 3757a93547c26705667d2d5e24ece9775335b961c3634990ba109111abbf8aa6585a9385e0b3ce93841e8a622c3c86394286f9d4d4ccad7dbf6189576933b009
+EBUILD asterisk-g729-16.0.3.1.9-r1.ebuild 1854 BLAKE2B 65f08ff0e67608db2f87e73f50cf70f2bbe97a75a81ed31429eec21f1dd7662edd6fc885ff312c7977ac97c241fd84a3a0869c849f283a315ee7a37a708c8ec3 SHA512 3757a93547c26705667d2d5e24ece9775335b961c3634990ba109111abbf8aa6585a9385e0b3ce93841e8a622c3c86394286f9d4d4ccad7dbf6189576933b009
+EBUILD asterisk-g729-18.0.3.1.9.ebuild 1854 BLAKE2B 65f08ff0e67608db2f87e73f50cf70f2bbe97a75a81ed31429eec21f1dd7662edd6fc885ff312c7977ac97c241fd84a3a0869c849f283a315ee7a37a708c8ec3 SHA512 3757a93547c26705667d2d5e24ece9775335b961c3634990ba109111abbf8aa6585a9385e0b3ce93841e8a622c3c86394286f9d4d4ccad7dbf6189576933b009
MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9.ebuild b/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild
index 1a226c0eb772..01114a23c866 100644
--- a/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild
@@ -21,7 +21,7 @@ amd64? (
)"
LICENSE="Digium"
-SLOT="0"
+SLOT="0/${AST_PV}"
KEYWORDS="-* ~amd64 ~x86"
RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
@@ -32,7 +32,8 @@ S="${WORKDIR}"
pkg_setup() {
QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
- QA_PREBUILT="/usr/sbin/asthostid
+ QA_PREBUILT="${QA_FLAGS_IGNORED}
+ /usr/sbin/asthostid
/usr/sbin/astregister"
}
@@ -52,8 +53,6 @@ src_install() {
binsuffix=x86_32
elif use amd64; then
binsuffix=x86_64
- else
- die "Ebuild only functions for x86 and amd64."
fi
newsbin astregister-${binsuffix} astregister
diff --git a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9.ebuild b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild
index 317b54926409..01114a23c866 100644
--- a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9.ebuild
+++ b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -21,7 +21,7 @@ amd64? (
)"
LICENSE="Digium"
-SLOT="0"
+SLOT="0/${AST_PV}"
KEYWORDS="-* ~amd64 ~x86"
RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
@@ -32,7 +32,8 @@ S="${WORKDIR}"
pkg_setup() {
QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
- QA_PREBUILT="/usr/sbin/asthostid
+ QA_PREBUILT="${QA_FLAGS_IGNORED}
+ /usr/sbin/asthostid
/usr/sbin/astregister"
}
diff --git a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild
new file mode 100644
index 000000000000..01114a23c866
--- /dev/null
+++ b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="G.729 codec and supporting files for asterisk"
+HOMEPAGE="https://www.sangoma.com/asterisk/software/g729-codec/"
+
+AST_PV="$(ver_cut 1-2)"
+MY_PV="$(ver_rs 2 _)"
+
+SRC_URI="x86? (
+ https://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-x86_32.tar.gz
+ https://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32
+ https://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32
+)
+amd64? (
+ https://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-x86_64.tar.gz
+ https://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64
+ https://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64
+)"
+
+LICENSE="Digium"
+SLOT="0/${AST_PV}"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="=net-misc/asterisk-$(ver_cut 1)*"
+
+RESTRICT="mirror strip"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+ QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so"
+ QA_PREBUILT="${QA_FLAGS_IGNORED}
+ /usr/sbin/asthostid
+ /usr/sbin/astregister"
+}
+
+src_unpack() {
+ local dfile
+
+ for dfile in ${A}; do
+ [[ "${dfile}" = *.tar.gz ]] && unpack "${dfile}"
+ cp "${DISTDIR}/${dfile}" "${WORKDIR}/" || die "Error copying ${dfile} to ${WORKDIR}"
+ done
+}
+
+src_install() {
+ local binsuffix
+
+ if use x86; then
+ binsuffix=x86_32
+ elif use amd64; then
+ binsuffix=x86_64
+ fi
+
+ newsbin astregister-${binsuffix} astregister
+ newsbin asthostid-${binsuffix} asthostid
+
+ dodoc codec_g729a-${MY_PV}-${binsuffix}/README
+ insinto usr/$(get_libdir)/asterisk/modules/
+ doins "codec_g729a-${MY_PV}-${binsuffix}/codec_g729a.so"
+}
+
+pkg_postinst() {
+ einfo "Please note that Digium's register utility has been installed as astregister"
+}
diff --git a/net-misc/asterisk-opus/Manifest b/net-misc/asterisk-opus/Manifest
index 4347cca53eac..41f3317e1784 100644
--- a/net-misc/asterisk-opus/Manifest
+++ b/net-misc/asterisk-opus/Manifest
@@ -2,6 +2,9 @@ DIST codec_opus-13.0_1.3.0-x86_32.tar.gz 308059 BLAKE2B ec93fe29c030f2e63dffef88
DIST codec_opus-13.0_1.3.0-x86_64.tar.gz 343694 BLAKE2B ff43085aabbfc4f4082dc22f11b12d62ddb631b46df492baef8786a1f76cbc6b2828091867d40c77f0c268ed2ba50148fd6a1394493b595342da408d6746fe20 SHA512 0932006e8537ddee8c73b598bf04b6b552e1bf9527c65abdd6f7b8ff7ef677e251bc4fff55233e5d7e715f9ff5b928347618ed0d14a1f6bc9c6c728303593213
DIST codec_opus-16.0_1.3.0-x86_32.tar.gz 394187 BLAKE2B 0b187360ae65fe4cfd56f90c2f617da916ec4ee9046a6ab9af3764c9182fce22bdaccf79eb1917ff4535201a96adda84761b7bb829aa062751d6836c539caa58 SHA512 851c94f327ed8823069d1a83ca750a607780753d3ea37f52e8ca5ad4c14a419be1b86c47adb965722f27de0cca2a829a3454d3f2c44925c676d040e78d440ad1
DIST codec_opus-16.0_1.3.0-x86_64.tar.gz 388551 BLAKE2B d36f4ce8e9414e0887232afe6fd15098e48eb5ccaf690f340d4a62eaac432342a61e43801260f0198bd68af58217ef2a9aacd6d46af99b192444fa59994ff590 SHA512 601d04de2bd4e67cd3d111c8a6c383ea3885180f8ab82c8943e0d09f8203cff3e6d45b6048843946d53b4002d01d31d92592107053e512b5347568050aba5ac7
-EBUILD asterisk-opus-13.0.1.3.0.ebuild 1131 BLAKE2B 82feadbc475d8fccdaa388e69665dcaa9f006747c94e9a09ecce1c0fd7a09e8740774d93468969fd994ed83b71888a782c9f3a2a9d8957e976e92d86353410dd SHA512 2d039f6b907f7f27998bb3020fbecaa323c04ab34fd09cd1e7c093955949049f38098f8998475f92a8b47f367290710762c150fb52a4022288df71fc10f9bda0
-EBUILD asterisk-opus-16.0.1.3.0.ebuild 1131 BLAKE2B 82feadbc475d8fccdaa388e69665dcaa9f006747c94e9a09ecce1c0fd7a09e8740774d93468969fd994ed83b71888a782c9f3a2a9d8957e976e92d86353410dd SHA512 2d039f6b907f7f27998bb3020fbecaa323c04ab34fd09cd1e7c093955949049f38098f8998475f92a8b47f367290710762c150fb52a4022288df71fc10f9bda0
+DIST codec_opus-18.0_1.3.0-x86_32.tar.gz 394411 BLAKE2B ecd374e7a6d0f8ee9dfffe7437276fabbcdbc334c0d3791874fcc22b41f150bb0ea2918920018bfb28b27538be9cb4fa4fe430d05e3c117041b33890e9d72ee5 SHA512 5d7b6651b8097a017ccbddd82811558d1b3e6f82871c4b761212f3695baa9207899fbce35cb9185a4543ad8fc8b11557c73bb21f3fc57e7d4b45f9e75a8189cf
+DIST codec_opus-18.0_1.3.0-x86_64.tar.gz 388492 BLAKE2B acf993c9d82921ec72307e1237ec0a88df2e10321423672e6d3d6377b61d44ed8bb7ec5e9109e3d5d17ba8dae54b03fb245ca59e90d896897536b1f629c213ab SHA512 5155703af8e9d1b68b3f0469d3e77f266d8b1d4bbb5bb5761e4f775d3ea117902d9a50ffc390db2d367c8a9dc5682f61c199e18450b6567c5518163e0e04605f
+EBUILD asterisk-opus-13.0.1.3.0-r1.ebuild 1176 BLAKE2B b0df7de74f692ae3386aae6013b053ac52f9063df56ee0f37af616b0873e7dd725094aa431a0f7b4e875765db5c2e49205c242c87328cbb1b5ac4e66110776e0 SHA512 e6333fd18bae0750d967edd483b9bfbf7d19ed4239285389386ef9d06a86eaee992c8cbdba8da5400f8d271599192518658615cc1a3bfb3178d98c11c6ea6963
+EBUILD asterisk-opus-16.0.1.3.0-r1.ebuild 1176 BLAKE2B b0df7de74f692ae3386aae6013b053ac52f9063df56ee0f37af616b0873e7dd725094aa431a0f7b4e875765db5c2e49205c242c87328cbb1b5ac4e66110776e0 SHA512 e6333fd18bae0750d967edd483b9bfbf7d19ed4239285389386ef9d06a86eaee992c8cbdba8da5400f8d271599192518658615cc1a3bfb3178d98c11c6ea6963
+EBUILD asterisk-opus-18.0.1.3.0-r1.ebuild 1176 BLAKE2B b0df7de74f692ae3386aae6013b053ac52f9063df56ee0f37af616b0873e7dd725094aa431a0f7b4e875765db5c2e49205c242c87328cbb1b5ac4e66110776e0 SHA512 e6333fd18bae0750d967edd483b9bfbf7d19ed4239285389386ef9d06a86eaee992c8cbdba8da5400f8d271599192518658615cc1a3bfb3178d98c11c6ea6963
MISC metadata.xml 586 BLAKE2B 1a57ae9569c9e563efd47abb9b82f64636640dd5e0afd216a72d2be568112badd74ed0b578cf5b9a934979252fe156e0115eece065357b369aceabb5ab476c5c SHA512 e42c760a72a8b3ac002cf43d0ec32bd86bac7583ff1f74ce20d73fdaf2c5748a8e22646a2fe93a17ea275e8939ce727cc598b6ac3fc3a6b0af0b42d2c636ca80
diff --git a/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0.ebuild b/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild
index 43c46db99b3b..e21609589199 100644
--- a/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0.ebuild
+++ b/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -17,7 +17,7 @@ x86? (
)"
LICENSE="Digium"
-SLOT="0"
+SLOT="0/${AST_PV}"
KEYWORDS="-* ~amd64 ~x86"
RDEPEND="=net-misc/asterisk-${PV%%.*}*"
@@ -28,6 +28,7 @@ S="${WORKDIR}"
pkg_setup() {
QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_opus.so"
+ QA_PREBUILT="${QA_FLAGS_IGNORED}"
}
src_install() {
diff --git a/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0.ebuild b/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild
index 43c46db99b3b..e21609589199 100644
--- a/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0.ebuild
+++ b/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -17,7 +17,7 @@ x86? (
)"
LICENSE="Digium"
-SLOT="0"
+SLOT="0/${AST_PV}"
KEYWORDS="-* ~amd64 ~x86"
RDEPEND="=net-misc/asterisk-${PV%%.*}*"
@@ -28,6 +28,7 @@ S="${WORKDIR}"
pkg_setup() {
QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_opus.so"
+ QA_PREBUILT="${QA_FLAGS_IGNORED}"
}
src_install() {
diff --git a/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild b/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild
new file mode 100644
index 000000000000..e21609589199
--- /dev/null
+++ b/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="OPUS codec and supporting files for asterisk"
+HOMEPAGE="https://wiki.asterisk.org/wiki/display/AST/Codec+Opus"
+
+AST_PV="$(ver_cut 1-2)"
+MY_PV="$(ver_rs 2 _)"
+
+SRC_URI="amd64? (
+ https://downloads.digium.com/pub/telephony/codec_opus/asterisk-${AST_PV}/x86-64/codec_opus-${MY_PV}-x86_64.tar.gz
+)
+x86? (
+ https://downloads.digium.com/pub/telephony/codec_opus/asterisk-${AST_PV}/x86-32/codec_opus-${MY_PV}-x86_32.tar.gz
+)"
+
+LICENSE="Digium"
+SLOT="0/${AST_PV}"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="=net-misc/asterisk-${PV%%.*}*"
+
+RESTRICT="mirror strip"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+ QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_opus.so"
+ QA_PREBUILT="${QA_FLAGS_IGNORED}"
+}
+
+src_install() {
+ local arch
+
+ if use x86; then
+ arch=x86_32
+ elif use amd64; then
+ arch=x86_64
+ fi
+
+ dodoc codec_opus-${MY_PV}-${arch}/README
+ insinto /usr/$(get_libdir)/asterisk/modules/
+ doins "codec_opus-${MY_PV}-${arch}/codec_opus.so"
+
+ insinto /var/lib/asterisk/documentation/thirdparty
+ doins "codec_opus-${MY_PV}-${arch}/codec_opus_config-en_US.xml"
+}
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 2982739083ee..6a7c32d5b326 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -4,8 +4,10 @@ AUX asterisk-13.38.1-r1-autoconf-lua-version.patch 2320 BLAKE2B 5f9a4b4063286f96
AUX asterisk-13.38.1-r1-func_lock-fix-races.patch 9580 BLAKE2B 174aa69b0738c87f02692c2eec978171216b2117218a54b9785a836d0b72b779ed1aa48a3c3b624deb9e16e3485d60a8390b60019c90524f6248665d1ae0ff44 SHA512 bff6f20a677eef837a6727859c1c90309e6f012621743b7e8b6b92ad17cf44c9b94aa75a0b64550ae39a6260210a944725d9e9603fbe0ca7bcbd4fd61d991748
AUX asterisk-13.38.2-r1-menuselect-exitcodes.patch 1736 BLAKE2B 32f18fe623c6a9ba4db24001bc6669a2bc0838f2b757a2bcacde6eeb6b63f31881af877ce25cf7f38f6b7c010d92b5a1065d22b3f7526bcdc22799a09b22a975 SHA512 c4888e24051f0913c7dd13dbadbc38e7638bdedfee36b6f6cee047f6113d39cd09d79d9ecbfbb38f72ae6c9092e1423a0eff885118cfa44d4995f11d95c4a1d3
AUX asterisk-13.38.2-r2-func_odbc_minargs-ARGC.patch 7091 BLAKE2B bd00ce7a49b946cd6f2f170edf777a3b7f61bc02882096536dd4e05f2d9c279d1ff5c4501f65eb1c64edbca8b9f283ac7cf542722478dca2c2fcc1e9d9decf83 SHA512 a5a160f5a93e64f6780e56c4af248aa33739bdacc80cfb0f224060c7bbe57633d84368ddac291306f6ec41989cfe619771f55d1c415fc80db3f0597b6058e553
+AUX asterisk-13.38.2-r3-func_lock-fix-races.patch 13721 BLAKE2B ad0ec83d10cd41aaf7fdd9a3b72c59e64c110a3b694e3ef5bd383efbf3fb7403f3f7b42cf61d9470c097cfb69a5445764134f00e590c022b8f9e7ce20ccf851e SHA512 0d13c50bf14351ed85305f737372c825ee950a760ad523b5f4976afd98c9d2907e6c0161621278598ab5ea507720146eaddebede59725e80f4632a7f9d77aa04
AUX asterisk-16.15.1-r2-autoconf-2.70.patch 499 BLAKE2B d52c6514d3cd120402298322dac081d88821035a13a5210bddf8574dfe69ec1e6eca1f3335dbd2976e870a8dfc634d1883b3e0db707557581da38b074f7359e6 SHA512 a55725377a874ee15a722076fc63323d73a976592aad524e56bdff5f4164eaa7e533723f5add93b738f39532392541bd2615fc39b3a4fd55a49f57f584d82846
AUX asterisk-16.16.2-no-var-run-install.patch 728 BLAKE2B 25fc61c4aa68d9e3243d1161e68e0b61b14b5505eadd00fdf46e1c3977e7fb536afd42dc6c9a07f400a686c19afd04fd8f00fc1cb916978783a9e54ecfe81dd4 SHA512 ab1e7ac700711125162396c4ebe590eb000f4ad6c4cbe8845794f5d06353a4a52167fcc83ee97860f38540089cad6d45f2e8589c1f30098e85479a2b4c722f75
+AUX asterisk-16.18.0-r1-func_lock-fix-races.patch 6085 BLAKE2B e53b5debccbd54505a51a38cc63f64fec10603abc47fbb86b171268ea3a90b6e041984eb8802efafae8df4bb2aa6098c78c0b6473cd0a0aac61cd233cbd322df SHA512 aa3cd2d1ddec0c0ca57bc6b7131b09c0aa691fd01cffa17b7797cc023627dba8b3a329cbdd6b72e51d73689a82682814e954906ea9fdd9716f1f7cb26d606224
AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd
AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
@@ -16,19 +18,11 @@ AUX confd-16.16.2-r1 4078 BLAKE2B 9d49eb95660f5cb92d62d34a262d77909ab9acd68afa35
AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38fe88dce5655e36628644e38f07984e305c706b167ec3674eec63933fb889586b78a9386c16bb3765766 SHA512 6c31c7627e30b15a35540d9eabad310841b5f740f8f361fc01630fd6ab389bae02f0d1092ee35e6375b5ae93a7d8d71d03cb06201045d084882177a2ce49a4da
AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b573839db7860fd10828f444aef0f08d189a4e129a5545538424c1698e7d9d980cdbb44da2e68ff73dd0c75 SHA512 81747f6e6b4142b341797a8b2e9b212a48870d8db661669759020cc4c3ab0b66996a37dbd35afaa842dc00cd43aa834d3146021420b3f29b0d2f8b6e11d3fca7
DIST asterisk-13.38.2.tar.gz 33708267 BLAKE2B f8c188f6500a01e807982518486972c18f8f903285910e64b4d8e2a4f553d42534f910696a02ab13e371dbd83dfd932c5cb7a6cea08817862ecaddcc7afd99d2 SHA512 bd9755503048cd8dcf8e39947dd5cfb617c20c4b1ad5033ae297499a4967c06ba11b6e43233c1ae0d33f8f11a81dbb9b4487f16a1f4786007172028caf1ee051
-DIST asterisk-16.16.2.tar.gz 27808852 BLAKE2B dc05fe7c797f9b848c918121ffe7e7648bca75fccb70412fcd39f37beb3fd33e7d64cd198919cb6ae2867cd685651497ae15a30fb280988a9c7184e80de235ae SHA512 9e47ea2906a2c0d1a2f527d106ef6200a8d0cce76a31a6cfb3ca720a2ef7b5f723ae5c6266c74b0bdfd5718346e8d01a30fc346981463fa4ee7a4b7c99a67928
-DIST asterisk-16.17.0.tar.gz 27836573 BLAKE2B f01b499cdd9659403df2d422dc4140f3ade66384fc4bf72b220c4179ada5723e2ce07f0c76c473d9fb5bd14a83357c55145c7d5c840ef29c754b05d337f8709e SHA512 ea142028974beffc6e8e87a780eb3928c4542eb7886246eb689fc4f61191e4bf05477aabd24c98f14e69504e5afec29cea33aeab4fefcc8fbd48c72592b630c2
DIST asterisk-16.18.0.tar.gz 27843069 BLAKE2B 643c371b4747111e233c0758efb529e7f54f1deeff10e65fb05f3a1a58c4ba5c139bdb583d2a2552e29aacac5d0f3980fd9aeb19fda2513843fbe0c849dec217 SHA512 025a30a1eed1d2cd14eb1345e1e0edfcc23b4c517e0d33da7d06d97b3ffa3c9ce9c2fe9449109eefade6d62b6205b598fecb69245adb04f03bd53f8482fbd7ad
-DIST asterisk-18.2.2.tar.gz 27888521 BLAKE2B 5837b6434568a8e9f7a8963098994ccb487cfe9b85d59b30e5866e4eb67d222c4ac2c77036f7d461de72acc6ffd07fcd2d56bcaa618f4aecdbdba60d609eeb93 SHA512 e15fe3c7f46d49991bcb6f6f565f15e4af0d658b4cd6b091079209dd95a8027858effdc2f2314d72ed46a73cdebc089d3c27d5cf8db50d2d21f3c317a8a4a546
-DIST asterisk-18.3.0.tar.gz 27917957 BLAKE2B df4589291a1b8c815acc63650c1a1c6febef4147b849114fad13c84754f23c8a960b1ebc865c4e4fa33e63a841c11f2d0a5474980a406df94a654622b4a4b6f0 SHA512 7625d6c2c1069acde8dcb94f54dc3016cbb63c70eab7e0a86768be79ffe2286691367cd32df372d695e63f58919246e5c2dca98bec9389d7a4b09dced5bf8ecb
DIST asterisk-18.4.0.tar.gz 27926601 BLAKE2B 1a4089ee274732462a8e480d449e4043f7393a6df0b78dd3ea341d3996b9e433066e6d7c53b3ab334db5946a4b847ac02abb4afc5747b6f541cad81a6d58d468 SHA512 024d0a5c75d55fe614ba6219aece62778e9522a0f8365d57192aa5aa22be94d45a3bed69ac14659738e97dd98967533c13096a855366083e6df2b7800e684602
EBUILD asterisk-13.38.2-r2.ebuild 10791 BLAKE2B 378bdbcd0cc936a195a72d61ad3bd8e074130fbb6bb7bf2b41eaffe89c2ced1606a53fe8d9d1fab986bedf12622d323bc46395e0914792b7b03911d9384c6193 SHA512 12caa9d74f34658a6888c043a3ce682a67671dfe1528a91712f8a72c73686ddcd881f138c8eff34f6fa4d1fdd0fc43e7a69a9c4e41ee11463e770681200d8192
+EBUILD asterisk-13.38.2-r3.ebuild 10793 BLAKE2B 9882ff88ad7d5afa2dc9372d4dec8975b5def601ad3b590df91cdeeb3c189f6672ed93781e73ccaef76fe1decd15421a8434aad92ace456dfc92e4dfe0c8007a SHA512 9ce8934d879c44e4218701390e35475eea4f7e5a336a113cc5067720d6ab1b5bc0f01a5b49083b55ad8b1ac2af936ff0330a2b618981a54fb52e6ccbe900eebd
EBUILD asterisk-13.38.2.ebuild 9664 BLAKE2B 7b5018e14e5fd93fe92b96a2ba20c39e061dee93a7c3491601ac1a051498fefa6914b5c259576537e1d9c96be1ef45e85d7b742bdc62d40390d824f08cb617cb SHA512 5c82cef460eebf4fb1cf1bbc1824b050855dfb2e8d8a8b0e42cfbff85a761e97843a1ff4bfc38dcb235475db7f2ea36536e031978dd861a9de4d84cddba829f3
-EBUILD asterisk-16.16.2-r1.ebuild 11297 BLAKE2B 70d3e6454e089576316d562b0fe92e9b146c673d129479b90c5c108def4be9cc6ee2f1491210ae753934132ba3472a1833fc1c7cadfc0edfc603c86e0ba49593 SHA512 cade051bcc31019a1a8a831f23deb7a9dfdf54585c158ff798bcb3132b5683f7534a3c1aedacab9062596b22d9c70a510426abb8338bebaaa1691616cf37125e
-EBUILD asterisk-16.16.2.ebuild 9855 BLAKE2B d83137ba59e6497549c60202332615cc8ca7fc7aa80fb69691fe7269fc43e47f6713264ed8328dcdad58886cf7e9b1e84ca3c65a9ef7e8e9ae8e4a4dfbf957dd SHA512 6ac7bdaa50bfaf06b7d45daa4b3349765b1ee89d838681afcc9a3b2a92bbc489273ce6d09635fcd2ac951b234fdcb1371365bbf7fee1eb4de8a80a814d6e43f9
-EBUILD asterisk-16.17.0.ebuild 9859 BLAKE2B cdf9fcbba362fbe821e9bb93bb5ddaf159b650187b1a3d94986554d3afaa9a01c1d14b6ae883defe98c8e6ec72f470203656129f1be2375aff84c69f4f3c7f48 SHA512 fef880641ac72ee4988371d4130c2fdae283f9c9da958d6a66377b56f6f81e46d228145864d3f5b1da77c2314b0b26ced599be8f604340e547dbde43d208a3c1
-EBUILD asterisk-16.18.0.ebuild 9800 BLAKE2B dd4a96b4104359bfea9bb46eec7f8b4453e40e043035b5e8ffc6bd9b1e66bde0583ba701d03450604fb94e76b101951bec0c214871fc3bc35323deb5f8b6ffa3 SHA512 18bcd403796ce850783592df92a927d8c5a31023601d830a4951de2ec6995571a9a54b9ab554781683248a4944e128fc979b1a51da99b0c386b0d491de1378c7
-EBUILD asterisk-18.2.2.ebuild 11270 BLAKE2B bb3522c9a90506fdcf22dd243edee97550d4af8d70d5d6393b2005e6ce71adbc3fd1c23b53b618651888aab14557a1d5c6fe774ac89fcb6a20e264ad52d1b3df SHA512 fbbfa6d86aa3fb6734a68844a7724f234b239c74b4c43232af9cb08077af0824a0475ce11ae365ef399f1419299324e63a50ec6106a47b9403aa7f259fd7397c
-EBUILD asterisk-18.3.0.ebuild 11218 BLAKE2B efeba024aeedee227df0c4f94b4f611b8bdd49a45dc350d23c7fd5042f329a60a79b77210b0f990cf66dcbaf7a4244b0f01ebad632a25ef9186ddb554f691b60 SHA512 05343e131eb0e84b0a73e7a7cc0a16ff386bc1a4fd0914ab49e8fa84a5b6e69449aba2dbcc56087ac0bf18d6037f41eb006ecd321b0c750c1ba06c610afda895
-EBUILD asterisk-18.4.0.ebuild 11159 BLAKE2B 0f13f7d155054688e97bfa5dc892f5d6f80b8d9bf0f952356d76be3f907716803ee6fb8978a9c03ae0791dc1d0932fe6ddb66119e6c05c6251177ef6c9b278e1 SHA512 7bbd41f0b4a2767ec4b36ebed02498b3b2fa35145b376a20b44c0750d71edb21c0ebe0d30f7300112a3e2c626820799e948ed17c55200a96bd55d030656a700d
+EBUILD asterisk-16.18.0-r1.ebuild 9855 BLAKE2B d17ca05051bfb2a28c4bac764226bcc285dfbc01d60e409ed1cc4ec00e430a0ba68768352dc66924bc8627f2f797be074f150b74da6176a319b069761d8081f4 SHA512 4db4384d0adf42c5201529fc032e7ce7570900cf83c16708841f64341b5673cf5adc7a4ee1f1306b6542049fd24f2bdc0669789ac0ab57a66c38952d40f9dd5d
+EBUILD asterisk-18.4.0-r1.ebuild 11217 BLAKE2B bb978a4fda8ef5f398d6b28c0bd6a9c0c3c021ff96396fedb94f4af831dcb4210393d44b312540ad14774007a083b006747ce4a26238d220fd57efe8aa96e05a SHA512 cb84fab3ce287ac75aa3f4fa391b5efff5606e2c9c5708ff3e0929e44ac0ef7b54d347db424e856a257a40839e1a9ccaeed8e615f56d8e21e216f4804a2bd767
MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee
diff --git a/net-misc/asterisk/asterisk-16.16.2-r1.ebuild b/net-misc/asterisk/asterisk-13.38.2-r3.ebuild
index 26a46df8f972..c41ddbf6577a 100644
--- a/net-misc/asterisk/asterisk-16.16.2-r1.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.2-r3.ebuild
@@ -19,8 +19,7 @@ IUSE_VOICEMAIL_STORAGE=(
voicemail_storage_odbc
voicemail_storage_imap
)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi 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"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug 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 vorbis xmpp"
REQUIRED_USE="gtalk? ( xmpp )
lua? ( ${LUA_REQUIRED_USE} )
^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
@@ -28,20 +27,22 @@ REQUIRED_USE="gtalk? ( xmpp )
"
PATCHES=(
- "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
- "${FILESDIR}/${PN}-16.15.1-r2-autoconf-2.70.patch"
+ "${FILESDIR}/${PN}-historic-no-var-run-install.patch"
+ "${FILESDIR}/${PN}-13.38.1-r1-autoconf-lua-version.patch"
+ "${FILESDIR}/${PN}-13.38.2-r3-func_lock-fix-races.patch"
+ "${FILESDIR}/${PN}-13.18.1-r2-autoconf-2.70.patch"
"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
+ "${FILESDIR}/${PN}-13.38.2-r2-func_odbc_minargs-ARGC.patch"
)
DEPEND="acct-user/asterisk
acct-group/asterisk
dev-db/sqlite:3
dev-libs/popt
- >=dev-libs/jansson-2.11
+ dev-libs/jansson
dev-libs/libedit
dev-libs/libxml2:2
dev-libs/libxslt
- sys-apps/util-linux
sys-libs/zlib
alsa? ( media-libs/alsa-lib )
bluetooth? ( net-wireless/bluez:= )
@@ -53,7 +54,6 @@ DEPEND="acct-user/asterisk
caps? ( sys-libs/libcap )
blocks? ( sys-libs/blocksruntime )
cluster? ( sys-cluster/corosync )
- codec2? ( media-libs/codec2:= )
curl? ( net-misc/curl )
dahdi? (
net-libs/libpri
@@ -69,14 +69,13 @@ DEPEND="acct-user/asterisk
mysql? ( dev-db/mysql-connector-c:= )
newt? ( dev-libs/newt )
odbc? ( dev-db/unixODBC )
- pjproject? ( >=net-libs/pjproject-2.9:= )
+ pjproject? ( net-libs/pjproject:= )
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
)
@@ -86,7 +85,6 @@ DEPEND="acct-user/asterisk
)
systemd? ( sys-apps/systemd )
!systemd? ( !sys-apps/systemd )
- unbound? ( net-dns/unbound )
vorbis? (
media-libs/libogg
media-libs/libvorbis
@@ -110,7 +108,6 @@ QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
_make_args=(
"NOISY_BUILD=yes"
"ASTDBDIR=\$(ASTDATADIR)/astdb"
- "ASTCACHEDIR=/var/cache/asterisk"
"OPTIMIZE="
"DEBUG="
"DESTDIR=${D}"
@@ -156,24 +153,20 @@ src_configure() {
--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)
+ $(use_with ssl)
_menuselect() {
menuselect/menuselect "$@" || die "menuselect $* failed."
}
_use_select() {
- local state=$(use "$1" && echo enable || echo disable)
+ local state=$(usex "$1" enable disable)
shift # remove use from parameters
while [[ -n $1 ]]; do
@@ -225,10 +218,8 @@ src_configure() {
_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 dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
- _use_select deprecated app_macro
_use_select freetds {cdr,cel}_tds
_use_select gtalk chan_motif
_use_select http res_http_post
@@ -244,7 +235,6 @@ src_configure() {
_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
@@ -260,7 +250,7 @@ src_configure() {
if use debug; then
for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
- _menuselect --enable "${o}" menuselect.makeopts
+ _menuselect --enable $o menuselect.makeopts
done
fi
@@ -283,9 +273,8 @@ src_install() {
local d
dodir "/usr/$(get_libdir)/pkgconfig"
-
diropts -m 0750 -o root -g asterisk
- dodir /etc/asterisk
+ dodir /etc/asterisk
emake "${_make_args[@]}" install install-configs
@@ -302,11 +291,11 @@ src_install() {
diropts -m 0750 -o asterisk -g asterisk
keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
- newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
- newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+ newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+ newconfd "${FILESDIR}"/confd-13.32.0 asterisk
systemd_dounit "${FILESDIR}"/asterisk.service
- newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+ newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
# Reset diropts else dodoc uses it for doc installations.
@@ -341,11 +330,6 @@ pkg_postinst() {
elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
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"
diff --git a/net-misc/asterisk/asterisk-16.17.0.ebuild b/net-misc/asterisk/asterisk-16.17.0.ebuild
deleted file mode 100644
index 2daad3a7ab31..000000000000
--- a/net-misc/asterisk/asterisk-16.17.0.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-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_file
- voicemail_storage_odbc
- voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug 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 unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
- lua? ( ${LUA_REQUIRED_USE} )
- ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
- voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
- "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
- "${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.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/ncurses:0=
- sys-libs/zlib
- 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 )
- dahdi? (
- net-libs/libpri
- net-misc/dahdi-tools
- )
- 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.9 )
- 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=
- )
- unbound? ( net-dns/unbound )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- voicemail_storage_imap? ( virtual/imap-c-client )
- 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 )"
-
-BDEPEND="dev-libs/libxml2:2
- virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-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" eautoreconf
-}
-
-src_configure() {
- local vmst
-
- econf \
- LUA_VERSION="${ELUA#lua}" \
- --libdir="/usr/$(get_libdir)" \
- --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)
-
- _menuselect() {
- menuselect/menuselect "$@" || die "menuselect $* failed."
- }
-
- _use_select() {
- local state=$(use "$1" && echo enable || echo disable)
- shift # remove use from parameters
-
- while [[ -n $1 ]]; do
- _menuselect --${state} "$1" menuselect.makeopts
- shift
- 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.
- >"${S}"/sounds/sounds.xml
-
- # That NATIVE_ARCH chatter really is quite bothersome
- sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
- # Compile menuselect binary for optional components
- emake NOISY_BUILD=yes menuselect.makeopts
-
- # Disable BUILD_NATIVE (bug #667498)
- _menuselect --disable build_native menuselect.makeopts
-
- # Broken functionality is forcibly disabled (bug #360143)
- _menuselect --disable chan_misdn menuselect.makeopts
- _menuselect --disable chan_ooh323 menuselect.makeopts
-
- # Utility set is forcibly enabled (bug #358001)
- _menuselect --enable smsq menuselect.makeopts
- _menuselect --enable streamplayer menuselect.makeopts
- _menuselect --enable aelparse menuselect.makeopts
- _menuselect --enable astman menuselect.makeopts
-
- # this is connected, otherwise it would not find
- # ast_pktccops_gate_alloc symbol
- _menuselect --enable chan_mgcp menuselect.makeopts
- _menuselect --enable res_pktccops menuselect.makeopts
-
- # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
- _menuselect --enable pbx_dundi menuselect.makeopts
- _menuselect --enable func_aes menuselect.makeopts
- _menuselect --enable chan_iax2 menuselect.makeopts
-
- # SQlite3 is now the main database backend, enable related features
- _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
- _menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
- # 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 dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
- _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 ...
- for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
- if use "${vmst#+}"; then
- _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
- fi
- done
-
- if use debug; then
- for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
- _menuselect --enable "${o}" menuselect.makeopts
- done
- fi
-}
-
-src_compile() {
- emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
- local d
-
- dodir "/usr/$(get_libdir)/pkgconfig"
- emake DESTDIR="${D}" NOISY_BUILD=yes install
-
- if use radius; then
- insinto /etc/radiusclient/
- doins contrib/dictionary.digium
- fi
- diropts -m 0750 -o root -g asterisk
- keepdir /etc/asterisk
- emake NOISY_BUILD=yes DESTDIR="${D}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
- chown root:root "${ED}/etc/asterisk/"* || die "chown root:root of config files failed."
- chmod 644 "${ED}/etc/asterisk/"* || die "chmod 644 of config files failed."
-
- # keep directories
- diropts -m 0750 -o asterisk -g root
- keepdir /var/lib/asterisk
- keepdir /var/spool/asterisk
- keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
- diropts -m 0750 -o asterisk -g asterisk
- keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
- newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
- newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
- systemd_dounit "${FILESDIR}"/asterisk.service
- newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
- systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
- # Reset diropts else dodoc uses it for doc installations.
- diropts -m0755
-
- # install the upgrade documentation
- dodoc UPGRADE* BUGS CREDITS
-
- # install extra documentation
- use doc && dodoc doc/*.{txt,pdf}
-
- # install logrotate snippet; bug #329281
- #
- insinto /etc/logrotate.d
- newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
- # Asterisk installs a few folders that's empty by design,
- # but still required. This finds them, and marks them for
- # portage.
- while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
- keepdir "${d#${ED}}"
- done
-}
-
-pkg_postinst() {
- if [ -z "${REPLACING_VERSIONS}" ]; then
- elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
- elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
- elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
- elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
- elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
- elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
- fi
-}
diff --git a/net-misc/asterisk/asterisk-16.16.2.ebuild b/net-misc/asterisk/asterisk-16.18.0-r1.ebuild
index c69374145886..520bcc0b1569 100644
--- a/net-misc/asterisk/asterisk-16.16.2.ebuild
+++ b/net-misc/asterisk/asterisk-16.18.0-r1.ebuild
@@ -28,8 +28,8 @@ REQUIRED_USE="gtalk? ( xmpp )
"
PATCHES=(
- "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch"
- "${FILESDIR}/asterisk-16.15.1-r2-autoconf-2.70.patch"
+ "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+ "${FILESDIR}/${PN}-16.18.0-r1-func_lock-fix-races.patch"
)
DEPEND="acct-user/asterisk
diff --git a/net-misc/asterisk/asterisk-16.18.0.ebuild b/net-misc/asterisk/asterisk-16.18.0.ebuild
deleted file mode 100644
index fd51937b8461..000000000000
--- a/net-misc/asterisk/asterisk-16.18.0.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-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_file
- voicemail_storage_odbc
- voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug 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 unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
- lua? ( ${LUA_REQUIRED_USE} )
- ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
- 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/ncurses:0=
- sys-libs/zlib
- 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 )
- dahdi? (
- net-libs/libpri
- net-misc/dahdi-tools
- )
- 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.9 )
- 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=
- )
- unbound? ( net-dns/unbound )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- voicemail_storage_imap? ( virtual/imap-c-client )
- 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 )"
-
-BDEPEND="dev-libs/libxml2:2
- virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-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" eautoreconf
-}
-
-src_configure() {
- local vmst
-
- econf \
- LUA_VERSION="${ELUA#lua}" \
- --libdir="/usr/$(get_libdir)" \
- --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)
-
- _menuselect() {
- menuselect/menuselect "$@" || die "menuselect $* failed."
- }
-
- _use_select() {
- local state=$(use "$1" && echo enable || echo disable)
- shift # remove use from parameters
-
- while [[ -n $1 ]]; do
- _menuselect --${state} "$1" menuselect.makeopts
- shift
- 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.
- >"${S}"/sounds/sounds.xml
-
- # That NATIVE_ARCH chatter really is quite bothersome
- sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
- # Compile menuselect binary for optional components
- emake NOISY_BUILD=yes menuselect.makeopts
-
- # Disable BUILD_NATIVE (bug #667498)
- _menuselect --disable build_native menuselect.makeopts
-
- # Broken functionality is forcibly disabled (bug #360143)
- _menuselect --disable chan_misdn menuselect.makeopts
- _menuselect --disable chan_ooh323 menuselect.makeopts
-
- # Utility set is forcibly enabled (bug #358001)
- _menuselect --enable smsq menuselect.makeopts
- _menuselect --enable streamplayer menuselect.makeopts
- _menuselect --enable aelparse menuselect.makeopts
- _menuselect --enable astman menuselect.makeopts
-
- # this is connected, otherwise it would not find
- # ast_pktccops_gate_alloc symbol
- _menuselect --enable chan_mgcp menuselect.makeopts
- _menuselect --enable res_pktccops menuselect.makeopts
-
- # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
- _menuselect --enable pbx_dundi menuselect.makeopts
- _menuselect --enable func_aes menuselect.makeopts
- _menuselect --enable chan_iax2 menuselect.makeopts
-
- # SQlite3 is now the main database backend, enable related features
- _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
- _menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
- # 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 dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
- _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 ...
- for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
- if use "${vmst#+}"; then
- _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
- fi
- done
-
- if use debug; then
- for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
- _menuselect --enable "${o}" menuselect.makeopts
- done
- fi
-}
-
-src_compile() {
- emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
- local d
-
- dodir "/usr/$(get_libdir)/pkgconfig"
- emake DESTDIR="${D}" NOISY_BUILD=yes install
-
- if use radius; then
- insinto /etc/radiusclient/
- doins contrib/dictionary.digium
- fi
- diropts -m 0750 -o root -g asterisk
- keepdir /etc/asterisk
- emake NOISY_BUILD=yes DESTDIR="${D}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
- chown root:root "${ED}/etc/asterisk/"* || die "chown root:root of config files failed."
- chmod 644 "${ED}/etc/asterisk/"* || die "chmod 644 of config files failed."
-
- # keep directories
- diropts -m 0750 -o asterisk -g root
- keepdir /var/lib/asterisk
- keepdir /var/spool/asterisk
- keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
- diropts -m 0750 -o asterisk -g asterisk
- keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
- newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
- newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
- systemd_dounit "${FILESDIR}"/asterisk.service
- newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
- systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
- # Reset diropts else dodoc uses it for doc installations.
- diropts -m0755
-
- # install the upgrade documentation
- dodoc UPGRADE* BUGS CREDITS
-
- # install extra documentation
- use doc && dodoc doc/*.{txt,pdf}
-
- # install logrotate snippet; bug #329281
- #
- insinto /etc/logrotate.d
- newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
- # Asterisk installs a few folders that's empty by design,
- # but still required. This finds them, and marks them for
- # portage.
- while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
- keepdir "${d#${ED}}"
- done
-}
-
-pkg_postinst() {
- if [ -z "${REPLACING_VERSIONS}" ]; then
- elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
- elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
- elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
- elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
- elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
- elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
- fi
-}
diff --git a/net-misc/asterisk/asterisk-18.2.2.ebuild b/net-misc/asterisk/asterisk-18.2.2.ebuild
deleted file mode 100644
index bd70db646a93..000000000000
--- a/net-misc/asterisk/asterisk-18.2.2.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-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 dahdi 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}/${PN}-16.16.2-no-var-run-install.patch"
- "${FILESDIR}/${PN}-16.15.1-r2-autoconf-2.70.patch"
- "${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.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
- 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 )
- dahdi? (
- net-libs/libpri
- net-misc/dahdi-tools
- )
- 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.9:= )
- 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? ( virtual/imap-c-client )
- 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 )"
-
-BDEPEND="dev-libs/libxml2:2
- virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
- "NOISY_BUILD=yes"
- "ASTDBDIR=\$(ASTDATADIR)/astdb"
- "ASTCACHEDIR=/var/cache/asterisk"
- "OPTIMIZE="
- "DEBUG="
- "DESTDIR=${D}"
- "CONFIG_SRC=configs/samples"
- "CONFIG_EXTEN=.sample"
-)
-
-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" eautoreconf
-}
-
-src_configure() {
- local vmst
- local copt cstate
-
- econf \
- LUA_VERSION="${ELUA#lua}" \
- --libdir="/usr/$(get_libdir)" \
- --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)
-
- _menuselect() {
- menuselect/menuselect "$@" || die "menuselect $* failed."
- }
-
- _use_select() {
- local state=$(use "$1" && echo enable || echo disable)
- shift # remove use from parameters
-
- while [[ -n $1 ]]; do
- _menuselect --${state} "$1" menuselect.makeopts
- shift
- 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.
- >"${S}"/sounds/sounds.xml
-
- # That NATIVE_ARCH chatter really is quite bothersome
- sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
- # Compile menuselect binary for optional components
- emake "${_make_args[@]}" menuselect.makeopts
-
- # Disable BUILD_NATIVE (bug #667498)
- _menuselect --disable build_native menuselect.makeopts
-
- # Broken functionality is forcibly disabled (bug #360143)
- _menuselect --disable chan_misdn menuselect.makeopts
- _menuselect --disable chan_ooh323 menuselect.makeopts
-
- # Utility set is forcibly enabled (bug #358001)
- _menuselect --enable smsq menuselect.makeopts
- _menuselect --enable streamplayer menuselect.makeopts
- _menuselect --enable aelparse menuselect.makeopts
- _menuselect --enable astman menuselect.makeopts
-
- # this is connected, otherwise it would not find
- # ast_pktccops_gate_alloc symbol
- _menuselect --enable chan_mgcp menuselect.makeopts
- _menuselect --enable res_pktccops menuselect.makeopts
-
- # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
- _menuselect --enable pbx_dundi menuselect.makeopts
- _menuselect --enable func_aes menuselect.makeopts
- _menuselect --enable chan_iax2 menuselect.makeopts
-
- # SQlite3 is now the main database backend, enable related features
- _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
- _menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
- # 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 dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
- _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 ...
- _menuselect --enable app_voicemail menuselect.makeopts
- for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
- if use "${vmst#+}"; then
- _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
- fi
- done
-
- if use debug; then
- for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
- _menuselect --enable "${o}" menuselect.makeopts
- 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"
- _menuselect ${cstate} "${copt#[-+]}"
- eend $?
- done
- fi
-}
-
-src_compile() {
- emake "${_make_args[@]}"
-}
-
-src_install() {
- local d
-
- dodir "/usr/$(get_libdir)/pkgconfig"
-
- diropts -m 0750 -o root -g asterisk
- dodir /etc/asterisk
-
- emake "${_make_args[@]}" install install-headers install-configs
-
- 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}
- diropts -m 0750 -o asterisk -g asterisk
- keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
- newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
- newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
-
- systemd_dounit "${FILESDIR}"/asterisk.service
- newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
- systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
- # Reset diropts else dodoc uses it for doc installations.
- diropts -m0755
-
- # install the upgrade documentation
- dodoc UPGRADE* BUGS CREDITS
-
- # install extra documentation
- use doc && dodoc doc/*.{txt,pdf}
-
- # install logrotate snippet; bug #329281
- #
- insinto /etc/logrotate.d
- newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
- # Asterisk installs a few folders that's empty by design,
- # but still required. This finds them, and marks them for
- # portage.
- while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
- keepdir "${d#${ED}}"
- done
-}
-
-pkg_postinst() {
- if [ -z "${REPLACING_VERSIONS}" ]; then
- elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
- elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
- elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
- elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
- elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
- elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
- 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.3.0.ebuild b/net-misc/asterisk/asterisk-18.3.0.ebuild
deleted file mode 100644
index 15706359eafa..000000000000
--- a/net-misc/asterisk/asterisk-18.3.0.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-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 dahdi 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}/${PN}-16.16.2-no-var-run-install.patch"
- "${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.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
- 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 )
- dahdi? (
- net-libs/libpri
- net-misc/dahdi-tools
- )
- 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.9:= )
- 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? ( virtual/imap-c-client )
- 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 )"
-
-BDEPEND="dev-libs/libxml2:2
- virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
- "NOISY_BUILD=yes"
- "ASTDBDIR=\$(ASTDATADIR)/astdb"
- "ASTCACHEDIR=/var/cache/asterisk"
- "OPTIMIZE="
- "DEBUG="
- "DESTDIR=${D}"
- "CONFIG_SRC=configs/samples"
- "CONFIG_EXTEN=.sample"
-)
-
-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" eautoreconf
-}
-
-src_configure() {
- local vmst
- local copt cstate
-
- econf \
- LUA_VERSION="${ELUA#lua}" \
- --libdir="/usr/$(get_libdir)" \
- --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)
-
- _menuselect() {
- menuselect/menuselect "$@" || die "menuselect $* failed."
- }
-
- _use_select() {
- local state=$(use "$1" && echo enable || echo disable)
- shift # remove use from parameters
-
- while [[ -n $1 ]]; do
- _menuselect --${state} "$1" menuselect.makeopts
- shift
- 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.
- >"${S}"/sounds/sounds.xml
-
- # That NATIVE_ARCH chatter really is quite bothersome
- sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
- # Compile menuselect binary for optional components
- emake "${_make_args[@]}" menuselect.makeopts
-
- # Disable BUILD_NATIVE (bug #667498)
- _menuselect --disable build_native menuselect.makeopts
-
- # Broken functionality is forcibly disabled (bug #360143)
- _menuselect --disable chan_misdn menuselect.makeopts
- _menuselect --disable chan_ooh323 menuselect.makeopts
-
- # Utility set is forcibly enabled (bug #358001)
- _menuselect --enable smsq menuselect.makeopts
- _menuselect --enable streamplayer menuselect.makeopts
- _menuselect --enable aelparse menuselect.makeopts
- _menuselect --enable astman menuselect.makeopts
-
- # this is connected, otherwise it would not find
- # ast_pktccops_gate_alloc symbol
- _menuselect --enable chan_mgcp menuselect.makeopts
- _menuselect --enable res_pktccops menuselect.makeopts
-
- # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
- _menuselect --enable pbx_dundi menuselect.makeopts
- _menuselect --enable func_aes menuselect.makeopts
- _menuselect --enable chan_iax2 menuselect.makeopts
-
- # SQlite3 is now the main database backend, enable related features
- _menuselect --enable cdr_sqlite3_custom menuselect.makeopts
- _menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
- # 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 dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
- _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 ...
- _menuselect --enable app_voicemail menuselect.makeopts
- for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
- if use "${vmst#+}"; then
- _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
- fi
- done
-
- if use debug; then
- for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
- _menuselect --enable "${o}" menuselect.makeopts
- 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"
- _menuselect ${cstate} "${copt#[-+]}"
- eend $?
- done
- fi
-}
-
-src_compile() {
- emake "${_make_args[@]}"
-}
-
-src_install() {
- local d
-
- dodir "/usr/$(get_libdir)/pkgconfig"
-
- diropts -m 0750 -o root -g asterisk
- dodir /etc/asterisk
-
- emake "${_make_args[@]}" install install-headers install-configs
-
- 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}
- diropts -m 0750 -o asterisk -g asterisk
- keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
- newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
- newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
-
- systemd_dounit "${FILESDIR}"/asterisk.service
- newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
- systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
- # Reset diropts else dodoc uses it for doc installations.
- diropts -m0755
-
- # install the upgrade documentation
- dodoc UPGRADE* BUGS CREDITS
-
- # install extra documentation
- use doc && dodoc doc/*.{txt,pdf}
-
- # install logrotate snippet; bug #329281
- #
- insinto /etc/logrotate.d
- newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
- # Asterisk installs a few folders that's empty by design,
- # but still required. This finds them, and marks them for
- # portage.
- while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
- keepdir "${d#${ED}}"
- done
-}
-
-pkg_postinst() {
- if [ -z "${REPLACING_VERSIONS}" ]; then
- elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
- elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
- elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
- elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
- elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
- elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
- 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.4.0.ebuild b/net-misc/asterisk/asterisk-18.4.0-r1.ebuild
index 7af5c494233a..ad920ebb0ab2 100644
--- a/net-misc/asterisk/asterisk-18.4.0.ebuild
+++ b/net-misc/asterisk/asterisk-18.4.0-r1.ebuild
@@ -27,6 +27,7 @@ REQUIRED_USE="gtalk? ( xmpp )
PATCHES=(
"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+ "${FILESDIR}/${PN}-16.18.0-r1-func_lock-fix-races.patch"
)
DEPEND="acct-user/asterisk
diff --git a/net-misc/asterisk/files/asterisk-13.38.2-r3-func_lock-fix-races.patch b/net-misc/asterisk/files/asterisk-13.38.2-r3-func_lock-fix-races.patch
new file mode 100644
index 000000000000..3d3c7b101d47
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-13.38.2-r3-func_lock-fix-races.patch
@@ -0,0 +1,421 @@
+From b35211fd58afcf430a0d95a243dc7a086d72b2b8 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Fri, 21 May 2021 20:11:59 +0200
+Subject: [PATCH] Replacement patch for v13.
+
+Change-Id: I30236d7d7229f317c681fb7c6d7944d6108acd08
+---
+ funcs/func_lock.c | 234 +++++++++++++++++++++++++---------------------
+ 1 file changed, 126 insertions(+), 108 deletions(-)
+
+diff --git a/funcs/func_lock.c b/funcs/func_lock.c
+index a006a574eb..c472504f52 100644
+--- a/funcs/func_lock.c
++++ b/funcs/func_lock.c
+@@ -44,6 +44,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ #include "asterisk/linkedlists.h"
+ #include "asterisk/astobj2.h"
+ #include "asterisk/utils.h"
++#include "asterisk/cli.h"
+
+ /*** DOCUMENTATION
+ <function name="LOCK" language="en_US">
+@@ -112,7 +113,6 @@ static AST_LIST_HEAD_STATIC(locklist, lock_frame);
+ static void lock_free(void *data);
+ static void lock_fixup(void *data, struct ast_channel *oldchan, struct ast_channel *newchan);
+ static int unloading = 0;
+-static pthread_t broker_tid = AST_PTHREADT_NULL;
+
+ static const struct ast_datastore_info lock_info = {
+ .type = "MUTEX",
+@@ -126,8 +126,8 @@ struct lock_frame {
+ ast_cond_t cond;
+ /*! count is needed so if a recursive mutex exits early, we know how many times to unlock it. */
+ unsigned int count;
+- /*! Container of requesters for the named lock */
+- struct ao2_container *requesters;
++ /*! Count of waiting of requesters for the named lock */
++ unsigned int requesters;
+ /*! who owns us */
+ struct ast_channel *owner;
+ /*! name of the lock */
+@@ -149,14 +149,19 @@ static void lock_free(void *data)
+ while ((clframe = AST_LIST_REMOVE_HEAD(oldlist, list))) {
+ /* Only unlock if we own the lock */
+ if (clframe->channel == clframe->lock_frame->owner) {
++ ast_mutex_lock(&clframe->lock_frame->mutex);
+ clframe->lock_frame->count = 0;
+ clframe->lock_frame->owner = NULL;
++ ast_cond_signal(&clframe->lock_frame->cond);
++ ast_mutex_unlock(&clframe->lock_frame->mutex);
+ }
+ ast_free(clframe);
+ }
+ AST_LIST_UNLOCK(oldlist);
+ AST_LIST_HEAD_DESTROY(oldlist);
+ ast_free(oldlist);
++
++ ast_module_unref(ast_module_info->self);
+ }
+
+ static void lock_fixup(void *data, struct ast_channel *oldchan, struct ast_channel *newchan)
+@@ -175,54 +180,11 @@ static void lock_fixup(void *data, struct ast_channel *oldchan, struct ast_chann
+ if (clframe->lock_frame->owner == oldchan) {
+ clframe->lock_frame->owner = newchan;
+ }
+- /* We don't move requesters, because the thread stack is different */
+ clframe->channel = newchan;
+ }
+ AST_LIST_UNLOCK(list);
+ }
+
+-static void *lock_broker(void *unused)
+-{
+- struct lock_frame *frame;
+- struct timespec forever = { 1000000, 0 };
+- for (;;) {
+- int found_requester = 0;
+-
+- /* Test for cancel outside of the lock */
+- pthread_testcancel();
+- AST_LIST_LOCK(&locklist);
+-
+- AST_LIST_TRAVERSE(&locklist, frame, entries) {
+- if (ao2_container_count(frame->requesters)) {
+- found_requester++;
+- ast_mutex_lock(&frame->mutex);
+- if (!frame->owner) {
+- ast_cond_signal(&frame->cond);
+- }
+- ast_mutex_unlock(&frame->mutex);
+- }
+- }
+-
+- AST_LIST_UNLOCK(&locklist);
+- pthread_testcancel();
+-
+- /* If there are no requesters, then wait for a signal */
+- if (!found_requester) {
+- nanosleep(&forever, NULL);
+- } else {
+- sched_yield();
+- }
+- }
+- /* Not reached */
+- return NULL;
+-}
+-
+-static int ast_channel_cmp_cb(void *obj, void *arg, int flags)
+-{
+- struct ast_channel *chan = obj, *cmp_args = arg;
+- return strcasecmp(ast_channel_name(chan), ast_channel_name(cmp_args)) ? 0 : CMP_MATCH;
+-}
+-
+ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+ {
+ struct ast_datastore *lock_store = ast_channel_datastore_find(chan, &lock_info, NULL);
+@@ -234,7 +196,12 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+ struct timeval now;
+
+ if (!lock_store) {
+- ast_debug(1, "Channel %s has no lock datastore, so we're allocating one.\n", ast_channel_name(chan));
++ if (unloading) {
++ ast_log(LOG_ERROR, "%sLOCK has no datastore and func_lock is unloading, failing.\n",
++ trylock ? "TRY" : "");
++ return -1;
++ }
++
+ lock_store = ast_datastore_alloc(&lock_info, NULL);
+ if (!lock_store) {
+ ast_log(LOG_ERROR, "Unable to allocate new datastore. No locks will be obtained.\n");
+@@ -253,6 +220,9 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+ lock_store->data = list;
+ AST_LIST_HEAD_INIT(list);
+ ast_channel_datastore_add(chan, lock_store);
++
++ /* We cannot unload until this channel has released the lock_store */
++ ast_module_ref(ast_module_info->self);
+ } else
+ list = lock_store->data;
+
+@@ -266,6 +236,9 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+
+ if (!current) {
+ if (unloading) {
++ ast_log(LOG_ERROR,
++ "Lock doesn't exist whilst unloading. %sLOCK will fail.\n",
++ trylock ? "TRY" : "");
+ /* Don't bother */
+ AST_LIST_UNLOCK(&locklist);
+ return -1;
+@@ -292,17 +265,12 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+ AST_LIST_UNLOCK(&locklist);
+ return -1;
+ }
+- current->requesters = ao2_container_alloc_list(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
+- NULL, ast_channel_cmp_cb);
+- if (!current->requesters) {
+- ast_mutex_destroy(&current->mutex);
+- ast_cond_destroy(&current->cond);
+- ast_free(current);
+- AST_LIST_UNLOCK(&locklist);
+- return -1;
+- }
+ AST_LIST_INSERT_TAIL(&locklist, current, entries);
+ }
++ /* Add to requester list */
++ ast_mutex_lock(&current->mutex);
++ current->requesters++;
++ ast_mutex_unlock(&current->mutex);
+ AST_LIST_UNLOCK(&locklist);
+
+ /* Found lock or created one - now find or create the corresponding link in the channel */
+@@ -315,7 +283,13 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+
+ if (!clframe) {
+ if (unloading) {
++ ast_log(LOG_ERROR,
++ "Busy unloading. %sLOCK will fail.\n",
++ trylock ? "TRY" : "");
+ /* Don't bother */
++ ast_mutex_lock(&current->mutex);
++ current->requesters--;
++ ast_mutex_unlock(&current->mutex);
+ AST_LIST_UNLOCK(list);
+ return -1;
+ }
+@@ -324,6 +298,9 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+ ast_log(LOG_ERROR,
+ "Unable to allocate channel lock frame. %sLOCK will fail.\n",
+ trylock ? "TRY" : "");
++ ast_mutex_lock(&current->mutex);
++ current->requesters--;
++ ast_mutex_unlock(&current->mutex);
+ AST_LIST_UNLOCK(list);
+ return -1;
+ }
+@@ -339,44 +316,44 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+ * the same amount, before we'll release this one.
+ */
+ if (current->owner == chan) {
++ /* We're not a requester, we already have it */
++ ast_mutex_lock(&current->mutex);
++ current->requesters--;
++ ast_mutex_unlock(&current->mutex);
+ current->count++;
+ return 0;
+ }
+
+- /* Okay, we have both frames, so now we need to try to lock.
+- *
+- * Locking order: always lock locklist first. We need the
+- * locklist lock because the broker thread counts whether
+- * there are requesters with the locklist lock held, and we
+- * need to hold it, so that when we send our signal, below,
+- * to wake up the broker thread, it definitely will see that
+- * a requester exists at that point in time. Otherwise, we
+- * could add to the requesters after it has already seen that
+- * that lock is unoccupied and wait forever for another signal.
+- */
+- AST_LIST_LOCK(&locklist);
+- ast_mutex_lock(&current->mutex);
+- /* Add to requester list */
+- ao2_link(current->requesters, chan);
+- pthread_kill(broker_tid, SIGURG);
+- AST_LIST_UNLOCK(&locklist);
+-
+ /* Wait up to three seconds from now for LOCK. */
+ now = ast_tvnow();
+ timeout.tv_sec = now.tv_sec + 3;
+ timeout.tv_nsec = now.tv_usec * 1000;
+
+- if (!current->owner
+- || (!trylock
+- && !(res = ast_cond_timedwait(&current->cond, &current->mutex, &timeout)))) {
+- res = 0;
++ ast_mutex_lock(&current->mutex);
++
++ res = 0;
++ while (!trylock && !res && current->owner) {
++ res = ast_cond_timedwait(&current->cond, &current->mutex, &timeout);
++ }
++ if (current->owner) {
++ ast_log(LOG_ERROR, "%sLOCK failed to obtain lock %s.\n", trylock ? "TRY" : "",
++ lockname);
++ /* timeout;
++ * trylock; or
++ * cond_timedwait failed.
++ *
++ * either way, we fail to obtain the lock.
++ */
++ res = -1;
++ } else {
+ current->owner = chan;
+ current->count++;
+- } else {
+- res = -1;
++ res = 0;
+ }
+ /* Remove from requester list */
+- ao2_unlink(current->requesters, chan);
++ current->requesters--;
++ if (res && unloading)
++ ast_cond_signal(&current->cond);
+ ast_mutex_unlock(&current->mutex);
+
+ return res;
+@@ -400,7 +377,7 @@ static int unlock_read(struct ast_channel *chan, const char *cmd, char *data, ch
+ }
+
+ if (!(list = lock_store->data)) {
+- ast_debug(1, "This should NEVER happen\n");
++ ast_log(LOG_ERROR, "Datastore's data member is NULL ... this should be impossible.");
+ ast_copy_string(buf, "0", len);
+ return 0;
+ }
+@@ -419,12 +396,17 @@ static int unlock_read(struct ast_channel *chan, const char *cmd, char *data, ch
+
+ if (!clframe) {
+ /* We didn't have this lock in the first place */
++ ast_log(LOG_WARNING, "Attempting to UNLOCK(%s) - a lock this channel never owned.\n",
++ data);
+ ast_copy_string(buf, "0", len);
+ return 0;
+ }
+
+ if (--clframe->lock_frame->count == 0) {
++ ast_mutex_lock(&clframe->lock_frame->mutex);
+ clframe->lock_frame->owner = NULL;
++ ast_cond_signal(&clframe->lock_frame->cond);
++ ast_mutex_unlock(&clframe->lock_frame->mutex);
+ }
+
+ ast_copy_string(buf, "1", len);
+@@ -455,6 +437,37 @@ static int trylock_read(struct ast_channel *chan, const char *cmd, char *data, c
+ return 0;
+ }
+
++static char *handle_cli_locks_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
++{
++ int c = 0;
++ struct lock_frame* current;
++ switch (cmd) {
++ case CLI_INIT:
++ e->command = "locks show";
++ e->usage =
++ "Usage: locks show\n"
++ " List all locks known to func_lock, along with their current status.\n";
++ return NULL;
++ case CLI_GENERATE:
++ return NULL;
++ }
++
++ ast_cli(a->fd, "func_lock locks:\n");
++ ast_cli(a->fd, "%-40s Requesters Owner\n", "Name");
++ AST_LIST_LOCK(&locklist);
++ AST_LIST_TRAVERSE(&locklist, current, entries) {
++ ast_mutex_lock(&current->mutex);
++ ast_cli(a->fd, "%-40s %-10d %s\n", current->name, current->requesters,
++ current->owner ? ast_channel_name(current->owner) : "(unlocked)");
++ ast_mutex_unlock(&current->mutex);
++ c++;
++ }
++ AST_LIST_UNLOCK(&locklist);
++ ast_cli(a->fd, "%d total locks listed.\n", c);
++
++ return 0;
++}
++
+ static struct ast_custom_function lock_function = {
+ .name = "LOCK",
+ .read = lock_read,
+@@ -473,6 +486,8 @@ static struct ast_custom_function unlock_function = {
+ .read_max = 2,
+ };
+
++static struct ast_cli_entry cli_locks_show = AST_CLI_DEFINE(handle_cli_locks_show, "List func_lock locks.");
++
+ static int unload_module(void)
+ {
+ struct lock_frame *current;
+@@ -480,34 +495,43 @@ static int unload_module(void)
+ /* Module flag */
+ unloading = 1;
+
++ /* Make it impossible for new requesters to be added
++ * NOTE: channels could already be in get_lock() */
++ ast_custom_function_unregister(&lock_function);
++ ast_custom_function_unregister(&trylock_function);
++
++ ast_cli_unregister(&cli_locks_show);
++
+ AST_LIST_LOCK(&locklist);
+ while ((current = AST_LIST_REMOVE_HEAD(&locklist, entries))) {
+- /* If any locks are currently in use, then we cannot unload this module */
+- if (current->owner || ao2_container_count(current->requesters)) {
+- /* Put it back */
+- AST_LIST_INSERT_HEAD(&locklist, current, entries);
+- AST_LIST_UNLOCK(&locklist);
+- unloading = 0;
+- return -1;
++ int warned = 0;
++ ast_mutex_lock(&current->mutex);
++ while (current->owner || current->requesters) {
++ if (!warned) {
++ ast_log(LOG_WARNING, "Waiting for %d requesters for %s lock %s.\n",
++ current->requesters, current->owner ? "locked" : "unlocked",
++ current->name);
++ warned = 1;
++ }
++ /* either the mutex is locked, or other parties are currently in get_lock,
++ * we need to wait for all of those to clear first */
++ ast_cond_wait(&current->cond, &current->mutex);
+ }
++ ast_mutex_unlock(&current->mutex);
++ /* At this point we know:
++ * 1. the lock has been released,
++ * 2. there are no requesters (nor should any be able to sneak in).
++ */
+ ast_mutex_destroy(&current->mutex);
+- ao2_ref(current->requesters, -1);
++ ast_cond_destroy(&current->cond);
+ ast_free(current);
+ }
++ AST_LIST_UNLOCK(&locklist);
++ AST_LIST_HEAD_DESTROY(&locklist);
+
+- /* No locks left, unregister functions */
+- ast_custom_function_unregister(&lock_function);
+- ast_custom_function_unregister(&trylock_function);
++ /* At this point we can safely stop access to UNLOCK */
+ ast_custom_function_unregister(&unlock_function);
+
+- if (broker_tid != AST_PTHREADT_NULL) {
+- pthread_cancel(broker_tid);
+- pthread_kill(broker_tid, SIGURG);
+- pthread_join(broker_tid, NULL);
+- }
+-
+- AST_LIST_UNLOCK(&locklist);
+-
+ return 0;
+ }
+
+@@ -516,13 +540,7 @@ static int load_module(void)
+ int res = ast_custom_function_register_escalating(&lock_function, AST_CFE_READ);
+ res |= ast_custom_function_register_escalating(&trylock_function, AST_CFE_READ);
+ res |= ast_custom_function_register_escalating(&unlock_function, AST_CFE_READ);
+-
+- if (ast_pthread_create_background(&broker_tid, NULL, lock_broker, NULL)) {
+- ast_log(LOG_ERROR, "Failed to start lock broker thread. Unloading func_lock module.\n");
+- broker_tid = AST_PTHREADT_NULL;
+- unload_module();
+- return AST_MODULE_LOAD_DECLINE;
+- }
++ res |= ast_cli_register(&cli_locks_show);
+
+ return res;
+ }
+--
+2.26.3
+
diff --git a/net-misc/asterisk/files/asterisk-16.18.0-r1-func_lock-fix-races.patch b/net-misc/asterisk/files/asterisk-16.18.0-r1-func_lock-fix-races.patch
new file mode 100644
index 000000000000..a18ef34d499c
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-16.18.0-r1-func_lock-fix-races.patch
@@ -0,0 +1,177 @@
+Combined patch from upstream (All authored by myself):
+
+https://gerrit.asterisk.org/c/asterisk/+/15942 (CLI: locks show)
+https://gerrit.asterisk.org/c/asterisk/+/15943 (unload memory corruption)
+https://gerrit.asterisk.org/c/asterisk/+/15944 (error path ref counting)
+https://gerrit.asterisk.org/c/asterisk/+/15945 (ast_module_ref usage)
+
+The cause of my nightmares was the unload memory corruption, however,
+the other two whilst much less likely to occur are just as serious.
+
+Fixes on all has been well tested. The individual patches are quite small.
+
+Signed-off-by: Jaco Kroon <jaco@uls.co.za>
+---
+diff --git a/funcs/func_lock.c b/funcs/func_lock.c
+index 072640751e..31a7fcda29 100644
+--- a/funcs/func_lock.c
++++ b/funcs/func_lock.c
+@@ -42,6 +42,7 @@
+ #include "asterisk/linkedlists.h"
+ #include "asterisk/astobj2.h"
+ #include "asterisk/utils.h"
++#include "asterisk/cli.h"
+
+ /*** DOCUMENTATION
+ <function name="LOCK" language="en_US">
+@@ -157,6 +158,8 @@ static void lock_free(void *data)
+ AST_LIST_UNLOCK(oldlist);
+ AST_LIST_HEAD_DESTROY(oldlist);
+ ast_free(oldlist);
++
++ ast_module_unref(ast_module_info->self);
+ }
+
+ static void lock_fixup(void *data, struct ast_channel *oldchan, struct ast_channel *newchan)
+@@ -191,7 +194,12 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+ struct timeval now;
+
+ if (!lock_store) {
+- ast_debug(1, "Channel %s has no lock datastore, so we're allocating one.\n", ast_channel_name(chan));
++ if (unloading) {
++ ast_log(LOG_ERROR, "%sLOCK has no datastore and func_lock is unloading, failing.\n",
++ trylock ? "TRY" : "");
++ return -1;
++ }
++
+ lock_store = ast_datastore_alloc(&lock_info, NULL);
+ if (!lock_store) {
+ ast_log(LOG_ERROR, "Unable to allocate new datastore. No locks will be obtained.\n");
+@@ -210,6 +218,9 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+ lock_store->data = list;
+ AST_LIST_HEAD_INIT(list);
+ ast_channel_datastore_add(chan, lock_store);
++
++ /* We cannot unload until this channel has released the lock_store */
++ ast_module_ref(ast_module_info->self);
+ } else
+ list = lock_store->data;
+
+@@ -223,6 +234,9 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+
+ if (!current) {
+ if (unloading) {
++ ast_log(LOG_ERROR,
++ "Lock doesn't exist whilst unloading. %sLOCK will fail.\n",
++ trylock ? "TRY" : "");
+ /* Don't bother */
+ AST_LIST_UNLOCK(&locklist);
+ return -1;
+@@ -249,7 +263,6 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+ AST_LIST_UNLOCK(&locklist);
+ return -1;
+ }
+- current->requesters = 0;
+ AST_LIST_INSERT_TAIL(&locklist, current, entries);
+ }
+ /* Add to requester list */
+@@ -268,7 +281,13 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+
+ if (!clframe) {
+ if (unloading) {
++ ast_log(LOG_ERROR,
++ "Busy unloading. %sLOCK will fail.\n",
++ trylock ? "TRY" : "");
+ /* Don't bother */
++ ast_mutex_lock(&current->mutex);
++ current->requesters--;
++ ast_mutex_unlock(&current->mutex);
+ AST_LIST_UNLOCK(list);
+ return -1;
+ }
+@@ -277,6 +296,9 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock)
+ ast_log(LOG_ERROR,
+ "Unable to allocate channel lock frame. %sLOCK will fail.\n",
+ trylock ? "TRY" : "");
++ ast_mutex_lock(&current->mutex);
++ current->requesters--;
++ ast_mutex_unlock(&current->mutex);
+ AST_LIST_UNLOCK(list);
+ return -1;
+ }
+@@ -409,6 +431,37 @@ static int trylock_read(struct ast_channel *chan, const char *cmd, char *data, c
+ return 0;
+ }
+
++static char *handle_cli_locks_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
++{
++ int c = 0;
++ struct lock_frame* current;
++ switch (cmd) {
++ case CLI_INIT:
++ e->command = "locks show";
++ e->usage =
++ "Usage: locks show\n"
++ " List all locks known to func_lock, along with their current status.\n";
++ return NULL;
++ case CLI_GENERATE:
++ return NULL;
++ }
++
++ ast_cli(a->fd, "func_lock locks:\n");
++ ast_cli(a->fd, "%-40s Requesters Owner\n", "Name");
++ AST_LIST_LOCK(&locklist);
++ AST_LIST_TRAVERSE(&locklist, current, entries) {
++ ast_mutex_lock(&current->mutex);
++ ast_cli(a->fd, "%-40s %-10d %s\n", current->name, current->requesters,
++ current->owner ? ast_channel_name(current->owner) : "(unlocked)");
++ ast_mutex_unlock(&current->mutex);
++ c++;
++ }
++ AST_LIST_UNLOCK(&locklist);
++ ast_cli(a->fd, "%d total locks listed.\n", c);
++
++ return 0;
++}
++
+ static struct ast_custom_function lock_function = {
+ .name = "LOCK",
+ .read = lock_read,
+@@ -427,6 +480,8 @@ static struct ast_custom_function unlock_function = {
+ .read_max = 2,
+ };
+
++static struct ast_cli_entry cli_locks_show = AST_CLI_DEFINE(handle_cli_locks_show, "List func_lock locks.");
++
+ static int unload_module(void)
+ {
+ struct lock_frame *current;
+@@ -439,10 +494,19 @@ static int unload_module(void)
+ ast_custom_function_unregister(&lock_function);
+ ast_custom_function_unregister(&trylock_function);
+
++ ast_cli_unregister(&cli_locks_show);
++
+ AST_LIST_LOCK(&locklist);
+- AST_LIST_TRAVERSE(&locklist, current, entries) {
++ while ((current = AST_LIST_REMOVE_HEAD(&locklist, entries))) {
++ int warned = 0;
+ ast_mutex_lock(&current->mutex);
+ while (current->owner || current->requesters) {
++ if (!warned) {
++ ast_log(LOG_WARNING, "Waiting for %d requesters for %s lock %s.\n",
++ current->requesters, current->owner ? "locked" : "unlocked",
++ current->name);
++ warned = 1;
++ }
+ /* either the mutex is locked, or other parties are currently in get_lock,
+ * we need to wait for all of those to clear first */
+ ast_cond_wait(&current->cond, &current->mutex);
+@@ -470,6 +534,7 @@ static int load_module(void)
+ int res = ast_custom_function_register_escalating(&lock_function, AST_CFE_READ);
+ res |= ast_custom_function_register_escalating(&trylock_function, AST_CFE_READ);
+ res |= ast_custom_function_register_escalating(&unlock_function, AST_CFE_READ);
++ res |= ast_cli_register(&cli_locks_show);
+
+ return res;
+ }
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 8754b275dc7d..51fee4375736 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -9,7 +9,7 @@ DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7
DIST chrony-4.0.tar.gz.asc 195 BLAKE2B 1947a73f35eb5c58f91775d76473210a7b5edff5b808e360eb0c3724351c54ac4f187a2aa4450830130da718c6a0c488baa170ca87e7e6eac781d85c67b3773f SHA512 c3156d91f4fdb6f9e2fdbc83b1399afb0ecdfa9b7bc92648c5bce477c3f0f921d2a13aa21ac6c281f18b008c60f08e3db6d82b642b646f064aea1dbe19295c4c
DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f
DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff SHA512 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a
-EBUILD chrony-4.0-r2.ebuild 5467 BLAKE2B 3ce0ad6ccb8e6477b4b7e615e7c19fa8f492253730f185ddf127fffccdf18b9f23b55b2a5acbc06ca19e1deb328d01b477a50a70984f8f4ac968d48f8ab57e08 SHA512 6d7c2c61527da60511bf62a3133fd717faad3a4a970f898687bd14806427229012defc36713fb70b8ae4fedde3b4c9b48eea0c8124003f5866299a3e0717b12d
+EBUILD chrony-4.0-r2.ebuild 5478 BLAKE2B 4dde74187b43f93d8056a1c70a0a9671ea3e5ef4f9975f0ed9458ec901565849fc0f7a8dced8398d82f1e6836cfdfe55d4c2630043795153b3592639c3828715 SHA512 d6249e70f95dc0bbe3355cea997b362bdce5b91d3aec27a885eefc7c10cac4ab9718054b172c37c60c4363e7eebb62bf1f4a6e77bef330d4c34c8975bfd71202
EBUILD chrony-4.1-r1.ebuild 6631 BLAKE2B 93c4b6a53a2c44bcf2508125fe33291c60a37321f32eaaa2c6fb4616bb97378cc50463ec977cd0204e1215c4651d84d79c39adca45285c9ae44e126007cea5a7 SHA512 69c90fa53b76c2a996d466098133a962764f19a54686bbd03c1694eff80b6e4a846bf6c33b1d139bcc0e0076eb51f49a78d45a550f816786785bad00b3fc6075
EBUILD chrony-9999.ebuild 6631 BLAKE2B 93c4b6a53a2c44bcf2508125fe33291c60a37321f32eaaa2c6fb4616bb97378cc50463ec977cd0204e1215c4651d84d79c39adca45285c9ae44e126007cea5a7 SHA512 69c90fa53b76c2a996d466098133a962764f19a54686bbd03c1694eff80b6e4a846bf6c33b1d139bcc0e0076eb51f49a78d45a550f816786785bad00b3fc6075
MISC metadata.xml 2299 BLAKE2B f5e8667a5fdeb86395d773eaf6e7d80c2133fe945565d7d6005f156a0a4763f1434ba887627fba63dd0f0a15663d7fa194d91699f6961ad21b9afa40576cd1fd SHA512 370e06edf9df22a327ff8b528f8a810c731af4615d740331ac737af8cbc5af265f7592ec22bf844301c5089185bc4f7de102f87378f85cf276d4f550933e519a
diff --git a/net-misc/chrony/chrony-4.0-r2.ebuild b/net-misc/chrony/chrony-4.0-r2.ebuild
index 2c76d583d7c4..290db9f4f020 100644
--- a/net-misc/chrony/chrony-4.0-r2.ebuild
+++ b/net-misc/chrony/chrony-4.0-r2.ebuild
@@ -45,7 +45,7 @@ if [[ ${PV} == "9999" ]]; then
REQUIRED_USE+=" html"
BDEPEND+=" virtual/w3m"
else
- BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-mlichvar )"
+ BDEPEND+=" verify-sig? ( <=app-crypt/openpgp-keys-mlichvar-20210416 )"
fi
DEPEND="
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 06c272c93e9f..5c855567f2ee 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,13 +1,8 @@
AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-7.74.0.tar.xz 2400972 BLAKE2B bef9e01493994afc933549a78b41065708aeaa9f6f5cdd1dbf2f43bbb03bbc97b17308b8bda5f11599c3cc0c6c77903e6fa6f1310ff874fad902a59566b51e8a SHA512 5d987f0b4d051c9e254f14d4e2a05f7cda9fb0f0ac7b3ca3664a25a51ee5ffe092ee072c0d9a613fcd3f34727d75bba14b70f5500cb110ca818591e071c3e6f4
-DIST curl-7.75.0.tar.xz 2418816 BLAKE2B 74889ede1b57a6685eef0f504d4c261c0b271b36ab3290bfc895efe9a6fffe4bfd433eaae438cd2b54a920671a2ebc2ca5e73bd88f6be40b4f46ef281028f1d8 SHA512 4c2fc6658379b8b93dd50665b70f3000b63d3bcafd2df60b7e651a8edf4735b3decb06c338b84cb22058191aa9f8f4dc85760a42f9987210b59300758304b746
-DIST curl-7.76.0.tar.xz 2428552 BLAKE2B 7c02bbd3c86a5de38990f7ef63e92804fc02977bf34eb4372e7ac95aa091689094193bcf58e30d76114341f930777787cbfbbf83f02c5037f7ac7599296a6735 SHA512 a67e5078b48150c6f5331e76b25a6b197f1e916be1db900bf9455b032b3af5a71610b47e607546ecbae510d196a0cfcb75a14dac549288797af1701b7b587ece
DIST curl-7.76.1.tar.xz 2427636 BLAKE2B 56452871fbd998f0c9a5af86b3853ed1dfc956c39380e5da472b4f382db45926ac3aa9e395ae7d2812aac0f0f29bee28343218810a169beb592c5224e0a4f018 SHA512 5fe85d2e776789aa8117c57fe7648e375b7fa92d5ead5d69855f19ca9a2624d77a1f9ab91766ecb72bbc17e82862248cd07e48917884d6fd856b93fb00d83e28
-EBUILD curl-7.74.0-r2.ebuild 8441 BLAKE2B f187405773912743d8105038c72fa28510d60bcef0c6ca36b457e0d0152c3c98aaed65b86827e6ac4a2b05618894d30885c65a9db74141b77d12c0592775084c SHA512 3cf800f328e653ffeeaf972349e69729b2fd8d079e56c8124e5a9c3e7bbea25fe2f759df414ad5698b9218f8d94ced6c9ca475cc8bb81443c988c8620c8704a5
-EBUILD curl-7.74.0-r4.ebuild 8113 BLAKE2B fbe25717bdfc5f72378663c6ca5d789ed804f9f781b681021fe673ecbc8b6610529f04e9a85651fef8b06c82a705c90733cd0b0f87f8a230ee542d0476127271 SHA512 80c82de586872712446702ddf9a69971f378ce253ea2511a07a6d0daad756254cc543a64e47034ed4e08099210b06fd2bb432e1269bfbdf62c53c55a9d526a5a
-EBUILD curl-7.75.0.ebuild 8131 BLAKE2B 2eea96c28eb050bbce674de4922484b0ee269e7a2da55d964596dead5efafdc9638e102abd7bbb1b59a26ece7f78aa77cbec2feca05ea5d08d6172c3367b62b8 SHA512 a87d56e727c0bf9d9cd819ca9c8290581cd4eda32c1e3f20804845122e7be0a49492aec395048604fc16f9110b0be0c7464528069f7c0a78882e124cbf5c24d3
-EBUILD curl-7.76.0.ebuild 8126 BLAKE2B 7c13dd8eebeb6f4faa739491cb472f2f51072fce44afc3f1bdcab4b89299ab0fc2db136d02f9fb8857da561174710271f15c37002c477ba356f1a6e669a8cc05 SHA512 c4691af18330e43d8526784e0e796bae9b8acd33acf72ea491d32ea08efabfb6e97f049563cd1516d1af9378a395963390f16964a2cd104ba6a186e353cb45b6
+DIST curl-7.77.0.tar.xz 2439336 BLAKE2B 433b3179dcf2c3363514b72bf9c54286873d8e5559b33e543ba8f3e7df25a619c5be13a8aacb9361c4464b646af4d1fb214d4de57a17f3de7e8f379777214d13 SHA512 aef92a0e3f8ce8491b258a9a1c4dcea3c07c29b139a1f68f08619caa0295cfde76335d2dfb9cdf434525daea7dd05d8acd22f203f5ccc7735bd317964ec1da76
EBUILD curl-7.76.1.ebuild 8187 BLAKE2B d5744b39a6a51c6ec2646df5c699c5311ff5391ec026a61c387f2d1cafb478e2db6757edb050722b932640fac49521c9c57b92cf5b330680b9aa88f6da7fdeac SHA512 6fce3a508e11c8c628b4b5b29e2e777353557b26dca5e2211997ddce1a745650d7d9e15e73521cb71db6b2f865666e4bde130f8ced68b0bf0aaf883f0599c9e5
+EBUILD curl-7.77.0.ebuild 8188 BLAKE2B 3e72837643cda35ef27136e0329205bfc986e0a6eea616d1ef54bd5cd678b61e9d1ff4d55c5e0f0cd1fd4bdefc548c19a670e4474d2758a798acfc7668f11275 SHA512 deeea4b9784d937fc16a65fc5c7a8b19664ba10f2ec72fa78125fb95bad9a57bdaf849c011f9e8a5b8cb2164ab501ae5867e05776cd726dce2f991ac641cbe77
MISC metadata.xml 2104 BLAKE2B cd965737bacd5cde978fdcb652559c3c29eee0083bdee82e00cf78055e681571e77a2deaf4ab6ef5a9aba0c33689356fc2299c346c4c1e6b4afda9c675b9f3b1 SHA512 a2e9ba5358d115b18fa089bd222f026a7553505a154e1d865af0cde1004a0a427f58ed38d802815d96453d5d58628aa91d8cd5d082fe059cb1afd4dc9d312052
diff --git a/net-misc/curl/curl-7.74.0-r2.ebuild b/net-misc/curl/curl-7.74.0-r2.ebuild
deleted file mode 100644
index e5b102b31a7d..000000000000
--- a/net-misc/curl/curl-7.74.0-r2.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
-
-LICENSE="curl"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" nghttp3 quiche"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
- ssl? (
- gnutls? (
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
- dev-libs/nettle:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- mbedtls? (
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- openssl? (
- dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
- )
- nss? (
- dev-libs/nss:0[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- )
- http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
- nghttp3? (
- net-libs/nghttp3[${MULTILIB_USEDEP}]
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
- )
- quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
- adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
- sys-libs/zlib[${MULTILIB_USEDEP}]
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-# rtmp? (
-# media-video/rtmpdump
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-# )
-
-# ssl providers to be added:
-# fbopenssl $(use_with spnego)
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- test? (
- sys-apps/diffutils
- dev-lang/perl
- )"
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
- winssl? ( elibc_Winnt )
- threads? ( !adns )
- ssl? (
- ^^ (
- curl_ssl_gnutls
- curl_ssl_mbedtls
- curl_ssl_nss
- curl_ssl_openssl
- curl_ssl_winssl
- )
- )"
-
-DOCS=( CHANGES README docs/FEATURES.md docs/INTERNALS.md \
- docs/FAQ docs/BUGS.md docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/curl-config
-)
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
- eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
- eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
- sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
- sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
- eapply_user
- eprefixify curl-config.in
- eautoreconf
-}
-
-multilib_src_configure() {
- # We make use of the fact that later flags override earlier ones
- # So start with all ssl providers off until proven otherwise
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
- local myconf=()
-
- myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
- #myconf+=( --without-default-ssl-backend )
- if use ssl ; then
- if use gnutls || use curl_ssl_gnutls; then
- einfo "SSL provided by gnutls"
- myconf+=( --with-gnutls --with-nettle )
- fi
- if use mbedtls || use curl_ssl_mbedtls; then
- einfo "SSL provided by mbedtls"
- myconf+=( --with-mbedtls )
- fi
- if use nss || use curl_ssl_nss; then
- einfo "SSL provided by nss"
- myconf+=( --with-nss )
- fi
- if use openssl || use curl_ssl_openssl; then
- einfo "SSL provided by openssl"
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
- fi
- if use winssl || use curl_ssl_winssl; then
- einfo "SSL provided by Windows"
- myconf+=( --with-winssl )
- fi
-
- if use curl_ssl_gnutls; then
- einfo "Default SSL provided by gnutls"
- myconf+=( --with-default-ssl-backend=gnutls )
- elif use curl_ssl_mbedtls; then
- einfo "Default SSL provided by mbedtls"
- myconf+=( --with-default-ssl-backend=mbedtls )
- elif use curl_ssl_nss; then
- einfo "Default SSL provided by nss"
- myconf+=( --with-default-ssl-backend=nss )
- elif use curl_ssl_openssl; then
- einfo "Default SSL provided by openssl"
- myconf+=( --with-default-ssl-backend=openssl )
- elif use curl_ssl_winssl; then
- einfo "Default SSL provided by Windows"
- myconf+=( --with-default-ssl-backend=winssl )
- else
- eerror "We can't be here because of REQUIRED_USE."
- fi
-
- else
- einfo "SSL disabled"
- fi
-
- # These configuration options are organized alphabetically
- # within each category. This should make it easier if we
- # ever decide to make any of them contingent on USE flags:
- # 1) protocols first. To see them all do
- # 'grep SUPPORT_PROTOCOLS configure.ac'
- # 2) --enable/disable options second.
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
- # 3) --with/without options third.
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
- ECONF_SOURCE="${S}" \
- econf \
- $(use_enable alt-svc) \
- --enable-crypto-auth \
- --enable-dict \
- --disable-ech \
- --enable-file \
- $(use_enable ftp) \
- $(use_enable gopher) \
- $(use_enable hsts) \
- --enable-http \
- $(use_enable imap) \
- $(use_enable ldap) \
- $(use_enable ldap ldaps) \
- --disable-ntlm-wb \
- $(use_enable pop3) \
- --enable-rt \
- --enable-rtsp \
- $(use_enable samba smb) \
- $(use_with ssh libssh2) \
- $(use_enable smtp) \
- $(use_enable telnet) \
- $(use_enable tftp) \
- --enable-tls-srp \
- $(use_enable adns ares) \
- --enable-cookies \
- --enable-dateparse \
- --enable-dnsshuffle \
- --enable-doh \
- --enable-hidden-symbols \
- --enable-http-auth \
- $(use_enable ipv6) \
- --enable-largefile \
- --enable-manual \
- --enable-mime \
- --enable-netrc \
- $(use_enable progress-meter) \
- --enable-proxy \
- --disable-sspi \
- $(use_enable static-libs static) \
- $(use_enable threads threaded-resolver) \
- $(use_enable threads pthreads) \
- --disable-versioned-symbols \
- --without-amissl \
- --without-bearssl \
- --without-cyassl \
- --without-darwinssl \
- --without-fish-functions-dir \
- $(use_with idn libidn2) \
- $(use_with kerberos gssapi "${EPREFIX}"/usr) \
- $(use_with metalink libmetalink) \
- $(use_with http2 nghttp2) \
- --without-libpsl \
- $(use_with nghttp3) \
- $(use_with nghttp3 ngtcp2) \
- $(use_with quiche) \
- $(use_with rtmp librtmp) \
- $(use_with brotli) \
- --without-schannel \
- --without-secure-transport \
- --without-spnego \
- --without-winidn \
- --without-wolfssl \
- --with-zlib \
- $(use_with zstd) \
- "${myconf[@]}"
-
- if ! multilib_is_native_abi; then
- # avoid building the client
- sed -i -e '/SUBDIRS/s:src::' Makefile || die
- sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
- fi
-
- # Fix up the pkg-config file to be more robust.
- # https://github.com/curl/curl/issues/864
- local priv=() libs=()
- # We always enable zlib.
- libs+=( "-lz" )
- priv+=( "zlib" )
- if use http2; then
- libs+=( "-lnghttp2" )
- priv+=( "libnghttp2" )
- fi
- if use quiche; then
- libs+=( "-lquiche" )
- priv+=( "quiche" )
- fi
- if use nghttp3; then
- libs+=( "-lnghttp3" "-lngtcp2" )
- priv+=( "libnghttp3" "-libtcp2" )
- 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
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -type f -name '*.la' -delete
- rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.74.0-r4.ebuild b/net-misc/curl/curl-7.74.0-r4.ebuild
deleted file mode 100644
index 07c50b9ce556..000000000000
--- a/net-misc/curl/curl-7.74.0-r4.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
-
-LICENSE="curl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" nghttp3 quiche"
-IUSE+=" elibc_Winnt"
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
- winssl? ( elibc_Winnt )
- threads? ( !adns )
- ssl? (
- ^^ (
- curl_ssl_gnutls
- curl_ssl_mbedtls
- curl_ssl_nss
- curl_ssl_openssl
- curl_ssl_winssl
- )
- )"
-
-# lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
- ssl? (
- gnutls? (
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
- dev-libs/nettle:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- mbedtls? (
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- openssl? (
- dev-libs/openssl:0=[sslv3=,static-libs?,${MULTILIB_USEDEP}]
- )
- nss? (
- dev-libs/nss:0[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- )
- http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
- nghttp3? (
- net-libs/nghttp3[${MULTILIB_USEDEP}]
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
- )
- quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
- adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
- sys-libs/zlib[${MULTILIB_USEDEP}]
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-# rtmp? (
-# media-video/rtmpdump
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-# )
-
-# ssl providers to be added:
-# fbopenssl $(use_with spnego)
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- test? (
- sys-apps/diffutils
- dev-lang/perl
- )"
-
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/curl-config
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.30.0-prefix.patch
- "${FILESDIR}"/${PN}-respect-cflags-3.patch
- "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-)
-
-src_prepare() {
- default
-
- sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
- sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
- eprefixify curl-config.in
- eautoreconf
-}
-
-multilib_src_configure() {
- # We make use of the fact that later flags override earlier ones
- # So start with all ssl providers off until proven otherwise
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
- local myconf=()
-
- myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
- #myconf+=( --without-default-ssl-backend )
- if use ssl ; then
- if use gnutls || use curl_ssl_gnutls; then
- einfo "SSL provided by gnutls"
- myconf+=( --with-gnutls --with-nettle )
- fi
- if use mbedtls || use curl_ssl_mbedtls; then
- einfo "SSL provided by mbedtls"
- myconf+=( --with-mbedtls )
- fi
- if use nss || use curl_ssl_nss; then
- einfo "SSL provided by nss"
- myconf+=( --with-nss )
- fi
- if use openssl || use curl_ssl_openssl; then
- einfo "SSL provided by openssl"
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
- fi
- if use winssl || use curl_ssl_winssl; then
- einfo "SSL provided by Windows"
- myconf+=( --with-winssl )
- fi
-
- if use curl_ssl_gnutls; then
- einfo "Default SSL provided by gnutls"
- myconf+=( --with-default-ssl-backend=gnutls )
- elif use curl_ssl_mbedtls; then
- einfo "Default SSL provided by mbedtls"
- myconf+=( --with-default-ssl-backend=mbedtls )
- elif use curl_ssl_nss; then
- einfo "Default SSL provided by nss"
- myconf+=( --with-default-ssl-backend=nss )
- elif use curl_ssl_openssl; then
- einfo "Default SSL provided by openssl"
- myconf+=( --with-default-ssl-backend=openssl )
- elif use curl_ssl_winssl; then
- einfo "Default SSL provided by Windows"
- myconf+=( --with-default-ssl-backend=winssl )
- else
- eerror "We can't be here because of REQUIRED_USE."
- fi
-
- else
- einfo "SSL disabled"
- fi
-
- # These configuration options are organized alphabetically
- # within each category. This should make it easier if we
- # ever decide to make any of them contingent on USE flags:
- # 1) protocols first. To see them all do
- # 'grep SUPPORT_PROTOCOLS configure.ac'
- # 2) --enable/disable options second.
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
- # 3) --with/without options third.
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
- myconf+=(
- $(use_enable alt-svc)
- --enable-crypto-auth
- --enable-dict
- --disable-ech
- --enable-file
- $(use_enable ftp)
- $(use_enable gopher)
- $(use_enable hsts)
- --enable-http
- $(use_enable imap)
- $(use_enable ldap)
- $(use_enable ldap ldaps)
- --disable-ntlm-wb
- $(use_enable pop3)
- --enable-rt
- --enable-rtsp
- $(use_enable samba smb)
- $(use_with ssh libssh2)
- $(use_enable smtp)
- $(use_enable telnet)
- $(use_enable tftp)
- --enable-tls-srp
- $(use_enable adns ares)
- --enable-cookies
- --enable-dateparse
- --enable-dnsshuffle
- --enable-doh
- --enable-hidden-symbols
- --enable-http-auth
- $(use_enable ipv6)
- --enable-largefile
- --enable-manual
- --enable-mime
- --enable-netrc
- $(use_enable progress-meter)
- --enable-proxy
- --disable-sspi
- $(use_enable static-libs static)
- $(use_enable threads threaded-resolver)
- $(use_enable threads pthreads)
- --disable-versioned-symbols
- --without-amissl
- --without-bearssl
- --without-cyassl
- --without-darwinssl
- --without-fish-functions-dir
- $(use_with idn libidn2)
- $(use_with kerberos gssapi "${EPREFIX}"/usr)
- $(use_with metalink libmetalink)
- $(use_with http2 nghttp2)
- --without-libpsl
- $(use_with nghttp3)
- $(use_with nghttp3 ngtcp2)
- $(use_with quiche)
- $(use_with rtmp librtmp)
- $(use_with brotli)
- --without-schannel
- --without-secure-transport
- --without-spnego
- --without-winidn
- --without-wolfssl
- --with-zlib
- $(use_with zstd)
- )
-
- ECONF_SOURCE="${S}" \
- econf "${myconf[@]}"
-
- if ! multilib_is_native_abi; then
- # avoid building the client
- sed -i -e '/SUBDIRS/s:src::' Makefile || die
- sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
- fi
-
- # Fix up the pkg-config file to be more robust.
- # https://github.com/curl/curl/issues/864
- local priv=() libs=()
- # We always enable zlib.
- libs+=( "-lz" )
- priv+=( "zlib" )
- if use http2; then
- libs+=( "-lnghttp2" )
- priv+=( "libnghttp2" )
- fi
- if use quiche; then
- libs+=( "-lquiche" )
- priv+=( "quiche" )
- fi
- if use nghttp3; then
- libs+=( "-lnghttp3" "-lngtcp2" )
- priv+=( "libnghttp3" "-libtcp2" )
- 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
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -type f -name '*.la' -delete || die
- rm -rf "${ED}"/etc/ || die
-}
diff --git a/net-misc/curl/curl-7.75.0.ebuild b/net-misc/curl/curl-7.75.0.ebuild
deleted file mode 100644
index 89cefa1028fd..000000000000
--- a/net-misc/curl/curl-7.75.0.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
-
-LICENSE="curl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" nghttp3 quiche"
-IUSE+=" elibc_Winnt"
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
- winssl? ( elibc_Winnt )
- threads? ( !adns )
- ssl? (
- ^^ (
- curl_ssl_gnutls
- curl_ssl_mbedtls
- curl_ssl_nss
- curl_ssl_openssl
- curl_ssl_winssl
- )
- )"
-
-# lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
- ssl? (
- gnutls? (
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
- dev-libs/nettle:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- mbedtls? (
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- openssl? (
- dev-libs/openssl:0=[sslv3=,static-libs?,${MULTILIB_USEDEP}]
- )
- nss? (
- dev-libs/nss:0[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- )
- http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
- nghttp3? (
- net-libs/nghttp3[${MULTILIB_USEDEP}]
- net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
- )
- quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
- idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
- adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
- rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
- ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
- sys-libs/zlib[${MULTILIB_USEDEP}]
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-# rtmp? (
-# media-video/rtmpdump
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-# )
-
-# ssl providers to be added:
-# fbopenssl $(use_with spnego)
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- test? (
- sys-apps/diffutils
- dev-lang/perl
- )"
-
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/curl-config
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-7.30.0-prefix.patch
- "${FILESDIR}"/${PN}-respect-cflags-3.patch
- "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-)
-
-src_prepare() {
- default
-
- sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
- sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
- eprefixify curl-config.in
- eautoreconf
-}
-
-multilib_src_configure() {
- # We make use of the fact that later flags override earlier ones
- # So start with all ssl providers off until proven otherwise
- # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
- local myconf=()
-
- myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
- myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
- #myconf+=( --without-default-ssl-backend )
- if use ssl ; then
- if use gnutls || use curl_ssl_gnutls; then
- einfo "SSL provided by gnutls"
- myconf+=( --with-gnutls --with-nettle )
- fi
- if use mbedtls || use curl_ssl_mbedtls; then
- einfo "SSL provided by mbedtls"
- myconf+=( --with-mbedtls )
- fi
- if use nss || use curl_ssl_nss; then
- einfo "SSL provided by nss"
- myconf+=( --with-nss )
- fi
- if use openssl || use curl_ssl_openssl; then
- einfo "SSL provided by openssl"
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
- fi
- if use winssl || use curl_ssl_winssl; then
- einfo "SSL provided by Windows"
- myconf+=( --with-winssl )
- fi
-
- if use curl_ssl_gnutls; then
- einfo "Default SSL provided by gnutls"
- myconf+=( --with-default-ssl-backend=gnutls )
- elif use curl_ssl_mbedtls; then
- einfo "Default SSL provided by mbedtls"
- myconf+=( --with-default-ssl-backend=mbedtls )
- elif use curl_ssl_nss; then
- einfo "Default SSL provided by nss"
- myconf+=( --with-default-ssl-backend=nss )
- elif use curl_ssl_openssl; then
- einfo "Default SSL provided by openssl"
- myconf+=( --with-default-ssl-backend=openssl )
- elif use curl_ssl_winssl; then
- einfo "Default SSL provided by Windows"
- myconf+=( --with-default-ssl-backend=winssl )
- else
- eerror "We can't be here because of REQUIRED_USE."
- fi
-
- else
- einfo "SSL disabled"
- fi
-
- # These configuration options are organized alphabetically
- # within each category. This should make it easier if we
- # ever decide to make any of them contingent on USE flags:
- # 1) protocols first. To see them all do
- # 'grep SUPPORT_PROTOCOLS configure.ac'
- # 2) --enable/disable options second.
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
- # 3) --with/without options third.
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
- myconf+=(
- $(use_enable alt-svc)
- --enable-crypto-auth
- --enable-dict
- --disable-ech
- --enable-file
- $(use_enable ftp)
- $(use_enable gopher)
- $(use_enable hsts)
- --enable-http
- $(use_enable imap)
- $(use_enable ldap)
- $(use_enable ldap ldaps)
- --disable-ntlm-wb
- $(use_enable pop3)
- --enable-rt
- --enable-rtsp
- $(use_enable samba smb)
- $(use_with ssh libssh2)
- $(use_enable smtp)
- $(use_enable telnet)
- $(use_enable tftp)
- --enable-tls-srp
- $(use_enable adns ares)
- --enable-cookies
- --enable-dateparse
- --enable-dnsshuffle
- --enable-doh
- --enable-hidden-symbols
- --enable-http-auth
- $(use_enable ipv6)
- --enable-largefile
- --enable-manual
- --enable-mime
- --enable-netrc
- $(use_enable progress-meter)
- --enable-proxy
- --disable-sspi
- $(use_enable static-libs static)
- $(use_enable threads threaded-resolver)
- $(use_enable threads pthreads)
- --disable-versioned-symbols
- --without-amissl
- --without-bearssl
- --without-cyassl
- --without-darwinssl
- --without-fish-functions-dir
- --without-hyper
- $(use_with idn libidn2)
- $(use_with kerberos gssapi "${EPREFIX}"/usr)
- $(use_with metalink libmetalink)
- $(use_with http2 nghttp2)
- --without-libpsl
- $(use_with nghttp3)
- $(use_with nghttp3 ngtcp2)
- $(use_with quiche)
- $(use_with rtmp librtmp)
- $(use_with brotli)
- --without-schannel
- --without-secure-transport
- --without-spnego
- --without-winidn
- --without-wolfssl
- --with-zlib
- $(use_with zstd)
- )
-
- ECONF_SOURCE="${S}" \
- econf "${myconf[@]}"
-
- if ! multilib_is_native_abi; then
- # avoid building the client
- sed -i -e '/SUBDIRS/s:src::' Makefile || die
- sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
- fi
-
- # Fix up the pkg-config file to be more robust.
- # https://github.com/curl/curl/issues/864
- local priv=() libs=()
- # We always enable zlib.
- libs+=( "-lz" )
- priv+=( "zlib" )
- if use http2; then
- libs+=( "-lnghttp2" )
- priv+=( "libnghttp2" )
- fi
- if use quiche; then
- libs+=( "-lquiche" )
- priv+=( "quiche" )
- fi
- if use nghttp3; then
- libs+=( "-lnghttp3" "-lngtcp2" )
- priv+=( "libnghttp3" "-libtcp2" )
- 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
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -type f -name '*.la' -delete || die
- rm -rf "${ED}"/etc/ || die
-}
diff --git a/net-misc/curl/curl-7.76.0.ebuild b/net-misc/curl/curl-7.77.0.ebuild
index dbfb4e71fdf4..e15247a6d58e 100644
--- a/net-misc/curl/curl-7.76.0.ebuild
+++ b/net-misc/curl/curl-7.77.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
LICENSE="curl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
IUSE+=" nghttp3 quiche"
@@ -284,6 +284,10 @@ multilib_src_configure() {
echo "Requires.private: ${priv[*]}" >> libcurl.pc
}
+multilib_src_test() {
+ multilib_is_native_abi && default_src_test
+}
+
multilib_src_install_all() {
einstalldocs
find "${ED}" -type f -name '*.la' -delete || die
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 8667f7d4e817..6e0363332e2b 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -23,6 +23,8 @@ AUX dhcrelay4.service.conf 105 BLAKE2B 52ad8018d2b6fd47b5d752a6e6626a8fa6c1d21fa
AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd53dc30a25aad02f5332f538bc9d6ca65b5d388ff83f0ee30358d56cefa440fe7f5b8a6678521ba6b SHA512 40d3a6bdf8521bf5152cf31b961aea88b2fb0339433d0b6a6360a16c796298620b377bd079c0246e97bc9c0533ddb13bbb58cc5169d0ca598e3a51d1a607a9e9
AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
+DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040
DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40
EBUILD dhcp-4.4.2-r3.ebuild 8222 BLAKE2B a1d8cc6bae3fa9b0cbbf6c2acbf640478434c3ee9b21bb79bbf988a11b84712adf5322a805c93797f7a34220d36d0c43f190d9e06ccea4e19f9540b657decf2e SHA512 63866cde12580db53cdf6a59553714b9082d5f553936731640a616b22d0e9b2372ab902faa4db74c3629385ee73005230120b4ab8034797b46c641e672214a90
+EBUILD dhcp-4.4.2_p1.ebuild 8229 BLAKE2B 6f4db80f9b79d638a5fc2593789049596edf83077db28e26b6e3368513770b5000efdbb086f10019f150099cfa1a913835f0bca3ece4f2b8a49edd0ecb25748f SHA512 71949a58ffa6b14defded787efea2f66a9a186b43aef8b9028acae3d4521e4b7b9ecbe696457e1f38e1124e1b33b52d0e4b92c6126840d21eccfbc84f2d89ba1
MISC metadata.xml 476 BLAKE2B e77eff7eca45c59f3f7ead1b4065db2696400ed0814fddcd6b8cd377d156795e7d7a6864da8c869b870d1705bbdd6f403a3a0358e149b5a4b4ad098589ba90a9 SHA512 8e9599bcb9c15749514d5fada7ebb4e4bf0752541ff8b54a3c6b557d5debc6356ce593b8f9640abf534aae123d3e65d978cfdf091635246c8afe2a170a61de26
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
new file mode 100644
index 000000000000..1a0e0a3d7f5f
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs flag-o-matic tmpfiles
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="https://www.isc.org/dhcp"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+ ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
+
+DEPEND="
+ acct-group/dhcp
+ acct-user/dhcp
+ client? (
+ kernel_linux? (
+ ipv6? ( sys-apps/iproute2 )
+ sys-apps/net-tools
+ )
+ )
+ ldap? (
+ net-nds/openldap
+ ssl? ( dev-libs/openssl:0= )
+ )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-dhcp )
+ vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack ${A}
+ # handle local bind hell
+ cd "${S}"/bind
+ unpack ./bind.tar.gz
+}
+
+PATCHES=(
+ # Gentoo patches - these will probably never be accepted upstream
+ # Fix some permission issues
+ "${FILESDIR}/${PN}-3.0-fix-perms.patch"
+
+ # Enable dhclient to equery NTP servers
+ "${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
+ "${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
+
+ # Enable dhclient to get extra configuration from stdin
+ "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+ "${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
+ "${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
+ "${FILESDIR}/${PN}-4.4.0-always-accept-4.patch" #437108
+ "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
+ "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
+ "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
+
+ # Possible upstream candidates
+ "${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194
+ "${FILESDIR}/dhcp-4.4.2-variable-name.patch" #752402
+)
+
+src_prepare() {
+ default
+
+ # Brand the version with Gentoo
+ sed -i \
+ -e "/VERSION=/s:'$: Gentoo-${PR}':" \
+ configure || die
+
+ # Change the hook script locations of the scripts
+ sed -i \
+ -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+ -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+ client/scripts/* || die
+
+ # No need for the linux script to force bash #158540
+ sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+ # Quiet the freebsd logger a little
+ sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+ # Remove these options from the sample config
+ sed -i -r \
+ -e "/(script|host-name|domain-name) /d" \
+ client/dhclient.conf.example || die
+
+ if use client && ! use server ; then
+ sed -i -r \
+ -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+ Makefile.in || die
+ elif ! use client && use server ; then
+ sed -i -r \
+ -e '/^SUBDIRS/s:\<client\>::' \
+ Makefile.in || die
+ fi
+
+ # Only install different man pages if we don't have en
+ if [[ " ${LINGUAS} " != *" en "* ]]; then
+ # Install Japanese man pages
+ if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+ einfo "Installing Japanese documention"
+ cp doc/ja_JP.eucJP/dhclient* client || die
+ cp doc/ja_JP.eucJP/dhcp* common || die
+ fi
+ fi
+ # Now remove the non-english docs so there are no errors later
+ rm -r doc/ja_JP.eucJP || die
+
+ # make the bind build work - do NOT make "binddir" local!
+ binddir="${S}/bind"
+ cd "${binddir}" || die
+ cat <<-EOF > bindvar.tmp
+ binddir=${binddir}
+ GMAKE=${MAKE:-gmake}
+ EOF
+ eapply -p2 "${FILESDIR}"/${PN}-4.4.0-bind-disable.patch
+ # Only use the relevant subdirs now that ISC
+ #removed the lib/export structure in bind.
+ sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
+ -i bind-*/lib/Makefile.in || die
+}
+
+src_configure() {
+ # bind defaults to stupid `/usr/bin/ar`
+ tc-export AR BUILD_CC
+ export ac_cv_path_AR=${AR}
+
+ # this is tested for by the bind build system, and can cause trouble
+ # when cross-building; since dhcp itself doesn't make use of libcap,
+ # simply disable it.
+ export ac_cv_lib_cap_cap_set_proc=no
+
+ # Use FHS sane paths ... some of these have configure options,
+ # but not all, so just do it all here.
+ local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+ cat <<-EOF >> includes/site.h
+ #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
+ #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
+ #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
+ #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
+ #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
+ #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
+ #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
+ #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
+ #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
+ #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
+ #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
+ #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
+ EOF
+
+ # https://bugs.gentoo.org/720806
+ if use ppc || use arm || use hppa; then
+ append-libs -latomic
+ fi
+
+ local myeconfargs=(
+ --enable-paranoia
+ --enable-early-chroot
+ --sysconfdir=${e}
+ --with-randomdev=/dev/random
+ $(use_enable ipv6 dhcpv6)
+ $(use_with ldap)
+ $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+ LIBS="${LIBS}"
+ )
+ econf "${myeconfargs[@]}"
+
+ # configure local bind cruft. symtable option requires
+ # perl and we don't want to require that #383837.
+ cd bind/bind-*/ || die
+ local el
+ eval econf \
+ $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+ --with-randomdev=/dev/random \
+ --disable-symtable \
+ --without-make-clean
+}
+
+src_compile() {
+ # build local bind cruft first
+ emake -C bind/bind-*/lib install
+ # then build standard dhcp code
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+ docinto html
+ dodoc doc/References.html
+
+ if [[ -e client/dhclient ]] ; then
+ # move the client to /
+ dodir /sbin
+ mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
+
+ exeinto /sbin
+ if use kernel_linux ; then
+ newexe "${S}"/client/scripts/linux dhclient-script
+ else
+ newexe "${S}"/client/scripts/freebsd dhclient-script
+ fi
+ fi
+
+ if [[ -e server/dhcpd ]] ; then
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins contrib/ldap/dhcp.*
+ dosbin contrib/ldap/dhcpd-conf-to-ldap
+ fi
+
+ newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+ newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+ newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+ newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+ newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+ newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+ systemd_dounit "${FILESDIR}"/dhcpd4.service
+ systemd_dounit "${FILESDIR}"/dhcpd6.service
+ systemd_dounit "${FILESDIR}"/dhcrelay4.service
+ systemd_dounit "${FILESDIR}"/dhcrelay6.service
+ systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+ systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+ sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+ fi
+
+ # the default config files aren't terribly useful #384087
+ local f
+ for f in "${ED}"/etc/dhcp/*.conf.example ; do
+ mv "${f}" "${f%.example}" || die
+ done
+ sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+
+ diropts -m0750 -o dhcp -g dhcp
+ keepdir /var/lib/dhcp
+}
+
+pkg_preinst() {
+ # Keep the user files over the sample ones. The
+ # hashing is to ignore the crappy defaults #384087.
+ local f h
+ for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+ h=${f#*:}
+ f="/etc/dhcp/${f%:*}.conf"
+ if [ -e "${EROOT}"${f} ] ; then
+ case $(md5sum "${EROOT}"${f}) in
+ ${h}*) ;;
+ *) cp -p "${EROOT}"${f} "${ED}"${f};;
+ esac
+ fi
+ done
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+ ewarn
+ ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+ ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+ ewarn "and dhcp should be removed from the default runlevel"
+ ewarn
+ fi
+}
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index ed01854cc1ec..6fddfc1862ba 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,18 +1,9 @@
-AUX dhcpcd-9.3.4-include_termios.patch 631 BLAKE2B a5f7bb637d5c365dd4d6c6cc296d1f9d263f88073bac0ca930a947e5fe5ba186929cf3d201b64bca9d26ffd8d8ffaa02513061a4459ab90ba157e63a4be897a2 SHA512 2124070c834e23efafcdeda34b9ec71b4b6a1af79c786c8d291cf3d0d739c32f6167e34d6efce2627a99d8b00e4237599563c25f470b503a97377fe663e31096
AUX dhcpcd-9.4.0-memleak_fix.patch 730 BLAKE2B 705d0d6a203560315702af8ccd491cd3529cc7abe5038cb3a8881acb88e5c14d3bb75af267e2ba338e4ef4a6a9b85c0b47ca004f30b2018d978214f260e46fb3 SHA512 3a2111468bb8def0353b153c6d234ee70e7de9606ec4463ecf3276afe82dcbd772138ac7b429c6723112d61f0b22e27760deaf43a2838b7406d8886a29f6393a
AUX dhcpcd-9.4.0-sparc_privsep.patch 1657 BLAKE2B 58564b77f97fa469ae64747915ac27f733e03d833d73edaac64293f1552c3be9128091683b061a05095244a3c59729f3aacd69ca3220bfb3f66bcf09112dedbc SHA512 d9dff010beb3eccd8f6f3adfa9ab2162d16b504f17f6f66363930be693760b16e1f226591e7486e893e99511480cba29d5baaeac1d23e5387e6e5d0e8f4dd1a0
AUX dhcpcd-9.4.0-unlink_socket.patch 1657 BLAKE2B 6c66e78fb0be1ed60176bee31240b9185b9bf71e80d9b0d6a03d77c1cd5ca7b7a4dab468d5299887443e8e1ef17556d89d569eebdb8eecfbe0e0bf91b381d116 SHA512 17325af7fd51dd9a6eb7edf8e952eb096c054414a7ad7fdf242d19500222832e994815ed9eb3aafb7a68a62dbaa7c9b9e77dc7b632919127662c805e4117f11e
-AUX dhcpcd.initd 315 BLAKE2B c972ddd75c879d4e6a109cc4fd7b377ea27aef0b79ea5524cc456050117627c1baef8e884dbcd2cec987bac43efb42b77b426d6f2f864f09bf922142e08cd6af SHA512 f554a78c04ddae8fdc44a9427c5fc318d4eb31b6771bcc46e9b06feafc061ab9c1ceffb7d740cba57905f0820ca5e2313b152b217772abd5a9b9385e9aae7459
AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f
-AUX dhcpcd.service 308 BLAKE2B b9533183aedeb8243512923de5eab61b8655bbd907d89cd06d1fac13c4b1a7741b59e9eebd37abfcfd2092781ba29e43edd4fa09d4eefc5b54c62ea74aa3885e SHA512 ff512117941a285e0b6f90689a78d6149d134d457ab08be78cd741f2c3707eb0c21ddf5961d8d5972844a13e995bb1757a29b9d0e6b26c6761250c8f9da29557
AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
-DIST dhcpcd-8.1.9-patches-01.tar.xz 3208 BLAKE2B 38f59096c7fbe7beb3df11e492d3ef1d116645eefe0722870dd0ca7b5a9b562c2f8302343f33d22359e37623d66874eb5f9981c9f4e521a80629678edff6d0d8 SHA512 13f10f84d44f5cfbf262d4aeb4134121c99629062a8075247b2b35ad5d1927914139bdc8f897644e501239763b409d5eedb9bc30f86456a4af622ab20fe6ffcb
-DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da65021b2c1261a45958b628cd066ccd9bc6b60bbb42f8280fcbbf9d4b1c7666b993c37f150b27ef2a0527a0fd5b96 SHA512 40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a
-DIST dhcpcd-9.3.4.tar.xz 255212 BLAKE2B cd64dca55bd8adfcfa8ffb5f75a949c6f8aef9f1bf7925060590f7f5f0325e08de3c766c8ff780736eb2bed40ba3ae7b59c3cf3e03f2ad1bd7ff4c92aafb6370 SHA512 00125cbed9a20ba016cbb383c02ce61a58482dcf6c46144e573ee3759dbaf19b5f470eaf19038197d0ff4249c852773c537294bab30b5bf3f5bae4d754741517
DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f
-EBUILD dhcpcd-8.1.9-r1.ebuild 4506 BLAKE2B 0d12744d514c7648a102cb7039ded63670fda8c573393bf48039547b15adc82840f6f9146f29ff143aa154f3d459f55a3a7300d97b9f1e70b5d3ed790f9f6565 SHA512 3f4123bc7c6dccc99adc70d90d2e8f5965fb4bb6d8d9f59562ddab4d06332dbc4cd1d88a3e1ccab936ed10cb2bac25138ded8761d540934a128879343d4186de
-EBUILD dhcpcd-9.3.4.ebuild 4730 BLAKE2B 4c63d9e20ae7c3e0d4265ba9294daa15ad29ee9a4375181eecc9d09e8868da304312df9e15560723919dfa705621db198039f80c961e314ddd12a63aedb750b4 SHA512 6d8d899536afd2124f32aeb04b250eb8e8535c46c7e4538fdb86fe8270d1862823284e0a77a793267d04c9775287d62c04eeef4af0654c30acfb3fc9ba2f08a6
EBUILD dhcpcd-9.4.0-r1.ebuild 4744 BLAKE2B 18cde63628669a0de7c93100ae02ac541634b699dc24e5ffd3fcaf0932d9c953900e3c73d82d11bcd0fd5e72a4c80fc1a9e763ec0dd65e25e2e7bba4b79a9a61 SHA512 27f78b73542d848065fcff74ca4a34d5bfb500aa1b718bdb59ff199d583842f0baa14917df0a5560ce16e2da08a2f9f4ae36d654000cdd31229816bcf6a64804
-EBUILD dhcpcd-9.4.0.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
EBUILD dhcpcd-9999.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
MISC metadata.xml 702 BLAKE2B 8fb8f980d543f5dc016383e89bf69a952a3bcfd47ee750ba241e0e77878fc886105607cf3de196fd43a4bba259591d53bbaa902b9c9d216b285f8cfa3f179c6f SHA512 3f8b3d9d8a41addee641c06cc2bc717f00787dd04450e68807e92345b19d1b45a1b17145a4d3adf42dea4c4e525cda058ed3559818d3893de60da2a3d4e45df1
diff --git a/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild
deleted file mode 100644
index 77c0de3e8f74..000000000000
--- a/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
-else
- MY_P="${P/_alpha/-alpha}"
- MY_P="${MY_P/_beta/-beta}"
- MY_P="${MY_P/_rc/-rc}"
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz
- https://dev.gentoo.org/~polynomial-c/${P}-patches-01.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
- S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
- default
- eapply "${WORKDIR}"/patches
-}
-
-src_configure() {
- local myeconfargs=(
- --dbdir="${EPREFIX}/var/lib/dhcpcd"
- --libexecdir="${EPREFIX}/lib/dhcpcd"
- --localstatedir="${EPREFIX}/var"
- --prefix="${EPREFIX}"
- --with-hook=ntp.conf
- $(use_enable embedded)
- $(use_enable ipv6)
- $(usex elibc_glibc '--with-hook=yp.conf' '')
- $(usex kernel_linux '--rundir=${EPREFIX}/run' '')
- $(usex udev '' '--without-dev --without-udev')
- CC="$(tc-getCC)"
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- keepdir /var/lib/dhcpcd
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.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-9.3.4.ebuild b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
deleted file mode 100644
index c8db117d1acc..000000000000
--- a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://roy.marples.name/cgit/dhcpcd.git"
-else
- MY_P="${P/_alpha/-alpha}"
- MY_P="${MY_P/_beta/-beta}"
- MY_P="${MY_P/_rc/-rc}"
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
- S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
- ${COMMON_DEPEND}
- privsep? (
- acct-group/dhcpcd
- acct-user/dhcpcd
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.4.0-sparc_privsep.patch" #776178
- "${FILESDIR}/${PN}-9.3.4-include_termios.patch" #777600
-)
-
-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-9.4.0.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.0.ebuild
deleted file mode 100644
index 092c6e4a1dda..000000000000
--- a/net-misc/dhcpcd/dhcpcd-9.4.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://roy.marples.name/cgit/dhcpcd.git"
-else
- MY_P="${P/_alpha/-alpha}"
- MY_P="${MY_P/_beta/-beta}"
- MY_P="${MY_P/_rc/-rc}"
- SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
- S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
- ${COMMON_DEPEND}
- privsep? (
- acct-group/dhcpcd
- acct-user/dhcpcd
- )
-"
-
-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/files/dhcpcd-9.3.4-include_termios.patch b/net-misc/dhcpcd/files/dhcpcd-9.3.4-include_termios.patch
deleted file mode 100644
index 58a6a0216b8a..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-9.3.4-include_termios.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7c08f3777a69c69e87a149bb35681ce2ed2f0490 Mon Sep 17 00:00:00 2001
-From: Mikhail Efremov <sem@altlinux.org>
-Date: Tue, 8 Dec 2020 16:15:28 +0000
-Subject: [PATCH] Linux: Fix privsep build by including sys/termios.h for all
- platforms
-
----
- src/privsep-linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/privsep-linux.c b/src/privsep-linux.c
-index e588ecd7..1fbe97fa 100644
---- a/src/privsep-linux.c
-+++ b/src/privsep-linux.c
-@@ -29,6 +29,7 @@
- #include <sys/ioctl.h>
- #include <sys/prctl.h>
- #include <sys/syscall.h>
-+#include <sys/termios.h> /* For TCGETS */
-
- #include <linux/audit.h>
- #include <linux/filter.h>
diff --git a/net-misc/dhcpcd/files/dhcpcd.initd b/net-misc/dhcpcd/files/dhcpcd.initd
deleted file mode 100644
index b89b785fd23f..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd.initd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2007-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command=/sbin/dhcpcd
-pidfile=/var/run/dhcpcd.pid
-command_args=-q
-name="DHCP Client Daemon"
-
-depend()
-{
- provide net
- need localmount
- use logger network
- after bootmisc modules
- before dns
-}
diff --git a/net-misc/dhcpcd/files/dhcpcd.service b/net-misc/dhcpcd/files/dhcpcd.service
deleted file mode 100644
index 8f9ad25e4d01..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Lightweight DHCP client daemon
-Wants=network.target
-Before=network.target network-online.target
-
-[Service]
-Type=forking
-ExecStart=/sbin/dhcpcd -q
-PIDFile=/run/dhcpcd.pid
-# Avoid duplicate output on stderr/syslog
-StandardOutput=null
-StandardError=null
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index 49365a74cd93..4ad2c25c8443 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,6 +1,3 @@
-AUX 0.6.0-gupnp-1.2.patch 2449 BLAKE2B 25aba7b48ef6dfef1d1dbe1c229fefc8c395c8ab1b393a49b6382662437137f628a7e4565aff701331375aae89fbdc3d6b8408d606694ca540036eb87743415b SHA512 9f0ba14980cb9238b576f40802c11e718a42576fd5f33fabf0ff4a2be186533bc6113ae88f1d554894d2205b7824a3a83f7fb99b43559a1c0add8ee07c8adf48
-DIST dleyna-server-0.6.0.tar.gz 107573 BLAKE2B c2460d20ac12d377170fc1292efa48ccec218b7c8e6f2d463a159bda801a7e9a5cfd239e51bcf9d997124a0a9ff305f3a4047228d54a55b26407fb1e37b2e238 SHA512 5fecc48f72afdac46da04d1785cf49384ed84b078802e4703cd86dc8e2c5db64df0232f66b73c73b3f358f7248117cd00fa4652397619d87f8f4a305e047306c
DIST dleyna-server-0.7.0.tar.gz 105020 BLAKE2B 01e4459631fef66e88aabcadfd85a4b01a5b95d33b5c1734decd1b0667876d7e5834bf23f754361772faebd7daf63d5f37cff9cb9bd11ff47c62aeb7afdb4969 SHA512 16bcab369a4d4624f75ed5d40bb5a06cafa1907b3ceceeb0de95f9f00750c257b69202f29f9c2d1ebcd61c541ee930d7a2747dab979e15a74e9a6e109eae6800
-EBUILD dleyna-server-0.6.0.ebuild 841 BLAKE2B e5014558bdd82997482c12db73ad825001fc73adb1196db18d6979f399ccb56dc531d8470e12a1d4ff70f1c6e51ed7625aca13990bd540a2a0aaf4426c1163e5 SHA512 99bfb47d58eb2590508b8213c87fe830c9b2c9ad79648c47e89b5050fcd201ba4043db829b278ea0e2e8f937b99fba066efb8f50f92316547717f3d2791485da
-EBUILD dleyna-server-0.7.0.ebuild 676 BLAKE2B 12d52c5bdd438af72bbbf711827a539d7ca77a6f7e565fd50ed979cb3893dea9386c5fa79a834d7866039fb86f3adf31fbb6093141b78efe9f3838a4577a1569 SHA512 36aca02ee595be426ad85e699dcd4cb6e53c77feb3923a5156bae9fd6047e4a389dd396bd6fdde13d5e82a94bfd1ce9f807965a0746eb7bcaaf2d283c71c3ca1
+EBUILD dleyna-server-0.7.0.ebuild 674 BLAKE2B 61ff666be0dd8d68a5ccb443f08e7597c2cf196c8de5db2c018bf88b574a982a677f51cbb4e09e18e022c562911194d27b39aa2ca7cf7fe04e582edce63c1a55 SHA512 64b58c5e4285d80b3e55a16b60a15e1ca531cc96ab84ea599839c2f206dc9d3a85441ffbc3ba0ed640a3ab17171a45722fc1ea99778c3e2fa686ffd9646c75f9
MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild
deleted file mode 100644
index 5fc1c3dd3c42..000000000000
--- a/net-misc/dleyna-server/dleyna-server-0.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Service that allows to discover and manipulate DLNA Digital Media servers (DMS)"
-HOMEPAGE="https://01.org/dleyna/"
-SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar_2.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.36:2
- dev-libs/libxml2:2
- >=media-libs/gupnp-dlna-0.9.4:2.0
- >=net-libs/dleyna-core-0.6.0
- >=net-libs/gssdp-1.2:0=
- >=net-libs/gupnp-1.2:0=
- >=net-libs/gupnp-av-0.11.5
- >=net-libs/libsoup-2.28.2:2.4
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-gupnp-1.2.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_install() {
- default
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild
index 0718496ba1d2..40dfe39201cd 100644
--- a/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild
+++ b/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
>=dev-libs/glib-2.36:2
diff --git a/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch b/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch
deleted file mode 100644
index ff9725e0f58c..000000000000
--- a/net-misc/dleyna-server/files/0.6.0-gupnp-1.2.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 96c01c88363d6e5e9b7519bc4e8b5d86cf783e1f Mon Sep 17 00:00:00 2001
-From: Jan Tojnar <jtojnar@gmail.com>
-Date: Sat, 16 Mar 2019 05:46:20 +0100
-Subject: [PATCH] Port to gupnp-1.2
-
-gupnp_context_get_host_ip has been deprecated for a long time, as
-the host-ip property moved to gssdp.
-
-There is also a ton of new deprecations but I will address that separately.
----
- configure.ac | 8 ++++----
- libdleyna/server/upnp.c | 4 ++--
- test/dbus/dms-info.c | 2 --
- 3 files changed, 6 insertions(+), 8 deletions(-)
- mode change 100755 => 100644 libdleyna/server/upnp.c
- mode change 100755 => 100644 test/dbus/dms-info.c
-
-diff --git a/configure.ac b/configure.ac
-index 11879e7..61f4fca 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,10 +36,10 @@ LT_LANG([C])
-
- # Checks for libraries.
- PKG_PROG_PKG_CONFIG(0.16)
--PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
--PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28])
--PKG_CHECK_MODULES([GSSDP], [gssdp-1.0 >= 0.13.2])
--PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.3])
-+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.36])
-+PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.36])
-+PKG_CHECK_MODULES([GSSDP], [gssdp-1.2 >= 0.13.2])
-+PKG_CHECK_MODULES([GUPNP], [gupnp-1.2 >= 0.20.3])
- PKG_CHECK_MODULES([GUPNPAV], [gupnp-av-1.0 >= 0.11.5])
- PKG_CHECK_MODULES([GUPNPDLNA], [gupnp-dlna-2.0 >= 0.9.4])
- PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.28.2])
-diff --git a/libdleyna/server/upnp.c b/libdleyna/server/upnp.c
-old mode 100755
-new mode 100644
-index 9913a76..d04efb8
---- a/libdleyna/server/upnp.c
-+++ b/libdleyna/server/upnp.c
-@@ -351,8 +351,8 @@ static void prv_device_unavailable_cb(GUPnPControlPoint *cp,
-
- udn = gupnp_device_info_get_udn((GUPnPDeviceInfo *)proxy);
-
-- ip_address = gupnp_context_get_host_ip(
-- gupnp_control_point_get_context(cp));
-+ ip_address = gssdp_client_get_host_ip(
-+ GSSDP_CLIENT(gupnp_control_point_get_context(cp)));
-
- if (!udn || !ip_address)
- goto on_error;
-diff --git a/test/dbus/dms-info.c b/test/dbus/dms-info.c
-old mode 100755
-new mode 100644
-index a189b9f..4530e58
---- a/test/dbus/dms-info.c
-+++ b/test/dbus/dms-info.c
-@@ -360,8 +360,6 @@ int main(int argc, char *argv[])
- if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1)
- goto on_error;
-
-- g_type_init();
--
- /* Create proxy for com.intel.dLeynaServer.Manager. The Manager
- object has no properties. We will create the proxy asynchronously
- and use G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES to ensure that
---
-2.20.1
-
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 3eea1b6bf2d1..dbc5a51d9b4f 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,6 +2,9 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
DIST dropbox-lnx.x86-122.4.4867.tar.gz 98758165 BLAKE2B bb9fac6670cb384e5417ad6f73d0894ba35cc8471ccaec3dbb37d99fb0ec36810051856bc674b5291e654c4c4626f82963335ad92190318f3765bfc33b47703e SHA512 7606f21b56df4e894611b30566538007715e9598f0ac45377e8bbda4a649f4ab6df6b9b0f4da467c9a9aa632d38f78a632c3c879cb21bbd13bcc46faca450689
+DIST dropbox-lnx.x86-123.4.4832.tar.gz 98431455 BLAKE2B 6838420baeb330b6d0a611564e28f13d65b5b9ed1f616afb440af57b31ffab2275b615e5346856d485aeacb691603999430fa8eb6d6299231f02951f2d017b69 SHA512 bba088d2123a8b3a3263d4c1c2ddd24b21e573d938920a07c15bf18cd89be02fe3cde76f68939a18ca5a80bc3a0d729adcaec095e7cba9ed234081d75d0275b7
DIST dropbox-lnx.x86_64-122.4.4867.tar.gz 102022157 BLAKE2B ce68823f184d9ff9a7378f6c7248ba73bd76f120cf095386bd6f43a701849f380c849ae3e7e6e035594d480e59bb9c98b0d23774c6083e97122af657c2860e46 SHA512 5b2252a07b63a0805445bda486039a07c267e280cead8519de88a35b8d877cc4276e3ce91421b3bd4a64cbcab125edc519d067974c64de012d59a74d06324d39
+DIST dropbox-lnx.x86_64-123.4.4832.tar.gz 101557451 BLAKE2B f30778a81fcbee0989c7ec4b5ff5337179138a50cea56a7b4d38e940e263ac849ac1a2db58978634a1bbd75c1eac6f87b04be6a7c3c5dfdc531ae48ec558bb55 SHA512 42411274863c0262a0623ff1cb3ae2d776bf342121f6f47351d61645b0b5096bdade08084208e7f73f5fd08be6152c0971b9208dd2a083a5229f5bd0519ab089
EBUILD dropbox-122.4.4867.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
+EBUILD dropbox-123.4.4832.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-123.4.4832.ebuild b/net-misc/dropbox/dropbox-123.4.4832.ebuild
new file mode 100644
index 000000000000..be2fed244fff
--- /dev/null
+++ b/net-misc/dropbox/dropbox-123.4.4832.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+ amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+ x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+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"
+
+ use X && doicon -s 16 -c status "${T}"/status
+
+ make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+ 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/frr/Manifest b/net-misc/frr/Manifest
index 35332c6e3739..97e870b32f30 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -2,5 +2,5 @@ AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285eb
AUX frr-openrc-v1 7068 BLAKE2B c790c783ea9c289110b1e85aa23a1adccba36122524cde36798f26c31f82e5381eefb3e5e16b497e84a5aa2faf5bf1f59d12fe8f9b7b3c5d0f504c26ce13fb86 SHA512 34e371bb9bb34e494536091a811084d543c18b302489ce0a56ec3e69c805c22d84d7a928e24e17eba5d4fe6d4e33ac847060da95ded5a02975ba2a2e5a568243
AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
DIST frr-7.5.1.tar.gz 6746148 BLAKE2B e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d SHA512 cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
-EBUILD frr-7.5.1-r2.ebuild 3508 BLAKE2B fa2757e877258e6d353b77f454b873d22f24c60355acc536468eacfbd252027c4f230e478287dfbcc962cda792664bf1d7432f3deab54db8b4b011b973a5d072 SHA512 ec2f0cb7916ce4d4be36f63c049d4227d697f59d02fd2bcfe3afabe16b9e3200387ad1690ec22ee94ab6ca71765275bf74f45ec4dbe72b5316fd6a81412d73bd
+EBUILD frr-7.5.1-r3.ebuild 3533 BLAKE2B bc225761128d8df40e0b0c66551c8f9fa911e8e5a6b602e733cc6fec2cbf4ad0808654d34d414f6e871c7b6982c816f9a78e400fc644398489c1335881a15acc SHA512 a35298206d1cbaa4415628a0984c90a3e6ec840e501c74e572e0d0a9ea6d469484521b27232b386a636ab9180d9a1ff9bce42ed91d76c6c2225c7cd50ab40d82
MISC metadata.xml 770 BLAKE2B 13813d2c2fc611a87a9d2e516b0fd8fb5f9539339f99837ec08c9ed0ac276f9ee80b0e1afa84d6e52adfde8135b3b6950172faed307ae0dbec423bf1a4acd4bf SHA512 e4989acf1cfaabf52030284acff11ae6408dc8d958286ca1cf68d183526dd6a8379ed7ace5d5348f4e298e792387f3ba0a06dea402d125597aa9032222ff1dcb
diff --git a/net-misc/frr/frr-7.5.1-r2.ebuild b/net-misc/frr/frr-7.5.1-r3.ebuild
index 5b7e3d014731..0a5028d606e5 100644
--- a/net-misc/frr/frr-7.5.1-r2.ebuild
+++ b/net-misc/frr/frr-7.5.1-r3.ebuild
@@ -24,6 +24,7 @@ COMMON_DEPEND="
acct-user/frr
dev-libs/json-c:0=
>=net-libs/libyang-1.0.184
+ <net-libs/libyang-2.0.0
sys-libs/libcap
sys-libs/readline:0=
grpc? ( net-libs/grpc )
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 9e9d6dc69e10..d51fdf84589f 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,6 +1,6 @@
-DIST gallery-dl-1.17.1.tar.gz 344091 BLAKE2B e5a108d088083e3aa1881919e74f6631321312a225c0dd6d9c6cbee87ecc957d19a6c3812d3f0c80c5937089d1402ca2e0a779c23537f28ab78ad9654c06852d SHA512 015346cec09ab85fa408b3faa6b63d61fa1f2004b39b45d36741cb63e2809c62c48b544c57b0a02b797db6f36cc66172e9c120ff6cf1bf1a2c3d6f05f7ceb627
-DIST gallery-dl-1.17.2.tar.gz 347680 BLAKE2B 443d859a6cf45cc36eb03dfd591f5f512f4ac7128aeb6da7530c3758c813023a08c324c6ecf0d8cd6a7db597c1b147dc6dad744af38374a3a9f80e9d9a556746 SHA512 1b62f0607f2a153909029672ecf91ec25a0e5473e8ec2c9974ff3a1a03e99a94616565c5092035cbd34865606f4ee9bbb8cf1949f5792f6edb07b7eeaa5dab51
-EBUILD gallery-dl-1.17.1.ebuild 1004 BLAKE2B e0190d0149b34c2a93c7514e36284e092f31178772aaeda49124b64dde02884ff8b77fbd8113c45d73f2b23e796362026dd3035cd6bd7a6adcca0da0ebf5f037 SHA512 4707beda8e5d127d58a7415caff052732e517b8b233ac6303d74c8f6383e5090ea947550d8c22b1e6af7a08907e1562bdd36125c466dbb26c06c14754506227c
-EBUILD gallery-dl-1.17.2.ebuild 1004 BLAKE2B e0190d0149b34c2a93c7514e36284e092f31178772aaeda49124b64dde02884ff8b77fbd8113c45d73f2b23e796362026dd3035cd6bd7a6adcca0da0ebf5f037 SHA512 4707beda8e5d127d58a7415caff052732e517b8b233ac6303d74c8f6383e5090ea947550d8c22b1e6af7a08907e1562bdd36125c466dbb26c06c14754506227c
+DIST gallery-dl-1.17.3.tar.gz 353605 BLAKE2B bae09e7a71457510c5d05c897e0082a6dca1b9c9a0a7bb57cd4585fd3a3748af7dd9c85cd92340fe3fb8329562c7153af717ef07d7c0a4a486a3400d37869031 SHA512 ee11058f04197695a2a47b50a9bef81f91b10875959841bca0f9ae27d9229b9ce1fa1e6fd32b7199163d458d698ccd92be7a700aeaed55078feaf70063883f47
+DIST gallery-dl-1.17.4.tar.gz 354616 BLAKE2B b8730759af439b9a06b3498cbe2aa5ca758040dbdd812d00f5944d82e050ab09bfd69658aeb861d29bf597b6fa8976e29d3ce41e7a2073c479536cf819b83046 SHA512 f46fa38fcb58724fcfbed247c5e9da91f06ac70bc9fbaa8013f7bafd6de1f0563ac2b5c712216686d660e400aac9cb3f95b74218c8cfba85210fb0417e8f6db2
+EBUILD gallery-dl-1.17.3.ebuild 1004 BLAKE2B e0190d0149b34c2a93c7514e36284e092f31178772aaeda49124b64dde02884ff8b77fbd8113c45d73f2b23e796362026dd3035cd6bd7a6adcca0da0ebf5f037 SHA512 4707beda8e5d127d58a7415caff052732e517b8b233ac6303d74c8f6383e5090ea947550d8c22b1e6af7a08907e1562bdd36125c466dbb26c06c14754506227c
+EBUILD gallery-dl-1.17.4.ebuild 1004 BLAKE2B e0190d0149b34c2a93c7514e36284e092f31178772aaeda49124b64dde02884ff8b77fbd8113c45d73f2b23e796362026dd3035cd6bd7a6adcca0da0ebf5f037 SHA512 4707beda8e5d127d58a7415caff052732e517b8b233ac6303d74c8f6383e5090ea947550d8c22b1e6af7a08907e1562bdd36125c466dbb26c06c14754506227c
EBUILD gallery-dl-9999.ebuild 1004 BLAKE2B e0190d0149b34c2a93c7514e36284e092f31178772aaeda49124b64dde02884ff8b77fbd8113c45d73f2b23e796362026dd3035cd6bd7a6adcca0da0ebf5f037 SHA512 4707beda8e5d127d58a7415caff052732e517b8b233ac6303d74c8f6383e5090ea947550d8c22b1e6af7a08907e1562bdd36125c466dbb26c06c14754506227c
MISC metadata.xml 793 BLAKE2B 0c014ab324d1fce9d2242f124aaea8273cb6de0553b5c0c6a65479d853ade3f1a9b8a7f482da9bd4ed6ff72ffd6138c35cde4cb373e92b5019e94405e29ba69f SHA512 2e7b177f458f13b084e28e0a59613ee58dce7ac0ad9483b04a2bb79df48583043924f13b5e3899d5f76a44b76ce2e4a04c63e71bea1916031c378831ea613fad
diff --git a/net-misc/gallery-dl/gallery-dl-1.17.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.17.3.ebuild
index c0680f91535c..c0680f91535c 100644
--- a/net-misc/gallery-dl/gallery-dl-1.17.1.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.17.3.ebuild
diff --git a/net-misc/gallery-dl/gallery-dl-1.17.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.17.4.ebuild
index c0680f91535c..c0680f91535c 100644
--- a/net-misc/gallery-dl/gallery-dl-1.17.2.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.17.4.ebuild
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index d670659bb7d1..f17348910d1c 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -4,9 +4,11 @@ AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059
AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1
AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
+DIST iperf-3.10.tar.gz 636646 BLAKE2B a8a7e01aa02a0dfb320311812a5e0d95213c5c67990fd30e9747d0372e125e4318bb211dc97a614015b75418a70d6a62f1dfd08d7499fd78765dcff9d99a4ca0 SHA512 f9ccc0dc0dc74f708d75a6992318b615259e8fa716175ee916462ebf75a370dc06a0ab5ac2aa314bf9c6f6f56dd2a00648bba34c65da848cbde1ea196c5a6f4e
DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc359eb402055dcaa90af63e2df2b6c67ba8a0a72a17648014240dc5b355084e69550afed4d59257a224de8 SHA512 3da0939bed576a7c14baa03c996e6f407f20bfe58c4b3a36a66e74f41bd5442c0b23ab18c8eb1f2f37fd47449af533b61b658d810c68707b2b06d28894ac2035
EBUILD iperf-2.0.14a.ebuild 856 BLAKE2B d75c7d282707edad5bcf7b8304c1820beb7dbe082f8a0203dd75857ab9ab80a741049acb671bd3383aafa936a51fcaf4cee19e98de64e71456332d6cd676e8b9 SHA512 2dfca97c4d60f56a8977279dd947fc35f0c30d8bc3c36fe308bb72de8287b5975ea20be2b11aaf1b2d858b1e3543ef759a94419e90a9ae0a304e8f852e9a1d34
EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 753dbd819ad867ee52dcdb9af069667d78053826f0028257eaee9fa13b6fab31cb27e5d419baa4c038a3346f607cd06639ed4dcc8fabbee6af943de336e9c45d SHA512 37d2329648792714b13e5fcdd2709b181d1cf32aa159aa39d8e3a1b922a01ef47e13ea340bef966991b7321d93bf9a41e7d2e824204f6770610eb71afeec6f13
+EBUILD iperf-3.10.ebuild 886 BLAKE2B 6c5610d40243962c52db5eb2f90b774bf5efb75a1dd66a2811cb47be3b34789aa0cdc0e83991c812e31a9e893a92981be997c42eaea57988f1e7f81c1150f89e SHA512 7563f89b69490920026a769618d1445a2f5d44f6d9c3d9075045a4c0071863d1aa305e76d971f6c50173a6130a32627ffb26a4fc24a73428d22cbd7965dc7a8d
EBUILD iperf-3.9-r1.ebuild 909 BLAKE2B ba3fb40ccd81fe6a241d51ff65ea925417fa8f9410dae883b5eaa13fd9da10202eecd7b575ec76425b91aa52eea19d678c34daf4484d7c2d6d5651ae505affbb SHA512 660f46d0f3167f667e2136b89a561eb616898791fd3c31b6409d70d0cc5df4f941a3f84fe0ea9e5b747bbc3641160359a2f960737ad555f7718e718a7db18d01
EBUILD iperf-3.99999.99999.ebuild 722 BLAKE2B 3e048d5eb49365b5c5f89e4072de496e908269c1dcf754f54810671d6ee66c08c814278be899060a7ac97a04464da4ddcbb9a93e79f5cbc6fa195eed584ea71d SHA512 b47ee419c1d04829ccb9a5a4225d58bb15f723a0f297b01c99f194ec662bba4200371aa0e084e737af0f9ccbbccb656c4e0dd680830fc9af11dc1be342bcd64c
MISC metadata.xml 569 BLAKE2B 66b45104e695c19a4c0e9bb804e75c2f5236d7b9e6b6741df3ab40669c79374a7b01b080c3d99b21f522fd48554713cc44af543c661168aaa0a0989c8dbffeab SHA512 5c67ca8f97c48097ff3e1f8c2a738deebf2357c15f82e19f9b695da6892240a78e3fd2af265b9ebaa2f706e46d09bfc99401f0538ceebef448a911db3197b4ab
diff --git a/net-misc/iperf/iperf-3.10.ebuild b/net-misc/iperf/iperf-3.10.ebuild
new file mode 100644
index 000000000000..9e9f34b2843b
--- /dev/null
+++ b/net-misc/iperf/iperf-3.10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf"
+SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="sctp"
+
+DEPEND="
+ dev-libs/openssl:0=
+ sctp? ( net-misc/lksctp-tools )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md RELNOTES.md )
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_with sctp)
+}
+
+src_install() {
+ default
+
+ newconfd "${FILESDIR}"/iperf.confd iperf3
+ newinitd "${FILESDIR}"/iperf3.initd iperf3
+ systemd_dounit contrib/iperf3.service
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-misc/lyricwikia/Manifest b/net-misc/lyricwikia/Manifest
new file mode 100644
index 000000000000..5afd9a52bba6
--- /dev/null
+++ b/net-misc/lyricwikia/Manifest
@@ -0,0 +1,4 @@
+AUX lyricwikia-0.1.11-skip-online-test.patch 506 BLAKE2B 92bf9826dd35d483fdabae057884e36847e2be273e668adae281962ec26ec05338b5fe53debb01655136af6a1325a20d043f023e756ee674c876c40d08095915 SHA512 6bb6d2960c39bee05e1d5b3a01656d78bce4fe07038758029274cf7e4d8495a29ffd2b79a7f3e02902a5e73fce03b505d1fed48a75e3681ab004a95cd6466416
+DIST lyricwikia-0.1.11.tar.gz 5571 BLAKE2B 1e2fb5400b4c0ed07d419e577e3c12c6b8eca749ce1a5b7dea51d6d055979722b82d003eac20402da873d3011d1b444c0783935adbc01ec99dd6079b234e6bc7 SHA512 53ff9a2837ccc10be62c2a92240e9849a9c88b7979f8058deff87ce6eda6e98e39fb86c78052de9a885db679cd87a6c5749af2f9502d3316fbbf2c0796718805
+EBUILD lyricwikia-0.1.11-r1.ebuild 1318 BLAKE2B 95c706a85be8d56a02f1a20681d5ef0cacd5475c1f3ac04021c3c97f477b29616b8d11b7103b56a8c6f24bd947ae3308689087d49f3f68394abbf96b88f0ef73 SHA512 b5a1bca6ff1f0fee0a321a2dd6bc445cf3f1e8517ef5e1a28210a6762eb9fb025fe057475d323c87b12659e3c2ccd5486e3ab09580b1e9356ca6235c56938ccb
+MISC metadata.xml 283 BLAKE2B ef3dfe1a27e46c933f7ae0bbdece78cab262e4c6a5713caceabd3cc11e5150ff4ad87da258f9a9aee61eb0b4f84dd8aa4b5537bdee54c0eee3d219666c436a46 SHA512 1401089263deca8f8539e7242fd5a68f32c51f8eeb44c05639cc5bee57781948443fd8fe3912c77dc7bbd61181c0b1d7ded90c7c7c3ae161d681d050ec990bda
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
new file mode 100644
index 000000000000..5ca24dd4d4bc
--- /dev/null
+++ b/net-misc/lyricwikia/files/lyricwikia-0.1.11-skip-online-test.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000000..feabf0bad1a1
--- /dev/null
+++ b/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+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/beautifulsoup:4[${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
new file mode 100644
index 000000000000..213b9d4ff05b
--- /dev/null
+++ b/net-misc/lyricwikia/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+ <maintainer type="person">
+ <email>andrewammerlaan@gentoo.org</email>
+ <name>Andrew Ammerlaan</name>
+ </maintainer>
+ <stabilize-allarches/>
+</pkgmetadata>
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 67d8a7a310b4..123d55131d84 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,6 +1,8 @@
AUX mikutter 137 BLAKE2B f76eb22d6492f8737ce7de92068f551ece304a7d983a922555db1d6bd36ad895376c7812840afe579959a122c7619ef02c209cb7dc06da1011bc95b9b8d9fe74 SHA512 bbf70ab03b994f9593ea3854d1911f23d1a78d155e6aa755b2456f138ef6f7f2ca5ad7aea477beca487dac43a2e5472ca7f2e7d1503a57aaa93f41f06cafccba
DIST mikutter-4.0.6.tar.gz 2322108 BLAKE2B 46d0cda2bc173ee971e516f017f66e26e9f7a4abd7330111ef66cd40bd0c6dd407b3d6988fa5955ca33a2c375cb77b4c234c8439dc27b6baf43dfcc9a34f4052 SHA512 16dca21bf7f989d2af71a8acc26816dbd7ebff7866b65d4c376b87cf2ba7757d8978a25483cb548448e3341c51d7767b638775e2696f64484b4f5ec8cdce050e
+DIST mikutter-4.1.5.tar.gz 2331485 BLAKE2B 25113ed59cad43094b77bacdf2e42079d9fb5a641a0b2e7ac9529e66183b6f7f953182350cf1d7f8703c10dda0a973edddd54b6c092fc3bf4c3ffe1cc243c2bf SHA512 a8d4be8fb4bf73a9b383ee0d18a6a6c91b6a4ad4ff5837c483da6274b70e4390600d729e303e00a3d4068791e80e0c83619760a3b885cbc4e3717eefb48b3c7c
DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
EBUILD mikutter-4.0.6.ebuild 2842 BLAKE2B 3e58510c4bfbbb648fe4d635f706305052fc3e45856749f7741b36b4720ce928193822969f8489d1af2babc838a2d21d1845a3d07935027d327ff0bcdc9304b4 SHA512 6951f54995cad1162278b876b9cb7665c5154093d56dd9731184a999a8bca69aa836ccd2273ebaa4a4b80c30dcdc9936fa0c9a28d2fbd6e42ad01fdeafc060fb
+EBUILD mikutter-4.1.5.ebuild 2913 BLAKE2B 62aab5d7da3e7a3c823594d5f530e4bae3e4df538e13ddfc36433e3617c19885e8e2cb7dcc68f7cbfff6f0f2234b32d2b19557b073fb1772030231de69e8dee7 SHA512 5b7859c8371e92ad97d0312984cd2029c517a6f1c8e44769f4e2993072b2e710ff6f052966a023929b8408ae83e49268e63c715461fb2fd3a1a0184b1b4b8abe
EBUILD mikutter-9999.ebuild 2842 BLAKE2B 3e58510c4bfbbb648fe4d635f706305052fc3e45856749f7741b36b4720ce928193822969f8489d1af2babc838a2d21d1845a3d07935027d327ff0bcdc9304b4 SHA512 6951f54995cad1162278b876b9cb7665c5154093d56dd9731184a999a8bca69aa836ccd2273ebaa4a4b80c30dcdc9936fa0c9a28d2fbd6e42ad01fdeafc060fb
MISC metadata.xml 214 BLAKE2B 8c736c7fcedf2d2c712e43cb3a7850254057fca17f9ec3647598d76e726cd4eea542ce40b339abb3f96a56b17a3f355d9508a5980dd7c7e243bbc19b68a6a5b7 SHA512 3950e95b95a325c58612d9c601ee4c59714d0387574f31bc8ac8eb35305082413aebe00435aeca391fe8dc72a0901aef3ee68ee0da10a14e88908ae766d637c3
diff --git a/net-misc/mikutter/mikutter-4.1.5.ebuild b/net-misc/mikutter/mikutter-4.1.5.ebuild
new file mode 100644
index 000000000000..37c694971242
--- /dev/null
+++ b/net-misc/mikutter/mikutter-4.1.5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+inherit desktop ruby-ng
+
+PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
+
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git
+ https://github.com/toshia/twitter_api_keys.git"
+ inherit git-r3
+ SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/all"
+else
+ SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
+ https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Simple, powerful and moeful twitter client"
+HOMEPAGE="https://mikutter.hachune.net/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+libnotify"
+
+DEPEND=""
+RDEPEND="
+ libnotify? ( x11-libs/libnotify )
+ media-sound/alsa-utils"
+
+ruby_add_rdepend "=dev-ruby/addressable-2.7*
+ >=dev-ruby/delayer-1.1.2
+ !>=dev-ruby/delayer-2.0
+ >=dev-ruby/delayer-deferred-2.2.0
+ !>=dev-ruby/delayer-deferred-3.0
+ >=dev-ruby/diva-1.0.2
+ !>=dev-ruby/diva-2.0
+ dev-ruby/httpclient
+ dev-ruby/json:2
+ >=dev-ruby/memoist-0.16.2
+ !>=dev-ruby/memoist-0.17
+ dev-ruby/moneta
+ dev-ruby/nokogiri
+ >=dev-ruby/oauth-0.5.4
+ >=dev-ruby/pluggaloid-1.5.0
+ !>=dev-ruby/pluggaloid-2.0
+ dev-ruby/rcairo
+ >=dev-ruby/ruby-gettext-3.3.5
+ !>=dev-ruby/ruby-gettext-3.4
+ =dev-ruby/ruby-gtk2-3.4*
+ >=dev-ruby/typed-array-0.1.2
+ !>=dev-ruby/typed-array-0.2
+ dev-ruby/twitter-text
+ virtual/ruby-ssl"
+
+all_ruby_unpack() {
+ if [ "${PV}" = "9999" ];then
+ git-3_src_unpack
+ else
+ default
+ fi
+}
+
+all_ruby_install() {
+ local rubyversion
+ local r
+
+ for r in $USE_RUBY; do
+ if use ruby_targets_${r}; then
+ rubyversion=${r}
+ fi
+ done
+
+ exeinto /usr/share/mikutter
+ doexe mikutter.rb
+ insinto /usr/share/mikutter
+ doins -r core plugin
+ sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
+ | newbin - mikutter
+ dodoc README
+ make_desktop_entry mikutter Mikutter \
+ /usr/share/mikutter/core/skin/data/icon.png
+
+ insinto /usr/share/mikutter/plugin/twitter_api_keys
+ newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in
+}
+
+pkg_postinst() {
+ echo
+ elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running"
+ elog " emerge --config =${PF}"
+}
+
+pkg_config() {
+ local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin
+ local CK CS
+
+ echo
+ einfon "Please input your Consumer Key for Twitter: "
+ read -r CK
+
+ echo
+ einfon "Please input your Consumer Secret for Twitter: "
+ read -r CS
+
+ if [ -z "${CK}" -o -z "${CS}" ]; then
+ eerror "Consumer Key or Consumer Secret is missing."
+ return
+ fi
+
+ sed -e "/consumer_key = /s!''!'${CK}'!" \
+ -e "/consumer_secret = /s!''!'${CS}'!" \
+ ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \
+ ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb
+
+ echo
+ einfo "Consuker Key/Consumer secret is set."
+}
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 68d1f385ac3b..b3b620b764a0 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,9 +1,5 @@
AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4
-DIST ModemManager-1.14.8.tar.xz 2255964 BLAKE2B 8f0e4e4747b3603795b533c41949ef7180922e92b7b26348145e18ffaa38f23cccbcb6662ac912216d33b4aef805c5f7ad10aef8029ffd16eb30b331fc2ca88e SHA512 2457214fecd7d4d9fef291f756ef19973b98a05d07721cd57bdaee704cd6b9e96d27f6741bd8d245a0495f1d338e65db12f19b2d9a8dd6a5cddfb050614381c6
-DIST ModemManager-1.16.2.tar.xz 2447936 BLAKE2B aafd2bde9fe72ec837a34987a698d82f4ba2aedf778c350263f8fe937ccd4b5b9b78fc66c58a39a8729c371788ab7b7782073726dc132b8f08bd2df0a9bc2da4 SHA512 c0b095972eba6e0f3a1ad22e425b412f17d8b60f0af4d423a92fdebcb6d2801f87e6af98758f8c2dc4db3586a3a15530a318805fda312443fa6abe2265ebd6b6
DIST ModemManager-1.16.4.tar.xz 2335908 BLAKE2B dfd3293e9b685d3b01fa3deec111aafca6f11dc27be0a69e0496036e537eecb6f51f592ce1996f47c86b5d9db2abf3c9b9a26e66e9f058ba59982caf38b28ef9 SHA512 5fb7625c9d41ce0179b4e59745b00b815038239552a5438d71ff36b019b398fc3dc6bef709e91a186f5f7427fcb59d79c0b1c3ca9c3dca867f0d5677fd979506
-EBUILD modemmanager-1.14.8-r1.ebuild 3722 BLAKE2B 375cb72e7b4ff273c548817a14043b6552f74fd56a1b60432f1903616f591d039460effc0d64684d3b49ef289f1846ad3a185b323c7d2e30a1680417cc82b40d SHA512 875516a545420aa782059ec04a4b90a778fdcefa42b17b9d704126db08277235ca7251c8bf83970885844ae044cd830672a35fc898fe91ad30784d3f0bb4b17e
-EBUILD modemmanager-1.16.2.ebuild 3573 BLAKE2B 3e3bafe15765b85cbb78d4e92413438bc9d2f0e7bd4a2026287425de5dde139e7e727cdd90e33b5e3031af8351780cef25deb44f613c9622a2ba674ca1fbf466 SHA512 70ca7487c3cab6b2b7ee48a07ece32d055a99b4010505482f0f04248c14e2dfdd5811ee00d2470f90d7c0ffce43639ec31c0a9656106656f44db915050f4b87b
-EBUILD modemmanager-1.16.4.ebuild 3573 BLAKE2B 3e3bafe15765b85cbb78d4e92413438bc9d2f0e7bd4a2026287425de5dde139e7e727cdd90e33b5e3031af8351780cef25deb44f613c9622a2ba674ca1fbf466 SHA512 70ca7487c3cab6b2b7ee48a07ece32d055a99b4010505482f0f04248c14e2dfdd5811ee00d2470f90d7c0ffce43639ec31c0a9656106656f44db915050f4b87b
+EBUILD modemmanager-1.16.4.ebuild 3567 BLAKE2B 9e5825b5df612ecc0da6ef056a58fe12e62700be0a215fd67f5f31c9de377930ac15317ed689cda7d0a88f6d027c1757ecc52c5583cd3db8083dbe39d75f1dcd SHA512 f4456cd7b40dc0ba85ba6fa2f3ec8ed3ef9b370cb9b7ee64dfb66034caf9afb33997ea8215a661439533035f62590e98601830256b2fc7780fb775d717349aab
MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild
deleted file mode 100644
index 677d74b3a719..000000000000
--- a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
-REQUIRED_USE="
- ?? ( elogind systemd )
- vala? ( introspection )
-"
-
-DEPEND="
- >=dev-libs/glib-2.48.0:2
- udev? ( >=dev-libs/libgudev-230:= )
- introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
- mbim? ( >=net-libs/libmbim-1.24.0 )
- policykit? ( >=sys-auth/polkit-0.106[introspection] )
- qmi? ( >=net-libs/libqmi-1.26.0:= )
- elogind? ( sys-auth/elogind )
- systemd? ( >=sys-apps/systemd-209 )
-"
-RDEPEND="${DEPEND}
- policykit? ( acct-group/plugdev )
-"
-BDEPEND="
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
- DOC_CONTENTS="
- If your USB modem shows up only as a storage device when you plug it in,
- then you should install sys-apps/usb_modeswitch, which will automatically
- switch it over to USB modem mode whenever you plug it in.\n"
-
- if use policykit; then
- DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
- add your user account to the 'plugdev' group."
- fi
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf=(
- --disable-Werror
- --disable-static
- --with-dist-version=${PVR}
- --with-udev-base-dir="$(get_udevdir)"
- $(use_with udev)
- $(use_enable introspection)
- $(use_with mbim)
- $(use_with policykit polkit)
- $(use_with systemd systemd-suspend-resume)
- $(use_with systemd systemd-journal)
- $(use_with qmi)
- $(use_enable vala)
- )
- if use elogind; then
- local pkgconfig="$(tc-getPKG_CONFIG)"
- myconf+=(
- --with-systemd-suspend-resume
- LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
- LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")"
- )
- fi
- gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
- gnome2_src_install
-
- # Allow users in plugdev group full control over their modem
- if use policykit; then
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
- fi
-
- readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/modemmanager.initd" modemmanager
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- # The polkit rules file moved to /usr/share
- old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
- if [[ -f "${old_rules}" ]]; then
- case "$(md5sum ${old_rules})" in
- c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
- # Automatically delete the old rules.d file if the user did not change it
- elog
- elog "Removing old ${old_rules} ..."
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
- ;;
- * )
- elog "The ${old_rules}"
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
- elog "If you edited ${old_rules}"
- elog "without changing its behavior, you may want to remove it."
- ;;
- esac
- fi
-
- if ! use udev; then
- ewarn "You have built ModemManager without udev support. You may have to teach it"
- ewarn "about your modem port manually."
- fi
-
- systemd_reenable ModemManager.service
-
- readme.gentoo_print_elog
-}
diff --git a/net-misc/modemmanager/modemmanager-1.16.2.ebuild b/net-misc/modemmanager/modemmanager-1.16.2.ebuild
deleted file mode 100644
index 5642c599e4ed..000000000000
--- a/net-misc/modemmanager/modemmanager-1.16.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
-REQUIRED_USE="
- ?? ( elogind systemd )
- vala? ( introspection )
-"
-
-DEPEND="
- >=dev-libs/glib-2.48.0:2
- udev? ( >=dev-libs/libgudev-230:= )
- introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
- mbim? ( >=net-libs/libmbim-1.24.0 )
- policykit? ( >=sys-auth/polkit-0.106[introspection?] )
- qmi? ( >=net-libs/libqmi-1.28.0:= )
- elogind? ( sys-auth/elogind )
- systemd? ( >=sys-apps/systemd-209 )
-"
-RDEPEND="${DEPEND}
- policykit? ( acct-group/plugdev )
-"
-BDEPEND="
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
- DOC_CONTENTS="
- If your USB modem shows up only as a storage device when you plug it in,
- then you should install sys-apps/usb_modeswitch, which will automatically
- switch it over to USB modem mode whenever you plug it in.\n"
-
- if use policykit; then
- DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
- add your user account to the 'plugdev' group."
- fi
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf=(
- --disable-Werror
- --disable-static
- --with-dist-version=${PVR}
- --with-udev-base-dir="$(get_udevdir)"
- $(use_with udev)
- $(use_enable introspection)
- $(use_with mbim)
- $(use_with policykit polkit)
- $(use_with systemd systemd-journal)
- $(use_with qmi)
- $(use_enable vala)
- )
- if use systemd || use elogind; then
- myconf+=(--with-systemd-suspend-resume)
- else
- myconf+=(--without-systemd-suspend-resume)
- fi
- gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
- gnome2_src_install
-
- # Allow users in plugdev group full control over their modem
- if use policykit; then
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
- fi
-
- readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/modemmanager.initd" modemmanager
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- # The polkit rules file moved to /usr/share
- old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
- if [[ -f "${old_rules}" ]]; then
- case "$(md5sum ${old_rules})" in
- c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
- # Automatically delete the old rules.d file if the user did not change it
- elog
- elog "Removing old ${old_rules} ..."
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
- ;;
- * )
- elog "The ${old_rules}"
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
- elog "If you edited ${old_rules}"
- elog "without changing its behavior, you may want to remove it."
- ;;
- esac
- fi
-
- if ! use udev; then
- ewarn "You have built ModemManager without udev support. You may have to teach it"
- ewarn "about your modem port manually."
- fi
-
- systemd_reenable ModemManager.service
-
- readme.gentoo_print_elog
-}
diff --git a/net-misc/modemmanager/modemmanager-1.16.4.ebuild b/net-misc/modemmanager/modemmanager-1.16.4.ebuild
index 5642c599e4ed..da2524401b41 100644
--- a/net-misc/modemmanager/modemmanager-1.16.4.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.16.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
LICENSE="GPL-2+"
SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
REQUIRED_USE="
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index ca0b779398de..b4a03bc43ee3 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -1,5 +1,5 @@
-DIST netopeer2-1.1.53.tar.gz 169329 BLAKE2B d65b579ca47d59963a181d78ec060c8a239639e7311f9e48ab88412cfa7f30e17dabde4ad086109193fec4129f836c46fb04acb0881248fc27e6f4e6877a70af SHA512 30da532a370c44d598b37199550ae1adb65486d5bc9205e9a0213beafe16174c87628395d564c48d095503b597b0008457e0b951451472f1c414fcc705897d21
DIST netopeer2-1.1.70.tar.gz 170883 BLAKE2B 59dbb1f82b355d807769466fc95dcac0ef0b74711f299b29cc6653183b5ffbb832d69b4247e04f38bdb9218adfabe1fff20c6f76e198ca0860808ec3910d20bd SHA512 d60c7ac861a05f8ee325013786e25e7f987f28265d66df5568ffd92ee31016a2d07f6b8256572110b9a6a5d00cb68644d1c3c3cd638f609b0f4f806e9e6cf602
-EBUILD netopeer2-1.1.53.ebuild 901 BLAKE2B d16ea4b1178f7ecd1e7c0f3a37f2b042b0b8cf40b8ae891907fc37a49b0eaa43284bf3e0385df28a5c44dfaa7cbe5e2c536db613fd71768f1ffdfaf45c28ccfd SHA512 d8c6e66fd8871c7362316bad639986fbed10fab21a2ecf9db62b7f909a27fc915a6ea31e3a8b2c13673cc0b2cb7f5ee5a9d9eccdd53bc9e499aa3a9c90b76dcb
-EBUILD netopeer2-1.1.70.ebuild 930 BLAKE2B 75c99ec7ec152bb695aa878fe1b3ae7d95203fe287fd86ed6251ac8d71d6ba779109130b84ddefef3aabc35351bb0ddca48a8b319b9b8be077cf553c477bef35 SHA512 3f8a5e2c1314038d985076b80afa4f0d50dce2dc243c4dbc1b2f957bdf1893cffb8eaa01bd55c2e5e4a2ec1d58b968b4084e143831b8593660ae82a14732aadb
+DIST netopeer2-2.0.0.tar.gz 255138 BLAKE2B a33fa6a952a060a8fb4bd4ad2f2f4e0ab163faef44cd999eb5d3a28706110908bf6350859da1032e873cf24ff8bd9327d0d694edeb35ecb8e0650634dc5d8966 SHA512 789a6fb36f9a3cf9df4ff996b90a5e8f07a24b14027ec455133e184ae96c72a1e8f9adef6d36800139d47d667c54189a2c14616f4947ce0fe72467cb178dbec5
+EBUILD netopeer2-1.1.70-r1.ebuild 1015 BLAKE2B b75b3dec3703a2cef4514743fd13153663d497b9384411345b39b4b0db6d2c3422a17b1b489971133e2c6c1c3c2c9141ad6ec5bafe8b1142bce66c54d872872c SHA512 92446cbfb98218c888e23f1f8bc56ed4b8dc02515234b1e4cb4ce1bc9126042bc062ab8f4817a7047a09c2ad823b34e1f3431783f9fdd9386b25fe4f74bd0b86
+EBUILD netopeer2-2.0.0.ebuild 925 BLAKE2B 1b527e1f11dd8c24f3e594d030877293c5ca6eee48515afeaea03efdc3891f05d5d810c52ac811393f65524192f7e30d04179e9a4635f3e9bb4e460b16b99d20 SHA512 5de23f009617944ba31c3472731cb79dfb3fb811ea65cc303c185ef1d3b0ce55a2728d4124b79d2523a377c17a19b80617858ce3aa662a6101799aca9c5fba24
MISC metadata.xml 449 BLAKE2B e77e9d18382c642d6165e32716e8ae0c8e5964acb49249687269fcec0f678b194fa905f50458ad640c25ce7d47138b7062232d92e0649a4b5fb54487a47c4cc1 SHA512 51596d9786cae042106f29190c459161c3eadccd64b51f79e255a8a2ee470bacd1c990420d195e7b2e15e913f8ba418cf2140aa87eacfe2e8252de1e5f95a6ff
diff --git a/net-misc/netopeer2/netopeer2-1.1.70.ebuild b/net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild
index 27f4dbd2ebd6..5d8fc5b128b1 100644
--- a/net-misc/netopeer2/netopeer2-1.1.70.ebuild
+++ b/net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild
@@ -11,15 +11,19 @@ SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
RDEPEND="
dev-libs/openssl:=
net-misc/curl:=
>=net-misc/sysrepo-1.4.122:=
+ <net-misc/sysrepo-2.0.0:=
>=net-libs/libnetconf2-1.1.43:=
+ <net-libs/libnetconf2-2.0.0:=
net-libs/libssh:=
- >=net-libs/libyang-1.0.225:="
+ >=net-libs/libyang-1.0.225:=
+ <net-libs/libyang-2.0.0:=
+"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/net-misc/netopeer2/netopeer2-1.1.53.ebuild b/net-misc/netopeer2/netopeer2-2.0.0.ebuild
index 13d86c998387..fa8bef0b722d 100644
--- a/net-misc/netopeer2/netopeer2-1.1.53.ebuild
+++ b/net-misc/netopeer2/netopeer2-2.0.0.ebuild
@@ -16,10 +16,10 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
dev-libs/openssl:=
net-misc/curl:=
- net-misc/sysrepo:=
- net-libs/libnetconf2:=
+ >=net-misc/sysrepo-2.0.0:=
+ >=net-libs/libnetconf2-2.0.0:=
net-libs/libssh:=
- net-libs/libyang:="
+ >=net-libs/libyang-2.0.0:="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 9a268ca329d1..34a975298f95 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,15 +2,6 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
-AUX networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch 574 BLAKE2B 179dfdcdb97bfc66adbeb58ca0e0b8f95f6d1cc0687fef338bc25ac59b4dc83e20e547d419ef8cea482c6302a05bbce8279c868f00c0cb173f42ebdc6a4bdcae SHA512 ab3e96bbd88b4a5c0aac59dc8de437be78f2e77762d6bc9c99e3b1ff1d7db39a054c4fd9ba9e2f6f9907da1ef66c8af310562addaa79ecd9e9812564f609a273
-AUX networkmanager-1.28.0-dhcpcd9.patch 10608 BLAKE2B fb5512d4b290ae668b41b2d1f387643e8d7c1c235ec255c292e419551c3a67a06463f43293ea75f8dd9700bde2d045e86eafe313384c22609cb8422117ac092f SHA512 7f9a2a3b7f861cc2c8e4b066449e6574ac74227b7a45ae8e9ca79c81a232d292a62216edff0620042f9556193e3841aa8cf5e8ecdbc2edfc9df0751e2d1f5303
-AUX networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch 2215 BLAKE2B c6165a5e6a1c892aed98bcb14369fc1282aa5179370b3194d879fe3866e184ce99687e88b5f1dbfdaa82313b7c1b59d0949442cc539d5355c114c539a2017598 SHA512 6844e58aa7d7be3030d046b8c330ad0615152a762c689e7dda07ee46466030a078ddf81f3ce8be8c1880191ec22aedde9325dde782ec0cfb95726935fe9086e3
-DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d788a6e979c2d7f232259e682fdc9e1f5569259731fdbbea65b6e8321561ecb8354b6f7a0b10843eb17cbe6f5937af8d9d898 SHA512 61b6214188a3cd281d0d5a5b8bfc402f8a19d8beaa6a3a2bd85983991cc66d62b2c3785d7ca652373903d53331610cd63a45d94bdb355196d939c48f42be29c1
-DIST NetworkManager-1.28.0.tar.xz 5129848 BLAKE2B 37dc9cda283dad29a70c85ed41a77844b4f60a9815be4b6780fbefecfeffb644fd67ea65373a1895fd2102f2beec9ad141b6e9a92a1a32de646d64acd4250b62 SHA512 ab0bc39626dc55df4e122ad6e1a8086e1467f44bdd41c4491c752dca3ffb549796e0ac888041f12f661f2f6cf4142d0fce59b5135549e48a0076fafcdc45ca06
-DIST NetworkManager-1.30.2.tar.xz 5302032 BLAKE2B 2fd30a09b479a4202c905ef29905d0672c0f4e07af15b0b124a626f160d150348e3d4b256386db43b91c4ac27c897f82269ede6e0f35f4b82905920494d070f2 SHA512 08482ac18814fd94bc99f0aa32de7d38c39d29c914a3080fb6df7ec2437b30f1aea1b5207edeae74ff63b9a181a4823cfa11e8884bc22ae80cb0b95f8cc3514e
DIST NetworkManager-1.30.4.tar.xz 5303420 BLAKE2B c2d81fe03f75f4afd05cac06741d9e7fb0d2892bad30462788a39d9c84afd056614e8f8d3371f15f4de7398cc40a32861814498fc36911c43bbe8e43f5053cde SHA512 ca42907d0c0fc6a981d94798a5e264dd58c7d11576a8dd52c8ef6799334af46848091d872e9cec553714766c51457cbe12c5c2017eaac63abce968823b047624
-EBUILD networkmanager-1.22.10-r12.ebuild 8548 BLAKE2B 5da579ca289ff404eb75807972ccb0e1f9cd04d219e766f4942ca6dd5e83da047bcd94c27e17aefb14b194d3e759a858e1590746ee61ae87bf176d322330f4bc SHA512 f6a6f6885e2c56428c60f6b717a5f5cafe15264280a66b946756da2332f64cffca24ce4d8defc583f07880829a54d098f5435a4b86b912c67bbb17560b910405
-EBUILD networkmanager-1.28.0-r1.ebuild 11251 BLAKE2B 031ebeea877a8959eb386b5e12041203f068df0ddb070fb0a259b3bef66890c424a868857ff2321bcdf3fba7e4bf1498e12692be26218cf44eeca1365b332ef9 SHA512 036d870f72ebb7af8ca5e795e2fe87bf434397a8c9dc7cd8fb6d7f481cc41bcb247d6c983b05215db56da5d29b6556470feb108797b4491aaaf8e5704043bb74
-EBUILD networkmanager-1.30.2.ebuild 11277 BLAKE2B 4fe920d0219755d1a6f15ba31cff95f9edb9a839b7ed61ddd1c5553d4458daa5e5951731fa40edae2a54dc9f30b60c2b32dc767ef0874bebf90bc28071c5a365 SHA512 16bb51e39b73fe99e0406d500ced0d4ad844cc5f12d4991bb7aac243e2ff9ffde7706e7e611100829f9dd320f6e6e581049dd2fdf3102528abcc34ce52003f35
-EBUILD networkmanager-1.30.4.ebuild 11212 BLAKE2B 91e9a109bc1071266bf90e47f336b6cb2b43401688f701537708c41fa464a7a8d0370f5c560dea4de163cafacaa63a8ee316853caf417fbfd6b84babbfb2de29 SHA512 3d7030df1a15de73a139cb4883bf6c1e6545c42d1707788eb5fdc3cfd291d9b7b4be6878c7042b268157bc392658f3db6d0f4915ef44b886d437dd0292d91d9a
-MISC metadata.xml 2182 BLAKE2B 699e4c087f213e132e3787d7c2f913b23bf79f4fb78037bd92510de0655863eb7ad2148a615b68b84ad14309624c25802bcbf65ee3052a6b84d20d2b8657bae6 SHA512 f8fbb50dbe481b3530e8ac6446c43e385095f04ad36c33a3ac73964675468b0d4cf47eab8698bc338d5fabc1f9f9ad2ad99edffac69aace897c88fa88f1dcfe3
+EBUILD networkmanager-1.30.4.ebuild 11206 BLAKE2B 2eac583bf5c83f16e7417ebb890155a5386b91550071d2ad819d14a089ecd120a823b53b73eb01da2b212b2eef0095840a0de68bad7c8984aaaf8177ad2b5027 SHA512 5523dc378109cbf5f058a34dbfbdd75891d53f90cbf32d86c0bd15eb16b442082b37b8983ff59ef3f52756bff5472f855471906cc5d9a238d0f5434847a3792a
+MISC metadata.xml 1837 BLAKE2B aa043d2334596bc186550d670e239a7aa272345fa7f93b50b2080e8ba238c0e604a5e2b1e6da9c4e122da4cf372c7a1ae2e491e9ba211815e4d31455c094bdfd SHA512 3af46024f51345dc5aa914539d43f74015bf75e8b5e92e008bb9fc65055fe0fa29e397ac86cd2ca23e6c048b51ac7f15de2458b4033a83d77c0c134629ad495d
diff --git a/net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch b/net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch
deleted file mode 100644
index f7ce742c5d53..000000000000
--- a/net-misc/networkmanager/files/networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-We don't have sed in /usr/bin
-
---- NetworkManager-1.20.6/data/84-nm-drivers.rules
-+++ NetworkManager-1.20.6/data/84-nm-drivers.rules
-@@ -7,6 +7,6 @@
- # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
- ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
- DRIVERS=="?*", GOTO="nm_drivers_end"
--PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
-+PROGRAM="/bin/sh -c 'ethtool -i $$1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
-
- LABEL="nm_drivers_end"
diff --git a/net-misc/networkmanager/files/networkmanager-1.28.0-dhcpcd9.patch b/net-misc/networkmanager/files/networkmanager-1.28.0-dhcpcd9.patch
deleted file mode 100644
index cfa642dd29b0..000000000000
--- a/net-misc/networkmanager/files/networkmanager-1.28.0-dhcpcd9.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From a58a89213bf4d0cefb155fef1ec9425f7a6ca5c8 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Tue, 19 Jan 2021 05:04:31 +0000
-Subject: [PATCH] DHCP: Support dhcpcd-9.x
-
-This locks NM into dhcpcd-9.3.3 as that is the first version to support
-the --noconfigure option. Older versions are no longer supported by NM
-because they do modify the host which is undesirable.
-
-Due to the way dhcpcd-9 uses privilege separation and that it re-parents
-itself to PID 1, the main process cannot be reaped or waited for.
-So we rely on dhcpcd correctly cleaning up after itself.
-A new function nm_dhcp_client_stop_watch_child() has been added
-so that dhcpcd can perform similar cleanup to the equivalent stop call.
-
-As part of this change, the STOP and STOPPED reasons are mapped to
-NM_DHCP_STATE_DONE and PREINIT is mapped to a new state NM_DHCP_STATE_NOOP
-which means NM should just ignore this state.
-
-https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/668
----
- NEWS | 3 ++
- src/dhcp/nm-dhcp-client.c | 20 +++++++++-
- src/dhcp/nm-dhcp-client.h | 3 ++
- src/dhcp/nm-dhcp-dhcpcd.c | 82 ++++++++++++++++++++-------------------
- 4 files changed, 67 insertions(+), 41 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 8a48587e5..958bbe91c 100644
---- a/NEWS
-+++ b/NEWS
-@@ -45,6 +45,9 @@ USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE!
- cmdline argument actually generates a connection which disables both
- ipv4 and ipv6. Previously the generated connection would disable ipv4
- but ipv6 would be set to the 'auto' method.
-+* The dhcpcd plugin now requires a minimum version of dhcpcd-9.3.3 with
-+ the --noconfigure option. Using an older version will cause dhcpcd to
-+ exit with a status code of 1.
-
- =============================================
- NetworkManager-1.26
-diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
-index 46ab48959..56f599abf 100644
---- a/src/dhcp/nm-dhcp-client.c
-+++ b/src/dhcp/nm-dhcp-client.c
-@@ -367,10 +367,13 @@ reason_to_state(NMDhcpClient *self, const char *iface, const char *reason)
- else if (g_ascii_strcasecmp(reason, "nak") == 0 || g_ascii_strcasecmp(reason, "expire") == 0
- || g_ascii_strcasecmp(reason, "expire6") == 0)
- return NM_DHCP_STATE_EXPIRE;
-- else if (g_ascii_strcasecmp(reason, "end") == 0)
-+ else if (g_ascii_strcasecmp(reason, "end") == 0 || g_ascii_strcasecmp(reason, "stop") == 0
-+ || g_ascii_strcasecmp(reason, "stopped") == 0)
- return NM_DHCP_STATE_DONE;
- else if (g_ascii_strcasecmp(reason, "fail") == 0 || g_ascii_strcasecmp(reason, "abend") == 0)
- return NM_DHCP_STATE_FAIL;
-+ else if (g_ascii_strcasecmp(reason, "preinit") == 0)
-+ return NM_DHCP_STATE_NOOP;
-
- _LOGD("unmapped DHCP state '%s'", reason);
- return NM_DHCP_STATE_UNKNOWN;
-@@ -547,6 +550,18 @@ nm_dhcp_client_watch_child(NMDhcpClient *self, pid_t pid)
- priv->watch_id = g_child_watch_add(pid, daemon_watch_cb, self);
- }
-
-+void
-+nm_dhcp_client_stop_watch_child(NMDhcpClient *self, pid_t pid)
-+{
-+ NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self);
-+
-+ g_return_if_fail(priv->pid == pid);
-+ priv->pid = -1;
-+
-+ watch_cleanup(self);
-+ timeout_cleanup(self);
-+}
-+
- gboolean
- nm_dhcp_client_start_ip4(NMDhcpClient *self,
- GBytes * client_id,
-@@ -874,6 +889,9 @@ nm_dhcp_client_handle_event(gpointer unused,
- state_to_string(new_state),
- reason);
-
-+ if (new_state == NM_DHCP_STATE_NOOP)
-+ return TRUE;
-+
- if (NM_IN_SET(new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED)) {
- GVariantIter iter;
- const char * name;
-diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h
-index 05faa9ea5..46446849a 100644
---- a/src/dhcp/nm-dhcp-client.h
-+++ b/src/dhcp/nm-dhcp-client.h
-@@ -55,6 +55,7 @@ typedef enum {
- NM_DHCP_STATE_EXPIRE, /* lease expired or NAKed */
- NM_DHCP_STATE_FAIL, /* failed for some reason */
- NM_DHCP_STATE_TERMINATED, /* client is no longer running */
-+ NM_DHCP_STATE_NOOP, /* state is a non operation for NetworkManager */
- __NM_DHCP_STATE_MAX,
- NM_DHCP_STATE_MAX = __NM_DHCP_STATE_MAX - 1,
- } NMDhcpState;
-@@ -183,6 +184,8 @@ void nm_dhcp_client_start_timeout(NMDhcpClient *self);
-
- void nm_dhcp_client_watch_child(NMDhcpClient *self, pid_t pid);
-
-+void nm_dhcp_client_stop_watch_child(NMDhcpClient *self, pid_t pid);
-+
- void nm_dhcp_client_set_state(NMDhcpClient *self,
- NMDhcpState new_state,
- NMIPConfig * ip_config,
-diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/dhcp/nm-dhcp-dhcpcd.c
-index b2b5d28bd..7cb003859 100644
---- a/src/dhcp/nm-dhcp-dhcpcd.c
-+++ b/src/dhcp/nm-dhcp-dhcpcd.c
-@@ -1,6 +1,6 @@
- /* SPDX-License-Identifier: GPL-2.0+ */
- /*
-- * Copyright (C) 2008 Roy Marples
-+ * Copyright (C) 2008,2020 Roy Marples <roy@marples.name>
- * Copyright (C) 2010 Dan Williams <dcbw@redhat.com>
- */
-
-@@ -40,7 +40,6 @@ static GType nm_dhcp_dhcpcd_get_type(void);
- /*****************************************************************************/
-
- typedef struct {
-- char * pid_file;
- NMDhcpListener *dhcp_listener;
- } NMDhcpDhcpcdPrivate;
-
-@@ -71,39 +70,37 @@ ip4_start(NMDhcpClient *client,
- const char * last_ip4_address,
- GError ** error)
- {
-- NMDhcpDhcpcd * self = NM_DHCP_DHCPCD(client);
-- NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE(self);
-- gs_unref_ptrarray GPtrArray *argv = NULL;
-- pid_t pid = -1;
-- GError * local = NULL;
-- gs_free char * cmd_str = NULL;
-- gs_free char * binary_name = NULL;
-+ NMDhcpDhcpcd * self = NM_DHCP_DHCPCD(client);
-+ gs_unref_ptrarray GPtrArray *argv = NULL;
-+ pid_t pid;
-+ GError * local;
-+ gs_free char * cmd_str = NULL;
- const char * iface;
- const char * dhcpcd_path;
- const char * hostname;
-
-- g_return_val_if_fail(priv->pid_file == NULL, FALSE);
-+ pid = nm_dhcp_client_get_pid(client);
-+ g_return_val_if_fail(pid == -1, FALSE);
-
- iface = nm_dhcp_client_get_iface(client);
-
-- /* dhcpcd does not allow custom pidfiles; the pidfile is always
-- * RUNSTATEDIR "dhcpcd-<ifname>.pid".
-- */
-- priv->pid_file = g_strdup_printf(RUNSTATEDIR "/dhcpcd-%s.pid", iface);
--
- dhcpcd_path = nm_dhcp_dhcpcd_get_path();
- if (!dhcpcd_path) {
- nm_utils_error_set_literal(error, NM_UTILS_ERROR_UNKNOWN, "dhcpcd binary not found");
- return FALSE;
- }
-
-- /* Kill any existing dhcpcd from the pidfile */
-- binary_name = g_path_get_basename(dhcpcd_path);
-- nm_dhcp_client_stop_existing(priv->pid_file, binary_name);
--
- argv = g_ptr_array_new();
- g_ptr_array_add(argv, (gpointer) dhcpcd_path);
-
-+ /* Don't configure anything, we will do that instead.
-+ * This requires dhcpcd-9.3.3 or newer.
-+ * Older versions only had an option not to install a default route,
-+ * dhcpcd still added addresses and other routes so we no longer support that
-+ * as it doesn't fit how NetworkManager wants to work.
-+ */
-+ g_ptr_array_add(argv, (gpointer) "--noconfigure");
-+
- g_ptr_array_add(argv, (gpointer) "-B"); /* Don't background on lease (disable fork()) */
-
- g_ptr_array_add(argv, (gpointer) "-K"); /* Disable built-in carrier detection */
-@@ -113,8 +110,6 @@ ip4_start(NMDhcpClient *client,
- /* --noarp. Don't request or claim the address by ARP; this also disables IPv4LL. */
- g_ptr_array_add(argv, (gpointer) "-A");
-
-- g_ptr_array_add(argv, (gpointer) "-G"); /* Let NM handle routing */
--
- g_ptr_array_add(argv, (gpointer) "-c"); /* Set script file */
- g_ptr_array_add(argv, (gpointer) nm_dhcp_helper_path);
-
-@@ -146,8 +141,8 @@ ip4_start(NMDhcpClient *client,
- if (!g_spawn_async(NULL,
- (char **) argv->pdata,
- NULL,
-- G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_STDOUT_TO_DEV_NULL
-- | G_SPAWN_STDERR_TO_DEV_NULL,
-+ G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL
-+ | G_SPAWN_DO_NOT_REAP_CHILD,
- nm_utils_setpgid,
- NULL,
- &pid,
-@@ -169,23 +164,32 @@ ip4_start(NMDhcpClient *client,
- static void
- stop(NMDhcpClient *client, gboolean release)
- {
-- NMDhcpDhcpcd * self = NM_DHCP_DHCPCD(client);
-- NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE(self);
-- int errsv;
--
-- NM_DHCP_CLIENT_CLASS(nm_dhcp_dhcpcd_parent_class)->stop(client, release);
--
-- if (priv->pid_file) {
-- if (remove(priv->pid_file) == -1) {
-- errsv = errno;
-- _LOGD("could not remove dhcp pid file \"%s\": %d (%s)",
-- priv->pid_file,
-- errsv,
-- nm_strerror_native(errsv));
-- }
-+ NMDhcpDhcpcd *self = NM_DHCP_DHCPCD(client);
-+ pid_t pid;
-+ int sig, errsv;
-+
-+ pid = nm_dhcp_client_get_pid(client);
-+ sig = release ? SIGALRM : SIGTERM;
-+ _LOGD("sending %s to dhcpcd pid %d", sig == SIGALRM ? "SIGALRM" : "SIGTERM", pid);
-+
-+ /* dhcpcd-9.x features privilege separation.
-+ * It's not our job to track all these processes so we rely on dhcpcd
-+ * to always cleanup after itself.
-+ * Because it also re-parents itself to PID 1, the process cannot be
-+ * reaped or waited for.
-+ * As such, just send the correct signal.
-+ */
-+ if (kill(pid, sig) == -1) {
-+ errsv = errno;
-+ _LOGE("failed to kill dhcpcd %d:%s", errsv, strerror(errsv));
- }
-
-- /* FIXME: implement release... */
-+ /* When this function exits NM expects the PID to be -1.
-+ * This means we also need to stop watching the pid.
-+ * If we need to know the exit status then we need to refactor NM
-+ * to allow a non -1 to mean we're waiting to exit still.
-+ */
-+ nm_dhcp_client_stop_watch_child(client, pid);
- }
-
- /*****************************************************************************/
-@@ -214,8 +218,6 @@ dispose(GObject *object)
- g_clear_object(&priv->dhcp_listener);
- }
-
-- nm_clear_g_free(&priv->pid_file);
--
- G_OBJECT_CLASS(nm_dhcp_dhcpcd_parent_class)->dispose(object);
- }
-
---
-2.30.0
-
diff --git a/net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch b/net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch
deleted file mode 100644
index 0e60ccdcb894..000000000000
--- a/net-misc/networkmanager/files/networkmanager-1.30.2-iwd-autoconnect-fix-pr785.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4409900f1d05bf60647492a75e478590647b997a Mon Sep 17 00:00:00 2001
-From: Andrew Zaborowski <andrew.zaborowski@intel.com>
-Date: Thu, 18 Mar 2021 00:21:31 +0100
-Subject: [PATCH] iwd: Don't call IWD methods when device unmanaged
-
-When using IWD-side autoconnect mode (current default), in .deactivate()
-and .deactivate_async() refrain from commanding IWD to actually
-disconnect until the device is managed. Likely the device is already
-disconnected but in any case it's up to IWD to decide in this mode.
-
-Calling IWD device's .Disconnect() D-Bus method has the side effect of
-disabling autoconnect and doing this while NM is still in platform-init
-was unexpectedly leaving the device without autoconnect after
-platform-init was done, according to user reports.
-
-Fixes: dc0e31fb7014d8a97aca96bf97a8f86f8236300c
----
- src/core/devices/wifi/nm-device-iwd.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c
-index 95ade44b58..01f2a30396 100644
---- a/src/core/devices/wifi/nm-device-iwd.c
-+++ b/src/core/devices/wifi/nm-device-iwd.c
-@@ -588,10 +588,16 @@ deactivate(NMDevice *device)
- return;
- }
-
-- cleanup_association_attempt(self, TRUE);
-+ cleanup_association_attempt(self, FALSE);
- priv->act_mode_switch = FALSE;
-
-- if (!priv->dbus_station_proxy)
-+ /* Don't trigger any actions on the IWD side until the device is managed */
-+ if (priv->iwd_autoconnect && nm_device_get_state(device) < NM_DEVICE_STATE_DISCONNECTED)
-+ return;
-+
-+ if (priv->dbus_station_proxy)
-+ send_disconnect(self);
-+ else
- reset_mode(self, NULL, NULL, NULL);
- }
-
-@@ -647,6 +653,11 @@ deactivate_async(NMDevice * device,
- cleanup_association_attempt(self, FALSE);
- priv->act_mode_switch = FALSE;
-
-+ if (priv->iwd_autoconnect && nm_device_get_state(device) < NM_DEVICE_STATE_DISCONNECTED) {
-+ nm_utils_invoke_on_idle(cancellable, disconnect_cb_on_idle, user_data);
-+ return;
-+ }
-+
- if (priv->dbus_station_proxy) {
- g_dbus_proxy_call(priv->dbus_station_proxy,
- "Disconnect",
---
-GitLab
-
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 808f71c51288..bad2d1a41b75 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo GNOME Desktop</name>
</maintainer>
<use>
- <flag name="concheck">Enable connectivity checking support</flag>
<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and
<pkg>net-firewall/iptables</pkg> for connection sharing</flag>
<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for
@@ -15,10 +14,6 @@
<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
<flag name="iwd">Use <pkg>net-wireless/iwd</pkg> instead of
<pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default</flag>
- <flag name="json">Enable JSON validation via <pkg>dev-libs/jansson</pkg>
- in libnm.</flag>
- <flag name="libpsl">Link against libpsl</flag>
- <flag name="lto">Link-time optimization</flag>
<flag name="modemmanager">Enable support for mobile broadband devices
using <pkg>net-misc/modemmanager</pkg></flag>
<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
@@ -32,7 +27,6 @@
systemd-resolved, disable this flag and create a symlink to
/run/systemd/resolve/stub-resolv.conf.</flag>
<flag name="teamd">Enable Teamd control support</flag>
- <flag name="tools">Build cli tools such as nmcli, nmtui and nm_cloud_setup</flag>
<flag name="wifi">Enable support for wifi and 802.1x security</flag>
<flag name="wext">Enable support for the deprecated Wext (Wireless
Extensions) API; needed for some older drivers (e.g. ipw2200,
diff --git a/net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild b/net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild
deleted file mode 100644
index 562789d7de90..000000000000
--- a/net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit meson linux-info python-any-r1 systemd udev vala
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-SRC_URI="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/${PV}/NetworkManager-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="audit bluetooth +concheck connection-sharing +dhclient dhcpcd "
-IUSE+="debug elogind examples +gnutls gtk-doc introspection iwd json kernel_linux "
-IUSE+="libpsl lto modemmanager nss ofono ovs +policykit ppp resolvconf selinux "
-IUSE+="syslog systemd teamd test +tools vala wext +wifi"
-
-REQUIRED_USE="
- gtk-doc? ( introspection )
- iwd? ( wifi )
- vala? ( introspection )
- ^^ ( gnutls nss )
- ?? ( elogind systemd )
- ?? ( dhclient dhcpcd )
- ?? ( syslog systemd )
-"
-
-DEPEND="
- dev-libs/dbus-glib
- dev-libs/glib:2
- net-libs/libndp
- sys-apps/dbus
- sys-kernel/linux-headers
- virtual/libudev
- audit? ( sys-process/audit )
- bluetooth? ( net-wireless/bluez )
- concheck? ( net-misc/curl )
- connection-sharing? (
- net-dns/dnsmasq[dbus,dhcp]
- net-firewall/iptables
- )
- dhclient? ( net-misc/dhcp[client] )
- dhcpcd? ( net-misc/dhcpcd )
- elogind? ( sys-auth/elogind )
- gnutls? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls
- )
- introspection? ( dev-libs/gobject-introspection:= )
- json? ( dev-libs/jansson )
- libpsl? ( net-libs/libpsl )
- modemmanager? (
- net-misc/mobile-broadband-provider-info
- net-misc/modemmanager
- )
- nss? ( dev-libs/nss )
- ofono? ( net-misc/ofono )
- ovs? ( dev-libs/jansson )
- policykit? ( sys-auth/polkit )
- ppp? ( net-dialup/ppp[ipv6] )
- resolvconf? ( net-dns/openresolv )
- selinux? ( sys-libs/libselinux )
- systemd? ( sys-apps/systemd:= )
- teamd? (
- dev-libs/jansson
- net-misc/libteam
- )
- tools? (
- dev-libs/newt
- sys-libs/ncurses
- sys-libs/readline:0=
- )
-"
-RDEPEND="${DEPEND}
- acct-group/plugdev
- || (
- net-analyzer/arping
- net-misc/iputils[arping(+)]
- )
- wifi? (
- iwd? ( net-wireless/iwd )
- !iwd? ( net-wireless/wpa_supplicant[dbus] )
- )
-"
-BDEPEND="dev-util/intltool
- gtk-doc? ( dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.1.2 )
- sys-devel/gettext
- virtual/pkgconfig
- introspection? (
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- dev-libs/libxslt
- dev-lang/perl
- )
- vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}"/NetworkManager-${PV}
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.20.6-dont_call_helpers_with_full_paths.patch"
-)
-
-python_check_deps() {
- if use introspection; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
- fi
-
- if use test; then
- has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
- fi
-}
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile "
- eerror "your kernel or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend ${?}
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, "
- ewarn "NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
- fi
-}
-
-pkg_setup() {
- CONFIG_CHECK="~BPF"
-
- if use connection-sharing; then
- if kernel_is lt 5 1; then
- CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
- else
- CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
- fi
- fi
-
- linux-info_pkg_setup
-
- # if use introspection || use test; then
- if use introspection; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- default
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -D systemdsystemunitdir=$(systemd_get_systemunitdir)
- -D system_ca_path=/etc/ssl/certs
- -D udev_dir=$(get_udevdir)
- -D dbus_conf_dir=/usr/share/dbus-1/system.d
- -D kernel_firmware_dir=/lib/firmware
- -D iptables=/sbin/iptables
- #-D dnsmasq=
- #-D dnssec_trigger=
-
- -D dist_version=${PVR}
- $(meson_use policykit polkit)
- -D modify_system=true
- $(meson_use policykit polkit_agent)
- $(meson_use policykit config_auth_polkit_default)
- $(meson_use selinux)
- $(meson_use systemd systemd_journal)
- -D hostname_persist=gentoo
- -D libaudit=$(usex audit yes no)
-
- $(meson_use wext)
- $(meson_use wifi)
- $(meson_use iwd)
- $(meson_use ppp)
- #-D pppd='path to pppd binary'
- #-D pppd_plugin_dir='path to the pppd plugins directory'
- $(meson_use modemmanager modem_manager)
- $(meson_use ofono)
- $(meson_use concheck)
- $(meson_use teamd teamdctl)
- $(meson_use ovs)
- $(meson_use tools nmcli)
- $(meson_use tools nmtui)
- $(meson_use tools nm_cloud_setup)
- $(meson_use bluetooth bluez5_dun)
- -D ebpf=true
-
- -D config_plugins_default=keyfile
- -D ifcfg_rh=false
- -D ifupdown=false
-
- $(meson_feature resolvconf)
- -D netconfig=disable
- -D config_dns_rc_manager_default=symlink
-
- $(meson_feature dhclient)
- -D dhcpcanon=disable
- $(meson_feature dhcpcd)
-
- $(meson_use introspection)
- $(meson_use vala vapi)
- $(meson_use gtk-doc docs)
- # $(meson_use debug more_asserts)
- -D more_asserts=0
- $(meson_use debug more_logging)
- -D valgrind=no
- -D valgrind_suppressions=
- $(meson_use debug ld_gc)
- $(meson_use libpsl)
- $(meson_use json json_validation)
- -D qt=false
-
- $(meson_use lto b_lto)
- )
-
- if use systemd; then
- emesonargs+=( -D session_tracking_consolekit=false )
- emesonargs+=( -D session_tracking=systemd )
- emesonargs+=( -D suspend_resume=systemd )
- elif use elogind; then
- emesonargs+=( -D session_tracking_consolekit=false )
- emesonargs+=( -D session_tracking=elogind )
- emesonargs+=( -D suspend_resume=elogind )
- else
- emesonargs+=( -D session_tracking_consolekit=false )
- emesonargs+=( -D session_tracking=none )
- emesonargs+=( -D suspend_resume=auto )
- fi
-
- if use syslog; then
- emesonargs+=( -D config_logging_backend_default=syslog )
- elif use systemd; then
- emesonargs+=( -D config_logging_backend_default=journal )
- else
- emesonargs+=( -D config_logging_backend_default=default )
- fi
-
- if use dhclient; then
- emesonargs+=( -D config_dhcp_default=dhclient )
- elif use dhcpcd; then
- emesonargs+=( -D config_dhcp_default=dhcpcd )
- else
- emesonargs+=( -D config_dhcp_default=internal )
- fi
-
- if use nss; then
- emesonargs+=( -D crypto=nss )
- else
- emesonargs+=( -D crypto=gnutls )
- fi
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* || die
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
- if use iwd; then
- insinto /usr/lib/NetworkManager/conf.d/
- newins - iwd.conf <<- _EOF_
- [device]
- wifi.backend=iwd
- _EOF_
- fi
-
- if use examples; then
- dodoc -r "${S}"/examples/
-
- insinto /usr/lib/NetworkManager/conf.d
- doins "${S}"/examples/nm-conf.d/{30-anon,31-mac-addr-change}.conf
-
- # Temporary workaround
- cp "${ED}"/usr/share/doc/NetworkManager/examples/server.conf \
- "${ED}"/usr/share/doc/${PF}/examples/ ||
- die "Failed to copy server.conf example."
- fi
-
- # Temporary workaround,
- # The file will be installed regargless of 'examples' USE.
- rm "${ED}"/usr/share/doc/NetworkManager/examples/server.conf || die
- rm -r "${ED}"/usr/share/doc/NetworkManager || die
-
- # Empty dirs
- rm -r "${ED}/var" || die
-}
-
-pkg_postinst() {
- systemd_reenable NetworkManager.service
-}
diff --git a/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild b/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild
deleted file mode 100644
index cd47f2d90ad0..000000000000
--- a/net-misc/networkmanager/networkmanager-1.28.0-r1.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- bluetooth? ( modemmanager )
- iwd? ( wifi )
- vala? ( introspection )
- wext? ( wifi )
- || ( nss gnutls )
- ?? ( elogind systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
- >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
- policykit? ( >=sys-auth/polkit-0.106 )
- net-libs/libndp[${MULTILIB_USEDEP}]
- >=net-misc/curl-7.24
- net-misc/iputils
- sys-apps/util-linux[${MULTILIB_USEDEP}]
- sys-libs/readline:0=
- >=virtual/libudev-175:=[${MULTILIB_USEDEP}]
- audit? ( sys-process/audit )
- bluetooth? ( >=net-wireless/bluez-5 )
- connection-sharing? (
- net-dns/dnsmasq[dbus,dhcp]
- net-firewall/iptables )
- dhclient? ( >=net-misc/dhcp-4[client] )
- dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
- elogind? ( >=sys-auth/elogind-219 )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
- net-misc/mobile-broadband-provider-info )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
- !nss? ( gnutls? (
- dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
- ofono? ( net-misc/ofono )
- ovs? ( dev-libs/jansson )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
- resolvconf? ( net-dns/openresolv )
- selinux? ( sys-libs/libselinux )
- systemd? ( >=sys-apps/systemd-209:0= )
- teamd? (
- dev-libs/jansson
- >=net-misc/libteam-1.9
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/plugdev
- || (
- net-misc/iputils[arping(+)]
- net-analyzer/arping
- )
- wifi? (
- !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
- iwd? ( net-wireless/iwd )
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.18
- "
-BDEPEND="
- dev-util/gdbus-codegen
- dev-util/glib-utils
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- introspection? (
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- dev-lang/perl
- dev-libs/libxslt
- )
- vala? ( $(vala_depend) )
- test? (
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]')
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.28.0-dhcpcd9.patch"
-)
-
-python_check_deps() {
- if use introspection; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
- fi
- if use test; then
- has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
- fi
-}
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- if use connection-sharing; then
- if kernel_is lt 5 1; then
- CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
- else
- CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
- fi
- linux-info_pkg_setup
- fi
- if use introspection || use test; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-
- sed -i \
- -e 's#/usr/bin/sed#/bin/sed#' \
- data/84-nm-drivers.rules \
- || die
-}
-
-multilib_src_configure() {
- local myconf=(
- --disable-more-warnings
- --disable-static
- --localstatedir=/var
- --with-runstatedir=/run
- --disable-lto
- --disable-qt
- --without-netconfig
- --with-dbus-sys-dir=/etc/dbus-1/system.d
- $(multilib_native_with nmcli)
- --with-udev-dir="$(get_udevdir)"
- --with-config-plugins-default=keyfile
- --with-iptables=/sbin/iptables
- --with-ebpf=yes
- $(multilib_native_enable concheck)
- --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
- --with-crypto=$(usex nss nss gnutls)
- # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
- # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
- # (There is no off switch, and we do not support upower.)
- # bug #747358
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
- $(multilib_native_use_with audit libaudit)
- $(multilib_native_use_enable bluetooth bluez5-dun)
- --without-dhcpcanon
- $(use_with dhclient)
- $(use_with dhcpcd)
- --with-config-dhcp-default=internal
- $(multilib_native_use_enable introspection)
- $(multilib_native_use_enable ppp)
- --without-libpsl
- $(multilib_native_use_with modemmanager modem-manager-1)
- $(multilib_native_use_with ncurses nmtui)
- $(multilib_native_use_with ofono)
- $(multilib_native_use_enable ovs)
- $(multilib_native_use_enable policykit polkit)
- $(multilib_native_use_with resolvconf)
- $(multilib_native_use_with selinux)
- $(multilib_native_use_with systemd systemd-journal)
- $(multilib_native_use_enable teamd teamdctl)
- $(multilib_native_use_enable test tests)
- $(multilib_native_use_enable vala)
- --without-valgrind
- $(multilib_native_use_with wifi iwd)
- $(multilib_native_use_with wext)
- $(multilib_native_use_enable wifi)
- )
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
- fi
-
- # unit files directory needs to be passed only when systemd is enabled,
- # otherwise systemd support is not disabled completely, bug #524534
- use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
- if multilib_is_native_abi; then
- # work-around man out-of-source brokenness, must be done before configure
- ln -s "${S}/docs" docs || die
- ln -s "${S}/man" man || die
- fi
-
- ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- local targets=(
- libnm/libnm.la
- )
- emake "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- if use test && multilib_is_native_abi; then
- python_setup
- virtx emake check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
- insinto /usr/lib/NetworkManager/conf.d #702476
- doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
- else
- local targets=(
- install-libLTLIBRARIES
- install-libnmincludeHEADERS
- install-nodist_libnmincludeHEADERS
- install-pkgconfigDATA
- )
- emake DESTDIR="${D}" "${targets[@]}"
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- ! use systemd && readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
- if use iwd; then
- # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
- cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
- [device]
- wifi.backend=iwd
- EOF
- fi
-
- # Empty
- rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- systemd_reenable NetworkManager.service
- ! use systemd && readme.gentoo_print_elog
-
- if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-
- if use dhclient || use dhcpcd; then
- ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
- ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
- ewarn "works for you, and you're happy with, the alternative USE flags can be"
- ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
- ewarn "the main.dhcp configuration option to use one of them instead of internal."
- fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.30.2.ebuild b/net-misc/networkmanager/networkmanager-1.30.2.ebuild
deleted file mode 100644
index 5dfe828e9e78..000000000000
--- a/net-misc/networkmanager/networkmanager-1.30.2.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- bluetooth? ( modemmanager )
- iwd? ( wifi )
- vala? ( introspection )
- wext? ( wifi )
- || ( nss gnutls )
- ?? ( elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
- >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
- policykit? ( >=sys-auth/polkit-0.106 )
- net-libs/libndp[${MULTILIB_USEDEP}]
- >=net-misc/curl-7.24
- net-misc/iputils
- sys-apps/util-linux[${MULTILIB_USEDEP}]
- sys-libs/readline:0=
- >=virtual/libudev-175:=[${MULTILIB_USEDEP}]
- audit? ( sys-process/audit )
- bluetooth? ( >=net-wireless/bluez-5 )
- connection-sharing? (
- net-dns/dnsmasq[dbus,dhcp]
- net-firewall/iptables )
- dhclient? ( >=net-misc/dhcp-4[client] )
- dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
- elogind? ( >=sys-auth/elogind-219 )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
- net-misc/mobile-broadband-provider-info )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
- !nss? ( gnutls? (
- dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
- ofono? ( net-misc/ofono )
- ovs? ( dev-libs/jansson )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
- resolvconf? ( net-dns/openresolv )
- selinux? ( sys-libs/libselinux )
- systemd? ( >=sys-apps/systemd-209:0= )
- teamd? (
- dev-libs/jansson
- >=net-misc/libteam-1.9
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/plugdev
- || (
- net-misc/iputils[arping(+)]
- net-analyzer/arping
- )
- wifi? (
- !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
- iwd? ( net-wireless/iwd )
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-kernel/linux-headers-3.18
- "
-BDEPEND="
- dev-util/gdbus-codegen
- dev-util/glib-utils
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- introspection? (
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- dev-lang/perl
- dev-libs/libxslt
- )
- vala? ( $(vala_depend) )
- test? (
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]')
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-iwd-autoconnect-fix-pr785.patch
-)
-
-python_check_deps() {
- if use introspection; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
- fi
- if use test; then
- has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
- fi
-}
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- if use connection-sharing; then
- if kernel_is lt 5 1; then
- CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
- else
- CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
- fi
- linux-info_pkg_setup
- fi
- if use introspection || use test; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-
- sed -i \
- -e 's#/usr/bin/sed#/bin/sed#' \
- data/84-nm-drivers.rules \
- || die
-}
-
-multilib_src_configure() {
- local myconf=(
- --disable-more-warnings
- --disable-static
- --localstatedir=/var
- --with-runstatedir=/run
- --disable-lto
- --disable-qt
- --without-netconfig
- --with-dbus-sys-dir=/etc/dbus-1/system.d
- $(multilib_native_with nmcli)
- --with-udev-dir="$(get_udevdir)"
- --with-config-plugins-default=keyfile
- --with-iptables=/sbin/iptables
- --with-ebpf=yes
- $(multilib_native_enable concheck)
- --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
- --with-crypto=$(usex nss nss gnutls)
- # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
- # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
- # (There is no off switch, and we do not support upower.)
- # bug #747358
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
- $(multilib_native_use_with audit libaudit)
- $(multilib_native_use_enable bluetooth bluez5-dun)
- --without-dhcpcanon
- $(use_with dhclient)
- $(use_with dhcpcd)
- --with-config-dhcp-default=internal
- $(multilib_native_use_enable introspection)
- $(multilib_native_use_enable ppp)
- --without-libpsl
- $(multilib_native_use_with modemmanager modem-manager-1)
- $(multilib_native_use_with ncurses nmtui)
- $(multilib_native_use_with ofono)
- $(multilib_native_use_enable ovs)
- $(multilib_native_use_enable policykit polkit)
- $(multilib_native_use_with resolvconf)
- $(multilib_native_use_with selinux)
- $(multilib_native_use_with systemd systemd-journal)
- $(multilib_native_use_enable teamd teamdctl)
- $(multilib_native_use_enable test tests)
- $(multilib_native_use_enable vala)
- --without-valgrind
- $(multilib_native_use_with wifi iwd)
- $(multilib_native_use_with wext)
- $(multilib_native_use_enable wifi)
- )
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
- fi
-
- # unit files directory needs to be passed only when systemd is enabled,
- # otherwise systemd support is not disabled completely, bug #524534
- use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
- if multilib_is_native_abi; then
- # work-around man out-of-source brokenness, must be done before configure
- ln -s "${S}/docs" docs || die
- ln -s "${S}/man" man || die
- fi
-
- ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- local targets=(
- libnm/libnm.la
- )
- emake "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- if use test && multilib_is_native_abi; then
- python_setup
- virtx emake check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
- insinto /usr/lib/NetworkManager/conf.d #702476
- doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
- else
- local targets=(
- install-libLTLIBRARIES
- install-libnmincludeHEADERS
- install-nodist_libnmincludeHEADERS
- install-pkgconfigDATA
- )
- emake DESTDIR="${D}" "${targets[@]}"
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- ! use systemd && readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
- if use iwd; then
- # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
- cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
- [device]
- wifi.backend=iwd
- EOF
- fi
-
- # Empty
- rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- systemd_reenable NetworkManager.service
- ! use systemd && readme.gentoo_print_elog
-
- if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-
- if use dhclient || use dhcpcd; then
- ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
- ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
- ewarn "works for you, and you're happy with, the alternative USE flags can be"
- ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
- ewarn "the main.dhcp configuration option to use one of them instead of internal."
- fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.30.4.ebuild b/net-misc/networkmanager/networkmanager-1.30.4.ebuild
index 7889e17ce1bd..e65e736be858 100644
--- a/net-misc/networkmanager/networkmanager-1.30.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.30.4.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
?? ( elogind systemd )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
# gobject-introspection-0.10.3 is needed due to gnome bug 642300
# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 89bd6a3fba09..fbfcc7b240c8 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -3,9 +3,13 @@ DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78
DIST nextcloud-client-3.1.1.tar.gz 19440799 BLAKE2B ae6ef7fbff4b7b5c9a5728a30558000cd781348dd07aba068af5b123ec629e1661b52cd63b50bf45c593411866bc607dfcc3112713fa2aea3eabfda7ce969614 SHA512 1f60266ff6d413a614261ae8b6c75ba6bc5cdb534f1906039b47cb7d593d12d72013d277dc12c0bfc5c5919322438543736a7cdff056949d80e093538fd04209
DIST nextcloud-client-3.1.2.tar.gz 19517295 BLAKE2B 75713a892816be515984cef579e09dfb58165bf1e35e73982bd59fb1cce9a0cdcc76a33a9116b85da99174f0ee4f3c425afb380df5a99d65dba82a9c6d5b3553 SHA512 bad05fab6c6d391ed40e7f9b5869f3ab3231bdba1bbb24b7222d9cace0bd96989b0b24757bf0757053a851312265aec5a4ac6f4d1c71d532152aa20ddee838a6
DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99
+DIST nextcloud-client-3.2.1.tar.gz 15234115 BLAKE2B 2fcbaab4e73db3cfbf7dea750a0e0782c6cb8bb03c867653a47d2f21cfe369da8e4eff8bf1f0ff548c62909e770132799a927e18f9c732a4d551b97ff6362572 SHA512 bf2b4e1c85e07ad32ed00efa4a56d6b4195b42f4d95c7cb32d8c43d2c5564ac1512155a9f51508d522366c5ce44104f1b076f1addef1147a77ace5a11bd500e6
+DIST nextcloud-client-3.2.2.tar.gz 15398900 BLAKE2B b91c814977486db57b1864f71d3763c64f676449a5547f21bb379154f66a38bc4db355bb16cc6a70781cb45d4a4704f55238dd570f123b450c512bc3e0ce5b3c SHA512 ce6adbb09ee8495448b7da0c5e9637b3c775d28b8ee1656864843264bdacffbc402c9f507ced3e3943896ae25ee73975054b8ffa1577bdd3d32dc453c3f94d74
EBUILD nextcloud-client-2.6.5.ebuild 1951 BLAKE2B bbb143e83a235f27cdd65c5cbbeb3b4bf40938a79e9295802f9d892609c5980ccde188d88a1b482295a40be96e856bce9e4d615dbd93cb65aefc4904924216e6 SHA512 0e1567e43e28299f27c633d7c828a1422aeea689f46422fb10a6a80ae02d4b75dec6542460d86d800fdb9c2dfcf4815a2c69575ecc5db8ff9ab3e863ab0120b6
EBUILD nextcloud-client-3.1.1-r1.ebuild 1974 BLAKE2B aae432b4adb150febaaae576d6f8da55cc0cecdf6bd6ff1552eb8959dca212a3a2a56739155ff8c442f3bf5410e3abfc3f37fc1e7b9066c5048913dad292dfd9 SHA512 8c9e69d4877d92aa36e164a68fbf50dbb6afc066e0851dec7ee659b5f1b091198fc2484bfb0f313c47beed276bfbeffee60ee8aa609b4fb0f7e7b0b4baf33154
EBUILD nextcloud-client-3.1.1.ebuild 1960 BLAKE2B fcd5c84cba55bb4f13b80675bce099b0c2bee12c672f734e8a8bd71f0faa9692d247cc82dbd3deffcae7b3cb63fff38471dbc919154da34ab94ee7d8a10ed44b SHA512 fe549e7480b99e168d4708cea9419cbd474326c56aed705827e020ceed9fef9da94afd65adb29b41d5911c5aaba2cdf57da895616dfd55182ef1dc5f3dcdaa29
EBUILD nextcloud-client-3.1.2.ebuild 1975 BLAKE2B 24632086723d697bc003937c2a71cd30bc51c27fe32e92a9d7e1b29472f932a4f26914c896323ca2ee0ec84e811c9ef27f46a510d9bcc21425ca5ac56913a47e SHA512 6c199a2a6fe7db6da5b238afcc37b0d7e3bd675325198bddac5678cf1426b09df6747fca490bd71c2a13324a93017bb43d4984a8fdc997eb869060993090b308
-EBUILD nextcloud-client-3.1.3.ebuild 1975 BLAKE2B 24632086723d697bc003937c2a71cd30bc51c27fe32e92a9d7e1b29472f932a4f26914c896323ca2ee0ec84e811c9ef27f46a510d9bcc21425ca5ac56913a47e SHA512 6c199a2a6fe7db6da5b238afcc37b0d7e3bd675325198bddac5678cf1426b09df6747fca490bd71c2a13324a93017bb43d4984a8fdc997eb869060993090b308
+EBUILD nextcloud-client-3.1.3.ebuild 1973 BLAKE2B f175a9555be40de2623e5392e99d587a6e5ae2e058964924165c01495be57d42f209c15db261571cc8120587e9be0c04aa5b83293f2d0e7f714fe521a8b6bac9 SHA512 65ec99fb719ec4ebdf0466aa59ac5e9a4ffecaac9a8b94cb2f59a2efadab5ce9e44ec54e574fc818cbb71554828c14b7b1a575ddd97fc881345854045b8931e3
+EBUILD nextcloud-client-3.2.1.ebuild 1987 BLAKE2B 99a990f7413277e794c4c59050bf33bc4ea786955c6c2b65ca1b30f63a7cce3170f85577fd69449c971405a6a96c0a72afde08d12c3a3fa9af9b8615f0fbcaca SHA512 4c5db01203e7c93f2878f549b589d7b2e618b814a403423dfd88de4cc0f6eed0d8328ce64f854d04a4b565665c4df3083b10ce044f4b0e0356f7d69878c087c9
+EBUILD nextcloud-client-3.2.2.ebuild 1987 BLAKE2B 99a990f7413277e794c4c59050bf33bc4ea786955c6c2b65ca1b30f63a7cce3170f85577fd69449c971405a6a96c0a72afde08d12c3a3fa9af9b8615f0fbcaca SHA512 4c5db01203e7c93f2878f549b589d7b2e618b814a403423dfd88de4cc0f6eed0d8328ce64f854d04a4b565665c4df3083b10ce044f4b0e0356f7d69878c087c9
MISC metadata.xml 513 BLAKE2B b63b5116dcf22fc8b7608cf7a13b5749668a139f8e670419733cbcbd44284bb45227d16b9a3d5d50d505440e2d50fff77b98cfe4321afc78b20fd22ab3a495c9 SHA512 491340b64cb8bbeb0efc5cba4de9878aca75231bbfc19b8fdd2de895ed0cacaf154add48cec8964412a68e496f348dc539262afa74b08e38d2d7a27ed220ff5f
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild
index b5b9e96e1fb6..80095a1fb503 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
LICENSE="CC-BY-3.0 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="doc dolphin nautilus test"
COMMON_DEPEND=">=dev-db/sqlite-3.34:3
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.2.1.ebuild
new file mode 100644
index 000000000000..7e82191086ca
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.2.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+ dev-libs/qtkeychain[qt5(+)]
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtquickcontrols2:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwebsockets:5
+ dev-qt/qtwidgets:5
+ sys-libs/zlib
+ dolphin? (
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/kio:5
+ )
+ >=dev-libs/openssl-1.1.0:0=
+ nautilus? ( dev-python/nautilus-python )"
+
+DEPEND="${COMMON_DEPEND}
+ dev-qt/linguist-tools:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtxml:5
+ doc? (
+ dev-python/sphinx
+ dev-tex/latexmk
+ dev-texlive/texlive-latexextra
+ virtual/latex-base
+ )
+ dolphin? ( kde-frameworks/extra-cmake-modules )
+ test? (
+ dev-util/cmocka
+ dev-qt/qttest:5
+ )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+src_prepare() {
+ # Keep tests in ${T}
+ sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+ if ! use nautilus; then
+ pushd shell_integration > /dev/null || die
+ cmake_comment_add_subdirectory nautilus
+ popd > /dev/null || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+ -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+ -DNO_SHIBBOLETH=yes
+ -DBUILD_UPDATER=OFF
+ -DUNIT_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if ! use doc ; then
+ elog "Documentation and man pages not installed"
+ elog "Enable doc USE-flag to generate them"
+ fi
+}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.2.2.ebuild
new file mode 100644
index 000000000000..7e82191086ca
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.2.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+ dev-libs/qtkeychain[qt5(+)]
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtquickcontrols2:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwebsockets:5
+ dev-qt/qtwidgets:5
+ sys-libs/zlib
+ dolphin? (
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/kio:5
+ )
+ >=dev-libs/openssl-1.1.0:0=
+ nautilus? ( dev-python/nautilus-python )"
+
+DEPEND="${COMMON_DEPEND}
+ dev-qt/linguist-tools:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtxml:5
+ doc? (
+ dev-python/sphinx
+ dev-tex/latexmk
+ dev-texlive/texlive-latexextra
+ virtual/latex-base
+ )
+ dolphin? ( kde-frameworks/extra-cmake-modules )
+ test? (
+ dev-util/cmocka
+ dev-qt/qttest:5
+ )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+src_prepare() {
+ # Keep tests in ${T}
+ sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+ if ! use nautilus; then
+ pushd shell_integration > /dev/null || die
+ cmake_comment_add_subdirectory nautilus
+ popd > /dev/null || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+ -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+ -DNO_SHIBBOLETH=yes
+ -DBUILD_UPDATER=OFF
+ -DUNIT_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if ! use doc ; then
+ elog "Documentation and man pages not installed"
+ elog "Enable doc USE-flag to generate them"
+ fi
+}
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 80a6cdd22bef..6e028dba60db 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -8,7 +8,7 @@ AUX ntpsec-1.2.0-move-newfstatat.patch 544 BLAKE2B 877bb058fc2d06c315c086b550118
AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
DIST ntpsec-1.1.9.tar.gz 2606066 BLAKE2B bbc482333c7f86936fa20751df1b427bc24be159969050caf5751e26724714bbf6491b120986563497f015c96ac9cdbdf0e999c6446a68798aff23076f631ecc SHA512 e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b
DIST ntpsec-1.2.0.tar.gz 2625968 BLAKE2B 23ceae5a1f241fcf5a17801fec2f15f9b9d9d64a108bebe29bdc75196303091eaf0efee7df67ce10acefb7c8dba90ce1144a0c0c5432797d7659714d162f26bb SHA512 9e18b3ca2f786a1ea323ba2384b51cff3d862115cea1ae576fc98172c476ac5e7d0d0fc873e47be0b19b050204ea9ed49669d94e66eb94525068dd1b08a8ae71
-EBUILD ntpsec-1.1.9.ebuild 4202 BLAKE2B 1ebc5057450b6540711e2ea2f5b8fb931003d2a48e414cf7d3bb053ca0edecb0c1ef25a98e43d7548ac343e790c28ff1b06a5df8109aca59dac4fba4939491f0 SHA512 2cdbff26ce55200b1c27d21bca50fab17754390a30b51dd755c13448493858f103600b377cbd858c5e601d390d8aaceea9ac11db99b8ddae55b6cd3c00a42fe7
-EBUILD ntpsec-1.2.0-r1.ebuild 4445 BLAKE2B a680005d9aad4391f8df584d76484f22461168229c2ee0519f26e01a166b959b98f3ac92a9ad52ab1f9939f8eeda99ddb3931dc70c90df0f06f5067b6854f7cc SHA512 39e84d394ea3a7e849073b189c814f042387f97dfbe8387be35bf556b247194cd3962311a15346c782cb004cc95b5a186610cc6097a390473f22d81517266894
-EBUILD ntpsec-9999.ebuild 4061 BLAKE2B 8da977b7169633fe0ff502be5972399ab72207bb5b2a3a1d2a469c6b716b501f899814a1f3993a2ec1ceb796cf611cbc5ffe279d60b275465f930d99e643e040 SHA512 a3a122de2ac5e2d16c714599547d9470598f8736d3ee26b8f1adf45f91259ad31ba59feaea4b3b913217a04aae35ba0e3a4adf2bd50653eebe0b873fbc51ac87
+EBUILD ntpsec-1.1.9.ebuild 4204 BLAKE2B 7048ffe57ab11bb95b10a136fca7c84178be03b81ae075d390c4cf90ec7c4efffb250a59d957c7c758efbef8e6ede0b38208775d19e33075f12ce61e17c9df2f SHA512 9bdcfb046201f517b8e1f249146c704e55a73b4649382402ad10bfca1bd7708daaad212fe708ef807ef0bccb8196cc7bcb41e5e2684f14c89fb94605535288ae
+EBUILD ntpsec-1.2.0-r1.ebuild 4443 BLAKE2B b22f287060e4d61410c4bdcec9c2800e648a1e67b72bb154c5452494caddd88fef92d258490a0c9c18f670dafe792f0cb1b90fb29dd6b5e7bcdebf268a5d8f0e SHA512 ed762dea1c5b8f1f7f49d809a4ec3f4fa25f268ce368188797b3cbba2fdab4cbf95ba6eabaf5a89ffb22375cb1b63d3d0334f7a1c216631a5b2f98732ee200f0
+EBUILD ntpsec-9999.ebuild 4063 BLAKE2B a4bd61f498368159597b30b658ee186c14817fba8e0e27c64f2b779457a7b9df1f51c9ac1cf8b3dbb77bfac97bda5678ae0d4c60bb4ee4dd6ae91898e4aa83a5 SHA512 797245b867ba2e9fa33386fb631dff6b4c724862adf5d92e85b8ea4ae47bc9a9fc104bd99f85d7f1bb64e51fbf5d11bf16dee382ff435650463d19484103d0b7
MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/ntpsec-1.1.9.ebuild b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
index 0cfaff72ab52..f92de0e4f1d9 100644
--- a/net-misc/ntpsec/ntpsec-1.1.9.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_REQ_USE='threads(+)'
inherit flag-o-matic python-r1 waf-utils systemd
diff --git a/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild
index efc382f1edd9..1032524529cf 100644
--- a/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
else
SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
RESTRICT="mirror"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~x86"
fi
DESCRIPTION="The NTP reference implementation, refactored"
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 361635d422b3..7833fafd9711 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_REQ_USE='threads(+)'
inherit flag-o-matic python-r1 waf-utils systemd
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index e9f2167e6b32..6dfeebc6f482 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -4,13 +4,7 @@ AUX openssh-7.9_p1-include-stdlib.patch 914 BLAKE2B 9c7eb79f87ecd657a80821dfa979
AUX openssh-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch 977 BLAKE2B b2e28683176c4678f51a9a0be3e29496620ac795c7de4649fb3cc0bd076682e42bc1c606b17a76e140f51319e4c4a1cc890c3a37c4bc3cf9222a88e31b8a773f SHA512 8c2567ae16dccc73e302ba90c1bb03e19d4afc3892dd8e1636d7c8853932662eccbda3957e4db55a21bd37d2e65abe74b0b2c1efb74e31751335eb523759d945
AUX openssh-8.0_p1-fix-putty-tests.patch 1760 BLAKE2B a1127e8f2275c1e23c956b5041dbc84dbdb2cd6b788fc69bfc1f6b030afe86a827483602ce76577b4101ee2e790b1cfa8c1d2db09da59b89fe7df8083bf4695f SHA512 f544d818bdde628131f1819bf2ffb4007802ee5bf12c5cd5bd398efe0f0f430ed6b3efa7969cb2c4fa49a2bbd773d8fa09f4c927cf998a564b7611443437c310
AUX openssh-8.0_p1-hpn-version.patch 590 BLAKE2B 1ff20ab17e7e1a20f7a96ded56ff7c059fd509d7773d9abaeac83743102385d9713284c630dc932d40672a9bfc8a894b57c6b073e93a7b024de7490ea54a589c SHA512 37250881f17a44e4a4b0ac164d06961e0731528847d5cbbb263e3f9a286a192c8dae92250b85db3f2e1f280a464c7b3bfc8a7c9e85552375c013e16a6fcf28ed
-AUX openssh-8.2_p1-GSSAPI-dns.patch 11647 BLAKE2B b904922f809a6616f488509a962c778837bc6003138efe79fb1ce9edf9611f14c209c11559a922497c50c3dff450286e40dfcb929414cb7f705357d2c4e3603d SHA512 f9256a80c75ae0db11df0e562ace026614f2f6d0f6c91eaed7786b2a3c37608e18ca45242385813fa34487e50f21e5d3a13bfb66adc854b7c34d278a164c3dc4
AUX openssh-8.3_p1-sha2-include.patch 370 BLAKE2B 3d9ee891d9d647f4ff3b42d47cae4c7a32533bce917b35101fd3c5549717a6b285423894b3372ecb6983d4425c712f4b0590fc95799fd521523d9d74860863c6 SHA512 a1edda5dc43af79e9e4e7d3bcd78cc1c2dbf40e94f22189022dcaf1107c8f2cb2a37c949af5955144f6ada210417a695fe0c4d05d52ba2dbafb1dddf6a1bac3f
-AUX openssh-8.4_p1-X509-glue-12.6.patch 1524 BLAKE2B de9de289b7a401726f92df2e23750df1cb26b3cc9595f1f2db7d74ffacbf4ca2a723d270ffbd0a085d44674375247f34efe04bbbd8150e67a82b6b96b8786065 SHA512 7b301e672cea87ecee89ed1eaea44ac35e2d8395696d7456690308ba1dfe671144488c7b9c79f5a238e2242eae54bca6abadd1ae448ac70cab976930f4ad5f4d
-AUX openssh-8.4_p1-fix-ssh-copy-id.patch 1070 BLAKE2B 2928bc4fbef7d70f57d1f77f4e79238dbe4b640ee891aae94ee767de98fbb04a9421bd9e071771c6d1f9818695ba329058284469ce2f01704b05351989274a1b SHA512 d6088a20e3d4cb597ca99c29fd761e06c16b8a54e7e5d0fa63a07f814fd21e831e0e5e4e3c643b99fe10e536ed98ef5f8179cab2ac79bc44e725327b8d5d5dba
-AUX openssh-8.4_p1-hpn-14.22-X509-glue.patch 4462 BLAKE2B ca35715fd95ec872e39964b499a6415065b291aa25695cc001add8da7687b73700e2c6735e1da21997fac2e31b0767b5cd44d3fcee72f4b5291546034acb1238 SHA512 e61e814646580c59a7acc7dce48250baa0c968869397582a8311ad8138180fbc3154a0bbf056c28ab7d488acf57c7dd0b3c3094bd7e9d78f5a67fdb6e195d064
-AUX openssh-8.4_p1-hpn-14.22-glue.patch 3335 BLAKE2B f5b179aaa82c17f820cdc057de4dbb832bb944668a35d37dc9ca6a390a5d3537026f816e7cb73f9474baa77f81b459af7933d0349eba9585aa9f50139f1d588c SHA512 9b1dff1150230353e7fae31a737b9d1090d3a2017ca04fdc510043fbfb962790b489204e7195f9feff0f4f16732d61ee5804b212776addee6caf7409bb9af017
-AUX openssh-8.4_p1-hpn-14.22-sctp-glue.patch 733 BLAKE2B 3262f5293611579202b31540eb4ff6bf24be5bd09a93d10f693b173b61eff371cce0be4ecea2ba873c7d5b250a73c032684345b53a41c369f2a5663ad15ecd41 SHA512 b39a5d76558af51db0e9b1daeaaab3d906a4c941886f8016fb7e5e89177fcd5c81904cb5b3c4d0d5935240bee43d4433ad42495f1aa21771e90013ab7726b6fe
AUX openssh-8.5_p1-GSSAPI-dns.patch 11631 BLAKE2B 9ed39b04f320612f166b091979a21e7765d19afc3947a95dd3019da25eefcad32fcf2a3f17813441fce87cc03a28e0a52ac1aad3ac4b5b7ecdf3f4f8c391ba4a SHA512 d28f7df54af4cc998e1978a6c0fcb28f88affaad4a347084e429549bc0f74347dd8ad79c0ced0ca5a739e2c3cc19f6516aeb678f3a9709c40f1d0fa16d93b9e4
AUX openssh-8.5_p1-X509-glue-13.0.1.patch 2714 BLAKE2B 03a00a1b9c62d75688706e3f4950510bafea6ae524a3bdbd08a7f059663eae3ff386ffa1ea1edfbf3349231a53b314625778043f39bb52395ffe9ef2a45a8400 SHA512 1ddf7c62ff3e73278a88f9afe5085c4101ef2cae4383cfa7bddc90403db5ea2c9c0fc630d31dc72072c4c008034f02b30cfea149aeb95e70c74292f3b978471b
AUX openssh-8.5_p1-X509-glue-13.0.patch 2773 BLAKE2B f6bfe7a9986a0804eacb83bd61718b2fb5c52b26740441878cadadcd4773abb7a9f441f9263a704c13de5e25c614d989010b6806bde43b767ae892e68733087d SHA512 27894c3a76ce7483585975b41e7b3a64b8e896daaaf958738f8cd4081d4ff0884d945beb11f9e2ae12b87532d9a30bd642e4442db3ced2cf8747c60459752aec
@@ -30,27 +24,15 @@ AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391a
AUX sshd.service 259 BLAKE2B e65ea7227658295584c3fdee3bf46f098c1c5a53a0b433e88ae8d43f0823fade25846a5f3abbacf939a13af8195a888d0ffb937e8da943478e76eea7c0e13c82 SHA512 9656ae4c045ba47ad28f983e50d1119d51c1d0a7471fe8e792d6f734a71c8d4d900431b591f2f40bb8af3a382e6215933ae32eff56de6da0f2f166d6fb855987
AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42
AUX sshd_at.service 177 BLAKE2B 0e78184f58cb4c68fb834953fac3ce01f9e39e9eb1a84c03f720205f5b611365c9a48fba445962c06c7e18bdb310cdb9ffe4fc49e95f69608922d224b00c890b SHA512 423120ea2e1ac0b92575ce4eb05347483f902238dc104848e74088f49483c37d30c27364e7fe8599b3e85562159c69284ecf25a4c5394b4cfa18c5c77c6beacd
-DIST openssh-8.4p1+x509-12.6.diff.gz 857479 BLAKE2B ac8c3e8c1087ca571e5459c9826903410ff2d45de60151d9bd8e59da15805b75752f8f3ffc231c9f8aaa8f2b2c07a97a8296684f885e0d14b54ff5d7bc585588 SHA512 e56516b376ecc3e5464895744ce0616cf4446a891fbd3cbcb090d5f61ebc349d74f9c01e855ccd22e574dbfeec0cb2ba7daf582983010ff991243a6371cc5fe3
-DIST openssh-8.4p1-sctp-1.2.patch.xz 7668 BLAKE2B 2e22d2a90723cea9ef958bd989b8c431fcb08b4dc5bfd3ebbf463ca9546dc37acdc185c35ddf3adbb90bde9b3902bf36524a456061a9bcbdef7a76ece79e2ff4 SHA512 90da34b7b86e52df9e0191c99c9d645a4d4671958adebeed46e1149102d4ba8c729eadb79d84fad9feac64aafa0541d2f1f4db8cdfe0af5ba893aac072ef2380
-DIST openssh-8.4p1.tar.gz 1742201 BLAKE2B 4b1e60d4962095df045c3a31bbf8af725b1c07324c4aa1f6b9a3ddb7e695c98e9aa01655b268f6fd6a400f511b23be91f6b89d07b14a6a2d92f873efb4d9c146 SHA512 d65275b082c46c5efe7cf3264fa6794d6e99a36d4a54b50554fc56979d6c0837381587fd5399195e1db680d2a5ad1ef0b99a180eac2b4de5637906cb7a89e9ce
DIST openssh-8.5p1+x509-13.0.1.diff.gz 997005 BLAKE2B b6cdc9ba12dc642c7073463fb8b153a32019e8bc4c1778c2371d89cdc8d9b43e86523d0c03ebeeafa7004a16ad46dfbc18b338bf95f46101d8865709d45aa6b0 SHA512 b0247885d3a0718eb4df123c552f9e95ad9ffd55f96189aca35006c23d76ec76b28420cac4d7b2167c07f2e0a0652edfa20c2ce60aea3f7607a1e747f836ff91
-DIST openssh-8.5p1+x509-13.0.diff.gz 996872 BLAKE2B 136937e4e65e5e73d1d1b596ae6188f359daa8e95aafd57fab8cf947b59fde573ff4e6259781d1a0fd89718d14469ca4aed01bae6f37cc16df109c673fa2c73c SHA512 2276b0ac577162f7f6a56115637636a6eaaa8b3cc06e5ef053ec06e00a7c3459efe8de8dbc5f55c9f6a192534e2f7c8c7064fcdbf56d28b628bb301c5072802c
DIST openssh-8.5p1-sctp-1.2.patch.xz 7692 BLAKE2B 298bf5e2004fd864bdbb6d6f354d1fbcb7052a9caaf8e39863b840a7af8e31f87790f6aa10ae84df177d450bb34a43c4a3aa87d7472e2505d727757c016ce92b SHA512 84990f95e22c90dbc4d04d47ea88b761ff1d0101018661ff2376ac2a726b5fca43f1b5f5d926ccbe1c8d0143ac36b104616bd1a6b5dcdba4addf48a5dd196e2b
DIST openssh-8.5p1.tar.gz 1779733 BLAKE2B f4e4bd39e2dd275d4811e06ca994f2239ad27c804b003c74cc26f9dffae28f1b4006fc618580f0dc9c45f0b7361c24728c23688b45f41cb8a15cf6206c3f15c3 SHA512 af9c34d89170a30fc92a63973e32c766ed4a6d254bb210e317c000d46913e78d0c60c7befe62d993d659be000b828b9d4d3832fc40df1c3d33850aaa6293846f
DIST openssh-8.6p1+x509-13.1.diff.gz 1011666 BLAKE2B 0ac0cf2ff962b8ef677c49de0bb586f375f14d8964e077c10f6a88ec15734807940ab6c0277e44ebdfde0e50c2c80103cff614a6cde4d66e9986152032eeaa90 SHA512 ae4986dd079678c7b0cfd805136ff7ac940d1049fdddeb5a7c4ea2141bfcca70463b951485fb2b113bc930f519b1b41562900ced0269f5673dbdad867f464251
DIST openssh-8.6p1-sctp-1.2.patch.xz 7696 BLAKE2B 37f9e943a1881af05d9cf2234433711dc45ca30c60af4c0ea38a1d361df02abb491fa114f3698285f582b40b838414c1a048c4f09aa4f7ae9499adb09201d2ac SHA512 ba8c4d38a3d90854e79dc18918fffde246d7609a3f1c3a35e06c0fbe33d3688ed29b0ec33556ae37d1654e1dc2133d892613ad8d1ecbdce9aaa5b9eb10dcbb7a
DIST openssh-8.6p1.tar.gz 1786328 BLAKE2B 261a0f1a6235275894d487cce37537755c86835e3a34871462fe29bfe72b49cd9a6b6a547aea4bd554f0957e110c84458cc75a5f2560717fb04804d62228562a SHA512 9854eda0b773c64c9f1f74844ce466b2b42ee8845f58ad062b73141d617af944fa4ebafdf72069f400106d2c2bd0a69c92fe805ec1fc26d4f0faadf06c3fbbe6
-DIST openssh-8_3_P1-hpn-AES-CTR-14.22.diff 29963 BLAKE2B 19b82f4ff820f52dafaa5b3f09f8a0a67f318771c1c7276b9d37e4a6412052c9c53347f880f2d78981af3830432704b9ad74b375241965326530ae23ec8d74a2 SHA512 49f2778831dc768850870a1755da9cdd7d3bc83fa87069070f5a1d357ce9bdadeb2506c8ff3c6b055708da12a70e9ede7ed0e8a29fcab441abb55c9d483663be
-DIST openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff 42783 BLAKE2B 10940c35ae6bdc33e58bc9abd9cd7a551d4ca76a175400acb872906805bd04d384f57e81049b183d7d892ce1b5f7a138e197366369fe12e5c9dc1349850b0582 SHA512 c09162b96e0ffadc59c6076507bc843e6f8f2fb372140b84181f5fb2894225b1e05a831d85ba689c35c322b5a99302b9db77c324f978f1a46a16b185b3cb28dd
-DIST openssh-8_3_P1-hpn-PeakTput-14.22.diff 2012 BLAKE2B 701f46da022e7ecf35b57f41bf5682a37be453c175928d3ff3df09292275e6021f6108a20c02eec9d636e85ee5a8e05b7233ada180edf1209a3dc4b139d58858 SHA512 026f65c62e4c05b69661094d41bf338df608e2a9b23ef95588062e3bd68729733dae32adab783609a6eca810ccdcbddee25e7649a534c9a283a03282f73438bb
-DIST openssh-8_4_P1-hpn-AES-CTR-15.1.diff 29966 BLAKE2B 79dea4e16ffdda329131eb48a3c3dd40e167e5c6fa4dd2beb6c67e7e4f17a45c6645e84dcdc97baae90215a802cd1d723dfd88c981b1db826f61fca0a4e92ae1 SHA512 cdb7aa5737a1527d83ffa747d17ae997a64b7bc16e198d0721b690e5932446d30ba4129c122be2a457f261be7a11d944ef49ba2450ce90f552daab508b0c980b
-DIST openssh-8_4_P1-hpn-DynWinNoneSwitch-15.1.diff 51327 BLAKE2B 6879df5bfb4c07c44b41620bd49433591711edb08ad6b5c09af8a5f754ca09f3ff6a066ffac3210fdad6dee47710221dca0a3dc47b919498ec6939b42a073418 SHA512 1e6471e88783acf764186577a767ea7c2071bcab1b803c18288f70166d87471703b332dae3bdcaf4318039089caebfba46e5b6da218912eff1103bd03d736a60
-DIST openssh-8_4_P1-hpn-PeakTput-15.1.diff 2429 BLAKE2B fc2140f4036ef57b7093696680b6e157c78bb431af9bc9e75f223c2b13693f0ec2ad214fbf6b2ba0059cbf3690a93235559f07b46dabd056d65ae1fc9d7418f0 SHA512 99801a743da8f108dcf883bc216f2abd3fc3071617566b83eb07b6627ed657cccf0ea93ea2a70eff1050a34a0e635e732665c5583e8aa35968fdeb839f837b63
DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
-EBUILD openssh-8.4_p1-r3.ebuild 17681 BLAKE2B e3c13a7180491d36b97c3eafd3ded74b2535b065fd84fde9cbe2d9d0ca2183b2e22e659aaf9ae746346bd9be88f6531dd25fa3d1937f6a06761ce312f01ec8b6 SHA512 e66fa10dc28713a9e7fb8a3d5b3303973e9acc33b89c589bbab09c9bee8a29ab2a80791a31a371b6b5224ff9fa09de389432e4ecefb93f8c4ac2bc5c1181ec6a
EBUILD openssh-8.5_p1-r1.ebuild 17572 BLAKE2B 8d25dca2f0af588bc56ced2b452f9b136514dec2e4dd270594c3c123eb07fecd4d51988bd23aa51d10350950c3f3856d4e4efd8f3fb43bae08127f38ea052f7f SHA512 15536c564e4855885d6a4aee15d1634666b15d827cb6aa8f5a98bc98cf39b1a62810120a10005eb8e8a5ecd855491359499a83bfb845ea67a92289237aa1378f
-EBUILD openssh-8.5_p1.ebuild 17587 BLAKE2B 0b69f26bb8917d041c08bac69401dbf45ab60bec22e552b619126dc0f73a70a49d8deabe152b890bae9e9776a05b238ff73ea144d27a5016cc1a47e58c3c7957 SHA512 a7813cdb227e57b39ce538268faaa9361ceab1c3e005d01027995e7c29ad293ec29344de2efd7e300d7389a1a2e0e5b0bb6993c360bceeb7a9d1002955ce8a12
-EBUILD openssh-8.6_p1-r1.ebuild 17654 BLAKE2B 39539eecb1ffb9c8e5c01a6c5063812fc2d90a06f231258148bbb9160b0e35473e7e1e020be300e87c803b577db872c1022aafd8c9d3efcf55ef03fd4511666e SHA512 a9f9bf2d3aa91eb083b3c488894ebbfbe107f6bd8afad26cf64be5250c9abc1d9104d22aff9d19ea6a1aeaebe80c224299b04058d9602afa3a3c4e850e30baf3
+EBUILD openssh-8.6_p1-r1.ebuild 17646 BLAKE2B fc8f41a3d4a8b4f80cc02e091c1bbf3e2bea39c48e142c41e5c532ad443585f4067eed6f1c4030eef73f8218aa32717d71e6f653422873df14dc4fc20817e4c2 SHA512 97d588fc6f41964ab670cb44e733eb436fca898d672a252e0249595c8a30dca40ab1f215545658caf628d1bc33a9d717ed005664f4bc94eca508e9b4f4186973
MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f
diff --git a/net-misc/openssh/files/openssh-8.2_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-8.2_p1-GSSAPI-dns.patch
deleted file mode 100644
index d4db77b98557..000000000000
--- a/net-misc/openssh/files/openssh-8.2_p1-GSSAPI-dns.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-diff --git a/auth.c b/auth.c
-index 086b8ebb..a267353c 100644
---- a/auth.c
-+++ b/auth.c
-@@ -724,120 +724,6 @@ fakepw(void)
- return (&fake);
- }
-
--/*
-- * Returns the remote DNS hostname as a string. The returned string must not
-- * be freed. NB. this will usually trigger a DNS query the first time it is
-- * called.
-- * This function does additional checks on the hostname to mitigate some
-- * attacks on legacy rhosts-style authentication.
-- * XXX is RhostsRSAAuthentication vulnerable to these?
-- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
-- */
--
--static char *
--remote_hostname(struct ssh *ssh)
--{
-- struct sockaddr_storage from;
-- socklen_t fromlen;
-- struct addrinfo hints, *ai, *aitop;
-- char name[NI_MAXHOST], ntop2[NI_MAXHOST];
-- const char *ntop = ssh_remote_ipaddr(ssh);
--
-- /* Get IP address of client. */
-- fromlen = sizeof(from);
-- memset(&from, 0, sizeof(from));
-- if (getpeername(ssh_packet_get_connection_in(ssh),
-- (struct sockaddr *)&from, &fromlen) == -1) {
-- debug("getpeername failed: %.100s", strerror(errno));
-- return xstrdup(ntop);
-- }
--
-- ipv64_normalise_mapped(&from, &fromlen);
-- if (from.ss_family == AF_INET6)
-- fromlen = sizeof(struct sockaddr_in6);
--
-- debug3("Trying to reverse map address %.100s.", ntop);
-- /* Map the IP address to a host name. */
-- if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
-- NULL, 0, NI_NAMEREQD) != 0) {
-- /* Host name not found. Use ip address. */
-- return xstrdup(ntop);
-- }
--
-- /*
-- * if reverse lookup result looks like a numeric hostname,
-- * someone is trying to trick us by PTR record like following:
-- * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5
-- */
-- memset(&hints, 0, sizeof(hints));
-- hints.ai_socktype = SOCK_DGRAM; /*dummy*/
-- hints.ai_flags = AI_NUMERICHOST;
-- if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
-- logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
-- name, ntop);
-- freeaddrinfo(ai);
-- return xstrdup(ntop);
-- }
--
-- /* Names are stored in lowercase. */
-- lowercase(name);
--
-- /*
-- * Map it back to an IP address and check that the given
-- * address actually is an address of this host. This is
-- * necessary because anyone with access to a name server can
-- * define arbitrary names for an IP address. Mapping from
-- * name to IP address can be trusted better (but can still be
-- * fooled if the intruder has access to the name server of
-- * the domain).
-- */
-- memset(&hints, 0, sizeof(hints));
-- hints.ai_family = from.ss_family;
-- hints.ai_socktype = SOCK_STREAM;
-- if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
-- logit("reverse mapping checking getaddrinfo for %.700s "
-- "[%s] failed.", name, ntop);
-- return xstrdup(ntop);
-- }
-- /* Look for the address from the list of addresses. */
-- for (ai = aitop; ai; ai = ai->ai_next) {
-- if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
-- sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
-- (strcmp(ntop, ntop2) == 0))
-- break;
-- }
-- freeaddrinfo(aitop);
-- /* If we reached the end of the list, the address was not there. */
-- if (ai == NULL) {
-- /* Address not found for the host name. */
-- logit("Address %.100s maps to %.600s, but this does not "
-- "map back to the address.", ntop, name);
-- return xstrdup(ntop);
-- }
-- return xstrdup(name);
--}
--
--/*
-- * Return the canonical name of the host in the other side of the current
-- * connection. The host name is cached, so it is efficient to call this
-- * several times.
-- */
--
--const char *
--auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
--{
-- static char *dnsname;
--
-- if (!use_dns)
-- return ssh_remote_ipaddr(ssh);
-- else if (dnsname != NULL)
-- return dnsname;
-- else {
-- dnsname = remote_hostname(ssh);
-- return dnsname;
-- }
--}
--
- /*
- * Runs command in a subprocess with a minimal environment.
- * Returns pid on success, 0 on failure.
-diff --git a/canohost.c b/canohost.c
-index abea9c6e..4f4524d2 100644
---- a/canohost.c
-+++ b/canohost.c
-@@ -202,3 +202,117 @@ get_local_port(int sock)
- {
- return get_sock_port(sock, 1);
- }
-+
-+/*
-+ * Returns the remote DNS hostname as a string. The returned string must not
-+ * be freed. NB. this will usually trigger a DNS query the first time it is
-+ * called.
-+ * This function does additional checks on the hostname to mitigate some
-+ * attacks on legacy rhosts-style authentication.
-+ * XXX is RhostsRSAAuthentication vulnerable to these?
-+ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
-+ */
-+
-+static char *
-+remote_hostname(struct ssh *ssh)
-+{
-+ struct sockaddr_storage from;
-+ socklen_t fromlen;
-+ struct addrinfo hints, *ai, *aitop;
-+ char name[NI_MAXHOST], ntop2[NI_MAXHOST];
-+ const char *ntop = ssh_remote_ipaddr(ssh);
-+
-+ /* Get IP address of client. */
-+ fromlen = sizeof(from);
-+ memset(&from, 0, sizeof(from));
-+ if (getpeername(ssh_packet_get_connection_in(ssh),
-+ (struct sockaddr *)&from, &fromlen) < 0) {
-+ debug("getpeername failed: %.100s", strerror(errno));
-+ return strdup(ntop);
-+ }
-+
-+ ipv64_normalise_mapped(&from, &fromlen);
-+ if (from.ss_family == AF_INET6)
-+ fromlen = sizeof(struct sockaddr_in6);
-+
-+ debug3("Trying to reverse map address %.100s.", ntop);
-+ /* Map the IP address to a host name. */
-+ if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
-+ NULL, 0, NI_NAMEREQD) != 0) {
-+ /* Host name not found. Use ip address. */
-+ return strdup(ntop);
-+ }
-+
-+ /*
-+ * if reverse lookup result looks like a numeric hostname,
-+ * someone is trying to trick us by PTR record like following:
-+ * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5
-+ */
-+ memset(&hints, 0, sizeof(hints));
-+ hints.ai_socktype = SOCK_DGRAM; /*dummy*/
-+ hints.ai_flags = AI_NUMERICHOST;
-+ if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
-+ logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
-+ name, ntop);
-+ freeaddrinfo(ai);
-+ return strdup(ntop);
-+ }
-+
-+ /* Names are stored in lowercase. */
-+ lowercase(name);
-+
-+ /*
-+ * Map it back to an IP address and check that the given
-+ * address actually is an address of this host. This is
-+ * necessary because anyone with access to a name server can
-+ * define arbitrary names for an IP address. Mapping from
-+ * name to IP address can be trusted better (but can still be
-+ * fooled if the intruder has access to the name server of
-+ * the domain).
-+ */
-+ memset(&hints, 0, sizeof(hints));
-+ hints.ai_family = from.ss_family;
-+ hints.ai_socktype = SOCK_STREAM;
-+ if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
-+ logit("reverse mapping checking getaddrinfo for %.700s "
-+ "[%s] failed.", name, ntop);
-+ return strdup(ntop);
-+ }
-+ /* Look for the address from the list of addresses. */
-+ for (ai = aitop; ai; ai = ai->ai_next) {
-+ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
-+ sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
-+ (strcmp(ntop, ntop2) == 0))
-+ break;
-+ }
-+ freeaddrinfo(aitop);
-+ /* If we reached the end of the list, the address was not there. */
-+ if (ai == NULL) {
-+ /* Address not found for the host name. */
-+ logit("Address %.100s maps to %.600s, but this does not "
-+ "map back to the address.", ntop, name);
-+ return strdup(ntop);
-+ }
-+ return strdup(name);
-+}
-+
-+/*
-+ * Return the canonical name of the host in the other side of the current
-+ * connection. The host name is cached, so it is efficient to call this
-+ * several times.
-+ */
-+
-+const char *
-+auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
-+{
-+ static char *dnsname;
-+
-+ if (!use_dns)
-+ return ssh_remote_ipaddr(ssh);
-+ else if (dnsname != NULL)
-+ return dnsname;
-+ else {
-+ dnsname = remote_hostname(ssh);
-+ return dnsname;
-+ }
-+}
-diff --git a/readconf.c b/readconf.c
-index f3cac6b3..adfd7a4e 100644
---- a/readconf.c
-+++ b/readconf.c
-@@ -160,6 +160,7 @@ typedef enum {
- oClearAllForwardings, oNoHostAuthenticationForLocalhost,
- oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
- oAddressFamily, oGssAuthentication, oGssDelegateCreds,
-+ oGssTrustDns,
- oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
- oSendEnv, oSetEnv, oControlPath, oControlMaster, oControlPersist,
- oHashKnownHosts,
-@@ -205,9 +206,11 @@ static struct {
- #if defined(GSSAPI)
- { "gssapiauthentication", oGssAuthentication },
- { "gssapidelegatecredentials", oGssDelegateCreds },
-+ { "gssapitrustdns", oGssTrustDns },
- # else
- { "gssapiauthentication", oUnsupported },
- { "gssapidelegatecredentials", oUnsupported },
-+ { "gssapitrustdns", oUnsupported },
- #endif
- #ifdef ENABLE_PKCS11
- { "pkcs11provider", oPKCS11Provider },
-@@ -1033,6 +1036,10 @@ parse_time:
- intptr = &options->gss_deleg_creds;
- goto parse_flag;
-
-+ case oGssTrustDns:
-+ intptr = &options->gss_trust_dns;
-+ goto parse_flag;
-+
- case oBatchMode:
- intptr = &options->batch_mode;
- goto parse_flag;
-@@ -1912,6 +1919,7 @@ initialize_options(Options * options)
- options->challenge_response_authentication = -1;
- options->gss_authentication = -1;
- options->gss_deleg_creds = -1;
-+ options->gss_trust_dns = -1;
- options->password_authentication = -1;
- options->kbd_interactive_authentication = -1;
- options->kbd_interactive_devices = NULL;
-@@ -2061,6 +2069,8 @@ fill_default_options(Options * options)
- options->gss_authentication = 0;
- if (options->gss_deleg_creds == -1)
- options->gss_deleg_creds = 0;
-+ if (options->gss_trust_dns == -1)
-+ options->gss_trust_dns = 0;
- if (options->password_authentication == -1)
- options->password_authentication = 1;
- if (options->kbd_interactive_authentication == -1)
-diff --git a/readconf.h b/readconf.h
-index feedb3d2..c7139c1b 100644
---- a/readconf.h
-+++ b/readconf.h
-@@ -42,6 +42,7 @@ typedef struct {
- /* Try S/Key or TIS, authentication. */
- int gss_authentication; /* Try GSS authentication */
- int gss_deleg_creds; /* Delegate GSS credentials */
-+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */
- int password_authentication; /* Try password
- * authentication. */
- int kbd_interactive_authentication; /* Try keyboard-interactive auth. */
-diff --git a/ssh_config.5 b/ssh_config.5
-index 06a32d31..6871ff36 100644
---- a/ssh_config.5
-+++ b/ssh_config.5
-@@ -770,6 +770,16 @@ The default is
- Forward (delegate) credentials to the server.
- The default is
- .Cm no .
-+Note that this option applies to protocol version 2 connections using GSSAPI.
-+.It Cm GSSAPITrustDns
-+Set to
-+.Dq yes to indicate that the DNS is trusted to securely canonicalize
-+the name of the host being connected to. If
-+.Dq no, the hostname entered on the
-+command line will be passed untouched to the GSSAPI library.
-+The default is
-+.Dq no .
-+This option only applies to protocol version 2 connections using GSSAPI.
- .It Cm HashKnownHosts
- Indicates that
- .Xr ssh 1
-diff --git a/sshconnect2.c b/sshconnect2.c
-index af00fb30..652463c5 100644
---- a/sshconnect2.c
-+++ b/sshconnect2.c
-@@ -716,6 +716,13 @@ userauth_gssapi(struct ssh *ssh)
- OM_uint32 min;
- int r, ok = 0;
- gss_OID mech = NULL;
-+ const char *gss_host;
-+
-+ if (options.gss_trust_dns) {
-+ extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns);
-+ gss_host = auth_get_canonical_hostname(ssh, 1);
-+ } else
-+ gss_host = authctxt->host;
-
- /* Try one GSSAPI method at a time, rather than sending them all at
- * once. */
-@@ -730,7 +737,7 @@ userauth_gssapi(struct ssh *ssh)
- elements[authctxt->mech_tried];
- /* My DER encoding requires length<128 */
- if (mech->length < 128 && ssh_gssapi_check_mechanism(&gssctxt,
-- mech, authctxt->host)) {
-+ mech, gss_host)) {
- ok = 1; /* Mechanism works */
- } else {
- authctxt->mech_tried++;
diff --git a/net-misc/openssh/files/openssh-8.4_p1-X509-glue-12.6.patch b/net-misc/openssh/files/openssh-8.4_p1-X509-glue-12.6.patch
deleted file mode 100644
index f12a3096b64a..000000000000
--- a/net-misc/openssh/files/openssh-8.4_p1-X509-glue-12.6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -u a/openssh-8.4p1+x509-12.6.diff b/openssh-8.4p1+x509-12.6.diff
---- a/openssh-8.4p1+x509-12.6.diff 2020-10-04 10:58:16.980495330 -0700
-+++ b/openssh-8.4p1+x509-12.6.diff 2020-10-04 11:02:31.951966223 -0700
-@@ -39348,12 +39348,11 @@
-
- install-files:
- $(MKDIR_P) $(DESTDIR)$(bindir)
--@@ -384,6 +365,8 @@
-+@@ -384,6 +365,7 @@
- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
- $(MKDIR_P) $(DESTDIR)$(libexecdir)
- + $(MKDIR_P) $(DESTDIR)$(sshcadir)
--+ $(MKDIR_P) $(DESTDIR)$(piddir)
- $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
- $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
- $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
-@@ -103950,16 +103949,6 @@
- +int asnmprintf(char **, size_t, int *, const char *, ...)
- __attribute__((format(printf, 4, 5)));
- void msetlocale(void);
--diff -ruN openssh-8.4p1/version.h openssh-8.4p1+x509-12.6/version.h
----- openssh-8.4p1/version.h 2020-09-27 10:25:01.000000000 +0300
--+++ openssh-8.4p1+x509-12.6/version.h 2020-10-03 10:07:00.000000000 +0300
--@@ -2,5 +2,4 @@
--
-- #define SSH_VERSION "OpenSSH_8.4"
--
---#define SSH_PORTABLE "p1"
---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
--+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1"
- diff -ruN openssh-8.4p1/version.m4 openssh-8.4p1+x509-12.6/version.m4
- --- openssh-8.4p1/version.m4 1970-01-01 02:00:00.000000000 +0200
- +++ openssh-8.4p1+x509-12.6/version.m4 2020-10-03 10:07:00.000000000 +0300
diff --git a/net-misc/openssh/files/openssh-8.4_p1-fix-ssh-copy-id.patch b/net-misc/openssh/files/openssh-8.4_p1-fix-ssh-copy-id.patch
deleted file mode 100644
index 32713d43ff32..000000000000
--- a/net-misc/openssh/files/openssh-8.4_p1-fix-ssh-copy-id.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d9e727dcc04a52caaac87543ea1d230e9e6b5604 Mon Sep 17 00:00:00 2001
-From: Oleg <Fallmay@users.noreply.github.com>
-Date: Thu, 1 Oct 2020 12:09:08 +0300
-Subject: [PATCH] Fix `EOF: command not found` error in ssh-copy-id
-
----
- contrib/ssh-copy-id | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
-index 392f64f94..a76907717 100644
---- a/contrib/ssh-copy-id
-+++ b/contrib/ssh-copy-id
-@@ -247,7 +247,7 @@ installkeys_sh() {
- # the -z `tail ...` checks for a trailing newline. The echo adds one if was missing
- # the cat adds the keys we're getting via STDIN
- # and if available restorecon is used to restore the SELinux context
-- INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF)
-+ INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF
- cd;
- umask 077;
- mkdir -p $(dirname "${AUTH_KEY_FILE}") &&
-@@ -258,6 +258,7 @@ installkeys_sh() {
- restorecon -F .ssh ${AUTH_KEY_FILE};
- fi
- EOF
-+ )
-
- # to defend against quirky remote shells: use 'exec sh -c' to get POSIX;
- printf "exec sh -c '%s'" "${INSTALLKEYS_SH}"
diff --git a/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-X509-glue.patch b/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-X509-glue.patch
deleted file mode 100644
index 9bd600b6a1cc..000000000000
--- a/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-X509-glue.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -u a/openssh-8_3_P1-hpn-AES-CTR-14.22.diff b/openssh-8_3_P1-hpn-AES-CTR-14.22.diff
---- a/openssh-8_3_P1-hpn-AES-CTR-14.22.diff 2020-10-04 11:04:44.495171346 -0700
-+++ b/openssh-8_3_P1-hpn-AES-CTR-14.22.diff 2020-10-04 11:48:05.099637206 -0700
-@@ -3,9 +3,9 @@
- --- a/Makefile.in
- +++ b/Makefile.in
- @@ -46,7 +46,7 @@ CFLAGS=@CFLAGS@
-- CFLAGS_NOPIE=@CFLAGS_NOPIE@
-- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
-- PICFLAG=@PICFLAG@
-+ LD=@LD@
-+ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA)
-+ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
- -LIBS=@LIBS@
- +LIBS=@LIBS@ -lpthread
- K5LIBS=@K5LIBS@
-@@ -803,7 +803,7 @@
- ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
- {
- struct session_state *state;
--- const struct sshcipher *none = cipher_by_name("none");
-+- const struct sshcipher *none = cipher_none();
- + struct sshcipher *none = cipher_by_name("none");
- int r;
-
-@@ -901,17 +901,18 @@
- }
-
- /*
--@@ -2203,6 +2210,10 @@ fill_default_options(Options * options)
-+@@ -2203,5 +2210,10 @@ fill_default_options(Options * options)
- if (options->sk_provider == NULL)
- options->sk_provider = xstrdup("$SSH_SK_PROVIDER");
-- #endif
-+
- + if (options->update_hostkeys == -1)
- + options->update_hostkeys = 0;
- + if (options->disable_multithreaded == -1)
- + options->disable_multithreaded = 0;
--
-- /* Expand KEX name lists */
-- all_cipher = cipher_alg_list(',', 0);
-++
-+ /* expand KEX and etc. name lists */
-+ { char *all;
-+ #define ASSEMBLE(what, defaults, all) \
- diff --git a/readconf.h b/readconf.h
- index e143a108..1383a3cd 100644
- --- a/readconf.h
-@@ -950,9 +951,9 @@
- /* Portable-specific options */
- sUsePAM,
- + sDisableMTAES,
-- /* Standard Options */
-- sPort, sHostKeyFile, sLoginGraceTime,
-- sPermitRootLogin, sLogFacility, sLogLevel,
-+ /* X.509 Standard Options */
-+ sHostbasedAlgorithms,
-+ sPubkeyAlgorithms,
- @@ -679,6 +683,7 @@ static struct {
- { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
- { "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
-diff -u a/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff b/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff
---- a/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff 2020-10-04 11:04:37.441213650 -0700
-+++ b/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff 2020-10-04 11:50:55.865616716 -0700
-@@ -382,7 +382,7 @@
- @@ -888,6 +888,10 @@ kex_choose_conf(struct ssh *ssh)
- int nenc, nmac, ncomp;
- u_int mode, ctos, need, dh_need, authlen;
-- int r, first_kex_follows;
-+ int r, first_kex_follows = 0;
- + int auth_flag;
- +
- + auth_flag = packet_authentication_state(ssh);
-@@ -1193,14 +1193,3 @@
- # Example of overriding settings on a per-user basis
- #Match User anoncvs
- # X11Forwarding no
--diff --git a/version.h b/version.h
--index a2eca3ec..ff654fc3 100644
----- a/version.h
--+++ b/version.h
--@@ -3,4 +3,5 @@
-- #define SSH_VERSION "OpenSSH_8.3"
--
-- #define SSH_PORTABLE "p1"
---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
--+#define SSH_HPN "-hpn14v22"
--+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN
-diff -u a/openssh-8_3_P1-hpn-PeakTput-14.22.diff b/openssh-8_3_P1-hpn-PeakTput-14.22.diff
---- a/openssh-8_3_P1-hpn-PeakTput-14.22.diff 2020-10-04 11:51:46.409313155 -0700
-+++ b/openssh-8_3_P1-hpn-PeakTput-14.22.diff 2020-10-04 11:56:57.407445258 -0700
-@@ -12,9 +12,9 @@
- static long stalled; /* how long we have been stalled */
- static int bytes_per_second; /* current speed in bytes per second */
- @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update)
-+ off_t bytes_left;
- int cur_speed;
-- int hours, minutes, seconds;
-- int file_len;
-+ int len;
- + off_t delta_pos;
-
- if ((!force_update && !alarm_fired && !win_resized) || !can_output())
-@@ -30,15 +30,17 @@
- if (bytes_left > 0)
- elapsed = now - last_update;
- else {
--@@ -166,7 +173,7 @@ refresh_progress_meter(int force_update)
-+@@ -166,8 +173,8 @@ refresh_progress_meter(int force_update)
-+ buf[1] = '\0';
-
- /* filename */
-- buf[0] = '\0';
--- file_len = win_size - 36;
--+ file_len = win_size - 45;
-- if (file_len > 0) {
-- buf[0] = '\r';
-- snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s",
-+- if (win_size > 36) {
-+- int file_len = win_size - 36;
-++ if (win_size > 45) {
-++ int file_len = win_size - 45;
-+ snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ",
-+ file_len, file);
-+ }
- @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update)
- (off_t)bytes_per_second);
- strlcat(buf, "/s ", win_size);
diff --git a/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-glue.patch b/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-glue.patch
deleted file mode 100644
index 884063c60f13..000000000000
--- a/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-glue.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -ur a/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff b/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff
---- a/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff 2020-09-28 13:15:17.780747192 -0700
-+++ b/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff 2020-09-28 13:34:03.576552219 -0700
-@@ -409,18 +409,10 @@
- index e7abb341..c23276d4 100644
- --- a/packet.c
- +++ b/packet.c
--@@ -961,6 +961,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
-+@@ -961,6 +961,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
- return 0;
- }
-
--+/* this supports the forced rekeying required for the NONE cipher */
--+int rekey_requested = 0;
--+void
--+packet_request_rekeying(void)
--+{
--+ rekey_requested = 1;
--+}
--+
- +/* used to determine if pre or post auth when rekeying for aes-ctr
- + * and none cipher switch */
- +int
-@@ -434,20 +426,6 @@
- #define MAX_PACKETS (1U<<31)
- static int
- ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
--@@ -987,6 +1005,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
-- if (state->p_send.packets == 0 && state->p_read.packets == 0)
-- return 0;
--
--+ /* used to force rekeying when called for by the none
--+ * cipher switch methods -cjr */
--+ if (rekey_requested == 1) {
--+ rekey_requested = 0;
--+ return 1;
--+ }
--+
-- /* Time-based rekeying */
-- if (state->rekey_interval != 0 &&
-- (int64_t)state->rekey_time + state->rekey_interval <= monotime())
- diff --git a/packet.h b/packet.h
- index c2544bd9..ebd85c88 100644
- --- a/packet.h
-@@ -481,9 +459,9 @@
- oLocalCommand, oPermitLocalCommand, oRemoteCommand,
- + oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
- + oNoneEnabled, oNoneSwitch,
-+ oDisableMTAES,
- oVisualHostKey,
- oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
-- oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
- @@ -294,6 +297,8 @@ static struct {
- { "kexalgorithms", oKexAlgorithms },
- { "ipqos", oIPQoS },
-@@ -615,9 +593,9 @@
- int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */
- SyslogFacility log_facility; /* Facility for system logging. */
- @@ -114,7 +118,10 @@ typedef struct {
--
- int enable_ssh_keysign;
- int64_t rekey_limit;
-+ int disable_multithreaded; /*disable multithreaded aes-ctr*/
- + int none_switch; /* Use none cipher */
- + int none_enabled; /* Allow none to be used */
- int rekey_interval;
-@@ -700,9 +678,9 @@
- + options->hpn_buffer_size = CHAN_TCP_WINDOW_DEFAULT;
- + }
- +
-+ if (options->disable_multithreaded == -1)
-+ options->disable_multithreaded = 0;
- if (options->ip_qos_interactive == -1)
-- options->ip_qos_interactive = IPTOS_DSCP_AF21;
-- if (options->ip_qos_bulk == -1)
- @@ -519,6 +565,8 @@ typedef enum {
- sPasswordAuthentication, sKbdInteractiveAuthentication,
- sListenAddress, sAddressFamily,
-@@ -1081,11 +1059,11 @@
- xxx_host = host;
- xxx_hostaddr = hostaddr;
-
--@@ -435,6 +446,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
-+@@ -435,7 +446,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
-+ }
-+ }
-+ #endif
-
-- if (!authctxt.success)
-- fatal("Authentication failed.");
--+
- + /*
- + * If the user wants to use the none cipher, do it post authentication
- + * and only if the right conditions are met -- both of the NONE commands
diff --git a/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-sctp-glue.patch b/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-sctp-glue.patch
deleted file mode 100644
index 52ec42e37fd3..000000000000
--- a/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-sctp-glue.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff b/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff
---- a/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff 2020-09-28 16:42:34.168386903 -0700
-+++ b/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff 2020-09-28 16:42:43.806325434 -0700
-@@ -1171,14 +1171,3 @@
- # Example of overriding settings on a per-user basis
- #Match User anoncvs
- # X11Forwarding no
--diff --git a/version.h b/version.h
--index a2eca3ec..ff654fc3 100644
----- a/version.h
--+++ b/version.h
--@@ -3,4 +3,5 @@
-- #define SSH_VERSION "OpenSSH_8.3"
--
-- #define SSH_PORTABLE "p1"
---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
--+#define SSH_HPN "-hpn14v22"
--+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN
diff --git a/net-misc/openssh/openssh-8.4_p1-r3.ebuild b/net-misc/openssh/openssh-8.4_p1-r3.ebuild
deleted file mode 100644
index bc42f87054e4..000000000000
--- a/net-misc/openssh/openssh-8.4_p1-r3.ebuild
+++ /dev/null
@@ -1,515 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-# PV to USE for HPN patches
-#HPN_PV="${PV^^}"
-HPN_PV="8.3_P1"
-
-HPN_VER="14.22"
-HPN_PATCHES=(
- ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
- ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
- ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
-)
-
-SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="12.6" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
- ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
- ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
- ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
-"
-S="${WORKDIR}/${PARCH}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- ldns? ( ssl )
- pie? ( !static )
- static? ( !kerberos !pam )
- X509? ( !sctp !security-key ssl !xmss )
- xmss? ( ssl )
- test? ( ssl )
-"
-
-LIB_DEPEND="
- audit? ( sys-process/audit[static-libs(+)] )
- ldns? (
- net-libs/ldns[static-libs(+)]
- !bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
- bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
- )
- libedit? ( dev-libs/libedit:=[static-libs(+)] )
- sctp? ( net-misc/lksctp-tools[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.0.1:0[bindist=]
- <dev-libs/openssl-1.1.0:0[bindist=]
- )
- >=dev-libs/openssl-1.1.0g:0[bindist=]
- )
- dev-libs/openssl: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}
- pam? ( >=sys-auth/pambase-20081028 )
- userland_GNU? ( !prefix? ( sys-apps/shadow ) )
- X? ( x11-apps/xauth )
-"
-BDEPEND="
- virtual/pkgconfig
- sys-devel/autoconf
-"
-
-pkg_pretend() {
- # this sucks, but i'd rather have people unable to `emerge -u openssh`
- # than not be able to log in to their server any more
- maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
- local fail="
- $(use hpn && maybe_fail hpn HPN_VER)
- $(use sctp && maybe_fail sctp SCTP_PATCH)
- $(use X509 && maybe_fail X509 X509_PATCH)
- "
- fail=$(echo ${fail})
- if [[ -n ${fail} ]] ; then
- eerror "Sorry, but this version does not yet support features"
- eerror "that you requested: ${fail}"
- eerror "Please mask ${PF} for now and check back later:"
- eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
- die "Missing requested third party patch."
- fi
-
- # Make sure people who are using tcp wrappers are notified of its removal. #531156
- if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
- ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
- ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please."
- fi
-}
-
-src_prepare() {
- sed -i \
- -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
- pathnames.h || die
-
- # don't break .ssh/authorized_keys2 for fun
- sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
- eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
- eapply "${FILESDIR}"/${PN}-8.2_p1-GSSAPI-dns.patch #165444 integrated into gsskex
- eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
- eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
- eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
- eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
-
- # https://bugs.gentoo.org/749026
- use X509 || eapply "${FILESDIR}"/${PN}-8.4_p1-fix-ssh-copy-id.patch
-
- # workaround for https://bugs.gentoo.org/734984
- use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.patch
-
- [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
-
- local PATCHSET_VERSION_MACROS=()
-
- if use X509 ; then
- pushd "${WORKDIR}" &>/dev/null || die
- eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
- popd &>/dev/null || die
-
- eapply "${WORKDIR}"/${X509_PATCH%.*}
-
- # We need to patch package version or any X.509 sshd will reject our ssh client
- # with "userauth_pubkey: could not parse key: string is too large [preauth]"
- # error
- einfo "Patching package version for X.509 patch set ..."
- sed -i \
- -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
- "${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
-
- einfo "Patching version.h to expose X.509 patch set ..."
- sed -i \
- -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \
- "${S}"/version.h || die "Failed to sed-in X.509 patch version"
- PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
- fi
-
- if use sctp ; then
- eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-
- einfo "Patching version.h to expose SCTP patch set ..."
- sed -i \
- -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \
- "${S}"/version.h || die "Failed to sed-in SCTP patch version"
- PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
-
- einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
- sed -i \
- -e "/\t\tcfgparse \\\/d" \
- "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
- fi
-
- if use hpn ; then
- local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
- mkdir "${hpn_patchdir}" || die
- cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
- pushd "${hpn_patchdir}" &>/dev/null || die
- eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch
- use X509 && eapply "${FILESDIR}"/${PN}-8.4_p1-hpn-${HPN_VER}-X509-glue.patch
- use sctp && eapply "${FILESDIR}"/${PN}-8.4_p1-hpn-${HPN_VER}-sctp-glue.patch
- popd &>/dev/null || die
-
- eapply "${hpn_patchdir}"
-
- use X509 || eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch"
-
- einfo "Patching Makefile.in for HPN patch set ..."
- sed -i \
- -e "/^LIBS=/ s/\$/ -lpthread/" \
- "${S}"/Makefile.in || die "Failed to patch Makefile.in"
-
- einfo "Patching version.h to expose HPN patch set ..."
- sed -i \
- -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \
- "${S}"/version.h || die "Failed to sed-in HPN patch version"
- PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
-
- if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
- einfo "Disabling known non-working MT AES cipher per default ..."
-
- cat > "${T}"/disable_mtaes.conf <<- EOF
-
- # HPN's Multi-Threaded AES CTR cipher is currently known to be broken
- # and therefore disabled per default.
- DisableMTAES yes
- EOF
- sed -i \
- -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
- "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
-
- sed -i \
- -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
- "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
- fi
- fi
-
- if use X509 || use sctp || use hpn ; then
- einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
- sed -i \
- -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
- "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
-
- einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
- sed -i \
- -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
- "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
-
- einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
- sed -i \
- -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
- "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
- fi
-
- sed -i \
- -e "/#UseLogin no/d" \
- "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
-
- eapply_user #473004
-
- # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
- sed -e '/\t\tpercent \\/ d' \
- -i regress/Makefile || die
-
- tc-export PKG_CONFIG
- local sed_args=(
- -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
- # Disable PATH reset, trust what portage gives us #254615
- -e 's:^PATH=/:#PATH=/:'
- # Disable fortify flags ... our gcc does this for us
- -e 's:-D_FORTIFY_SOURCE=2::'
- )
-
- # The -ftrapv flag ICEs on hppa #505182
- use hppa && sed_args+=(
- -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
- -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
- )
- # _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
- $(use_with audit audit linux)
- $(use_with kerberos kerberos5 "${EPREFIX}"/usr)
- # We apply the sctp patch conditionally, so can't pass --without-sctp
- # unconditionally else we get unknown flag warnings.
- $(use sctp && use_with sctp)
- $(use_with ldns ldns "${EPREFIX}"/usr)
- $(use_with libedit)
- $(use_with pam)
- $(use_with pie)
- $(use_with selinux)
- $(usex X509 '' "$(use_with security-key security-key-builtin)")
- $(use_with ssl openssl)
- $(use_with ssl md5-passwords)
- $(use_with ssl ssl-engine)
- $(use_with !elibc_Cygwin hardening) #659210
- )
-
- if use elibc_musl; then
- # stackprotect is broken on musl x86 and ppc
- if use x86 || use ppc; then
- myconf+=( --without-stackprotect )
- fi
-
- # musl defines bogus values for UTMP_FILE and WTMP_FILE
- # https://bugs.gentoo.org/753230
- myconf+=( --disable-utmp --disable-wtmp )
- fi
-
- # The seccomp sandbox is broken on x32, so use the older method for now. #553748
- use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- local t skipped=() failed=() passed=()
- local tests=( interop-tests compat-tests )
-
- local shell=$(egetshell "${UID}")
- if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
- elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
- elog "user, so we will run a subset only."
- skipped+=( tests )
- else
- tests+=( tests )
- fi
-
- # It will also attempt to write to the homedir .ssh.
- local sshhome=${T}/homedir
- mkdir -p "${sshhome}"/.ssh
- for t in "${tests[@]}" ; do
- # Some tests read from stdin ...
- HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \
- SUDO="" SSH_SK_PROVIDER="" \
- TEST_SSH_UNSAFE_PERMISSIONS=1 \
- emake -k -j1 ${t} </dev/null \
- && passed+=( "${t}" ) \
- || failed+=( "${t}" )
- done
-
- einfo "Passed tests: ${passed[*]}"
- [[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
- [[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}"
-}
-
-# Gentoo tweaks to default config files.
-tweak_ssh_configs() {
- 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
- )
-
- # First the server config.
- cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
- # Allow client to pass locale environment variables. #367017
- AcceptEnv ${locale_vars[*]}
-
- # Allow client to pass COLORTERM to match TERM. #658540
- AcceptEnv COLORTERM
- EOF
-
- # Then the client config.
- cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
- # Send locale environment variables. #367017
- SendEnv ${locale_vars[*]}
-
- # Send COLORTERM to match TERM. #658540
- SendEnv COLORTERM
- EOF
-
- if use pam ; then
- sed -i \
- -e "/^#UsePAM /s:.*:UsePAM yes:" \
- -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
- -e "/^#PrintMotd /s:.*:PrintMotd no:" \
- -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
- "${ED}"/etc/ssh/sshd_config || die
- fi
-
- if use livecd ; then
- sed -i \
- -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
- "${ED}"/etc/ssh/sshd_config || die
- fi
-}
-
-src_install() {
- emake install-nokeys DESTDIR="${D}"
- fperms 600 /etc/ssh/sshd_config
- dobin contrib/ssh-copy-id
- newinitd "${FILESDIR}"/sshd-r1.initd sshd
- newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
- if use pam; then
- newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
- fi
-
- tweak_ssh_configs
-
- doman contrib/ssh-copy-id.1
- dodoc CREDITS OVERVIEW README* TODO sshd_config
- use hpn && dodoc HPN-README
- use X509 || dodoc ChangeLog
-
- diropts -m 0700
- dodir /etc/skel/.ssh
-
- # https://bugs.gentoo.org/733802
- if ! use scp; then
- rm "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \
- || die "failed to remove scp"
- fi
-
- rmdir "${ED}"/var/empty || die
-
- systemd_dounit "${FILESDIR}"/sshd.{service,socket}
- systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-pkg_preinst() {
- if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
- show_ssl_warning=1
- fi
-}
-
-pkg_postinst() {
- local old_ver
- for old_ver in ${REPLACING_VERSIONS}; do
- if ver_test "${old_ver}" -lt "5.8_p1"; then
- elog "Starting with openssh-5.8p1, the server will default to a newer key"
- elog "algorithm (ECDSA). You are encouraged to manually update your stored"
- elog "keys list as servers update theirs. See ssh-keyscan(1) for more info."
- fi
- if ver_test "${old_ver}" -lt "7.0_p1"; then
- elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
- elog "Make sure to update any configs that you might have. Note that xinetd might"
- elog "be an alternative for you as it supports USE=tcpd."
- fi
- if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
- elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
- elog "weak sizes. If you rely on these key types, you can re-enable the key types by"
- elog "adding to your sshd_config or ~/.ssh/config files:"
- elog " PubkeyAcceptedKeyTypes=+ssh-dss"
- elog "You should however generate new keys using rsa or ed25519."
-
- elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
- elog "to 'prohibit-password'. That means password auth for root users no longer works"
- elog "out of the box. If you need this, please update your sshd_config explicitly."
- fi
- if ver_test "${old_ver}" -lt "7.6_p1"; then
- elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
- elog "Furthermore, rsa keys with less than 1024 bits will be refused."
- fi
- if ver_test "${old_ver}" -lt "7.7_p1"; then
- elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
- elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
- elog "if you need to authenticate against LDAP."
- elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
- fi
- if ver_test "${old_ver}" -lt "8.2_p1"; then
- ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
- ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
- ewarn "connection is generally safe."
- fi
- done
-
- if [[ -n ${show_ssl_warning} ]]; then
- elog "Be aware that by disabling openssl support in openssh, the server and clients"
- elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys"
- elog "and update all clients/servers that utilize them."
- fi
-
- if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
- elog ""
- elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
- elog "and therefore disabled at runtime per default."
- elog "Make sure your sshd_config is up to date and contains"
- elog ""
- elog " DisableMTAES yes"
- elog ""
- elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
- elog ""
- fi
-}
diff --git a/net-misc/openssh/openssh-8.5_p1.ebuild b/net-misc/openssh/openssh-8.5_p1.ebuild
deleted file mode 100644
index 340080016b33..000000000000
--- a/net-misc/openssh/openssh-8.5_p1.ebuild
+++ /dev/null
@@ -1,512 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-# PV to USE for HPN patches
-#HPN_PV="${PV^^}"
-HPN_PV="8.4_P1"
-
-HPN_VER="15.1"
-HPN_PATCHES=(
- ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
- ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
- ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
-)
-
-SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="13.0" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
- ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
- ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
- ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
-"
-S="${WORKDIR}/${PARCH}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- ldns? ( ssl )
- pie? ( !static )
- static? ( !kerberos !pam )
- X509? ( !sctp !security-key ssl !xmss )
- xmss? ( ssl )
- test? ( ssl )
-"
-
-LIB_DEPEND="
- audit? ( sys-process/audit[static-libs(+)] )
- ldns? (
- net-libs/ldns[static-libs(+)]
- !bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
- bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
- )
- libedit? ( dev-libs/libedit:=[static-libs(+)] )
- sctp? ( net-misc/lksctp-tools[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.0.1:0[bindist=]
- <dev-libs/openssl-1.1.0:0[bindist=]
- )
- >=dev-libs/openssl-1.1.0g:0[bindist=]
- )
- dev-libs/openssl: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}
- pam? ( >=sys-auth/pambase-20081028 )
- userland_GNU? ( !prefix? ( sys-apps/shadow ) )
- X? ( x11-apps/xauth )
-"
-BDEPEND="
- virtual/pkgconfig
- sys-devel/autoconf
-"
-
-pkg_pretend() {
- # this sucks, but i'd rather have people unable to `emerge -u openssh`
- # than not be able to log in to their server any more
- maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
- local fail="
- $(use hpn && maybe_fail hpn HPN_VER)
- $(use sctp && maybe_fail sctp SCTP_PATCH)
- $(use X509 && maybe_fail X509 X509_PATCH)
- "
- fail=$(echo ${fail})
- if [[ -n ${fail} ]] ; then
- eerror "Sorry, but this version does not yet support features"
- eerror "that you requested: ${fail}"
- eerror "Please mask ${PF} for now and check back later:"
- eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
- die "Missing requested third party patch."
- fi
-
- # Make sure people who are using tcp wrappers are notified of its removal. #531156
- if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
- ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
- ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please."
- fi
-}
-
-src_prepare() {
- sed -i \
- -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
- pathnames.h || die
-
- # don't break .ssh/authorized_keys2 for fun
- sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
- eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
- eapply "${FILESDIR}"/${PN}-8.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
- eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
- eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
- eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
- eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
-
- # workaround for https://bugs.gentoo.org/734984
- use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.patch
-
- [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
-
- local PATCHSET_VERSION_MACROS=()
-
- if use X509 ; then
- pushd "${WORKDIR}" &>/dev/null || die
- eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
- popd &>/dev/null || die
-
- eapply "${WORKDIR}"/${X509_PATCH%.*}
-
- # We need to patch package version or any X.509 sshd will reject our ssh client
- # with "userauth_pubkey: could not parse key: string is too large [preauth]"
- # error
- einfo "Patching package version for X.509 patch set ..."
- sed -i \
- -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
- "${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
-
- einfo "Patching version.h to expose X.509 patch set ..."
- sed -i \
- -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \
- "${S}"/version.h || die "Failed to sed-in X.509 patch version"
- PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
- fi
-
- if use sctp ; then
- eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-
- einfo "Patching version.h to expose SCTP patch set ..."
- sed -i \
- -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \
- "${S}"/version.h || die "Failed to sed-in SCTP patch version"
- PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
-
- einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
- sed -i \
- -e "/\t\tcfgparse \\\/d" \
- "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
- fi
-
- if use hpn ; then
- local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
- mkdir "${hpn_patchdir}" || die
- cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
- pushd "${hpn_patchdir}" &>/dev/null || die
- eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch
- use X509 && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-X509-glue.patch
- use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch
- popd &>/dev/null || die
-
- eapply "${hpn_patchdir}"
-
- use X509 || eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch"
-
- einfo "Patching Makefile.in for HPN patch set ..."
- sed -i \
- -e "/^LIBS=/ s/\$/ -lpthread/" \
- "${S}"/Makefile.in || die "Failed to patch Makefile.in"
-
- einfo "Patching version.h to expose HPN patch set ..."
- sed -i \
- -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \
- "${S}"/version.h || die "Failed to sed-in HPN patch version"
- PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
-
- if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
- einfo "Disabling known non-working MT AES cipher per default ..."
-
- cat > "${T}"/disable_mtaes.conf <<- EOF
-
- # HPN's Multi-Threaded AES CTR cipher is currently known to be broken
- # and therefore disabled per default.
- DisableMTAES yes
- EOF
- sed -i \
- -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
- "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
-
- sed -i \
- -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
- "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
- fi
- fi
-
- if use X509 || use sctp || use hpn ; then
- einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
- sed -i \
- -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
- "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
-
- einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
- sed -i \
- -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
- "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
-
- einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
- sed -i \
- -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
- "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
- fi
-
- sed -i \
- -e "/#UseLogin no/d" \
- "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
-
- eapply_user #473004
-
- # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
- sed -e '/\t\tpercent \\/ d' \
- -i regress/Makefile || die
-
- tc-export PKG_CONFIG
- local sed_args=(
- -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
- # Disable PATH reset, trust what portage gives us #254615
- -e 's:^PATH=/:#PATH=/:'
- # Disable fortify flags ... our gcc does this for us
- -e 's:-D_FORTIFY_SOURCE=2::'
- )
-
- # The -ftrapv flag ICEs on hppa #505182
- use hppa && sed_args+=(
- -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
- -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
- )
- # _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
- $(use_with audit audit linux)
- $(use_with kerberos kerberos5 "${EPREFIX}"/usr)
- # We apply the sctp patch conditionally, so can't pass --without-sctp
- # unconditionally else we get unknown flag warnings.
- $(use sctp && use_with sctp)
- $(use_with ldns ldns "${EPREFIX}"/usr)
- $(use_with libedit)
- $(use_with pam)
- $(use_with pie)
- $(use_with selinux)
- $(usex X509 '' "$(use_with security-key security-key-builtin)")
- $(use_with ssl openssl)
- $(use_with ssl md5-passwords)
- $(use_with ssl ssl-engine)
- $(use_with !elibc_Cygwin hardening) #659210
- )
-
- if use elibc_musl; then
- # stackprotect is broken on musl x86 and ppc
- if use x86 || use ppc; then
- myconf+=( --without-stackprotect )
- fi
-
- # musl defines bogus values for UTMP_FILE and WTMP_FILE
- # https://bugs.gentoo.org/753230
- myconf+=( --disable-utmp --disable-wtmp )
- fi
-
- # The seccomp sandbox is broken on x32, so use the older method for now. #553748
- use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- local t skipped=() failed=() passed=()
- local tests=( interop-tests compat-tests )
-
- local shell=$(egetshell "${UID}")
- if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
- elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
- elog "user, so we will run a subset only."
- skipped+=( tests )
- else
- tests+=( tests )
- fi
-
- # It will also attempt to write to the homedir .ssh.
- local sshhome=${T}/homedir
- mkdir -p "${sshhome}"/.ssh
- for t in "${tests[@]}" ; do
- # Some tests read from stdin ...
- HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \
- SUDO="" SSH_SK_PROVIDER="" \
- TEST_SSH_UNSAFE_PERMISSIONS=1 \
- emake -k -j1 ${t} </dev/null \
- && passed+=( "${t}" ) \
- || failed+=( "${t}" )
- done
-
- einfo "Passed tests: ${passed[*]}"
- [[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
- [[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}"
-}
-
-# Gentoo tweaks to default config files.
-tweak_ssh_configs() {
- 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
- )
-
- # First the server config.
- cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
- # Allow client to pass locale environment variables. #367017
- AcceptEnv ${locale_vars[*]}
-
- # Allow client to pass COLORTERM to match TERM. #658540
- AcceptEnv COLORTERM
- EOF
-
- # Then the client config.
- cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
- # Send locale environment variables. #367017
- SendEnv ${locale_vars[*]}
-
- # Send COLORTERM to match TERM. #658540
- SendEnv COLORTERM
- EOF
-
- if use pam ; then
- sed -i \
- -e "/^#UsePAM /s:.*:UsePAM yes:" \
- -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
- -e "/^#PrintMotd /s:.*:PrintMotd no:" \
- -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
- "${ED}"/etc/ssh/sshd_config || die
- fi
-
- if use livecd ; then
- sed -i \
- -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
- "${ED}"/etc/ssh/sshd_config || die
- fi
-}
-
-src_install() {
- emake install-nokeys DESTDIR="${D}"
- fperms 600 /etc/ssh/sshd_config
- dobin contrib/ssh-copy-id
- newinitd "${FILESDIR}"/sshd-r1.initd sshd
- newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
- if use pam; then
- newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
- fi
-
- tweak_ssh_configs
-
- doman contrib/ssh-copy-id.1
- dodoc CREDITS OVERVIEW README* TODO sshd_config
- use hpn && dodoc HPN-README
- use X509 || dodoc ChangeLog
-
- diropts -m 0700
- dodir /etc/skel/.ssh
-
- # https://bugs.gentoo.org/733802
- if ! use scp; then
- rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \
- || die "failed to remove scp"
- fi
-
- rmdir "${ED}"/var/empty || die
-
- systemd_dounit "${FILESDIR}"/sshd.{service,socket}
- systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-pkg_preinst() {
- if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
- show_ssl_warning=1
- fi
-}
-
-pkg_postinst() {
- local old_ver
- for old_ver in ${REPLACING_VERSIONS}; do
- if ver_test "${old_ver}" -lt "5.8_p1"; then
- elog "Starting with openssh-5.8p1, the server will default to a newer key"
- elog "algorithm (ECDSA). You are encouraged to manually update your stored"
- elog "keys list as servers update theirs. See ssh-keyscan(1) for more info."
- fi
- if ver_test "${old_ver}" -lt "7.0_p1"; then
- elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
- elog "Make sure to update any configs that you might have. Note that xinetd might"
- elog "be an alternative for you as it supports USE=tcpd."
- fi
- if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
- elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
- elog "weak sizes. If you rely on these key types, you can re-enable the key types by"
- elog "adding to your sshd_config or ~/.ssh/config files:"
- elog " PubkeyAcceptedKeyTypes=+ssh-dss"
- elog "You should however generate new keys using rsa or ed25519."
-
- elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
- elog "to 'prohibit-password'. That means password auth for root users no longer works"
- elog "out of the box. If you need this, please update your sshd_config explicitly."
- fi
- if ver_test "${old_ver}" -lt "7.6_p1"; then
- elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
- elog "Furthermore, rsa keys with less than 1024 bits will be refused."
- fi
- if ver_test "${old_ver}" -lt "7.7_p1"; then
- elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
- elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
- elog "if you need to authenticate against LDAP."
- elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
- fi
- if ver_test "${old_ver}" -lt "8.2_p1"; then
- ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
- ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
- ewarn "connection is generally safe."
- fi
- done
-
- if [[ -n ${show_ssl_warning} ]]; then
- elog "Be aware that by disabling openssl support in openssh, the server and clients"
- elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys"
- elog "and update all clients/servers that utilize them."
- fi
-
- if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
- elog ""
- elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
- elog "and therefore disabled at runtime per default."
- elog "Make sure your sshd_config is up to date and contains"
- elog ""
- elog " DisableMTAES yes"
- elog ""
- elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
- elog ""
- fi
-}
diff --git a/net-misc/openssh/openssh-8.6_p1-r1.ebuild b/net-misc/openssh/openssh-8.6_p1-r1.ebuild
index ca2ff312f1a5..0e9654a50441 100644
--- a/net-misc/openssh/openssh-8.6_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-8.6_p1-r1.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${PARCH}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Probably want to drop ssl defaulting to on in a future version.
IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
diff --git a/net-misc/pedro/Manifest b/net-misc/pedro/Manifest
index fa1e92e041a6..f0fd02c4bdba 100644
--- a/net-misc/pedro/Manifest
+++ b/net-misc/pedro/Manifest
@@ -1,5 +1,9 @@
+AUX pedro-1.12-portage.patch 1816 BLAKE2B 715c6e17a31d86a3b947fb7be8bfead7e2c4c03daee3fefa203b0c6b3f7a4b77ff11b1537c2b1fd92e044191331b9be86a8b83dd9f05fecac64909e3d37262ab SHA512 a5ddccfb2a64baa6582d176803ce38b687a135d62f923d4779e3bfb4435eefe3a35742113ea05538534a8bc9c2244c66c0bdeafcb304568550b6b9821b6eeb18
AUX pedro-1.6-portage.patch 719 BLAKE2B ee8a23964e875e271624a2d0f4c06d5cd05e9d78cae4147c2e0d0701d2df816f2e9b90ca0d3919cc03d5a3c3c62bc5fe6ade08f3775b61af23d6a2fdeda67a00 SHA512 10446c0348e20e2ee946544c0947fe4373ee90b9e9ef5524d6743d7be9f13855dee06ed7e011f1d82b321fd0b8594924bf3ae6f4d0744f4d4517910f0f756875
+DIST pedro-1.12.tgz 1181678 BLAKE2B ed882ab3dae0912519283229d10ff6f12ef4f623d72beaf22b8467e8072752fbd57836a0ebbad0f0ce3da1b4837049161bcb12673e3c38c94eb167e16c0c0a1e SHA512 936b2c6cac526d9d3c0e146b53dc65ed0508c6abd1b66c97656fa5b4011d7dd11912d1c0bf091a29b56e13c3e19ec3e0ad7760d44d4887b939699cdd2389c819
DIST pedro-1.6.tgz 711856 BLAKE2B 5027dd438995e212889786996debb5765d49828d38ce715672e44776b5fb63db0d6bca0e72339fd5067254aed0b731d3f77656ad510d978e4f456af45d6cf008 SHA512 263f53e447d4b3baab405a1d7313fc397f8a62958957688265c7485a5697b642138636659b5515b9010341655ba8045e5d85f69a86c20baa28edc0dcff0aef42
DIST pedro-manual-1.6.tar.gz 222863 BLAKE2B 085b118585808aced9217a8001080b589d9dad958ad14787f929a4808b10bb2be80ae7bc04c07b676e41aed9e2ec916215c5d15dda2317f71ecebbc7c1737d96 SHA512 87f8e07e3a687d12e366f1974398996f2346e417680ab534622f901c0c7e1efeb171f0c0dadad46b578122c9e98531570c303d2d3ce04b1cd8150816d6138f99
-EBUILD pedro-1.6.ebuild 1002 BLAKE2B 4b179803707c9b11b89073cde36b2b9498a6db08631506306fb828c8dcaa54479f9ae6d6641005a1c1ebefbda6150d4e6da6762046effbc6cbf3deddbafbe38d SHA512 04fe0bf58fd4e9e61284866b5bc1cece0f680433bcc59a7212a2bfe9bd1f64ee2137ad1e68b0eec2b1015fbee4fe8b9db7ed215db8b65184d0a4692e3fb985d2
+DIST pedro-manual-1.x.tar.gz 222863 BLAKE2B 085b118585808aced9217a8001080b589d9dad958ad14787f929a4808b10bb2be80ae7bc04c07b676e41aed9e2ec916215c5d15dda2317f71ecebbc7c1737d96 SHA512 87f8e07e3a687d12e366f1974398996f2346e417680ab534622f901c0c7e1efeb171f0c0dadad46b578122c9e98531570c303d2d3ce04b1cd8150816d6138f99
+EBUILD pedro-1.12.ebuild 1025 BLAKE2B 097c9debd6126c546dd43811adf7e3e47918594769519c7496e58097d7fa54d762c8d767e469862eedc5c44af3792164b1fc5c8af554ddca355ef658e72150db SHA512 11f8d3ddba8638212a706e2bf1f0e4a5429d1a8d2aee1910ed5862caf927f17ca207273fdc79caac82cdb63cf23af3e72cf36a2c734f4d28fa763cd8b0ef587f
+EBUILD pedro-1.6-r1.ebuild 943 BLAKE2B cc7197f5f6a278ec7fd94f633eba135e41594027c8a7ef93c0f40665aa4d1e9df9147fe123ade0e23635a9633d1283e216e5ebb79348f80a4c664e7ee2251f7c SHA512 ac458e6df660d07e0e97fc5fb92b30db3498b07d16202abf5fea6a41fa3a053571c455c92e2e0eda027eab4d73d8be610f3c902e1b070dc53d63323ffa1298a9
MISC metadata.xml 238 BLAKE2B 471c25958ebf5f578ea2bc7abf38d99bd0810529255b7a3c42327d482a83d9b89c31c524907cc391b2320b3ff08b402d372498940dffc5aac5e6e4ad37e263a6 SHA512 98e2109c9261f162840c0123e9f4748fcf3eb0f07f2f4a47c30ea78b84ab1bc41dca829ad2c8b6476df49748a40fc7101e59d4ce150b28cf32415d8232e47fd7
diff --git a/net-misc/pedro/files/pedro-1.12-portage.patch b/net-misc/pedro/files/pedro-1.12-portage.patch
new file mode 100644
index 000000000000..17b027cebdf0
--- /dev/null
+++ b/net-misc/pedro/files/pedro-1.12-portage.patch
@@ -0,0 +1,45 @@
+--- pedro-1.12.orig/configure.ac 2021-01-06 21:02:47.000000000 -0000
++++ pedro-1.12/configure.ac 2021-05-31 18:52:32.205375746 -0000
+@@ -4,30 +4,31 @@
+ AC_PROG_CC
+ AC_PROG_LEX
+ AC_PROG_INSTALL
++AM_PROG_AR
+ AC_PROG_RANLIB
+ #AC_PROG_LIBTOOL
+ PKG_CHECK_MODULES([GLIB],[glib-2.0 >= 2.12])
+ AM_CONFIG_HEADER(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+-CPPFLAGS="-DNDEBUG -O2 -g `pkg-config --cflags glib-2.0`"
++CPPFLAGS="`${PKG_CONFIG} --cflags glib-2.0`"
+ case "${host}" in
+- *i686*)
++ *-mingw32*)
+ WIN32="yes"
+- LDFLAGS=""
+- #LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm"
+- LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm"
++ #LDFLAGS=""
++ #LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm"
++ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm"
+ ;;
+ *x86*)
+ WIN32="no"
+- LDFLAGS=""
+- #LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm"
+- LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm"
++ #LDFLAGS=""
++ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm"
++ #LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm"
+ ;;
+ *)
+ WIN32="no"
+- #LDFLAGS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm"
+- LDFLAGS=""
+- LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm"
++ #LDFLAGS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm"
++ #LDFLAGS=""
++ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm"
+ ;;
+ esac
+ AC_OUTPUT(Makefile src/Makefile src/server/Makefile src/lib/Makefile src/examples/Makefile doc/Makefile)
diff --git a/net-misc/pedro/pedro-1.12.ebuild b/net-misc/pedro/pedro-1.12.ebuild
new file mode 100644
index 000000000000..f513594a09f5
--- /dev/null
+++ b/net-misc/pedro/pedro-1.12.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Pedro is a subscription/notification communications system"
+HOMEPAGE="https://staff.itee.uq.edu.au/pjr/HomePages/PedroHome.html"
+SRC_URI="https://staff.itee.uq.edu.au/pjr/HomePages/PedroFiles/${P}.tgz
+ doc? ( https://dev.gentoo.org/~keri/distfiles/pedro/${PN}-manual-1.x.tar.gz )"
+S="${WORKDIR}"/${P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/glib:2"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-portage.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ tc-export PKG_CONFIG
+
+ default
+}
+
+src_install() {
+ default
+
+ if use doc ; then
+ dodoc "${WORKDIR}"/${PN}.pdf
+ fi
+
+ if use examples ; then
+ docinto examples
+ dodoc src/examples/*.{c,tcl}
+
+ docinto examples/java_api
+ dodoc src/java_api/*.java
+
+ docinto examples/python_api
+ dodoc src/python_api/*.py
+ fi
+}
diff --git a/net-misc/pedro/pedro-1.6.ebuild b/net-misc/pedro/pedro-1.6-r1.ebuild
index 68f35cb0e6f4..0d2ffbd916f8 100644
--- a/net-misc/pedro/pedro-1.6.ebuild
+++ b/net-misc/pedro/pedro-1.6-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
inherit toolchain-funcs
DESCRIPTION="Pedro is a subscription/notification communications system"
-HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/PedroHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/PedroFiles/${P}.tgz
+HOMEPAGE="https://staff.itee.uq.edu.au/pjr/HomePages/PedroHome.html"
+SRC_URI="https://staff.itee.uq.edu.au/pjr/HomePages/PedroFiles/${P}.tgz
doc? ( mirror://gentoo/${PN}-manual-${PV}.tar.gz )"
S="${WORKDIR}"/${P}
@@ -40,13 +40,13 @@ src_install() {
fi
if use examples ; then
- docinto /usr/share/doc/${PF}/examples
+ docinto examples
dodoc src/examples/*.{c,tcl}
- docinto /usr/share/doc/${PF}/examples/java_api
+ docinto examples/java_api
dodoc src/java_api/*.java
- docinto /usr/share/doc/${PF}/examples/python_api
+ docinto examples/python_api
dodoc src/python_api/*.py
fi
}
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index f0782cd1fe7a..9296b6fef781 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -2,5 +2,5 @@ AUX radvd-2.15.init 1537 BLAKE2B 6ca0db1eeeee77c345e4a5d9ee75d4e4fac188e3e19b153
AUX radvd.conf 337 BLAKE2B 67d50a761449b35389580ac956758f5c8c9373a14294a9e98e8238cce4ef2847694712e12296197ff196d58a9e5123aa6e27044a2137c36c34c6e2342ee7db63 SHA512 303a79c6e60293571f5cc868ba36f48a98658be8b6a9596c007461cbef2775d7deb67950fdacb3f37765cffdda164bc386e23bbb512cbabebd5173245841e401
AUX radvd.service 603 BLAKE2B fb573b528050d772926f3cb3cf82984b946345f636b661583f3aa5ef720a664cc13b20b8435ad2bcdd5bbdbad6451530384cd869f6d33d4e6f2ccf014ff9871b SHA512 3371d18e71ddb7672e929152d9f93201b49c1ce08c77d59cbcac7654362690a9ab97db08519f5fbe210738595aa52f30f5972cacca988b9274e2218c21bc7dd2
DIST radvd-2.19.tar.gz 222794 BLAKE2B 1c877d5a9eda6bda41b5c20ac9c1e28a26defc192fe14fc2d65888280bc96fc1ff6f4212ccaeac5f7e899087b2805772ed4c0cbbda163b2a87c79a2c178eda2b SHA512 caa621fd77e34ff6858d60a41b0ee02aff967ac14f2b84c402359744f4bece5c1563419860431c328adc0385e9893ed1f2421d652247a3aa0dfc0aaad1e01233
-EBUILD radvd-2.19.ebuild 1645 BLAKE2B d0a8fad16d870345307508f6fc5eb8d60e234043205ed17a5b3b3b3dfcc62e6daedf0b39e40205abebf458a1711b41831bd17588015139ee3435440c0341f6a3 SHA512 cfb01dfbb09acb7683b964f2b9bbfa3e0c68bd0b40ff77ec279892801abe24352e7640477fe09840d3f04a2c2e44d22afd4d2b63494722025c80ea0fee56acc4
+EBUILD radvd-2.19-r1.ebuild 1624 BLAKE2B a4f9002fe62fc75de645c49deccae066bbf728184a13e26424a77cf05bdc37c1c21eae6b78eb995a30a320750a14db47a6844b9b390583954fec5cc61c14e97a SHA512 f04f5908acfcf234d5ba72c7c355e3f42420d11edba1d34ef37943a77b16c00b1e5b44f42f8c4ad9020d7fb842a5100749154dcbc352b620caa2413439a63d35
MISC metadata.xml 357 BLAKE2B 7a671f4f2fc8439f4fb80a70b5e436e9002464600ce9ad0c9aacdc22d7c3d090e26ac30431d39107ab1081f6238528b91e67d3e1e59a7ba64a85e92c584bc4d8 SHA512 d81daf7b68978a8012b5c5de47074fa35bfcd457f99ef873f0ac46409022d93c41eac5bd7492f7af1b9f7b1bae94da7eb8e6fa537414b6371ca77ba13b70e1c1
diff --git a/net-misc/radvd/radvd-2.19.ebuild b/net-misc/radvd/radvd-2.19-r1.ebuild
index 738d9ecf3e0f..ee8991b121b6 100644
--- a/net-misc/radvd/radvd-2.19.ebuild
+++ b/net-misc/radvd/radvd-2.19-r1.ebuild
@@ -47,7 +47,7 @@ src_compile() {
src_install() {
default
- docinto /usr/share/doc/${PF}/html
+ docinto html
dodoc INTRO.html
newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 1f52fe9c9c51..e008a17475ef 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,5 +1,7 @@
DIST Remmina-v1.4.13.tar.gz 2519879 BLAKE2B ff2410ffbdea4509866b41e47eaa8caafb7f45091047eff9a830590b7a04c25cbbdec5788ccf9f35afdee613722e74e7595b73b4c3c8eea2fa3ffb4e09411d99 SHA512 cf82dc90f021635bcde906a73a2ad59087fe7cbe1bdd69a828ffc1e04ea0cc1bfa23386b70c36df85ae41dfa17f2d4379bedff29c03d9838c6ac18347e06b6dc
DIST Remmina-v1.4.16.tar.gz 2615347 BLAKE2B 5cff71d94bf66dd0116be739646c33a601a83deb8fef1cfcddf9c197eb34458ea97f6e45e96e7e0bab7fbfb6d95c6150e5c72c6d5aae5f23bfedc8f080e00ade SHA512 a9b42ba95ab9c5f985c5c359d0fb138d73ca5f0f9199cb9e84e522d1e11c50f9fe2b8c943d64242e367f4185fd9eb0c764321ba9d4ab9a09c5c5c1dc37c0ba78
+DIST Remmina-v1.4.17.tar.gz 2618015 BLAKE2B 2b4fbc6cd80dba7d73d8ce7cb5627b6fb67c0cc0c76f124da629f2ebee2c5d0542c3e6b626cdc19630f49f1227fada7e5344ff2f49eeabbc8709c50f5d1f58eb SHA512 e833a4c602ce68354b6d65ea0d7e32c19a242bb72d5fcfd558106b6f53d9397b278472070bc53579185ebbc8fb2ea88718e05f05fdb743df5b46051eb3423d78
EBUILD remmina-1.4.13.ebuild 2491 BLAKE2B 70f498068e3529e7e8a3d46d937f4a76faee8b5eae69d12f07a5c8785f5c2c496f4331d5770cb6e4cf6b408fae859c14a40573892484a1a75dcc97b83163d108 SHA512 d142b8d3bbf6b4520a77564d6be9e01cc02e9df66e82ac38ef70f2e1cfce9378418f107d4859416606bf5aadc108792bc1039b4f63161ea97cb2d7ca0546d470
EBUILD remmina-1.4.16.ebuild 2526 BLAKE2B ca1d007130661aafd360d7e11275b4227580a6f252a605b5be69f857e6f4815d58386592d23675817b143602450015c26e8cec88530d694ad34dd5e8dd347faa SHA512 52b8ac1fc61154b8359b1a037717a0f485439efcfe3f3261879d17701d46a48ea3641c130b84f77feb8afc093710d1cceee13cc173cc26dd88a6a7bcfadca7bb
+EBUILD remmina-1.4.17.ebuild 2526 BLAKE2B ca1d007130661aafd360d7e11275b4227580a6f252a605b5be69f857e6f4815d58386592d23675817b143602450015c26e8cec88530d694ad34dd5e8dd347faa SHA512 52b8ac1fc61154b8359b1a037717a0f485439efcfe3f3261879d17701d46a48ea3641c130b84f77feb8afc093710d1cceee13cc173cc26dd88a6a7bcfadca7bb
MISC metadata.xml 1179 BLAKE2B cd5ed669c77987fc48b69e50632cbdcff804a9eea251b1f2591e47ee22f9e7d0e7922fc23b7b8f8846e15d8d201b9bf177fcba75d3bca75118f912f63ee58f88 SHA512 88b7748273b1cb9e625352a30820fdeb56e78207e5d06049c20406b371859713fcf5a7053578c9df41369ba12d35b3031e1e95919a34529f5f95246727a33c9c
diff --git a/net-misc/remmina/remmina-1.4.17.ebuild b/net-misc/remmina/remmina-1.4.17.ebuild
new file mode 100644
index 000000000000..e7bceef93c0f
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.17.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature xdg
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
+
+DEPEND="
+ dev-libs/glib:2
+ dev-libs/json-glib
+ dev-libs/libpcre2
+ dev-libs/libsodium:=
+ dev-libs/openssl:0=
+ dev-libs/wayland
+ net-libs/libsoup
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libxkbfile
+ appindicator? ( dev-libs/libappindicator:3 )
+ crypt? ( dev-libs/libgcrypt:0= )
+ rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+ <net-misc/freerdp-3[X]
+ cups? ( net-print/cups:= ) )
+ gnome-keyring? ( app-crypt/libsecret )
+ gvnc? ( net-libs/gtk-vnc )
+ kwallet? ( kde-frameworks/kwallet )
+ spice? ( net-misc/spice-gtk[gtk3] )
+ ssh? ( net-libs/libssh:0=[sftp]
+ x11-libs/vte:2.91 )
+ telepathy? ( net-libs/telepathy-glib )
+ vnc? ( net-libs/libvncserver[jpeg] )
+ webkit? ( net-libs/webkit-gtk:4 )
+ zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
+"
+BDEPEND="
+ dev-util/intltool
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+ ${DEPEND}
+ virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ xdg_environment_reset
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_APPINDICATOR=$(usex appindicator)
+ -DWITH_GCRYPT=$(usex crypt)
+ -DWITH_EXAMPLES=$(usex examples)
+ -DWITH_LIBSECRET=$(usex gnome-keyring)
+ -DWITH_KF5WALLET=$(usex kwallet)
+ -DWITH_GETTEXT=$(usex nls)
+ -DWITH_TRANSLATIONS=$(usex nls)
+ -DWITH_FREERDP=$(usex rdp)
+ -DWITH_FREERDP3=OFF
+ -DWITH_CUPS=$(usex cups)
+ -DWITH_SPICE=$(usex spice)
+ -DWITH_LIBSSH=$(usex ssh)
+ -DWITH_VTE=$(usex ssh)
+ -DWITH_TELEPATHY=$(usex telepathy)
+ -DWITH_LIBVNCSERVER=$(usex vnc)
+ -DWITH_WWW=$(usex webkit)
+ -DWITH_AVAHI=$(usex zeroconf)
+ -DWITH_NEWS=$(usex telemetry)
+ -DWITH_ICON_CACHE=OFF
+ -DWITH_UPDATE_DESKTOP_DB=OFF
+ # when this feature is stable, add python eclass usage to optionally enable
+ -DWITH_PYTHON=OFF
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+ optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index c173d3030617..965f89b9392d 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -2,10 +2,9 @@ AUX rsync-3.2.3-glibc-lchmod.patch 1836 BLAKE2B 14b2e4246c6c2d4623500e346bea3ad4
AUX rsyncd.conf-3.0.9-r1 462 BLAKE2B 45a7dde876368e7392ee7a05edf593f55cf6b3b4dc913745f4322ebd75f97bcdf1a24240a54e11469bd659fd565fc74cd8eeaa9490434d88444b5a076803cea7 SHA512 5c57f633aa3daa6513b5d35a1157a50308559ad993257374ce4eea0269f6bf384938f95bed749acb19538e8c4672355351fcee5cef9607153463b19227d343d7
AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3
AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a03127ba242ec535b7c8a3af3ad4489661ba7b5f6b074e2af38b12da394c0f8992bd28328d807a89757bb0 SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a
-AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968909e9ee0f109b9151de8157427b0aa8fb0ed89fa6cc4cab6ac6e0a9986c076531cd4aa87bea4e2d25 SHA512 b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5
+AUX rsyncd.logrotate 104 BLAKE2B 8e031a851e527815d26816985b8438dd439614cf8753d5137cccd73703e8311c33560580736b562ae03951520254b1e6a9ad26d587f5157866c2af1c9e648c3b SHA512 e7ff164926785c4eff2ea641c7ce2d270b25f1c26d93a6108bb6ff2c0207a28ebfd93dca39596243446ce41aceaeae62fc2b34084eb9c9086fcdbc03a657eed8
AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
-EBUILD rsync-3.2.3-r2.ebuild 4074 BLAKE2B 94c4dec18019a55a7f9c47c1c859caa9d9a3f245e407e9a0094bba6eb5309c27d2926ea3d5fe76e08ce3cfd71dbd2c92be58c178419a30504d8536d2d72a8bbf SHA512 9f86e4bd40539bcbd0ad396d71d1b95622e2ac96b25d413925c9732b63441ec95717d1f627c5effa73175fdbbf786fd73410e082b2c156ef641bf33b4eb8b2cb
-EBUILD rsync-3.2.3-r3.ebuild 3963 BLAKE2B 92b115ec6174e7b3bf2f60d29b9b34eb8c103ef5d88b66d692e9172e5bced76568efacb7e2f993d5e367e6130adb3ef049fe93be4b01e4e1d15cfbd3c2405f30 SHA512 489d75155f40390125567fd6f371bb33129bd12eb99955d53bbb74d0ce5300e91d89f333fa5626479b0af92e386d5f43b5d3ce83b04c00ca5230350e66eb17c6
-EBUILD rsync-9999.ebuild 3904 BLAKE2B 2e0ee58ff446a942084240e1f1e91d32e6ce37da72b6be5cfc89dfab97487adeb6e6422d7ce24b13ffc7725d0c00cf5a92772f5a3f31ea3aac62284397f4c608 SHA512 c4c72c379a294686926da24fa2c0a45a70566a5f9be4ec7989560e119ea3b10d25b1a33e7f2f4ba4d1ddb1502ae8c9bb34ff41ee134a9cb6f6d9b8e5b3b7f94e
+EBUILD rsync-3.2.3-r4.ebuild 3963 BLAKE2B 17f902650a030111cb232102e132b8aeffc680fd2ae1a91a12cf9ee755a0bc4be79368b403aca6ba562c57da56c7e10520e5f6e0fc1c3709a25e7bafe51958d4 SHA512 1c2aeb0a0fd3e192f3bfd88298662e22d2626c8929fbfd3e49a43ac56e6b2c42c07c0c12c916b7bd85c47f2ab9ae683a86b2b8ac2004f5766e1338e65a6f2bda
+EBUILD rsync-9999.ebuild 3904 BLAKE2B 132baf8b3aab2eeb43b888947c1c280d478d3524f5a2f7a7f460952e82f9837367b83c86fee945da2ca9537655cc50c83c23fe8465e562717c5943aeccc761b3 SHA512 7986da32b9b1009f2f7d29c5e4b94b414e1520be8bfa6d1b0902bd1dc97cdc150ba68b50b99d1e68fca7ccde6c6126ece21461b7280be6154d9ed03967892fad
MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d
diff --git a/net-misc/rsync/files/rsyncd.logrotate b/net-misc/rsync/files/rsyncd.logrotate
index 34bcf72d210c..ec8a98284e23 100644
--- a/net-misc/rsync/files/rsyncd.logrotate
+++ b/net-misc/rsync/files/rsyncd.logrotate
@@ -2,7 +2,7 @@
compress
maxage 365
rotate 7
- size=+1024k
+ size 1024k
notifempty
missingok
copytruncate
diff --git a/net-misc/rsync/rsync-3.2.3-r2.ebuild b/net-misc/rsync/rsync-3.2.3-r2.ebuild
deleted file mode 100644
index b877bc20ccdb..000000000000
--- a/net-misc/rsync/rsync-3.2.3-r2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ "${PV}" == *9999 ]] ; then
- PYTHON_COMPAT=( python3_{6,7,8} )
- inherit autotools git-r3 python-any-r1
- EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-else
- if [[ "${PV}" == *_pre* ]] ; then
- SRC_DIR="src-previews"
- else
- SRC_DIR="src"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- fi
- SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
- S="${WORKDIR}/${P/_/}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE_CPU_FLAGS_X86=" sse2"
-IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd"
-IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
-
-RDEPEND="acl? ( virtual/acl )
- lz4? ( app-arch/lz4 )
- ssl? ( dev-libs/openssl:0= )
- system-zlib? ( sys-libs/zlib )
- xattr? ( kernel_linux? ( sys-apps/attr ) )
- xxhash? ( dev-libs/xxhash )
- zstd? ( >=app-arch/zstd-1.4 )
- >=dev-libs/popt-1.5
- iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}"
-
-if [[ "${PV}" == *9999 ]] ; then
- BDEPEND="${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/commonmark[${PYTHON_USEDEP}]
- ')"
-fi
-
-# Only required for live ebuild
-python_check_deps() {
- has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
- if [[ "${PV}" == *9999 ]] ; then
- eaclocal -I m4
- eautoconf -o configure.sh
- eautoheader && touch config.h.in
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
- --without-included-popt
- $(use_enable acl acl-support)
- $(use_enable iconv)
- $(use_enable ipv6)
- $(use_enable lz4)
- $(use_enable ssl openssl)
- $(use_with !system-zlib included-zlib)
- $(use_enable xattr xattr-support)
- $(use_enable xxhash)
- $(use_enable zstd)
- )
-
- if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then
- # SIMD is only available for x86_64 right now
- # and only on glibc (#728868)
- myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
- else
- myeconfargs+=( --disable-simd )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
- newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
- dodoc NEWS.md README.md TODO tech_report.tex
-
- insinto /etc
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
- # Install stunnel helpers
- if use stunnel ; then
- emake DESTDIR="${D}" install-ssl-daemon
- fi
-
- # Install the useful contrib scripts
- if use examples ; then
- exeinto /usr/share/rsync
- doexe support/*
- rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
- fi
-
- eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
- systemd_newunit "packaging/systemd/rsync.service" "rsyncd.service"
-}
-
-pkg_postinst() {
- if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
- "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
- ewarn "You have disabled chroot support in your rsyncd.conf. This"
- ewarn "is a security risk which you should fix. Please check your"
- ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
- fi
- if use stunnel ; then
- einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
- einfo
- einfo "You maybe have to update the certificates configured in"
- einfo "${EROOT}/etc/stunnel/rsync.conf"
- fi
- if use system-zlib ; then
- ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
- ewarn "using the --compress option."
- ewarn
- ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
- ewarn "and the --compress option, add --new-compress (-zz)."
- ewarn
- ewarn "For syncing the portage tree, add:"
- ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
- fi
-}
diff --git a/net-misc/rsync/rsync-3.2.3-r3.ebuild b/net-misc/rsync/rsync-3.2.3-r4.ebuild
index d5c381d9ed3b..34c869e7619a 100644
--- a/net-misc/rsync/rsync-3.2.3-r3.ebuild
+++ b/net-misc/rsync/rsync-3.2.3-r4.ebuild
@@ -119,7 +119,7 @@ src_install() {
}
pkg_postinst() {
- if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+ if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
ewarn "You have disabled chroot support in your rsyncd.conf. This"
ewarn "is a security risk which you should fix. Please check your"
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index de005c109c3c..a0178f21af56 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -116,7 +116,7 @@ src_install() {
}
pkg_postinst() {
- if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+ if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
ewarn "You have disabled chroot support in your rsyncd.conf. This"
ewarn "is a security risk which you should fix. Please check your"
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index e8db9443ae18..f05a73c90800 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,3 @@
-DIST rygel-0.38.4.tar.xz 4123464 BLAKE2B b807dd7fd20c0fd77da6af49cb32399d3e83cd45f1eed121d9b16f201aff260eb4a381ec47774c638a274e83a9b4a1c10d6d317374891ffdb792217e2693fdb5 SHA512 791dcc624f90cdc77bd00e9513c15998d42979e0b3255dcfda771e1d9d718fe4a0127ba0d18e69b6f4e9259c9e691e187b69c6c55c5c35ccefaf5daf65a1f447
DIST rygel-0.40.1.tar.xz 1693996 BLAKE2B 505b96152c0b73bda2b7c81cb742f48cfea86738ea965f07afc1532a77e2262a5c0050eab185a33a831d57fc2f3c85247bc2a02bf73eab5d0be35817e8f00aac SHA512 180f143f394d7a2697c888eef7e7c2bdb5077b4ad289eb6e3f832cc1efde5147248b46e5ad9e77615d7976de7e7d3e68d737732bf7f91f01c42e18e06d8f89bb
-EBUILD rygel-0.38.4.ebuild 2210 BLAKE2B 5a42d1a38b0b1c5d035316fcff1db6329247793a80ba65a65c63016656194052cf3115a4350e330b1cd1dd426aaf4f20a704ed001e7817c7393496ca68204682 SHA512 073d660ade82096ba760306e4f59b5d8cacbddc634c9015f78aad14ae73ab53be0259ad603f1063ba169582b4e0e1271e055beed3304d38496cf0a05bc748620
-EBUILD rygel-0.40.1.ebuild 2197 BLAKE2B cd303ee282e419ba6170ef0189ac14460f32c9f29eb85549138196e4dc3880a2f5c03c3b293f08b1f7e1f12c6bb65b8b30083217235e591551127b9690125a87 SHA512 54d32e7d8563ba598e159e56bc99650420e89c5ad91cd55115dbd754aae516a76cd8734142bd1d2f6ccfd3c1544b4edfb49f59df7b755a11bfd3016f1a73aa13
+EBUILD rygel-0.40.1.ebuild 2195 BLAKE2B 622a36e1b407b1a7d596b41f54a7bf9f22bfe01253c3aa73c6c316c3552a41232e4afbc001961f63ea47af89f3175011ec3e274e1329fc513652863efd9150e7 SHA512 4b665f5d653d7645255f0276627f4c732c8820ad69e7150126a58f89f455881457a92266fff5dbc092bd1fe2d3fa8038bf5a842f2008f88c896a484c353035f1
MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce
diff --git a/net-misc/rygel/rygel-0.38.4.ebuild b/net-misc/rygel/rygel-0.38.4.ebuild
deleted file mode 100644
index 4abd0d800fdd..000000000000
--- a/net-misc/rygel/rygel-0.38.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X +introspection +sqlite tracker test transcode"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/glib-2.44.0:2
- >=dev-libs/libgee-0.8:0.8
- >=dev-libs/libxml2-2.7:2
- >=media-libs/gupnp-dlna-0.9.4:2.0
- >=media-libs/gstreamer-1.12:1.0
- >=media-libs/gst-plugins-base-1.12:1.0
- >=media-libs/libmediaart-0.7:2.0
- media-plugins/gst-plugins-soup:1.0
- >=net-libs/gssdp-1.1.0:0=
- >=net-libs/gupnp-1.1.0:0=
- >=net-libs/gupnp-av-0.12.8
- >=net-libs/libsoup-2.44:2.4
- >=sys-apps/util-linux-2.20
- x11-misc/shared-mime-info
- introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
- sqlite? (
- >=dev-db/sqlite-3.5:3
- dev-libs/libunistring:=
- x11-libs/gdk-pixbuf:2
- )
- tracker? ( app-misc/tracker:0= )
- transcode? (
- media-libs/gst-plugins-bad:1.0
- media-plugins/gst-plugins-twolame:1.0
- media-plugins/gst-plugins-libav:1.0
- )
- X? ( >=x11-libs/gtk+-3.22:3 )
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- >=sys-devel/gettext-0.19.7
- virtual/pkgconfig
-"
-# Maintainer only
-# app-text/docbook-xsl-stylesheets
-# >=dev-lang/vala-0.36
-# dev-libs/libxslt
-
-src_prepare() {
- # Disable test triggering call to gst-plugins-scanner which causes
- # sandbox issues when plugins such as clutter are installed
- sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
- -i tests/rygel-playbin-renderer-test.c || die
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # We set xsltproc because man pages are provided by upstream
- # and we do not want to regenerate them automagically.
- gnome2_src_configure \
- XSLTPROC=$(type -P false) \
- --enable-gst-launch-plugin \
- --with-media-engine=gstreamer \
- --enable-nls \
- --with-systemduserunitdir=$(systemd_get_userunitdir) \
- $(use_enable introspection) \
- $(use_enable sqlite media-export-plugin) \
- $(use_enable sqlite lms-plugin) \
- $(use_enable test tests) \
- $(use_enable tracker tracker-plugin) \
- $(use_with X ui)
-}
diff --git a/net-misc/rygel/rygel-0.40.1.ebuild b/net-misc/rygel/rygel-0.40.1.ebuild
index 3adce2028c6b..b6b7bad539db 100644
--- a/net-misc/rygel/rygel-0.40.1.ebuild
+++ b/net-misc/rygel/rygel-0.40.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
RESTRICT="!test? ( test )"
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 78502260a509..1c24c0f19b27 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -2,6 +2,6 @@ DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63
DIST streamlink-2.0.0.tar.gz 497816 BLAKE2B e0d8ebf2ae72bb2dc9c9a22810577a34ae6fe3a81bb75b03f5186c69170b9ed94311c1e018bd2a2a0e9a5fc1d8f8470de431f602bd3c8bb2d215c9c8d87dc867 SHA512 ce8b34670ea991ddd9b86eb4f05233468ad9df7ea743ed047cd2e3de8d0844dcded082df1215273e8a22ac5386dd17f64c80662b80fb8dbfae421b7f18c146d6
DIST streamlink.1-2.0.0.man.xz 12956 BLAKE2B e4e24f1f04a4edabcc9973005a1097a6ed0cf450bf65624fee9dee13c39312e96d48a91c5558b5b4f2e1122510ea64d497588c42c1c6f2a83f1bb6fd92843419 SHA512 3d857b953a10a4c4ca9906cd03d170a7b76ecf724c3627571b90fa584c729cce54f492438c7e9aae32fc65b5c0561e0d325b0b1f9bcc69a98bc000b81e5492c9
EBUILD streamlink-1.3.1-r1.ebuild 2060 BLAKE2B d3e2cb738d52fb3cb03e0adb0a15f2422335200fd1d83788a9113a2ad4ec761d3022d0884d67486d515ad237230d7fff2ac80f6fbbac501e8c0f072177fe18a3 SHA512 1d2f6d2adc441298e75402170b40a6d1baacf9097b566cb030f919b8362b9beb82dcd8f9b1bb3decc9e3da595309fb3ef786d4c26ab2ef3ebece333372a37ab3
-EBUILD streamlink-2.0.0.ebuild 1864 BLAKE2B f2bedcafea2b70bf26914e9f21016cb581da9da8256f4a20b748ae5fa12ee6f19288f78c372c9a5195e525eadcb9a7330bf1d2aaaaf5f988aed9787ff92fb241 SHA512 1cf95eb03042e94a745bd21abe5f84dbfda25a1a875d0042368cd46f41ad8b6d68956bc5338c9cca7fb3ebaec057bbc53bfa45a36ab4c0176ff75ecb6ae68719
-EBUILD streamlink-9999.ebuild 1864 BLAKE2B f2bedcafea2b70bf26914e9f21016cb581da9da8256f4a20b748ae5fa12ee6f19288f78c372c9a5195e525eadcb9a7330bf1d2aaaaf5f988aed9787ff92fb241 SHA512 1cf95eb03042e94a745bd21abe5f84dbfda25a1a875d0042368cd46f41ad8b6d68956bc5338c9cca7fb3ebaec057bbc53bfa45a36ab4c0176ff75ecb6ae68719
+EBUILD streamlink-2.0.0.ebuild 1831 BLAKE2B 2c65f0230f4f5a6170ee647acdfa0c3c0bbcf1b6b11e77ac23cc05c6ec6acf503c42c2db55a675477a572c748c17859bddccacebbe291445e6de0a20ffeb6b39 SHA512 5355ba71c7c018c26c43e3a6686bea68d90b91eb307c4a823df052abc3d38ecdfe1ee90d491f1a0a12c2b87e240fe5c6572bf9755ea8327ecefd7b061957a25b
+EBUILD streamlink-9999.ebuild 1831 BLAKE2B 2c65f0230f4f5a6170ee647acdfa0c3c0bbcf1b6b11e77ac23cc05c6ec6acf503c42c2db55a675477a572c748c17859bddccacebbe291445e6de0a20ffeb6b39 SHA512 5355ba71c7c018c26c43e3a6686bea68d90b91eb307c4a823df052abc3d38ecdfe1ee90d491f1a0a12c2b87e240fe5c6572bf9755ea8327ecefd7b061957a25b
MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672
diff --git a/net-misc/streamlink/streamlink-2.0.0.ebuild b/net-misc/streamlink/streamlink-2.0.0.ebuild
index 22a91c1cf0a9..4c7dab37c195 100644
--- a/net-misc/streamlink/streamlink-2.0.0.ebuild
+++ b/net-misc/streamlink/streamlink-2.0.0.ebuild
@@ -8,11 +8,9 @@ if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
fi
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE='xml(+),threads(+)'
DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
inherit distutils-r1 ${GIT_ECLASS}
DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 22a91c1cf0a9..4c7dab37c195 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -8,11 +8,9 @@ if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
fi
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE='xml(+),threads(+)'
DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
inherit distutils-r1 ${GIT_ECLASS}
DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index 2420bc807f17..424d4921ce04 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,5 +1,6 @@
-DIST sysrepo-1.4.104.tar.gz 673855 BLAKE2B 4b3a032538d469bb87d7975e559b329a2d0e1b7d805fda393de47d2be759ab0c37b6d8a7ada6058ec11ba636fb71f358c3e8af4c7a9064859eef9c319566d0de SHA512 a3d518cc2d9c808333906ea3123b09abacb4f83f430e621167577112b95280b389bf19fa0aa47a4e74fca469420d12d585d2ab9c0d63a06e6db087f49817bfb6
+AUX sysrepo-2.0.1-cmake.patch 749 BLAKE2B 40419e1ac3cd9459587f5af1a54a89cbce3b770e81e2c891a6a5dd8f12da9499cdea470951b65233ac43095282892069a976b2f13753332a3981d9779a635ec2 SHA512 9b2d89bf5f6fea6b088d672c51c6b7691375ca2d824c350b9d21cb72df6f290d31681b51426dfd8d2fa5d027e49177e4d6f7392fb758de5718ecd59a9a674597
DIST sysrepo-1.4.122.tar.gz 679974 BLAKE2B 3161eb8635c3ea7a0168b1a0eb3250da7e8c134030e5c5443d492cb708f095f9af12f08257a7d0b86a084b121754a8f19fa408de5afc32ce82d92bb4c6c7a535 SHA512 ccd603913b0f31f26f990dba8430ad6c1033546cd764396c43cc6667919b486924fc2d2fade77eee9ef7a3329aae2ceaf4acc578613a0c7c1d2a53d3cbf2944c
-EBUILD sysrepo-1.4.104.ebuild 734 BLAKE2B 1119853e40e1e6cbbaf815cad96fe5e4350215ae2038aebb1f933e263ca54796df9e322ea4cc3e54aa8d32184272575f659de0dcabdd3424962393ef7549b2db SHA512 8481d00488d91c59146b8c10f9fdb0d3a2b076befd44d238d73db13ba209e790124c3bdd49a34a088783e39d8c6b54817c47830101fb73c905048f367acaf908
-EBUILD sysrepo-1.4.122.ebuild 744 BLAKE2B 1a454ac7c1229846a414c8ad34bf80fe5b9cdc7c961a0d89654d78e98f98759837e742f3363fe1db50fad2115dcf0049e1eff4ed903c69b6edbd8e3375437214 SHA512 7478c4704c9c8a8dfea9595a7db500cf257425247fb9fad32a573f70f6ea9db0af9bd12f04b1a3d9a196c9a5e82c1dcea24e4575eed51089636d85a54990cf28
+DIST sysrepo-2.0.1.tar.gz 642522 BLAKE2B dc2ce960f1ce4156b89ed8f0ab2c567ca50f8d7fc3bc1151cf52d2302ba8114c8e01b7e295c249176acab6c501fbf45850a6d89fde427be444bcb12ccd243dcc SHA512 c231174980985d7cc7380f2708cd5395f621735cee62923fcb224d09d500978917b4caa7860e4dca8520e27a4f002e7377b987b6738472d6424d09a0894a3953
+EBUILD sysrepo-1.4.122-r1.ebuild 773 BLAKE2B 080c24c14b11ed46417c5a86204e888b8db85c927045a924d55824ee587823c72e135595443b2a0520addfaab84c0c76d2f97a6bff995baa423c422488394fcb SHA512 dc3de4b6afc417add8fc24c9ba17109111229b019ea81162017678c08d3189db80b37131051f32e10e5bd5cc3747bd88de265361aed3024b15b512fd7643e4f6
+EBUILD sysrepo-2.0.1.ebuild 786 BLAKE2B 676f6c564fb8fadd063a9bf4b0e380bf6441bcc6e959c802c48a3a8add0472838adb6fb074092333bf919171fca4406850fab59933ca88357003644f5f6e65ff SHA512 750d39de3bb4fdce534491a8d95eaaf528b4cdb4084125e7fcbaa0d4f457c6918956b820227ebe8842a8864fcc73be29e302f53c2146e5404e826143511d9f21
MISC metadata.xml 448 BLAKE2B 798011f819ee97c46422d54b813c029e04c3d6e093710b0e3f1c12b7b0dd7d5b36d5dc83910f33436a1a8d93b548286bc49d5c5510779494cad33e02ffca0dc6 SHA512 f98a83cb700cff73e694f8c70f8bb6de64304cb589c2871f4f4f794890a5178019ece7d4fbef4487508b3d5856dd29d009c70c7fe1cc9ba29b3084d85605c1ba
diff --git a/net-misc/sysrepo/files/sysrepo-2.0.1-cmake.patch b/net-misc/sysrepo/files/sysrepo-2.0.1-cmake.patch
new file mode 100644
index 000000000000..b48a4baad267
--- /dev/null
+++ b/net-misc/sysrepo/files/sysrepo-2.0.1-cmake.patch
@@ -0,0 +1,12 @@
+# ${LIB_HEADERS} are not supposed to be installed here, causes file collision with glibc
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -308,7 +308,7 @@ configure_file("${PROJECT_SOURCE_DIR}/sysrepo.pc.in" "${PROJECT_BINARY_DIR}/sysr
+
+ # installation
+ install(TARGETS sysrepo DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-install(FILES ${LIB_HEADERS} ${PROJECT_SOURCE_DIR}/src/sysrepo.h ${PROJECT_SOURCE_DIR}/src/sysrepo_types.h
++install(FILES ${PROJECT_SOURCE_DIR}/src/sysrepo.h ${PROJECT_SOURCE_DIR}/src/sysrepo_types.h
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ install(FILES ${PROJECT_BINARY_DIR}/version.h ${PROJECT_SOURCE_DIR}/src/utils/values.h ${PROJECT_SOURCE_DIR}/src/utils/xpath.h
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sysrepo)
diff --git a/net-misc/sysrepo/sysrepo-1.4.104.ebuild b/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild
index b962fe8648e3..abea148c94a3 100644
--- a/net-misc/sysrepo/sysrepo-1.4.104.ebuild
+++ b/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild
@@ -11,11 +11,14 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
-RDEPEND="net-libs/libyang:="
+RDEPEND="
+ >=net-libs/libyang-1.0.225:=
+ <net-libs/libyang-2.0.0:=
+"
DEPEND="${RDEPEND}"
BDEPEND="doc? ( app-doc/doxygen[dot] )"
diff --git a/net-misc/sysrepo/sysrepo-1.4.122.ebuild b/net-misc/sysrepo/sysrepo-2.0.1.ebuild
index 8a6de6d35aeb..b35cdd15a375 100644
--- a/net-misc/sysrepo/sysrepo-1.4.122.ebuild
+++ b/net-misc/sysrepo/sysrepo-2.0.1.ebuild
@@ -15,10 +15,12 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
-RDEPEND=">=net-libs/libyang-1.0.225:="
+RDEPEND=">=net-libs/libyang-2.0.3:="
DEPEND="${RDEPEND}"
BDEPEND="doc? ( app-doc/doxygen[dot] )"
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
src_configure() {
local mycmakeargs=(
-DENABLE_TESTS=$(usex test)
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index e02c81c08579..f085842185db 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,11 +1,6 @@
AUX wget-1.20.3-gcc10-fno-common.patch 887 BLAKE2B 34b94aa99b2335ade4f6c3e1fbb5b739143b8a9706d153ba598a1849898151df3482df416075c67efdfbf5adbac4efe3e72d7ff412334dec9647b89cfe1d9a6e SHA512 b7008692ca3a35a49ec206e3314c232b24e26821d280d4346e7a63b8e2d2592614d2b290880379f861bb4f0d97977d0205660d2653b9cce6ac0297c2d224002d
-AUX wget-1.21-avoid_bashisms.patch 870 BLAKE2B 12c695361b55fe9f1cccac1d99294af9685f83a6dc7a05fc0eb90a1fcf9b12677638de9a78db6889a573b365e2688911ba4ddc9b2f9cfb8675b4b1cb594a7d51 SHA512 62c462fca5b4c7600e12c6e0f8895d91ae11f1b14dcdac642e8e248abf83a93bfc045e10245872677d72b5d3720ebaeb62473e6d396e5ced9c77714928d105cf
-AUX wget-1.21-avoid_eautoreconf.patch 214 BLAKE2B f03448fb7d494544d3fe579cc4460ab8d36bb033f0bdcb700fcf851c4e0e2e539bdc5d1bd08dd3fcecf3aa1957ff7ac68a858716fd96a9510f6cbdde64e0b92c SHA512 161f728b002335753ed085052092ae0563ce8120f44ec8bc06a47743ed6528996ec9e00a92de017eb5de863216c1521bd69663f97cc69f64e2579b08b6bb5f27
-AUX wget-1.21-gnulib-utime-errno.patch 753 BLAKE2B 01d236f8252e1ea2764e317f78740fa6479407ec2e25ff92b8be39e5bbadb33b73d263c326f12372a542cb044f52d60cab76caab1f496739c5b4d3a795c3ae1a SHA512 02b48efcad960e7b1b9b623bd8e99a55ce546e149536b9a43a15f494ee256d7c4616a5587734ee3b5c1c90759950cf48ecd54f1918f1a828fabf28e9158347c3
DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712
-DIST wget-1.21.tar.gz 4866788 BLAKE2B e019df0ba0eefb0d6de0e73a73e7dc0ecd46048831ef3b4719ab47ce6895de7da3163902ff19881eb60eb4f67568a7de70092f62a8f8397a5ac9583fb689ad3a SHA512 13313a98f91ef34ad90103f076285549eb4887d77953e9f192d3b0667642b5ceb9e2e30091f766cbf1d6ed423499c497ed85d826f3f3e92f0711aa06d8303c5a
EBUILD wget-1.20.3-r3.ebuild 3290 BLAKE2B 46ba1c5d99cd2447e168c09affd97bcfb2f7f9842e9f9e70922e0579512e810400a7ee01bcfddf4c757440bb5ff6d39101251d75fb54e375cd4e4315d81cc5e7 SHA512 bfbbcbd088e1cb169d4bceea7dd831f5dcda35502545e55b095befe2dc9359daa2b909ce0e6916732af62bf323beb87db5f4640c247ff83de5695e63f901d9b7
-EBUILD wget-1.21-r1.ebuild 3436 BLAKE2B bc9b13ef84dceed0714a423de3c96bd5cb3540a799803e3e9558dbc864f7da14ba347708b55f810eded4320c0581185aaa2231ea2a4f984f122843216bfdb11e SHA512 8d565683e9a0e28897661b57b9e26e288b9a9864d9a40f4e1efa6d4552b4d050b7835dfbf58e322cd928d2ffb419333a499122017ab9faa97d3b1b74adb831d2
EBUILD wget-1.21.1.ebuild 3244 BLAKE2B 66fffe658f8c23fdf58b14af890d0007ccd3c8eeee3bd0f6ce849290eb2b7cf30f698bbf368445fe72b59cb7fe57ebae4ab0d088d002aef644f935c022b8b4fd SHA512 48ddfa4bc61e16977f1ccf181be9e1b93dc4667e264552765145ed03f99d6bedcb3a4ff3053fdfea108903d49a668132f98f583bc9f12621fa79ca4f20ff8baf
MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4
diff --git a/net-misc/wget/files/wget-1.21-avoid_bashisms.patch b/net-misc/wget/files/wget-1.21-avoid_bashisms.patch
deleted file mode 100644
index 478621ecb594..000000000000
--- a/net-misc/wget/files/wget-1.21-avoid_bashisms.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a9092887e0e98877a205e9052930692f35fb179e Mon Sep 17 00:00:00 2001
-From: Matt Whitlock <gentoo@mattwhitlock.name>
-Date: Sat, 2 Jan 2021 16:27:57 +0100
-Subject: [PATCH] configure.ac: Don't use bashisms
-
-Gentoo-bug: https://bugs.gentoo.org/762946
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 96adf13b..f6268fd5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -978,7 +978,7 @@ AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
- AM_CONDITIONAL([WITH_SSL], [test "X$with_ssl" != "Xno"])
- AM_CONDITIONAL([METALINK_IS_ENABLED], [test "X$with_metalink" != "Xno"])
- AM_CONDITIONAL([WITH_XATTR], [test "X$ENABLE_XATTR" != "Xno"])
--AM_CONDITIONAL([WITH_NTLM], [test "X$ENABLE_NTLM" == "Xyes"])
-+AM_CONDITIONAL([WITH_NTLM], [test "X$ENABLE_NTLM" = "Xyes"])
-
- dnl
- dnl Create output
---
-2.30.0
-
diff --git a/net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch b/net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch
deleted file mode 100644
index 0e02851a2577..000000000000
--- a/net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -55925,7 +55925,7 @@
- WITH_XATTR_FALSE=
- fi
-
-- if test "X$ENABLE_NTLM" == "Xyes"; then
-+ if test "X$ENABLE_NTLM" = "Xyes"; then
- WITH_NTLM_TRUE=
- WITH_NTLM_FALSE='#'
- else
diff --git a/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch b/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch
deleted file mode 100644
index 546028c83df0..000000000000
--- a/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6a76832db224ac5671599ce332717f985a2addc7 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Thu, 31 Dec 2020 17:16:57 +0100
-Subject: utime: Fix compilation error on macOS and Solaris 9 (regr.
- 2020-12-24).
-
-Reported by Tom G. Christensen <tgc@jupiterrise.com> in
-<https://lists.gnu.org/archive/html/bug-gnulib/2020-12/msg00295.html>.
-
-* lib/utime.c: Include <errno.h>.
----
- ChangeLog | 7 +++++++
- lib/utime.c | 1 +
- 2 files changed, 8 insertions(+)
-
-diff --git a/lib/utime.c b/lib/utime.c
-index bf7d7c534..337217950 100644
---- a/lib/utime.c
-+++ b/lib/utime.c
-@@ -261,6 +261,7 @@ utime (const char *name, const struct utimbuf *ts)
-
- #else
-
-+# include <errno.h>
- # include <sys/stat.h>
- # include "filename.h"
-
---
-cgit v1.2.1
-
diff --git a/net-misc/wget/wget-1.21-r1.ebuild b/net-misc/wget/wget-1.21-r1.ebuild
deleted file mode 100644
index 3337acda223f..000000000000
--- a/net-misc/wget/wget-1.21-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib"
-REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-RESTRICT="!test? ( test )"
-
-# Force a newer libidn2 to avoid libunistring deps. #612498
-LIB_DEPEND="
- cookie_check? ( net-libs/libpsl )
- idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
- metalink? ( media-libs/libmetalink )
- pcre? ( dev-libs/libpcre2[static-libs(+)] )
- ssl? (
- gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
- !gnutls? ( dev-libs/openssl:0=[static-libs(+)] )
- )
- uuid? ( sys-apps/util-linux[static-libs(+)] )
- zlib? ( sys-libs/zlib[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="
- ${RDEPEND}
- static? ( ${LIB_DEPEND} )
- test? (
- ${PYTHON_DEPS}
- dev-lang/perl
- dev-perl/HTTP-Daemon
- dev-perl/HTTP-Message
- dev-perl/IO-Socket-SSL
- )
-"
-BDEPEND="
- app-arch/xz-utils
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-PATCHES=(
- "${FILESDIR}"/${P}-gnulib-utime-errno.patch # 763123, drop next release
- "${FILESDIR}"/${PN}-1.21-avoid_bashisms.patch #762946
- "${FILESDIR}"/${PN}-1.21-avoid_eautoreconf.patch
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # revert some hack that breaks linking, bug #585924
- if [[ ${CHOST} == *-darwin* ]] \
- || [[ ${CHOST} == *-solaris* ]] \
- || [[ ${CHOST} == *-uclibc* ]] \
- || [[ ${CHOST} == *-cygwin* ]] \
- ; then
- sed -i \
- -e 's/^ LIBICONV=$/:/' \
- configure || die
- fi
-}
-
-src_configure() {
- # fix compilation on Solaris, we need filio.h for FIONBIO as used in
- # the included gnutls -- force ioctl.h to include this header
- [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
-
- if use static ; then
- append-ldflags -static
- tc-export PKG_CONFIG
- PKG_CONFIG+=" --static"
- fi
-
- # There is no flag that controls this. libunistring-prefix only
- # controls the search path (which is why we turn it off below).
- # Further, libunistring is only needed w/older libidn2 installs,
- # and since we force the latest, we can force off libunistring. #612498
- local myeconfargs=(
- --disable-assert
- --disable-pcre
- --disable-rpath
- --without-included-libunistring
- --without-libunistring-prefix
- $(use_enable debug)
- $(use_enable idn iri)
- $(use_enable ipv6)
- $(use_enable nls)
- $(use_enable ntlm)
- $(use_enable pcre pcre2)
- $(use_enable ssl digest)
- $(use_enable ssl opie)
- $(use_with cookie_check libpsl)
- $(use_with idn libidn)
- $(use_with metalink)
- $(use_with ssl ssl $(usex gnutls gnutls openssl))
- $(use_with uuid libuuid)
- $(use_with zlib)
- )
- ac_cv_libunistring=no \
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- sed -i \
- -e "s:/usr/local/etc:${EPREFIX}/etc:g" \
- "${ED}"/etc/wgetrc \
- "${ED}"/usr/share/man/man1/wget.1 \
- "${ED}"/usr/share/info/wget.info \
- || die
-}
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index 72f53c3100bb..2133050bc220 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -1,7 +1,5 @@
-DIST you-get-0.4.1432.tar.gz 149854 BLAKE2B 227fc950dfdfdbcf899a06db37e0b4e9060e7f82bfbae8a8081a6930827d32f59cc0ec32c0c2166f46d55b958930cafdb4bd1e81d46b7326ca759c58e4e68cd3 SHA512 aef856c86f574470ffbe0ebcb056b63f08663c514a68fc3953a2c10497df44d5f76fa19c593c1c02559effd13f32c82bd52738d033b6cd0bd7b1e8f8c418b680
-DIST you-get-0.4.1500.tar.gz 157365 BLAKE2B 4b55a6950c3134792807eedc6e7ba47cae68e909fd29b34d59c289761828814df07bebb8bfe12f7ff0a42e32d0e6cecd770c152ca79ad199ce19f464bdf66ed9 SHA512 133977bfc24b4bd1abd50fcc252d9d75fe166ebe1c02897d0b6720f479a6f9f6368c84d8e9beba2d0c1dedff7a632c67062ee61098f07e5f5ed27c827fbea73a
DIST you-get-0.4.1520.tar.gz 164979 BLAKE2B 063c3a3d14c5430de49fc5ba4e70302048287dad812aef8ba9d2bc67d2089b6f1bcfe4e0db3edf9e1dd0621549104594c8df56acfe8567bd87fb22b9d8ec617d SHA512 fc211753110ffcd39412da82ee11b9a32d98fb9f6caee5ac94732d75c615a8e8439bac247564036b1359bf61422704089e6fca206367f5c7e8fc1f7ec3aff454
-EBUILD you-get-0.4.1432.ebuild 519 BLAKE2B 804b2a951e210bf25f7c5e00fe68cecd9adb72d951b794eb69ec53b867b5e1ccd3ad4279f6a3704b917ef24f6112814412e13207bc9439437f027797fa1349e8 SHA512 dd07cf0556a842c0a00fbde2602779c59f7f80045a3958a9e2a7a2ba11241cf7fa75c39e75cb03fea55417e73ac012c47a360b0293990de884e654522655e789
-EBUILD you-get-0.4.1500.ebuild 510 BLAKE2B 6f52f1d579213889ef26ec16c662acdc07873031a72dfc802760ab960c0c86318861747601e36b6408d44d1e6a368c0d03bfd9e5c0825d20b1d18fb5029a6d7e SHA512 e0c410aed1373a46b8c52d5cd4b1a809df2c8cf8e818f4b1a1fa22c614f1edcb024546b84066eaccb0e24dbc0695d2d5df94bf9859cfc8acfb3ad1056832567c
-EBUILD you-get-0.4.1520.ebuild 510 BLAKE2B 6f52f1d579213889ef26ec16c662acdc07873031a72dfc802760ab960c0c86318861747601e36b6408d44d1e6a368c0d03bfd9e5c0825d20b1d18fb5029a6d7e SHA512 e0c410aed1373a46b8c52d5cd4b1a809df2c8cf8e818f4b1a1fa22c614f1edcb024546b84066eaccb0e24dbc0695d2d5df94bf9859cfc8acfb3ad1056832567c
+DIST you-get-0.4.1525.tar.gz 164972 BLAKE2B 4ac50572a2714d523f4f3a53c0f7329b07faf88a3c22b26bac5b440383bd6d540854d9966c0b10c25b0c207d4e29c6dd09a06c55c68dbed13ba673c29f5f4eaa SHA512 2d9bc2e66da39dbe0146ad4ff88dd1b45ce17a2208b82196c96a36ed1f4a0a86ade274b3c7b8cf683cf46d69f813caed1e24f58a3a7677a29f1999707da9a5ba
+EBUILD you-get-0.4.1520.ebuild 508 BLAKE2B 384915fd1cc4b27a5d407a1a60fab8e2b0c4f0a32bd172111138ed1b5e701ba5c5414c542e6ac45452666f5ee93861f4dd9de458d082231bf662c997ce15073d SHA512 2d375049c7612dd263a59aacee83623a5b13d17df211b5089e27904e4918a2a75ec73eddc0ad6d96a4854faf3b7f5ecfa7adad82d7dbede1c41048e373e396ba
+EBUILD you-get-0.4.1525.ebuild 510 BLAKE2B 6f52f1d579213889ef26ec16c662acdc07873031a72dfc802760ab960c0c86318861747601e36b6408d44d1e6a368c0d03bfd9e5c0825d20b1d18fb5029a6d7e SHA512 e0c410aed1373a46b8c52d5cd4b1a809df2c8cf8e818f4b1a1fa22c614f1edcb024546b84066eaccb0e24dbc0695d2d5df94bf9859cfc8acfb3ad1056832567c
MISC metadata.xml 355 BLAKE2B 634db21b0e450020e42fa7576e04a3015f624b4d9ba3fe4d185897142d81497eecc14ffd35283e7903efb67a02368bbf1b27d507123675169abf0ab627c0b1bd SHA512 1dd99e270059527e7230eeffb8779664977af2f9000a1e4fc2025e377602ba4a1a3f6f8def34eb3854a9284638717eea469581cba61ab0ddf374272be62d7520
diff --git a/net-misc/you-get/you-get-0.4.1432.ebuild b/net-misc/you-get/you-get-0.4.1432.ebuild
deleted file mode 100644
index 797f88273bf6..000000000000
--- a/net-misc/you-get/you-get-0.4.1432.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to download media contents from the web"
-HOMEPAGE="http://www.soimort.org/you-get"
-SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- media-video/ffmpeg
-"
diff --git a/net-misc/you-get/you-get-0.4.1520.ebuild b/net-misc/you-get/you-get-0.4.1520.ebuild
index 93636c539412..a0cb7ef0a1e3 100644
--- a/net-misc/you-get/you-get-0.4.1520.ebuild
+++ b/net-misc/you-get/you-get-0.4.1520.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
diff --git a/net-misc/you-get/you-get-0.4.1500.ebuild b/net-misc/you-get/you-get-0.4.1525.ebuild
index 93636c539412..93636c539412 100644
--- a/net-misc/you-get/you-get-0.4.1500.ebuild
+++ b/net-misc/you-get/you-get-0.4.1525.ebuild