summaryrefslogtreecommitdiff
path: root/net-misc
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/Manifest.gzbin55278 -> 55264 bytes
-rw-r--r--net-misc/anydesk/Manifest2
-rw-r--r--net-misc/anydesk/anydesk-6.1.1.ebuild109
-rw-r--r--net-misc/asterisk/Manifest2
-rw-r--r--net-misc/asterisk/asterisk-13.38.2-r2.ebuild2
-rw-r--r--net-misc/batctl/Manifest4
-rw-r--r--net-misc/batctl/batctl-2021.0.ebuild (renamed from net-misc/batctl/batctl-2020.4.ebuild)2
-rw-r--r--net-misc/chrony/Manifest10
-rw-r--r--net-misc/chrony/chrony-4.1-r1.ebuild (renamed from net-misc/chrony/chrony-4.1_pre1.ebuild)51
-rw-r--r--net-misc/chrony/chrony-9999.ebuild51
-rw-r--r--net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch12
-rw-r--r--net-misc/chrony/files/chronyd.conf-r312
-rw-r--r--net-misc/croc/Manifest34
-rw-r--r--net-misc/croc/croc-9.1.3.ebuild (renamed from net-misc/croc/croc-9.1.2.ebuild)12
-rw-r--r--net-misc/croc/croc-9.1.4.ebuild (renamed from net-misc/croc/croc-9.1.1.ebuild)32
-rw-r--r--net-misc/croc/files/croc-disable-network-tests.patch33
-rw-r--r--net-misc/curl/Manifest2
-rw-r--r--net-misc/curl/curl-7.76.1.ebuild2
-rw-r--r--net-misc/dhcpcd/Manifest2
-rw-r--r--net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild2
-rw-r--r--net-misc/dropbox/Manifest9
-rw-r--r--net-misc/dropbox/dropbox-121.4.4267.ebuild102
-rw-r--r--net-misc/dropbox/dropbox-122.4.4867.ebuild (renamed from net-misc/dropbox/dropbox-120.4.4598.ebuild)0
-rw-r--r--net-misc/ethercard-diag/Manifest1
-rw-r--r--net-misc/ethercard-diag/ethercard-diag-20050321.1g.ebuild28
-rw-r--r--net-misc/exabgp/Manifest4
-rw-r--r--net-misc/exabgp/files/exabgp.initd4
-rw-r--r--net-misc/exabgp/files/exabgp.initd-r14
-rw-r--r--net-misc/frr/Manifest2
-rw-r--r--net-misc/frr/frr-7.5.1-r2.ebuild2
-rw-r--r--net-misc/kafka-bin/Manifest18
-rw-r--r--net-misc/kafka-bin/kafka-bin-2.0.1.ebuild61
-rw-r--r--net-misc/kafka-bin/kafka-bin-2.1.1.ebuild61
-rw-r--r--net-misc/kafka-bin/kafka-bin-2.2.1.ebuild61
-rw-r--r--net-misc/kafka-bin/kafka-bin-2.3.0.ebuild61
-rw-r--r--net-misc/kafka-bin/kafka-bin-2.4.0.ebuild57
-rw-r--r--net-misc/kafka-bin/kafka-bin-2.4.1.ebuild57
-rw-r--r--net-misc/kafka-bin/kafka-bin-2.5.0.ebuild57
-rw-r--r--net-misc/kafka-bin/kafka-bin-2.8.0.ebuild (renamed from net-misc/kafka-bin/kafka-bin-2.6.0.ebuild)16
-rw-r--r--net-misc/kea/Manifest9
-rw-r--r--net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch50
-rw-r--r--net-misc/kea/kea-1.8.1-r1.ebuild74
-rw-r--r--net-misc/kea/kea-1.8.2.ebuild9
-rw-r--r--net-misc/kea/kea-1.9.4.ebuild2
-rw-r--r--net-misc/kea/kea-9999.ebuild2
-rw-r--r--net-misc/miniupnpd/Manifest3
-rw-r--r--net-misc/miniupnpd/miniupnpd-2.2.2.ebuild86
-rw-r--r--net-misc/openssh/Manifest8
-rw-r--r--net-misc/openssh/openssh-8.4_p1-r3.ebuild2
-rw-r--r--net-misc/openssh/openssh-8.5_p1-r1.ebuild2
-rw-r--r--net-misc/openssh/openssh-8.5_p1.ebuild2
-rw-r--r--net-misc/openssh/openssh-8.6_p1-r1.ebuild4
-rw-r--r--net-misc/radvd/Manifest7
-rw-r--r--net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch48
-rw-r--r--net-misc/radvd/radvd-2.17-r1.ebuild66
-rw-r--r--net-misc/radvd/radvd-2.17-r2.ebuild70
-rw-r--r--net-misc/radvd/radvd-2.18-r1.ebuild73
-rw-r--r--net-misc/radvd/radvd-2.18.ebuild69
-rw-r--r--net-misc/smb4k/Manifest2
-rw-r--r--net-misc/smb4k/smb4k-3.0.6.ebuild4
-rw-r--r--net-misc/unison/Manifest2
-rw-r--r--net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch67
-rw-r--r--net-misc/unison/files/unison-2.48.4-Makefile-dep.patch20
-rw-r--r--net-misc/youtube-dl/Manifest8
-rw-r--r--net-misc/youtube-dl/youtube-dl-2021.04.07.ebuild71
-rw-r--r--net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild4
-rw-r--r--net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild (renamed from net-misc/youtube-dl/youtube-dl-2021.04.17.ebuild)2
67 files changed, 447 insertions, 1300 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 987a984b4cbf..83da583669e8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index 860572a93409..21b984613eaa 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -8,8 +8,10 @@ DIST anydesk-6.0.0-i386.tar.gz 5116771 BLAKE2B 074907ac1976a3b9df7df0acf29663039
DIST anydesk-6.0.1-amd64.tar.gz 5209989 BLAKE2B 5588b40460af9033aca744440d5ce43db608b8dc188a33c6f317e5e36c32b5ee8b102761b2153365018dea3a3afad03b4b1a2720cafd98f62789de407deaaeeb SHA512 bdf585bdb6fe5738e253f631807965446f585a4ffed3747b2e147b3f39d474c3a9c6177c88e2cfa1c0ae0e46c0219f581171147393609f0ecd7fa4d6cccd369d
DIST anydesk-6.0.1-i386.tar.gz 5130077 BLAKE2B 9d0467cb24493458efdac6d835b06ef22bb6db3aaeb7277386ae0749c215c3640e722e2e7d17964e32a668d63826a68f3429d3425fb7aabe59a2718648bd2b88 SHA512 58cf2ca8bb67f672ec2ac988216ab593479f09d32e8e6ace93b0d92640197f9d13a637480421be8b038f8840d91a89f97b937c9e3b3f115bc49a5fa852b2c064
DIST anydesk-6.1.0-amd64.tar.gz 5264850 BLAKE2B dd71ca67af11e84860f785a50bfb41a6fedae0f1cd28e9a9061d4f34a84a07add7900eb234ac77b0ffd6c2cb77b2e614e9b7d50b4f7045269c008070ab605064 SHA512 b58cd0bde8ef6bbf4878b276dc45297bdeb5c05c273d41b95465cbfec879b60c9295ae3a76e5cae4940ece5471c13856bb18b2785e0bea1866402afd95f5372a
+DIST anydesk-6.1.1-amd64.tar.gz 5296860 BLAKE2B 676a5eddaa088a62f8f4ecb4b25ecce955331eaf4de383c1b029770e282bc79b45b600cbb7ad8c8918ff540b210e2a6bcee8330603c5bddaea821d794012c278 SHA512 435828660c44437441ab3f5c61783d29f772a958e6b465f24b880014faf120c51dc06a4c1da11bb383be99f9fc1f1f35994ea3a990fc0e94bc18fe26bf95958e
EBUILD anydesk-5.5.6-r1.ebuild 2584 BLAKE2B 7917472494dafd9b8023329e803f517df74cdecb162e0281bb40174bf411fe9b7412cae45a7045c31eeebccbd3d63f7b6ff371c72a8ed94dcdffb432db832192 SHA512 3a6cc70c201cad2633506730804da0a221bca870f8214086c749794feb8291700f672939446a35c23928aadd4b854c60cdbed0319d3d48024e5ab25fbade7086
EBUILD anydesk-6.0.0-r1.ebuild 2584 BLAKE2B 7917472494dafd9b8023329e803f517df74cdecb162e0281bb40174bf411fe9b7412cae45a7045c31eeebccbd3d63f7b6ff371c72a8ed94dcdffb432db832192 SHA512 3a6cc70c201cad2633506730804da0a221bca870f8214086c749794feb8291700f672939446a35c23928aadd4b854c60cdbed0319d3d48024e5ab25fbade7086
EBUILD anydesk-6.0.1.ebuild 2590 BLAKE2B ca86304549b74307150bec314b1039cdcc52e02000bd6888c758f095f06f6df694f8fba2823f0d3b21e494a55667fbd68505371bed8e2028ad5d33996722db67 SHA512 625bb319aafea3cc7524641d07d7282651fd8fba216f117f8d6f642c00977072ecbea7c41af5320bb5ff38600d5a6de3b2cb6c7787acc5941ec7f123c4b32714
EBUILD anydesk-6.1.0.ebuild 2437 BLAKE2B 77218d2eea87f14eb5db5da9ada5d8afc2413affc9a9f28f296774b56f7ebd677bf0e79cdf7dd9f2a7a1d0c68cd008e5da8dc5ffe4cf030ddbb5b48a35c6f970 SHA512 02856b52bc8f4dc4e514b00d510fe6fe213c0a66bffa6e87ff1bb418e2b3e0a6f4ca801167c6bce6a83fcab3f413f58aff21e8b639dfc68a96a3f7b36e0ad8f2
+EBUILD anydesk-6.1.1.ebuild 2435 BLAKE2B c57623bc14cb70281e5de81b1dd299734569993999719be3a98b177fa57d1a6579b553698b3ce2c581799739d0a7482e0ba069297332304953eef056526f3b1e SHA512 00da8d4b62f8d527ed9c505403068a19d6b473ecdccbf7da3798a5e73caba8756d6956b8db64909024ed4c4091d925fa9fa100bfff011ef31bd942c9f0630429
MISC metadata.xml 677 BLAKE2B f5b86851aaa83fc0f0a22739416e5d6fa06e4f8bdd14ed33660219774e1179a9df5e08440e99a3b75f156b72835a6a2c9742ba176828ac6caea9f7d564ebca87 SHA512 824b2ba8de1e03f3089a248226612505b2d0e172443fadc488a45d8f5a4eaa26e8acb8c67f27476dc0d7d8dd8de25950a87225f8495cd1b38c573308c3d1fc3c
diff --git a/net-misc/anydesk/anydesk-6.1.1.ebuild b/net-misc/anydesk/anydesk-6.1.1.ebuild
new file mode 100644
index 000000000000..62fe1172d7a0
--- /dev/null
+++ b/net-misc/anydesk/anydesk-6.1.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop optfeature systemd xdg-utils
+
+DESCRIPTION="Feature rich multi-platform remote desktop application"
+HOMEPAGE="https://anydesk.com"
+SRC_URI="https://download.anydesk.com/linux/${P}-amd64.tar.gz
+ https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz"
+
+# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
+LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+ dev-libs/atk
+ dev-libs/glib:2
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ media-libs/glu
+ media-libs/mesa[X(+)]
+ sys-auth/polkit
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ x11-libs/gtkglext
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxkbfile
+ x11-libs/libXmu
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-libs/pango
+"
+BDEPEND="dev-util/patchelf"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="opt/${PN}/*"
+
+src_install() {
+ local dst="/opt/${PN}"
+
+ exeinto ${dst}
+ doexe ${PN}
+
+ # bug 706344
+ patchelf --remove-needed libpangox-1.0.so.0 "${ED}${dst}/${PN}" || die
+
+ dodir /opt/bin
+ dosym "${dst}/${PN}" "/opt/bin/${PN}"
+
+ newinitd "${FILESDIR}/anydesk.init" anydesk
+ systemd_newunit "${FILESDIR}/anydesk-4.0.1.service" anydesk.service
+
+ insinto /usr/share/polkit-1/actions
+ doins polkit-1/com.anydesk.anydesk.policy
+
+ insinto /usr/share
+ doins -r icons
+
+ domenu "${FILESDIR}/anydesk.desktop"
+
+ keepdir "/etc/${PN}"
+
+ dodoc copyright README
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "To run AnyDesk as background service use:"
+ elog
+ elog "OpenRC:"
+ elog "# rc-service anydesk start"
+ elog "# rc-update add anydesk default"
+ elog
+ elog "Systemd:"
+ elog "# systemctl start anydesk.service"
+ elog "# systemctl enable anydesk.service"
+ elog
+ elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
+ elog "further information about the linux version of AnyDesk."
+ elog
+ fi
+
+ optfeature_header "AnyDesk uses additional tools to query information about the host:"
+ optfeature "lsb_release" sys-apps/lsb-release
+ optfeature "lspci" sys-apps/pciutils
+ optfeature "lsusb" sys-apps/usbutils
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 5cf70699ceae..2982739083ee 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -22,7 +22,7 @@ DIST asterisk-16.18.0.tar.gz 27843069 BLAKE2B 643c371b4747111e233c0758efb529e7f5
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 10793 BLAKE2B 80fafcb1cb0e73db4d3d8fa386d7db287ee952d583d7a014f85e979622d908edc2aa853719feeddab915577a012a75931c242b0f7b4dbceaa8e4ef5be6cfecab SHA512 88d94fc242a934089788a1cde7d7ed30880a9b0bec03c3c5c5fb5c04cdf4f3abe866b7b8c06588739143f83ad41395e99446a4610d6e5e8914269def23e9382c
+EBUILD asterisk-13.38.2-r2.ebuild 10791 BLAKE2B 378bdbcd0cc936a195a72d61ad3bd8e074130fbb6bb7bf2b41eaffe89c2ced1606a53fe8d9d1fab986bedf12622d323bc46395e0914792b7b03911d9384c6193 SHA512 12caa9d74f34658a6888c043a3ce682a67671dfe1528a91712f8a72c73686ddcd881f138c8eff34f6fa4d1fdd0fc43e7a69a9c4e41ee11463e770681200d8192
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
diff --git a/net-misc/asterisk/asterisk-13.38.2-r2.ebuild b/net-misc/asterisk/asterisk-13.38.2-r2.ebuild
index 44754c3a017f..623c8dfd0f21 100644
--- a/net-misc/asterisk/asterisk-13.38.2-r2.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.2-r2.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE_VOICEMAIL_STORAGE=(
+voicemail_storage_file
diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest
index ce091ec44a88..f21f4b3a1ab5 100644
--- a/net-misc/batctl/Manifest
+++ b/net-misc/batctl/Manifest
@@ -1,3 +1,3 @@
-DIST batctl-2020.4.tar.gz 112430 BLAKE2B 3fde106d7c422ed8bf8b259fc4cf95e0732a893eb06eb99da961c2d5664079a3611eac42491855288b42b94de75b642ea515024c309ec2d3d885ebeba828ec3e SHA512 ecb7c83883b7ae2a4cebbb4319ad7f6c2138d68b91cd24b9753b54e8b0c83080e1358dc61a6bd45d03cc64132bc4f2516b3fab422f71a1e63f53a0e2187fd7e8
-EBUILD batctl-2020.4.ebuild 768 BLAKE2B ca5d2c954323ad5bae7fd25e28d424b7aa4199c74fe0fcb830c4a1b29efb7eec557820c5002e1712398944cc6d01ad3059ade5364c2e94a20fd49111b621ab56 SHA512 4e41451bd50f8ff05af910972c7eed68f045aaf41c8e9e2a387ccf35b9f8d36d5cc09433d57ce664d242a0dbe26d6b04f92d65efe7ef49cbe73acd3d32658e45
+DIST batctl-2021.0.tar.gz 108424 BLAKE2B e6823c730348483582ad3724a3ef5a67ba0c429ccea114a650ea23cae22d6fae256f95992777a9a7634ad29315085a3f7f91c6ea45d46568ce9b422fe58d8290 SHA512 87a773667377826d2d7fcdc16d2b34f61e3d02ed8303617bf33f5ef9d5a9c46cfe6bfe560ff8899c45290ce3e8581ddf798991590f48ba3e70b2e0e07f7a8e69
+EBUILD batctl-2021.0.ebuild 768 BLAKE2B c1fb8cbc6b2a57a9374288b095d4a8a7dfe4d4777075d33fa5dbe5a4ee6fd301c1b9b16bda759d17ce7b1aa71e60edc15d1ee58ea19f2b6cde65b063c31a278a SHA512 6ec88c6d9839c39ce95722a31fefa722c14a24324001d43c0bc18fd26375ea6ad1623d38a42bdde19bc9e35545668680591930e1a77fa63c5b57c52f91462868
MISC metadata.xml 405 BLAKE2B 719af4f8dfc3545f1a93dfc42ef385658bf2de2aad67deb3abc16f2f898dca06af6b85047cb98d83eab2dfb988f65141742f3d19119a743d5540413e3a2b2168 SHA512 6e428a8de5643d3d151ce8375e8077a7519fd9c9bb11a82a6c83d6365c4e40f7632cc06e19d0b1ce1d39da8bf79b4b4dbd8a3921af0ca19cf6e556341467f6b6
diff --git a/net-misc/batctl/batctl-2020.4.ebuild b/net-misc/batctl/batctl-2021.0.ebuild
index 52be9621f8af..6ac8ab8cc2d2 100644
--- a/net-misc/batctl/batctl-2020.4.ebuild
+++ b/net-misc/batctl/batctl-2021.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 24e585ca3c7f..8754b275dc7d 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,13 +1,15 @@
AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c321544376ff2e48d67ee13bebcf04a8fea56326bf5efe66f568913dc92ff7f16a641ffb39a456e9cdac6004a6c SHA512 e6febb744476be6c83ac086f2054dc2c190b6e1abd2cf20d4187f222b2485817f06c4ad62b8d40fcea3e18a771cf21899fe0a1dafbfb31f5c99da9092d24d79b
AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4
AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 4e441ea854dda077c68f05b420f50d5374436670270eca6ff5cde50c68ac4060ffd752628dc664eac5a1fc6c21ad42c4bae7df07f9a4963d186dfc41a68f3a77 SHA512 0e6c1ef2b346fa2a722e67d8cf1cbc5e4413c65bba8301e3d0d87590fd9b73489a23807e0f17fa365a66ed1dbf03d86d8c617d54d609bf435816b1266f30f170
+AUX chrony-4.1-systemd-gentoo.patch 309 BLAKE2B 4824abf9130c6861f2966c4cdec93313429df499c14cd75897ffebdcc1bb9dd4058aa4889f17e4549ed5d0c581208c316bc3bd28cbed96030303f401a4dd7bff SHA512 ae5d80bcf16554a22b624c2def7ccabc72cc3dba5dc0fc8096eeb7367b388d02ad2d3ce6119980fc12d573ea0803eeb58cb5b409b0c475f70e75c8d112553245
AUX chronyd.conf 390 BLAKE2B a0058c72ae04371aa273d71f01349a00dfc0d66c016e6c2d977b9499e2ded3072942bb21c468ca9263263d55f1cc35cca4a3a72ee058cc31cf982648552bc77d SHA512 6798d40da70921b95430371459a4b276a88c57ec79f99d0efd214770f5fffee5d80d20baf4313f210b6af46c4aafbb038920cd774d6c03ffbb0849229c431bdc
+AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea7106356083cf1a20bdb8fd4b85bd8cce8cf20ce6839e8788fedc1f94e912ec512193988f83283ceef86d6cfc7 SHA512 ab0bbd07c17e391d068c5a37d5f8d9c8fc2c42add2700869217a95784666bd3f23bebd70942cf11b42c124e0947f68c101153998e89bc61ccb71b30a0187cf0c
AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9
DIST chrony-4.0.tar.gz.asc 195 BLAKE2B 1947a73f35eb5c58f91775d76473210a7b5edff5b808e360eb0c3724351c54ac4f187a2aa4450830130da718c6a0c488baa170ca87e7e6eac781d85c67b3773f SHA512 c3156d91f4fdb6f9e2fdbc83b1399afb0ecdfa9b7bc92648c5bce477c3f0f921d2a13aa21ac6c281f18b008c60f08e3db6d82b642b646f064aea1dbe19295c4c
-DIST chrony-4.1-pre1.tar.gz 563277 BLAKE2B 474d27d0e402d83bda52125940b8205119519b93571e6b8df3fea5eeb5f1f3babbcc40bc81db77bc345830d5e9528ad087ff539026a1a585ce220feeb851e978 SHA512 03e28e6651d6aa3c99333b94ee503843c3a69b8c8366bf647c41a3a9e34e987c440e289ec16e5c62c2a7405271bddc533efbd59d6c6ab43712c8908dfb86322e
-DIST chrony-4.1-pre1.tar.gz.asc 195 BLAKE2B 4a06b35be3257a52cc824e2acfdff32b6598d1744bc23418e89291d71d6d9a86c35559eab26034ce2e05c4152ffb691b5ec4104dc339821e93523c33c8cbdd72 SHA512 8eb695c3f85f90d02b22b1202c8766347289a6da1d0658a3d89eed90202799bcfc647b96e5f931fb862011e85feed5f4914b39e45a3e20f01827509fe271a2d7
+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.1_pre1.ebuild 5947 BLAKE2B 41fa23fb7f17ec9d3c6829b22f74bce01dd1c90e9e483e0631b0c8c472a39cbc7ed652faebcb6ee3961ad090a59a1e6cd20af64ee556e658a80f775baa608209 SHA512 811d728b23e25f0e8b30f0689870c0e75295b9a2bb69d2e7678612644ecb652d0cdeb0565d7d437a417272e10bd99e4c1ae211f90b50d2b06f46f985e35a58ee
-EBUILD chrony-9999.ebuild 5947 BLAKE2B 41fa23fb7f17ec9d3c6829b22f74bce01dd1c90e9e483e0631b0c8c472a39cbc7ed652faebcb6ee3961ad090a59a1e6cd20af64ee556e658a80f775baa608209 SHA512 811d728b23e25f0e8b30f0689870c0e75295b9a2bb69d2e7678612644ecb652d0cdeb0565d7d437a417272e10bd99e4c1ae211f90b50d2b06f46f985e35a58ee
+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.1_pre1.ebuild b/net-misc/chrony/chrony-4.1-r1.ebuild
index c615418eb65b..d3e68c8d0126 100644
--- a/net-misc/chrony/chrony-4.1_pre1.ebuild
+++ b/net-misc/chrony/chrony-4.1-r1.ebuild
@@ -70,12 +70,12 @@ 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-20210513 )"
fi
PATCHES=(
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
- "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
+ "${FILESDIR}"/${PN}-4.1-systemd-gentoo.patch
)
src_prepare() {
@@ -85,7 +85,7 @@ src_prepare() {
-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
doc/* examples/* || die
- cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die
+ cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
}
src_configure() {
@@ -97,7 +97,7 @@ src_configure() {
if ! use seccomp ; then
sed -i \
- -e 's/ -F 0//' \
+ -e 's/ -F 2//' \
"${T}"/chronyd.conf examples/chronyd.service || die
fi
@@ -192,17 +192,24 @@ src_install() {
}
pkg_preinst() {
- HAD_CAPS=false
- HAD_SECCOMP=false
+ HAD_CAPS=0
+ HAD_SECCOMP=0
+ HAD_PRE_NEW_SECCOMP_LEVEL=0
# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
if has_version 'net-misc/chrony[caps]' ; then
- HAD_CAPS=true
+ HAD_CAPS=1
fi
if has_version 'net-misc/chrony[seccomp]' ; then
- HAD_SECCOMP=true
+ HAD_SECCOMP=1
+ fi
+
+ if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
+ # This version introduced a new filter level: -F 2
+ # It's a limited set of seccomp filters designed to be 'bare minimum'
+ HAD_PRE_NEW_SECCOMP_LEVEL=1
fi
}
@@ -210,22 +217,36 @@ pkg_postinst() {
tmpfiles_process chronyd.conf
if [[ -n "${REPLACING_VERSIONS}" ]] ; then
- if use caps && ! ${HAD_CAPS} ; then
+ if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
# bug #719876
ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
ewarn "This is necessary for chrony to drop privileges"
- elif ! use caps && ! ${HAD_CAPS} ; then
+ elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
fi
fi
- # TODO: Will try to re-enable before final release ideally?
- # bug #783915
- if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then
- elog "To enable seccomp in enforcing mode, please modify:"
+ # See bug #783915 for general discussion on enabling seccomp filtering
+ # by default.
+ local show_seccomp_enable_msg=0
+
+ # Was seccomp disabled before and now enabled?
+ if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
+ show_seccomp_enable_msg=1
+ fi
+
+ # Are we coming from an old version without the new 'minimal' filter?
+ # (-F 2)
+ if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
+ show_seccomp_enable_msg=1
+ fi
+
+ if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
+ elog "To enable seccomp in a stricter mode, please modify:"
elog "- /etc/conf.d/chronyd for OpenRC"
elog "- systemctl edit chronyd for systemd"
- elog "to use -F 1 or -F -1 instead of -F 0 (see man chronyd)"
+ elog "By default, we now use -F 2 which is a baseline/minimal filter."
+ elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
fi
}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index c615418eb65b..d3e68c8d0126 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -70,12 +70,12 @@ 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-20210513 )"
fi
PATCHES=(
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
- "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
+ "${FILESDIR}"/${PN}-4.1-systemd-gentoo.patch
)
src_prepare() {
@@ -85,7 +85,7 @@ src_prepare() {
-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
doc/* examples/* || die
- cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die
+ cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
}
src_configure() {
@@ -97,7 +97,7 @@ src_configure() {
if ! use seccomp ; then
sed -i \
- -e 's/ -F 0//' \
+ -e 's/ -F 2//' \
"${T}"/chronyd.conf examples/chronyd.service || die
fi
@@ -192,17 +192,24 @@ src_install() {
}
pkg_preinst() {
- HAD_CAPS=false
- HAD_SECCOMP=false
+ HAD_CAPS=0
+ HAD_SECCOMP=0
+ HAD_PRE_NEW_SECCOMP_LEVEL=0
# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
if has_version 'net-misc/chrony[caps]' ; then
- HAD_CAPS=true
+ HAD_CAPS=1
fi
if has_version 'net-misc/chrony[seccomp]' ; then
- HAD_SECCOMP=true
+ HAD_SECCOMP=1
+ fi
+
+ if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
+ # This version introduced a new filter level: -F 2
+ # It's a limited set of seccomp filters designed to be 'bare minimum'
+ HAD_PRE_NEW_SECCOMP_LEVEL=1
fi
}
@@ -210,22 +217,36 @@ pkg_postinst() {
tmpfiles_process chronyd.conf
if [[ -n "${REPLACING_VERSIONS}" ]] ; then
- if use caps && ! ${HAD_CAPS} ; then
+ if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
# bug #719876
ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
ewarn "This is necessary for chrony to drop privileges"
- elif ! use caps && ! ${HAD_CAPS} ; then
+ elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
fi
fi
- # TODO: Will try to re-enable before final release ideally?
- # bug #783915
- if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then
- elog "To enable seccomp in enforcing mode, please modify:"
+ # See bug #783915 for general discussion on enabling seccomp filtering
+ # by default.
+ local show_seccomp_enable_msg=0
+
+ # Was seccomp disabled before and now enabled?
+ if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
+ show_seccomp_enable_msg=1
+ fi
+
+ # Are we coming from an old version without the new 'minimal' filter?
+ # (-F 2)
+ if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
+ show_seccomp_enable_msg=1
+ fi
+
+ if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
+ elog "To enable seccomp in a stricter mode, please modify:"
elog "- /etc/conf.d/chronyd for OpenRC"
elog "- systemctl edit chronyd for systemd"
- elog "to use -F 1 or -F -1 instead of -F 0 (see man chronyd)"
+ elog "By default, we now use -F 2 which is a baseline/minimal filter."
+ elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
fi
}
diff --git a/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch b/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch
new file mode 100644
index 000000000000..ff3b320d1e47
--- /dev/null
+++ b/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch
@@ -0,0 +1,12 @@
+--- a/examples/chronyd.service
++++ b/examples/chronyd.service
+@@ -8,8 +8,7 @@
+ [Service]
+ Type=forking
+ PIDFile=/run/chrony/chronyd.pid
+-EnvironmentFile=-/etc/sysconfig/chronyd
+-ExecStart=/usr/sbin/chronyd $OPTIONS
++ExecStart=/usr/sbin/chronyd -u ntp -F 2
+ PrivateTmp=yes
+ ProtectHome=yes
+ ProtectSystem=full
diff --git a/net-misc/chrony/files/chronyd.conf-r3 b/net-misc/chrony/files/chronyd.conf-r3
new file mode 100644
index 000000000000..25a4758954ea
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.conf-r3
@@ -0,0 +1,12 @@
+# /etc/conf.d/chronyd
+
+CFGFILE="/etc/chrony/chrony.conf"
+
+# Configuration dependant options :
+# -s - Set system time from RTC if rtcfile directive present
+# -r - Reload sample histories if dumponexit directive present
+#
+# The combination of "-s -r" allows chronyd to perform long term averaging of
+# the gain or loss rate across system reboots and shutdowns.
+
+ARGS=" -u ntp -F 2"
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index 2fd64bc21444..a1b61cded489 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,7 +1,6 @@
AUX croc-disable-network-tests-r1.patch 763 BLAKE2B daf8248adb801bd16f1a567d1ce16746877617a83a2f63ab640312abf3b1089105e8b71b4fcb21ccdf8cd59987ac4e5826463680634c44d417d8bf5c2b514b35 SHA512 659936bafed02bc2274ee7a9a482c711850a08ed1e871584d978930e5b38b019b42b3308a3550e388e04cbdcd92964cb5326fc5825b7b377c11e6ba99660f772
-AUX croc-disable-network-tests.patch 813 BLAKE2B 305ccd0cbfde01e44bc89cc9bd5545134b02df4f91e217f4eca71cbc4b4c0f2fc908912f16b47fd4867c4472cfb861bc17263cf378106d7542a7ec78287a69f3 SHA512 f31578ac1530e20715a4be305a18245f201ea16514bb265c0b676d72190e3ac90d89d1e846e5bfb8199fc0e532ed56b890b7e2b1389834564686c7bb36fc2e46
-DIST croc-9.1.1.tar.gz 2820437 BLAKE2B 55cd043fee62c27e28261826e11c96fec355463850ae459d1709439f74153a8e6f87a65607232a51cc9d0fa0682e7e65f73eb885aee8ce06a46969040784e24a SHA512 88c4399cf64fc7f539ce40599785517dfcc97dd05caeb7d9976e39bf011dfecf8d04b2501bd8b94442ceba56c7515d15cd69b3ee4969cc61cac59e048e8e3bba
-DIST croc-9.1.2.tar.gz 2784568 BLAKE2B e0bc32f5d8e72fafd04d6c10797906f4f5d627dc0bf5a2bfdcd0d1fd55d3ede50332f0e628f147b3c0c99f3da38750ffe318642b3bbfee206b2b954a446fdeb9 SHA512 ca6e45db48eb1fe652fbaa48c0cdd580ea25e5094c462ff9d3dcb545b1f868bb78f91b7c079c7299d2efebb72d41a805b0971f6b2f011a1f642cdc3ea5503885
+DIST croc-9.1.3.tar.gz 2784231 BLAKE2B 844e3b3db6e65ab88fed9162ecfa5ba7e0018f95e466f73314423127557dffb10a3dce46b307c45f7e1b635b7f90edc18af8a42f95b36c17b8f80c24a52e1a5f SHA512 f81230be44f5462a7e92fccdeb63570c9ccca2f02405f4e06019822c6a8c2d5b48c7622dc779bacb5d4120a36c92acff1e7689aed182e7b8db467a3cf4d9ad06
+DIST croc-9.1.4.tar.gz 2785285 BLAKE2B 401f4c033831490e50fefe9c6a49e9296a6dd47d6ab675e2426115a600b019196f1455e71fe8747557bc469ff5b14a7b9a05466872143c916f1c4b152bbad6bd SHA512 667cb636a8fea54997a734f46f2002b179361f54cc5b16f67dcc469645f85a46bfb4b587d720c599654358ea1e6a2ec4a46829f4a6e5c74fc9a574a24d316ce1
DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod 43 BLAKE2B 60ec6257dc0098e3dabfb32b6c668db9159d69dfc7daa06b9d7f9089f4a6dfc11d2b6d39393e1b990f6ca126019baa1b3d99364fe8a6df9ae323626c8d82494c SHA512 be1111b482157b8c8dda0f45a71e587b51ef78cc9676db4cb560bf0e71c112f45bd048bab7f1b0a64651777bb395c0ce210cf3df20a4afe08e66a42b6da89765
@@ -44,14 +43,10 @@ DIST github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod 42 BLAKE2B 28d1441e2d219c81
DIST github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip 4494 BLAKE2B e17a498a1c54d88a2e98483c52efbd8e0150a728c299e0bb0319ea820cc50276e5f2727c549a126d3094efe9a889adcdc2862286f19fcb870abe8a9157fac4ee SHA512 25f1fde274a499c5ade50061cbb5727f2798158b1547092b298d36b89ed0efcfe84b727e20a3dc980b1f9fcaa1a0dc07f8e0369155df11bd5f76b8fffbb32a64
DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod 72 BLAKE2B 5f5815449eb44d202f99b7e2168a08000eba8b70f3b669190d8ebd8d485adada71049cacc71b6e72931d45284565b816597f995e16858b2fd0a2eef2cd815c7d SHA512 eaedd08e8235f2a61d8e3c8e342b1773d2d687351e715adc8ea13d1e49511d16c6f8d5510bba5ffcb9d295a64813d21214e6d55dadcd1c8686f9c3320a9d2511
DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip 21717 BLAKE2B 611144d8f187db3a63bf6c8dce9b2b4752551c412a5228c4d52c7f24cc65336b95e6d2ffb8f20baf50d0ebf90ae77998c6ec6c5618c0fbebf5b312a7b26be892 SHA512 bac0d4ffb2e4bb0dcdcebdd5d651984dc9b1be639a7de249b1ba47bd66d7d4f0aad3ae7b9ba9ea6ba032204e543feb3b83b77e86e7a5de295f2fd06a0f8876b9
-DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.1.mod 200 BLAKE2B ac3886b13c5b45725a8b53e9f8c03b577cc1ade1d81947bc441e28d107b0cb402621def301c3507ffbae3ad822af7f04307794e6b215209ab12ccc30b0d35b39 SHA512 01d5e9bb9869ab766d61ab82cd383eeabef10b7f93a708271824958ce4f2cd6fa1140b21065809b0141c795c025c22f04501cf8874804a1fa3445ad722e42a13
-DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.1.zip 11583 BLAKE2B f1e557e34acd31eda481a39b053211bd581dd64019afe305c236886970cdff4489825e5823e28f83fbe7c0bbaa4229bc14714fb28d00d3023acfa8f9247bc804 SHA512 3fa8341a5e534baa4b4cde61df068e67db65fdbadc3bfb48bed3fabea3d6acadfa04dea950286d8a1778a18afa2b09564948f53b8da65e8b58481d2baeebbb60
DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.mod 200 BLAKE2B ac3886b13c5b45725a8b53e9f8c03b577cc1ade1d81947bc441e28d107b0cb402621def301c3507ffbae3ad822af7f04307794e6b215209ab12ccc30b0d35b39 SHA512 01d5e9bb9869ab766d61ab82cd383eeabef10b7f93a708271824958ce4f2cd6fa1140b21065809b0141c795c025c22f04501cf8874804a1fa3445ad722e42a13
DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.zip 11584 BLAKE2B 436025438469ea00bca4fd958a604a29d688bf0c9c205e651d814458a35728d065c7c1af9f5bf3d39b61bf629581656578b9453fb788cbd9c71af83c7f9416be SHA512 c16986d2d0ecda2c9b119abfb4565eab79c829d8eaf0c2be00079f21b4f4988fb13bcd3e61add4a5781511aecbd1411d6a9da3aea12401db89ad41a67c409522
-DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.mod 216 BLAKE2B cab544fefb07749635d4f00451aececdb02ee3f24a08762f5ce2af7ca356693b2dbadd1190fae5aa0b67564d34faa5afef9882ceffec4389c2ab26b6e5da70c2 SHA512 4ebaa50c73558c972222a6c44f768442542ceef31a1b4372df732b6c634443cdda8dc6ab8e468a53380a4323e05464b995364109ae9f17e215ca2eb55f0b5665
-DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.zip 9036 BLAKE2B ee36c5c39df2e10c28c6caae3b40c876ab88fd314dfe65809f92914429156cf87eafb0f9709df8a6b9ca45427a69dc62d03591c4d3da00376c4065617f44799c SHA512 a1686577f23bdc2121197742103a4c35685e3aaf4251ee26e2352f830a1244eaaeceb859cba23410a1a12d6d59e9f62b03cd8aeaf287d10c59db6c784d51ac68
-DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.6.mod 595 BLAKE2B c96dbd7220e3f018eff0feacd44ae0330edab515a8f5d8b8be1e2e65f429e6b9927a38425f0629ceac2a812773dbf9feeae5c37302e120b4d4bd6ed698d09e16 SHA512 29ec96afa5026e9b5238db5fe506979ae88689e25bec6e76a6acb7d9ef79e6126a642c0ccc11594ac5746654dcfa0104470b99a60068efea44eb01c247265f55
-DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.6.zip 606458 BLAKE2B e22a5c544a46b42aff8cdcd1fee43531d63ecd13a25b2b876004ac754c117ade1599ba14b180732361f045a13c31056db84451e98d68cacde7e285e3c86ffc99 SHA512 4548ec4cc5645c7ffbf0eba82a31512711b57368c408aebf884a314a6dfd49035f3e6391fbe526194357ce11c0ac717fd7f1d45a308832dad47e6862b1bcc8f7
+DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.5.mod 216 BLAKE2B cab544fefb07749635d4f00451aececdb02ee3f24a08762f5ce2af7ca356693b2dbadd1190fae5aa0b67564d34faa5afef9882ceffec4389c2ab26b6e5da70c2 SHA512 4ebaa50c73558c972222a6c44f768442542ceef31a1b4372df732b6c634443cdda8dc6ab8e468a53380a4323e05464b995364109ae9f17e215ca2eb55f0b5665
+DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.5.zip 9383 BLAKE2B a703122effe26cb19f7e591c32fb75797b09c9bd9b089f1db4b4d273e7ee6a23927c6db5d9cb0ca9b1e27ac038ce5c0bebb6ca58eb3e4f1672251470e948bd35 SHA512 971532b3a65a0294a96bef3e92f4e3426791c27635cbe359f5e55916ce73bcabfae038864b2e399b6d0d287035bb836935d9cc5424c9569fa834e8c468041f12
DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.0.mod 595 BLAKE2B c96dbd7220e3f018eff0feacd44ae0330edab515a8f5d8b8be1e2e65f429e6b9927a38425f0629ceac2a812773dbf9feeae5c37302e120b4d4bd6ed698d09e16 SHA512 29ec96afa5026e9b5238db5fe506979ae88689e25bec6e76a6acb7d9ef79e6126a642c0ccc11594ac5746654dcfa0104470b99a60068efea44eb01c247265f55
DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.0.zip 606683 BLAKE2B 52a01c6532d69a877a53cdac3faee136edc3b4c913aa97c03de2ae2bf149f6d2edbeef3e1623fe9453a56c5143b9f669c5bf131708aadb3c562214b3d1a64cbc SHA512 eee7b75e41ce80c290b1cb1bd9199687a5b0c02d98eafcc74a42be21c0565834cec0809f6d03ffe232793566c5e2fc5b99d2f5573fa58fde89b185eef8692841
DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
@@ -68,34 +63,25 @@ DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.mod 40 BLAKE2B 0d12dc1fd09b245563
DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.zip 18374 BLAKE2B 6e50720c2fab931d282011fa0025c42f26942871a932fd0631aeae3ff256a18a7bdee8cd254e1cde12af4e65f56f0c6588505832e5e181fee23c2e5342eabef6 SHA512 e2270a2e07692e777b933b64b72dcf47b2cd1b24c2d1eaac3d9190f2d4cea930202e67ed73c23e29e4c0e7ca52671266de027ef2e9e034913ffdc6f09b33278d
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210415154028-4f45737414dc.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210415154028-4f45737414dc.zip 1865333 BLAKE2B 58893c3623e8ae23e9dbb28cfbb4faa45b949b640489e5e8e677b52292afd272da6075d5a9f532fe6089412ea0324b87db31c7bbb5831c35fc817a11892a2aba SHA512 ee1b82519e67b583b967d7426c0a4bab55253039259dcb1ac9bd053a16623a9fe9e9a491e5c540499e69bd20b1f05c2ff4a31e3dd5f8da175ead4b784bb8dc90
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210506145944-38f3c27a63bf.mod 247 BLAKE2B 66c7bddf0c6300cb14884379a13eacf7ce4cbd1e86cdd94fbef5f67bbb27e263ecd4cc2c936b7f95751b7afadee561629014be9d997159c742be2e5ce7bf099d SHA512 36d6474a79deda7b8749681b46e682e0440d07b3e8930279c66a45c0d42a6f2c6dd75b7bc7c3cc1ef50cdeff988442630af904ff0f58bb2def5f49040ade16cc
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210506145944-38f3c27a63bf.zip 1874428 BLAKE2B bc63491e97e9a528a252723dd16ac8e79d7dda0a022be2f0b94ae68017f14759127bbc398b721efbca6f270ccf4ea7146cd267be68898369a81bb2368cc367e6 SHA512 203fa97ecc318bc5a6de3a79380d52863b7280eeb7e1509f092d04bc6c1d6f89e32b5c836622adbee2031f2482d4d63e0e2e2523fe1c610ce6eb08f338fcb523
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210415231046-e915ea6b2b7d.mod 179 BLAKE2B 1d41797e9cd238f294cd4d01f3115a496d72952d4aa92116e99de7fef6d5881b8e532e4c419c36dbd58a04e4cfd27c814936e5b51ca99f47c9bee8578eb9d71e SHA512 ea5604f4e47cf196e4ab474016327b04c27aab3ef394d19f15a0a34d763f659c1764dea0554de8afbc9ec28168681f1ea1e03a6ef64fc1355f0e0d7c4ef709a1
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210415231046-e915ea6b2b7d.zip 1565776 BLAKE2B eb0064f562896b0e6ae48369150c663f66ed93ced8d05f355e8c6ad7d53b9e6b7f4b1ff5d4c0dfb6a7e5b23e6344a90e9e02304ece8d669578d56bfa9517d27f SHA512 dae90ddd392edd9d13a21e183c1cd1e8ab37c595172612f499dd264a599cd9ea191e5a84a7ae4f26baca2615c6bd18671a63b9844dd4b84a5af13585582b3fc9
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210505214959-0714010a04ed.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210505214959-0714010a04ed.zip 1563787 BLAKE2B dacd05c5aa5769245e305f6a1909d8db3c9aa2fba479965b620ac2e093788f586e57102df3bcccfde8d4a8c13cac4a714c075506ffc5ff9146b339562d7b72a9 SHA512 5d517a263e8a7ec74a84c6306596a26f434bdffa85f3334c77665977a3f8f9359eb21720f1c9ba47f8a253ecc83efd725cacc5301df43948d17dfd1315120dd9
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.zip 1565631 BLAKE2B 80fee98ed18592b39375d95aa4ca99752d13c55ef618414c8983dba3faf1faa8baf8c47b1e1f7350dcc4d2b90093990f2738f3c4638d5cba2a7ec11c7685d3cb SHA512 8b376daeb6c9dbe8ede34b94dd4efd02419151d9a50d92891a8d199393c304b0cba5921e6d990a8f141ed58ec1f1395f0281d3b0ac1fee0c42f84ce2458ac801
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210223095934-7937bea0104d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210415045647-66c3f260301c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210415045647-66c3f260301c.zip 1668770 BLAKE2B e071f99a42996d0a84bf57f5f7c3d081d85dc97f64fc952c796323c76745b55bf9d7edbea2ffd7fe8598c8e69eba540c6fbe6df56fc1c21bc6db3fde2b0df17d SHA512 fd719c0cadd011e001a94453e97d496b5daea4afcc95a7747dd090bbb4cc38ceb5262f7183800adda7791aaf75206831cbe60553faf4f950706dcf8336136967
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210507161434-a76c4d0a0096.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210507161434-a76c4d0a0096.zip 1634364 BLAKE2B d1f30deb0d15aebbf986cc79f797f53db03521e109a8642ca1fc950cf1c94942e2309a7136c42470cad9fedb586afceff4087acad885bebaa6b9f4e7524ebe8f SHA512 e5c0b615cb8161d2efadf58e3c411dff7f62e14a836379d6024924c0dbcfe54ff4d3bc20cad86fb20d0c8a4b391e2061a3d75ac3033ee17d6d804eaad32c40e4
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210511113859-b0526f3d8744.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210511113859-b0526f3d8744.zip 1634357 BLAKE2B a30240d51cb13049e8705df0160afff8fdc3707d2287e32261b5d909e60e02af13e292be839c3731ec3ed75dc3215d809d21ac53d46d5118ce928ad3ec6a2488 SHA512 79105ca14bd2eadd6351300b7adb954129597309246e1a2e8dcd8ca512113e576c3198c28441069bfa6f4ffc4fb4072e86ff679ae4b168dd52a6c36af8698612
DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.zip 22672 BLAKE2B e36e6cfa566c936219702eb086d6fe20936dfd57b58f7643331b116b63dfbfd40e679794d453b9a4c5952d5523a52dc6538ea05466e6a291f9d1240d3a2381c6 SHA512 9dca218e749d2a405b7d7bdc29ce1a3219e5f965103a7cccd5468c861262539c0c13212b28059d27937a9b39ce0e16dff386f92a31b62cb23f3dbb52bf992660
DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210503060354-a79de5458b56.mod 95 BLAKE2B e684a60aa4f81d9b1bc646e05933b19fbce141011fd2e6c68922bc35ae5605c7ac6bf360d23495386b2d6aa6dc1752fff42f9ee110395e7d693df4aecd600e65 SHA512 e9ea2b640f798292d676ee885d9390a0d39e97209bd1f361eb110acbaebcfc36dfa49140770fdd5d768daa4d7cf1554cfdfaa19864ee078825c84401a5a09658
DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210503060354-a79de5458b56.zip 21403 BLAKE2B cbe932fa03ef0429e062a16019f125577b0a281902b93b0b84c30b56e1a8d120211b0e5f435eafee842cbc2430f877bff71e3ded19db5316ad4ddf5e92dd1f2b SHA512 71948fb5bb4e2802e3dbc1bbea9cef38a11f07719c357cbf519c62d85cd49a544e36c64f6a1193a329d29f19006dd753de986644338a9b01ac21c5d5fbd0269d
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -111,6 +97,6 @@ DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip 6816 BLAKE2B 44b63e4a425a5b5250
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
-EBUILD croc-9.1.1.ebuild 5860 BLAKE2B 001c6ae2fff287364a7a7c7f254e1b24100594330eb154af269f20918e5658323ea6485f6482e265c60140f2392532aee5b24c46be9abc84a994c5cb699cd085 SHA512 936aa93b8f69ee4bb0a4b283e2a9ebc22406ce8095d0e1193730a7f9033215f54575190a844bb8f92d57e7036639e004e0c604f6ec0e6369a51ebd010489110c
-EBUILD croc-9.1.2.ebuild 5863 BLAKE2B 1205cabc8607db50439e45eb29cee43e29ce16158cdd36a0bef2c0c8fc7fbccb9fe22cb2932921a6aa3e883936ab717987c9cf0fdaa0673bf369ef2b61e41ede SHA512 069e821d0e3253e70bb8e3306178ff2c6d357d5425b27ac13108e828e51aa1da8fa33152ff2c9f5f3976e9390b66e8e5a265571b84a18111bb1890b2a66e85d1
+EBUILD croc-9.1.3.ebuild 5863 BLAKE2B ee8592fdd71c35bf9d9a0e86602740569b5d0a65bc3cab953dcadf7e4181ab666929411ae176a16ea27fe277c7e2fe0368a183dc94ad89d0b26f54f6821791a8 SHA512 ec4da117814e2223ced88a6c6243eca8426896c82e506f2e6878be5fd89b73f9d85d2e9dba7e1275d77b49d1b7579eced4e09737c41565e3525403d10ffab672
+EBUILD croc-9.1.4.ebuild 5863 BLAKE2B ee8592fdd71c35bf9d9a0e86602740569b5d0a65bc3cab953dcadf7e4181ab666929411ae176a16ea27fe277c7e2fe0368a183dc94ad89d0b26f54f6821791a8 SHA512 ec4da117814e2223ced88a6c6243eca8426896c82e506f2e6878be5fd89b73f9d85d2e9dba7e1275d77b49d1b7579eced4e09737c41565e3525403d10ffab672
MISC metadata.xml 326 BLAKE2B 1d21a0f6089d6399bf2f2262b64d941a9d8ca689929ab306121968e86ad29465d7dd6802ea8010c2bdf898f57ce5a640d74f93340058e5d155878214668ea683 SHA512 ce6f19fc8a729207e3f95787e8d4100b3877c22db06afa83667d58cd1d208b127c49bb7116280668ef0a4f864b0f92cace9aa1766efd82ed1cffd1b1fab86c91
diff --git a/net-misc/croc/croc-9.1.2.ebuild b/net-misc/croc/croc-9.1.3.ebuild
index fcb14f2ddb82..6b7526df7016 100644
--- a/net-misc/croc/croc-9.1.2.ebuild
+++ b/net-misc/croc/croc-9.1.3.ebuild
@@ -53,8 +53,8 @@ EGO_SUM=(
"github.com/schollz/mnemonicode v1.0.1/go.mod"
"github.com/schollz/pake/v3 v3.0.2"
"github.com/schollz/pake/v3 v3.0.2/go.mod"
- "github.com/schollz/peerdiscovery v1.6.3"
- "github.com/schollz/peerdiscovery v1.6.3/go.mod"
+ "github.com/schollz/peerdiscovery v1.6.5"
+ "github.com/schollz/peerdiscovery v1.6.5/go.mod"
"github.com/schollz/progressbar/v3 v3.8.0"
"github.com/schollz/progressbar/v3 v3.8.0/go.mod"
"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
@@ -76,8 +76,8 @@ EGO_SUM=(
"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
- "golang.org/x/net v0.0.0-20210505214959-0714010a04ed"
- "golang.org/x/net v0.0.0-20210505214959-0714010a04ed/go.mod"
+ "golang.org/x/net v0.0.0-20210510120150-4163338589ed"
+ "golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod"
"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
@@ -85,8 +85,8 @@ EGO_SUM=(
"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
"golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod"
"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
- "golang.org/x/sys v0.0.0-20210507161434-a76c4d0a0096"
- "golang.org/x/sys v0.0.0-20210507161434-a76c4d0a0096/go.mod"
+ "golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744"
+ "golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod"
"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
diff --git a/net-misc/croc/croc-9.1.1.ebuild b/net-misc/croc/croc-9.1.4.ebuild
index 78ffabf503ab..6b7526df7016 100644
--- a/net-misc/croc/croc-9.1.1.ebuild
+++ b/net-misc/croc/croc-9.1.4.ebuild
@@ -51,12 +51,12 @@ EGO_SUM=(
"github.com/schollz/logger v1.2.0/go.mod"
"github.com/schollz/mnemonicode v1.0.1"
"github.com/schollz/mnemonicode v1.0.1/go.mod"
- "github.com/schollz/pake/v3 v3.0.1"
- "github.com/schollz/pake/v3 v3.0.1/go.mod"
- "github.com/schollz/peerdiscovery v1.6.3"
- "github.com/schollz/peerdiscovery v1.6.3/go.mod"
- "github.com/schollz/progressbar/v3 v3.7.6"
- "github.com/schollz/progressbar/v3 v3.7.6/go.mod"
+ "github.com/schollz/pake/v3 v3.0.2"
+ "github.com/schollz/pake/v3 v3.0.2/go.mod"
+ "github.com/schollz/peerdiscovery v1.6.5"
+ "github.com/schollz/peerdiscovery v1.6.5/go.mod"
+ "github.com/schollz/progressbar/v3 v3.8.0"
+ "github.com/schollz/progressbar/v3 v3.8.0/go.mod"
"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
"github.com/spaolacci/murmur3 v1.1.0"
@@ -71,27 +71,27 @@ EGO_SUM=(
"github.com/twmb/murmur3 v1.1.5/go.mod"
"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
- "golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc"
- "golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc/go.mod"
+ "golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf"
+ "golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod"
"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
- "golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d"
- "golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d/go.mod"
+ "golang.org/x/net v0.0.0-20210510120150-4163338589ed"
+ "golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod"
"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
"golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod"
- "golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
- "golang.org/x/sys v0.0.0-20210415045647-66c3f260301c"
- "golang.org/x/sys v0.0.0-20210415045647-66c3f260301c/go.mod"
+ "golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+ "golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744"
+ "golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod"
"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
- "golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72"
- "golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72/go.mod"
+ "golang.org/x/term v0.0.0-20210503060354-a79de5458b56"
+ "golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod"
"golang.org/x/text v0.3.0/go.mod"
"golang.org/x/text v0.3.3/go.mod"
"golang.org/x/text v0.3.6"
@@ -121,7 +121,7 @@ RDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-disable-network-tests.patch"
+ "${FILESDIR}/${PN}-disable-network-tests-r1.patch"
)
DOCS=( README.md )
diff --git a/net-misc/croc/files/croc-disable-network-tests.patch b/net-misc/croc/files/croc-disable-network-tests.patch
deleted file mode 100644
index 92a3a620b96e..000000000000
--- a/net-misc/croc/files/croc-disable-network-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Disable tests that fail with network-sandbox
-
-index 101162e..5be096e 100644
---- a/src/utils/utils_test.go
-+++ b/src/utils/utils_test.go
-@@ -7,7 +7,6 @@ import (
- "log"
- "math/rand"
- "os"
-- "strings"
- "testing"
-
- "github.com/stretchr/testify/assert"
-@@ -169,19 +168,6 @@ func TestHashFile(t *testing.T) {
- assert.Equal(t, "18c9673a4bb8325d323e7f24fda9ae1e", fmt.Sprintf("%x", hashed))
- }
-
--func TestPublicIP(t *testing.T) {
-- ip, err := PublicIP()
-- fmt.Println(ip)
-- assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":"))
-- assert.Nil(t, err)
--}
--
--func TestLocalIP(t *testing.T) {
-- ip := LocalIP()
-- fmt.Println(ip)
-- assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":"))
--}
--
- func TestGetRandomName(t *testing.T) {
- name := GetRandomName()
- assert.NotEmpty(t, name)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 34ed6f541b4b..06c272c93e9f 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -9,5 +9,5 @@ EBUILD curl-7.74.0-r2.ebuild 8441 BLAKE2B f187405773912743d8105038c72fa28510d60b
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
-EBUILD curl-7.76.1.ebuild 8189 BLAKE2B 3d6856679fb9559354573437e2891f916279d18566273de097e71e1cd66c3f0917bf39462f43c2e96d5e9e7bc02818fc24fde7aed5e69e6204e100861e01c803 SHA512 b9726621a7190ef207c35488a7fb12c947dfea0fce4b5908550ae274d1d368481a25ce6b7c8493c35a1cd48470dcd361eb19118daac7a62f9aaf80dceb94ea60
+EBUILD curl-7.76.1.ebuild 8187 BLAKE2B d5744b39a6a51c6ec2646df5c699c5311ff5391ec026a61c387f2d1cafb478e2db6757edb050722b932640fac49521c9c57b92cf5b330680b9aa88f6da7fdeac SHA512 6fce3a508e11c8c628b4b5b29e2e777353557b26dca5e2211997ddce1a745650d7d9e15e73521cb71db6b2f865666e4bde130f8ced68b0bf0aaf883f0599c9e5
MISC metadata.xml 2104 BLAKE2B cd965737bacd5cde978fdcb652559c3c29eee0083bdee82e00cf78055e681571e77a2deaf4ab6ef5a9aba0c33689356fc2299c346c4c1e6b4afda9c675b9f3b1 SHA512 a2e9ba5358d115b18fa089bd222f026a7553505a154e1d865af0cde1004a0a427f58ed38d802815d96453d5d58628aa91d8cd5d082fe059cb1afd4dc9d312052
diff --git a/net-misc/curl/curl-7.76.1.ebuild b/net-misc/curl/curl-7.76.1.ebuild
index a160c73bbf4e..ccca9041f594 100644
--- a/net-misc/curl/curl-7.76.1.ebuild
+++ b/net-misc/curl/curl-7.76.1.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"
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 53e76979d496..ed01854cc1ec 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -12,7 +12,7 @@ DIST dhcpcd-9.3.4.tar.xz 255212 BLAKE2B cd64dca55bd8adfcfa8ffb5f75a949c6f8aef9f1
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 4752 BLAKE2B 5b8044625fd6cfcceced8c61ec58d821854e730e5563acade906f66039e1414f3414b8e454e39120d638eaab64840c6de20a135085e1b745f014d5edebceba4e SHA512 bc1ac38efdf606c7da4d12573741d9b6bbd626c056cfa4f4cb4e702448766540e5969cdcdaee354948667255694c015f13b4d0ed2abab456df69062506a4b02b
+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-9.4.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
index 51628651f42b..b70fbf92e08a 100644
--- a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
@@ -13,7 +13,7 @@ else
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"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 44c2b71d982b..3eea1b6bf2d1 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +1,7 @@
AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
-DIST dropbox-lnx.x86-120.4.4598.tar.gz 99345343 BLAKE2B 9845f94832ffe7929a7e94a9e5b978390cb40611a054ba8ed7f1c880e13364f019d58a86d6083fc8e2b45d618870a4ac2d9643262bab8d600ebdad45bbaf8a6e SHA512 9ce9403695c88c1abf6413a1b06ad4d350b9603f20d4c1358b337123fc9ab02775d1a0e13c441e8185840705499eab4e59813210abe6e54274b39399b0ca309a
-DIST dropbox-lnx.x86-121.4.4267.tar.gz 99203310 BLAKE2B 469c82023d1d4f31be64781e5c5be8cca8a4b963544427f42ec66e9116fb3395fd448fe1e620c5bc40da682b6263dc090fd6965f16e240adb895d3b6a95a3941 SHA512 1750d0fd7d30bdc882fa22703d395f9f9f7164f70fe11342f3fcf6813dc1fed8fbc1091c3a31fa0dec9dd7852784e7d33844d90baaddb8118c68bf32357ff79b
-DIST dropbox-lnx.x86_64-120.4.4598.tar.gz 102693511 BLAKE2B 0d25e6d35ad1e1a9de541d3cbe19d5a63741616dac8ec70ab54ab6a78871d3f9008ce17518caa44c1722bf87de9cac924b65bdc16bd5a456a17d140b8c85fd09 SHA512 9ddafeff9b640f315f5bca4a9ee8af8da7d767f19a0aa4dc75df9cd6e02b822994d621331de929ab62a5d32c5c7fcd757b50ccb6f15be81c1c5d1dcc634291d8
-DIST dropbox-lnx.x86_64-121.4.4267.tar.gz 102554014 BLAKE2B ecaeec313d3f27680c9fd907e7fa2f448e741b9ae60520ab010a7695f298254a705a72300999bf6e944d35292f780fc16e22685ff414bdded14133f11022ccd1 SHA512 b68c9923c3cc8786abe0f4f8d477847cecebbdf8c11a196ea1b54b85238d4c77e38a4bd88dc7e857e934739b958113e9a45b39fbb9e24d8b600204793fc44f11
-EBUILD dropbox-120.4.4598.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
-EBUILD dropbox-121.4.4267.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d
+DIST dropbox-lnx.x86-122.4.4867.tar.gz 98758165 BLAKE2B bb9fac6670cb384e5417ad6f73d0894ba35cc8471ccaec3dbb37d99fb0ec36810051856bc674b5291e654c4c4626f82963335ad92190318f3765bfc33b47703e SHA512 7606f21b56df4e894611b30566538007715e9598f0ac45377e8bbda4a649f4ab6df6b9b0f4da467c9a9aa632d38f78a632c3c879cb21bbd13bcc46faca450689
+DIST dropbox-lnx.x86_64-122.4.4867.tar.gz 102022157 BLAKE2B ce68823f184d9ff9a7378f6c7248ba73bd76f120cf095386bd6f43a701849f380c849ae3e7e6e035594d480e59bb9c98b0d23774c6083e97122af657c2860e46 SHA512 5b2252a07b63a0805445bda486039a07c267e280cead8519de88a35b8d877cc4276e3ce91421b3bd4a64cbcab125edc519d067974c64de012d59a74d06324d39
+EBUILD dropbox-122.4.4867.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-121.4.4267.ebuild b/net-misc/dropbox/dropbox-121.4.4267.ebuild
deleted file mode 100644
index a77b20f7a3b2..000000000000
--- a/net-misc/dropbox/dropbox-121.4.4267.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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
-"
-
-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/dropbox/dropbox-120.4.4598.ebuild b/net-misc/dropbox/dropbox-122.4.4867.ebuild
index 17ace6762e14..17ace6762e14 100644
--- a/net-misc/dropbox/dropbox-120.4.4598.ebuild
+++ b/net-misc/dropbox/dropbox-122.4.4867.ebuild
diff --git a/net-misc/ethercard-diag/Manifest b/net-misc/ethercard-diag/Manifest
index 76361e8e2339..4ee04a1c6ac6 100644
--- a/net-misc/ethercard-diag/Manifest
+++ b/net-misc/ethercard-diag/Manifest
@@ -1,4 +1,3 @@
DIST ethercard-diag-20050321.1g.tar.lzma 113181 BLAKE2B 2803587c7176f7fabdbbdac8f46034c693851c24bd74df346fe0bd084cb8b507ce7985e1e59bf1c5ed97c5a41dc05a2987e26b7ca9650e0d821257d67092b53f SHA512 19f9030f97a6a675b2f372acaa320314452b1c5edf543973ac72ac5cce45c05c03c1b1cc0a0375a2b15fc26c89b7a9d18b0702f82c8d4f4362e2f82362feda35
EBUILD ethercard-diag-20050321.1g-r1.ebuild 780 BLAKE2B 159f6de2926d44cdb31e2db814edd45168e622661b98d7504cda105cbee2721e46cb1fd208042ff84f8ed4a18583411b3ae63e08a6d334a9b83df361cedbaae0 SHA512 a69bf748d173795e70bfd1bc8071e3bcae6eae9f171199e54563a3adcbc50b4cdac42bbef917475aaa062fd1cc932e22016692560aa67e6da93929a42cc01c45
-EBUILD ethercard-diag-20050321.1g.ebuild 581 BLAKE2B 4730ca85fce958099c932c4c63c396be744adc1ec846df5dade5d5feea0fb54a53737a695df5caba2773862d92d13d0df4d4d8354b8ce0738a8db3225301119a SHA512 010296169b2b96c6235dbb7a328d4689cfb416b03e374fca892382ce3466abcb06ed00d5ab90f4f0f20b8a11011c302ea5f6409fa20271c4fd29284902510bff
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/ethercard-diag/ethercard-diag-20050321.1g.ebuild b/net-misc/ethercard-diag/ethercard-diag-20050321.1g.ebuild
deleted file mode 100644
index f8424e16c1d3..000000000000
--- a/net-misc/ethercard-diag/ethercard-diag-20050321.1g.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="low level mii diagnostic tools including mii-diag and etherwake (merge of netdiag/isa-diag)"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="!sys-apps/nictools"
-
-src_compile() {
- tc-export CC AR
- default
-}
-
-src_install() {
- default
- dodir /sbin
- mv "${ED%/}"/usr/sbin/{mii-diag,ether-wake} "${ED%/}"/sbin/ || die
-}
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index eb54a27b1d6d..e76ff23e2db7 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -4,8 +4,8 @@ AUX exabgp-4.2.11-healthcheck-fix-log-crash.patch 504 BLAKE2B ba1070bfd58e84748c
AUX exabgp-4.2.11-less-verbose-logging.patch 2346 BLAKE2B 7a08fe4ac14622a69136a0456a7249d1a3ab08cd1fd07338ec05eedaff05ece565c5d86abaf24ab3147a248067f91d84982118e2713362c0648c2e8ade139a59 SHA512 2f76c8eb7b4fdd9ea39f896af6892a1b13a7357868e8a99803df295a9955149d09c6a25c17f2f0c50c435bcc320fccfe9b424f899b17d4c9a73ee359deabf6ff
AUX exabgp-4.2.7-paths.patch 302 BLAKE2B 52110fefb75e0a36452ea3e53f099897b30df8287d033b353f66df25cf75c4a75a80e91ef49a47c652a46274faabfcf5385653ae03eb75ed1afd866c068967c7 SHA512 678258e4848b17b9880849cb8d105ee64b4cb6bdd678c3c96707467a2bae51c30d34b8609bf5c9a48bcd0722f6247b009dc5c406a3bab02d77bf2f919e7f4fbc
AUX exabgp.confd 183 BLAKE2B 59338bbd61001e4418b970abc45786004b833f80576117122fec99f148c1bab3bc7feed80c46b8bac2ac639b720daa320bd141f65b25a37a6ce1f229653f3741 SHA512 7b888ea5053ebb8da9acbd4a85b6a9900663cadb89258aea86d47cade505e8bbfc6e741fed599d410480467f76f759175d710c284bc6caafdabb4a61c53611ac
-AUX exabgp.initd 1472 BLAKE2B 488c1de5222be9f5f67e279fa9607c326922d80c2aafa6cb098f5f721ef1df30f1d56a2a0a0ef6ca376cdb00f65cb1fc644214248b7ea9dbc9dfd55442be7d2b SHA512 453ab87961b4647374af62a02280e750ba0b1bf535a5e92c4434c4ff6c0a55f7ec52a5e0e5a784a31695e02ece42543260186aa25c658368331c06c12794d4b4
-AUX exabgp.initd-r1 1587 BLAKE2B b3462e4e990b96975ee6904937ffb859ad761581b596d71adda251e6a2aeeb9c2559c517d5f99e5d7cf5b62f155545fd7e3e43be8fd7ce89a30eae180ebd1c5c SHA512 0e4f93a1fcadea383da86bccb886dfc340f92cab6814c01fc6a5f2923ad85b894ee8b314312c04b55f2f94c28f46af5081ac55592f45882c9ae5d328fa08d91e
+AUX exabgp.initd 1476 BLAKE2B a7b85715a05ac9a754157cf19efd9616fb356666bcdb3722e26ac22e92aef7a501641ac7690ff5b163d29a70ea993d2ebef6efb4eb2723ad8d0e417d6b40d2f6 SHA512 596009c03b39f7cb50bf6104202789c06ab98d387a4797006cd20f6cba49dbeb2fd9fb10ccacce29251f5540e587d7c7df1f545aa642dfbb91e818efb87166ff
+AUX exabgp.initd-r1 1591 BLAKE2B 10b61e1daf5d10a5e3d60c67bc3b67fdee1583d816d2b19593db8cb507b6973be93cde8897e8ce2c272ccfac22a269f8990f3cbb2183b15d85ddd2961780f4f2 SHA512 769acb66fafc143fc0c8ca6a679895a523bdf66fe8ba320000e3ab1135578228da818b0e9fd5419d6c3b10cb15d33716b919e1cdd0e9a3893772f229204134ea
AUX exabgp.logrotate 61 BLAKE2B 63024bebc07e3eadacf1550674f5fbb7cf22d903a02784d8d5f1aae3b8f6e543e5b4b2f7208af91b4c063cb68d831caf18c2b03fce211c4c447f3828c5c8127f SHA512 27e751f0ff066448fc0121a129a9c48ac645738f65041aa29816cddc80dc73f2458110ccd12fa48b2ccb573908357425070103303d5645987b2a4e74986a2786
AUX exabgp.tmpfiles 136 BLAKE2B 1255c9e510f9dc53b4e1b678ab8be2c7e88aac461789b15106ebf1e9606eb48ccd732efcc8ebfc8271efa5d0f6972705476a5f8c658480909b35ebf6eb399281 SHA512 3a11a011967f83483c85035ab63376bc92af3c3076ddbaac2e2cb3557aa314cfb188ee8e3208bfec7cb74d86a7b877c50487cbfa5f3097534cdbc7e98fc4b537
DIST exabgp-4.2.11.tar.gz 2931753 BLAKE2B e5241619db24e2e82dfb42bc613d6b2c28efac205d2bedf732a665a5a9eff1b384833cb1fec3e68a285fc01269c2eaca55b311650e59bcda13d8f024e5294dc3 SHA512 61c143e90fd81323b03682ad46f2861576ab0328e2030259eff15bb9ef965477c514fb355112cbaf3dc138fb9f5582b6e1e1efb8d0d4313a9b9924ced156a155
diff --git a/net-misc/exabgp/files/exabgp.initd b/net-misc/exabgp/files/exabgp.initd
index e220108d8262..c3bbcf1247e1 100644
--- a/net-misc/exabgp/files/exabgp.initd
+++ b/net-misc/exabgp/files/exabgp.initd
@@ -7,8 +7,8 @@
command="capsh"
command_args="
- --uid=${EXABGP_USER:-exabgp}
- --gid=${EXABGP_GROUP:-exabgp}
+ --groups=${EXABGP_GROUP:=exabgp}
+ --user=${EXABGP_USER:=exabgp}
--caps='cap_net_admin+epi cap_setuid+ep-i cap_setgid+ep-i'
-- -c \"/usr/bin/exabgp ${EXABGP_ARGS}\""
command_background="yes"
diff --git a/net-misc/exabgp/files/exabgp.initd-r1 b/net-misc/exabgp/files/exabgp.initd-r1
index ec2f01704b8b..1d942d850253 100644
--- a/net-misc/exabgp/files/exabgp.initd-r1
+++ b/net-misc/exabgp/files/exabgp.initd-r1
@@ -7,8 +7,8 @@
command="capsh"
command_args="
- --uid=${EXABGP_USER:=exabgp}
- --gid=${EXABGP_GROUP:=exabgp}
+ --groups=${EXABGP_GROUP:=exabgp}
+ --user=${EXABGP_USER:=exabgp}
--caps='cap_net_admin+epi cap_setuid+ep-i cap_setgid+ep-i'
-- -c \"/usr/bin/exabgp ${EXABGP_ARGS}\""
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 549bb9981847..35332c6e3739 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 3501 BLAKE2B 905bbdc0b7fa1b1a2d846a89e9f097651d2ddf26088b8efe0de5bd8a8088ff958cca0df92f7b5f0410d757e36f9e509da234937ed6f315e13631ca04d76a1708 SHA512 e489f106056487f2bb2d866889946033383877e791d0f7ac461d62be9805a6542da2179b789f8325a3b4f9f8e0256b7664722f930aae1ce0925095b32f6af46a
+EBUILD frr-7.5.1-r2.ebuild 3508 BLAKE2B fa2757e877258e6d353b77f454b873d22f24c60355acc536468eacfbd252027c4f230e478287dfbcc962cda792664bf1d7432f3deab54db8b4b011b973a5d072 SHA512 ec2f0cb7916ce4d4be36f63c049d4227d697f59d02fd2bcfe3afabe16b9e3200387ad1690ec22ee94ab6ca71765275bf74f45ec4dbe72b5316fd6a81412d73bd
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-r2.ebuild
index 9e16c18b16dc..5b7e3d014731 100644
--- a/net-misc/frr/frr-7.5.1-r2.ebuild
+++ b/net-misc/frr/frr-7.5.1-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 2a44452ed80d..bb45e3c24ca0 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -2,26 +2,12 @@ AUX kafka-connect-distributed.init.d 836 BLAKE2B 983a7eff314d7d09e3d6c01de7187b4
AUX kafka-zookeeper.init.d 506 BLAKE2B f0e6ab4a15a54363fe31e567805b19a1b18d59238f4f4eff4733432ef48ad0d3352c843290e517a195ca89ee39a8c1793d0fac671689cb51946696b3eb62d90e SHA512 96656e81a296c989fa5dcbab4831b6ca12841ef8e902d32b3100196e0dfc1984ba6d4eb426ade14ef8b4299ea9665753a0af22e8e7f4b7947424d5529d2f7010
AUX kafka.init.d.4 709 BLAKE2B 3fb3d09fb715b4c01396406574c21a2127cc7c73a92927b9add59123fb5cc2d9f97c2dd2c10c212eb3bb723a05ab7575c2443a71baa6063b85ef21dce9426f75 SHA512 1c96854b6fab044e1b415e6e9f16964d1d06dc4070dabead9a1b391a9ab2a4b64120e175f8199afbc1fd2a4ba7f7d319932e0d2b5fb1ef0e8cfe55c68313d1a3
AUX kafka.init.d.5 792 BLAKE2B 458fe70e6e8460e7291421e411440719224688a6521f2514272c16379d302019630add9fa1cf840cbe398afc1d36d5a19522aefbbbad635d050070cdbd6ae0c3 SHA512 578dbbb51ec12220f51ee4e80ebcfc3d20e0d921b262673505f50010522f9f67998293a6081357fc0f8b6d9e4a7dc306d4e5f45d4099bfee80fd5cd3f2940e8d
-DIST kafka_2.12-2.0.1.tgz 49446678 BLAKE2B 6d4aa6bd015cb42492364893c3f8ee01b2ce0408097ce5cdf0d3074c1096d30c8eec9926cad6dab31d3b2f26e16ae06173ee25554a8f901632bfde27270a70d3 SHA512 9773a85ef2898b4bae20481df4cfd5488bd195fffd700fcc874a9fa55065f6873f2ee12f46d2f6a6ccb5d5a93ddb7dec19227aef5d39d4f72b545ec63b24bb2f
-DIST kafka_2.12-2.1.1.tgz 55351618 BLAKE2B a102fa24883ab5d3110aec1367e40c0ed0a437ca776e2532dbddb8a79c6288b8334c30b48072da8b58c693fc765106b6dcd03b6baebf66708021305a2dff2acf SHA512 a2e8168e8de6b45e8fca1f2883f0744d3c5a939b70d8a47a5428b72188501d4c2fc11bc35759f2392680d4e8ecf2fa9d0e518e77fd28393afba22194ad018b10
-DIST kafka_2.12-2.2.1.tgz 57054917 BLAKE2B fb69ef12f7480b8b47e511cc9325b622dc1fcc6a265bacfdf1ac03d34ad8f5a3b3242c41386214519423bce1e18d8a90f2e7034e26681fe637c823d0a73f69bb SHA512 b8d828f06dfe59e34c4cfa20c57c8c8b43374f1e7c09f12dfa5433534a380bfe09a6de90fb86a4403939a87ab9c665e2369143c138c71391b01bbb9b384e7ac5
-DIST kafka_2.12-2.3.0.tgz 57215197 BLAKE2B 91400bed0860633523d60f4b00e47eb18b27f67abca24547d680d08213c10e0de126bf39f790ae16e704446811e9d25d78ed940cf3ae07fff8e2045cd05a89f1 SHA512 a5ed591ab304a1f16f7fd64183871e38aabf814a2c1ca86bb3d064c83e85a6463d3c55f4d707a29fc3d7994dd7ba1f790b5a6219c6dffdf472afd99cee37892e
-DIST kafka_2.12-2.4.0.tgz 62283588 BLAKE2B 3492f7a5be9941a75aa5896be0e25974b46887a66e391395a813844bae2f5f57062b636852cdb7aa3650fb4017f9d462a3b95b2166b8a0be62f403c44826b675 SHA512 53b52f86ea56c9fac62046524f03f75665a089ea2dae554aefe3a3d2694f2da88b5ba8725d8be55f198ba80695443559ed9de7c0b2a2817f7a6141008ff79f49
-DIST kafka_2.12-2.4.1.tgz 62358954 BLAKE2B 333b4a1d34c6249efb9984e90c314f4b39bbd1e907bbd53e1ce67d49eaa7f972c291fafcbf5be129cde055cd696ba545ac8c95c54dfbd3a89f639f7461f8dc45 SHA512 8582dc25cb14a2e9c6966efd98e41cd0ebf6369b42436954800b847298e763b22caecf130fdccc58bf79fe9e95facce6e0b5aacad072d69f6dc1eed7678a49b8
-DIST kafka_2.12-2.5.0.tgz 61604633 BLAKE2B f73f3a03f245aa82b9ce5a895e7875d5ad9c4006b84c3152cac72322eb18283a1a87d81f255160ff062883737ae9862e160fec0d85160ed3a64f45e47b26db53 SHA512 447a7057bcd9faca98b6f4807bd6019ef73eee90efdc1e7b10005f669e2537a8a190cb8b9c9f4c20db1d95b13d0f0487e9cc560d0759532058439ce7f722c7cd
DIST kafka_2.12-2.5.1.tgz 61709988 BLAKE2B 4e6943058fe25da0cc9285e1e8dbe2be2ad2be5ef52d7c12f9007607e34ba1834d192c45e01275e893dca2e8968bdba07510dbd30ccd106e80edaabc0f7c6dba SHA512 91f96f28c016bdaa3fe025f87ace188417a1e594c8e32b7d23a104aa390bc25f5db5897e23cccf00ea7ede3ac20b3028c10363ebe99dcbd7db2cf6237ee7553a
-DIST kafka_2.13-2.6.0.tgz 65537909 BLAKE2B 883bc22f53ae7882ff2e27a3b9b62967f4718718f8e2ee222debd5f5b36636e00b35ceb60c3fd6924905b88ef96442439198255bb8329cee1cc722364ff0810f SHA512 d884e4df7d85b4fff54ca9cd987811c58506ad7871b9ed7114bbafa6fee2e79f43d04c550eea471f508b08ea34b4316ea1e529996066fd9b93fcf912f41f6165
DIST kafka_2.13-2.6.1.tgz 65585925 BLAKE2B 639cc9ec9a3b630d01387b1fe4aa12f5e6ba66b751689d48f17af3759fbfc079616a21534eb72bb647cfee0d14ff86757d73e2ee0733d0f69548efceb90be3e3 SHA512 09ec7a39d0e11494ede7d92cf7dfec5b95c6b0218e3b096b731d85ee8c442469e66aaf369a9c6750399719e515ee1bd372d609d6b232e3358e18aa2b57c90e29
DIST kafka_2.13-2.7.0.tgz 68583422 BLAKE2B 68925221e025c2f380808da672f9ac08c19c21eaf4d3fe732051e02143dbc735082fce55cd40388b980159bfbe8b06666922852492564927c5fcc237bb3f74dc SHA512 f3dd1fd88766d9150d3d395b285bfa75f5b89a835822381490c8428e6e568889054ddb5fada1eb63613a6441989151bc7c7d6cde16a871c6674b909c4edd4e28
-EBUILD kafka-bin-2.0.1.ebuild 1450 BLAKE2B c26f7529cf50b5aea129385bd65b64b189ae118ce6a05c14fa61b14a7f625183514cd03bfbc8057f4000e79fddde56807a82aa910cfdaa3136e04b03848b75a7 SHA512 ca38e61427b2baf0110807c82b2830df0e63e5d5615bf6c569b02e34e67529a95377ae10f3b3fc1c9c47ee9db59933b90ca473f4d5514d75f0cae4a39bbb176b
-EBUILD kafka-bin-2.1.1.ebuild 1450 BLAKE2B c26f7529cf50b5aea129385bd65b64b189ae118ce6a05c14fa61b14a7f625183514cd03bfbc8057f4000e79fddde56807a82aa910cfdaa3136e04b03848b75a7 SHA512 ca38e61427b2baf0110807c82b2830df0e63e5d5615bf6c569b02e34e67529a95377ae10f3b3fc1c9c47ee9db59933b90ca473f4d5514d75f0cae4a39bbb176b
-EBUILD kafka-bin-2.2.1.ebuild 1450 BLAKE2B c26f7529cf50b5aea129385bd65b64b189ae118ce6a05c14fa61b14a7f625183514cd03bfbc8057f4000e79fddde56807a82aa910cfdaa3136e04b03848b75a7 SHA512 ca38e61427b2baf0110807c82b2830df0e63e5d5615bf6c569b02e34e67529a95377ae10f3b3fc1c9c47ee9db59933b90ca473f4d5514d75f0cae4a39bbb176b
-EBUILD kafka-bin-2.3.0.ebuild 1450 BLAKE2B c26f7529cf50b5aea129385bd65b64b189ae118ce6a05c14fa61b14a7f625183514cd03bfbc8057f4000e79fddde56807a82aa910cfdaa3136e04b03848b75a7 SHA512 ca38e61427b2baf0110807c82b2830df0e63e5d5615bf6c569b02e34e67529a95377ae10f3b3fc1c9c47ee9db59933b90ca473f4d5514d75f0cae4a39bbb176b
-EBUILD kafka-bin-2.4.0.ebuild 1429 BLAKE2B 6a202fa449002460098a6c2b787d88cebcceab183c3d313430981847928c3851bc494104469e34abee7c30d1a8e230e620a80d4a8098d39cd0782911995cc521 SHA512 bda704ae8da66e352209f4bad03a2c47de66aa4a1036e0050352d122120ea8b75297c141e5ccb7f818a3abe321c4181309ccb965a0f23197a12743abbdd59c0a
-EBUILD kafka-bin-2.4.1.ebuild 1429 BLAKE2B 6a202fa449002460098a6c2b787d88cebcceab183c3d313430981847928c3851bc494104469e34abee7c30d1a8e230e620a80d4a8098d39cd0782911995cc521 SHA512 bda704ae8da66e352209f4bad03a2c47de66aa4a1036e0050352d122120ea8b75297c141e5ccb7f818a3abe321c4181309ccb965a0f23197a12743abbdd59c0a
-EBUILD kafka-bin-2.5.0.ebuild 1429 BLAKE2B 6a202fa449002460098a6c2b787d88cebcceab183c3d313430981847928c3851bc494104469e34abee7c30d1a8e230e620a80d4a8098d39cd0782911995cc521 SHA512 bda704ae8da66e352209f4bad03a2c47de66aa4a1036e0050352d122120ea8b75297c141e5ccb7f818a3abe321c4181309ccb965a0f23197a12743abbdd59c0a
+DIST kafka_2.13-2.8.0.tgz 71403603 BLAKE2B 5aae0b9c3bbe26af093c00fb971ebdac2a7ee28e10ba52732dd816d343ae79dad08502f766efb3465ab5d43ee51e3573b240dfbb511330af74d8010aef107eb7 SHA512 3c49dca1147a0a249dd88e089f40af31a67b8207ed2d9e2294fa9a6d41f5ed0b006943cd60d8e30d7e69d760d398f299cafcd68b6ed7bedf9f93d1b7a9e8c487
EBUILD kafka-bin-2.5.1.ebuild 1429 BLAKE2B 6a202fa449002460098a6c2b787d88cebcceab183c3d313430981847928c3851bc494104469e34abee7c30d1a8e230e620a80d4a8098d39cd0782911995cc521 SHA512 bda704ae8da66e352209f4bad03a2c47de66aa4a1036e0050352d122120ea8b75297c141e5ccb7f818a3abe321c4181309ccb965a0f23197a12743abbdd59c0a
-EBUILD kafka-bin-2.6.0.ebuild 1429 BLAKE2B b2138db523d0c013ecdec359a9f94085ca8e03d57a1784cb9ce0a2f60c158a89b914fffeeecd709fe3b92fd0714b09092ad2ce28f8c88b0db048088bbb42ba76 SHA512 658ff97fc57bdab8c811082cf7e8791f068ce0b34a5d86be6ab994c3b549b2db6b138a47816b38e66dabae7bfd64035f0ef5017d0704f52e09429d682df972de
EBUILD kafka-bin-2.6.1.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90
EBUILD kafka-bin-2.7.0.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90
+EBUILD kafka-bin-2.8.0.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90
MISC metadata.xml 389 BLAKE2B 335c0cabaf348612feaa741673e778069f02881601f3f5aecba14cac49b065cbbd20fb1247cd035391528dc31c345ace91f43c3a38e7d083f1942a1f67bf6d3f SHA512 21cc10fb914680844252c607b5c401a87783fa4d8b7371358a6cdef8b99fb43f7dad2c9ac31af685490872a99c02941b012440ea07cea306b45303a2359d53ab
diff --git a/net-misc/kafka-bin/kafka-bin-2.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.0.1.ebuild
deleted file mode 100644
index aaa89d5e8d9d..000000000000
--- a/net-misc/kafka-bin/kafka-bin-2.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="virtual/jre:1.8"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
- enewgroup kafka
- enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
- sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
- sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
- eapply_user
-}
-
-src_install() {
- insinto /etc/kafka
- doins config/zookeeper.properties config/server.properties
- if use "internal-zookeeper"; then
- keepdir /var/lib/kafka/zookeeper
- newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
- fi
-
- keepdir /var/lib/kafka
- fowners -R kafka:kafka /var/lib/kafka
-
- keepdir /var/log/kafka
- fowners -R kafka:kafka /var/log/kafka
-
- newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
- dodir "${INSTALL_DIR}"
- cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
- keepdir "${INSTALL_DIR}/logs"
- fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-2.1.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.1.1.ebuild
deleted file mode 100644
index aaa89d5e8d9d..000000000000
--- a/net-misc/kafka-bin/kafka-bin-2.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="virtual/jre:1.8"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
- enewgroup kafka
- enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
- sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
- sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
- eapply_user
-}
-
-src_install() {
- insinto /etc/kafka
- doins config/zookeeper.properties config/server.properties
- if use "internal-zookeeper"; then
- keepdir /var/lib/kafka/zookeeper
- newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
- fi
-
- keepdir /var/lib/kafka
- fowners -R kafka:kafka /var/lib/kafka
-
- keepdir /var/log/kafka
- fowners -R kafka:kafka /var/log/kafka
-
- newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
- dodir "${INSTALL_DIR}"
- cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
- keepdir "${INSTALL_DIR}/logs"
- fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-2.2.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.2.1.ebuild
deleted file mode 100644
index aaa89d5e8d9d..000000000000
--- a/net-misc/kafka-bin/kafka-bin-2.2.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="virtual/jre:1.8"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
- enewgroup kafka
- enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
- sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
- sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
- eapply_user
-}
-
-src_install() {
- insinto /etc/kafka
- doins config/zookeeper.properties config/server.properties
- if use "internal-zookeeper"; then
- keepdir /var/lib/kafka/zookeeper
- newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
- fi
-
- keepdir /var/lib/kafka
- fowners -R kafka:kafka /var/lib/kafka
-
- keepdir /var/log/kafka
- fowners -R kafka:kafka /var/log/kafka
-
- newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
- dodir "${INSTALL_DIR}"
- cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
- keepdir "${INSTALL_DIR}/logs"
- fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-2.3.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.3.0.ebuild
deleted file mode 100644
index aaa89d5e8d9d..000000000000
--- a/net-misc/kafka-bin/kafka-bin-2.3.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="virtual/jre:1.8"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
- enewgroup kafka
- enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
- sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
- sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
- eapply_user
-}
-
-src_install() {
- insinto /etc/kafka
- doins config/zookeeper.properties config/server.properties
- if use "internal-zookeeper"; then
- keepdir /var/lib/kafka/zookeeper
- newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
- fi
-
- keepdir /var/lib/kafka
- fowners -R kafka:kafka /var/lib/kafka
-
- keepdir /var/log/kafka
- fowners -R kafka:kafka /var/log/kafka
-
- newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
- dodir "${INSTALL_DIR}"
- cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
- keepdir "${INSTALL_DIR}/logs"
- fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-2.4.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.4.0.ebuild
deleted file mode 100644
index 2b5372ad071a..000000000000
--- a/net-misc/kafka-bin/kafka-bin-2.4.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="https://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-COMMON_DEPEND="acct-group/kafka
- acct-user/kafka
- virtual/jre:1.8"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-src_prepare() {
- sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
- sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
- eapply_user
-}
-
-src_install() {
- insinto /etc/kafka
- doins config/zookeeper.properties config/server.properties
- if use "internal-zookeeper"; then
- keepdir /var/lib/kafka/zookeeper
- newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
- fi
-
- keepdir /var/lib/kafka
- fowners -R kafka:kafka /var/lib/kafka
-
- keepdir /var/log/kafka
- fowners -R kafka:kafka /var/log/kafka
-
- newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
- dodir "${INSTALL_DIR}"
- cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
- keepdir "${INSTALL_DIR}/logs"
- fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-2.4.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.4.1.ebuild
deleted file mode 100644
index 2b5372ad071a..000000000000
--- a/net-misc/kafka-bin/kafka-bin-2.4.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="https://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-COMMON_DEPEND="acct-group/kafka
- acct-user/kafka
- virtual/jre:1.8"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-src_prepare() {
- sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
- sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
- eapply_user
-}
-
-src_install() {
- insinto /etc/kafka
- doins config/zookeeper.properties config/server.properties
- if use "internal-zookeeper"; then
- keepdir /var/lib/kafka/zookeeper
- newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
- fi
-
- keepdir /var/lib/kafka
- fowners -R kafka:kafka /var/lib/kafka
-
- keepdir /var/log/kafka
- fowners -R kafka:kafka /var/log/kafka
-
- newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
- dodir "${INSTALL_DIR}"
- cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
- keepdir "${INSTALL_DIR}/logs"
- fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-2.5.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.5.0.ebuild
deleted file mode 100644
index 2b5372ad071a..000000000000
--- a/net-misc/kafka-bin/kafka-bin-2.5.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="https://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-COMMON_DEPEND="acct-group/kafka
- acct-user/kafka
- virtual/jre:1.8"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-src_prepare() {
- sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
- sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
- eapply_user
-}
-
-src_install() {
- insinto /etc/kafka
- doins config/zookeeper.properties config/server.properties
- if use "internal-zookeeper"; then
- keepdir /var/lib/kafka/zookeeper
- newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
- fi
-
- keepdir /var/lib/kafka
- fowners -R kafka:kafka /var/lib/kafka
-
- keepdir /var/log/kafka
- fowners -R kafka:kafka /var/log/kafka
-
- newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
-
- dodir "${INSTALL_DIR}"
- cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
- keepdir "${INSTALL_DIR}/logs"
- fowners -R kafka:kafka "${INSTALL_DIR}"
-}
diff --git a/net-misc/kafka-bin/kafka-bin-2.6.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.8.0.ebuild
index a014a476b4e0..fb42f54f96da 100644
--- a/net-misc/kafka-bin/kafka-bin-2.6.0.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-2.8.0.ebuild
@@ -17,7 +17,7 @@ RESTRICT="mirror"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
+IUSE="internal-zookeeper connect"
COMMON_DEPEND="acct-group/kafka
acct-user/kafka
@@ -31,6 +31,7 @@ INSTALL_DIR="/opt/${MY_PN}"
src_prepare() {
sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+ sed -i -e 's:/tmp/connect.offsets:/var/lib/kafka/connect.offsets:' "config/connect-standalone.properties" || die
eapply_user
}
@@ -40,6 +41,17 @@ src_install() {
if use "internal-zookeeper"; then
keepdir /var/lib/kafka/zookeeper
newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+
+ ewarn "Zookeeper owner has been changed to kafka:kafka"
+ ewarn "you might want to run chown -R kafka:kafka /var/lib/kafka/zookeeper"
+ ewarn "or set COMMAND_USER=\"root:root\" in /etc/conf.d/kafka-zookeeper"
+ ewarn "to keep the previous behavior."
+ ewarn "All logs files have been move to /var/log/kafka/"
+ fi
+
+ if use "connect"; then
+ doins config/connect-distributed.properties config/connect-standalone.properties
+ newinitd "${FILESDIR}/${MY_PN}-connect-distributed.init.d" "${MY_PN}-connect-distributed"
fi
keepdir /var/lib/kafka
@@ -48,7 +60,7 @@ src_install() {
keepdir /var/log/kafka
fowners -R kafka:kafka /var/log/kafka
- newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
+ newinitd "${FILESDIR}/${MY_PN}.init.d.5" "${MY_PN}"
dodir "${INSTALL_DIR}"
cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index ac8d98190793..ad368a18e99c 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,10 +1,9 @@
+AUX kea-1.8.2-fix-cxx11-detection.patch 1388 BLAKE2B 96adf841b29936442b81aed5cd5d4bf9433db039026ca8e7235499d6a52692b37915d9ee5df3247b9b5d08fb0a9ef3a448c202ef9081816acac253eb96f37c13 SHA512 5a71bbe97051577207d22791c284db27c7558c98fa886744cb8ec7208c0c2e5d2aeccb21c0eb461309019784b69ac6a82c4cf2456b6250df36b59f55c5d54bc2
AUX kea-confd-r1 289 BLAKE2B da62fc34c87d791f765a7077020f7ca1c224c2b2bc86880e4bacdbc12e60840675750e2c5c71dc90e99a1d11d1e5e725f59d1045d4b973d6155d22876314aeb5 SHA512 9f74344bc39fd2d85d2e305060e35e96a43ec9775793f29d4140a2a6ebf40cc0e8c6b2766fd6ad1fef531fc4be66b004ce0631ac76ac7646df4e655d9a2805e6
AUX kea-initd-r1 2210 BLAKE2B 052fbbf03c6c1e8c66beb3161dbc8d46c6c704b7d931438039321177e792e1d7f08ccf17acb87d7c36af1878413c2f17cd00b951d4076c3be049cbe31de3e32a SHA512 051f4b86f083931c3934e2c63aeb45409bae5d50e6a91b29e642bf4cb609a539e2c23029b8dc70b48517a4646fa3db06961c823d804c514f05213be0b172cf9d
-DIST kea-1.8.1.tar.gz 9001243 BLAKE2B f121c173b915b82055048fb05dcde622ef3f7ee1d113604d94c7df737f9de1b15e5cedbe414ea583f6a6c9e9ceca615eaad2778a2736addc21b27fe45521aa3e SHA512 0f0972d63a1e146623dd30b8acab9a72af2d10c25fbdf9cf31e66ed25dee14f6b7602226c475f574a723415ba5569b04e13a97711bd933448e1045636ca6b96f
DIST kea-1.8.2.tar.gz 9005645 BLAKE2B fec1118ca34adc4bdafea13dd6c1c3abcd42df80043b621d1ed994e7ec6906a5d13e86a1bbb6dcbdfee32a4d70281c751b46c57d4866bd92557448ab7c602c30 SHA512 7bea9eb30ee819bd350ba3f64da7dc46d1176363e7243e934ff0f0498fcd47ef4eccb7fe8d8dd4f883ab9e376174aaba4fae06b20405181d46b6b12cfbdf7dd0
DIST kea-1.9.4.tar.gz 9280374 BLAKE2B 8fa3917ac9d3a95524b89474ac6ed09bc3b118b349a192a69a68bc7638295bd4b3e9bba532d4baba5575140d3b76f7d319a1ae4275d781ce6ffe9f931127f3bb SHA512 1808583194d426cf3881426a4d2c2f4134c463c6804648e2b1baa6a8ae48bca8b12ee2bc230349c785aff385a05a98a943d1c6ba09565e2204f262a2255be911
-EBUILD kea-1.8.1-r1.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
-EBUILD kea-1.8.2.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
-EBUILD kea-1.9.4.ebuild 1687 BLAKE2B fbc35228e78f1588c94dec8903b6af6be614a73f8bde3e097374a652db656e9f1a8f28495e22aca7d4c2398d21b06c6b704bfa238dc9fa6ef7c310bd90884387 SHA512 95b7879dae4b8fd42b6025effd3db251d61d7cf44c4c4f6aa39f8d572d9116975fdc405bff99516be143af81152bf6b288d2c6d155f61441b1f40edb11db67f3
-EBUILD kea-9999.ebuild 1687 BLAKE2B fbc35228e78f1588c94dec8903b6af6be614a73f8bde3e097374a652db656e9f1a8f28495e22aca7d4c2398d21b06c6b704bfa238dc9fa6ef7c310bd90884387 SHA512 95b7879dae4b8fd42b6025effd3db251d61d7cf44c4c4f6aa39f8d572d9116975fdc405bff99516be143af81152bf6b288d2c6d155f61441b1f40edb11db67f3
+EBUILD kea-1.8.2.ebuild 1750 BLAKE2B 3cde9b01069147d468eba1d52dafc56ff0cb1b95d836eac34fa27fa6c6cb8f5926ecb3dd43ef0ca5047619caa1b429b757ca27f06f7ef8d990a886e5978744cd SHA512 021a790c8530dc2f361fc96b6ad90bea0a27a99eacc6b45eeebe7a3a12f2f2ff06be6bff4885f1cc98e58a40f4dad582280b73bbcaf418a27c06a3755b5a32b1
+EBUILD kea-1.9.4.ebuild 1662 BLAKE2B bb651942e59eac1372cd6cc30de20656319a9f8b484f47b60ab48627bb6d726ec027fc774e563c29d2f1d03207fc033a6dba0d8293168831c507791c71c054a7 SHA512 e7d259920ce263476e8a46f683c4ec50e4a75d73123f71610196f8adecde54c504f8b00116112dc78bb412a5161c0b965ab8b0451dd74795d603c8f1d1e24291
+EBUILD kea-9999.ebuild 1662 BLAKE2B bb651942e59eac1372cd6cc30de20656319a9f8b484f47b60ab48627bb6d726ec027fc774e563c29d2f1d03207fc033a6dba0d8293168831c507791c71c054a7 SHA512 e7d259920ce263476e8a46f683c4ec50e4a75d73123f71610196f8adecde54c504f8b00116112dc78bb412a5161c0b965ab8b0451dd74795d603c8f1d1e24291
MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch b/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch
new file mode 100644
index 000000000000..867561f2e7e5
--- /dev/null
+++ b/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch
@@ -0,0 +1,50 @@
+--- a/m4macros/ax_cpp11.m4
++++ b/m4macros/ax_cpp11.m4
+@@ -182,6 +182,7 @@
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [#include <thread>
++ #include <memory>
+ std::shared_ptr<std::thread> th;],
+ [th.reset(new std::thread([[]]() { return; }));
+ th->join();])],
+--- a/src/bin/perfdhcp/Makefile.am
++++ b/src/bin/perfdhcp/Makefile.am
+@@ -3,7 +3,6 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
+ AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
+ AM_CPPFLAGS += $(BOOST_INCLUDES)
+-AM_CPPFLAGS += -Werror
+
+ AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
+--- a/src/bin/perfdhcp/tests/Makefile.am
++++ b/src/bin/perfdhcp/tests/Makefile.am
+@@ -4,7 +4,6 @@
+ AM_CPPFLAGS += -I$(srcdir)/.. -I$(builddir)/..
+ AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_srcdir)/testdata\"
+ AM_CPPFLAGS += $(BOOST_INCLUDES)
+-AM_CPPFLAGS += -Werror
+ AM_CXXFLAGS = $(KEA_CXXFLAGS)
+
+ if USE_STATIC_LINK
+--- a/src/lib/database/backend_selector.cc
++++ b/src/lib/database/backend_selector.cc
+@@ -7,6 +7,7 @@
+ #include <database/backend_selector.h>
+ #include <exceptions/exceptions.h>
+ #include <climits>
++#include <limits>
+ #include <sstream>
+
+ using namespace isc::data;
+--- a/src/lib/dhcpsrv/subnet_id.h
++++ b/src/lib/dhcpsrv/subnet_id.h
+@@ -10,6 +10,7 @@
+ #include <exceptions/exceptions.h>
+ #include <stdint.h>
+ #include <typeinfo>
++#include <limits>
+
+ namespace isc {
+ namespace dhcp {
diff --git a/net-misc/kea/kea-1.8.1-r1.ebuild b/net-misc/kea/kea-1.8.1-r1.ebuild
deleted file mode 100644
index 3e20776fe7e7..000000000000
--- a/net-misc/kea/kea-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="${PV//_p/-P}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
-HOMEPAGE="http://www.isc.org/kea/"
-if [[ ${PV} = 9999* ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
-else
- SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
- ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
- [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-IUSE="mysql +openssl postgres samples"
-
-DEPEND="
- dev-libs/boost:=
- dev-cpp/gtest
- dev-libs/log4cplus
- mysql? ( dev-db/mysql-connector-c )
- !openssl? ( dev-libs/botan:2= )
- openssl? ( dev-libs/openssl:0= )
- postgres? ( dev-db/postgresql:* )
-"
-RDEPEND="${DEPEND}
- acct-group/dhcp
- acct-user/dhcp"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- [[ ${PV} = *9999 ]] && eautoreconf
- # Brand the version with Gentoo
- sed -i \
- -e "/VERSION=/s:'$: Gentoo-${PR}':" \
- configure || die
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- --enable-perfdhcp
- --localstatedir="${EPREFIX}/var"
- --without-werror
- $(use_with mysql)
- $(use_with openssl)
- $(use_with postgres pgsql)
- $(use_enable samples install-configurations)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
- newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
- keepdir /var/lib/${PN} /var/log
- rm -rf "${ED}"/var/run || die
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/net-misc/kea/kea-1.8.2.ebuild b/net-misc/kea/kea-1.8.2.ebuild
index 3e20776fe7e7..8fa2128e5ae0 100644
--- a/net-misc/kea/kea-1.8.2.ebuild
+++ b/net-misc/kea/kea-1.8.2.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit toolchain-funcs
-
MY_PV="${PV//_p/-P}"
MY_PV="${MY_PV/_/-}"
MY_P="${PN}-${MY_PV}"
@@ -15,6 +13,7 @@ if [[ ${PV} = 9999* ]] ; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
else
+ inherit autotools
SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
@@ -41,9 +40,11 @@ BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${PN}-1.8.2-fix-cxx11-detection.patch )
+
src_prepare() {
default
- [[ ${PV} = *9999 ]] && eautoreconf
+ eautoreconf
# Brand the version with Gentoo
sed -i \
-e "/VERSION=/s:'$: Gentoo-${PR}':" \
diff --git a/net-misc/kea/kea-1.9.4.ebuild b/net-misc/kea/kea-1.9.4.ebuild
index f693a2e9d6d1..cc899fb2dce2 100644
--- a/net-misc/kea/kea-1.9.4.ebuild
+++ b/net-misc/kea/kea-1.9.4.ebuild
@@ -3,8 +3,6 @@
EAPI=7
-inherit toolchain-funcs
-
MY_PV="${PV//_p/-P}"
MY_PV="${MY_PV/_/-}"
MY_P="${PN}-${MY_PV}"
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index f693a2e9d6d1..cc899fb2dce2 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -3,8 +3,6 @@
EAPI=7
-inherit toolchain-funcs
-
MY_PV="${PV//_p/-P}"
MY_PV="${MY_PV/_/-}"
MY_P="${PN}-${MY_PV}"
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index bf5ad74159dd..c7bb56f35363 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -4,6 +4,9 @@ DIST miniupnpd-2.2.0.tar.gz 249858 BLAKE2B ef216c7703cb9806a3719b247d67c5c844879
DIST miniupnpd-2.2.0.tar.gz.sig 543 BLAKE2B 11778dd70128ece1f80144bb229176c53f3cd89847a8eedd4fe1b75ac55d986ae7c4689edf40f80c4605ba42260bc41f8fd069e99b8c249226ab9e2981d15412 SHA512 5e0e053a2a3ab876da001589677b0f5e3a4df8511ea5185dbbaee9b80928f9cb9705029f1c83bd9d26b144e39721fce1c4c8c33983956b6731ae654bc094063c
DIST miniupnpd-2.2.1.tar.gz 250023 BLAKE2B 67418a8480f7d3ac3d51a9c18fdcce4a85c33ff6c373051e1f9df121b00d936f02038ed0a5a5a848b7b2c145aa08dc1e2b954b211cc79fae1de09075f55a9f21 SHA512 211b608472a72065d892e9197f8bdd8c82e44296bb692244ec5e83ca9b076cbcc3426c806ff27d5e805505b1c82b1a7afd7b4030ddecdb60aa85c37062c10c8a
DIST miniupnpd-2.2.1.tar.gz.sig 543 BLAKE2B fac8c2fd5c50e3201c5fc490d91aed5752bf70297bed101cb3d5ec53d891fdc8f893b3d83e0cf064eb9e9bf16ae9504a849187e18eabc8ed12055574d1e551f5 SHA512 da5b52b1c62bf433a165acf87a64195e27c71c98dfa086cfde19f7b1c4046a62926cca5eb2d10f4260eb1b97c428ba08b4b7fcbf280c2a7009c86279a7563e0f
+DIST miniupnpd-2.2.2.tar.gz 250649 BLAKE2B d561916ced9b5c58371382fe0bec68cd0771d1dc3b2c7fa7e3701cb2579db69697fbdcd724bea2350abd46381eda1fd257dede6df99f99fa54e423db4ee52717 SHA512 3cc11ad901e93a9879fe07e35a20f8977df466bb402e0270e46d1dbd0b5dc3b5dc22303467d5022103952d7dd789ac590c17d0fa81fc7ec42676b66223d37ee4
+DIST miniupnpd-2.2.2.tar.gz.sig 543 BLAKE2B 461a9149c66b0e314a767405024fc7bfb641a20ae36b908dc467c9211660d5cb0753fb3c99fa9d6df35d693a2f6790efb6a325f0005804572eaa78a02b23a482 SHA512 8ffc9901cd992cbd9d0fa4c5e510fe43f748ab4a7c4732cc8f2f685f19b71a3f087a63a39e1dbf081175ac65de34b5c05dc3ef636a805e550a0406119a5904ef
EBUILD miniupnpd-2.2.0.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80
EBUILD miniupnpd-2.2.1.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80
+EBUILD miniupnpd-2.2.2.ebuild 2096 BLAKE2B 8d0fd68a34e76b77f74160775f8057c68b3c1a4e17b99461626b89fd703f20b9369164fba285c980e14f30028406cf215b0d707ecfe43dc703d1253974d7ae1f SHA512 3bc8158580d5040bfaf6953a6f2019547d8f6f6c7f64f6fb444d5108619c66cb98763d5f72c70fcd05514d185da19632f5435c2b5d7189b8b9f86dafc64d7fea
MISC metadata.xml 902 BLAKE2B ec10dab38256289a3445ad960eb869fe01ad009e21f77e61ffa4e45cac71120df285461cc3515de395918635b8f76a5448d761f9644172064e1eea79aa926947 SHA512 931799b28d6b7b1676d7ed0b94ce6760b550087785885635cb03c656c20e51c810a75dd8d675e17e5b8fdb87e7909f2a972ba11e168310eef4f58efd0a065135
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.2.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.2.ebuild
new file mode 100644
index 000000000000..b2d4b1534d14
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.2.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs verify-sig
+
+MY_P=${P/_rc/-RC}
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz
+ verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+ dev-libs/gmp:0=
+ sys-apps/util-linux:=
+ dev-libs/openssl:0=
+ !nftables? (
+ >=net-firewall/iptables-1.4.6:0=[ipv6?]
+ net-libs/libnfnetlink:=
+ net-libs/libmnl:=
+ )
+ nftables? (
+ net-firewall/nftables
+ net-libs/libnftnl:=
+ net-libs/libmnl:=
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-apps/lsb-release
+ verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_configure() {
+ local opts=(
+ --vendorcfg
+ $(usex igd2 '--igd2' '')
+ $(usex ipv6 '--ipv6' '')
+ $(usex leasefile '--leasefile' '')
+ $(usex portinuse '--portinuse' '')
+ $(usex pcp-peer '--pcp-peer' '')
+ $(usex strict '--strict' '')
+ --firewall=$(usex nftables nftables iptables)
+ )
+
+ # custom script
+ ./configure "${opts[@]}" || die
+ # prevent gzipping manpage
+ sed -i -e '/gzip/d' Makefile || die
+}
+
+src_compile() {
+ # By default, it builds a bunch of unittests that are missing wrapper
+ # scripts in the tarball
+ emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+ emake PREFIX="${ED}" STRIP=true install
+
+ local confd_seds=()
+ if use nftables; then
+ confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+ else
+ confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+ fi
+ if ! use ipv6 || use nftables; then
+ confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+ fi
+
+ newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+ newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+ "${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+ elog "Please correct the external interface in the top of the two"
+ elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index bdb772016305..e9f2167e6b32 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -49,8 +49,8 @@ DIST openssh-8_4_P1-hpn-PeakTput-15.1.diff 2429 BLAKE2B fc2140f4036ef57b70936966
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 17690 BLAKE2B 4a4da9135299252827c3d7069add541c3b94c2bf83a090453779e648636b4c6aeb6795463e0a3800eb26e9182b3c3bd22a70a9a728d6230578b8cd21c9bba2cd SHA512 4cbd311dc5ecac80a71c51b55668bc5f92d071cce7adf44c1d7afe0789c43213a726e0b52649b88046253d65e44669c501618fd0d234fe8c9ed9c2e7b0a22dc6
-EBUILD openssh-8.5_p1-r1.ebuild 17581 BLAKE2B 37b5478e20633a7dc673f5ec6b502642ff8a43383c3f33f562f3b9e94ec0084efe0fb8cf55384c9dc5a84065e613749058efff5e80984659dcef323e3a007334 SHA512 30cffed24dd1479ba8b09ffe402ac9de304f318b1a33ec68481fe2753a706bc1b3b88760a5706e2fa40d7c3305caaa25ccfc97353920155c46b03062350b1a59
-EBUILD openssh-8.5_p1.ebuild 17596 BLAKE2B 169bc9eeb353595865df78455edfdb503ef83922bc81154f91618b45185c9f867d362466b11c344c89faa9efe353f1df63ce37f9559c690c2656dd387b65bcd9 SHA512 3a33fbdfd98564676ac66e17c34cc0143e7bfd69b7f1f9609340d0b91ca14d4737937b9efb4691116746aca29897a8f4f87bc1025020d9b74e37564e3627ce6a
-EBUILD openssh-8.6_p1-r1.ebuild 17662 BLAKE2B 9e3f543f66fcc30763f0f4f13b4393b962af3093f12fd545d360c0d69de0b9421641e4cce9de190f98991e87ae76326e8561a2d8e8301964fa0310d420d8ab1e SHA512 bb9481cc63f7b1f3e6224ddfcb999acc4950e4a305d100acc0435f8d83a42fe82a366f680d7b289f256dbc44f22a33e12ef66b78b6b3e93e52f0403a824d401c
+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
MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f
diff --git a/net-misc/openssh/openssh-8.4_p1-r3.ebuild b/net-misc/openssh/openssh-8.4_p1-r3.ebuild
index ef43e0aa2027..bc42f87054e4 100644
--- a/net-misc/openssh/openssh-8.4_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-8.4_p1-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
# Make it more portable between straight releases
# and _p? releases.
diff --git a/net-misc/openssh/openssh-8.5_p1-r1.ebuild b/net-misc/openssh/openssh-8.5_p1-r1.ebuild
index b440e7aa4ae8..8aea025ac78a 100644
--- a/net-misc/openssh/openssh-8.5_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-8.5_p1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
# Make it more portable between straight releases
# and _p? releases.
diff --git a/net-misc/openssh/openssh-8.5_p1.ebuild b/net-misc/openssh/openssh-8.5_p1.ebuild
index 1d37aa2af6c1..340080016b33 100644
--- a/net-misc/openssh/openssh-8.5_p1.ebuild
+++ b/net-misc/openssh/openssh-8.5_p1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
# Make it more portable between straight releases
# and _p? releases.
diff --git a/net-misc/openssh/openssh-8.6_p1-r1.ebuild b/net-misc/openssh/openssh-8.6_p1-r1.ebuild
index bda61266ca34..ca2ff312f1a5 100644
--- a/net-misc/openssh/openssh-8.6_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-8.6_p1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
# Make it more portable between straight releases
# and _p? releases.
@@ -50,7 +50,7 @@ REQUIRED_USE="
"
# tests currently fail with XMSS
-REQUIRED_USE="test? ( !xmss )"
+REQUIRED_USE+="test? ( !xmss )"
LIB_DEPEND="
audit? ( sys-process/audit[static-libs(+)] )
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index 152e369aa82e..f0782cd1fe7a 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -1,13 +1,6 @@
AUX radvd-2.15.init 1537 BLAKE2B 6ca0db1eeeee77c345e4a5d9ee75d4e4fac188e3e19b153cff748c2b3a6c95960e8c360168b32a0f2b860bf40c21de86bcff1cfb69b2f70e7ce005e46f5d532f SHA512 cd3a6527d7b323266748cf674090419e89dc153daf883601604d040fceb55850d551e44371ba383a2bb98adaf361311969d1eea94a9f3ec1bf8c11aad54aac8e
-AUX radvd-2.17-nd_opt_6co.patch 2240 BLAKE2B 45c096fc406d31d9a9edca64c6e24005ac0b73b13acdf7a73fefe39f6212e574d3eca342d90211df65255763fe40771d4836b3f5b060e4e3875a865e571c2e49 SHA512 0732d403e416fc4b3ed3f322c90b3d5c98adaf7b4fe0af05fa5ffaf3845f5047b0997f03065889c6272e57d3a09088a6beb99692cb9e4efc660638f586c4dbf3
AUX radvd.conf 337 BLAKE2B 67d50a761449b35389580ac956758f5c8c9373a14294a9e98e8238cce4ef2847694712e12296197ff196d58a9e5123aa6e27044a2137c36c34c6e2342ee7db63 SHA512 303a79c6e60293571f5cc868ba36f48a98658be8b6a9596c007461cbef2775d7deb67950fdacb3f37765cffdda164bc386e23bbb512cbabebd5173245841e401
AUX radvd.service 603 BLAKE2B fb573b528050d772926f3cb3cf82984b946345f636b661583f3aa5ef720a664cc13b20b8435ad2bcdd5bbdbad6451530384cd869f6d33d4e6f2ccf014ff9871b SHA512 3371d18e71ddb7672e929152d9f93201b49c1ce08c77d59cbcac7654362690a9ab97db08519f5fbe210738595aa52f30f5972cacca988b9274e2218c21bc7dd2
-DIST radvd-2.17.tar.gz 214937 BLAKE2B 1eec22e09607c0396f9539aef203b76d5beca18d1fdf5aa0ff202dcb2ff0e36ed8af74fc7900eb7b16012bfb0672f9660f17c88c222ac0269947d3cf4a270db3 SHA512 117a42c2c007d730b956cf999ac281f50a1a9b57c9428fe0f860cb211ac234ec62f59fead244a80191aaa15ef4ce96fb7dba9bd1a3cb6c3b29f1b6897d7a6132
-DIST radvd-2.18.tar.gz 224183 BLAKE2B 4bacf9e17b78286a032ca5e6b6424aa8742d2e42b3a00a67e5d8beeda139a70a574e69c0d8fde2c2754b6e9c9e92a97dfb6a2a67b4b3ce91740aa8edee994c5e SHA512 b66068ec40d4f228f679946039d7c696bf611eb55b88cb37bbea5e748cf7cdda796dc0b12e0f1e54b26a6af21750c8714ea18a152ef932741c0f0a6a7a9de59a
DIST radvd-2.19.tar.gz 222794 BLAKE2B 1c877d5a9eda6bda41b5c20ac9c1e28a26defc192fe14fc2d65888280bc96fc1ff6f4212ccaeac5f7e899087b2805772ed4c0cbbda163b2a87c79a2c178eda2b SHA512 caa621fd77e34ff6858d60a41b0ee02aff967ac14f2b84c402359744f4bece5c1563419860431c328adc0385e9893ed1f2421d652247a3aa0dfc0aaad1e01233
-EBUILD radvd-2.17-r1.ebuild 1556 BLAKE2B 93af31a21f7871e1fd1d8fe86182afcd668a91aaccf1de5da7613f0bced8ce434d6d353318f6749e63ea0af66470158786b9c2065a95532c1d6cf43da7bd9089 SHA512 0a997263824fcfd2228ea865e5d2ed0bc1735cc9b3df7f9020bbb1b6ddf99833f462c4a0ce8c4bea60bd60f3a93d93f3aa76297808b66439d32f7888e8f9bc1f
-EBUILD radvd-2.17-r2.ebuild 1611 BLAKE2B d928b23c57c3b5de1b5d2a693bff19e9d47e137626f27f7c05a4c9cd09bc71848a92c608bd1cb5b83fab98985d5467d327e7763fa76ed70a406a731c8b319c39 SHA512 caa59fc06ebc864cb19a5c9fdd6c69c7f71ab8966fbe9d38a026ee072a26c3be1f0154a6c27804ebd334da2c962a0f72c846e45e90d2eaf5c69a2bbc843046d1
-EBUILD radvd-2.18-r1.ebuild 1640 BLAKE2B ff5c262a37241cbcff12262f8248d2817145cb1190b3dd930498d9ea2a40741162390fffaf94e3c5c3402bcad54830d95a93f11cd1382c82d26a3b1daabea386 SHA512 3a68a9c9ad0cd8cb3abf25df3af5807f327e628e068cf52b1e767f8f50c671769664bf58e30ac415f653027712f19beb3d0dae44bde143f97074ced7fea00228
-EBUILD radvd-2.18.ebuild 1575 BLAKE2B e311998f67468be9b522e4ee1003da8f706a13551e03b64526e8f5454dcc49a744df60e5706d7a430d382f3a21fe901f10a3f666850669b89137267398beb0dd SHA512 bc30b1d124da0d25705c0e7e89f09d9cbde7086082d9ad9bba720f0fa9f6738fa28a207f0ec8693a78a1cf41e8ea591e616e4a1c78a0865ddc5285df5e176d29
EBUILD radvd-2.19.ebuild 1645 BLAKE2B d0a8fad16d870345307508f6fc5eb8d60e234043205ed17a5b3b3b3dfcc62e6daedf0b39e40205abebf458a1711b41831bd17588015139ee3435440c0341f6a3 SHA512 cfb01dfbb09acb7683b964f2b9bbfa3e0c68bd0b40ff77ec279892801abe24352e7640477fe09840d3f04a2c2e44d22afd4d2b63494722025c80ea0fee56acc4
MISC metadata.xml 357 BLAKE2B 7a671f4f2fc8439f4fb80a70b5e436e9002464600ce9ad0c9aacdc22d7c3d090e26ac30431d39107ab1081f6238528b91e67d3e1e59a7ba64a85e92c584bc4d8 SHA512 d81daf7b68978a8012b5c5de47074fa35bfcd457f99ef873f0ac46409022d93c41eac5bd7492f7af1b9f7b1bae94da7eb8e6fa537414b6371ca77ba13b70e1c1
diff --git a/net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch b/net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch
deleted file mode 100644
index 09fb29f9e318..000000000000
--- a/net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-nd_opt_6co: fix serialization
-
-Bug: https://github.com/reubenhwk/radvd/issues/77
-Bug: https://bugs.gentoo.org/637958
---- a/radvd.h
-+++ b/radvd.h
-@@ -261,5 +261,3 @@ struct nd_opt_6co {
- uint8_t nd_opt_6co_context_len;
-- uint8_t nd_opt_6co_res : 3;
-- uint8_t nd_opt_6co_c : 1;
-- uint8_t nd_opt_6co_cid : 4;
-+ uint8_t nd_opt_6co_res_c_cid; /* [ res=3-bits | c=1-bit | cid=4-bits ] */
- uint16_t nd_opt_6co_reserved;
---- a/send.c
-+++ b/send.c
-@@ -621,5 +621,5 @@ static void add_ra_option_lowpanco(struct safe_buffer *sb, struct AdvLowpanCo co
- co.nd_opt_6co_context_len = lowpanco->ContextLength;
-- co.nd_opt_6co_c = lowpanco->ContextCompressionFlag;
-- co.nd_opt_6co_cid = lowpanco->AdvContextID;
-- co.nd_opt_6co_valid_lifetime = lowpanco->AdvLifeTime;
-+ co.nd_opt_6co_res_c_cid = ((lowpanco->ContextCompressionFlag ? 1 : 0) << 4)
-+ | (lowpanco->AdvContextID & 0x0F);
-+ co.nd_opt_6co_valid_lifetime = htons(lowpanco->AdvLifeTime);
- co.nd_opt_6co_con_prefix = lowpanco->AdvContextPrefix;
-@@ -637,5 +637,5 @@ static void add_ra_option_abro(struct safe_buffer *sb, struct AdvAbro const *abr
- abro.nd_opt_abro_len = 3;
-- abro.nd_opt_abro_ver_low = abroo->Version[1];
-- abro.nd_opt_abro_ver_high = abroo->Version[0];
-- abro.nd_opt_abro_valid_lifetime = abroo->ValidLifeTime;
-+ abro.nd_opt_abro_ver_low = htons(abroo->Version[1]);
-+ abro.nd_opt_abro_ver_high = htons(abroo->Version[0]);
-+ abro.nd_opt_abro_valid_lifetime = htons(abroo->ValidLifeTime);
- abro.nd_opt_abro_6lbr_address = abroo->LBRaddress;
---- a/test/send.c
-+++ b/test/send.c
-@@ -311,6 +311,5 @@ START_TEST(test_add_ra_option_lowpanco)
- unsigned char expected[] = {
-- 0x22, 0x03, 0x32, 0x48, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x00, 0x00,
-+ 0x22, 0x03, 0x32, 0x14, 0x00, 0x00, 0x03, 0xe8, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- };
--
- ck_assert_int_eq(sb.used, sizeof(expected));
-@@ -336,3 +335,3 @@ START_TEST(test_add_ra_option_abro)
- unsigned char expected[] = {
-- 0x23, 0x03, 0x0a, 0x00, 0x02, 0x00, 0x02, 0x00, 0xfe, 0x80, 0x00, 0x00,
-+ 0x23, 0x03, 0x00, 0x0a, 0x00, 0x02, 0x00, 0x02, 0xfe, 0x80, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
diff --git a/net-misc/radvd/radvd-2.17-r1.ebuild b/net-misc/radvd/radvd-2.17-r1.ebuild
deleted file mode 100644
index 7bed2c874d95..000000000000
--- a/net-misc/radvd/radvd-2.17-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user readme.gentoo-r1
-
-DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="http://v6web.litech.org/radvd/"
-SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc sparc x86"
-IUSE="kernel_FreeBSD selinux test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/libdaemon"
-DEPEND="${CDEPEND}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-radvd )
-"
-DOCS=( CHANGES README TODO radvd.conf.example )
-
-pkg_setup() {
- enewgroup radvd
- enewuser radvd -1 -1 /dev/null radvd
-}
-
-src_configure() {
- econf --with-pidfile=/run/radvd/radvd.pid \
- --with-systemdsystemunitdir=no \
- $(use_with test check)
-}
-
-src_install() {
- default
-
- insinto /usr/share/doc/${PF}/html
- doins INTRO.html
-
- newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
- newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- if use kernel_FreeBSD ; then
- sed -i -e \
- 's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
- "${D}"/etc/init.d/${PN} || die
- fi
-
- readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf.
-See ${ROOT}usr/share/doc/${PF} for an example.
-
-grsecurity users should allow a specific group to read /proc
-and add the radvd user to that group, otherwise radvd may
-segfault on startup."
diff --git a/net-misc/radvd/radvd-2.17-r2.ebuild b/net-misc/radvd/radvd-2.17-r2.ebuild
deleted file mode 100644
index f323029a5944..000000000000
--- a/net-misc/radvd/radvd-2.17-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user readme.gentoo-r1
-
-DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="http://v6web.litech.org/radvd/"
-SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86"
-IUSE="kernel_FreeBSD selinux test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/libdaemon"
-DEPEND="${CDEPEND}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-radvd )
-"
-DOCS=( CHANGES README TODO radvd.conf.example )
-
-PATCHES=(
- "${FILESDIR}"/${P}-nd_opt_6co.patch
-)
-
-pkg_setup() {
- enewgroup radvd
- enewuser radvd -1 -1 /dev/null radvd
-}
-
-src_configure() {
- econf --with-pidfile=/run/radvd/radvd.pid \
- --with-systemdsystemunitdir=no \
- $(use_with test check)
-}
-
-src_install() {
- default
-
- insinto /usr/share/doc/${PF}/html
- doins INTRO.html
-
- newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
- newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- if use kernel_FreeBSD ; then
- sed -i -e \
- 's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
- "${D}"/etc/init.d/${PN} || die
- fi
-
- readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf.
-See ${ROOT}usr/share/doc/${PF} for an example.
-
-grsecurity users should allow a specific group to read /proc
-and add the radvd user to that group, otherwise radvd may
-segfault on startup."
diff --git a/net-misc/radvd/radvd-2.18-r1.ebuild b/net-misc/radvd/radvd-2.18-r1.ebuild
deleted file mode 100644
index e64526ed134a..000000000000
--- a/net-misc/radvd/radvd-2.18-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="http://v6web.litech.org/radvd/"
-SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="kernel_FreeBSD selinux test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/libdaemon"
-DEPEND="${CDEPEND}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-radvd )
-"
-DOCS=( CHANGES README TODO radvd.conf.example )
-
-PATCHES=(
-)
-
-pkg_setup() {
- enewgroup radvd
- enewuser radvd -1 -1 /dev/null radvd
-}
-
-src_configure() {
- econf --with-pidfile=/run/radvd/radvd.pid \
- --with-systemdsystemunitdir=no \
- $(use_with test check)
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- insinto /usr/share/doc/${PF}/html
- doins INTRO.html
-
- newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
- newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- if use kernel_FreeBSD ; then
- sed -i -e \
- 's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
- "${D}"/etc/init.d/${PN} || die
- fi
-
- readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf.
-See ${ROOT}usr/share/doc/${PF} for an example.
-
-grsecurity users should allow a specific group to read /proc
-and add the radvd user to that group, otherwise radvd may
-segfault on startup."
diff --git a/net-misc/radvd/radvd-2.18.ebuild b/net-misc/radvd/radvd-2.18.ebuild
deleted file mode 100644
index a39b4d0db4e3..000000000000
--- a/net-misc/radvd/radvd-2.18.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user readme.gentoo-r1
-
-DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="http://v6web.litech.org/radvd/"
-SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 sparc x86"
-IUSE="kernel_FreeBSD selinux test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/libdaemon"
-DEPEND="${CDEPEND}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-radvd )
-"
-DOCS=( CHANGES README TODO radvd.conf.example )
-
-PATCHES=(
-)
-
-pkg_setup() {
- enewgroup radvd
- enewuser radvd -1 -1 /dev/null radvd
-}
-
-src_configure() {
- econf --with-pidfile=/run/radvd/radvd.pid \
- --with-systemdsystemunitdir=no \
- $(use_with test check)
-}
-
-src_install() {
- default
-
- insinto /usr/share/doc/${PF}/html
- doins INTRO.html
-
- newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
- newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- if use kernel_FreeBSD ; then
- sed -i -e \
- 's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
- "${D}"/etc/init.d/${PN} || die
- fi
-
- readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf.
-See ${ROOT}usr/share/doc/${PF} for an example.
-
-grsecurity users should allow a specific group to read /proc
-and add the radvd user to that group, otherwise radvd may
-segfault on startup."
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 8f60d757d638..0dfde54ddfd4 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1,3 @@
DIST smb4k-3.0.6.tar.xz 3842424 BLAKE2B 7c42007a00b3da07bdc1629360bb8640c66ac7332fefca82698664cf197d4061d6c4419ab99ebd29e6515dace194973be2c179fa3c422820716fc5e5e1b8591f SHA512 993f669c12db30dd78f9f6cc694dfe563958407582f65ff64b6ada36cf4372ad6bb5addecc93970ce6750d031bf4ee9dfefa362e13100d2ce8d3e848a0d89382
-EBUILD smb4k-3.0.6.ebuild 1863 BLAKE2B 9f9a74efd627fb11a2a4eb4181776e7727594ae00bcdf6e7083dff17f864428dd6e25f00c78fcfcab482fa4293261586ed012e8ce7ede0ca70b3c8a39b0d0b8b SHA512 c99a37ca1bb9e0bd5090153e4becb9d5aa1eccb8142b0f0371c06e358fbde5307d13865e7d0eb37d2cd4f786c9e543122368e11f70b6fadf4bed8adc94e4c3ec
+EBUILD smb4k-3.0.6.ebuild 1861 BLAKE2B 4361e390e11a5b3b3821b9300d6f5bd46c1f37460c325d7793f93b32d6228daef0db6eafdaffe75a7e192d6bb4c6737ee46a89750755eb3a560cd18c1b678d58 SHA512 a60dbf1b19f7a0d6a8d8d0198203a6d285187d8fdf55bec1cbcbb1fc7e729476c8c74992a5bf20599b2f00ce267c53928bd21cc9cd311adc20a4095df69a74c5
MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/smb4k-3.0.6.ebuild b/net-misc/smb4k/smb4k-3.0.6.ebuild
index 758dd644103f..0466ede258ea 100644
--- a/net-misc/smb4k/smb4k-3.0.6.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.6.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
@@ -9,7 +9,7 @@ QTMIN=5.12.3
inherit ecm kde.org
DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://apps.kde.org/en/smb4k
+HOMEPAGE="https://apps.kde.org/smb4k/
https://sourceforge.net/p/smb4k/home/Home/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 430026495844..2e0cab8e8c28 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,5 +1,3 @@
-AUX unison-2.48.15_p4-ocaml-4.08.patch 1942 BLAKE2B 18cd8c18e0c30156fd3e36aaa987a9ad033ff321edd4f911006bfec958d70884f3575536cfe543e8da0fc10448193bb3514936bab95f3c71c96b75b4f4048c0e SHA512 802b333418513df59fbbf956620f1576141763a898d320a3be06d35d5ad8adf38c13e9bc9dd38cae05f2d7a25c07a3fcc709ace66c6a92d728c25a42688494e9
-AUX unison-2.48.4-Makefile-dep.patch 542 BLAKE2B b32665bd2562c84aae1a801648c9324a0fafe39fb7d7d6be0b6bc52cdcd2f8282cfcde97fe2682b1d41656f65f1df9e32adc03660ef2c5c6a9394709c3d1e838 SHA512 e36704c7ac0fee66a308364ad72443a36ac14c1aacca0728b50f1770df91bf77347b58d218e93943a91cf2e99672840a6c322a5a4a5f238797d440ae16aa2394
DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd SHA512 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703 SHA512 c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6
EBUILD unison-2.51.3_p20201127.ebuild 2775 BLAKE2B 5171b9656a9d6d7b624875d172f6bc19204973e62ecb9dd1b3c5a1a30f16d42a16ac4a0bab9dcfee89b30e96ea46d2a0d04ddf7d49c79e9b610d2f0232432dfa SHA512 bbdefdaf03776ba61885984dcbeedbf5e01577787228e5ace678405c038f61813c91dd3cdddae420ecf2cdd2d1ee5f94b18f2e90d5cd7541b38c1eadf725a7d4
diff --git a/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch b/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch
deleted file mode 100644
index 8a8205d3cfe3..000000000000
--- a/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Reworked for v2.48.15v4 ( https://github.com/bcpierce00/unison/commit/29fa058 )
-
-From: Stephane Glondu <steph@glondu.net>
-Date: Mon, 25 Nov 2019 10:52:48 +0100
-Subject: Fix compilation with OCaml 4.08.1
-
----
- files.ml | 2 +-
- recon.ml | 4 ++--
- system/system_generic.ml | 2 +-
- uigtk2.ml | 2 +-
- 5 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.OCaml b/Makefile.OCaml
-index 21610ce..7549907 100644
---- a/files.ml
-+++ b/files.ml
-@@ -722,7 +722,7 @@ let get_files_in_directory dir =
- with End_of_file ->
- dirh.System.closedir ()
- end;
-- Sort.list (<) !files
-+ List.sort String.compare !files
-
- let ls dir pattern =
- Util.convertUnixErrorsToTransient
-diff --git a/recon.ml b/recon.ml
-index 5ed358d..a8719c4 100644
---- a/recon.ml
-+++ b/recon.ml
-@@ -651,8 +651,8 @@ let rec reconcile
-
- (* Sorts the paths so that they will be displayed in order *)
- let sortPaths pathUpdatesList =
-- Sort.list
-- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
-+ List.sort
-+ Path.compare
- pathUpdatesList
-
- let rec enterPath p1 p2 t =
-diff --git a/system/system_generic.ml b/system/system_generic.ml
-index 9230cdc..ee457c5 100755
---- a/system/system_generic.ml
-+++ b/system/system_generic.ml
-@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
- let chmod = Unix.chmod
- let chown = Unix.chown
- let utimes = Unix.utimes
--let link = Unix.link
-+let link s d = Unix.link s d
- let openfile = Unix.openfile
- let opendir f =
- let h = Unix.opendir f in
-diff --git a/uigtk2.ml b/uigtk2.ml
-index 206d8ad..b2a17e2 100644
---- a/uigtk2.ml
-+++ b/uigtk2.ml
-@@ -94,7 +94,7 @@ let icon =
- let icon =
- let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
- Gpointer.blit
-- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
-+ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
- p
-
- let leftPtrWatch =
diff --git a/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch b/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
deleted file mode 100644
index f65959dfb4ac..000000000000
--- a/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Makefile.OCaml: fswatch.cmi depends on ubase/prefs.cmi.
-
- The dependency is needed to compile unison
- in parallel.
-
-Reference: https://github.com/bcpierce00/unison/pull/100
-
-diff --git a/Makefile.OCaml b/Makefile.OCaml
-index 21610ce..84fe7ad 100644
---- a/Makefile.OCaml
-+++ b/Makefile.OCaml
-@@ -426,6 +426,8 @@ win32rc/unison.res.lib: win32rc/unison.res
- @echo "$(CAMLC): $< ---> $@"
- $(CAMLC) $(CAMLFLAGS) -c $(CWD)/$<
-
-+fswatch.cmi : ubase/prefs.cmi
-+
- %.cmo: %.ml
- @echo "$(OCAMLC): $< ---> $@"
- $(OCAMLC) $(CAMLFLAGS) -c $(CWD)/$<
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index bfb1090bf7eb..9e63888ddea4 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,6 @@
-DIST youtube-dl-2021.04.07.tar.gz 3324661 BLAKE2B c560b6b07bc3ba0c9b7233a634bfae617f604ed5e019e22aefc90e9221a8cd358b937f727b706bba6e9bb6f0a18a8ebd28d5c1f0be383d9dca2c692266cdf222 SHA512 aabf6a1ceefe9101c710bbb45b91e6253a1256343513d841f7901d2be32521a001dac15f5bf13ac94beaf4638dce691f2a157a6172d89047ce2248d06bcafbf8
-DIST youtube-dl-2021.04.17.tar.gz 3331721 BLAKE2B 6b7be0fcb85222d287848cfa40da1dee3f689c59388bbc5d32c335b54cbd0e5ec54c86caf358418641c429d37ae28575858486d4db798d72225a4f5c6e064ac8 SHA512 cb8c76063fc3bd66d07995a669fcf29e5b766c4deb05c9d82fc9795ac3a090a4ae2ee152f150208eae22b93157c286c615044f8f5b0a47798266ab219b49632e
DIST youtube-dl-2021.04.26.tar.gz 3333530 BLAKE2B cffa09f91a1bbfc5962177133711ec1fce4760ef4a073c01daede2cdc168a10cfd868ca536903127f5a3214aece1c111d1dae23739aac86e765d7ff21903c884 SHA512 d187b537fc71ca8e0c9422404f14bab20f66ee9ea10af40d94e9216a79d6b78c1c535600308d18905c34ede0934dbf4f642f58125e898130ce536bc053aa2a10
-EBUILD youtube-dl-2021.04.07.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609
-EBUILD youtube-dl-2021.04.17.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
-EBUILD youtube-dl-2021.04.26.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
+DIST youtube-dl-2021.05.16.tar.gz 3336051 BLAKE2B b73206355187a9f61c51749ce01db40757937f79f988a3b81513a5cbe2c854d1b7f2268d7e02c4a0eb3d46c0852990950dfd400acc09f7616aeccb2e8cba6cf9 SHA512 a78ebfc16cc52458e2a036deb48693110f20c046ca3a509be9adbca76d23429953fcf3cd3aab8390a19af747291950bb9261e5339e5cbb0903b98848216c7aca
+EBUILD youtube-dl-2021.04.26.ebuild 2132 BLAKE2B aca117606444a348e36c1899222b24c091ed717dfa799f48a92de68c4ad07b9671719eaa15e084843d4fead0905d00302884da3ebd56e6e39297da42b446a38b SHA512 9f0f20088a069af5f33ffcab5c4db0bf850e01c34b70bd72279140b9485f838e4f947d48adbe8fc8a30ee064078aae02c08d7c7a5632d42803ae47d39431e99d
+EBUILD youtube-dl-2021.05.16.ebuild 2137 BLAKE2B fe26a208b04301c55e253adfa69189bcaa55624e1e7ac9103634383bb5c04537d1bd15552064d0ae07eb42ab19bd3be3497568d6b4dc74e8bf87748e211c08e1 SHA512 76d1a22b00c0d1625889b5bbd23bbae97a0408642d883127821a16896e3c48a0a809e40496777b65f45b34b6e20b38a7a168d087d781eb1b3e6575ab7fcc3ddc
EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B a1f8bf8a72ee78e4f6720b44da5c4f2782d16e6a63a5ac9bea156794492df0568a01de29e0015758668ac8902c510fdbae2855031f3b9f4902bf736753e3b2a3 SHA512 f14c1f7399ceeb6a367ecbdf790d9c99a74f0be93b27f1e140a681c8262739b9201cd12bde472f92e9041db7d3a21049cf646c58453f41f59b3edb77abc73c79
MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2021.04.07.ebuild b/net-misc/youtube-dl/youtube-dl-2021.04.07.ebuild
deleted file mode 100644
index d787a3f3be53..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2021.04.07.ebuild
+++ /dev/null
@@ -1,71 +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})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
- dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
- sed -i -e '/flake8/d' Makefile || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- emake offlinetest
-}
-
-python_install_all() {
- doman youtube-dl.1
-
- newbashcomp youtube-dl.bash-completion youtube-dl
-
- insinto /usr/share/zsh/site-functions
- newins youtube-dl.zsh _youtube-dl
-
- insinto /usr/share/fish/vendor_completions.d
- doins youtube-dl.fish
-
- distutils-r1_python_install_all
-
- rm -r "${ED}"/usr/etc || die
- rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
- elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
- elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
- elog
- elog "youtube-dl works fine on its own on most sites. However, if you want"
- elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
- elog "On some sites - most notably YouTube - videos can be retrieved in"
- elog "a higher quality format without sound. youtube-dl will detect whether"
- elog "ffmpeg is present and automatically pick the best option."
- elog
- elog "Videos or video formats streamed via RTMP protocol can only be"
- elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
- elog
- elog "Downloading MMS and RTSP videos requires either mplayer"
- elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
- elog
- elog "If you want youtube-dl to embed thumbnails from the metadata into the"
- elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild b/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild
index 9b024e43dbba..3d701ad41fa9 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=(python3_{7..9})
+PYTHON_COMPAT=(python3_{7..10})
DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -15,7 +15,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
S=${WORKDIR}/${PN}
LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
SLOT="0"
RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2021.04.17.ebuild b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
index 9b024e43dbba..6ca1748400e4 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.04.17.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=(python3_{7..9})
+PYTHON_COMPAT=(python3_{7..10})
DISTUTILS_USE_SETUPTOOLS=rdepend