diff options
Diffstat (limited to 'net-misc')
1575 files changed, 40051 insertions, 35080 deletions
diff --git a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild b/net-misc/adjtimex/adjtimex-1.29-r3.ebuild index 5ac80ba347a5..519a776f5a9d 100644 --- a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild +++ b/net-misc/adjtimex/adjtimex-1.29-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -10,6 +10,7 @@ MY_P="${P/-/_}" DEBIAN_URI="mirror://debian/pool/main/${PN:0:1}/${PN}" DEBIAN_PATCH="${MY_P}-${DEBIAN_PV}.debian.tar.xz" DEBIAN_SRC="${MY_P}.orig.tar.gz" + DESCRIPTION="Display or set the kernel time variables" HOMEPAGE="https://www.ibiblio.org/pub/Linux/system/admin/time/adjtimex.lsm https://github.com/rogers0/adjtimex" SRC_URI="${DEBIAN_URI}/${DEBIAN_PATCH} @@ -19,6 +20,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ppc x86" +RDEPEND="!net-misc/sntpd[adjtimex]" + src_unpack() { unpack "${DEBIAN_SRC}" cd "${S}" || die "Failed to cd ${S}" diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild index b2a89cb1988e..ff5e7181db2a 100644 --- a/net-misc/aggregate/aggregate-1.6.ebuild +++ b/net-misc/aggregate/aggregate-1.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs +inherit autotools DESCRIPTION="Perform two optimisations on a list of prefixes to reduce the length of the list" HOMEPAGE="https://ftp.isc.org/isc/aggregate" @@ -12,16 +12,17 @@ SRC_URI="https://ftp.isc.org/isc/aggregate/${P}.tar.gz" LICENSE="ISC" SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86" -IUSE="" RDEPEND="dev-lang/perl" -DEPEND="" -PATCHES=( "${FILESDIR}/${P}-build-fixup.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-build-fixup.patch +) -src_configure() { - tc-export CC - econf +src_prepare() { + default + + eautoreconf #871198 } src_install() { diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest index 7610c2f5aa10..e3f805ac65a0 100644 --- a/net-misc/anydesk/Manifest +++ b/net-misc/anydesk/Manifest @@ -1,8 +1 @@ -DIST anydesk-5.5.6-amd64.tar.gz 5054062 BLAKE2B a131fe5e10def7017cf29e8cc175e2b448be7fe3e9fa7257dc0cb470f31f6fdc78e510b5e377bc10528f0eb7f264572bf4c334c9d412f8f7404aaf85d4babbb9 SHA512 32527532fb769dccc6df8208c18e391ac6537e38f7d6c5acfd3280dbbc7cf0c545ec55416eb798ad8a6d3b0e958778d87696c9d721dd1739c17b935f1046c29d -DIST anydesk-5.5.6-i386.tar.gz 4970197 BLAKE2B b656071498784052ce1c81f32c0ae333039930b26487d204dc5f55e8352f263878437ab3a4e2ac8469745ece75a29056f553f12f33fe96c9c2bc54d3d4644941 SHA512 3b561e014cc4c149f4d77b43c4e5427266604679dfdf9253bb76689ee6c6ac5b274cc5ac58147bdc136c20f616c9f9d8dbc2c11b5b85d0f184a0251ece2ad265 -DIST anydesk-6.0.0-amd64.tar.gz 5195378 BLAKE2B b967e063cff609ff9a93f3946c6f555987526d2fd163130dc74d0e69d720972a483e0b7df04b1e39c9096156a7161ab46b160b243e249fca4ce7c6c565ae104e SHA512 f41e1fd7dc505166a21b0b7a16ad295e75b55ba73646564c8f1531f3ea659f58868294e694479a518f8692f1eb14918fa6a62c7b1e115f81da478bf8d268e07c -DIST anydesk-6.0.0-i386.tar.gz 5116771 BLAKE2B 074907ac1976a3b9df7df0acf29663039e0b56466c417cb40b6c2d5d643fa4f207af529ee89a278f26ede330e8bc6fc3b32e9e5a451811ff2d8e6e1b2ccd9065 SHA512 09bc0b0ae0f9d2ca764e9feee81c38a9890e710908265c35c181657a13eb5d326cde52d01b7ba68132aac1784b6422df33c904b130f025967e9375332a350414 -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 +DIST anydesk-6.3.2-amd64.tar.gz 7039607 BLAKE2B dfc628baef862bddb944b02d39c3e270a0ac4dbe88704099f8b9022e7e758a367093432b78e86bcc1d9432fabe1c2842c4e811e59541433cb75a9734e09cff08 SHA512 a0fac07d6beb085666f4414f592b5b26b0f699ebc0b1ad5a587317a0c46b0f92a8d3b3e2e0ab08ce9e6c4c1c15789f8396158cc87075e623e32ce714ad071612 diff --git a/net-misc/anydesk/anydesk-5.5.6-r1.ebuild b/net-misc/anydesk/anydesk-5.5.6-r1.ebuild deleted file mode 100644 index d498d8b7ae03..000000000000 --- a/net-misc/anydesk/anydesk-5.5.6-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# 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="amd64? ( - https://download.anydesk.com/linux/${P}-amd64.tar.gz - https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz - ) - x86? ( - https://download.anydesk.com/linux/${P}-i386.tar.gz - https://download.anydesk.com/linux/generic-linux/${P}-i386.tar.gz - )" - -# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash -LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" - -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.philandro.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/anydesk/anydesk-6.0.0-r1.ebuild b/net-misc/anydesk/anydesk-6.0.0-r1.ebuild deleted file mode 100644 index d498d8b7ae03..000000000000 --- a/net-misc/anydesk/anydesk-6.0.0-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# 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="amd64? ( - https://download.anydesk.com/linux/${P}-amd64.tar.gz - https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz - ) - x86? ( - https://download.anydesk.com/linux/${P}-i386.tar.gz - https://download.anydesk.com/linux/generic-linux/${P}-i386.tar.gz - )" - -# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash -LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" - -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.philandro.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/anydesk/anydesk-6.0.1.ebuild b/net-misc/anydesk/anydesk-6.0.1.ebuild deleted file mode 100644 index 3818d457efc3..000000000000 --- a/net-misc/anydesk/anydesk-6.0.1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# 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="amd64? ( - https://download.anydesk.com/linux/${P}-amd64.tar.gz - https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz - ) - x86? ( - https://download.anydesk.com/linux/${P}-i386.tar.gz - https://download.anydesk.com/linux/generic-linux/${P}-i386.tar.gz - )" - -# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash -LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" - -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.philandro.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/anydesk/anydesk-6.1.0.ebuild b/net-misc/anydesk/anydesk-6.1.0.ebuild deleted file mode 100644 index 258fe9e1b0d6..000000000000 --- a/net-misc/anydesk/anydesk-6.1.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# 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.philandro.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/anydesk/anydesk-6.1.1.ebuild b/net-misc/anydesk/anydesk-6.3.2.ebuild index 62fe1172d7a0..8da50cec7b3c 100644 --- a/net-misc/anydesk/anydesk-6.1.1.ebuild +++ b/net-misc/anydesk/anydesk-6.3.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" inherit desktop optfeature systemd xdg-utils @@ -15,20 +15,19 @@ LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB" SLOT="0" KEYWORDS="-* ~amd64" +# x11-libs/gtkglext is required and cannot be mitigated: https://bugs.gentoo.org/868255 RDEPEND=" - dev-libs/atk + app-accessibility/at-spi2-core:2 dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glu - media-libs/mesa[X(+)] + media-libs/libglvnd 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 @@ -36,10 +35,8 @@ RDEPEND=" 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 " @@ -55,9 +52,6 @@ src_install() { 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}" @@ -72,8 +66,6 @@ src_install() { domenu "${FILESDIR}/anydesk.desktop" - keepdir "/etc/${PN}" - dodoc copyright README } @@ -97,10 +89,11 @@ pkg_postinst() { elog fi - optfeature_header "AnyDesk uses additional tools to query information about the host:" + optfeature_header "AnyDesk additional tools:" optfeature "lsb_release" sys-apps/lsb-release optfeature "lspci" sys-apps/pciutils optfeature "lsusb" sys-apps/usbutils + optfeature "sound support" media-libs/libcanberra[gtk2] } pkg_postrm() { diff --git a/net-misc/anydesk/files/anydesk-4.0.1.service b/net-misc/anydesk/files/anydesk-4.0.1.service index e7a3ef008374..38ce50ea938d 100644 --- a/net-misc/anydesk/files/anydesk-4.0.1.service +++ b/net-misc/anydesk/files/anydesk-4.0.1.service @@ -6,7 +6,7 @@ After=systemd-user-sessions.service [Service] Type=simple ExecStart=/opt/bin/anydesk --service -PIDFile=/var/run/anydesk.pid +PIDFile=/run/anydesk.pid KillMode=mixed TimeoutStopSec=30 User=root diff --git a/net-misc/anydesk/files/anydesk.init b/net-misc/anydesk/files/anydesk.init index 5b8986ed8d1b..83bc3e58c7e9 100644 --- a/net-misc/anydesk/files/anydesk.init +++ b/net-misc/anydesk/files/anydesk.init @@ -6,5 +6,5 @@ name="AnyDesk service" description="AnyDesk global service" command="/opt/bin/anydesk" command_args="--service" -pidfile="/var/run/anydesk.pid" +pidfile="/run/anydesk.pid" command_background=true diff --git a/net-misc/anydesk/metadata.xml b/net-misc/anydesk/metadata.xml index f5bf7cbcdb2e..52f99006094c 100644 --- a/net-misc/anydesk/metadata.xml +++ b/net-misc/anydesk/metadata.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jmbsvicetto@gentoo.org</email> - <name>Jorge Manuel B. S. Vicetto</name> + <maintainer type="person" proxied="yes"> + <email>jaco@uls.co.za</email> + <name>Jaco Kroon</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <upstream> <changelog>https://download.anydesk.com/changelog.txt</changelog> diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest index f208121fab43..71d95398f837 100644 --- a/net-misc/apt-cacher-ng/Manifest +++ b/net-misc/apt-cacher-ng/Manifest @@ -1 +1 @@ -DIST apt-cacher-ng_3.6.3.orig.tar.xz 334620 BLAKE2B 7e77edb966f0732f392a3fb243cda547dca7d4f878e44c6c000491ccb0a3115ad58a553706ef02834d25366b09d24ee6af2dafad76f97cd1978dc5a4d35f3380 SHA512 57d991c71f6d0bb9d43b4645ee7be2fb38ccbf73581206e01b6ca389bd8591d5e9f425350e3aff053527125c95caefe9ab1217dedff812162cf6bd4cdfdef792 +DIST apt-cacher-ng-debian-3.7.4-1.tar.gz 524480 BLAKE2B ebb450af29439910fe35a558ae6f7ea02337bfbbe5a8efcb20a803e779deedd7901358a71b69745a53036fb8db9db3c9112fc09b47055f07dfe225f3df95202d SHA512 a2aa3218d8cf216cef7177f30bfb90b9961460add2a90823e15952e38d19b0dd527e3cecd029bbf1f10abcfcfd11d406bc9019919d1efccf0d9d69bb7cc1a173 diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild index f5616939a35b..a97170d14427 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r2.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.7.4_p1-r2.ebuild @@ -1,25 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake tmpfiles +MY_PV="${PV/_p/-}" +MY_P="${PN}-debian-${MY_PV}" + DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages" HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html" -SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz" +SRC_URI="https://salsa.debian.org/blade/${PN}/-/archive/debian/${MY_PV}/${MY_P}.tar.gz" LICENSE="BSD-4 ZLIB public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="doc fuse systemd tcpd" DEPEND="acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 - dev-libs/libevent:=[threads] + dev-libs/libevent:=[threads(+)] dev-libs/openssl:0= + net-dns/c-ares:= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) systemd? ( sys-apps/systemd ) @@ -32,9 +36,12 @@ PATCHES=( "${FILESDIR}/${PN}-3.3.1-flags.patch" "${FILESDIR}/${PN}-3.5-perl-syntax.patch" "${FILESDIR}/${PN}-3.6-optional-systemd.patch" + "${FILESDIR}/${PN}-3.7.4-strlcpy-glibc-2.38.patch" + "${FILESDIR}/${PN}-3.7.4-musl.patch" + "${FILESDIR}/${PN}-3.7.4-gcc14.patch" ) -S="${WORKDIR}/${P/_*}" +S="${WORKDIR}/${MY_P}" src_prepare() { # Fixup systemd/CMakeLists.txt cmake version requirement @@ -46,7 +53,7 @@ src_prepare() { sed -e "/install/s/LIBDIR/CFGDIR/" \ -e "/install.*acng\.conf/s/)$/ RENAME ${PN}.conf)/" \ -e "/file/s/)$/ \"*hooks\" \"backends_debian\")/" -i conf/CMakeLists.txt || die - sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" source/CMakeLists.txt || die + sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" src/CMakeLists.txt || die cmake_src_prepare } diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild index 317ac95f9c39..b3920920cb47 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake git-r3 tmpfiles @@ -18,7 +18,7 @@ IUSE="doc fuse systemd tcpd" DEPEND="acct-user/apt-cacher-ng acct-group/apt-cacher-ng app-arch/bzip2 - dev-libs/libevent:=[threads] + dev-libs/libevent:=[threads(+)] dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch new file mode 100644 index 000000000000..345d7d5c80e4 --- /dev/null +++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch @@ -0,0 +1,39 @@ +--- a/src/aconnect.cc ++++ b/src/aconnect.cc +@@ -6,6 +6,7 @@ + #include "debug.h" + #include "portutils.h" + ++#include <algorithm> + #include <future> + + #include <sys/types.h> +--- a/src/acregistry.cc ++++ b/src/acregistry.cc +@@ -5,6 +5,7 @@ + #include "cleaner.h" + #include "evabase.h" + ++#include <algorithm> + #include <list> + + #define IN_ABOUT_ONE_DAY 100000 +--- a/src/caddrinfo.cc ++++ b/src/caddrinfo.cc +@@ -1,5 +1,6 @@ + #include "meta.h" + ++#include <algorithm> + #include <deque> + #include <memory> + #include <list> +--- a/src/header.cc ++++ b/src/header.cc +@@ -10,6 +10,7 @@ + #include "filereader.h" + #include "httpdate.h" + ++#include <algorithm> + #include <map> + #include <iostream> + diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch new file mode 100644 index 000000000000..01fb990fc98c --- /dev/null +++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-musl.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/716564 +--- a/src/meta.h ++++ b/src/meta.h +@@ -20,6 +20,7 @@ + #include <strings.h> + #include <cstdlib> + #include <errno.h> ++#include <sys/time.h> + + #include "astrop.h" + diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch new file mode 100644 index 000000000000..4d97d6b0d05c --- /dev/null +++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/913133 + +From 7f4bb9de7c84bf55c446c98056259e4e6d8b61e7 Mon Sep 17 00:00:00 2001 +From: Richard Liu <richliu@techarea.org> +Date: Fri, 19 Jan 2024 00:38:27 +0800 +Subject: [PATCH] fix compile error + +--- + src/meta.cc | 2 +- + src/meta.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/meta.cc b/src/meta.cc +index 9a2053f..5b15eff 100644 +--- a/src/meta.cc ++++ b/src/meta.cc +@@ -831,7 +831,7 @@ bool scaseequals(string_view a, string_view b) + return true; + } + +-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY ++#if !defined(HAVE_STRLCPY) + size_t strlcpy(char *tgt, const char *src, size_t tgtSize) + { + auto p = src; +diff --git a/src/meta.h b/src/meta.h +index a1f4080..dafb754 100644 +--- a/src/meta.h ++++ b/src/meta.h +@@ -323,7 +323,7 @@ class NoCaseStringMap : public std::map<mstring, mstring, ltstring> + static constexpr string_view svRN = szRN; + static constexpr string_view svLF = "\n"; + +-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY ++#if !defined(HAVE_STRLCPY) + size_t strlcpy(char *tgt, const char *src, size_t tgtSize); + #endif + } +-- +2.43.0 + diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest index 1fcb359d651b..eab5c84fe4d4 100644 --- a/net-misc/aria2/Manifest +++ b/net-misc/aria2/Manifest @@ -1 +1 @@ -DIST aria2-1.36.0.tar.xz 1619036 BLAKE2B 7894ec705f6fefdbc6c4844efa8a645b3e7674e36d04535ac96b9daf5098a453d047109bad0db16e6fd656f63a3ec0bab5746e8ba7d549149e2364395a94399f SHA512 8203dbb75274455a78c50dd4f894e631de6931ac889f26896dceed78ec38c98cdbcf07e164744f308f2bfffeae1016beec1bfdbe8cad7f3280d11376aa0c2542 +DIST aria2-1.37.0.tar.xz 1705256 BLAKE2B 4714dd0806fb7693f45e854d544dadd87312a98eef93518f8e8ea5f3332d362724dead16c7ebfdbe594b8403ef7b44e09f4180629894506e333ec2a423828244 SHA512 df3b8b4de8fa8d78f203ea00c059e43585e18a229009f202e42e6a9e59db67d09df0dbba8a016e99ed73c82f59e4f8b26f86c2288afdbb96a6807cbe2c56e6b3 diff --git a/net-misc/aria2/aria2-1.36.0.ebuild b/net-misc/aria2/aria2-1.37.0.ebuild index 88356647df78..c22966b826cd 100644 --- a/net-misc/aria2/aria2-1.36.0.ebuild +++ b/net-misc/aria2/aria2-1.37.0.ebuild @@ -1,22 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit bash-completion-r1 +inherit bash-completion-r1 libtool DESCRIPTION="A download utility with segmented downloading with BitTorrent support" HOMEPAGE="https://aria2.github.io/" SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz" LICENSE="GPL-2+-with-openssl-exception" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" -IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc" +IUSE=" + adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle + nls sqlite scripts ssh ssl tcmalloc test xmlrpc +" # xmlrpc has no explicit switch, it's turned out by any XML library # so metalink implicitly forces it on -REQUIRED_USE="?? ( jemalloc tcmalloc ) - metalink? ( xmlrpc )" +REQUIRED_USE=" + ?? ( jemalloc tcmalloc ) + metalink? ( xmlrpc ) +" RESTRICT="!test? ( test )" # Crazy GnuTLS/OpenSSL/etc. logic below: @@ -34,13 +39,15 @@ RESTRICT="!test? ( test )" # We map this into: # ssl? -> openssl || (gnutls + (nettle || libgcrypt )) # !ssl? -> nettle || libgcrypt -RDEPEND="sys-libs/zlib:0= +RDEPEND=" + sys-libs/zlib:0= adns? ( >=net-dns/c-ares-1.5.0:0= ) jemalloc? ( dev-libs/jemalloc ) libuv? ( >=dev-libs/libuv-1.13:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) - !libxml2? ( dev-libs/expat:0= ) ) + !libxml2? ( dev-libs/expat:0= ) + ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) ssl? ( @@ -73,16 +80,22 @@ RDEPEND="sys-libs/zlib:0= tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) - !libxml2? ( dev-libs/expat:0= ) )" + !libxml2? ( dev-libs/expat:0= ) + ) +" -DEPEND="${RDEPEND} - test? ( >=dev-util/cppunit-1.12.0:0 )" +DEPEND=" + ${RDEPEND} + test? ( >=dev-util/cppunit-1.12.0:0 ) +" RDEPEND+=" nls? ( virtual/libiconv virtual/libintl ) - scripts? ( dev-lang/ruby )" + scripts? ( dev-lang/ruby ) +" BDEPEND="app-arch/xz-utils virtual/pkgconfig - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" pkg_setup() { if use scripts && ! use xmlrpc; then @@ -99,6 +112,8 @@ src_prepare() { -e '/^@ENABLE_BITTORRENT_TRUE@ LpdMessageDispatcherTest/d' \ -e '/^@ENABLE_BITTORRENT_TRUE@ LpdMessageReceiverTest/d' \ test/Makefile.in || die + + elibtoolize } src_configure() { @@ -123,6 +138,9 @@ src_configure() { $(use_with sqlite sqlite3) $(use_with ssh libssh2) $(use_with tcmalloc) + + # forces bundled wslay + --disable-websocket ) # See TLS/MD logic described above deps. @@ -169,6 +187,7 @@ src_configure() { src_install() { default + find "${D}" -name '*.la' -delete || die rm -r "${ED}"/usr/share/doc/${PF}/README{,.html} || die dobashcomp doc/bash_completion/aria2c diff --git a/net-misc/arpd/metadata.xml b/net-misc/arpd/metadata.xml index 489e730c1c90..115e9d64a669 100644 --- a/net-misc/arpd/metadata.xml +++ b/net-misc/arpd/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/arpsponge/arpsponge-3.17.11.ebuild b/net-misc/arpsponge/arpsponge-3.17.11-r1.ebuild index 5e23076d9806..e7e6ac97a607 100644 --- a/net-misc/arpsponge/arpsponge-3.17.11.ebuild +++ b/net-misc/arpsponge/arpsponge-3.17.11-r1.ebuild @@ -1,15 +1,19 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit perl-module DESCRIPTION="Sweeps up stray ARP queries from a peering LAN" HOMEPAGE="https://github.com/AMS-IX/arpsponge" SRC_URI="https://github.com/AMS-IX/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + LICENSE="|| ( GPL-1+ Artistic )" SLOT="0" KEYWORDS="~amd64" +# bug #692912 +RESTRICT="test" RDEPEND=" dev-lang/perl @@ -27,13 +31,11 @@ RDEPEND=" virtual/perl-Sys-Syslog virtual/perl-Time-HiRes " - -DEPEND="${RDEPEND} - sys-devel/make -" +DEPEND="${RDEPEND}" src_install() { perl_set_version + insinto ${VENDOR_LIB}/M6 doins lib/M6/ReadLine.pm @@ -56,6 +58,7 @@ src_install() { newinitd "${FILESDIR}/arpsponge.initd" arpsponge newconfd "${FILESDIR}/arpsponge.confd" arpsponge + dosbin sbin/asctl sbin/arpsponge sbin/aslogtail doman man/asctl.8 man/arpsponge.8 man/aslogtail.8 dodoc doc/command_mapping.txt doc/arpsponge_architecture.txt diff --git a/net-misc/arpsponge/metadata.xml b/net-misc/arpsponge/metadata.xml index bef24d2c2337..ac7e8fda41be 100644 --- a/net-misc/arpsponge/metadata.xml +++ b/net-misc/arpsponge/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">AMS-IX/arpsponge</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/asahi-btsync/Manifest b/net-misc/asahi-btsync/Manifest new file mode 100644 index 000000000000..d6effe408e76 --- /dev/null +++ b/net-misc/asahi-btsync/Manifest @@ -0,0 +1,64 @@ +DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 +DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68 +DIST anstream-0.6.4.crate 20593 BLAKE2B 2b617c45d351e01222fc50f52551e57b4a8b0ecf84c6ddf44336c7c9d3b9dde15232b1c4f664d567849295bf8f03612b73ded56f1b3937392eb7718f1e0446c3 SHA512 0b983d626c53d1edc184f04cbd2c004eb9c40d14486b23cce86ebf50cbd3d916d32cb0423ae1d67c2b83b966690090af740538538ef846c0b126c686a1ebe159 +DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3 +DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 +DIST anstyle-query-1.0.1.crate 8620 BLAKE2B 65d81d089b6f84e062276807e180e6a8b793cdf570e4e82a88dd1670ed1e15f6edc9ca8f55873069273efe170c2dbbbf75dd3b2b773c78d23c896c0d6f3bb237 SHA512 70178a50e4025a0ded9fa7235d045cd965889efe63bc319e418a3e34406a66a42c19a2d7684d8d607046cd8419ba9b789607fe5c50aeeeabb23d72de6ad43039 +DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931 +DIST asahi-btsync-0.2.0.tar.gz 20839 BLAKE2B 2b09167cc6bf1ccb376666c06491a04872790de5917950d6877e791f2cec0591375b5fd1aa829b7ef43466d2c656d0ff87748505ce5c6c34d3bf8b7fd6e16267 SHA512 70149a1f3eab442e460c057ee2bc85936dcc98c0ec9039e0343ed3edd4cb7bb6fd77da9ec61afb47f5bfb73765ae31ad9aad7b355ed9d77b4a9a1842ce31b305 +DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bitflags-2.3.3.crate 34320 BLAKE2B da9f42fc888e31d50d0b2f0d0cc1bddfa97e0c2d3eac60fd2cc451670f000b5148e58c3c40c348ef1bd516c7a568bcc3a97742ac5bdb9ef4772048eb922171af SHA512 8f063ba2bc3f638ca9200722e1c4370102589fb07aef25efcf63993fbf283cc86d554d11d24719f728ecabe540a47a90ce4113d8719f8e773f2344a66d21ff78 +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea +DIST clap-4.4.11.crate 54782 BLAKE2B 293721f850d5a5ddce6b26610ef47316d5914e9281312068c26e45d23cb568c1ce2da7e0546accdd0cd4cc703ddb9fad98b0c772907f52dcdc31e6ec463d2b27 SHA512 9da3f445523183e16f4c104a2f4029ee9f3fa70e6c8e579aadad0607293ff5963417d8534aa1f3cef6ef8f8a7529a898c01630d3eff42330ec369cf0f760929b +DIST clap_builder-4.4.11.crate 163317 BLAKE2B d2d998c4eff422436f36f71d681132b2545b561433ee733a8a64a640b97ebe8e35e97abc91d820189918d5fe9fa9496c89b02959aada1d55692957a86c8e14a0 SHA512 b601fd313e65dbf2b723f3ae5d2d3bfdfa1ec184962883503df9b31a7d43f4967ad5f81b0bc2fc8614e06d67ce52d399221df6f4fc9da311cca1c9134784d7c4 +DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167 +DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f +DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e +DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 +DIST crc-3.0.1.crate 9950 BLAKE2B 2afbaee34f754953396e452260290422d19416dad4b88333e4501592deff3b3350363ca4c2b37d573ecd4e64a762b702b79445460f15fc90bdb8214fe43c0945 SHA512 aabe9d4058fb4710405146e978ec5881bce5ce8971618b69a7ff873b0fff15fc78e5c48ff0136ca6d37663a53905bc3c5daa0ed3a2ed4d8d721e90c3b0ec28a5 +DIST crc-catalog-2.2.0.crate 9931 BLAKE2B b9c36e7f41e67daafc31f6ee6bf37ef78980171cd84565c103770a57bbed1e04f2b7a7261e7917252b3b6be96837e8138a8b9829380be93a69ee6f33ea332397 SHA512 9fcd42c44c66798c97ed36b36a902dff6e83a96d86da0f146c0db287ed6a00c8827d6749bfcdd090083bb81103bb2397e388a0e2a21698d65550360a45453396 +DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 +DIST dlv-list-0.3.0.crate 11920 BLAKE2B 2f5d52dd47c97799e6e7fead83c0f239daca5422f7fd2f3662d3d4a22714b2a64a4b65df3a451ad43675d828e3265a10ae30428204c33f4e1efa8bcd6933ca8d SHA512 3efa93e5ee5ee2e480a7e8dbc6d5baeb289279871f8b9f4858a24abf3f8b57cf1fd36369a6b5a1e667c121985197063c8834141b220a58453c8399edc9da4206 +DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b +DIST gpt-3.1.0.crate 47134 BLAKE2B 24a1b4607ee07e590c89c1a68bb7f20251a99f5078c38e937cf4f4d0f83508830a9b62b7f5a1eb5475095c41c80d56ebfce91e65f25a61b161b2a088e1c0e179 SHA512 dd298a4b6b6a200482193ba560241bc3f3e2e9e790c06d016447f58004d1aeb37e554f99fc1d5b166e4062978ad19883d021405c08b9648a34159a002316e3b5 +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 +DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e +DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038 +DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157 +DIST nix-0.26.2.crate 277973 BLAKE2B 86adcbeda37edda784593196c390e92ee069761d283f706c0390bf8983ba8841a51486a98a1869f910fe4d518afba5572490e9c69a021e12c598d094b41361ad SHA512 abf2d0a4eb83cd4bd43836e8b533f0f07f07979619c86c11302a2df0800d569f33f0dda0bc2c4136d36c79789d175eaf5d3928ecf16286319aabf93c720a1704 +DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST ordered-multimap-0.4.3.crate 19599 BLAKE2B 1287938e6bcb26c3e377fff6c492adfff7ca05fcdb5881d76edcf08aa89160180e6a2c2ad40b162e75997bc9fe36204c50d839d4305911de231bfd408345975a SHA512 92d02f260d912c70bc51a4e943ecf7be7e8211ff515dd6aa6029fbb0d0f67b8c689966b23e32520fc5b437caebab650e18a16cdd8b2a036edc91645faa9e47e8 +DIST os_str_bytes-6.5.1.crate 22778 BLAKE2B 1d3daa82b41e6e360ec17051be2c5b1a394fe49ae349b2888e6f30fccf99d102c71357f76c3f68118de59e24480221b352a223ed01f26f11bf707b1c7de81941 SHA512 6d7a4475398daaae4e3d55ad58a8fba729517acf5744a5a6296f477207ee91e5bc36c2b54e58f6f9b15ce9bc75286e9ba62a59d577f0171d8151d3aaa01311b8 +DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f +DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST rust-ini-0.18.0.crate 15439 BLAKE2B e225973af6e7d8a8ebf0d37efa913f5eacf8beb42d30f759135b18ae6fed091537466afc7e2aacfe1d00514a76eb4a8bd99ff281859ca0f7c7e0db3c6d6fb1a9 SHA512 2907d0891ff2164deacb2f217b4b8484bee9b2c2d32c354518e9b4d74069639bab55190d0d8ca6fb0751180cf2be1477ed9b100e3a5cc9f02af52ea26f32ccf4 +DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 +DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7 +DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 +DIST uuid-1.4.0.crate 55200 BLAKE2B 11e641e76f2f25f94430cbb473887cfa052f73527d7df2625d304d101c25ba0148c901460798dea962611df1f5af41119c29ff2aea25fd09bfd64368a2df8aab SHA512 92acf08ee1f36a3a394422ce9b1cdbe0ccf3fb8d878efe068fd025832af677466622bd1260e853c5232f18b4f5411136595aa07311a3f9886904800bee7cfaa0 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 +DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 +DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e +DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f +DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 +DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e +DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 +DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 +DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 +DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 diff --git a/net-misc/asahi-btsync/asahi-btsync-0.2.0.ebuild b/net-misc/asahi-btsync/asahi-btsync-0.2.0.ebuild new file mode 100644 index 000000000000..38625d6d5889 --- /dev/null +++ b/net-misc/asahi-btsync/asahi-btsync-0.2.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + adler32@1.2.0 + ahash@0.7.6 + anstream@0.6.4 + anstyle-parse@0.2.3 + anstyle-query@1.0.1 + anstyle-wincon@3.0.2 + anstyle@1.0.4 + atty@0.2.14 + autocfg@1.1.0 + bitflags@1.3.2 + bitflags@2.3.3 + cfg-if@1.0.0 + clap@3.2.25 + clap@4.4.11 + clap_builder@4.4.11 + clap_derive@4.4.7 + clap_lex@0.2.4 + clap_lex@0.6.0 + colorchoice@1.0.0 + crc-catalog@2.2.0 + crc32fast@1.3.2 + crc@3.0.1 + dlv-list@0.3.0 + getrandom@0.2.10 + gpt@3.1.0 + hashbrown@0.12.3 + heck@0.4.1 + hermit-abi@0.1.19 + indexmap@1.9.3 + libc@0.2.147 + log@0.4.19 + memoffset@0.7.1 + nix@0.26.2 + once_cell@1.18.0 + ordered-multimap@0.4.3 + os_str_bytes@6.5.1 + pin-utils@0.1.0 + proc-macro2@1.0.70 + quote@1.0.33 + rust-ini@0.18.0 + static_assertions@1.1.0 + strsim@0.10.0 + syn@2.0.39 + termcolor@1.2.0 + textwrap@0.16.0 + unicode-ident@1.0.12 + utf8parse@0.2.1 + uuid@1.4.0 + version_check@0.9.4 + wasi@0.11.0+wasi-snapshot-preview1 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.52.0 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.52.0 +" + +inherit cargo linux-info + +# Releases are not tagged +COMMIT="11e47cfa7ddbec0059d683e6d98a4e0f95e3ffa3" +MY_P="asahi-nvram-${COMMIT}" +DESCRIPTION="Bluetooth pairing data handoff from macOS for Apple Silicon Macs" +HOMEPAGE="https://github.com/WhatAmISupposedToPutHere/asahi-nvram" + +SRC_URI=" + ${CARGO_CRATE_URIS} + https://github.com/WhatAmISupposedToPutHere/asahi-nvram/archive/${COMMIT}.tar.gz -> ${P}.tar.gz +" +S="${WORKDIR}/${MY_P}/asahi-btsync" + +LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" MIT Unicode-DFS-2016 ZLIB" +SLOT="0" +KEYWORDS="~arm64" + +pkg_pretend() { + if use kernel_linux; then + linux_config_exists || die "No suitable kernel configuration could be found" + CONFIG_EXTRA="~MTD_SPI_NOR" + check_extra_config + fi +} diff --git a/net-misc/asahi-btsync/metadata.xml b/net-misc/asahi-btsync/metadata.xml new file mode 100644 index 000000000000..c0d4d6d29036 --- /dev/null +++ b/net-misc/asahi-btsync/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>jcalligeros99@gmail.com</email> + <name>James Calligeros</name> + </maintainer> + <maintainer type="project"> + <email>asahi@gentoo.org</email> + <name>Gentoo Asahi Project</name> + </maintainer> + <upstream> + <remote-id type="github">WhatAmISupposedToPutHere/asahi-nvram</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/asahi-wifisync/Manifest b/net-misc/asahi-wifisync/Manifest new file mode 100644 index 000000000000..d1a4c14fc0ee --- /dev/null +++ b/net-misc/asahi-wifisync/Manifest @@ -0,0 +1,64 @@ +DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 +DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68 +DIST anstream-0.6.4.crate 20593 BLAKE2B 2b617c45d351e01222fc50f52551e57b4a8b0ecf84c6ddf44336c7c9d3b9dde15232b1c4f664d567849295bf8f03612b73ded56f1b3937392eb7718f1e0446c3 SHA512 0b983d626c53d1edc184f04cbd2c004eb9c40d14486b23cce86ebf50cbd3d916d32cb0423ae1d67c2b83b966690090af740538538ef846c0b126c686a1ebe159 +DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3 +DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 +DIST anstyle-query-1.0.1.crate 8620 BLAKE2B 65d81d089b6f84e062276807e180e6a8b793cdf570e4e82a88dd1670ed1e15f6edc9ca8f55873069273efe170c2dbbbf75dd3b2b773c78d23c896c0d6f3bb237 SHA512 70178a50e4025a0ded9fa7235d045cd965889efe63bc319e418a3e34406a66a42c19a2d7684d8d607046cd8419ba9b789607fe5c50aeeeabb23d72de6ad43039 +DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931 +DIST asahi-wifisync-0.2.0.tar.gz 20839 BLAKE2B 2b09167cc6bf1ccb376666c06491a04872790de5917950d6877e791f2cec0591375b5fd1aa829b7ef43466d2c656d0ff87748505ce5c6c34d3bf8b7fd6e16267 SHA512 70149a1f3eab442e460c057ee2bc85936dcc98c0ec9039e0343ed3edd4cb7bb6fd77da9ec61afb47f5bfb73765ae31ad9aad7b355ed9d77b4a9a1842ce31b305 +DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bitflags-2.3.3.crate 34320 BLAKE2B da9f42fc888e31d50d0b2f0d0cc1bddfa97e0c2d3eac60fd2cc451670f000b5148e58c3c40c348ef1bd516c7a568bcc3a97742ac5bdb9ef4772048eb922171af SHA512 8f063ba2bc3f638ca9200722e1c4370102589fb07aef25efcf63993fbf283cc86d554d11d24719f728ecabe540a47a90ce4113d8719f8e773f2344a66d21ff78 +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea +DIST clap-4.4.11.crate 54782 BLAKE2B 293721f850d5a5ddce6b26610ef47316d5914e9281312068c26e45d23cb568c1ce2da7e0546accdd0cd4cc703ddb9fad98b0c772907f52dcdc31e6ec463d2b27 SHA512 9da3f445523183e16f4c104a2f4029ee9f3fa70e6c8e579aadad0607293ff5963417d8534aa1f3cef6ef8f8a7529a898c01630d3eff42330ec369cf0f760929b +DIST clap_builder-4.4.11.crate 163317 BLAKE2B d2d998c4eff422436f36f71d681132b2545b561433ee733a8a64a640b97ebe8e35e97abc91d820189918d5fe9fa9496c89b02959aada1d55692957a86c8e14a0 SHA512 b601fd313e65dbf2b723f3ae5d2d3bfdfa1ec184962883503df9b31a7d43f4967ad5f81b0bc2fc8614e06d67ce52d399221df6f4fc9da311cca1c9134784d7c4 +DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167 +DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f +DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e +DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 +DIST crc-3.0.1.crate 9950 BLAKE2B 2afbaee34f754953396e452260290422d19416dad4b88333e4501592deff3b3350363ca4c2b37d573ecd4e64a762b702b79445460f15fc90bdb8214fe43c0945 SHA512 aabe9d4058fb4710405146e978ec5881bce5ce8971618b69a7ff873b0fff15fc78e5c48ff0136ca6d37663a53905bc3c5daa0ed3a2ed4d8d721e90c3b0ec28a5 +DIST crc-catalog-2.2.0.crate 9931 BLAKE2B b9c36e7f41e67daafc31f6ee6bf37ef78980171cd84565c103770a57bbed1e04f2b7a7261e7917252b3b6be96837e8138a8b9829380be93a69ee6f33ea332397 SHA512 9fcd42c44c66798c97ed36b36a902dff6e83a96d86da0f146c0db287ed6a00c8827d6749bfcdd090083bb81103bb2397e388a0e2a21698d65550360a45453396 +DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 +DIST dlv-list-0.3.0.crate 11920 BLAKE2B 2f5d52dd47c97799e6e7fead83c0f239daca5422f7fd2f3662d3d4a22714b2a64a4b65df3a451ad43675d828e3265a10ae30428204c33f4e1efa8bcd6933ca8d SHA512 3efa93e5ee5ee2e480a7e8dbc6d5baeb289279871f8b9f4858a24abf3f8b57cf1fd36369a6b5a1e667c121985197063c8834141b220a58453c8399edc9da4206 +DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b +DIST gpt-3.1.0.crate 47134 BLAKE2B 24a1b4607ee07e590c89c1a68bb7f20251a99f5078c38e937cf4f4d0f83508830a9b62b7f5a1eb5475095c41c80d56ebfce91e65f25a61b161b2a088e1c0e179 SHA512 dd298a4b6b6a200482193ba560241bc3f3e2e9e790c06d016447f58004d1aeb37e554f99fc1d5b166e4062978ad19883d021405c08b9648a34159a002316e3b5 +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 +DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e +DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038 +DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157 +DIST nix-0.26.2.crate 277973 BLAKE2B 86adcbeda37edda784593196c390e92ee069761d283f706c0390bf8983ba8841a51486a98a1869f910fe4d518afba5572490e9c69a021e12c598d094b41361ad SHA512 abf2d0a4eb83cd4bd43836e8b533f0f07f07979619c86c11302a2df0800d569f33f0dda0bc2c4136d36c79789d175eaf5d3928ecf16286319aabf93c720a1704 +DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST ordered-multimap-0.4.3.crate 19599 BLAKE2B 1287938e6bcb26c3e377fff6c492adfff7ca05fcdb5881d76edcf08aa89160180e6a2c2ad40b162e75997bc9fe36204c50d839d4305911de231bfd408345975a SHA512 92d02f260d912c70bc51a4e943ecf7be7e8211ff515dd6aa6029fbb0d0f67b8c689966b23e32520fc5b437caebab650e18a16cdd8b2a036edc91645faa9e47e8 +DIST os_str_bytes-6.5.1.crate 22778 BLAKE2B 1d3daa82b41e6e360ec17051be2c5b1a394fe49ae349b2888e6f30fccf99d102c71357f76c3f68118de59e24480221b352a223ed01f26f11bf707b1c7de81941 SHA512 6d7a4475398daaae4e3d55ad58a8fba729517acf5744a5a6296f477207ee91e5bc36c2b54e58f6f9b15ce9bc75286e9ba62a59d577f0171d8151d3aaa01311b8 +DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f +DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST rust-ini-0.18.0.crate 15439 BLAKE2B e225973af6e7d8a8ebf0d37efa913f5eacf8beb42d30f759135b18ae6fed091537466afc7e2aacfe1d00514a76eb4a8bd99ff281859ca0f7c7e0db3c6d6fb1a9 SHA512 2907d0891ff2164deacb2f217b4b8484bee9b2c2d32c354518e9b4d74069639bab55190d0d8ca6fb0751180cf2be1477ed9b100e3a5cc9f02af52ea26f32ccf4 +DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 +DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7 +DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 +DIST uuid-1.4.0.crate 55200 BLAKE2B 11e641e76f2f25f94430cbb473887cfa052f73527d7df2625d304d101c25ba0148c901460798dea962611df1f5af41119c29ff2aea25fd09bfd64368a2df8aab SHA512 92acf08ee1f36a3a394422ce9b1cdbe0ccf3fb8d878efe068fd025832af677466622bd1260e853c5232f18b4f5411136595aa07311a3f9886904800bee7cfaa0 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 +DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 +DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e +DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f +DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 +DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e +DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 +DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 +DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 +DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 diff --git a/net-misc/asahi-wifisync/asahi-wifisync-0.2.0.ebuild b/net-misc/asahi-wifisync/asahi-wifisync-0.2.0.ebuild new file mode 100644 index 000000000000..4ab24a1b1b1e --- /dev/null +++ b/net-misc/asahi-wifisync/asahi-wifisync-0.2.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + adler32@1.2.0 + ahash@0.7.6 + anstream@0.6.4 + anstyle-parse@0.2.3 + anstyle-query@1.0.1 + anstyle-wincon@3.0.2 + anstyle@1.0.4 + atty@0.2.14 + autocfg@1.1.0 + bitflags@1.3.2 + bitflags@2.3.3 + cfg-if@1.0.0 + clap@3.2.25 + clap@4.4.11 + clap_builder@4.4.11 + clap_derive@4.4.7 + clap_lex@0.2.4 + clap_lex@0.6.0 + colorchoice@1.0.0 + crc-catalog@2.2.0 + crc32fast@1.3.2 + crc@3.0.1 + dlv-list@0.3.0 + getrandom@0.2.10 + gpt@3.1.0 + hashbrown@0.12.3 + heck@0.4.1 + hermit-abi@0.1.19 + indexmap@1.9.3 + libc@0.2.147 + log@0.4.19 + memoffset@0.7.1 + nix@0.26.2 + once_cell@1.18.0 + ordered-multimap@0.4.3 + os_str_bytes@6.5.1 + pin-utils@0.1.0 + proc-macro2@1.0.70 + quote@1.0.33 + rust-ini@0.18.0 + static_assertions@1.1.0 + strsim@0.10.0 + syn@2.0.39 + termcolor@1.2.0 + textwrap@0.16.0 + unicode-ident@1.0.12 + utf8parse@0.2.1 + uuid@1.4.0 + version_check@0.9.4 + wasi@0.11.0+wasi-snapshot-preview1 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.52.0 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.52.0 +" + +inherit cargo linux-info + +# Releases are not tagged +COMMIT="11e47cfa7ddbec0059d683e6d98a4e0f95e3ffa3" +MY_P="asahi-nvram-${COMMIT}" +DESCRIPTION="WiFi network handoff from macOS for Apple Silicon Macs" +HOMEPAGE="https://github.com/WhatAmISupposedToPutHere/asahi-nvram" + +SRC_URI=" + ${CARGO_CRATE_URIS} + https://github.com/WhatAmISupposedToPutHere/asahi-nvram/archive/${COMMIT}.tar.gz -> ${P}.tar.gz +" +S="${WORKDIR}/${MY_P}/asahi-wifisync" + +LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" MIT Unicode-DFS-2016 ZLIB" +SLOT="0" +KEYWORDS="~arm64" + +pkg_pretend() { + if use kernel_linux; then + linux_config_exists || die "No suitable kernel configuration could be found" + CONFIG_EXTRA="~MTD_SPI_NOR" + check_extra_config + fi +} diff --git a/net-misc/asahi-wifisync/metadata.xml b/net-misc/asahi-wifisync/metadata.xml new file mode 100644 index 000000000000..c0d4d6d29036 --- /dev/null +++ b/net-misc/asahi-wifisync/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>jcalligeros99@gmail.com</email> + <name>James Calligeros</name> + </maintainer> + <maintainer type="project"> + <email>asahi@gentoo.org</email> + <name>Gentoo Asahi Project</name> + </maintainer> + <upstream> + <remote-id type="github">WhatAmISupposedToPutHere/asahi-nvram</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/asterisk-base/Manifest b/net-misc/asterisk-base/Manifest new file mode 100644 index 000000000000..84b04d08477f --- /dev/null +++ b/net-misc/asterisk-base/Manifest @@ -0,0 +1 @@ +DIST asterisk-base-3.tar.gz 14589 BLAKE2B 854df19a0aa6cbd6c452ec03f8766f166824580f30edbf158f9e23baa451b092388b5f653999cab63d3232d7ff2c1efb7784c8e69d9ea1f2855dd446613ade87 SHA512 e2b53a3db6cb38fcc8456c3c69806452ecdd748f7d5833c6fdc426f436f92b651d69a902f6f588ffc371903c5a1374a9fc0695a74f9b4e47e75df3b1ce50764e diff --git a/net-misc/asterisk-base/asterisk-base-1.ebuild b/net-misc/asterisk-base/asterisk-base-1.ebuild new file mode 100644 index 000000000000..f1eb0c168d4c --- /dev/null +++ b/net-misc/asterisk-base/asterisk-base-1.ebuild @@ -0,0 +1,40 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles + +DESCRIPTION="Gentoo Asterisk init scripts" +HOMEPAGE="https://www.gentoo.org/wiki/No_homepage" +# Need to set S due to PMS saying we need it existing, but no SRC_URI +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" + +RDEPEND=" + net-misc/asterisk + !<=net-misc/asterisk-16.30.0:0/16 + !<=net-misc/asterisk-18.18.0:0/18 + !<=net-misc/asterisk-20.3.0:0/20 +" + +src_install() { + newinitd "${FILESDIR}/initd-1" asterisk + newconfd "${FILESDIR}/confd-1" asterisk + newsbin "${FILESDIR}/asterisk_wrapper-1" asterisk_wrapper + + systemd_newunit "${FILESDIR}/asterisk.service-1" asterisk.service + systemd_install_serviced "${FILESDIR}/asterisk.service-1.conf" asterisk.service + + newtmpfiles "${FILESDIR}/tmpfiles-1.conf" asterisk.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotate-1" asterisk +} + +pkg_postinst() { + tmpfiles_process asterisk.conf +} diff --git a/net-misc/asterisk-base/asterisk-base-2.ebuild b/net-misc/asterisk-base/asterisk-base-2.ebuild new file mode 100644 index 000000000000..98bf283c86b7 --- /dev/null +++ b/net-misc/asterisk-base/asterisk-base-2.ebuild @@ -0,0 +1,40 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles + +DESCRIPTION="Gentoo Asterisk init scripts" +HOMEPAGE="https://www.gentoo.org/wiki/No_homepage" +# Need to set S due to PMS saying we need it existing, but no SRC_URI +S="${WORKDIR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86" + +RDEPEND=" + net-misc/asterisk + !<=net-misc/asterisk-16.30.0:0/16 + !<=net-misc/asterisk-18.18.0:0/18 + !<=net-misc/asterisk-20.3.0:0/20 +" + +src_install() { + newinitd "${FILESDIR}/initd-1" asterisk + newconfd "${FILESDIR}/confd-1" asterisk + newsbin "${FILESDIR}/asterisk_wrapper-2" asterisk_wrapper + + systemd_newunit "${FILESDIR}/asterisk.service-1" asterisk.service + systemd_install_serviced "${FILESDIR}/asterisk.service-1.conf" asterisk.service + + newtmpfiles "${FILESDIR}/tmpfiles-1.conf" asterisk.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotate-1" asterisk +} + +pkg_postinst() { + tmpfiles_process asterisk.conf +} diff --git a/net-misc/asterisk-base/asterisk-base-3.ebuild b/net-misc/asterisk-base/asterisk-base-3.ebuild new file mode 100644 index 000000000000..3d9e4d044130 --- /dev/null +++ b/net-misc/asterisk-base/asterisk-base-3.ebuild @@ -0,0 +1,39 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles + +DESCRIPTION="Gentoo Asterisk init scripts" +HOMEPAGE="https://github.com/jkroonza/asterisk-base" +SRC_URI="https://github.com/jkroonza/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=" + net-misc/asterisk + !<=net-misc/asterisk-16.30.0:0/16 + !<=net-misc/asterisk-18.18.0:0/18 + !<=net-misc/asterisk-20.3.0:0/20 +" + +src_install() { + newinitd initd asterisk + newconfd confd asterisk + dosbin asterisk_wrapper + + systemd_dounit asterisk.service + systemd_install_serviced asterisk.service.conf asterisk.service + + newtmpfiles tmpfiles.conf asterisk.conf + + insinto /etc/logrotate.d + newins logrotate asterisk +} + +pkg_postinst() { + tmpfiles_process asterisk.conf +} diff --git a/net-misc/asterisk-base/files/asterisk.service-1 b/net-misc/asterisk-base/files/asterisk.service-1 new file mode 100644 index 000000000000..08245d9fe87f --- /dev/null +++ b/net-misc/asterisk-base/files/asterisk.service-1 @@ -0,0 +1,23 @@ +[Unit] +Description=Asterisk PBX and telephony daemon. +After=network.target + +[Service] +Type=simple +WorkingDirectory=/var/lib/asterisk +User=asterisk +Group=asterisk +ExecStart=/usr/sbin/asterisk -f -C /etc/asterisk/asterisk.conf +ExecStop=/usr/sbin/asterisk -rx 'core stop now' +ExecReload=/usr/sbin/asterisk -rx 'core reload' + +LimitNOFILE=4096 +ProtectSystem=full +ProtectHome=yes +PrivateTmp=yes + +Restart=always +RestartSec=5 + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/asterisk-base/files/asterisk.service-1.conf b/net-misc/asterisk-base/files/asterisk.service-1.conf new file mode 100644 index 000000000000..d94a08d78190 --- /dev/null +++ b/net-misc/asterisk-base/files/asterisk.service-1.conf @@ -0,0 +1,10 @@ +# Uncomment the following 7 lines to start asterisk with a console on tty7 +# +# Warning! Use only for debugging, this is a potential security issue! +# +# [Service] +# ExecStart=/usr/sbin/asterisk -f -c -C /etc/asterisk/asterisk.conf +# TTYPath=/dev/tty7 +# StandardInput=tty +# StandardOutput=tty +# StandardError=tty diff --git a/net-misc/asterisk-base/files/asterisk_wrapper-1 b/net-misc/asterisk-base/files/asterisk_wrapper-1 new file mode 100644 index 000000000000..1a85eccf9b25 --- /dev/null +++ b/net-misc/asterisk-base/files/asterisk_wrapper-1 @@ -0,0 +1,227 @@ +#! /bin/sh +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +progname="$(basename "$0")" + +T="$(getopt -o "h" --long "help,corecompress:,corerename:,crashemail:,dumpcore:,instance:,maxfd:,nicelevel:,restartdelay:,rundir:,syslog,tty:" -n "$progname" -- "$@")" +eval set -- "${T}" + +# bash builtins are special ... +echo_e="$([ "${SHELL}" = "/bin/bash" ] && echo "echo -e" || echo echo)" + +rundir=/run/asterisk +restartdelay=5 +nicelevel=0 +maxfd=4096 +dumpcore=0 +unset tty instance syslog corecompress corerename crashemail + +usage() { + cat <<USAGE +USAGE: $progname [options] -- asterisk options" +OPTIONS: + -h|--help + Output this text and exit. + --corecompress[=tool] + asterisk's address space can get quite large, compressing the core dumps can + save significant space, especially if asterisk core dumps frequently. + --corerename pattern + It's assumed core files (if enabled) will go into PWD, this specifies a + rename pattern. The following % codes are recognised: + %h - hostname + %D - date in format YYYYMMDD + %T - time in format HHMMSS + It must be mentioned that if kernel.core_pattern (sysctl) is modified + from the default 'core' value this option is unlikely to work. + --crashemail email@address + This will send an email whenver asterisk crashes (does not terminate + cleanly with a zero exit code). You need a working sendmail binary. + --dumpcore sizelimit + Maximum size of core limit, or the word unlimited. Default is disabled + (sizelimit of 0). + --instance name + Updated label for sylog logger. + --maxfd maxfd + Sets the maximum number of file descriptors (default 4096). + --nicelevel nicelevel + Will set the asterisk nice level to the specified value. + --restartdelay delay_in_seconds + Number of seconds to wait before attempting to restart asterisk. This helps + to avoid tight-loop crashes. Defaults to 5s. Minimum 1. + --rundir path + Where to store the asterisk asterisk_wrapper.pid file. In order to terminate the + wrapper (when asterisk next terminates), remove this file. + --syslog + Pass to redirect output to syslog rather than using stdout and stderr. + --tty tty + If asterisk should be attached to a TTY device, then pass this, eg --tty /dev/tty8. + Use of this is not recommended in general. + +NOTE: There are some quirks with bash getopt shunting non-options prior to -- + to asterisk options, so be careful of this. Typically stuff will break. +USAGE +} + +matchreg() { + local v=$1 + shift + echo "$v" | grep -q "$@" +} + +while [ "$1" != "--" ]; do + case "$1" in + --corecompress|--corerename|--crashemail|--dumpcore|--instance|--maxfd|--nicelevel|--restartdelay|--rundir|--tty) + eval "${1#--}=\"\${2}\"" + shift 2 + ;; + --syslog) + eval "${1#--}=1" + shift + ;; + --help|-h) + usage + exit 0 + ;; + *) + echo "BUG: Don't know how to process option $1." >&2 + usage >&2 + exit 1 + ;; + esac +done +shift # -- + +if ! matchreg "${restartdelay}" "^[1-9][0-9]*$"; then + echo "Invalid --restartdelay value ${restartdelay}, resetting to 5." >&2 + restartdelay=5 +fi + +if ! matchreg "${maxfd}" "^[1-9][0-9]*$"; then + echo "Invalid --maxfd value, resetting to 4096." >&2 + maxfd=4096 +fi + +if [ $maxfd -lt 1024 ]; then + echo "maxfd is guaranteed too low, bumping to at least 1024" >&2 + maxfd=1024 +fi + +if [ -n "${nicelevel}" ] && ! matchreg "${nicelevel}" -E "^-?[0-9]+$"; then + echo "Invalid --nicelevel which much be a valid integer (values from -20 to 20 makes sense)." + exit 1 +fi + +if [ -n "${corecompress}" -a ! -x "${corecompress}" ]; then + corecompress=$(which "${corecompress}" 2>/dev/null) + [ -z "${corecompress}" ] && echo "Error locating core compression tool, disabling core compression." >&2 +fi + +# Before here will still be output (potentially munged, to the terminal). +if [ -n "${syslog}" ]; then + tdir="$(mktemp -d)" + tfifo="${tdir}/asterisk_wrapper.logger.fifo" + mkfifo "${tfifo}" + logger -t "asterisk_wrapper${instance:+:}${instance}" --id=$$ >/dev/null 2>&1 <"${tfifo}" & + exec 1>"${tfifo}" + exec 2>&1 + + rm "${tfifo}" + rmdir "${tdir}" +fi + +echo "Initializing ${progname}" + +cleanup(){ + # There is a tiny race here, if this gets replaced inbetween the read and the rm. + # To fix this is quite complex in that we need to keep an fd, compare inode numbers + # and manage flock's. + [ -r "${rundir}/${progname}.pid" ] && \ + [ "$(cat "${rundir}/${progname}.pid")" = $$ ] && \ + rm "${rundir}/${progname}.pid" +} +trap cleanup EXIT + +# We could be clobbering an old version's pid, in which case it'll just terminate on +# it's next iteration. Towards this end, if asterisk.pid exists, attempt to find it's +# config file and request a core stop when convenient so that we can take over. +echo $$ > "${rundir}/${progname}.pid" +if [ -r "${rundir}/asterisk.pid" ]; then + ast_pid="$(cat "${rundir}/asterisk.pid")" + [ -r "/proc/${ast_pid}/cmdline" ] && ast_conf="$(tr '\0' '\n' < "/proc/${ast_pid}/cmdline" | grep -A1 '^-C$' | tail -n1)" && /usr/sbin/asterisk -C "${ast_conf:-/etc/asterisk/asterisk.conf}" -rx "core stop when convenient" + # We may hit a few (depending on how busy the server is a great many number) loop failures still ... +fi + +prlimit --core=${dumpcore} --pid=$$ +prlimit --nofile=${maxfd} --pid=$$ + +ast_cmd=/usr/sbin/asterisk +if [ -n "${nicelevel}" ]; then + ast_cmd="nice -n ${nicelevel} ${ast_cmd}" +fi + +while [ -r "${rundir}/${progname}.pid" ]; do + # Another instance is looking to replace us, so terminate. + if [ "$(cat "${rundir}/${progname}.pid")" != $$ ]; then + break + fi + + echo "Starting asterisk with ${ast_cmd} $*" + if [ -n "${tty+yes}" ]; then + /bin/stty -F "${tty}" sane + ${ast_cmd} "$@" >"${tty}" 2>&1 <"${tty}" + result=$? + else + # Purposefully leave stderr alone, this will under certain odd cases (like exceptions, + # and other odd cases logged from glibc) result in those logs at least being captured + # in syslog. + ${ast_cmd} "$@" </dev/null >/dev/null + result=$? + fi + + if [ "$result" -eq 0 ]; then + echo "Asterisk terminated normally." + break + fi + + if [ "$result" -gt 128 ]; then + signal="$(( result - 128 ))" + signame="$(kill -l $signal 2>/dev/null)" + MSG="Asterisk terminated with Signal: $signal (SIG${signame:-???})" + + # TODO: figure out how to use /proc/sys/kernel/core_pattern here, but if someone is using + # that, chances are they're already dealing with what we want here. + if [ -r core ]; then + if [ -n "${corerename+yes}" ]; then + core_target="$(echo "${core_pattern}" | sed -e "s/%h/$(hostname)/" \ + -e "s/%D/$(date +%Y%m%d)/" -e "s/%T/$(date +%H%M%S)/")" + mv core "${core_target}" + core_target=$(readlink -f "${core_target}") + else + core_target=$(readlink -f core) + fi + + if [ -n "${corecompress}" && -x "${corecompress}" ]; then + "${corecompress}" "${core_target}" + fi + + MSG="${MSG}\r\nCore dumped: ${core_target}" + fi + else + MSG="Asterisk terminated with return code: $result" + fi + + [ -n "${tty+yes}" ] \ + && echo "${MSG}" >"${tty}" \ + || echo "${MSG}" + + if [ -n "${crashemail+yes}" && -x /usr/sbin/sendmail ]; then + $echo_e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ + /usr/sbin/sendmail "${crashemail}" + fi + echo "Restarting asterisk after ${restartdelay}s ..." + sleep "${restartdelay}" +done + +echo "Terminating $progname." +exit 0 diff --git a/net-misc/asterisk-base/files/asterisk_wrapper-2 b/net-misc/asterisk-base/files/asterisk_wrapper-2 new file mode 100644 index 000000000000..cd7d5ff6504e --- /dev/null +++ b/net-misc/asterisk-base/files/asterisk_wrapper-2 @@ -0,0 +1,227 @@ +#! /bin/sh +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +progname="$(basename "$0")" + +T="$(getopt -o "h" --long "help,corecompress:,corerename:,crashemail:,dumpcore:,instance:,maxfd:,nicelevel:,restartdelay:,rundir:,syslog,tty:" -n "$progname" -- "$@")" +eval set -- "${T}" + +# bash builtins are special ... +echo_e="$([ "${SHELL}" = "/bin/bash" ] && echo "echo -e" || echo echo)" + +rundir=/run/asterisk +restartdelay=5 +nicelevel=0 +maxfd=4096 +dumpcore=0 +unset tty instance syslog corecompress corerename crashemail + +usage() { + cat <<USAGE +USAGE: $progname [options] -- asterisk options" +OPTIONS: + -h|--help + Output this text and exit. + --corecompress[=tool] + asterisk's address space can get quite large, compressing the core dumps can + save significant space, especially if asterisk core dumps frequently. + --corerename pattern + It's assumed core files (if enabled) will go into PWD, this specifies a + rename pattern. The following % codes are recognised: + %h - hostname + %D - date in format YYYYMMDD + %T - time in format HHMMSS + It must be mentioned that if kernel.core_pattern (sysctl) is modified + from the default 'core' value this option is unlikely to work. + --crashemail email@address + This will send an email whenver asterisk crashes (does not terminate + cleanly with a zero exit code). You need a working sendmail binary. + --dumpcore sizelimit + Maximum size of core limit, or the word unlimited. Default is disabled + (sizelimit of 0). + --instance name + Updated label for sylog logger. + --maxfd maxfd + Sets the maximum number of file descriptors (default 4096). + --nicelevel nicelevel + Will set the asterisk nice level to the specified value. + --restartdelay delay_in_seconds + Number of seconds to wait before attempting to restart asterisk. This helps + to avoid tight-loop crashes. Defaults to 5s. Minimum 1. + --rundir path + Where to store the asterisk asterisk_wrapper.pid file. In order to terminate the + wrapper (when asterisk next terminates), remove this file. + --syslog + Pass to redirect output to syslog rather than using stdout and stderr. + --tty tty + If asterisk should be attached to a TTY device, then pass this, eg --tty /dev/tty8. + Use of this is not recommended in general. + +NOTE: There are some quirks with bash getopt shunting non-options prior to -- + to asterisk options, so be careful of this. Typically stuff will break. +USAGE +} + +matchreg() { + local v=$1 + shift + echo "$v" | grep -q "$@" +} + +while [ "$1" != "--" ]; do + case "$1" in + --corecompress|--corerename|--crashemail|--dumpcore|--instance|--maxfd|--nicelevel|--restartdelay|--rundir|--tty) + eval "${1#--}=\"\${2}\"" + shift 2 + ;; + --syslog) + eval "${1#--}=1" + shift + ;; + --help|-h) + usage + exit 0 + ;; + *) + echo "BUG: Don't know how to process option $1." >&2 + usage >&2 + exit 1 + ;; + esac +done +shift # -- + +if ! matchreg "${restartdelay}" "^[1-9][0-9]*$"; then + echo "Invalid --restartdelay value ${restartdelay}, resetting to 5." >&2 + restartdelay=5 +fi + +if ! matchreg "${maxfd}" "^[1-9][0-9]*$"; then + echo "Invalid --maxfd value, resetting to 4096." >&2 + maxfd=4096 +fi + +if [ $maxfd -lt 1024 ]; then + echo "maxfd is guaranteed too low, bumping to at least 1024" >&2 + maxfd=1024 +fi + +if [ -n "${nicelevel}" ] && ! matchreg "${nicelevel}" -E "^-?[0-9]+$"; then + echo "Invalid --nicelevel which much be a valid integer (values from -20 to 20 makes sense)." + exit 1 +fi + +if [ -n "${corecompress}" -a ! -x "${corecompress}" ]; then + corecompress=$(which "${corecompress}" 2>/dev/null) + [ -z "${corecompress}" ] && echo "Error locating core compression tool, disabling core compression." >&2 +fi + +# Before here will still be output (potentially munged, to the terminal). +if [ -n "${syslog}" ]; then + tdir="$(mktemp -d)" + tfifo="${tdir}/asterisk_wrapper.logger.fifo" + mkfifo "${tfifo}" + logger -t "asterisk_wrapper${instance:+:}${instance}" --id=$$ >/dev/null 2>&1 <"${tfifo}" & + exec 1>"${tfifo}" + exec 2>&1 + + rm "${tfifo}" + rmdir "${tdir}" +fi + +echo "Initializing ${progname}" + +cleanup(){ + # There is a tiny race here, if this gets replaced inbetween the read and the rm. + # To fix this is quite complex in that we need to keep an fd, compare inode numbers + # and manage flock's. + [ -r "${rundir}/${progname}.pid" ] && \ + [ "$(cat "${rundir}/${progname}.pid")" = $$ ] && \ + rm "${rundir}/${progname}.pid" +} +trap cleanup EXIT + +# We could be clobbering an old version's pid, in which case it'll just terminate on +# it's next iteration. Towards this end, if asterisk.pid exists, attempt to find it's +# config file and request a core stop when convenient so that we can take over. +echo $$ > "${rundir}/${progname}.pid" +if [ -r "${rundir}/asterisk.pid" ]; then + ast_pid="$(cat "${rundir}/asterisk.pid")" + [ -r "/proc/${ast_pid}/cmdline" ] && ast_conf="$(tr '\0' '\n' < "/proc/${ast_pid}/cmdline" | grep -A1 '^-C$' | tail -n1)" && /usr/sbin/asterisk -C "${ast_conf:-/etc/asterisk/asterisk.conf}" -rx "core stop when convenient" + # We may hit a few (depending on how busy the server is a great many number) loop failures still ... +fi + +prlimit --core=${dumpcore} --pid=$$ +prlimit --nofile=${maxfd} --pid=$$ + +ast_cmd=/usr/sbin/asterisk +if [ -n "${nicelevel}" ]; then + ast_cmd="nice -n ${nicelevel} ${ast_cmd}" +fi + +while [ -r "${rundir}/${progname}.pid" ]; do + # Another instance is looking to replace us, so terminate. + if [ "$(cat "${rundir}/${progname}.pid")" != $$ ]; then + break + fi + + echo "Starting asterisk with ${ast_cmd} $*" + if [ -n "${tty+yes}" ]; then + /bin/stty -F "${tty}" sane + ${ast_cmd} "$@" >"${tty}" 2>&1 <"${tty}" + result=$? + else + # Purposefully leave stderr alone, this will under certain odd cases (like exceptions, + # and other odd cases logged from glibc) result in those logs at least being captured + # in syslog. + ${ast_cmd} "$@" </dev/null >/dev/null + result=$? + fi + + if [ "$result" -eq 0 ]; then + echo "Asterisk terminated normally." + break + fi + + if [ "$result" -gt 128 ]; then + signal="$(( result - 128 ))" + signame="$(kill -l $signal 2>/dev/null)" + MSG="Asterisk terminated with Signal: $signal (SIG${signame:-???})" + + # TODO: figure out how to use /proc/sys/kernel/core_pattern here, but if someone is using + # that, chances are they're already dealing with what we want here. + if [ -r core ]; then + if [ -n "${corerename+yes}" ]; then + core_target="$(echo "${corerename}" | sed -e "s/%h/$(hostname)/" \ + -e "s/%D/$(date +%Y%m%d)/" -e "s/%T/$(date +%H%M%S)/")" + mv core "${core_target}" + core_target=$(readlink -f "${core_target}") + else + core_target=$(readlink -f core) + fi + + if [ -n "${corecompress}" ] && [ -x "${corecompress}" ]; then + "${corecompress}" "${core_target}" + fi + + MSG="${MSG}, Core dumped: ${core_target}" + fi + else + MSG="Asterisk terminated with return code: $result" + fi + + [ -n "${tty+yes}" ] \ + && echo "${MSG}" >"${tty}" \ + || echo "${MSG}" + + if [ -n "${crashemail+yes}" ] && [ -x /usr/sbin/sendmail ]; then + $echo_e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ + /usr/sbin/sendmail "${crashemail}" + fi + echo "Restarting asterisk after ${restartdelay}s ..." + sleep "${restartdelay}" +done + +echo "Terminating $progname." +exit 0 diff --git a/net-misc/asterisk/files/confd-16.16.2-r1 b/net-misc/asterisk-base/files/confd-1 index a2da978af924..c350b7e9161d 100644 --- a/net-misc/asterisk/files/confd-16.16.2-r1 +++ b/net-misc/asterisk-base/files/confd-1 @@ -120,17 +120,6 @@ ASTERISK_MAX_FD="4096" #ASTERISK_STOP_TIMEOUT=-1 # -# Kill these tasks after asterisk crashed -# -# Warning! This will kill _ALL_ tasks with the specified names! -# -# Value: Space separated list of names in double quotes (e.g. "mpg123 mad") -# -# Default is to not do stupid things like killing random processes. -# -#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad" - -# # ASTERISK_CONFDIR # # If you'd like an alternative folder to /etc/${RC_SVCNAME} to be used @@ -169,3 +158,12 @@ ASTERISK_MAX_FD="4096" # Default: no # #ASTERISK_CORE_USEHOSTNAME=yes + +# +# When core-dumping, the default is to not compress these files. However, as it turns +# out, compressing these core files can save significant amount of space, so if you +# want them compressed, specify the tool to use here. +# +# Default: do not compress +# +#ASTERISK_CORE_COMPRESS=bzip2 diff --git a/net-misc/asterisk/files/initd-16.22.0-18.8.0 b/net-misc/asterisk-base/files/initd-1 index ed6fa8bca742..7d48b36456bf 100644 --- a/net-misc/asterisk/files/initd-16.22.0-18.8.0 +++ b/net-misc/asterisk-base/files/initd-1 @@ -31,7 +31,7 @@ setup_svc_variables() ast_instancename=asterisk ast_rundir=/run/${RC_SVCNAME} ast_logdir=/var/log/${RC_SVCNAME} - ast_confdir=/etc/${RC_SVCNAME/.//} + ast_confdir=/etc/${RC_SVCNAME} ast_cachedir=/var/cache/asterisk ast_stop_timeout=120 ast_stop_method="gracefully" @@ -42,7 +42,7 @@ setup_svc_variables() eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name." return 1 fi - ast_instancename+="(${t})" + ast_instancename="${ast_instancename}(${t})" fi [ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}" @@ -71,85 +71,11 @@ setup_svc_variables() return 0 } -asterisk_run_loop() { - local result=0 signal=0 - - echo "Initializing ${ast_instancename} wrapper" - OPTS="$*" - - trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT - touch "${ast_rundir}/wrapper_loop.running" - - while [ -r "${ast_rundir}/wrapper_loop.running" ]; do - if [ -n "${TTY}" ]; then - /usr/bin/stty -F "${TTY}" sane - ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}" - result=$? - else - ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >/dev/null 2>&1 - result=$? - fi - - if [ "$result" -eq 0 ]; then - echo "Asterisk terminated normally" - break - else - if [ "$result" -gt 128 ]; then - signal="$(expr "$result" - 128)" - MSG="Asterisk terminated with Signal: $signal" - - CORE_TARGET="core-" - yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-" - CORE_TARGET+="$(date "+%Y%m%d-%H%M%S")" - - local CORE_DUMPED=0 - if [ -f "${ASTERISK_CORE_DIR}/core" ]; then - mv "${ASTERISK_CORE_DIR}/core" \ - "${ASTERISK_CORE_DIR}/${CORE_TARGET}" - CORE_DUMPED=1 - - elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then - mv "${ASTERISK_CORE_DIR}/core.${PID}" \ - "${ASTERISK_CORE_DIR}/${CORE_TARGET}" - CORE_DUMPED=1 - - fi - - [ $CORE_DUMPED -eq 1 ] && \ - MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}" - else - MSG="Asterisk terminated with return code: $result" - fi - - # kill left-over tasks - for X in ${ASTERISK_CLEANUP_ON_CRASH}; do - kill -9 "$(pidof "${X}")"; - done - fi - - [ -n "${TTY}" ] \ - && echo "${MSG}" >"${TTY}" \ - || echo "${MSG}" - - - if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \ - [ -x /usr/sbin/sendmail ]; then - echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ - /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}" - fi - sleep "${ASTERISK_RESTART_DELAY}" - echo "Restarting Asterisk..." - done - - echo "Terminating wrapper loop." - return 0 -} - start() { local OPTS PID local tmp x - local OPTS ARGS + local OPTS ARGS WRAPPER_OPTS setup_svc_variables || return $? @@ -161,15 +87,23 @@ start() { OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")" # default options - OPTS="${OPTS} -f" # don't fork / detach breaks wrapper script... + OPTS="${OPTS}${OPTS:+ }-C ${ast_confdir}/asterisk.conf -f" # don't fork / detach breaks wrapper script... + WRAPPER_OPTS="--syslog" + if [ "${RC_SVCNAME}" != "asterisk" ]; then + WRAPPER_OPTS="${WRAPPER_OPTS} --instance ${RC_SVCNAME#asterisk.}" + fi + WRAPPER_OPTS="${WRAPPER_OPTS} --rundir ${ast_rundir}" + # ensure that ASTERISK_RESTART_DELAY is integer. ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')" [ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5 + WRAPPER_OPTS="${WRAPPER_OPTS} --restartdelay ${ASTERISK_RESTART_DELAY}" if [ -n "${ASTERISK_CORE_SIZE}" ] && [ "${ASTERISK_CORE_SIZE}" != "0" ]; then - ulimit -c ${ASTERISK_CORE_SIZE} + WRAPPER_OPTS="${WRAPPER_OPTS} --dumpcore ${ASTERISK_CORE_SIZE}" + OPTS="${OPTS} -g" if [ -n "${ASTERISK_CORE_DIR}" ] && \ [ ! -d "${ASTERISK_CORE_DIR}" ] @@ -182,11 +116,22 @@ start() { einfo "Core dump size : ${ASTERISK_CORE_SIZE}" einfo "Core dump location : ${ASTERISK_CORE_DIR}" - OPTS="${OPTS} -g" + if [ -n "${ASTERISK_CORE_COMPRESS}" ]; then + einfo "Core compression tool : ${ASTERISK_CORE_COMPRESS}" + WRAPPER_OPTS="${WRAPPER_OPTS} --corecompress ${ASTERISK_CORE_COMPRESS}" + fi + + if yesno "${ASTERISK_CORE_USEHOSTNAME}"; then + WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%H-%D-%T" + else + WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%D-%T" + fi + else + cd / fi if [ -n "${ASTERISK_MAX_FD}" ]; then - ulimit -n ${ASTERISK_MAX_FD} + WRAPPER_OPTS="${WRAPPER_OPTS} --maxfd ${ASTERISK_MAX_FD}" einfo "Max open filedescriptors : ${ASTERISK_MAX_FD}" fi @@ -194,21 +139,19 @@ start() { if [ ${ASTERISK_NICE} -ge -20 ] && \ [ ${ASTERISK_NICE} -le 19 ]; then einfo "Nice level : ${ASTERISK_NICE}" - NICE="nice -n ${ASTERISK_NICE} --" + WRAPPER_OPTS="${WRAPPER_OPTS} --nicelevel ${ASTERISK_NICE}" else eerror "Nice value must be between -20 and 19" return 1 fi - else - NICE="" fi if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then if [ -x /usr/sbin/sendmail ]; then einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}" + WRAPPER_OPTS="${WRAPPER_OPTS} --crashemail ${ASTERISK_NOTIFY_EMAIL}" else ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!" - unset ASTERISK_NOTIFY_EMAIL fi fi @@ -221,8 +164,12 @@ start() { TTY="${x}" fi done - [ -n "${TTY}" ] && \ + if [ -n "${TTY}" ]; then einfo "Messages are sent to : ${TTY}" + WRAPPER_OPTS="${WRAPPER_OPTS} --tty ${TTY}" + else + ewarn "ASTERISK_TTY=${TTY} ignored, not valid." + fi fi if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then @@ -230,13 +177,13 @@ start() { OPTS="${OPTS} -c" fi - if ! getent passwd "${ast_user}" &>/dev/null; then + if ! getent passwd "${ast_user}" >/dev/null 2>&1; then eerror "Requested to run asterisk as ${ast_user}, which doesn't exist." return 1 fi OPTS="${OPTS} -U ${ast_user}" - if [ -n "${ast_group}" ] && ! getent group "${ast_group}" &>/dev/null; then + if [ -n "${ast_group}" ] && ! getent group "${ast_group}" >/dev/null 2>&1; then eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist." return 1 fi @@ -252,7 +199,10 @@ start() { checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}" einfo "Starting asterisk as : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}" - asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null & + einfo "Wrapper options : ${WRAPPER_OPTS}" + einfo "Asterisk options : ${OPTS}" + + /usr/sbin/asterisk_wrapper ${WRAPPER_OPTS} -- ${OPTS} & result=$? if [ $result -eq 0 ]; then @@ -280,7 +230,7 @@ start() { fi if [ $result -eq 0 ]; then ebegin "Waiting for ${ast_instancename} to fully boot" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" >/dev/null 2>&1 eend $? fi fi @@ -289,18 +239,16 @@ start() { } wrapperstop() { - # Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running). - if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then - ebegin "Killing ${ast_instancename} wrapper script" - kill "$(cat /run/asterisk/wrapper_loop.pid)" + # Older path. + if [ -r "${ast_rundir}/wrapper_loop.running" ]; then + ebegin "Signalling ${ast_instancename} wrapper script to terminate" + rm "${ast_rundir}/wrapper_loop.running" eend $? fi - # The new one (due to "hardened" requirements) uses a simpler - # flag to indicate running or shutting down. - if [ -r "${ast_rundir}/wrapper_loop.running" ]; then + if [ -r "${ast_rundir}/asterisk_wrapper.pid" ]; then ebegin "Signalling ${ast_instancename} wrapper script to terminate" - rm "${ast_rundir}/wrapper_loop.running" + rm "${ast_rundir}/asterisk_wrapper.pid" eend $? fi @@ -329,7 +277,7 @@ stop() { fi ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" &>/dev/null + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" >/dev/null 2>&1 # Now we have to wait until asterisk has _really_ stopped. sleep 1 if is_running; then @@ -343,7 +291,7 @@ stop() { return 1 fi sleep 2 - echo -n "." + printf "." done echo fi @@ -354,8 +302,8 @@ reload() { setup_svc_variables || return $? if is_running; then - ebegin "Forcing ${ast_instancename} to reload configuration" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null + ebegin "Requesting ${ast_instancename} to reload configuration" + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" >/dev/null 2>&1 eend $? else eerror "${ast_instancename} is not running!" diff --git a/net-misc/asterisk-base/files/logrotate-1 b/net-misc/asterisk-base/files/logrotate-1 new file mode 100644 index 000000000000..2286efc1e7e9 --- /dev/null +++ b/net-misc/asterisk-base/files/logrotate-1 @@ -0,0 +1,27 @@ +/var/log/asterisk/messages { + missingok + notifempty + + postrotate + test -e /run/openrc/softlevel && /etc/init.d/asterisk --quiet status && /usr/sbin/asterisk -rnx "logger reload" || /bin/true + test -e /run/systemd/system && systemctl is-active --quiet asterisk.service && /usr/sbin/asterisk -rnx "logger reload" || /bin/true + endscript +} + +/var/log/asterisk/debug /var/log/asterisk/full { + missingok + notifempty + daily + + postrotate + test -e /run/openrc/softlevel && /etc/init.d/asterisk --quiet status && /usr/sbin/asterisk -rnx "logger reload" || /bin/true + test -e /run/systemd/system && systemctl is-active --quiet asterisk.service && /usr/sbin/asterisk -rnx "logger reload" || /bin/true + endscript +} + +/var/log/asterisk/cdr-csv/*.csv /var/log/asterisk/cdr-custom/*.csv /var/log/asterisk/queue_log { + missingok + notifempty + weekly + rotate 52 +} diff --git a/net-misc/asterisk/files/asterisk.tmpfiles3.conf b/net-misc/asterisk-base/files/tmpfiles-1.conf index 7af4ed720d43..224d060a3c92 100644 --- a/net-misc/asterisk/files/asterisk.tmpfiles3.conf +++ b/net-misc/asterisk-base/files/tmpfiles-1.conf @@ -1,2 +1,2 @@ -d /var/run/asterisk 0750 asterisk asterisk +d /run/asterisk 0750 asterisk asterisk d /var/cache/asterisk 0750 asterisk asterisk diff --git a/net-misc/asterisk-base/metadata.xml b/net-misc/asterisk-base/metadata.xml new file mode 100644 index 000000000000..ac7674006c95 --- /dev/null +++ b/net-misc/asterisk-base/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>jaco@uls.co.za</email> + <name>Jaco Kroon</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">jkroonza/asterisk-base</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild index afa1249c00e6..65915f0e5c61 100644 --- a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild +++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86" S="${WORKDIR}" diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild index c4e002184790..6cdfb0808711 100644 --- a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild +++ b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86" BLACKLIST=("astcc-followed-by-the-pound-key") diff --git a/net-misc/asterisk-g729/Manifest b/net-misc/asterisk-g729/Manifest index 4df9a0fd8b5e..58409a983684 100644 --- a/net-misc/asterisk-g729/Manifest +++ b/net-misc/asterisk-g729/Manifest @@ -2,9 +2,13 @@ DIST asthostid-x86_32 1678360 BLAKE2B 0caa098d9891cad9301bbc074d8ef8e0229ef3432c DIST asthostid-x86_64 1806296 BLAKE2B cd2e08ee760374f781d79a952679dc7d54f83dbd3f9a63dfe8fe4f36ea74c19c4a0486d459a5cb90877111100dd6e147bc701489e38ecefe585a4473147a5886 SHA512 be7d7b63259d5c4f15e6b3a55b283030bfc3f4ccf59c58848a9803838f7aa2ff470353a4d78d289bdcd40213c0cc81fad31e2bfad690fcaf111ea5cabae5adfd DIST astregister-x86_32 2103608 BLAKE2B 7fdf1c196152612cd28cfe7bf832dedb625b392f5e919480b1fb792327474d6ad91abaf4938ca8b230a1226bef62652e16f8d8ac1d0dad338fe308b3582c72e8 SHA512 3c3c4b8a32143d1aaaec6ec6b308335f59cf5381f844412e4e484aedc91bff2601778c28e99628fff828c81d2ec05b4de7c8c1cdddeea3ec37f5331beff47a2c DIST astregister-x86_64 2193440 BLAKE2B 9c9ac2343f5d7291251b9ceaa00fc4f8e4c39673e8d4854f8743beee5c86bbbc14c802c34ff26aa8412f1219113edeab7cb3b7adb94086c2f63724095d9f1fc5 SHA512 9302a7ead6bedd6683bcd0da92b7a7ca54fdb975784ef1783aa99f2bb26424dbb77b4c0fa6b809ae6e6ad839807feb055bee5c03a38292737412aa1c3d7df4e4 -DIST codec_g729a-13.0_3.1.9-x86_32.tar.gz 411156 BLAKE2B 179c77d32d1f8ac3314813a1d2ce51cee1cb7b9c1b9f5e8e78c4ed1169c0719f893c55c4fe890fb657196a37c5a4779164924a8696817ba7bbe6f17146286b82 SHA512 9b064b3db3c40f900b88937efde1605dfb67316d92adc3774b4e3322e9bc5042e6670a2d385b6487a8980620eb92c8564b4fd3535810bab117f53b2762e8ca68 -DIST codec_g729a-13.0_3.1.9-x86_64.tar.gz 478364 BLAKE2B 49136479e1bd139fcb22130868575d5be7d6784081307679cfeee16951f6a303b5328a62c23a0ade506f2df0527b275bd198560dacd59ba5b9ba237095622778 SHA512 5fa2dca977ca1dcbf3019fc86c3edc91fd561c814bfa9a5202680b7a581f03faa1705a4392a70409f9cd30a4379691b609f0f572030972cbe432cad435314951 +DIST codec_g729a-16.0_3.1.10-x86_32.tar.gz 476844 BLAKE2B c476afe4a8b2d559157d26fd03250e0ac566019a547ca9ecdb6f734bc1adb5401a2f9ceac59bd98c75e870b20570a2fe6067b635475a23826e3a9f802fa4e39a SHA512 18239b4c0c5cf35b6b1fd8a2a0e0b6453e6c48f27052a6b525392288a08f403c69909c94b74b4bc3748b25ad06764fa57ad7c1022e9471e9c23b7b45e556fbbf +DIST codec_g729a-16.0_3.1.10-x86_64.tar.gz 476330 BLAKE2B 51639c52b67133b585ae48df5b363a5eb94c55a33d7fe4cf436eff21f9729ea61e2899419bc510f11706d4a3e002415ce1bd429cd72b5bbad433016c0e7a787d SHA512 489fbc1d3c1a354f3775e46422ca43fd4314af69037c280e95419d0d58dd10df1fa12858b98f6e5905b361164624eccf398e22c3305e78fa9b84d1a8f62afacc DIST codec_g729a-16.0_3.1.9-x86_32.tar.gz 476772 BLAKE2B e1a7b8baefc551f16618fded2663acfb825a7eabcccc7ca844792e6179bac5b9ac2e0f4c387e3b2861347c6deb5db13f41ecd265c2261dbb65756890d976f4f7 SHA512 cddf46f369b0922a5569961688fcd4fb840bcce3a5573549d8a3a3e6150e20cd7c18e32ea07edc10150dd409763504ab50fad5d884fb33a49d624e4ebe0afd10 DIST codec_g729a-16.0_3.1.9-x86_64.tar.gz 475819 BLAKE2B d738dccb1e94ae5458b72de7f52d3bb9964f3be993efe44f615bc06b0c17638ac743dd0465a68c172f339d888ceac35b54babadd217c13b028575c3b1e5aa94b SHA512 f6c60c66fce03ea5ce02301dc9c8b5a93fefbc60089980401cd1fee58357b2c03ab2b12eb50df82d2f3a25613e37c1bb370a319cf0a36c92983ef98aa137429d +DIST codec_g729a-18.0_3.1.10-x86_32.tar.gz 475393 BLAKE2B ad7b2c7699f82f27bce00aa528e22166c9345229fc1169cd358e088d470dd781e229b76c3939e123809efc9dcaf065d9cfd27efef99818f7a765d7771af2649b SHA512 767d21fc669a4e6fe2da55557fe12ed7e3f9fe62090d0f5eb669305d5cb74ae11211b99e01535a1b2c13574d2791a5bda9c8852c7d2ae368b616cd4703d99898 +DIST codec_g729a-18.0_3.1.10-x86_64.tar.gz 476294 BLAKE2B 21fe46bdd544627dbe018730676091f9882ef25a02e6ce436f25757e46b91a6670c410da94c96fb9bc30e5e1976f3803d290049da319a2ad6230612e7805ebc6 SHA512 c7aaa72e7744309971e8abc71da8217ba181f85c163e24ca82bc0ac1276cb4e6e8107edf9f896fee941c8680188f931a14de3d2fbc5cdadfd3c9ecef53c15618 DIST codec_g729a-18.0_3.1.9-x86_32.tar.gz 476626 BLAKE2B 7a8a0a763fcae579ac4be2891c691e7e540881cfd723a2c25af0c0f67499fde24a3d786d9ec9dddb6ee70e77973d71af6538d52963ff33b41d1940c8b506266d SHA512 bb223c03185d33107dc3cfa9393fe07950ae3a5825e1a347e26d06e9ffb8bfbc7ba350cb1e072dd52eaa6ded5a98e53dec9be8d8c55d89f0c816058a2f6bb247 DIST codec_g729a-18.0_3.1.9-x86_64.tar.gz 475817 BLAKE2B ef45f1edab67b1fdb57d11340d2b3885c72d9f09f00fdccfdaa8674d61cf95ddf8ace223f29049e1e700f0bdcabd824ffbfa5382e492a1e0d0a47e1ab030d606 SHA512 12bbd2bcef0b7138d0ef261b6b1265f803526ce3c4ec371be830267e01e0e674150f17169742fe72737291b162136ea5224b320b655112cbc10fa207733c7f54 +DIST codec_g729a-20.0_3.1.10-x86_32.tar.gz 476843 BLAKE2B 8d014823184f17c158de9720bc903f841f290f1171344bc7a54ad7cf40627b7fcac697e642c35feef4e6eccff58b7fc85775e5d5a31c518b35a3b6c7bf258b19 SHA512 81d7d0921c9f17b31d9d3a3dd7e81844ee17bc9afd58418c2add40409c3eda932330e93411f32b5af67a42877f6abfba5d9b599812cc0655b2cc9851f1257c3c +DIST codec_g729a-20.0_3.1.10-x86_64.tar.gz 476178 BLAKE2B f27787c17929deecf048c0b79f38bd3630375d1e09afe142052ff7b4f9ef3d5577a09b11a11aa551ae6d82f44cf40931550fa5612ec132befa3c9e3776b7dd58 SHA512 91df558f4c88af703bde270d0e360ebba074ab5ff917f163f8a525b7fa0e4a2e7480884effafb1253d6a67a72e640d1cdaba75c10c24283655136d8a356dec56 diff --git a/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild index 01114a23c866..c62b6daea016 100644 --- a/net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9-r1.ebuild +++ b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" diff --git a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild index 01114a23c866..5f5eeeb743d5 100644 --- a/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild +++ b/net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -22,7 +22,7 @@ amd64? ( LICENSE="Digium" SLOT="0/${AST_PV}" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" RDEPEND="=net-misc/asterisk-$(ver_cut 1)*" diff --git a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild new file mode 100644 index 000000000000..c62b6daea016 --- /dev/null +++ b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.10.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +DESCRIPTION="G.729 codec and supporting files for asterisk" +HOMEPAGE="https://www.sangoma.com/asterisk/software/g729-codec/" + +AST_PV="$(ver_cut 1-2)" +MY_PV="$(ver_rs 2 _)" + +SRC_URI="x86? ( + https://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-x86_32.tar.gz + https://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32 + https://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32 +) +amd64? ( + https://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-x86_64.tar.gz + https://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64 + https://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64 +)" + +LICENSE="Digium" +SLOT="0/${AST_PV}" +KEYWORDS="-* ~amd64 ~x86" + +RDEPEND="=net-misc/asterisk-$(ver_cut 1)*" + +RESTRICT="mirror strip" + +S="${WORKDIR}" + +pkg_setup() { + QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so" + QA_PREBUILT="${QA_FLAGS_IGNORED} + /usr/sbin/asthostid + /usr/sbin/astregister" +} + +src_unpack() { + local dfile + + for dfile in ${A}; do + [[ "${dfile}" = *.tar.gz ]] && unpack "${dfile}" + cp "${DISTDIR}/${dfile}" "${WORKDIR}/" || die "Error copying ${dfile} to ${WORKDIR}" + done +} + +src_install() { + local binsuffix + + if use x86; then + binsuffix=x86_32 + elif use amd64; then + binsuffix=x86_64 + fi + + newsbin astregister-${binsuffix} astregister + newsbin asthostid-${binsuffix} asthostid + + dodoc codec_g729a-${MY_PV}-${binsuffix}/README + insinto usr/$(get_libdir)/asterisk/modules/ + doins "codec_g729a-${MY_PV}-${binsuffix}/codec_g729a.so" +} + +pkg_postinst() { + einfo "Please note that Digium's register utility has been installed as astregister" +} diff --git a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild index 01114a23c866..5f5eeeb743d5 100644 --- a/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild +++ b/net-misc/asterisk-g729/asterisk-g729-18.0.3.1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -22,7 +22,7 @@ amd64? ( LICENSE="Digium" SLOT="0/${AST_PV}" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" RDEPEND="=net-misc/asterisk-$(ver_cut 1)*" diff --git a/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.10.ebuild b/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.10.ebuild new file mode 100644 index 000000000000..c62b6daea016 --- /dev/null +++ b/net-misc/asterisk-g729/asterisk-g729-20.0.3.1.10.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +DESCRIPTION="G.729 codec and supporting files for asterisk" +HOMEPAGE="https://www.sangoma.com/asterisk/software/g729-codec/" + +AST_PV="$(ver_cut 1-2)" +MY_PV="$(ver_rs 2 _)" + +SRC_URI="x86? ( + https://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-32/codec_g729a-${MY_PV}-x86_32.tar.gz + https://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32 + https://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32 +) +amd64? ( + https://downloads.digium.com/pub/telephony/codec_g729/asterisk-${AST_PV}/x86-64/codec_g729a-${MY_PV}-x86_64.tar.gz + https://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64 + https://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64 +)" + +LICENSE="Digium" +SLOT="0/${AST_PV}" +KEYWORDS="-* ~amd64 ~x86" + +RDEPEND="=net-misc/asterisk-$(ver_cut 1)*" + +RESTRICT="mirror strip" + +S="${WORKDIR}" + +pkg_setup() { + QA_FLAGS_IGNORED="/usr/$(get_libdir)/asterisk/modules/codec_g729a.so" + QA_PREBUILT="${QA_FLAGS_IGNORED} + /usr/sbin/asthostid + /usr/sbin/astregister" +} + +src_unpack() { + local dfile + + for dfile in ${A}; do + [[ "${dfile}" = *.tar.gz ]] && unpack "${dfile}" + cp "${DISTDIR}/${dfile}" "${WORKDIR}/" || die "Error copying ${dfile} to ${WORKDIR}" + done +} + +src_install() { + local binsuffix + + if use x86; then + binsuffix=x86_32 + elif use amd64; then + binsuffix=x86_64 + fi + + newsbin astregister-${binsuffix} astregister + newsbin asthostid-${binsuffix} asthostid + + dodoc codec_g729a-${MY_PV}-${binsuffix}/README + insinto usr/$(get_libdir)/asterisk/modules/ + doins "codec_g729a-${MY_PV}-${binsuffix}/codec_g729a.so" +} + +pkg_postinst() { + einfo "Please note that Digium's register utility has been installed as astregister" +} diff --git a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild index 1e55dbf25b31..0cc3c194bb3b 100644 --- a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild +++ b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -17,7 +17,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86" S="${WORKDIR}" @@ -36,7 +36,6 @@ src_install() { diropts -m 0755 -o root -g root insopts -m 0644 -o root -g root - dodir /var/lib/asterisk/moh insinto /var/lib/asterisk/moh doins -r . } diff --git a/net-misc/asterisk-opus/Manifest b/net-misc/asterisk-opus/Manifest index 9cb523f867a8..450bfd0fa831 100644 --- a/net-misc/asterisk-opus/Manifest +++ b/net-misc/asterisk-opus/Manifest @@ -1,6 +1,6 @@ -DIST codec_opus-13.0_1.3.0-x86_32.tar.gz 308059 BLAKE2B ec93fe29c030f2e63dffef882326c9f362e2a81c8de26eb04e96995c00acf965ea376555c0befa90bdf0f2592d40cc2e296abba720702a6cd7f6683f9784d533 SHA512 aa4aafa4c688a328eec81daafd0589fc3a25d22d374742a0500ca71763d4191a24b055e3eb6ecd9bd3a0556ef359ab9a8482b44e9c1633568136db4997284063 -DIST codec_opus-13.0_1.3.0-x86_64.tar.gz 343694 BLAKE2B ff43085aabbfc4f4082dc22f11b12d62ddb631b46df492baef8786a1f76cbc6b2828091867d40c77f0c268ed2ba50148fd6a1394493b595342da408d6746fe20 SHA512 0932006e8537ddee8c73b598bf04b6b552e1bf9527c65abdd6f7b8ff7ef677e251bc4fff55233e5d7e715f9ff5b928347618ed0d14a1f6bc9c6c728303593213 DIST codec_opus-16.0_1.3.0-x86_32.tar.gz 394187 BLAKE2B 0b187360ae65fe4cfd56f90c2f617da916ec4ee9046a6ab9af3764c9182fce22bdaccf79eb1917ff4535201a96adda84761b7bb829aa062751d6836c539caa58 SHA512 851c94f327ed8823069d1a83ca750a607780753d3ea37f52e8ca5ad4c14a419be1b86c47adb965722f27de0cca2a829a3454d3f2c44925c676d040e78d440ad1 DIST codec_opus-16.0_1.3.0-x86_64.tar.gz 388551 BLAKE2B d36f4ce8e9414e0887232afe6fd15098e48eb5ccaf690f340d4a62eaac432342a61e43801260f0198bd68af58217ef2a9aacd6d46af99b192444fa59994ff590 SHA512 601d04de2bd4e67cd3d111c8a6c383ea3885180f8ab82c8943e0d09f8203cff3e6d45b6048843946d53b4002d01d31d92592107053e512b5347568050aba5ac7 DIST codec_opus-18.0_1.3.0-x86_32.tar.gz 394411 BLAKE2B ecd374e7a6d0f8ee9dfffe7437276fabbcdbc334c0d3791874fcc22b41f150bb0ea2918920018bfb28b27538be9cb4fa4fe430d05e3c117041b33890e9d72ee5 SHA512 5d7b6651b8097a017ccbddd82811558d1b3e6f82871c4b761212f3695baa9207899fbce35cb9185a4543ad8fc8b11557c73bb21f3fc57e7d4b45f9e75a8189cf DIST codec_opus-18.0_1.3.0-x86_64.tar.gz 388492 BLAKE2B acf993c9d82921ec72307e1237ec0a88df2e10321423672e6d3d6377b61d44ed8bb7ec5e9109e3d5d17ba8dae54b03fb245ca59e90d896897536b1f629c213ab SHA512 5155703af8e9d1b68b3f0469d3e77f266d8b1d4bbb5bb5761e4f775d3ea117902d9a50ffc390db2d367c8a9dc5682f61c199e18450b6567c5518163e0e04605f +DIST codec_opus-20.0_1.3.0-x86_32.tar.gz 394431 BLAKE2B 438fd122718e6efe45eaba0b81e774ddd02cef9d81983f9c5369acd4a8654429bcb0992d2918ccd4088f189221763bf4caf040bdd8a885b59ef3582bac5590a6 SHA512 6edb98a4b440c94c03c5623751b384b6595a1195dce3f62b3fbcafa9e1136bb8dd0c105a37f56369804e486095acb5d150e998e55a8f8a6b03988d8219e8883f +DIST codec_opus-20.0_1.3.0-x86_64.tar.gz 388429 BLAKE2B 535438df19edbf5e639e2427e46c05c4537b9955f3b02f94b21d674061e831f6097018fb1861b3f27081cdac4ae42a1dc9f8659e717a91be76c244cf9effaec3 SHA512 d98402be9cb12a9fefee427b4641e4e11873e04fe275d060ef8c272d4830a4c2227cac94963bb1bf19450487e5c6c381171328383192309c4f05250d6d759da2 diff --git a/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild b/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild index e21609589199..9d7059690599 100644 --- a/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild +++ b/net-misc/asterisk-opus/asterisk-opus-16.0.1.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -18,7 +18,7 @@ x86? ( LICENSE="Digium" SLOT="0/${AST_PV}" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" RDEPEND="=net-misc/asterisk-${PV%%.*}*" diff --git a/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild b/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild index e21609589199..9d7059690599 100644 --- a/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild +++ b/net-misc/asterisk-opus/asterisk-opus-18.0.1.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -18,7 +18,7 @@ x86? ( LICENSE="Digium" SLOT="0/${AST_PV}" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" RDEPEND="=net-misc/asterisk-${PV%%.*}*" diff --git a/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild b/net-misc/asterisk-opus/asterisk-opus-20.0.1.3.0.ebuild index e21609589199..8388e1beb69b 100644 --- a/net-misc/asterisk-opus/asterisk-opus-13.0.1.3.0-r1.ebuild +++ b/net-misc/asterisk-opus/asterisk-opus-20.0.1.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index a4826c204537..1f8a2ef7e547 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -1,9 +1,13 @@ -DIST asterisk-13.38.3.tar.gz 33711458 BLAKE2B a1f37c210e7e95962665310b542d9a3b682ecc5e90188e8272a0cd6e22ebfa963ed5af46f0f85c2074bc0bbe34d72473343ff3437d80b58e5383eb80385d0b89 SHA512 dd67f73704f1c68639313852ba1508165c7b525f0f4156c776258e27ee19a0ee87293ae7805178b0f37188fca91b861c52b5206cbba754a6181492d0efb7e895 -DIST asterisk-16.19.1.tar.gz 27870922 BLAKE2B e7b2ceac60f9db19802acc6c69b233556834815e1a9a3d17b2fd331d2577beb356f31a531a6d8fde70f78e9362bd8b6dbc796f906557c82bcd4847a612c788a3 SHA512 7b74fedce91ac597f3cc7a03b401ae7506bc6479faf008f3ea9c0f4783d85c5ce06d71bf73333d4bc1609a2cb96511d931d79f3bc8613906f370f9b4015b30b9 -DIST asterisk-16.20.0.tar.gz 27888074 BLAKE2B 74f7812db787e5dcb041850fc7e80229e05ef0849cf373be29f9a3ac2eb0f2244fc6f2bd2a3f411c4d37d968184dfbc140e55ad62de53e6beb0b2340179b831c SHA512 0e270c2d00eda1aea3135eba427a77ac2abe66a31c868cf700d5cc26bde65fded6f2191d5e4af361b2e055ae04f2943611ca1fa19815a4a690076a83fb899148 -DIST asterisk-16.21.1.tar.gz 27912610 BLAKE2B 75b93fbde52d72906bb613b1d42b7fe592fac9a6af76aabb11dab1bb15b2ad8134f8cfe0a9a58f5f72928e046b0b6111d8e899909d6baca3fd820b583c6acd35 SHA512 399875d3e70e2ebae8b27edc9d97b485d7acfe7a99c1f6e2a6212ccac9cd77fd4e720ccb1cf4d16a441fb8f894d8b9a64785c48bc606a0cfd105d2b7ab16d766 -DIST asterisk-16.22.0.tar.gz 27925083 BLAKE2B ce700f8924fb2c7c8fc521879c0768595eb7462bb3aa78dd8b64c8a268b357e522ece17c6c4a02a4e17c16bad5141d5c2c15b602d335567be5a3df49f67300ca SHA512 7032da647f4063320fb2ea9c3cd7b0079fbb907e5c8f9d5cdc4197c82d07c99c75bfdcace5c74a593573cd0d9a1b9eb73b2030dc0b13604abb481a311a742173 -DIST asterisk-18.5.1.tar.gz 27953748 BLAKE2B 543f2bfbe1527f3a168dc73d3d9f20e80e95be9de9532a97ff6a5c70a548d525c39ce5251b80dbcd1c0e31c066fc48520e6c373b1404bf24a00b0a48ad134bcd SHA512 95f30c14602587827c7d7bc4652639163f4fe6338fade35d533525aa8825d7a5082c9d6fa4671a5f4f89bd90a0d657ce7e51fd4216558bd367abcb10b25aeb23 -DIST asterisk-18.6.0.tar.gz 27970531 BLAKE2B a2eaecc962b236e6e455b8d305c05f33fab8e4d6c63eae1506b8354710d6e3e0e3c6da59600555d880520bb58a13950f830057ac03bc82628ab27b2627de52c9 SHA512 17ad7e4dc86f75d4e70f779b6fe6958ee544233b20a36847a6624a7f07b135ddb415f5dca245843ea359e9a6a7c75bfc40ce36fca1df5a7a12549ae522fa2590 -DIST asterisk-18.7.1.tar.gz 27995503 BLAKE2B edc13b33243507114fbf2a514fb67d462ca2f8095e4eba95dccd194b4495c3be256ddff280b7400182fed7ffc4d0a462c687f5a23e2162933e0603464e851d54 SHA512 5e08ed7e95d00538fd24ed46644818d690fe8c5b8f8d6b9a7d01120c7de28138372f8e166950730b65bd0ffc3e1028af89377bde598bee549ca86d369f9427df -DIST asterisk-18.8.0.tar.gz 28007752 BLAKE2B d5feb2a03003869ee304cd38bc3abcd77a13614c4f1f0a871d517c972f661c17de3da7f452345aaa11e23526a612c1805325ac5a3e902fea1070f63c993ef3fa SHA512 aa06077c6e33e35c35bbaf7dcee13782197f2d9f61e159741ade20050a7bd0dd9a7f6a69d539ee3789af950e8c03518d6186abc99d93ace38dd7e9a1e5dcd337 +DIST asterisk-16.30.0.tar.gz 28131110 BLAKE2B f230155a6347e891b531e54fe2821f1d477ed83699dd4a90c67b3307965430dbcdd04bd0ced49803776d349e29846492a6ef96e19ad3665dc610623be8de25cc SHA512 59cfbc1463dbad6ae7c6307d96b1a220fb02b3e398f96708654e58db788d57f2ca7aac8d4a290ed04f333b5c82c514ec9b95681125e3bdddc237e6c778fd2aec +DIST asterisk-16.30.1.tar.gz 28234979 BLAKE2B a9cd732feb00408876f90328d7f14dbfe426829e607f9b8e812ff25823c8dc1facab1ecd423e1d4f33c1623f3769197fa3b1fe3181efad0b231c96c0afb1dd16 SHA512 1624d207e80351f976c084344d09d67fe37b526a42970da007f5407be006d107e951093209415a68c891e2bd9cb142421e7acd1ac9fba2c1b1c064aee2224cb6 +DIST asterisk-18.17.0.tar.gz 28293243 BLAKE2B 8a162d7cac92df2b6dd430fedc1446a302b1b9c1061ddd4a236fd5797e8be17d53d7179d23a7c8bd4260c73d34dea2db2b9ebffd4eebb2ed714a286838bc5ddf SHA512 1a5dd9715811a8b699d49b057ef42f68ddc88cc22a568836a6a778f6ff22d3923f81840aef425819bb59f28bb27e321154ef9e1d3deba5ed7d39c7eca562e40e +DIST asterisk-18.18.0.tar.gz 28407407 BLAKE2B 2e49da8b93651268e2aa2f7f5e2b8ffb2f74c39eb74a4514593be39826912774584c4c33f3839a951ec068218e8db43153fee0a543a9adb94a90cc9338ad40c3 SHA512 bf3d73ef5b6a196d599771c913ae95596b0bfae8fc35cdf66181d7b56ffb4bd78078e25627e271c62988ed6342e69162a1f120cae6049dda6f1596d0759bee59 +DIST asterisk-18.18.1.tar.gz 28407009 BLAKE2B b3c3325a8958fa25364c735508357e35e4ad3ea2390b4f83d7b132c4263b2b0b56a65abab60f337e55cbc3edd4df580f3904164ba76abd4198ce1be112c93d38 SHA512 d5058399beffd2f74a17b0fdcc97720e08540383facb2f3691376cb2086e3d2f8df5b0c9110699d09cffe1ed6b2fbdfe9926d0698af0fce39c6c0a9bb4643d30 +DIST asterisk-18.20.2.tar.gz 28448635 BLAKE2B 9949033f93d770673e80a86cd48a084da853d0cbb51aa50159e813653bb39efd062772331aeb5d127f0c1c58724d9c6d748d45a2e0803f276e83bc804b942c2c SHA512 3ee44047a2d9823550b031933b709e8fd7d6a2a0a4cfb2221187da0983f8d22e411b93fde22934753ae9a7272390c7feebc8addabf7e0943eb57ae7f2fa71b3c +DIST asterisk-18.21.0.tar.gz 28446501 BLAKE2B 15a0f928f9c20eb676ffa25af8ac771494a417744758e6e9304451502ee2981c09e1c89c7012ec11edfb9a6bfd15599d462922a373a8f8d7d5074ea0b8c7e7cf SHA512 4a3c57af70b74918b61e1c67423667a876fcc519376f1795054a55700acb5d05da8e4e0a3e3187760203bc262678a6c29eae07ed2a5e2df84a9a555ec79cb48f +DIST asterisk-20.3.0.tar.gz 28176546 BLAKE2B 488cfe449c040c282afe438847d14f6cc20d1fb034fbb33555f8e43803b481d3f2b890ac01cc7d43278b41040093f8cedfc609c025cfab73fd8b9d23a0f67016 SHA512 332c24c089abca7059d80794b37a4f5dc34f0468a07f5534b0df26c5103e0508c9c5f3f35a02826ed6b33973c26503be2829fd51fa23a8056a58fa2b50b17730 +DIST asterisk-20.3.1.tar.gz 28176262 BLAKE2B 9ee75ee297dc4df37f51f75444d46af083b794cb444ae77b601f17308889db22240939edf04761eb3d41e74e2a67a3329d427861a5a5d34fec6016d6660793bd SHA512 4e34de731211aebe916d19948c41aff370187bfadc1202837a96ebc7f218e5bd7c3936b5b4e34ba6e79c079f77eb5ed038239c903800d5a56ceda2f342218613 +DIST asterisk-20.5.2.tar.gz 28215394 BLAKE2B d9baddc5b2134fd8d7c23dc1407abc37ee937f4dc3ac6dacca43126e0f3ee45b5eca1b8a66834e267d8bb02eb35c8b2e73d854b0a234a85f2dc4048b9d1c4a99 SHA512 ff2d6ddd5b6031b6e4fcb15c82149c3272031b617bf5bca87af1d085464fcd9af6bd373e9431077ce58a558b50c6b2c9cd4d94e739ecc312371cd605e4746a84 +DIST asterisk-20.6.0.tar.gz 28208707 BLAKE2B 7eaebcec7dd58912bc4ef6eccf46c0f10b328997889febaa0bf03e2a60197c9d2db97a0ccfd2870085c87eb97ca3b45286138857504199f09ba2071b9a0c50a2 SHA512 31af71a325cdcb9eb5c6b8bb72f523e7da8dcb1b2d33eaa04a493a922421f90c2019bbed01ff5bc8aa46cd02fa72b80a48074ecb146f5399d62bc504a0e4c053 +DIST asterisk-21.0.2.tar.gz 26280477 BLAKE2B 4bcf2f42bf75b869e2279780c4bb3999786d844e57d48eb5fd8570e0f4ecea0de73d71077e5a5fe6ce64c1c36ef694c987872281fd30e9434bc67d91a3ce1249 SHA512 419d8c2abfa680bb1a812fcbea939f2505dc9f95f860c263c303731fb4e0870060e433787b344136832ccf9d0e34dc64da25240ab3651fb499f416ec3098a711 +DIST asterisk-21.1.0.tar.gz 26268701 BLAKE2B eae9bab916198ab6fba39142d96c6391ffa711c4ac5a4dd7926c0494dabcd1606bab0525e24477f453ff419329efb0a3abf5e9a012abd2a39f6f818505dd196a SHA512 1d4aea4f02950becb492af49e2d434df725676185651b4c1e5dc502f21c8380ce1368f75726bca124d41128ea01a8210d1e229883c442a42bbdb03530fc981c8 diff --git a/net-misc/asterisk/asterisk-13.38.3-r2.ebuild b/net-misc/asterisk/asterisk-13.38.3-r2.ebuild deleted file mode 100644 index 12bf7e259cb9..000000000000 --- a/net-misc/asterisk/asterisk-13.38.3-r2.ebuild +++ /dev/null @@ -1,352 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} ) - -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles - -DESCRIPTION="Asterisk: A Modular Open Source PBX System" -HOMEPAGE="https://www.asterisk.org/" -SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0/${PV%%.*}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -IUSE_VOICEMAIL_STORAGE=( - +voicemail_storage_file - voicemail_storage_odbc - voicemail_storage_imap -) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd vorbis xmpp" -REQUIRED_USE="gtalk? ( xmpp ) - lua? ( ${LUA_REQUIRED_USE} ) - ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} ) - voicemail_storage_odbc? ( odbc ) -" - -PATCHES=( - "${FILESDIR}/${PN}-historic-no-var-run-install.patch" - "${FILESDIR}/${PN}-13.38.1-r1-autoconf-lua-version.patch" - "${FILESDIR}/${PN}-13.38.2-r3-func_lock-fix-races.patch" - "${FILESDIR}/${PN}-13.18.1-r2-autoconf-2.70.patch" - "${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch" - "${FILESDIR}/${PN}-13.38.2-r2-func_odbc_minargs-ARGC.patch" -) - -DEPEND="acct-user/asterisk - acct-group/asterisk - dev-db/sqlite:3 - dev-libs/popt - dev-libs/jansson:= - dev-libs/libedit - dev-libs/libxml2:2 - dev-libs/libxslt - virtual/libcrypt:= - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - calendar? ( - net-libs/neon:= - dev-libs/libical:= - dev-libs/iksemel - ) - caps? ( sys-libs/libcap ) - blocks? ( sys-libs/blocksruntime ) - cluster? ( sys-cluster/corosync ) - curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) - freetds? ( dev-db/freetds ) - gtalk? ( dev-libs/iksemel ) - http? ( dev-libs/gmime:2.6 ) - iconv? ( virtual/libiconv ) - ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap ) - lua? ( ${LUA_DEPS} ) - mysql? ( dev-db/mysql-connector-c:= ) - newt? ( dev-libs/newt ) - odbc? ( dev-db/unixODBC ) - pjproject? ( net-libs/pjproject:= ) - portaudio? ( media-libs/portaudio ) - postgres? ( dev-db/postgresql:* ) - radius? ( net-dialup/freeradius-client ) - snmp? ( net-analyzer/net-snmp:= ) - span? ( media-libs/spandsp ) - speex? ( - media-libs/speex - media-libs/speexdsp - ) - srtp? ( net-libs/libsrtp:0 ) - ssl? ( - dev-libs/openssl:0= - ) - systemd? ( sys-apps/systemd ) - !systemd? ( !sys-apps/systemd ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - voicemail_storage_imap? ( virtual/imap-c-client ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${DEPEND} - net-misc/asterisk-core-sounds - net-misc/asterisk-extra-sounds - net-misc/asterisk-moh-opsound - selinux? ( sec-policy/selinux-asterisk ) - syslog? ( virtual/logger )" - -BDEPEND="dev-libs/libxml2:2 - virtual/pkgconfig" - -QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" - -_make_args=( - "NOISY_BUILD=yes" - "ASTDBDIR=\$(ASTDATADIR)/astdb" - "ASTVARRUNDIR=/run/asterisk" - "OPTIMIZE=" - "DEBUG=" - "DESTDIR=${D}" - "CONFIG_SRC=configs/samples" - "CONFIG_EXTEN=.sample" -) - -pkg_pretend() { - CONFIG_CHECK="~!NF_CONNTRACK_SIP" - local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users - have reported that this module dropped critical SIP packets in their deployments. You - may want to disable it if you see such problems." - check_extra_config - - [[ "${MERGE_TYPE}" == binary ]] && return - - if tc-is-clang; then - use blocks || die "CC=clang requires USE=blocks" - else - use blocks && die "USE=blocks can only be used with CC=clang" - fi -} - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf -} - -src_configure() { - local vmst - local copt cstate - - econf \ - LUA_VERSION="${ELUA#lua}" \ - --libdir="/usr/$(get_libdir)" \ - --localstatedir="/var" \ - --with-crypto \ - --with-gsm=internal \ - --with-popt \ - --with-z \ - --with-libedit \ - $(use_with caps cap) \ - $(use_with lua lua) \ - $(use_with http gmime) \ - $(use_with newt) \ - $(use_with pjproject) \ - $(use_with portaudio) \ - $(use_with ssl) - - _menuselect() { - menuselect/menuselect "$@" || die "menuselect $* failed." - } - - _use_select() { - local state=$(usex "$1" enable disable) - shift # remove use from parameters - - while [[ -n $1 ]]; do - _menuselect --${state} "$1" menuselect.makeopts - shift - done - } - - # Blank out sounds/sounds.xml file to prevent - # asterisk from installing sounds files (we pull them in via - # asterisk-{core,extra}-sounds and asterisk-moh-opsound. - >"${S}"/sounds/sounds.xml - - # That NATIVE_ARCH chatter really is quite bothersome - sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" - - # Compile menuselect binary for optional components - emake "${_make_args[@]}" menuselect.makeopts - - # Disable BUILD_NATIVE (bug #667498) - _menuselect --disable build_native menuselect.makeopts - - # Broken functionality is forcibly disabled (bug #360143) - _menuselect --disable chan_misdn menuselect.makeopts - _menuselect --disable chan_ooh323 menuselect.makeopts - - # Utility set is forcibly enabled (bug #358001) - _menuselect --enable smsq menuselect.makeopts - _menuselect --enable streamplayer menuselect.makeopts - _menuselect --enable aelparse menuselect.makeopts - _menuselect --enable astman menuselect.makeopts - - # this is connected, otherwise it would not find - # ast_pktccops_gate_alloc symbol - _menuselect --enable chan_mgcp menuselect.makeopts - _menuselect --enable res_pktccops menuselect.makeopts - - # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available - _menuselect --enable pbx_dundi menuselect.makeopts - _menuselect --enable func_aes menuselect.makeopts - _menuselect --enable chan_iax2 menuselect.makeopts - - # SQlite3 is now the main database backend, enable related features - _menuselect --enable cdr_sqlite3_custom menuselect.makeopts - _menuselect --enable cel_sqlite3_custom menuselect.makeopts - - # The others are based on USE-flag settings - _use_select alsa chan_alsa - _use_select bluetooth chan_mobile - _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} - _use_select cluster res_corosync - _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi - _use_select freetds {cdr,cel}_tds - _use_select gtalk chan_motif - _use_select http res_http_post - _use_select iconv func_iconv - _use_select ilbc codec_ilbc format_ilbc - _use_select ldap res_config_ldap - _use_select lua pbx_lua - _use_select mysql app_mysql cdr_mysql res_config_mysql - _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - _use_select oss chan_oss - _use_select postgres {cdr,cel}_pgsql res_config_pgsql - _use_select radius {cdr,cel}_radius - _use_select snmp res_snmp - _use_select span res_fax_spandsp - _use_select speex {codec,func}_speex - _use_select srtp res_srtp - _use_select statsd res_statsd res_{endpoint,chan}_stats - _use_select syslog cdr_syslog - _use_select vorbis format_ogg_vorbis - _use_select xmpp res_xmpp - - # Voicemail storage ... - for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do - if use "${vmst#+}"; then - _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts - fi - done - - if use debug; then - for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do - _menuselect --enable $o menuselect.makeopts - done - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do - cstate=--enable - [[ "${copt}" == -* ]] && cstate=--disable - ebegin "Custom option ${copt#[-+]} ${cstate:2}d" - _menuselect ${cstate} "${copt#[-+]}" - eend $? - done - fi -} - -src_compile() { - emake "${_make_args[@]}" -} - -src_install() { - local d - - dodir "/usr/$(get_libdir)/pkgconfig" - diropts -m 0750 -o root -g asterisk - dodir /etc/asterisk - - emake "${_make_args[@]}" install install-configs - - fowners asterisk: /var/lib/asterisk/astdb - - if use radius; then - insinto /etc/radiusclient/ - doins contrib/dictionary.digium - fi - - # keep directories - diropts -m 0750 -o asterisk -g root - keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording} - diropts -m 0750 -o asterisk -g asterisk - keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - - newinitd "${FILESDIR}"/initd-13.38.3-r2 asterisk - newconfd "${FILESDIR}"/confd-13.32.0 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-13.38.3-r2.conf asterisk.conf - systemd_install_serviced "${FILESDIR}"/asterisk.service.conf - - # Reset diropts else dodoc uses it for doc installations. - diropts -m0755 - - # install the upgrade documentation - dodoc UPGRADE* BUGS CREDITS - - # install extra documentation - use doc && dodoc doc/*.{txt,pdf} - - # install logrotate snippet; bug #329281 - # - insinto /etc/logrotate.d - newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk - - # Asterisk installs a few folders that's empty by design, - # but still required. This finds them, and marks them for - # portage. - while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do - keepdir "${d#${ED}}" - done -} - -pkg_postinst() { - tmpfiles_process asterisk.conf - - if [ -z "${REPLACING_VERSIONS}" ]; then - elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" - elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then - elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" - elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" - ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" - fi - - if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then - ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" - ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" - ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" - ewarn "steps to migrate:" - ewarn "1. /etc/init.d/asterisk stop" - ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" - ewarn "3. /etc/init.d/asterisk start" - ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." - fi -} diff --git a/net-misc/asterisk/asterisk-16.21.1.ebuild b/net-misc/asterisk/asterisk-16.21.1.ebuild deleted file mode 100644 index 236daff8745d..000000000000 --- a/net-misc/asterisk/asterisk-16.21.1.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} ) - -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles - -DESCRIPTION="Asterisk: A Modular Open Source PBX System" -HOMEPAGE="https://www.asterisk.org/" -SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0/${PV%%.*}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -IUSE_VOICEMAIL_STORAGE=( - +voicemail_storage_file - voicemail_storage_odbc - voicemail_storage_imap -) -IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" -IUSE_EXPAND="VOICEMAIL_STORAGE" -REQUIRED_USE="gtalk? ( xmpp ) - lua? ( ${LUA_REQUIRED_USE} ) - ^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} ) - voicemail_storage_odbc? ( odbc ) -" - -PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" -) - -DEPEND="acct-user/asterisk - acct-group/asterisk - dev-db/sqlite:3 - dev-libs/popt - >=dev-libs/jansson-2.11:= - dev-libs/libedit - dev-libs/libxml2:2 - dev-libs/libxslt - sys-apps/util-linux - sys-libs/zlib - virtual/libcrypt:= - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - calendar? ( - net-libs/neon:= - dev-libs/libical:= - dev-libs/iksemel - ) - caps? ( sys-libs/libcap ) - blocks? ( sys-libs/blocksruntime ) - cluster? ( sys-cluster/corosync ) - codec2? ( media-libs/codec2:= ) - curl? ( net-misc/curl ) - dahdi? ( - net-libs/libpri - net-misc/dahdi-tools - ) - freetds? ( dev-db/freetds ) - gtalk? ( dev-libs/iksemel ) - http? ( dev-libs/gmime:2.6 ) - iconv? ( virtual/libiconv ) - ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap ) - lua? ( ${LUA_DEPS} ) - mysql? ( dev-db/mysql-connector-c:= ) - newt? ( dev-libs/newt ) - odbc? ( dev-db/unixODBC ) - pjproject? ( >=net-libs/pjproject-2.9:= ) - portaudio? ( media-libs/portaudio ) - postgres? ( dev-db/postgresql:* ) - radius? ( net-dialup/freeradius-client ) - snmp? ( net-analyzer/net-snmp:= ) - span? ( media-libs/spandsp ) - speex? ( - media-libs/libogg - media-libs/speex - media-libs/speexdsp - ) - srtp? ( net-libs/libsrtp:0 ) - ssl? ( - dev-libs/openssl:0= - ) - systemd? ( sys-apps/systemd ) - !systemd? ( !sys-apps/systemd ) - unbound? ( net-dns/unbound ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - voicemail_storage_imap? ( virtual/imap-c-client ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${DEPEND} - net-misc/asterisk-core-sounds - net-misc/asterisk-extra-sounds - net-misc/asterisk-moh-opsound - selinux? ( sec-policy/selinux-asterisk ) - syslog? ( virtual/logger )" - -BDEPEND="dev-libs/libxml2:2 - virtual/pkgconfig" - -QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" - -_make_args=( - "NOISY_BUILD=yes" - "ASTDBDIR=\$(ASTDATADIR)/astdb" - "ASTCACHEDIR=/var/cache/asterisk" - "OPTIMIZE=" - "DEBUG=" - "DESTDIR=${D}" - "CONFIG_SRC=configs/samples" - "CONFIG_EXTEN=.sample" -) - -pkg_pretend() { - CONFIG_CHECK="~!NF_CONNTRACK_SIP" - local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users - have reported that this module dropped critical SIP packets in their deployments. You - may want to disable it if you see such problems." - check_extra_config - - [[ "${MERGE_TYPE}" == binary ]] && return - - if tc-is-clang; then - use blocks || die "CC=clang requires USE=blocks" - else - use blocks && die "USE=blocks can only be used with CC=clang" - fi -} - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf -} - -src_configure() { - local vmst - local copt cstate - - econf \ - LUA_VERSION="${ELUA#lua}" \ - --libdir="/usr/$(get_libdir)" \ - --localstatedir="/var" \ - --with-crypto \ - --with-gsm=internal \ - --with-popt \ - --with-z \ - --with-libedit \ - --without-jansson-bundled \ - --without-pjproject-bundled \ - $(use_with caps cap) \ - $(use_with codec2) \ - $(use_with lua lua) \ - $(use_with http gmime) \ - $(use_with newt) \ - $(use_with pjproject) \ - $(use_with portaudio) \ - $(use_with ssl) \ - $(use_with unbound) - - _menuselect() { - menuselect/menuselect "$@" || die "menuselect $* failed." - } - - _use_select() { - local state=$(use "$1" && echo enable || echo disable) - shift # remove use from parameters - - while [[ -n $1 ]]; do - _menuselect --${state} "$1" menuselect.makeopts - shift - done - } - - # Blank out sounds/sounds.xml file to prevent - # asterisk from installing sounds files (we pull them in via - # asterisk-{core,extra}-sounds and asterisk-moh-opsound. - >"${S}"/sounds/sounds.xml - - # That NATIVE_ARCH chatter really is quite bothersome - sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" - - # Compile menuselect binary for optional components - emake "${_make_args[@]}" menuselect.makeopts - - # Disable BUILD_NATIVE (bug #667498) - _menuselect --disable build_native menuselect.makeopts - - # Broken functionality is forcibly disabled (bug #360143) - _menuselect --disable chan_misdn menuselect.makeopts - _menuselect --disable chan_ooh323 menuselect.makeopts - - # Utility set is forcibly enabled (bug #358001) - _menuselect --enable smsq menuselect.makeopts - _menuselect --enable streamplayer menuselect.makeopts - _menuselect --enable aelparse menuselect.makeopts - _menuselect --enable astman menuselect.makeopts - - # this is connected, otherwise it would not find - # ast_pktccops_gate_alloc symbol - _menuselect --enable chan_mgcp menuselect.makeopts - _menuselect --enable res_pktccops menuselect.makeopts - - # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available - _menuselect --enable pbx_dundi menuselect.makeopts - _menuselect --enable func_aes menuselect.makeopts - _menuselect --enable chan_iax2 menuselect.makeopts - - # SQlite3 is now the main database backend, enable related features - _menuselect --enable cdr_sqlite3_custom menuselect.makeopts - _menuselect --enable cel_sqlite3_custom menuselect.makeopts - - # The others are based on USE-flag settings - _use_select alsa chan_alsa - _use_select bluetooth chan_mobile - _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} - _use_select cluster res_corosync - _use_select codec2 codec_codec2 - _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi - _use_select deprecated app_macro - _use_select freetds {cdr,cel}_tds - _use_select gtalk chan_motif - _use_select http res_http_post - _use_select iconv func_iconv - _use_select ilbc codec_ilbc format_ilbc - _use_select ldap res_config_ldap - _use_select lua pbx_lua - _use_select mysql app_mysql cdr_mysql res_config_mysql - _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - _use_select oss chan_oss - _use_select postgres {cdr,cel}_pgsql res_config_pgsql - _use_select radius {cdr,cel}_radius - _use_select snmp res_snmp - _use_select span res_fax_spandsp - _use_select speex {codec,func}_speex - _use_select speex format_ogg_speex - _use_select srtp res_srtp - _use_select statsd res_statsd res_{endpoint,chan}_stats - _use_select syslog cdr_syslog - _use_select vorbis format_ogg_vorbis - _use_select xmpp res_xmpp - - # Voicemail storage ... - for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do - if use "${vmst#+}"; then - _menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts - fi - done - - if use debug; then - for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do - _menuselect --enable "${o}" menuselect.makeopts - done - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do - cstate=--enable - [[ "${copt}" == -* ]] && cstate=--disable - ebegin "Custom option ${copt#[-+]} ${cstate:2}d" - _menuselect ${cstate} "${copt#[-+]}" - eend $? - done - fi -} - -src_compile() { - emake "${_make_args[@]}" -} - -src_install() { - local d - - dodir "/usr/$(get_libdir)/pkgconfig" - - diropts -m 0750 -o root -g asterisk - dodir /etc/asterisk - - emake "${_make_args[@]}" install install-configs - - fowners asterisk: /var/lib/asterisk/astdb - - if use radius; then - insinto /etc/radiusclient/ - doins contrib/dictionary.digium - fi - - # keep directories - diropts -m 0750 -o asterisk -g root - keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} - diropts -m 0750 -o asterisk -g asterisk - keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - - newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk - newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf - systemd_install_serviced "${FILESDIR}"/asterisk.service.conf - - # Reset diropts else dodoc uses it for doc installations. - diropts -m0755 - - # install the upgrade documentation - dodoc UPGRADE* BUGS CREDITS - - # install extra documentation - use doc && dodoc doc/*.{txt,pdf} - - # install logrotate snippet; bug #329281 - # - insinto /etc/logrotate.d - newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk - - # Asterisk installs a few folders that's empty by design, - # but still required. This finds them, and marks them for - # portage. - while read d <&3; do - keepdir "${d#${ED}}" - done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") -} - -pkg_postinst() { - tmpfiles_process asterisk.conf - - if [ -z "${REPLACING_VERSIONS}" ]; then - elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" - elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then - elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" - elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" - fi - - if use deprecated; then - ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." - ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" - fi - - if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then - ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" - ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" - fi - - if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then - ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" - ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" - ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" - ewarn "steps to migrate:" - ewarn "1. /etc/init.d/asterisk stop" - ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" - ewarn "3. /etc/init.d/asterisk start" - ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." - fi -} diff --git a/net-misc/asterisk/asterisk-16.22.0.ebuild b/net-misc/asterisk/asterisk-16.30.0.ebuild index 735b5ef050f6..a684412a9be4 100644 --- a/net-misc/asterisk/asterisk-16.22.0.ebuild +++ b/net-misc/asterisk/asterisk-16.30.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} ) @@ -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 @@ -28,7 +28,8 @@ REQUIRED_USE="gtalk? ( xmpp ) " PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-16.29.1_18.15.1_20.0.1-noexec_stack.patch" ) DEPEND="acct-user/asterisk @@ -63,7 +64,7 @@ DEPEND="acct-user/asterisk http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) lua? ( ${LUA_DEPS} ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) @@ -90,7 +91,7 @@ DEPEND="acct-user/asterisk media-libs/libogg media-libs/libvorbis ) - voicemail_storage_imap? ( virtual/imap-c-client ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel ) " @@ -140,7 +141,8 @@ pkg_setup() { src_prepare() { default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf } src_configure() { @@ -148,6 +150,7 @@ src_configure() { local copt cstate econf \ + SED=sed \ LUA_VERSION="${ELUA#lua}" \ --libdir="/usr/$(get_libdir)" \ --localstatedir="/var" \ @@ -193,6 +196,11 @@ src_configure() { # Compile menuselect binary for optional components emake "${_make_args[@]}" menuselect.makeopts + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + # Disable BUILD_NATIVE (bug #667498) _menuselect --disable build_native menuselect.makeopts @@ -220,6 +228,9 @@ src_configure() { _menuselect --enable cdr_sqlite3_custom menuselect.makeopts _menuselect --enable cel_sqlite3_custom menuselect.makeopts + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -302,8 +313,9 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newinitd "${FILESDIR}"/initd-16.22.0-18.8.0 asterisk - newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk + newsbin "${FILESDIR}/asterisk_wrapper-16.26.1-18.12.1" asterisk_wrapper + newinitd "${FILESDIR}"/initd-16.26.1-18.12.1 asterisk + newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk systemd_dounit "${FILESDIR}"/asterisk.service newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf diff --git a/net-misc/asterisk/asterisk-16.20.0-r1.ebuild b/net-misc/asterisk/asterisk-16.30.1-r1.ebuild index a1a9536e12ed..e396518bc948 100644 --- a/net-misc/asterisk/asterisk-16.20.0-r1.ebuild +++ b/net-misc/asterisk/asterisk-16.30.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles +inherit autotools linux-info lua-single toolchain-funcs DESCRIPTION="Asterisk: A Modular Open Source PBX System" HOMEPAGE="https://www.asterisk.org/" @@ -28,7 +28,9 @@ REQUIRED_USE="gtalk? ( xmpp ) " PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-16.29.1_18.15.1_20.0.1-noexec_stack.patch" + "${FILESDIR}/asterisk-16.30.1-r1-iax2_jitterbuffer.patch" ) DEPEND="acct-user/asterisk @@ -63,7 +65,7 @@ DEPEND="acct-user/asterisk http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) lua? ( ${LUA_DEPS} ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) @@ -90,7 +92,7 @@ DEPEND="acct-user/asterisk media-libs/libogg media-libs/libvorbis ) - voicemail_storage_imap? ( virtual/imap-c-client ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel ) " @@ -100,6 +102,7 @@ RDEPEND="${DEPEND} net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )" +PDEPEND="net-misc/asterisk-base" BDEPEND="dev-libs/libxml2:2 virtual/pkgconfig" @@ -109,6 +112,7 @@ QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" _make_args=( "NOISY_BUILD=yes" "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" "ASTCACHEDIR=/var/cache/asterisk" "OPTIMIZE=" "DEBUG=" @@ -139,7 +143,8 @@ pkg_setup() { src_prepare() { default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf } src_configure() { @@ -147,6 +152,7 @@ src_configure() { local copt cstate econf \ + SED=sed \ LUA_VERSION="${ELUA#lua}" \ --libdir="/usr/$(get_libdir)" \ --localstatedir="/var" \ @@ -192,6 +198,11 @@ src_configure() { # Compile menuselect binary for optional components emake "${_make_args[@]}" menuselect.makeopts + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + # Disable BUILD_NATIVE (bug #667498) _menuselect --disable build_native menuselect.makeopts @@ -219,6 +230,9 @@ src_configure() { _menuselect --enable cdr_sqlite3_custom menuselect.makeopts _menuselect --enable cel_sqlite3_custom menuselect.makeopts + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -301,13 +315,6 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk - newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf - systemd_install_serviced "${FILESDIR}"/asterisk.service.conf - # Reset diropts else dodoc uses it for doc installations. diropts -m0755 @@ -317,11 +324,6 @@ src_install() { # install extra documentation use doc && dodoc doc/*.{txt,pdf} - # install logrotate snippet; bug #329281 - # - insinto /etc/logrotate.d - newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk - # Asterisk installs a few folders that's empty by design, # but still required. This finds them, and marks them for # portage. @@ -331,8 +333,6 @@ src_install() { } pkg_postinst() { - tmpfiles_process asterisk.conf - if [ -z "${REPLACING_VERSIONS}" ]; then elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" diff --git a/net-misc/asterisk/asterisk-16.19.1-r1.ebuild b/net-misc/asterisk/asterisk-16.30.1.ebuild index a1a9536e12ed..b2a0d086ac1e 100644 --- a/net-misc/asterisk/asterisk-16.19.1-r1.ebuild +++ b/net-misc/asterisk/asterisk-16.30.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles +inherit autotools linux-info lua-single toolchain-funcs DESCRIPTION="Asterisk: A Modular Open Source PBX System" HOMEPAGE="https://www.asterisk.org/" @@ -28,7 +28,8 @@ REQUIRED_USE="gtalk? ( xmpp ) " PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-16.29.1_18.15.1_20.0.1-noexec_stack.patch" ) DEPEND="acct-user/asterisk @@ -63,7 +64,7 @@ DEPEND="acct-user/asterisk http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) lua? ( ${LUA_DEPS} ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) @@ -90,7 +91,7 @@ DEPEND="acct-user/asterisk media-libs/libogg media-libs/libvorbis ) - voicemail_storage_imap? ( virtual/imap-c-client ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel ) " @@ -100,6 +101,7 @@ RDEPEND="${DEPEND} net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )" +PDEPEND="net-misc/asterisk-base" BDEPEND="dev-libs/libxml2:2 virtual/pkgconfig" @@ -109,6 +111,7 @@ QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" _make_args=( "NOISY_BUILD=yes" "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" "ASTCACHEDIR=/var/cache/asterisk" "OPTIMIZE=" "DEBUG=" @@ -139,7 +142,8 @@ pkg_setup() { src_prepare() { default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf } src_configure() { @@ -147,6 +151,7 @@ src_configure() { local copt cstate econf \ + SED=sed \ LUA_VERSION="${ELUA#lua}" \ --libdir="/usr/$(get_libdir)" \ --localstatedir="/var" \ @@ -192,6 +197,11 @@ src_configure() { # Compile menuselect binary for optional components emake "${_make_args[@]}" menuselect.makeopts + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + # Disable BUILD_NATIVE (bug #667498) _menuselect --disable build_native menuselect.makeopts @@ -219,6 +229,9 @@ src_configure() { _menuselect --enable cdr_sqlite3_custom menuselect.makeopts _menuselect --enable cel_sqlite3_custom menuselect.makeopts + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -301,13 +314,6 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk - newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf - systemd_install_serviced "${FILESDIR}"/asterisk.service.conf - # Reset diropts else dodoc uses it for doc installations. diropts -m0755 @@ -317,11 +323,6 @@ src_install() { # install extra documentation use doc && dodoc doc/*.{txt,pdf} - # install logrotate snippet; bug #329281 - # - insinto /etc/logrotate.d - newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk - # Asterisk installs a few folders that's empty by design, # but still required. This finds them, and marks them for # portage. @@ -331,8 +332,6 @@ src_install() { } pkg_postinst() { - tmpfiles_process asterisk.conf - if [ -z "${REPLACING_VERSIONS}" ]; then elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" diff --git a/net-misc/asterisk/asterisk-18.5.1-r1.ebuild b/net-misc/asterisk/asterisk-18.17.0.ebuild index 456bc7d82990..015737c8a097 100644 --- a/net-misc/asterisk/asterisk-18.5.1-r1.ebuild +++ b/net-misc/asterisk/asterisk-18.17.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} ) @@ -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_odbc @@ -26,7 +26,7 @@ REQUIRED_USE="gtalk? ( xmpp ) " PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" ) DEPEND="acct-user/asterisk @@ -61,12 +61,12 @@ DEPEND="acct-user/asterisk http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) lua? ( ${LUA_DEPS} ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) - pjproject? ( >=net-libs/pjproject-2.9:= ) + pjproject? ( >=net-libs/pjproject-2.12:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) @@ -88,7 +88,7 @@ DEPEND="acct-user/asterisk media-libs/libogg media-libs/libvorbis ) - voicemail_storage_imap? ( virtual/imap-c-client ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel ) " @@ -107,6 +107,7 @@ QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" _make_args=( "NOISY_BUILD=yes" "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" "ASTCACHEDIR=/var/cache/asterisk" "OPTIMIZE=" "DEBUG=" @@ -137,7 +138,8 @@ pkg_setup() { src_prepare() { default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf } src_configure() { @@ -190,6 +192,11 @@ src_configure() { # Compile menuselect binary for optional components emake "${_make_args[@]}" menuselect.makeopts + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + # Disable BUILD_NATIVE (bug #667498) _menuselect --disable build_native menuselect.makeopts @@ -217,6 +224,9 @@ src_configure() { _menuselect --enable cdr_sqlite3_custom menuselect.makeopts _menuselect --enable cel_sqlite3_custom menuselect.makeopts + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -300,11 +310,12 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk - newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk + newsbin "${FILESDIR}/asterisk_wrapper-16.26.1-18.12.1" asterisk_wrapper + newinitd "${FILESDIR}"/initd-16.26.1-18.12.1 asterisk + newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf + newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf systemd_install_serviced "${FILESDIR}"/asterisk.service.conf # Reset diropts else dodoc uses it for doc installations. diff --git a/net-misc/asterisk/asterisk-18.18.0.ebuild b/net-misc/asterisk/asterisk-18.18.0.ebuild new file mode 100644 index 000000000000..b2e2fa41bd6b --- /dev/null +++ b/net-misc/asterisk/asterisk-18.18.0.ebuild @@ -0,0 +1,377 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk ) + syslog? ( virtual/logger )" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_misdn menuselect.makeopts + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select deprecated app_macro + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql app_mysql cdr_mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select oss chan_oss + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select syslog cdr_syslog + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + newsbin "${FILESDIR}/asterisk_wrapper-18.17.1-20.2.1" asterisk_wrapper + newinitd "${FILESDIR}"/initd-18.17.1-20.2.1 asterisk + newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk + + systemd_dounit "${FILESDIR}"/asterisk.service + newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf + systemd_install_serviced "${FILESDIR}"/asterisk.service.conf + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # install logrotate snippet; bug #329281 + # + insinto /etc/logrotate.d + newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + tmpfiles_process asterisk.conf + + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if use deprecated; then + ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." + ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/asterisk-18.7.1.ebuild b/net-misc/asterisk/asterisk-18.18.1.ebuild index 456bc7d82990..3f4247463485 100644 --- a/net-misc/asterisk/asterisk-18.7.1.ebuild +++ b/net-misc/asterisk/asterisk-18.18.1.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles +inherit autotools linux-info lua-single toolchain-funcs DESCRIPTION="Asterisk: A Modular Open Source PBX System" HOMEPAGE="https://www.asterisk.org/" SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/${PV%%.*}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE_VOICEMAIL_STORAGE=( voicemail_storage_odbc @@ -26,7 +26,8 @@ REQUIRED_USE="gtalk? ( xmpp ) " PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch" ) DEPEND="acct-user/asterisk @@ -61,12 +62,12 @@ DEPEND="acct-user/asterisk http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) lua? ( ${LUA_DEPS} ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) - pjproject? ( >=net-libs/pjproject-2.9:= ) + pjproject? ( >=net-libs/pjproject-2.12:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) @@ -88,7 +89,7 @@ DEPEND="acct-user/asterisk media-libs/libogg media-libs/libvorbis ) - voicemail_storage_imap? ( virtual/imap-c-client ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel ) " @@ -98,6 +99,7 @@ RDEPEND="${DEPEND} net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )" +PDEPEND="net-misc/asterisk-base" BDEPEND="dev-libs/libxml2:2 virtual/pkgconfig" @@ -107,12 +109,14 @@ QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" _make_args=( "NOISY_BUILD=yes" "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" "ASTCACHEDIR=/var/cache/asterisk" "OPTIMIZE=" "DEBUG=" "DESTDIR=${D}" "CONFIG_SRC=configs/samples" "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" ) pkg_pretend() { @@ -137,7 +141,8 @@ pkg_setup() { src_prepare() { default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf } src_configure() { @@ -190,6 +195,11 @@ src_configure() { # Compile menuselect binary for optional components emake "${_make_args[@]}" menuselect.makeopts + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + # Disable BUILD_NATIVE (bug #667498) _menuselect --disable build_native menuselect.makeopts @@ -217,6 +227,9 @@ src_configure() { _menuselect --enable cdr_sqlite3_custom menuselect.makeopts _menuselect --enable cel_sqlite3_custom menuselect.makeopts + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -300,13 +313,6 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk - newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf - systemd_install_serviced "${FILESDIR}"/asterisk.service.conf - # Reset diropts else dodoc uses it for doc installations. diropts -m0755 @@ -316,11 +322,6 @@ src_install() { # install extra documentation use doc && dodoc doc/*.{txt,pdf} - # install logrotate snippet; bug #329281 - # - insinto /etc/logrotate.d - newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk - # Asterisk installs a few folders that's empty by design, # but still required. This finds them, and marks them for # portage. @@ -330,8 +331,6 @@ src_install() { } pkg_postinst() { - tmpfiles_process asterisk.conf - if [ -z "${REPLACING_VERSIONS}" ]; then elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" diff --git a/net-misc/asterisk/asterisk-18.8.0.ebuild b/net-misc/asterisk/asterisk-18.20.2.ebuild index 11d956599705..a16cf2d20212 100644 --- a/net-misc/asterisk/asterisk-18.8.0.ebuild +++ b/net-misc/asterisk/asterisk-18.20.2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles +inherit autotools linux-info lua-single toolchain-funcs DESCRIPTION="Asterisk: A Modular Open Source PBX System" HOMEPAGE="https://www.asterisk.org/" @@ -26,7 +26,7 @@ REQUIRED_USE="gtalk? ( xmpp ) " PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" ) DEPEND="acct-user/asterisk @@ -61,12 +61,12 @@ DEPEND="acct-user/asterisk http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) lua? ( ${LUA_DEPS} ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) - pjproject? ( >=net-libs/pjproject-2.9:= ) + pjproject? ( >=net-libs/pjproject-2.12:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) @@ -88,7 +88,7 @@ DEPEND="acct-user/asterisk media-libs/libogg media-libs/libvorbis ) - voicemail_storage_imap? ( virtual/imap-c-client ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel ) " @@ -98,6 +98,7 @@ RDEPEND="${DEPEND} net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )" +PDEPEND="net-misc/asterisk-base" BDEPEND="dev-libs/libxml2:2 virtual/pkgconfig" @@ -114,6 +115,7 @@ _make_args=( "DESTDIR=${D}" "CONFIG_SRC=configs/samples" "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" ) pkg_pretend() { @@ -138,7 +140,8 @@ pkg_setup() { src_prepare() { default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf } src_configure() { @@ -191,6 +194,11 @@ src_configure() { # Compile menuselect binary for optional components emake "${_make_args[@]}" menuselect.makeopts + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + # Disable BUILD_NATIVE (bug #667498) _menuselect --disable build_native menuselect.makeopts @@ -218,6 +226,9 @@ src_configure() { _menuselect --enable cdr_sqlite3_custom menuselect.makeopts _menuselect --enable cel_sqlite3_custom menuselect.makeopts + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -301,13 +312,6 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newinitd "${FILESDIR}"/initd-16.22.0-18.8.0 asterisk - newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf - systemd_install_serviced "${FILESDIR}"/asterisk.service.conf - # Reset diropts else dodoc uses it for doc installations. diropts -m0755 @@ -317,11 +321,6 @@ src_install() { # install extra documentation use doc && dodoc doc/*.{txt,pdf} - # install logrotate snippet; bug #329281 - # - insinto /etc/logrotate.d - newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk - # Asterisk installs a few folders that's empty by design, # but still required. This finds them, and marks them for # portage. @@ -331,8 +330,6 @@ src_install() { } pkg_postinst() { - tmpfiles_process asterisk.conf - if [ -z "${REPLACING_VERSIONS}" ]; then elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" diff --git a/net-misc/asterisk/asterisk-18.6.0-r1.ebuild b/net-misc/asterisk/asterisk-18.21.0.ebuild index 22c24bf0800f..1d3b1fdda21d 100644 --- a/net-misc/asterisk/asterisk-18.6.0-r1.ebuild +++ b/net-misc/asterisk/asterisk-18.21.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles +inherit autotools linux-info lua-single toolchain-funcs DESCRIPTION="Asterisk: A Modular Open Source PBX System" HOMEPAGE="https://www.asterisk.org/" @@ -26,7 +26,7 @@ REQUIRED_USE="gtalk? ( xmpp ) " PATCHES=( - "${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" ) DEPEND="acct-user/asterisk @@ -61,12 +61,12 @@ DEPEND="acct-user/asterisk http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) lua? ( ${LUA_DEPS} ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) - pjproject? ( >=net-libs/pjproject-2.9:= ) + pjproject? ( >=net-libs/pjproject-2.12:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) @@ -88,7 +88,7 @@ DEPEND="acct-user/asterisk media-libs/libogg media-libs/libvorbis ) - voicemail_storage_imap? ( virtual/imap-c-client ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) xmpp? ( dev-libs/iksemel ) " @@ -98,6 +98,7 @@ RDEPEND="${DEPEND} net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )" +PDEPEND="net-misc/asterisk-base" BDEPEND="dev-libs/libxml2:2 virtual/pkgconfig" @@ -107,12 +108,14 @@ QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" _make_args=( "NOISY_BUILD=yes" "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" "ASTCACHEDIR=/var/cache/asterisk" "OPTIMIZE=" "DEBUG=" "DESTDIR=${D}" "CONFIG_SRC=configs/samples" "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" ) pkg_pretend() { @@ -137,7 +140,8 @@ pkg_setup() { src_prepare() { default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf } src_configure() { @@ -190,6 +194,11 @@ src_configure() { # Compile menuselect binary for optional components emake "${_make_args[@]}" menuselect.makeopts + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + # Disable BUILD_NATIVE (bug #667498) _menuselect --disable build_native menuselect.makeopts @@ -217,6 +226,9 @@ src_configure() { _menuselect --enable cdr_sqlite3_custom menuselect.makeopts _menuselect --enable cel_sqlite3_custom menuselect.makeopts + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + # The others are based on USE-flag settings _use_select alsa chan_alsa _use_select bluetooth chan_mobile @@ -300,27 +312,15 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk - newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf - systemd_install_serviced "${FILESDIR}"/asterisk.service.conf - # Reset diropts else dodoc uses it for doc installations. diropts -m0755 # install the upgrade documentation - dodoc UPGRADE* BUGS CREDITS + dodoc README* BUGS CREDITS # install extra documentation use doc && dodoc doc/*.{txt,pdf} - # install logrotate snippet; bug #329281 - # - insinto /etc/logrotate.d - newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk - # Asterisk installs a few folders that's empty by design, # but still required. This finds them, and marks them for # portage. @@ -330,8 +330,6 @@ src_install() { } pkg_postinst() { - tmpfiles_process asterisk.conf - if [ -z "${REPLACING_VERSIONS}" ]; then elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" diff --git a/net-misc/asterisk/asterisk-20.3.0.ebuild b/net-misc/asterisk/asterisk-20.3.0.ebuild new file mode 100644 index 000000000000..e4e12e12fba8 --- /dev/null +++ b/net-misc/asterisk/asterisk-20.3.0.ebuild @@ -0,0 +1,373 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk )" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select deprecated app_macro chan_sip res_monitor + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + newsbin "${FILESDIR}/asterisk_wrapper-18.17.1-20.2.1" asterisk_wrapper + newinitd "${FILESDIR}"/initd-18.17.1-20.2.1 asterisk + newconfd "${FILESDIR}"/confd-16.26.1-18.12.1 asterisk + + systemd_dounit "${FILESDIR}"/asterisk.service + newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf + systemd_install_serviced "${FILESDIR}"/asterisk.service.conf + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # install logrotate snippet; bug #329281 + # + insinto /etc/logrotate.d + newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + tmpfiles_process asterisk.conf + + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if use deprecated; then + ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." + ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/asterisk-20.3.1.ebuild b/net-misc/asterisk/asterisk-20.3.1.ebuild new file mode 100644 index 000000000000..080afa1dc8ea --- /dev/null +++ b/net-misc/asterisk/asterisk-20.3.1.ebuild @@ -0,0 +1,359 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" + "${FILESDIR}/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select deprecated app_macro chan_sip res_monitor + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if use deprecated; then + ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." + ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/asterisk-20.5.2.ebuild b/net-misc/asterisk/asterisk-20.5.2.ebuild new file mode 100644 index 000000000000..53593c91aac6 --- /dev/null +++ b/net-misc/asterisk/asterisk-20.5.2.ebuild @@ -0,0 +1,358 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select deprecated app_macro chan_sip res_monitor + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if use deprecated; then + ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." + ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/asterisk-20.6.0.ebuild b/net-misc/asterisk/asterisk-20.6.0.ebuild new file mode 100644 index 000000000000..020f846fa16f --- /dev/null +++ b/net-misc/asterisk/asterisk-20.6.0.ebuild @@ -0,0 +1,357 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select deprecated app_macro chan_sip res_monitor + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + dodoc README* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if use deprecated; then + ewarn "You really aught to port whatever code you have that depends on this since these are going to go away." + ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/asterisk-21.0.2.ebuild b/net-misc/asterisk/asterisk-21.0.2.ebuild new file mode 100644 index 000000000000..b4ed5f80b54c --- /dev/null +++ b/net-misc/asterisk/asterisk-21.0.2.ebuild @@ -0,0 +1,345 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/asterisk-21.1.0.ebuild b/net-misc/asterisk/asterisk-21.1.0.ebuild new file mode 100644 index 000000000000..53ef3dcce988 --- /dev/null +++ b/net-misc/asterisk/asterisk-21.1.0.ebuild @@ -0,0 +1,344 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} ) + +inherit autotools linux-info lua-single toolchain-funcs + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0/${PV%%.*}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE_VOICEMAIL_STORAGE=( + voicemail_storage_odbc + voicemail_storage_imap +) +IUSE="${IUSE_VOICEMAIL_STORAGE[*]} blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd systemd unbound vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + lua? ( ${LUA_REQUIRED_USE} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/asterisk-16.16.2-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + >=dev-libs/jansson-2.11:= + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-apps/util-linux + sys-libs/zlib + virtual/libcrypt:= + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + blocks? ( sys-libs/blocksruntime ) + cluster? ( sys-cluster/corosync ) + codec2? ( media-libs/codec2:= ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap:= ) + lua? ( ${LUA_DEPS} ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( >=net-libs/pjproject-2.12:= ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/libogg + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + !systemd? ( !sys-apps/systemd ) + unbound? ( net-dns/unbound ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + voicemail_storage_imap? ( net-libs/c-client[ssl=] ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk )" +PDEPEND="net-misc/asterisk-base" + +BDEPEND="dev-libs/libxml2:2 + virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +_make_args=( + "NOISY_BUILD=yes" + "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" + "ASTCACHEDIR=/var/cache/asterisk" + "OPTIMIZE=" + "DEBUG=" + "DESTDIR=${D}" + "CONFIG_SRC=configs/samples" + "CONFIG_EXTEN=.sample" + "AST_FORTIFY_SOURCE=" +) + +pkg_pretend() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config + + [[ "${MERGE_TYPE}" == binary ]] && return + + if tc-is-clang; then + use blocks || die "CC=clang requires USE=blocks" + else + use blocks && die "USE=blocks can only be used with CC=clang" + fi +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson third-party/libjwt" \ + AC_CONFIG_SUBDIRS=menuselect eautoreconf +} + +src_configure() { + local vmst + local copt cstate + + econf \ + LUA_VERSION="${ELUA#lua}" \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + --without-jansson-bundled \ + --without-pjproject-bundled \ + $(use_with caps cap) \ + $(use_with codec2) \ + $(use_with lua lua) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) \ + $(use_with unbound) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake "${_make_args[@]}" menuselect.makeopts + + # Disable astdb2* tools. We've been on sqlite long enough + # that this should really no longer be a problem (bug #https://bugs.gentoo.org/872194) + _menuselect --disable astdb2sqlite3 menuselect.makeopts + _menuselect --disable astdb2bdb menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # Disable conversion tools (which fails to compile in some cases). + _menuselect --disable astdb2bdb menuselect.makeopts + + # The others are based on USE-flag settings + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select codec2 codec_codec2 + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select speex format_ogg_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + _menuselect --enable app_voicemail menuselect.makeopts + for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do + if use "${vmst#+}"; then + _menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do + _menuselect --enable "${o}" menuselect.makeopts + done + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do + cstate=--enable + [[ "${copt}" == -* ]] && cstate=--disable + ebegin "Custom option ${copt#[-+]} ${cstate:2}d" + _menuselect ${cstate} "${copt#[-+]}" + eend $? + done + fi +} + +src_compile() { + emake "${_make_args[@]}" +} + +src_install() { + local d + + dodir "/usr/$(get_libdir)/pkgconfig" + + diropts -m 0750 -o root -g asterisk + dodir /etc/asterisk + + emake "${_make_args[@]}" install install-headers install-configs + + fowners asterisk: /var/lib/asterisk/astdb + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + dodoc README* BUGS CREDITS + + # install extra documentation + use doc && dodoc doc/*.{txt,pdf} + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + while read d <&3; do + keepdir "${d#${ED}}" + done 3< <(find "${ED}"/var -type d -empty || die "Find failed.") +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat" + fi + + if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then + ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used" + ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org" + fi + + if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then + ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb" + ewarn "You still have a /var/lib/asterisk/astdb.sqlite file. You need to either set" + ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these" + ewarn "steps to migrate:" + ewarn "1. /etc/init.d/asterisk stop" + ewarn "2. mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/" + ewarn "3. /etc/init.d/asterisk start" + ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned." + fi +} diff --git a/net-misc/asterisk/files/asterisk-13.18.1-r2-autoconf-2.70.patch b/net-misc/asterisk/files/asterisk-13.18.1-r2-autoconf-2.70.patch deleted file mode 100644 index 68a5604757b2..000000000000 --- a/net-misc/asterisk/files/asterisk-13.18.1-r2-autoconf-2.70.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- asterisk-13.38.1/configure.ac.o 2021-01-08 18:33:41.360112920 +0200 -+++ asterisk-13.38.1/configure.ac 2021-01-08 18:38:26.649995123 +0200 -@@ -605,7 +605,6 @@ - - AC_FUNC_ALLOCA - AC_HEADER_DIRENT --AC_HEADER_STDC - AC_HEADER_SYS_WAIT - AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/event.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/types.h syslog.h termios.h unistd.h utime.h arpa/nameser.h sys/io.h]) - diff --git a/net-misc/asterisk/files/asterisk-13.38.1-r1-autoconf-lua-version.patch b/net-misc/asterisk/files/asterisk-13.38.1-r1-autoconf-lua-version.patch deleted file mode 100644 index 00a922ce0738..000000000000 --- a/net-misc/asterisk/files/asterisk-13.38.1-r1-autoconf-lua-version.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 61ef1a71e312f846b08ec4307c449f03907610a6 Mon Sep 17 00:00:00 2001 -From: Jaco Kroon <jaco@uls.co.za> -Date: Wed, 23 Dec 2020 19:41:10 +0200 -Subject: [PATCH] pbx_lua: Add LUA_VERSION environment variable to - ./configure. - -On Gentoo it's possible to have multiple lua versions installed, all -with a path of /usr, so it's not possible to use the current --with-lua -option to determisticly pin to a specific version as is required by the -Gentoo PMS standards. - -This environment variable allows to lock to specific versions, -unversioned check will be skipped if this variable is supplied. - -Change-Id: I8c403eda05df25ee0193960262ce849c7d2fd088 -Signed-off-by: Jaco Kroon <jaco@uls.co.za> ---- - configure | 7 ++++++- - configure.ac | 7 +++++-- - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 64a0a5ace5..b380759b2b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -511,6 +511,7 @@ AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2]) - AST_EXT_LIB_SETUP([LIBXSLT], [LibXSLT], [libxslt]) - AST_EXT_LIB_SETUP_OPTIONAL([LIBXSLT_CLEANUP], [LibXSLT Library Cleanup Function], [LIBXSLT], [libxslt]) - AST_EXT_LIB_SETUP([LUA], [Lua], [lua]) -+AC_ARG_VAR([LUA_VERSION],[A space separated list of target lua versions to test.]) - AST_EXT_LIB_SETUP([MISDN], [mISDN user], [misdn]) - AST_EXT_LIB_SETUP([MYSQLCLIENT], [MySQL client], [mysqlclient]) - AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs]) -@@ -2559,7 +2560,7 @@ if test -z "$__opus_include" -o x"$__opus_include" = x" " ; then - fi - AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include]) - --for ver in 5.4 5.3 5.2 5.1; do -+for ver in ${LUA_VERSION:-5.4 5.3 5.2 5.1}; do - AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm]) - if test "x${PBX_LUA}" = "x1" ; then - if test x"${LUA_DIR}" = x; then -@@ -2572,7 +2573,9 @@ for ver in 5.4 5.3 5.2 5.1; do - done - - # Some distributions (like openSUSE and NetBSD) remove the 5.x suffix. --AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm]) -+if test "x${LUA_VERSION}" = "x"; then -+ AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm]) -+fi - - # Accept either RADIUS client library, their APIs are fully compatible, - # just different header filenames and different SONAMEs --- -2.26.2 - diff --git a/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch b/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch deleted file mode 100644 index 90c97e9df5e3..000000000000 --- a/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 840eaa67e1ee0d10aa6bfb1e34659efa3095b772 Mon Sep 17 00:00:00 2001 -From: Jaco Kroon <jaco@uls.co.za> -Date: Sat, 13 Mar 2021 13:01:50 +0200 -Subject: [PATCH] menuselect: exit non-zero in case of failure on - --enable|disable options. - -Change-Id: I77e3466435f5a51a57538b29addb68d811af238d -Signed-off-by: Jaco Kroon <jaco@uls.co.za> ---- - menuselect/menuselect.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/menuselect/menuselect.c b/menuselect/menuselect.c -index 2eea3f09eb..adb6fa1777 100644 ---- a/menuselect/menuselect.c -+++ b/menuselect/menuselect.c -@@ -2090,6 +2090,7 @@ int main(int argc, char *argv[]) - /* Reset options processing */ - option_index = 0; - optind = 1; -+ res = 0; - - while ((c = getopt_long(argc, argv, "", long_options, &option_index)) != -1) { - print_debug("Got option %c\n", c); -@@ -2100,6 +2101,7 @@ int main(int argc, char *argv[]) - set_member_enabled(mem); - } else { - fprintf(stderr, "'%s' not found\n", optarg); -+ res = 1; - } - } - break; -@@ -2109,6 +2111,7 @@ int main(int argc, char *argv[]) - set_all(cat, 1); - } else { - fprintf(stderr, "'%s' not found\n", optarg); -+ res = 1; - } - } - break; -@@ -2123,6 +2126,7 @@ int main(int argc, char *argv[]) - clear_member_enabled(mem); - } else { - fprintf(stderr, "'%s' not found\n", optarg); -+ res = 1; - } - } - break; -@@ -2132,6 +2136,7 @@ int main(int argc, char *argv[]) - set_all(cat, 0); - } else { - fprintf(stderr, "'%s' not found\n", optarg); -+ res = 1; - } - } - break; -@@ -2146,7 +2151,6 @@ int main(int argc, char *argv[]) - break; - } - } -- res = 0; - } - - if (!res) { --- -2.26.2 - diff --git a/net-misc/asterisk/files/asterisk-13.38.2-r2-func_odbc_minargs-ARGC.patch b/net-misc/asterisk/files/asterisk-13.38.2-r2-func_odbc_minargs-ARGC.patch deleted file mode 100644 index db3817b5242b..000000000000 --- a/net-misc/asterisk/files/asterisk-13.38.2-r2-func_odbc_minargs-ARGC.patch +++ /dev/null @@ -1,180 +0,0 @@ -From d847f7e8f8736e5f51fd11df2992fac87131c1d8 Mon Sep 17 00:00:00 2001 -From: Jaco Kroon <jaco@uls.co.za> -Date: Wed, 17 Feb 2021 22:51:17 +0200 -Subject: [PATCH] func_odbc: Introduce minargs config and expose ARGC in - addition to ARGn. - -minargs enables enforcing of minimum count of arguments to pass to -func_odbc, so if you're unconditionally using ARG1 through ARG4 then -this should be set to 4. func_odbc will generate an error in this case, -so for example - -[FOO] -minargs = 4 - -and ODBC_FOO(a,b,c) in dialplan will now error out instead of using a -potentially leaked ARG4 from Gosub(). - -ARGC is needed if you're using optional argument, to verify whether or -not an argument has been passed, else it's possible to use a leaked ARGn -from Gosub (app_stack). So now you can safely do -${IF($[${ARGC}>3]?${ARGV}:default value)} kind of thing. - -Change-Id: I6ca0b137d90b03f6aa9c496991f6cbf1518f6c24 -Signed-off-by: Jaco Kroon <jaco@uls.co.za> ---- - configs/samples/func_odbc.conf.sample | 11 +++++++ - .../func_odbc_ARGC_minargs.txt | 20 ++++++++++++ - funcs/func_odbc.c | 31 +++++++++++++++++-- - 3 files changed, 60 insertions(+), 2 deletions(-) - create mode 100644 doc/CHANGES-staging/func_odbc_ARGC_minargs.txt - -diff --git a/configs/samples/func_odbc.conf.sample b/configs/samples/func_odbc.conf.sample -index c467f7ec06..b825974ea7 100644 ---- a/configs/samples/func_odbc.conf.sample -+++ b/configs/samples/func_odbc.conf.sample -@@ -23,6 +23,10 @@ - ; For substitution, you have ${ARG1}, ${ARG2} ... ${ARGn} - ; for the arguments to each SQL statement. - ; -+; Additionally you can use ${ARGC} to determine the number of arguments that -+; was actually passed (or risk using leaked ARGn variables from the channel). -+; Also reference the minargs configuration option. -+; - ; In addition, for write statements, you have ${VAL1}, ${VAL2} ... ${VALn} - ; parsed, just like arguments, for the values. In addition, if you want the - ; whole value, never mind the parsing, you can get that with ${VALUE}. -@@ -87,6 +91,13 @@ - ; These additional rows can be returned by using the name of the - ; function which was called to retrieve the first row as an - ; argument to ODBC_FETCH(). -+; minargs The minimum number of ARGUMENTS that has to be passed to the -+; function. If fewer arguments than this is passed, then the call -+; will fail. It is important to note that unlike Gosub() and friends, -+; func_odbc will not mask out ARGn variables that it's not actively -+; using, as such, without this, it's entirely possible to use say -+; ARG2 from the Gosub() inside func_odbc when the intent was to -+; use an argument passed to func_odbc, but it simply was never passed. - - - ; ODBC_SQL - Allow an SQL statement to be built entirely in the dialplan -diff --git a/doc/CHANGES-staging/func_odbc_ARGC_minargs.txt b/doc/CHANGES-staging/func_odbc_ARGC_minargs.txt -new file mode 100644 -index 0000000000..0984b5022d ---- /dev/null -+++ b/doc/CHANGES-staging/func_odbc_ARGC_minargs.txt -@@ -0,0 +1,20 @@ -+Subject: func_odbc -+ -+Introduce an ARGC variable for func_odbc functions, along with a minargs -+per-function configuration option. -+ -+minargs enables enforcing of minimum count of arguments to pass to -+func_odbc, so if you're unconditionally using ARG1 through ARG4 then -+this should be set to 4. func_odbc will generate an error in this case, -+so for example -+ -+[FOO] -+minargs = 4 -+ -+and ODBC_FOO(a,b,c) in dialplan will now error out instead of using a -+potentially leaked ARG4 from Gosub(). -+ -+ARGC is needed if you're using optional argument, to verify whether or -+not an argument has been passed, else it's possible to use a leaked ARGn -+from Gosub (app_stack). So now you can safely do -+${IF($[${ARGC}>3]?${ARGV}:default value)} kind of thing. -diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c -index 5cc0faaa98..9d6d0fc304 100644 ---- a/funcs/func_odbc.c -+++ b/funcs/func_odbc.c -@@ -120,6 +120,7 @@ struct acf_odbc_query { - char *sql_insert; - unsigned int flags; - int rowlimit; -+ int minargs; - struct ast_custom_function *acf; - }; - -@@ -545,6 +546,14 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co - return -1; - } - -+ AST_STANDARD_APP_ARGS(args, s); -+ if (args.argc < query->minargs) { -+ ast_log(LOG_ERROR, "%d arguments supplied to '%s' requiring minimum %d\n", -+ args.argc, cmd, query->minargs); -+ AST_RWLIST_UNLOCK(&queries); -+ return -1; -+ } -+ - if (!chan) { - if (!(chan = ast_dummy_channel_alloc())) { - AST_RWLIST_UNLOCK(&queries); -@@ -578,7 +587,8 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co - return -1; - } - -- AST_STANDARD_APP_ARGS(args, s); -+ snprintf(varname, sizeof(varname), "%u", args.argc); -+ pbx_builtin_pushvar_helper(chan, "ARGC", varname); - for (i = 0; i < args.argc; i++) { - snprintf(varname, sizeof(varname), "ARG%d", i + 1); - pbx_builtin_pushvar_helper(chan, varname, args.field[i]); -@@ -603,6 +613,8 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co - chan = ast_channel_unref(chan); - } else { - /* Restore prior values */ -+ pbx_builtin_setvar_helper(chan, "ARGC", NULL); -+ - for (i = 0; i < args.argc; i++) { - snprintf(varname, sizeof(varname), "ARG%d", i + 1); - pbx_builtin_setvar_helper(chan, varname, NULL); -@@ -756,6 +768,14 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha - return -1; - } - -+ AST_STANDARD_APP_ARGS(args, s); -+ if (args.argc < query->minargs) { -+ ast_log(LOG_ERROR, "%d arguments supplied to '%s' requiring minimum %d\n", -+ args.argc, cmd, query->minargs); -+ AST_RWLIST_UNLOCK(&queries); -+ return -1; -+ } -+ - if (!chan) { - if (!(chan = ast_dummy_channel_alloc())) { - AST_RWLIST_UNLOCK(&queries); -@@ -768,7 +788,8 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha - ast_autoservice_start(chan); - } - -- AST_STANDARD_APP_ARGS(args, s); -+ snprintf(varname, sizeof(varname), "%u", args.argc); -+ pbx_builtin_pushvar_helper(chan, "ARGC", varname); - for (x = 0; x < args.argc; x++) { - snprintf(varname, sizeof(varname), "ARG%d", x + 1); - pbx_builtin_pushvar_helper(chan, varname, args.field[x]); -@@ -780,6 +801,8 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha - chan = ast_channel_unref(chan); - } else { - /* Restore prior values */ -+ pbx_builtin_setvar_helper(chan, "ARGC", NULL); -+ - for (x = 0; x < args.argc; x++) { - snprintf(varname, sizeof(varname), "ARG%d", x + 1); - pbx_builtin_setvar_helper(chan, varname, NULL); -@@ -1290,6 +1313,10 @@ static int init_acf_query(struct ast_config *cfg, char *catg, struct acf_odbc_qu - sscanf(tmp, "%30d", &((*query)->rowlimit)); - } - -+ if ((tmp = ast_variable_retrieve(cfg, catg, "minargs"))) { -+ sscanf(tmp, "%30d", &((*query)->minargs)); -+ } -+ - (*query)->acf = ast_calloc(1, sizeof(struct ast_custom_function)); - if (!(*query)->acf) { - free_acf_query(*query); --- -2.26.3 - diff --git a/net-misc/asterisk/files/asterisk-13.38.2-r3-func_lock-fix-races.patch b/net-misc/asterisk/files/asterisk-13.38.2-r3-func_lock-fix-races.patch deleted file mode 100644 index 3d3c7b101d47..000000000000 --- a/net-misc/asterisk/files/asterisk-13.38.2-r3-func_lock-fix-races.patch +++ /dev/null @@ -1,421 +0,0 @@ -From b35211fd58afcf430a0d95a243dc7a086d72b2b8 Mon Sep 17 00:00:00 2001 -From: Jaco Kroon <jaco@uls.co.za> -Date: Fri, 21 May 2021 20:11:59 +0200 -Subject: [PATCH] Replacement patch for v13. - -Change-Id: I30236d7d7229f317c681fb7c6d7944d6108acd08 ---- - funcs/func_lock.c | 234 +++++++++++++++++++++++++--------------------- - 1 file changed, 126 insertions(+), 108 deletions(-) - -diff --git a/funcs/func_lock.c b/funcs/func_lock.c -index a006a574eb..c472504f52 100644 ---- a/funcs/func_lock.c -+++ b/funcs/func_lock.c -@@ -44,6 +44,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - #include "asterisk/linkedlists.h" - #include "asterisk/astobj2.h" - #include "asterisk/utils.h" -+#include "asterisk/cli.h" - - /*** DOCUMENTATION - <function name="LOCK" language="en_US"> -@@ -112,7 +113,6 @@ static AST_LIST_HEAD_STATIC(locklist, lock_frame); - static void lock_free(void *data); - static void lock_fixup(void *data, struct ast_channel *oldchan, struct ast_channel *newchan); - static int unloading = 0; --static pthread_t broker_tid = AST_PTHREADT_NULL; - - static const struct ast_datastore_info lock_info = { - .type = "MUTEX", -@@ -126,8 +126,8 @@ struct lock_frame { - ast_cond_t cond; - /*! count is needed so if a recursive mutex exits early, we know how many times to unlock it. */ - unsigned int count; -- /*! Container of requesters for the named lock */ -- struct ao2_container *requesters; -+ /*! Count of waiting of requesters for the named lock */ -+ unsigned int requesters; - /*! who owns us */ - struct ast_channel *owner; - /*! name of the lock */ -@@ -149,14 +149,19 @@ static void lock_free(void *data) - while ((clframe = AST_LIST_REMOVE_HEAD(oldlist, list))) { - /* Only unlock if we own the lock */ - if (clframe->channel == clframe->lock_frame->owner) { -+ ast_mutex_lock(&clframe->lock_frame->mutex); - clframe->lock_frame->count = 0; - clframe->lock_frame->owner = NULL; -+ ast_cond_signal(&clframe->lock_frame->cond); -+ ast_mutex_unlock(&clframe->lock_frame->mutex); - } - ast_free(clframe); - } - AST_LIST_UNLOCK(oldlist); - AST_LIST_HEAD_DESTROY(oldlist); - ast_free(oldlist); -+ -+ ast_module_unref(ast_module_info->self); - } - - static void lock_fixup(void *data, struct ast_channel *oldchan, struct ast_channel *newchan) -@@ -175,54 +180,11 @@ static void lock_fixup(void *data, struct ast_channel *oldchan, struct ast_chann - if (clframe->lock_frame->owner == oldchan) { - clframe->lock_frame->owner = newchan; - } -- /* We don't move requesters, because the thread stack is different */ - clframe->channel = newchan; - } - AST_LIST_UNLOCK(list); - } - --static void *lock_broker(void *unused) --{ -- struct lock_frame *frame; -- struct timespec forever = { 1000000, 0 }; -- for (;;) { -- int found_requester = 0; -- -- /* Test for cancel outside of the lock */ -- pthread_testcancel(); -- AST_LIST_LOCK(&locklist); -- -- AST_LIST_TRAVERSE(&locklist, frame, entries) { -- if (ao2_container_count(frame->requesters)) { -- found_requester++; -- ast_mutex_lock(&frame->mutex); -- if (!frame->owner) { -- ast_cond_signal(&frame->cond); -- } -- ast_mutex_unlock(&frame->mutex); -- } -- } -- -- AST_LIST_UNLOCK(&locklist); -- pthread_testcancel(); -- -- /* If there are no requesters, then wait for a signal */ -- if (!found_requester) { -- nanosleep(&forever, NULL); -- } else { -- sched_yield(); -- } -- } -- /* Not reached */ -- return NULL; --} -- --static int ast_channel_cmp_cb(void *obj, void *arg, int flags) --{ -- struct ast_channel *chan = obj, *cmp_args = arg; -- return strcasecmp(ast_channel_name(chan), ast_channel_name(cmp_args)) ? 0 : CMP_MATCH; --} -- - static int get_lock(struct ast_channel *chan, char *lockname, int trylock) - { - struct ast_datastore *lock_store = ast_channel_datastore_find(chan, &lock_info, NULL); -@@ -234,7 +196,12 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock) - struct timeval now; - - if (!lock_store) { -- ast_debug(1, "Channel %s has no lock datastore, so we're allocating one.\n", ast_channel_name(chan)); -+ if (unloading) { -+ ast_log(LOG_ERROR, "%sLOCK has no datastore and func_lock is unloading, failing.\n", -+ trylock ? "TRY" : ""); -+ return -1; -+ } -+ - lock_store = ast_datastore_alloc(&lock_info, NULL); - if (!lock_store) { - ast_log(LOG_ERROR, "Unable to allocate new datastore. No locks will be obtained.\n"); -@@ -253,6 +220,9 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock) - lock_store->data = list; - AST_LIST_HEAD_INIT(list); - ast_channel_datastore_add(chan, lock_store); -+ -+ /* We cannot unload until this channel has released the lock_store */ -+ ast_module_ref(ast_module_info->self); - } else - list = lock_store->data; - -@@ -266,6 +236,9 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock) - - if (!current) { - if (unloading) { -+ ast_log(LOG_ERROR, -+ "Lock doesn't exist whilst unloading. %sLOCK will fail.\n", -+ trylock ? "TRY" : ""); - /* Don't bother */ - AST_LIST_UNLOCK(&locklist); - return -1; -@@ -292,17 +265,12 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock) - AST_LIST_UNLOCK(&locklist); - return -1; - } -- current->requesters = ao2_container_alloc_list(AO2_ALLOC_OPT_LOCK_MUTEX, 0, -- NULL, ast_channel_cmp_cb); -- if (!current->requesters) { -- ast_mutex_destroy(¤t->mutex); -- ast_cond_destroy(¤t->cond); -- ast_free(current); -- AST_LIST_UNLOCK(&locklist); -- return -1; -- } - AST_LIST_INSERT_TAIL(&locklist, current, entries); - } -+ /* Add to requester list */ -+ ast_mutex_lock(¤t->mutex); -+ current->requesters++; -+ ast_mutex_unlock(¤t->mutex); - AST_LIST_UNLOCK(&locklist); - - /* Found lock or created one - now find or create the corresponding link in the channel */ -@@ -315,7 +283,13 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock) - - if (!clframe) { - if (unloading) { -+ ast_log(LOG_ERROR, -+ "Busy unloading. %sLOCK will fail.\n", -+ trylock ? "TRY" : ""); - /* Don't bother */ -+ ast_mutex_lock(¤t->mutex); -+ current->requesters--; -+ ast_mutex_unlock(¤t->mutex); - AST_LIST_UNLOCK(list); - return -1; - } -@@ -324,6 +298,9 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock) - ast_log(LOG_ERROR, - "Unable to allocate channel lock frame. %sLOCK will fail.\n", - trylock ? "TRY" : ""); -+ ast_mutex_lock(¤t->mutex); -+ current->requesters--; -+ ast_mutex_unlock(¤t->mutex); - AST_LIST_UNLOCK(list); - return -1; - } -@@ -339,44 +316,44 @@ static int get_lock(struct ast_channel *chan, char *lockname, int trylock) - * the same amount, before we'll release this one. - */ - if (current->owner == chan) { -+ /* We're not a requester, we already have it */ -+ ast_mutex_lock(¤t->mutex); -+ current->requesters--; -+ ast_mutex_unlock(¤t->mutex); - current->count++; - return 0; - } - -- /* Okay, we have both frames, so now we need to try to lock. -- * -- * Locking order: always lock locklist first. We need the -- * locklist lock because the broker thread counts whether -- * there are requesters with the locklist lock held, and we -- * need to hold it, so that when we send our signal, below, -- * to wake up the broker thread, it definitely will see that -- * a requester exists at that point in time. Otherwise, we -- * could add to the requesters after it has already seen that -- * that lock is unoccupied and wait forever for another signal. -- */ -- AST_LIST_LOCK(&locklist); -- ast_mutex_lock(¤t->mutex); -- /* Add to requester list */ -- ao2_link(current->requesters, chan); -- pthread_kill(broker_tid, SIGURG); -- AST_LIST_UNLOCK(&locklist); -- - /* Wait up to three seconds from now for LOCK. */ - now = ast_tvnow(); - timeout.tv_sec = now.tv_sec + 3; - timeout.tv_nsec = now.tv_usec * 1000; - -- if (!current->owner -- || (!trylock -- && !(res = ast_cond_timedwait(¤t->cond, ¤t->mutex, &timeout)))) { -- res = 0; -+ ast_mutex_lock(¤t->mutex); -+ -+ res = 0; -+ while (!trylock && !res && current->owner) { -+ res = ast_cond_timedwait(¤t->cond, ¤t->mutex, &timeout); -+ } -+ if (current->owner) { -+ ast_log(LOG_ERROR, "%sLOCK failed to obtain lock %s.\n", trylock ? "TRY" : "", -+ lockname); -+ /* timeout; -+ * trylock; or -+ * cond_timedwait failed. -+ * -+ * either way, we fail to obtain the lock. -+ */ -+ res = -1; -+ } else { - current->owner = chan; - current->count++; -- } else { -- res = -1; -+ res = 0; - } - /* Remove from requester list */ -- ao2_unlink(current->requesters, chan); -+ current->requesters--; -+ if (res && unloading) -+ ast_cond_signal(¤t->cond); - ast_mutex_unlock(¤t->mutex); - - return res; -@@ -400,7 +377,7 @@ static int unlock_read(struct ast_channel *chan, const char *cmd, char *data, ch - } - - if (!(list = lock_store->data)) { -- ast_debug(1, "This should NEVER happen\n"); -+ ast_log(LOG_ERROR, "Datastore's data member is NULL ... this should be impossible."); - ast_copy_string(buf, "0", len); - return 0; - } -@@ -419,12 +396,17 @@ static int unlock_read(struct ast_channel *chan, const char *cmd, char *data, ch - - if (!clframe) { - /* We didn't have this lock in the first place */ -+ ast_log(LOG_WARNING, "Attempting to UNLOCK(%s) - a lock this channel never owned.\n", -+ data); - ast_copy_string(buf, "0", len); - return 0; - } - - if (--clframe->lock_frame->count == 0) { -+ ast_mutex_lock(&clframe->lock_frame->mutex); - clframe->lock_frame->owner = NULL; -+ ast_cond_signal(&clframe->lock_frame->cond); -+ ast_mutex_unlock(&clframe->lock_frame->mutex); - } - - ast_copy_string(buf, "1", len); -@@ -455,6 +437,37 @@ static int trylock_read(struct ast_channel *chan, const char *cmd, char *data, c - return 0; - } - -+static char *handle_cli_locks_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) -+{ -+ int c = 0; -+ struct lock_frame* current; -+ switch (cmd) { -+ case CLI_INIT: -+ e->command = "locks show"; -+ e->usage = -+ "Usage: locks show\n" -+ " List all locks known to func_lock, along with their current status.\n"; -+ return NULL; -+ case CLI_GENERATE: -+ return NULL; -+ } -+ -+ ast_cli(a->fd, "func_lock locks:\n"); -+ ast_cli(a->fd, "%-40s Requesters Owner\n", "Name"); -+ AST_LIST_LOCK(&locklist); -+ AST_LIST_TRAVERSE(&locklist, current, entries) { -+ ast_mutex_lock(¤t->mutex); -+ ast_cli(a->fd, "%-40s %-10d %s\n", current->name, current->requesters, -+ current->owner ? ast_channel_name(current->owner) : "(unlocked)"); -+ ast_mutex_unlock(¤t->mutex); -+ c++; -+ } -+ AST_LIST_UNLOCK(&locklist); -+ ast_cli(a->fd, "%d total locks listed.\n", c); -+ -+ return 0; -+} -+ - static struct ast_custom_function lock_function = { - .name = "LOCK", - .read = lock_read, -@@ -473,6 +486,8 @@ static struct ast_custom_function unlock_function = { - .read_max = 2, - }; - -+static struct ast_cli_entry cli_locks_show = AST_CLI_DEFINE(handle_cli_locks_show, "List func_lock locks."); -+ - static int unload_module(void) - { - struct lock_frame *current; -@@ -480,34 +495,43 @@ static int unload_module(void) - /* Module flag */ - unloading = 1; - -+ /* Make it impossible for new requesters to be added -+ * NOTE: channels could already be in get_lock() */ -+ ast_custom_function_unregister(&lock_function); -+ ast_custom_function_unregister(&trylock_function); -+ -+ ast_cli_unregister(&cli_locks_show); -+ - AST_LIST_LOCK(&locklist); - while ((current = AST_LIST_REMOVE_HEAD(&locklist, entries))) { -- /* If any locks are currently in use, then we cannot unload this module */ -- if (current->owner || ao2_container_count(current->requesters)) { -- /* Put it back */ -- AST_LIST_INSERT_HEAD(&locklist, current, entries); -- AST_LIST_UNLOCK(&locklist); -- unloading = 0; -- return -1; -+ int warned = 0; -+ ast_mutex_lock(¤t->mutex); -+ while (current->owner || current->requesters) { -+ if (!warned) { -+ ast_log(LOG_WARNING, "Waiting for %d requesters for %s lock %s.\n", -+ current->requesters, current->owner ? "locked" : "unlocked", -+ current->name); -+ warned = 1; -+ } -+ /* either the mutex is locked, or other parties are currently in get_lock, -+ * we need to wait for all of those to clear first */ -+ ast_cond_wait(¤t->cond, ¤t->mutex); - } -+ ast_mutex_unlock(¤t->mutex); -+ /* At this point we know: -+ * 1. the lock has been released, -+ * 2. there are no requesters (nor should any be able to sneak in). -+ */ - ast_mutex_destroy(¤t->mutex); -- ao2_ref(current->requesters, -1); -+ ast_cond_destroy(¤t->cond); - ast_free(current); - } -+ AST_LIST_UNLOCK(&locklist); -+ AST_LIST_HEAD_DESTROY(&locklist); - -- /* No locks left, unregister functions */ -- ast_custom_function_unregister(&lock_function); -- ast_custom_function_unregister(&trylock_function); -+ /* At this point we can safely stop access to UNLOCK */ - ast_custom_function_unregister(&unlock_function); - -- if (broker_tid != AST_PTHREADT_NULL) { -- pthread_cancel(broker_tid); -- pthread_kill(broker_tid, SIGURG); -- pthread_join(broker_tid, NULL); -- } -- -- AST_LIST_UNLOCK(&locklist); -- - return 0; - } - -@@ -516,13 +540,7 @@ static int load_module(void) - int res = ast_custom_function_register_escalating(&lock_function, AST_CFE_READ); - res |= ast_custom_function_register_escalating(&trylock_function, AST_CFE_READ); - res |= ast_custom_function_register_escalating(&unlock_function, AST_CFE_READ); -- -- if (ast_pthread_create_background(&broker_tid, NULL, lock_broker, NULL)) { -- ast_log(LOG_ERROR, "Failed to start lock broker thread. Unloading func_lock module.\n"); -- broker_tid = AST_PTHREADT_NULL; -- unload_module(); -- return AST_MODULE_LOAD_DECLINE; -- } -+ res |= ast_cli_register(&cli_locks_show); - - return res; - } --- -2.26.3 - diff --git a/net-misc/asterisk/files/asterisk-16.29.1_18.15.1_20.0.1-noexec_stack.patch b/net-misc/asterisk/files/asterisk-16.29.1_18.15.1_20.0.1-noexec_stack.patch new file mode 100644 index 000000000000..ed1fafa8aa5b --- /dev/null +++ b/net-misc/asterisk/files/asterisk-16.29.1_18.15.1_20.0.1-noexec_stack.patch @@ -0,0 +1,39 @@ +From e4d33a4e488fb7abfa41b5ff947d048d22d000f4 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon <jaco@uls.co.za> +Date: Mon, 7 Nov 2022 17:30:00 +0200 +Subject: [PATCH] Build system: Avoid executable stack. + +Found in res_geolocation, but I believe others may have similar issues, +thus not linking to a specific issue. + +Essentially gcc doesn't mark the stack for being non-executable unless +it's compiling the source, this informs ld via gcc to mark the object as +not requiring an executable stack (which a binary blob obviously +doesn't). + +Change-Id: I71bcc2fd1fe0c82a28b3257405d6f2b566fd9bfc +Signed-off-by: Jaco Kroon <jaco@uls.co.za> +--- + Makefile.rules | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.rules b/Makefile.rules +index e6b6589cc7..7b508e6ab2 100644 +--- a/Makefile.rules ++++ b/Makefile.rules +@@ -213,10 +213,10 @@ endif + # extern const size_t _binary_abc_def_xml_size; + %.o: %.xml + $(ECHO_PREFIX) echo " [LD] $^ -> $@" +- $(CMD_PREFIX) $(CC) -g -nostartfiles -nodefaultlibs -nostdlib -r -Wl,-b,binary -o $@ $^ ++ $(CMD_PREFIX) $(CC) -g -Wl,-znoexecstack -nostartfiles -nodefaultlibs -nostdlib -r -Wl,-b,binary -o $@ $^ + + %.o: %.xslt + $(ECHO_PREFIX) echo " [LD] $^ -> $@" +- $(CMD_PREFIX) $(CC) -g -nostartfiles -nodefaultlibs -nostdlib -r -Wl,-b,binary -o $@ $^ ++ $(CMD_PREFIX) $(CC) -g -Wl,-znoexecstack -nostartfiles -nodefaultlibs -nostdlib -r -Wl,-b,binary -o $@ $^ + + dist-clean:: clean +-- +2.37.4 + diff --git a/net-misc/asterisk/files/asterisk-16.30.1-r1-iax2_jitterbuffer.patch b/net-misc/asterisk/files/asterisk-16.30.1-r1-iax2_jitterbuffer.patch new file mode 100644 index 000000000000..67fb68b3cf42 --- /dev/null +++ b/net-misc/asterisk/files/asterisk-16.30.1-r1-iax2_jitterbuffer.patch @@ -0,0 +1,65 @@ +From 73103bdcd5b342ce5dfa32039333ffadad551151 Mon Sep 17 00:00:00 2001 +From: Naveen Albert <asterisk@phreaknet.org> +Date: Wed, 14 Dec 2022 16:00:51 +0000 +Subject: [PATCH] chan_iax2: Fix jitterbuffer regression prior to receiving + audio. + +ASTERISK_29392 (a security fix) introduced a regression by +not processing frames when we don't have an audio format. + +Currently, chan_iax2 only calls jb_get to read frames from +the jitterbuffer when the voiceformat has been set on the pvt. +However, this only happens when we receive a voice frame, which +means that prior to receiving voice frames, other types of frames +get stalled completely in the jitterbuffer. + +To fix this, we now fallback to using the format negotiated during +call setup until we've actually received a voice frame with a format. +This ensures we're always able to read from the jitterbuffer. + +ASTERISK-30354 #close +ASTERISK-30162 #close + +Change-Id: Ie4fd1e8e088a145ad89e0427c2100a530e964fe9 +--- + channels/chan_iax2.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c +index ab6bd61638..5b3caf03b5 100644 +--- a/channels/chan_iax2.c ++++ b/channels/chan_iax2.c +@@ -4158,9 +4158,19 @@ static void __get_from_jb(const void *p) + now.tv_usec += 1000; + + ms = ast_tvdiff_ms(now, pvt->rxcore); +- +- voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat); +- if (voicefmt && ms >= (next = jb_next(pvt->jb))) { ++ if (ms >= (next = jb_next(pvt->jb))) { ++ voicefmt = ast_format_compatibility_bitfield2format(pvt->voiceformat); ++ if (!voicefmt) { ++ /* pvt->voiceformat won't be set if we haven't received any voice frames yet. ++ * In this case, fall back to using the format negotiated during call setup, ++ * so we don't stall the jitterbuffer completely. */ ++ voicefmt = ast_format_compatibility_bitfield2format(pvt->peerformat); ++ } ++ if (!voicefmt) { ++ /* Really shouldn't happen, but if it does, should be looked into */ ++ ast_log(LOG_WARNING, "No voice format and no peer format available on %s, backlogging frame\n", ast_channel_name(pvt->owner)); ++ goto cleanup; /* Don't crash if there's no voice format */ ++ } + ret = jb_get(pvt->jb, &frame, ms, ast_format_get_default_ms(voicefmt)); + switch(ret) { + case JB_OK: +@@ -4202,6 +4212,7 @@ static void __get_from_jb(const void *p) + break; + } + } ++cleanup: + if (pvt) + update_jbsched(pvt); + ast_mutex_unlock(&iaxsl[callno]); +-- +2.41.0 + diff --git a/net-misc/asterisk/files/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch b/net-misc/asterisk/files/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch new file mode 100644 index 000000000000..540888368223 --- /dev/null +++ b/net-misc/asterisk/files/asterisk-18.17.1-20.2.1-configure-fix-test-code-to-match-gethostbyname_r-pro.patch @@ -0,0 +1,71 @@ +From 79468a12c3533720c938731a8b7728ba4ff5a326 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon <jaco@uls.co.za> +Date: Wed, 10 May 2023 23:13:17 +0200 +Subject: [PATCH] configure: fix test code to match gethostbyname_r prototype. + +This enables the test to work with CC=clang. + +Without this the test for 6 args would fail with: + +utils.c:99:12: error: static declaration of 'gethostbyname_r' follows non-static declaration +static int gethostbyname_r (const char *name, struct hostent *ret, char *buf, + ^ +/usr/include/netdb.h:177:12: note: previous declaration is here +extern int gethostbyname_r (const char *__restrict __name, + ^ + +Fixing the expected return type to int sorts this out. + +Signed-off-by: Jaco Kroon <jaco@uls.co.za> +--- + configure | 4 ++-- + configure.ac | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index bf78e2aade..b046dfc755 100755 +--- a/configure ++++ b/configure +@@ -17537,7 +17537,7 @@ $as_echo_n "checking for gethostbyname_r with 6 arguments... " >&6; } + int + main () + { +-struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL); ++int r = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL); + ; + return 0; + } +@@ -17565,7 +17565,7 @@ $as_echo_n "checking for gethostbyname_r with 5 arguments... " >&6; } + int + main () + { +-struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL); ++int r = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL); + ; + return 0; + } +diff --git a/configure.ac b/configure.ac +index ab6632beac..aeec352054 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -962,7 +962,7 @@ if test "x$have_gethostbyname_r_public_declaration" = "xyes"; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include <stdlib.h> + #include <netdb.h>], +- [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);])], ++ [int r = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);])], + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_GETHOSTBYNAME_R_6], 1, [Define to 1 if your system has gethostbyname_r with 6 arguments.]), + AC_MSG_RESULT(no) +@@ -972,7 +972,7 @@ if test "x$have_gethostbyname_r_public_declaration" = "xyes"; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include <stdlib.h> + #include <netdb.h>], +- [struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);])], ++ [int r = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);])], + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_GETHOSTBYNAME_R_5], 1, [Define to 1 if your system has gethostbyname_r with 5 arguments.]), + AC_MSG_RESULT(no) +-- +2.39.3 + diff --git a/net-misc/asterisk/files/asterisk-historic-no-var-run-install.patch b/net-misc/asterisk/files/asterisk-historic-no-var-run-install.patch deleted file mode 100644 index aa9fb306831f..000000000000 --- a/net-misc/asterisk/files/asterisk-historic-no-var-run-install.patch +++ /dev/null @@ -1,14 +0,0 @@ -Patch by: Jaco Kroon <jkroon@uls.co.za> -Link: https://bugs.gentoo.org/show_bug.cgi?id=451808 - ---- a/Makefile 2013-01-17 17:16:59.767081716 +0200 -+++ b/Makefile 2013-01-17 17:17:45.897600655 +0200 -@@ -541,7 +541,7 @@ - - NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h)) - OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) --INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \ -+INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" \ - "$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \ - "$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \ - "$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \ diff --git a/net-misc/asterisk/files/asterisk.tmpfiles-13.38.3-r2.conf b/net-misc/asterisk/files/asterisk.tmpfiles-13.38.3-r2.conf deleted file mode 100644 index dc999ee65fc9..000000000000 --- a/net-misc/asterisk/files/asterisk.tmpfiles-13.38.3-r2.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/asterisk 0750 asterisk asterisk diff --git a/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1 b/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1 new file mode 100644 index 000000000000..8624bfa3383e --- /dev/null +++ b/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1 @@ -0,0 +1,202 @@ +#! /bin/bash +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +progname="$(basename "$0")" + +T="$(getopt -o "h" --long "help,corecompress:,corerename:,crashemail:,dumpcore:,instance:,maxfd:,nicelevel:,restartdelay:,rundir:,syslog,tty:" -n "$progname" -- "$@")" +eval set -- "${T}" + +rundir=/run/asterisk +restartdelay=5 +nicelevel=0 +maxfd=4096 +dumpcore=0 +unset tty instance syslog corecompress corerename crashemail + +function usage() { + cat <<USAGE +USAGE: $progname [options] -- asterisk options" +OPTIONS: + -h|--help + Output this text and exit. + --corecompress[=tool] + asterisk's address space can get quite large, compressing the core dumps can + save significant space, especially if asterisk core dumps frequently. + --corerename pattern + It's assumed core files (if enabled) will go into PWD, this specifies a + rename pattern. The following % codes are recognised: + %h - hostname + %D - date in format YYYYMMDD + %T - time in format HHMMSS + It must be mentioned that if kernel.core_pattern (sysctl) is modified + from the default 'core' value this option is unlikely to work. + --crashemail email@address + This will send an email whenver asterisk crashes (does not terminate + cleanly with a zero exit code). You need a working sendmail binary. + --dumpcore sizelimit + Maximum size of core limit, or the word unlimited. Default is disabled + (sizelimit of 0). + --instance name + Updated label for sylog logger. + --maxfd maxfd + Sets the maximum number of file descriptors (default 4096). + --nicelevel nicelevel + Will set the asterisk nice level to the specified value. + --restartdelay delay_in_seconds + Number of seconds to wait before attempting to restart asterisk. This helps + to avoid tight-loop crashes. Defaults to 5s. Minimum 1. + --rundir path + Where to store the asterisk asterisk_wrapper.pid file. In order to terminate the + wrapper (when asterisk next terminates), remove this file. + --syslog + Pass to redirect output to syslog rather than using stdout and stderr. + --tty tty + If asterisk should be attached to a TTY device, then pass this, eg --tty /dev/tty8. + Use of this is not recommended in general. + +NOTE: There are some quirks with bash getopt shunting non-options prior to -- + to asterisk options, so be careful of this. Typically stuff will break. +USAGE +} + +while [ "$1" != "--" ]; do + case "$1" in + --corecompress|--corerename|--crashemail|--dumpcore|--instance|--maxfd|--nicelevel|--restartdelay|--rundir|--tty) + eval "${1:2}=\"\${2}\"" + shift 2 + ;; + --syslog) + eval "${1:2}=1" + shift + ;; + --help|-h) + usage + exit 0 + ;; + *) + echo "BUG: Don't know how to process option $1." >&2 + usage >&2 + exit 1 + ;; + esac +done +shift # -- + +ast_opts=("$@") + +if ! [[ "${restartdelay}" =~ ^[1-9][0-9]*$ ]]; then + echo "Invalid --restartdelay value ${restartdelay}, resetting to 5." >&2 + restartdelay=5 +fi + +if [[ -n "${corecompress}" && ! -x "${corecompress}" ]]; then + corecompress=$(which "${corecompress}" 2>/dev/null) + [[ -z "${corecompress}" ]] && echo "Error locating core compression tool, disabling core compression." >&2 +fi + +# Before here will still be output (potentially munged, to the terminal). +if [[ -n "${syslog}" ]]; then + exec 1> >(logger -t "asterisk_wrapper${instance:+:}${instance}" &>/dev/null) + exec 2>&1 +fi + +echo "Initializing ${progname}" + +function cleanup(){ + # There is a tiny race here, if this gets replaced inbetween the read and the rm. + # To fix this is quite complex in that we need to keep an fd, compare inode numbers + # and manage flock's. + [[ -r "${rundir}/${progname}.pid" ]] && \ + [[ "$(<"${rundir}/${progname}.pid")" = $$ ]] && \ + rm "${rundir}/${progname}.pid" +} +trap cleanup EXIT + +# We could be clobbering an old version's pid, in which case it'll just terminate on +# it's next iteration. Towards this end, if asterisk.pid exists, attempt to find it's +# config file and request a core stop when convenient so that we can take over. +echo $$ > "${rundir}/${progname}.pid" +if [[ -r "${rundir}/asterisk.pid" ]]; then + ast_pid="$(<"${rundir}/asterisk.pid")" + [[ -r "/proc/${ast_pid}/cmdline" ]] && ast_conf="$(tr '\0' '\n' < "/proc/${ast_pid}/cmdline" | grep -A1 '^-C$' | tail -n1)" && /usr/sbin/asterisk -C "${ast_conf:-/etc/asterisk/asterisk.conf}" -rx "core stop when convenient" + # We may hit a few (depending on how busy the server is a great many number) loop failures still ... +fi + +ulimit -c "${dumpcore}" +ulimit -n "${maxfd}" + +ast_cmd=() +if [ -n "${nicelevel}" ]; then + ast_cmd+=(nice -n "${nicelevel}") +fi +ast_cmd+=(/usr/sbin/asterisk "${ast_opts[@]}") + +while [[ -r "${rundir}/${progname}.pid" ]]; do + # Another instance is looking to replace us, so terminate. + if [[ "$(<"${rundir}/${progname}.pid")" != $$ ]]; then + break + fi + + echo "Starting asterisk with ${ast_opts[*]}" + if [ -n "${tty+yes}" ]; then + /bin/stty -F "${tty}" sane + "${ast_cmd[@]}" >"${tty}" 2>&1 <"${tty}" + result=$? + else + # Purposefully leave stderr alone, this will under certain odd cases (like exceptions, + # and other odd cases logged from glibc) result in those logs at least being captured + # in syslog. + "${ast_cmd[@]}" </dev/null >/dev/null + result=$? + fi + + if [ "$result" -eq 0 ]; then + echo "Asterisk terminated normally." + break + fi + + if [ "$result" -gt 128 ]; then + signal="$(( result - 128 ))" + signame="$(kill -l $signal 2>/dev/null)" + MSG="Asterisk terminated with Signal: $signal (SIG${signame:-???})" + + # TODO: figure out how to use /proc/sys/kernel/core_pattern here, but if someone is using + # that, chances are they're already dealing with what we want here. + if [[ -r core ]]; then + if [[ -n "${corerename+yes}" ]]; then + core_target="${core_pattern}" + core_target="${core_target//%h/"$(hostname)"}" + core_target="${core_target//%D/"$(date +%Y%m%d)"}" + core_target="${core_target//%T/"$(date +%H%M%S)"}" + mv core "${core_target}" + core_target=$(readlink -f "${core_target}") + else + core_target=$(readlink -f core) + fi + + if [[ -n "${corecompress}" && -x "${corecompress}" ]]; then + "${corecompress}" "${core_target}" + # TODO: Figure out a way to tag the extension onto core_target. + fi + + MSG="${MSG}\r\nCore dumped: ${core_target}" + fi + else + MSG="Asterisk terminated with return code: $result" + fi + + [ -n "${tty+yes}" ] \ + && echo "${MSG}" >"${tty}" \ + || echo "${MSG}" + + if [[ -n "${crashemail+yes}" && -x /usr/sbin/sendmail ]]; then + echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ + /usr/sbin/sendmail "${crashemail}" + fi + echo "Restarting asterisk after ${restartdelay}s ..." + sleep "${restartdelay}" +done + +echo "Terminating $progname." +exit 0 diff --git a/net-misc/asterisk/files/asterisk_wrapper-18.17.1-20.2.1 b/net-misc/asterisk/files/asterisk_wrapper-18.17.1-20.2.1 new file mode 100644 index 000000000000..1a85eccf9b25 --- /dev/null +++ b/net-misc/asterisk/files/asterisk_wrapper-18.17.1-20.2.1 @@ -0,0 +1,227 @@ +#! /bin/sh +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +progname="$(basename "$0")" + +T="$(getopt -o "h" --long "help,corecompress:,corerename:,crashemail:,dumpcore:,instance:,maxfd:,nicelevel:,restartdelay:,rundir:,syslog,tty:" -n "$progname" -- "$@")" +eval set -- "${T}" + +# bash builtins are special ... +echo_e="$([ "${SHELL}" = "/bin/bash" ] && echo "echo -e" || echo echo)" + +rundir=/run/asterisk +restartdelay=5 +nicelevel=0 +maxfd=4096 +dumpcore=0 +unset tty instance syslog corecompress corerename crashemail + +usage() { + cat <<USAGE +USAGE: $progname [options] -- asterisk options" +OPTIONS: + -h|--help + Output this text and exit. + --corecompress[=tool] + asterisk's address space can get quite large, compressing the core dumps can + save significant space, especially if asterisk core dumps frequently. + --corerename pattern + It's assumed core files (if enabled) will go into PWD, this specifies a + rename pattern. The following % codes are recognised: + %h - hostname + %D - date in format YYYYMMDD + %T - time in format HHMMSS + It must be mentioned that if kernel.core_pattern (sysctl) is modified + from the default 'core' value this option is unlikely to work. + --crashemail email@address + This will send an email whenver asterisk crashes (does not terminate + cleanly with a zero exit code). You need a working sendmail binary. + --dumpcore sizelimit + Maximum size of core limit, or the word unlimited. Default is disabled + (sizelimit of 0). + --instance name + Updated label for sylog logger. + --maxfd maxfd + Sets the maximum number of file descriptors (default 4096). + --nicelevel nicelevel + Will set the asterisk nice level to the specified value. + --restartdelay delay_in_seconds + Number of seconds to wait before attempting to restart asterisk. This helps + to avoid tight-loop crashes. Defaults to 5s. Minimum 1. + --rundir path + Where to store the asterisk asterisk_wrapper.pid file. In order to terminate the + wrapper (when asterisk next terminates), remove this file. + --syslog + Pass to redirect output to syslog rather than using stdout and stderr. + --tty tty + If asterisk should be attached to a TTY device, then pass this, eg --tty /dev/tty8. + Use of this is not recommended in general. + +NOTE: There are some quirks with bash getopt shunting non-options prior to -- + to asterisk options, so be careful of this. Typically stuff will break. +USAGE +} + +matchreg() { + local v=$1 + shift + echo "$v" | grep -q "$@" +} + +while [ "$1" != "--" ]; do + case "$1" in + --corecompress|--corerename|--crashemail|--dumpcore|--instance|--maxfd|--nicelevel|--restartdelay|--rundir|--tty) + eval "${1#--}=\"\${2}\"" + shift 2 + ;; + --syslog) + eval "${1#--}=1" + shift + ;; + --help|-h) + usage + exit 0 + ;; + *) + echo "BUG: Don't know how to process option $1." >&2 + usage >&2 + exit 1 + ;; + esac +done +shift # -- + +if ! matchreg "${restartdelay}" "^[1-9][0-9]*$"; then + echo "Invalid --restartdelay value ${restartdelay}, resetting to 5." >&2 + restartdelay=5 +fi + +if ! matchreg "${maxfd}" "^[1-9][0-9]*$"; then + echo "Invalid --maxfd value, resetting to 4096." >&2 + maxfd=4096 +fi + +if [ $maxfd -lt 1024 ]; then + echo "maxfd is guaranteed too low, bumping to at least 1024" >&2 + maxfd=1024 +fi + +if [ -n "${nicelevel}" ] && ! matchreg "${nicelevel}" -E "^-?[0-9]+$"; then + echo "Invalid --nicelevel which much be a valid integer (values from -20 to 20 makes sense)." + exit 1 +fi + +if [ -n "${corecompress}" -a ! -x "${corecompress}" ]; then + corecompress=$(which "${corecompress}" 2>/dev/null) + [ -z "${corecompress}" ] && echo "Error locating core compression tool, disabling core compression." >&2 +fi + +# Before here will still be output (potentially munged, to the terminal). +if [ -n "${syslog}" ]; then + tdir="$(mktemp -d)" + tfifo="${tdir}/asterisk_wrapper.logger.fifo" + mkfifo "${tfifo}" + logger -t "asterisk_wrapper${instance:+:}${instance}" --id=$$ >/dev/null 2>&1 <"${tfifo}" & + exec 1>"${tfifo}" + exec 2>&1 + + rm "${tfifo}" + rmdir "${tdir}" +fi + +echo "Initializing ${progname}" + +cleanup(){ + # There is a tiny race here, if this gets replaced inbetween the read and the rm. + # To fix this is quite complex in that we need to keep an fd, compare inode numbers + # and manage flock's. + [ -r "${rundir}/${progname}.pid" ] && \ + [ "$(cat "${rundir}/${progname}.pid")" = $$ ] && \ + rm "${rundir}/${progname}.pid" +} +trap cleanup EXIT + +# We could be clobbering an old version's pid, in which case it'll just terminate on +# it's next iteration. Towards this end, if asterisk.pid exists, attempt to find it's +# config file and request a core stop when convenient so that we can take over. +echo $$ > "${rundir}/${progname}.pid" +if [ -r "${rundir}/asterisk.pid" ]; then + ast_pid="$(cat "${rundir}/asterisk.pid")" + [ -r "/proc/${ast_pid}/cmdline" ] && ast_conf="$(tr '\0' '\n' < "/proc/${ast_pid}/cmdline" | grep -A1 '^-C$' | tail -n1)" && /usr/sbin/asterisk -C "${ast_conf:-/etc/asterisk/asterisk.conf}" -rx "core stop when convenient" + # We may hit a few (depending on how busy the server is a great many number) loop failures still ... +fi + +prlimit --core=${dumpcore} --pid=$$ +prlimit --nofile=${maxfd} --pid=$$ + +ast_cmd=/usr/sbin/asterisk +if [ -n "${nicelevel}" ]; then + ast_cmd="nice -n ${nicelevel} ${ast_cmd}" +fi + +while [ -r "${rundir}/${progname}.pid" ]; do + # Another instance is looking to replace us, so terminate. + if [ "$(cat "${rundir}/${progname}.pid")" != $$ ]; then + break + fi + + echo "Starting asterisk with ${ast_cmd} $*" + if [ -n "${tty+yes}" ]; then + /bin/stty -F "${tty}" sane + ${ast_cmd} "$@" >"${tty}" 2>&1 <"${tty}" + result=$? + else + # Purposefully leave stderr alone, this will under certain odd cases (like exceptions, + # and other odd cases logged from glibc) result in those logs at least being captured + # in syslog. + ${ast_cmd} "$@" </dev/null >/dev/null + result=$? + fi + + if [ "$result" -eq 0 ]; then + echo "Asterisk terminated normally." + break + fi + + if [ "$result" -gt 128 ]; then + signal="$(( result - 128 ))" + signame="$(kill -l $signal 2>/dev/null)" + MSG="Asterisk terminated with Signal: $signal (SIG${signame:-???})" + + # TODO: figure out how to use /proc/sys/kernel/core_pattern here, but if someone is using + # that, chances are they're already dealing with what we want here. + if [ -r core ]; then + if [ -n "${corerename+yes}" ]; then + core_target="$(echo "${core_pattern}" | sed -e "s/%h/$(hostname)/" \ + -e "s/%D/$(date +%Y%m%d)/" -e "s/%T/$(date +%H%M%S)/")" + mv core "${core_target}" + core_target=$(readlink -f "${core_target}") + else + core_target=$(readlink -f core) + fi + + if [ -n "${corecompress}" && -x "${corecompress}" ]; then + "${corecompress}" "${core_target}" + fi + + MSG="${MSG}\r\nCore dumped: ${core_target}" + fi + else + MSG="Asterisk terminated with return code: $result" + fi + + [ -n "${tty+yes}" ] \ + && echo "${MSG}" >"${tty}" \ + || echo "${MSG}" + + if [ -n "${crashemail+yes}" && -x /usr/sbin/sendmail ]; then + $echo_e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ + /usr/sbin/sendmail "${crashemail}" + fi + echo "Restarting asterisk after ${restartdelay}s ..." + sleep "${restartdelay}" +done + +echo "Terminating $progname." +exit 0 diff --git a/net-misc/asterisk/files/confd-13.32.0 b/net-misc/asterisk/files/confd-16.26.1-18.12.1 index 20e8df4de21c..c350b7e9161d 100644 --- a/net-misc/asterisk/files/confd-13.32.0 +++ b/net-misc/asterisk/files/confd-16.26.1-18.12.1 @@ -65,10 +65,10 @@ #ASTERISK_CONSOLE="no" # -# Maximum size of core files. +# Maximum size of core files. # # Value: Size in bytes, unlimited for no limit or empty to disable. -# +# # Default: do not generate core dumps # #ASTERISK_CORE_SIZE="unlimited" @@ -105,7 +105,7 @@ ASTERISK_MAX_FD="4096" # # The stop mechanism to use. Asterisk can do gracefully, when convenient or now. # By default we expect you to want to stop as soon as possible, so we default -# +# # Default: gracefully # #ASTERISK_STOP_METHOD="when convenient" @@ -120,16 +120,7 @@ ASTERISK_MAX_FD="4096" #ASTERISK_STOP_TIMEOUT=-1 # -# Kill these tasks after asterisk crashed -# -# Warning! This will kill _ALL_ tasks with the specified names! -# -# Value: Space separated list of names in double quotes (e.g. "mpg123 mad") -# -# Default is to not do stupid things like killing random processes. -# -#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad" - +# ASTERISK_CONFDIR # # If you'd like an alternative folder to /etc/${RC_SVCNAME} to be used # (typically /etc/asterisk) to be used for configuration. @@ -138,6 +129,15 @@ ASTERISK_MAX_FD="4096" # #ASTERISK_CONFDIR="/etc/foo/bar" +# ASTERISK_CACHEDIR +# +# Value: Directory to which astcachedir in asterisk.conf is set. +# +# Default: /var/cache/asterisk +# +#ASTERISK_CACHEDIR="/var/cache/asterisk" + + # # Normally the init script will not wait for asterisk to fully boot. With this # setting set to yes/true/1 it will issue a "core waitfullybooted" directly @@ -158,3 +158,12 @@ ASTERISK_MAX_FD="4096" # Default: no # #ASTERISK_CORE_USEHOSTNAME=yes + +# +# When core-dumping, the default is to not compress these files. However, as it turns +# out, compressing these core files can save significant amount of space, so if you +# want them compressed, specify the tool to use here. +# +# Default: do not compress +# +#ASTERISK_CORE_COMPRESS=bzip2 diff --git a/net-misc/asterisk/files/initd-13.38.3-r2 b/net-misc/asterisk/files/initd-16.26.1-18.12.1 index 8a4555be7ecd..cc6a3dee575b 100644 --- a/net-misc/asterisk/files/initd-13.38.3-r2 +++ b/net-misc/asterisk/files/initd-16.26.1-18.12.1 @@ -24,7 +24,6 @@ is_running() { # Sets up a few variables for us for use # ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo. # ast_rundir: directory to be used as run folder (pid and ctl files). -# ast_spooldir: setup_svc_variables() { local t @@ -32,8 +31,8 @@ setup_svc_variables() ast_instancename=asterisk ast_rundir=/run/${RC_SVCNAME} ast_logdir=/var/log/${RC_SVCNAME} - ast_spooldir=/var/spool/${RC_SVCNAME} - ast_confdir=/etc/${RC_SVCNAME/.//} + ast_confdir=/etc/${RC_SVCNAME} + ast_cachedir=/var/cache/asterisk ast_stop_timeout=120 ast_stop_method="gracefully" @@ -43,13 +42,13 @@ setup_svc_variables() eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name." return 1 fi - ast_instancename+="(${t})" + ast_instancename="${ast_instancename}(${t})" fi [ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}" [ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}" - [ -n "${ASTERISK_SPOOLDIR}" ] && ast_spooldir="${ASTERISK_SPOOLDIR}" [ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}" + [ -n "${ASTERISK_CACHEDIR}" ] && ast_confdir="${ASTERISK_CACHEDIR}" [ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}" case "${ASTERISK_STOP_METHOD}" in gracefully|when\ convenient|now) @@ -72,85 +71,11 @@ setup_svc_variables() return 0 } -asterisk_run_loop() { - local result=0 signal=0 - - echo "Initializing ${ast_instancename} wrapper" - OPTS="$*" - - trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT - touch "${ast_rundir}/wrapper_loop.running" - - while [ -r "${ast_rundir}/wrapper_loop.running" ]; do - if [ -n "${TTY}" ]; then - /usr/bin/stty -F "${TTY}" sane - ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}" - result=$? - else - ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >/dev/null 2>&1 - result=$? - fi - - if [ "$result" -eq 0 ]; then - echo "Asterisk terminated normally" - break - else - if [ "$result" -gt 128 ]; then - signal="$(expr "$result" - 128)" - MSG="Asterisk terminated with Signal: $signal" - - CORE_TARGET="core-" - yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-" - CORE_TARGET+="$(date "+%Y%m%d-%H%M%S")" - - local CORE_DUMPED=0 - if [ -f "${ASTERISK_CORE_DIR}/core" ]; then - mv "${ASTERISK_CORE_DIR}/core" \ - "${ASTERISK_CORE_DIR}/${CORE_TARGET}" - CORE_DUMPED=1 - - elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then - mv "${ASTERISK_CORE_DIR}/core.${PID}" \ - "${ASTERISK_CORE_DIR}/${CORE_TARGET}" - CORE_DUMPED=1 - - fi - - [ $CORE_DUMPED -eq 1 ] && \ - MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}" - else - MSG="Asterisk terminated with return code: $result" - fi - - # kill left-over tasks - for X in ${ASTERISK_CLEANUP_ON_CRASH}; do - kill -9 "$(pidof "${X}")"; - done - fi - - [ -n "${TTY}" ] \ - && echo "${MSG}" >"${TTY}" \ - || echo "${MSG}" - - - if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \ - [ -x /usr/sbin/sendmail ]; then - echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ - /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}" - fi - sleep "${ASTERISK_RESTART_DELAY}" - echo "Restarting Asterisk..." - done - - echo "Terminating wrapper loop." - return 0 -} - start() { local OPTS PID local tmp x - local OPTS ARGS + local OPTS ARGS WRAPPER_OPTS setup_svc_variables || return $? @@ -162,15 +87,23 @@ start() { OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")" # default options - OPTS="${OPTS} -f" # don't fork / detach breaks wrapper script... + OPTS="${OPTS}${OPTS:+ }-C ${ast_confdir}/asterisk.conf -f" # don't fork / detach breaks wrapper script... + WRAPPER_OPTS="--syslog" + if [ "${RC_SVCNAME}" != "asterisk" ]; then + WRAPPER_OPTS="${WRAPPER_OPTS} --instance ${RC_SVCNAME#asterisk.}" + fi + WRAPPER_OPTS="${WRAPPER_OPTS} --rundir ${ast_rundir}" + # ensure that ASTERISK_RESTART_DELAY is integer. ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')" [ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5 + WRAPPER_OPTS="${WRAPPER_OPTS} --restartdelay ${ASTERISK_RESTART_DELAY}" if [ -n "${ASTERISK_CORE_SIZE}" ] && [ "${ASTERISK_CORE_SIZE}" != "0" ]; then - ulimit -c ${ASTERISK_CORE_SIZE} + WRAPPER_OPTS="${WRAPPER_OPTS} --dumpcore ${ASTERISK_CORE_SIZE}" + OPTS="${OPTS} -g" if [ -n "${ASTERISK_CORE_DIR}" ] && \ [ ! -d "${ASTERISK_CORE_DIR}" ] @@ -183,33 +116,40 @@ start() { einfo "Core dump size : ${ASTERISK_CORE_SIZE}" einfo "Core dump location : ${ASTERISK_CORE_DIR}" - OPTS="${OPTS} -g" + if [ -n "${ASTERISK_CORE_COMPRESS}" ]; then + einfo "Core compression tool : ${ASTERISK_CORE_COMPRESS}" + WRAPPER_OPTS="${WRAPPER_OPTS} --corecompress ${ASTERISK_CORE_COMPRESS}" + fi + + if yesno "${ASTERISK_CORE_USEHOSTNAME}"; then + WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%H-%D-%T" + else + WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%D-%T" + fi fi if [ -n "${ASTERISK_MAX_FD}" ]; then - ulimit -n ${ASTERISK_MAX_FD} + WRAPPER_OPTS="${WRAPPER_OPTS} --maxfd ${ASTERISK_MAX_FD}" einfo "Max open filedescriptors : ${ASTERISK_MAX_FD}" fi if [ -n "${ASTERISK_NICE}" ]; then if [ ${ASTERISK_NICE} -ge -20 ] && \ - [ ${ASTERISK_NICE} -le 19 ]; then + [ ${ASTERISK_NICE} -le 19 ]; then einfo "Nice level : ${ASTERISK_NICE}" - NICE="nice -n ${ASTERISK_NICE} --" + WRAPPER_OPTS="${WRAPPER_OPTS} --nicelevel ${ASTERISK_NICE}" else eerror "Nice value must be between -20 and 19" return 1 fi - else - NICE="" fi if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then if [ -x /usr/sbin/sendmail ]; then einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}" + WRAPPER_OPTS="${WRAPPER_OPTS} --crashemail ${ASTERISK_NOTIFY_EMAIL}" else ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!" - unset ASTERISK_NOTIFY_EMAIL fi fi @@ -222,8 +162,12 @@ start() { TTY="${x}" fi done - [ -n "${TTY}" ] && \ + if [ -n "${TTY}" ]; then einfo "Messages are sent to : ${TTY}" + WRAPPER_OPTS="${WRAPPER_OPTS} --tty ${TTY}" + else + ewarn "ASTERISK_TTY=${TTY} ignored, not valid." + fi fi if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then @@ -231,18 +175,18 @@ start() { OPTS="${OPTS} -c" fi - if ! getent passwd "${ast_user}" &>/dev/null; then + if ! getent passwd "${ast_user}" >/dev/null 2>&1; then eerror "Requested to run asterisk as ${ast_user}, which doesn't exist." return 1 fi OPTS="${OPTS} -U ${ast_user}" - if [ -n "${ast_group}" ] && ! getent group "${ast_group}" &>/dev/null; then + if [ -n "${ast_group}" ] && ! getent group "${ast_group}" >/dev/null 2>&1; then eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist." return 1 fi [ -n "${ast_group}" ] && OPTS="${OPTS} -G ${ast_group}" - + if [ "${ast_user}" = root ]; then ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)." elif [ "${ast_group}" = root ]; then @@ -250,13 +194,18 @@ start() { fi checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}" + checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}" + einfo "Starting asterisk as : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}" - asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null & + einfo "Wrapper options : ${WRAPPER_OPTS}" + einfo "Asterisk options : ${OPTS}" + + /usr/sbin/asterisk_wrapper ${WRAPPER_OPTS} -- ${OPTS} & result=$? if [ $result -eq 0 ]; then # 2 seconds should be enough for asterisk to start - sleep 2 + sleep 2 is_running result=$? @@ -279,7 +228,7 @@ start() { fi if [ $result -eq 0 ]; then ebegin "Waiting for ${ast_instancename} to fully boot" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" >/dev/null 2>&1 eend $? fi fi @@ -288,18 +237,16 @@ start() { } wrapperstop() { - # Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running). - if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then - ebegin "Killing ${ast_instancename} wrapper script" - kill "$(cat /run/asterisk/wrapper_loop.pid)" + # Older path. + if [ -r "${ast_rundir}/wrapper_loop.running" ]; then + ebegin "Signalling ${ast_instancename} wrapper script to terminate" + rm "${ast_rundir}/wrapper_loop.running" eend $? fi - # The new one (due to "hardened" requirements) uses a simpler - # flag to indicate running or shutting down. - if [ -r "${ast_rundir}/wrapper_loop.running" ]; then + if [ -r "${ast_rundir}/asterisk_wrapper.pid" ]; then ebegin "Signalling ${ast_instancename} wrapper script to terminate" - rm "${ast_rundir}/wrapper_loop.running" + rm "${ast_rundir}/asterisk_wrapper.pid" eend $? fi @@ -326,9 +273,9 @@ stop() { eerror "${ast_instancename} is not running!" return 0 fi - + ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" &>/dev/null + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" >/dev/null 2>&1 # Now we have to wait until asterisk has _really_ stopped. sleep 1 if is_running; then @@ -342,7 +289,7 @@ stop() { return 1 fi sleep 2 - echo -n "." + printf "." done echo fi @@ -353,8 +300,8 @@ reload() { setup_svc_variables || return $? if is_running; then - ebegin "Forcing ${ast_instancename} to reload configuration" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null + ebegin "Requesting ${ast_instancename} to reload configuration" + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" >/dev/null 2>&1 eend $? else eerror "${ast_instancename} is not running!" diff --git a/net-misc/asterisk/files/initd-16.16.2-r1 b/net-misc/asterisk/files/initd-18.17.1-20.2.1 index bdd979a56978..7d48b36456bf 100644 --- a/net-misc/asterisk/files/initd-16.16.2-r1 +++ b/net-misc/asterisk/files/initd-18.17.1-20.2.1 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 extra_started_commands="forcestop reload" @@ -29,9 +29,9 @@ setup_svc_variables() local t ast_instancename=asterisk - ast_rundir=/var/run/${RC_SVCNAME} + ast_rundir=/run/${RC_SVCNAME} ast_logdir=/var/log/${RC_SVCNAME} - ast_confdir=/etc/${RC_SVCNAME/.//} + ast_confdir=/etc/${RC_SVCNAME} ast_cachedir=/var/cache/asterisk ast_stop_timeout=120 ast_stop_method="gracefully" @@ -42,7 +42,7 @@ setup_svc_variables() eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name." return 1 fi - ast_instancename+="(${t})" + ast_instancename="${ast_instancename}(${t})" fi [ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}" @@ -71,85 +71,11 @@ setup_svc_variables() return 0 } -asterisk_run_loop() { - local result=0 signal=0 - - echo "Initializing ${ast_instancename} wrapper" - OPTS="$*" - - trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT - touch "${ast_rundir}/wrapper_loop.running" - - while [ -r "${ast_rundir}/wrapper_loop.running" ]; do - if [ -n "${TTY}" ]; then - /usr/bin/stty -F "${TTY}" sane - ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}" - result=$? - else - ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >/dev/null 2>&1 - result=$? - fi - - if [ "$result" -eq 0 ]; then - echo "Asterisk terminated normally" - break - else - if [ "$result" -gt 128 ]; then - signal="$(expr "$result" - 128)" - MSG="Asterisk terminated with Signal: $signal" - - CORE_TARGET="core-" - yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-" - CORE_TARGET+="$(date "+%Y%m%d-%H%M%S")" - - local CORE_DUMPED=0 - if [ -f "${ASTERISK_CORE_DIR}/core" ]; then - mv "${ASTERISK_CORE_DIR}/core" \ - "${ASTERISK_CORE_DIR}/${CORE_TARGET}" - CORE_DUMPED=1 - - elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then - mv "${ASTERISK_CORE_DIR}/core.${PID}" \ - "${ASTERISK_CORE_DIR}/${CORE_TARGET}" - CORE_DUMPED=1 - - fi - - [ $CORE_DUMPED -eq 1 ] && \ - MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}" - else - MSG="Asterisk terminated with return code: $result" - fi - - # kill left-over tasks - for X in ${ASTERISK_CLEANUP_ON_CRASH}; do - kill -9 "$(pidof "${X}")"; - done - fi - - [ -n "${TTY}" ] \ - && echo "${MSG}" >"${TTY}" \ - || echo "${MSG}" - - - if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \ - [ -x /usr/sbin/sendmail ]; then - echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ - /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}" - fi - sleep "${ASTERISK_RESTART_DELAY}" - echo "Restarting Asterisk..." - done - - echo "Terminating wrapper loop." - return 0 -} - start() { local OPTS PID local tmp x - local OPTS ARGS + local OPTS ARGS WRAPPER_OPTS setup_svc_variables || return $? @@ -161,15 +87,23 @@ start() { OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")" # default options - OPTS="${OPTS} -f" # don't fork / detach breaks wrapper script... + OPTS="${OPTS}${OPTS:+ }-C ${ast_confdir}/asterisk.conf -f" # don't fork / detach breaks wrapper script... + WRAPPER_OPTS="--syslog" + if [ "${RC_SVCNAME}" != "asterisk" ]; then + WRAPPER_OPTS="${WRAPPER_OPTS} --instance ${RC_SVCNAME#asterisk.}" + fi + WRAPPER_OPTS="${WRAPPER_OPTS} --rundir ${ast_rundir}" + # ensure that ASTERISK_RESTART_DELAY is integer. ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')" [ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5 + WRAPPER_OPTS="${WRAPPER_OPTS} --restartdelay ${ASTERISK_RESTART_DELAY}" if [ -n "${ASTERISK_CORE_SIZE}" ] && [ "${ASTERISK_CORE_SIZE}" != "0" ]; then - ulimit -c ${ASTERISK_CORE_SIZE} + WRAPPER_OPTS="${WRAPPER_OPTS} --dumpcore ${ASTERISK_CORE_SIZE}" + OPTS="${OPTS} -g" if [ -n "${ASTERISK_CORE_DIR}" ] && \ [ ! -d "${ASTERISK_CORE_DIR}" ] @@ -182,11 +116,22 @@ start() { einfo "Core dump size : ${ASTERISK_CORE_SIZE}" einfo "Core dump location : ${ASTERISK_CORE_DIR}" - OPTS="${OPTS} -g" + if [ -n "${ASTERISK_CORE_COMPRESS}" ]; then + einfo "Core compression tool : ${ASTERISK_CORE_COMPRESS}" + WRAPPER_OPTS="${WRAPPER_OPTS} --corecompress ${ASTERISK_CORE_COMPRESS}" + fi + + if yesno "${ASTERISK_CORE_USEHOSTNAME}"; then + WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%H-%D-%T" + else + WRAPPER_OPTS="${WRAPPER_OPTS} --corerename core-%D-%T" + fi + else + cd / fi if [ -n "${ASTERISK_MAX_FD}" ]; then - ulimit -n ${ASTERISK_MAX_FD} + WRAPPER_OPTS="${WRAPPER_OPTS} --maxfd ${ASTERISK_MAX_FD}" einfo "Max open filedescriptors : ${ASTERISK_MAX_FD}" fi @@ -194,21 +139,19 @@ start() { if [ ${ASTERISK_NICE} -ge -20 ] && \ [ ${ASTERISK_NICE} -le 19 ]; then einfo "Nice level : ${ASTERISK_NICE}" - NICE="nice -n ${ASTERISK_NICE} --" + WRAPPER_OPTS="${WRAPPER_OPTS} --nicelevel ${ASTERISK_NICE}" else eerror "Nice value must be between -20 and 19" return 1 fi - else - NICE="" fi if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then if [ -x /usr/sbin/sendmail ]; then einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}" + WRAPPER_OPTS="${WRAPPER_OPTS} --crashemail ${ASTERISK_NOTIFY_EMAIL}" else ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!" - unset ASTERISK_NOTIFY_EMAIL fi fi @@ -221,8 +164,12 @@ start() { TTY="${x}" fi done - [ -n "${TTY}" ] && \ + if [ -n "${TTY}" ]; then einfo "Messages are sent to : ${TTY}" + WRAPPER_OPTS="${WRAPPER_OPTS} --tty ${TTY}" + else + ewarn "ASTERISK_TTY=${TTY} ignored, not valid." + fi fi if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then @@ -230,13 +177,13 @@ start() { OPTS="${OPTS} -c" fi - if ! getent passwd "${ast_user}" &>/dev/null; then + if ! getent passwd "${ast_user}" >/dev/null 2>&1; then eerror "Requested to run asterisk as ${ast_user}, which doesn't exist." return 1 fi OPTS="${OPTS} -U ${ast_user}" - if [ -n "${ast_group}" ] && ! getent group "${ast_group}" &>/dev/null; then + if [ -n "${ast_group}" ] && ! getent group "${ast_group}" >/dev/null 2>&1; then eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist." return 1 fi @@ -252,7 +199,10 @@ start() { checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}" einfo "Starting asterisk as : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}" - asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null & + einfo "Wrapper options : ${WRAPPER_OPTS}" + einfo "Asterisk options : ${OPTS}" + + /usr/sbin/asterisk_wrapper ${WRAPPER_OPTS} -- ${OPTS} & result=$? if [ $result -eq 0 ]; then @@ -280,7 +230,7 @@ start() { fi if [ $result -eq 0 ]; then ebegin "Waiting for ${ast_instancename} to fully boot" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" >/dev/null 2>&1 eend $? fi fi @@ -289,18 +239,16 @@ start() { } wrapperstop() { - # Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running). - if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then - ebegin "Killing ${ast_instancename} wrapper script" - kill "$(cat /var/run/asterisk/wrapper_loop.pid)" + # Older path. + if [ -r "${ast_rundir}/wrapper_loop.running" ]; then + ebegin "Signalling ${ast_instancename} wrapper script to terminate" + rm "${ast_rundir}/wrapper_loop.running" eend $? fi - # The new one (due to "hardened" requirements) uses a simpler - # flag to indicate running or shutting down. - if [ -r "${ast_rundir}/wrapper_loop.running" ]; then + if [ -r "${ast_rundir}/asterisk_wrapper.pid" ]; then ebegin "Signalling ${ast_instancename} wrapper script to terminate" - rm "${ast_rundir}/wrapper_loop.running" + rm "${ast_rundir}/asterisk_wrapper.pid" eend $? fi @@ -314,7 +262,7 @@ forcestop() { wrapperstop ebegin "Stopping ${ast_instancename} PBX" - start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid + start-stop-daemon --stop --pidfile /run/asterisk/asterisk.pid eend $? } @@ -329,7 +277,7 @@ stop() { fi ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" &>/dev/null + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" >/dev/null 2>&1 # Now we have to wait until asterisk has _really_ stopped. sleep 1 if is_running; then @@ -343,7 +291,7 @@ stop() { return 1 fi sleep 2 - echo -n "." + printf "." done echo fi @@ -354,8 +302,8 @@ reload() { setup_svc_variables || return $? if is_running; then - ebegin "Forcing ${ast_instancename} to reload configuration" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null + ebegin "Requesting ${ast_instancename} to reload configuration" + /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" >/dev/null 2>&1 eend $? else eerror "${ast_instancename} is not running!" diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml index 24a85024683a..a24c794eaae3 100644 --- a/net-misc/asterisk/metadata.xml +++ b/net-misc/asterisk/metadata.xml @@ -25,4 +25,7 @@ <flag name="statsd">Enable statsd integration</flag> <flag name="unbound">Enable improved DNS core (SRV, NAPTR) by use of libunbound</flag> </use> + <upstream> + <remote-id type="github">asterisk/asterisk</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/autossh/autossh-1.4g.ebuild b/net-misc/autossh/autossh-1.4g-r2.ebuild index 57c7452cb478..f35e6439a315 100644 --- a/net-misc/autossh/autossh-1.4g.ebuild +++ b/net-misc/autossh/autossh-1.4g-r2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit autotools DESCRIPTION="Automatically restart SSH sessions and tunnels" HOMEPAGE="https://www.harding.motd.ca/autossh/" @@ -11,7 +13,19 @@ LICENSE="BSD" KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" -RDEPEND="net-misc/openssh" +DEPEND="dev-libs/libbsd" +RDEPEND="${DEPEND} + virtual/openssh" + +PATCHES=( + "${FILESDIR}"/autossh-1.4g-libbsd.patch + "${FILESDIR}"/autossh-1.4g-printf.patch +) + +src_prepare() { + default + eautoreconf +} src_install() { dobin autossh diff --git a/net-misc/autossh/files/autossh-1.4g-libbsd.patch b/net-misc/autossh/files/autossh-1.4g-libbsd.patch new file mode 100644 index 000000000000..09292b8b096d --- /dev/null +++ b/net-misc/autossh/files/autossh-1.4g-libbsd.patch @@ -0,0 +1,28 @@ +diff --git a/configure.ac b/configure.ac +index 4bb9380..8c15089 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -110,9 +110,10 @@ AC_FUNC_SELECT_ARGTYPES + AC_FUNC_STRFTIME + AC_FUNC_VPRINTF + AC_CHECK_FUNCS([alarm daemon dup2 gethostbyname gettimeofday memmove]) +-AC_CHECK_FUNCS([memset poll select setproctitle socket strchr strerror]) ++AC_CHECK_FUNCS([memset poll select socket strchr strerror]) + AC_CHECK_FUNCS([strncasecmp strtoul uname vsyslog]) + ++AC_CHECK_LIB(bsd, setproctitle) + AC_CHECK_LIB(nsl, gethostbyname) + AC_CHECK_LIB(socket, connect) + +diff --git a/autossh.c b/autossh.c +index e2e3b84..9d3c1bf 100644 +--- a/autossh.c ++++ b/autossh.c +@@ -52,6 +52,7 @@ typedef int32_t socklen_t; + #include <syslog.h> + #include <time.h> + #include <errno.h> ++#include <bsd/unistd.h> + + #ifndef HAVE_POLL + # ifdef HAVE_SELECT diff --git a/net-misc/autossh/files/autossh-1.4g-printf.patch b/net-misc/autossh/files/autossh-1.4g-printf.patch new file mode 100644 index 000000000000..362232395dd8 --- /dev/null +++ b/net-misc/autossh/files/autossh-1.4g-printf.patch @@ -0,0 +1,17 @@ +diff --git a/configure.ac b/configure.ac +index 4bb9380..38e2cf6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -133,7 +134,11 @@ AC_CHECK_LIB(socket, connect) + # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [ + AC_TRY_LINK([], +- [ extern char *__progname; printf("%s", __progname); ], ++ [ ++ #include <stdio.h>; ++ extern char *__progname; ++ printf("%s", __progname); ++ ], + [ ac_cv_libc_defines___progname="yes" ], + [ ac_cv_libc_defines___progname="no" ] + ) diff --git a/net-misc/autoupnp/Manifest b/net-misc/autoupnp/Manifest index 6d27e598d7a6..d026c72ad173 100644 --- a/net-misc/autoupnp/Manifest +++ b/net-misc/autoupnp/Manifest @@ -1 +1,2 @@ DIST autoupnp-0.4.7.tar.bz2 264916 BLAKE2B 3542c577a32f5ba3a8ea60c6f2ebb3d5cea76fa440d281e6895c246252d3ba70720aaafa4d843f06a23f1b022942cddb2a0b37b41eff91919db55fbbd87f28b5 SHA512 2c6bb3421fecbffea2a63ea1e930b7c789459d4626a0f281abe0e9bb62e5efc772475d4bf0c9f13fe2e9e13417940c6eb17408e6aae28bc24a4fc2e16d4dc8de +DIST autoupnp-0.5.0.tar.gz 7402 BLAKE2B b6de76a45e6811e57cfb15bf41d3305ad4e8ed9b1459270426724b016d33a9a398bae5bca4d3d87360d712614fcad0fa5d8571db88ce632afd43220539ba992d SHA512 0118b20fdb225673348c3ba469bfde6c37e79fba42e7dbf7bca6a0c25dd9f853b0ee73860c5dbb8165e97125cb71b2794d4e88ece0a1155c85f4c83390131dbc diff --git a/net-misc/autoupnp/autoupnp-0.4.7.ebuild b/net-misc/autoupnp/autoupnp-0.4.7.ebuild index c418eecc98a7..787951d2ea25 100644 --- a/net-misc/autoupnp/autoupnp-0.4.7.ebuild +++ b/net-misc/autoupnp/autoupnp-0.4.7.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Automatic open port forwarder using UPnP" -HOMEPAGE="https://github.com/mgorny/autoupnp/" -SRC_URI="https://github.com/mgorny/autoupnp/releases/download/v${PV}/${P}.tar.bz2" +HOMEPAGE="https://github.com/projg2/autoupnp/" +SRC_URI="https://github.com/projg2/autoupnp/releases/download/v${PV}/${P}.tar.bz2" LICENSE="BSD" SLOT="0" diff --git a/net-misc/autoupnp/autoupnp-0.5.0.ebuild b/net-misc/autoupnp/autoupnp-0.5.0.ebuild new file mode 100644 index 000000000000..9f5acac5c152 --- /dev/null +++ b/net-misc/autoupnp/autoupnp-0.5.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Automatic open port forwarder using UPnP" +HOMEPAGE="https://github.com/projg2/autoupnp/" +SRC_URI=" + https://github.com/projg2/autoupnp/archive/v${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libnotify" + +DEPEND=" + net-libs/miniupnpc:0= + libnotify? ( x11-libs/libtinynotify:0= ) +" +RDEPEND=" + ${DEPEND} +" + +src_configure() { + local emesonargs=( + $(meson_feature libnotify) + ) + meson_src_configure +} diff --git a/net-misc/autoupnp/autoupnp-9999.ebuild b/net-misc/autoupnp/autoupnp-9999.ebuild deleted file mode 100644 index f7ea428391ea..000000000000 --- a/net-misc/autoupnp/autoupnp-9999.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools git-r3 - -DESCRIPTION="Automatic open port forwarder using UPnP" -HOMEPAGE="https://github.com/mgorny/autoupnp/" -EGIT_REPO_URI="https://github.com/mgorny/${PN}.git" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="libnotify" - -RDEPEND="net-libs/miniupnpc:0= - libnotify? ( x11-libs/libtinynotify:0= )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - $(use_with libnotify) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/net-misc/autoupnp/metadata.xml b/net-misc/autoupnp/metadata.xml index 2b97f05c8032..ff2e8e5125ef 100644 --- a/net-misc/autoupnp/metadata.xml +++ b/net-misc/autoupnp/metadata.xml @@ -6,11 +6,7 @@ <name>Michał Górny</name> </maintainer> <upstream> - <maintainer status="active"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <bugs-to>https://github.com/mgorny/autoupnp/issues/</bugs-to> - <remote-id type="github">mgorny/autoupnp</remote-id> + <bugs-to>https://github.com/projg2/autoupnp/issues/</bugs-to> + <remote-id type="github">projg2/autoupnp</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest index 82743b9d4cec..545feeb4f3b6 100644 --- a/net-misc/axel/Manifest +++ b/net-misc/axel/Manifest @@ -1,3 +1,3 @@ DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0e026b136d50f2c52a42bbb6a3a110dcf8c0e8110dfdb6a67d0b6aecf0322101f75016b38888f35f44849340c SHA512 f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437 -DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea -DIST axel-2.17.9.tar.xz 204212 BLAKE2B 8ec63a5ccf73bf8e17c559b7fbce08ee926b0001b1d6f8ea09cbe1a7c600ceba69b6b6ecd19f989da333b57ed11e9a93913b2fa520d7e56b7d796cf18dcb9f1a SHA512 a0cabf43f451d61f4b1f4892a381fd5cf4088f7148502bf4e27d1c98177c3777bab9b732780cb9ba60c45aeead6cf9b79f870ac16db7148180f26350e69d8b01 +DIST axel-2.17.11.tar.xz 279964 BLAKE2B d2a740b6a9471cc384ddb8556c3dce946edffc3ef7b2740306040cb22d4cbabea92064ed3b0f351235f004b1017cefb5b0fc8a427691a74f29880eec7e3f5b85 SHA512 111e8b3bbb70e717bee8b3c318c18d0121776301c609c0894376a371238dd839f5dae7edda6738d2b89296fd4b6ac1083399acf62308eaa479b6d70b080e65a1 +DIST axel-2.17.13.tar.xz 224788 BLAKE2B 07b3918277fa2a4b0cda5e989c3c001058cc0c8da52e479d56bd88956362cb1bbfa927b85ed870c5b0ddc599839fadb25aa5733bd295f060879d31c211913e16 SHA512 e36129de893c3c56fe89f7ff3accba9803b4e6d3b5094ed4266c10b33639b973c2fdc41beaf0a80d4fb5e62339580383497a15b4b7caad7d70c8fc581c0c4fc2 diff --git a/net-misc/axel/axel-2.17.10.ebuild b/net-misc/axel/axel-2.17.10.ebuild index c2b94b904b2b..9ec3f17398db 100644 --- a/net-misc/axel/axel-2.17.10.ebuild +++ b/net-misc/axel/axel-2.17.10.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${ LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86" +KEYWORDS="amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" IUSE="debug nls ssl" CDEPEND=" diff --git a/net-misc/axel/axel-2.17.9.ebuild b/net-misc/axel/axel-2.17.11.ebuild index 1a4eb679c275..65b8d2b117b6 100644 --- a/net-misc/axel/axel-2.17.9.ebuild +++ b/net-misc/axel/axel-2.17.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="debug nls ssl" CDEPEND=" diff --git a/net-misc/axel/axel-2.17.8.ebuild b/net-misc/axel/axel-2.17.13.ebuild index c2b94b904b2b..d2b41dac25da 100644 --- a/net-misc/axel/axel-2.17.8.ebuild +++ b/net-misc/axel/axel-2.17.13.ebuild @@ -1,33 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Light Unix download accelerator" HOMEPAGE="https://github.com/axel-download-accelerator/axel" SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86" -IUSE="debug nls ssl" +KEYWORDS="~amd64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="nls ssl" -CDEPEND=" - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${CDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${CDEPEND} +DEPEND="ssl? ( dev-libs/openssl:0= )" +RDEPEND="${DEPEND} nls? ( virtual/libintl virtual/libiconv )" +BDEPEND="nls? ( sys-devel/gettext )" DOCS=( doc/. ) src_configure() { econf \ $(use_enable nls) \ - $(use_with ssl) + $(use_with ssl ssl=openssl) } pkg_postinst() { diff --git a/net-misc/axel/metadata.xml b/net-misc/axel/metadata.xml index fd7fe267b0a6..05ac5e3edf7c 100644 --- a/net-misc/axel/metadata.xml +++ b/net-misc/axel/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> + <!-- maintainer-needed --> <upstream> - <remote-id type="github">eribertomota/axel</remote-id> + <remote-id type="github">axel-download-accelerator/axel</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/babeld/Manifest b/net-misc/babeld/Manifest index a4867c6f689b..0ec4c01a6284 100644 --- a/net-misc/babeld/Manifest +++ b/net-misc/babeld/Manifest @@ -1,2 +1,3 @@ -DIST babeld-1.8.2.tar.gz 92852 BLAKE2B ddf64558ebe2c96812e0b68382cda118539a1221fa15df7ee5d6aa67cdb5e1da556e4518371580bfb9df61780f559892787057605a02b8870c0a8e1f2018fc5d SHA512 08ef0747a672e7a3f2e06d4082da0d021378cea94633fdddf7de38178552bc5a587852fdb5c8bfdeeb6897ba4fd61c78e6ee4d19523a6c3e60d0e3c150418319 -DIST babeld-1.9.1.tar.gz 94668 BLAKE2B 169932e8d37d683bfa7e945e313d17c3ee633d11031d940ef3f5be3e0a9fbaffb28d47cf9f6d6ef6b25130af9a485ac4a629d0009485021d6f2fe19ec5382788 SHA512 433a9a2da02c56e93f5fc5f9399320f7f4dbac8d87eff9a539300d5740269eeda6be1302a2cf4a4b9c524780b286d9eb7898585fc530129a1f84341faf1e6fd0 +DIST babeld-1.13.1.tar.gz 94890 BLAKE2B 78a58ca9b8c4d915e742081d90e210a14c1718c882d56a42926f29d1c99c53ea06ac8bc2c88f11e0af47a2f657d7649b41ccfcec79e4195c542cf5953e7c6d39 SHA512 c1733fbe115c1e07cc2455b1e0a5f61a53d50b1f2e81f24a82b04c988f1d8c6076e215005aae7e4e97f2497965d8459d0ac024fce016a22d8b416929a8569b13 +DIST babeld-BLAKE2-320c325437539ae91091ce62efec1913cd8093c2.tar.gz 895554 BLAKE2B eecc9cfebba1a9b0ccf64f2aab9bab4db96987cd3d75cffa40e7ba3bb6014f056c00fb6f5dc50477f38e4264625dd1702f2994e93dc8c3f8c1ba933d7e397188 SHA512 db668b6fad82c82a9431db0bad5982d9ba7ea3aeb3ede0a5335702a44fd19d23f2b89207940c060dba992009e1de7d8d892f6719cd8ffdeaed26303bdc7a7a6f +DIST babeld-rfc6234-285c8b86c0c6b8e9ffe1c420c5b09fa229629a30.tar.gz 93167 BLAKE2B 64d6a43ca3e1bac434d21a2df5c8449cd3b8eef821ef7af731a4242fc14131b284ad72c11062cd9b5c1f03bff37578931f464165f288589a8a22911b6b4fcd71 SHA512 0adb4a891042fde32451368b93f861015614858e8fe42bb9b7b377e9cbb0b06fa3903dd9e901f93b7b12fd2428df621208295cd0a11ff55fbc6382e15aff8079 diff --git a/net-misc/babeld/babeld-1.13.1.ebuild b/net-misc/babeld/babeld-1.13.1.ebuild new file mode 100644 index 000000000000..c4d5c377a8e8 --- /dev/null +++ b/net-misc/babeld/babeld-1.13.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +BLAKE2_COMMIT=320c325437539ae91091ce62efec1913cd8093c2 +RFC6234_COMMIT=285c8b86c0c6b8e9ffe1c420c5b09fa229629a30 + +DESCRIPTION="a loop-free distance-vector routing protocol" +HOMEPAGE="https://github.com/jech/babeld" +SRC_URI=" + https://github.com/jech/babeld/archive/${P}.tar.gz + https://github.com/BLAKE2/BLAKE2/archive/${BLAKE2_COMMIT}.tar.gz + -> ${PN}-BLAKE2-${BLAKE2_COMMIT}.tar.gz + https://github.com/massar/rfc6234/archive/${RFC6234_COMMIT}.tar.gz + -> ${PN}-rfc6234-${RFC6234_COMMIT}.tar.gz +" +S=${WORKDIR}/${PN}-${P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_unpack() { + default + cd "${S}" + rm -r BLAKE2 rfc6234 || die + ln -s ../BLAKE2-${BLAKE2_COMMIT} BLAKE2 || die + ln -s ../rfc6234-${RFC6234_COMMIT} rfc6234 || die +} + +src_compile() { + emake CDEBUGFLAGS="${CFLAGS}" +} + +src_install() { + emake TARGET="${ED}" PREFIX="/usr" install + dodoc CHANGES README + doinitd "${FILESDIR}"/${PN} +} diff --git a/net-misc/babeld/babeld-1.8.2.ebuild b/net-misc/babeld/babeld-1.8.2.ebuild deleted file mode 100644 index a0e8e1da80bc..000000000000 --- a/net-misc/babeld/babeld-1.8.2.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="a loop-free distance-vector routing protocol" -HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/babel/" -SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -src_compile() { - emake CDEBUGFLAGS="${CFLAGS}" -} - -src_install() { - emake "TARGET=${D}" PREFIX="${EPREFIX}"/usr install - dodoc CHANGES README - doinitd "${FILESDIR}"/${PN} -} diff --git a/net-misc/babeld/babeld-1.9.1.ebuild b/net-misc/babeld/babeld-1.9.1.ebuild deleted file mode 100644 index a0e8e1da80bc..000000000000 --- a/net-misc/babeld/babeld-1.9.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="a loop-free distance-vector routing protocol" -HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/babel/" -SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -src_compile() { - emake CDEBUGFLAGS="${CFLAGS}" -} - -src_install() { - emake "TARGET=${D}" PREFIX="${EPREFIX}"/usr install - dodoc CHANGES README - doinitd "${FILESDIR}"/${PN} -} diff --git a/net-misc/babeld/metadata.xml b/net-misc/babeld/metadata.xml index 2d9fb915a937..8a20628f200b 100644 --- a/net-misc/babeld/metadata.xml +++ b/net-misc/babeld/metadata.xml @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"><email>heroxbd@gentoo.org</email></maintainer> + <maintainer type="person"> + <email>heroxbd@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">jech/babeld</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/balance/Manifest b/net-misc/balance/Manifest index a93c9ec353e8..4071aa72291f 100644 --- a/net-misc/balance/Manifest +++ b/net-misc/balance/Manifest @@ -1 +1 @@ -DIST balance-3.57.tar.gz 35547 BLAKE2B 293861bdfbeb7d768c9ccc2e6373cee6000c1b048eed6d741b3e340382db15c5b012e228af47632cf6aed439caf200b62258dab9d0f4a6e64de0c299bd0588d4 SHA512 191195e2aa62c867d85085f273db911e8957c3eea7bed8e58abc29e125a0b0a4487048c7db5857e32f54545de1f81f8148b174225aaf8cf1e3a66e4b040748b4 +DIST balance-3.57.tar 102400 BLAKE2B 0112bdac264b7deca3e25ceb1df821ae1211ffef6506ffe825e96e7fe9320fcd58c602f3dd96bb3d849dfbfec8f3433d4593711d8eaf62dba4aff05cb84132fd SHA512 dc3e8358c4a35bf7668a6ef26e0f8792e75db1c24d8a18f11c89ab085324ed312250a833f4016ecca0e66d4e6a921c4a1cba3bb4095de24a63c2ea7318087aac diff --git a/net-misc/balance/balance-3.57-r1.ebuild b/net-misc/balance/balance-3.57-r1.ebuild new file mode 100644 index 000000000000..b432ff4b7e02 --- /dev/null +++ b/net-misc/balance/balance-3.57-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps flag-o-matic toolchain-funcs + +DESCRIPTION="TCP Load Balancing Port Forwarder" +HOMEPAGE="https://balance.inlab.net" +SRC_URI="https://download.inlab.net/Balance/${PV}/${P}.tar" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +PATCHES=( "${FILESDIR}"/${P}-Makefile.patch ) + +FILECAPS=( + CAP_NET_BIND_SERVICE usr/sbin/balance +) + +src_prepare() { + default + + tc-export CC +} + +src_compile() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861599 + # https://sourceforge.net/p/balance/bugs/13/ + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + default +} + +src_install() { + default + + # Autocreated on program start, if missing + rm -rv "${ED}/var/run" || die +} + +pkg_postinst() { + fcaps_pkg_postinst + elog "To run as non-root, be sure to have rendezvous directory created" + elog "with either 'mkdir -m 01777 ${EROOT}/var/run/balance' or using tmpfiles." +} diff --git a/net-misc/balance/balance-3.57.ebuild b/net-misc/balance/balance-3.57.ebuild deleted file mode 100644 index 2252401cdb41..000000000000 --- a/net-misc/balance/balance-3.57.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="TCP Load Balancing Port Forwarder" -HOMEPAGE="http://www.inlab.de/balance.html" -SRC_URI="http://www.inlab.de/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -PATCHES=( "${FILESDIR}"/${P}-Makefile.patch ) - -src_prepare() { - default - - tc-export CC -} - -src_install() { - default - - #autocreated on program start, if missing - rmdir "${D}"/var/run/${PN} -} diff --git a/net-misc/balance/metadata.xml b/net-misc/balance/metadata.xml index 115e9d64a669..9103896e5803 100644 --- a/net-misc/balance/metadata.xml +++ b/net-misc/balance/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <upstream> + <remote-id type="sourceforge">balance</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest index 70e940ef922b..39b260e8fa68 100644 --- a/net-misc/batctl/Manifest +++ b/net-misc/batctl/Manifest @@ -1 +1 @@ -DIST batctl-2021.4.tar.gz 116743 BLAKE2B 74dfecd1e07c5f6555fba9e184e887ecdb3c73d423f26af70ff5324acf2477e4ef0768197822e2fdd3e2626564d3b4e637c15a8af628f8e0d70ba48746c1186c SHA512 0a629ab6a52e503fc63b022abf5ada491e7ffd61e2ebda7a169b556b2362943452285d6a0177122634b8c7c0fafedc712d3d6fee82c03e6fd4e2d42d890f87da +DIST batctl-2022.2.tar.gz 116876 BLAKE2B e12773fce61bbe26ce6c80dc0842cd35f0207ceeaed36ff56e0f468f2bcf9c84867cdea17256ec489283b59c74c3c38040c76d5da7d6ca8d04acc99ea0c4a2ae SHA512 4a9dbc6a005fa2ecc657e1a03c7fa1e2eaf68f0cb41fdb7e8c6d832cc23f8ba8c0afd46839a281d1c8f3a15370e90302fab4b4b65890364de51a0304fcb2ce2e diff --git a/net-misc/batctl/batctl-2021.4.ebuild b/net-misc/batctl/batctl-2022.2.ebuild index 6dcab8083ac0..03a22398411e 100644 --- a/net-misc/batctl/batctl-2021.4.ebuild +++ b/net-misc/batctl/batctl-2022.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild b/net-misc/bfgminer/bfgminer-5.5.0-r4.ebuild index af67aaf1fede..27be1f5518ea 100644 --- a/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild +++ b/net-misc/bfgminer/bfgminer-5.5.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -83,31 +83,22 @@ DEPEND=" dev-libs/hidapi ) proxy_getwork? ( - net-libs/libmicrohttpd + net-libs/libmicrohttpd:= ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen - || ( - >=sys-apps/coreutils-8.15 - app-misc/realpath - ) + >=sys-apps/coreutils-8.15 ) " RDEPEND="${DEPEND} - opencl? ( - || ( - virtual/opencl - dev-util/nvidia-cuda-sdk[opencl] - ) - ) + opencl? ( virtual/opencl ) " DEPEND="${DEPEND} virtual/pkgconfig >=dev-libs/uthash-1.9.7 - sys-apps/sed cpumining? ( amd64? ( >=dev-lang/yasm-1.0.1 diff --git a/net-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml index 8e21be3dfd7b..37229c5f391f 100644 --- a/net-misc/bfgminer/metadata.xml +++ b/net-misc/bfgminer/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> - <maintainer type="person" proxied="yes"> - <email>luke-jr+gentoobugs@utopios.org</email> - <name>Luke Dashjr</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="adl">Enable support for controlling fans and overclocking on AMD cards with AMD Display Library</flag> <flag name="alchemist">Enable support for mining with AlcheMist</flag> @@ -44,7 +37,7 @@ <flag name="proxy_getwork">Enable proxy support for getwork protocol (often used with Block Erupter Blades)</flag> <flag name="proxy_stratum">Enable proxy support for stratum protocol</flag> <flag name="rockminer">Enable support for mining with RockMiner devices</flag> - <flag name="screen">Provide start-bfgminer.sh script to launch BFGMiner in app-misc/screen</flag> + <flag name="screen">Provide start-bfgminer.sh script to launch BFGMiner in <pkg>app-misc/screen</pkg></flag> <flag name="scrypt">Enable support for scrypt mining algorithm</flag> <flag name="sha256d">Enable support for SHA256d mining algorithm</flag> <flag name="twinfury">Enable support for mining with Twinfury USB sticks</flag> diff --git a/net-misc/bgpq3/Manifest b/net-misc/bgpq3/Manifest deleted file mode 100644 index 75e42b643fe3..000000000000 --- a/net-misc/bgpq3/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST bgpq3-0.1.35.tar.gz 87066 BLAKE2B b217d490ed74e9174cbbd70ed5d1dd4bc72b136a23d583b6b9cede8fd38d8b579a463d8a146313f9eec1904e836ac4db0b75a2c1554c00c5df79a8d0d32f950f SHA512 a41a424fc0230a0ab7d64ff017b9c1a52e32d7deae542ba096d4815e0e5ce76342ad55c204bbcc22ae4c47ad486917410c53b0dbb2306d40fa5c5a5cf93fcd01 -DIST bgpq3-0.1.36.tar.gz 91336 BLAKE2B 6413fcae51ec2db801d81e0c3f66db0a8f96b1d9e00fa2c30d7b89737f7b217126a2a6b620a99701e9db2ae02981d98b316292f46773f973fb84c940603ba9f7 SHA512 4c238348aeea86c04e1e1e3cd0045c59c9647df807780ccd428438421a93b2d9db549abe9ae8600aff7317f2727f5dfbfc28a3c2909e26640d4c45667659a85c diff --git a/net-misc/bgpq3/bgpq3-0.1.35.ebuild b/net-misc/bgpq3/bgpq3-0.1.35.ebuild deleted file mode 100644 index 39a1880953ef..000000000000 --- a/net-misc/bgpq3/bgpq3-0.1.35.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Generate access-lists for Cisco/Juniper routers, successor of bgpq" -HOMEPAGE="https://github.com/snar/bgpq3/" -SRC_URI="https://github.com/snar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" - -src_prepare() { - # Respect CFLAGS - sed -i \ - -e '/^CFLAGS=/s/-g //' \ - -e '/^CFLAGS=/s/ -O0//' \ - Makefile.in || die 'sed on Makefile.in failed' - - # configure.in in package is actually valid configure.ac - mv configure.in configure.ac || die - - eapply_user - eautoreconf -} - -src_install() { - dobin bgpq3 - doman bgpq3.8 - dodoc CHANGES README.md *.html -} diff --git a/net-misc/bgpq3/bgpq3-0.1.36.ebuild b/net-misc/bgpq3/bgpq3-0.1.36.ebuild deleted file mode 100644 index fce4328017a3..000000000000 --- a/net-misc/bgpq3/bgpq3-0.1.36.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Generate access-lists for Cisco/Juniper routers, successor of bgpq" -HOMEPAGE="https://github.com/snar/bgpq3/" -SRC_URI="https://github.com/snar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" - -src_prepare() { - # Respect CFLAGS - sed -i \ - -e '/^CFLAGS=/s/-g //' \ - -e '/^CFLAGS=/s/ -O0//' \ - Makefile.in || die 'sed on Makefile.in failed' - - # configure.in in package is actually valid configure.ac - mv configure.in configure.ac || die - - eapply_user - eautoreconf -} - -src_install() { - dobin bgpq3 - doman bgpq3.8 - dodoc CHANGES README.md *.html -} diff --git a/net-misc/bgpq4/Manifest b/net-misc/bgpq4/Manifest new file mode 100644 index 000000000000..995eff4f109c --- /dev/null +++ b/net-misc/bgpq4/Manifest @@ -0,0 +1,2 @@ +DIST bgpq4-1.7.tar.gz 55311 BLAKE2B 56824c0ebfa97cc459753cd59069a370afb5f6c86675f6c358e49d1cb7d781e5a9f51aa4526fd60269a5a77bc53685426898f439768c08a0f1917b1b2d98cdb3 SHA512 d9798f9d8297e05d1553fb9cfafe63fd77145e14aa72cb95d4581cae30bdf3e7c08a5ca6261a4f44580a35e048ba50fc181750ecbe838ca40b6dcfbaaca42ab5 +DIST bgpq4-1.8.tar.gz 55947 BLAKE2B 2aea8eddc33881b2e5734a805e290ed8e0a24aa41dfc65d6cd0d4221b4ff95f9477d80754eb3ae92e71843e4539653143748eca61f8f0a561932c5fff28a799e SHA512 c2bb9a6cc4f2ee361a3193c2637bc62432cc82f0182368d56d90112e50ffb7b1a28868568ee551ceda658dbdeed809dff30c820e50f9b5cf430cca01ac55cf99 diff --git a/net-misc/bgpq4/bgpq4-1.7.ebuild b/net-misc/bgpq4/bgpq4-1.7.ebuild new file mode 100644 index 000000000000..249a36b386d6 --- /dev/null +++ b/net-misc/bgpq4/bgpq4-1.7.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Generate access-lists for various routers, maintained fork of bgpq3" +HOMEPAGE="https://github.com/bgp/bgpq4/" +SRC_URI="https://github.com/bgp/bgpq4/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +src_prepare() { + default + + eautoreconf +} diff --git a/net-misc/bgpq4/bgpq4-1.8.ebuild b/net-misc/bgpq4/bgpq4-1.8.ebuild new file mode 100644 index 000000000000..f8e8353f66b3 --- /dev/null +++ b/net-misc/bgpq4/bgpq4-1.8.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Generate access-lists for various routers, maintained fork of bgpq3" +HOMEPAGE="https://github.com/bgp/bgpq4/" +SRC_URI="https://github.com/bgp/bgpq4/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="amd64 ~arm x86" + +src_prepare() { + default + + eautoreconf +} diff --git a/net-misc/bgpq3/metadata.xml b/net-misc/bgpq4/metadata.xml index 129babe352bb..9c468ef07db7 100644 --- a/net-misc/bgpq3/metadata.xml +++ b/net-misc/bgpq4/metadata.xml @@ -10,20 +10,16 @@ <name>Proxy Maintainers</name> </maintainer> <longdescription lang="en"> - bgpq3 allows to generate different config entries with prefix lists, useful for Cisco/Juniper routers and their software analogs, such as Quagga. + bgpq4 allows to generate different config entries with prefix lists, useful for Cisco/Juniper routers and their software analogs, such as Quagga. This program is a successor of bgpq from same author, main difference - it supports IPv6. </longdescription> <longdescription lang="ru"> - bgpq3 позволяет создавать различные чaсти конфигурационных файлов со списком сетей для маршрутизаторов Cisco/Juniper и их программных аналогов, + bgpq4 позволяет создавать различные чaсти конфигурационных файлов со списком сетей для маршрутизаторов Cisco/Juniper и их программных аналогов, таких как Quagga. Данная программа - идейный наследник bgpq от того же автора, основное отличие - поддержка IPv6. </longdescription> <upstream> - <maintainer> - <email>snar@snar.spb.ru</email> - <name>Alexandre Snarskii</name> - </maintainer> - <remote-id type="github">snar/bgpq3</remote-id> - <bugs-to>https://github.com/snar/bgpq3/issues</bugs-to> + <remote-id type="github">bgp/bgpq4</remote-id> + <bugs-to>https://github.com/bgp/bgpq4/issues</bugs-to> </upstream> </pkgmetadata> diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest index 65402b14904f..3be63b711736 100644 --- a/net-misc/bird/Manifest +++ b/net-misc/bird/Manifest @@ -1,2 +1,4 @@ +DIST bird-2.0.10.tar.gz 1276546 BLAKE2B 21e1dde7d38d836c761eb13067b6aacdfc66211ca75f4ae72948f2c3a9519ac45af410f764c638e9a7314c51873675621feabc730e0604a42c00f054b0db1017 SHA512 607f9c96bbf55b7622a8c49126ad568ce9a220520801a13e89be63eee65a76c575a8095485e5bbd867d1306fed87c8394a82fe88d76307eaa40ee5902842d158 +DIST bird-2.0.11.tar.gz 1301502 BLAKE2B 0761bd50b3b0338ecf2a6325f61f90db9f92324ed814de2ec6b360c6f5a7e12d6ae4ae9b73a11ddede0e6c8fd1d15bea1b62076c38c937ae281f10a8bc2d1cbf SHA512 aaab11b4faf7d0c0afc3c4e3480f24ab6e0037b209aee969192eea57bef698073da5fa9155ef43d999ed91cbe3cd87acb95aa08fa03f2525c5c7653a0589dcf6 +DIST bird-2.0.12.tar.gz 1307984 BLAKE2B ca00574bb8e508255afb90e0d65f4e1763880699cff9877731d072efc48944b9f9ac77b35bb7ffd7b780e8e8b1c2eacdc38ee273353817c53723e7972fb5f0d6 SHA512 b5e1235210e500511955c009456710dd12d6ea747825806a6d35a9de5f2f984d9a45fa541d45dd5e353f87f4d61bf1d4612cb6058769e905e4ef6b414ab4212f DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35 -DIST bird-2.0.8.tar.gz 1135228 BLAKE2B 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a SHA512 5f8ad63b1dcdcfdfd4c98f55601dda3a07dea3099fc51b52a340650ca475bd943ee6aac31a1e7735b7596b279e338697c65728754b97108ae687a05f566c94e2 diff --git a/net-misc/bird/bird-2.0.10.ebuild b/net-misc/bird/bird-2.0.10.ebuild new file mode 100644 index 000000000000..68cedb7d4894 --- /dev/null +++ b/net-misc/bird/bird-2.0.10.ebuild @@ -0,0 +1,75 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools fcaps + +DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6" +HOMEPAGE="https://bird.network.cz" +SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="amd64 ~arm64 ~x86 ~x64-macos" +IUSE="+client debug libssh" + +RDEPEND=" + client? ( + sys-libs/ncurses:= + sys-libs/readline:= + ) + filecaps? ( + acct-group/bird + acct-user/bird + ) + libssh? ( net-libs/libssh:= )" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + sys-devel/m4 +" + +FILECAPS=( + CAP_NET_ADMIN usr/sbin/bird + CAP_NET_BIND_SERVICE usr/sbin/bird + CAP_NET_RAW usr/sbin/bird +) + +PATCHES=( + "${FILESDIR}/${PN}-2.0.9-musl-tests.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --localstatedir="${EPREFIX}/var" \ + $(use_enable client) \ + $(use_enable debug) \ + $(use_enable libssh) +} + +src_install() { + if use client; then + dobin birdc + fi + + dobin birdcl + dosbin bird + + newinitd "${FILESDIR}/initd-${PN}-2" ${PN} + newconfd "${FILESDIR}/confd-${PN}-2" ${PN} + + dodoc doc/bird.conf.example +} + +pkg_postinst() { + use filecaps && \ + einfo "If you want to run bird as non-root, edit" + einfo "'${EROOT}/etc/conf.d/bird' and set BIRD_GROUP and BIRD_USER with" + einfo "the wanted username." +} diff --git a/net-misc/bird/bird-2.0.8.ebuild b/net-misc/bird/bird-2.0.11.ebuild index 5b842e0b42ed..44a995dcc670 100644 --- a/net-misc/bird/bird-2.0.8.ebuild +++ b/net-misc/bird/bird-2.0.11.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit fcaps +inherit autotools fcaps DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6" HOMEPAGE="https://bird.network.cz" @@ -15,16 +15,18 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos" IUSE="+client debug libssh" RDEPEND=" - client? ( sys-libs/ncurses:= ) - client? ( sys-libs/readline:= ) + client? ( + sys-libs/ncurses:= + sys-libs/readline:= + ) filecaps? ( acct-group/bird acct-user/bird ) libssh? ( net-libs/libssh:= )" BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex sys-devel/m4 " @@ -34,6 +36,15 @@ FILECAPS=( CAP_NET_RAW usr/sbin/bird ) +PATCHES=( + "${FILESDIR}/${PN}-2.0.9-musl-tests.patch" +) + +src_prepare() { + default + eautoreconf +} + src_configure() { econf \ --localstatedir="${EPREFIX}/var" \ @@ -46,10 +57,13 @@ src_install() { if use client; then dobin birdc fi + dobin birdcl dosbin bird + newinitd "${FILESDIR}/initd-${PN}-2" ${PN} newconfd "${FILESDIR}/confd-${PN}-2" ${PN} + dodoc doc/bird.conf.example } diff --git a/net-misc/bird/bird-2.0.12-r1.ebuild b/net-misc/bird/bird-2.0.12-r1.ebuild new file mode 100644 index 000000000000..daa657410251 --- /dev/null +++ b/net-misc/bird/bird-2.0.12-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools fcaps + +DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6" +HOMEPAGE="https://bird.network.cz" +SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="amd64 ~arm64 ~x86 ~x64-macos" +IUSE="+client custom-cflags debug libssh" + +RDEPEND=" + client? ( + sys-libs/ncurses:= + sys-libs/readline:= + ) + filecaps? ( + acct-group/bird + acct-user/bird + ) + libssh? ( net-libs/libssh:= )" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + sys-devel/m4 +" + +FILECAPS=( + CAP_NET_ADMIN usr/sbin/bird + CAP_NET_BIND_SERVICE usr/sbin/bird + CAP_NET_RAW usr/sbin/bird +) + +PATCHES=( + "${FILESDIR}/${P}-musl-tests.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # This export makes compilation and test phases verbose + export VERBOSE=1 + + local myargs=( + --localstatedir="${EPREFIX}/var" + $(use_enable client) + $(use_enable debug) + $(use_enable libssh) + ) + + # lto must be enabled by default as bird is mono-threaded and use several + # optimisations to be fast, as it may very likely be exposed to several + # thounsand BGP updates per seconds + # Although, we make it possible to deactivate it if wanted + use custom-cflags && myargs+=( bird_cv_c_lto=no ) + + econf "${myargs[@]}" +} + +src_install() { + if use client; then + dobin birdc + fi + + dobin birdcl + dosbin bird + + newinitd "${FILESDIR}/initd-${PN}-2" ${PN} + newconfd "${FILESDIR}/confd-${PN}-2" ${PN} + + dodoc doc/bird.conf.example +} + +pkg_postinst() { + use filecaps && \ + einfo "If you want to run bird as non-root, edit" + einfo "'${EROOT}/etc/conf.d/bird' and set BIRD_GROUP and BIRD_USER with" + einfo "the wanted username." +} diff --git a/net-misc/bird/bird-2.0.7.ebuild b/net-misc/bird/bird-2.0.7.ebuild index e1b3892ab3f7..397df5ee7aeb 100644 --- a/net-misc/bird/bird-2.0.7.ebuild +++ b/net-misc/bird/bird-2.0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,8 +14,8 @@ IUSE="+client debug" RDEPEND="client? ( sys-libs/ncurses ) client? ( sys-libs/readline )" -DEPEND="sys-devel/flex - sys-devel/bison +DEPEND="app-alternatives/lex + app-alternatives/yacc sys-devel/m4" PATCHES=( diff --git a/net-misc/bird/files/bird-2.0.12-musl-tests.patch b/net-misc/bird/files/bird-2.0.12-musl-tests.patch new file mode 100644 index 000000000000..df6e00e04dfe --- /dev/null +++ b/net-misc/bird/files/bird-2.0.12-musl-tests.patch @@ -0,0 +1,43 @@ +https://bird.network.cz/pipermail/bird-users/2023-March/016743.html +https://gitlab.nic.cz/labs/bird/-/commit/0f679438f36d8c2a31dfe490007e983b085caef6 + +From 0f679438f36d8c2a31dfe490007e983b085caef6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz> +Date: Mon, 6 Mar 2023 11:19:30 +0100 +Subject: [PATCH] Printf test suite fails on systems with musl libc because + tests for "%m" and "%M" formats expect "Input/output error" message but musl + returns "I/O error". Proposed change compares the printf output with string + returned from strerror function for EIO constant. + +See-also: https://bugs.gentoo.org/836713 + +Minor change from committer. +--- + lib/printf_test.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/lib/printf_test.c b/lib/printf_test.c +index 47ea905d..88ecf05e 100644 +--- a/lib/printf_test.c ++++ b/lib/printf_test.c +@@ -32,11 +32,14 @@ t_simple(void) + BSPRINTF(1, "@", buf, "@", 64); + BSPRINTF(1, "\xff", buf, "%c", 0xff); + +- errno = 5; +- BSPRINTF(18, "Input/output error", buf, "%m"); ++ const char *io_error_str = lp_strdup(tmp_linpool, strerror(EIO)); ++ const int io_error_len = strlen(io_error_str); ++ ++ errno = EIO; ++ BSPRINTF(io_error_len, io_error_str, buf, "%m"); + errno = 0; + +- BSPRINTF(18, "Input/output error", buf, "%M", 5); ++ BSPRINTF(io_error_len, io_error_str, buf, "%M", EIO); + + BSPRINTF(11, "TeSt%StRiNg", buf, "%s", "TeSt%StRiNg"); + +-- +GitLab + diff --git a/net-misc/bird/files/bird-2.0.9-musl-tests.patch b/net-misc/bird/files/bird-2.0.9-musl-tests.patch new file mode 100644 index 000000000000..4da5788fa4d4 --- /dev/null +++ b/net-misc/bird/files/bird-2.0.9-musl-tests.patch @@ -0,0 +1,30 @@ +https://bird.network.cz/pipermail/bird-users/2023-March/016743.html +See-also: https://bugs.gentoo.org/836713 +Signed-off-by: Petr Vaněk <arkamar at atlas.cz> +--- + lib/printf_test.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/lib/printf_test.c b/lib/printf_test.c +index 47ea905d..ca278975 100644 +--- a/lib/printf_test.c ++++ b/lib/printf_test.c +@@ -32,11 +32,14 @@ t_simple(void) + BSPRINTF(1, "@", buf, "@", 64); + BSPRINTF(1, "\xff", buf, "%c", 0xff); + ++ const char * io_error_str = strerror(EIO); ++ const int io_error_len = strlen(io_error_str); ++ + errno = 5; +- BSPRINTF(18, "Input/output error", buf, "%m"); ++ BSPRINTF(io_error_len, io_error_str, buf, "%m"); + errno = 0; + +- BSPRINTF(18, "Input/output error", buf, "%M", 5); ++ BSPRINTF(io_error_len, io_error_str, buf, "%M", 5); + + BSPRINTF(11, "TeSt%StRiNg", buf, "%s", "TeSt%StRiNg"); + +-- +2.39.2 diff --git a/net-misc/bird/files/initd-bird-2 b/net-misc/bird/files/initd-bird-2 index 3b759df883d8..fc4908990c20 100644 --- a/net-misc/bird/files/initd-bird-2 +++ b/net-misc/bird/files/initd-bird-2 @@ -5,13 +5,12 @@ extra_started_commands="reload" -pidfile="/run/${RC_SVCNAME}.pid" +pidfile="/run/${RC_SVCNAME}/${RC_SVCNAME}.pid" command="/usr/sbin/${RC_SVCNAME}" retry=15 -start_stop_daemon_args="--make-pidfile" CONF_FILE="/etc/${RC_SVCNAME}.conf" -SOCK="/run/${RC_SVCNAME}.ctl" +SOCK="/run/${RC_SVCNAME}/${RC_SVCNAME}.ctl" if [ ${BIRD_GROUP} ]; then BIRD_OPTS="${BIRD_OPTS} -g ${BIRD_GROUP}" @@ -22,10 +21,9 @@ fi client_args="-s ${SOCK}" command_args="${client_args} -c ${CONF_FILE} -P ${pidfile} ${BIRD_OPTS}" -client_args="${client_args} -r" depend() { - need net + use net use logger } @@ -52,8 +50,12 @@ reload() { eend $? } +start_pre() { + checkpath -d -m 0755 -o bird:bird "/run/${RC_SVCNAME}" +} + start_post() { - checkpath -f -m 0655 -o bird:bird "${pidfile}" + ln -sf "${SOCK}" /run } stop_pre() { diff --git a/net-misc/blinkperl/Manifest b/net-misc/blinkperl/Manifest deleted file mode 100644 index 61a148b93d6a..000000000000 --- a/net-misc/blinkperl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST blinkperl-2003-02-08.tar.gz 64918 BLAKE2B 906aabc4e47890c1c30740b4f2575fc2899253eaa41e43fe429a0403788d7d06c0ea0d1197b5affe060c3acadb68826fb1bdfc70965cf812038eac3a6e01144f SHA512 4759e00b179ecc210af7b0a83d0eb18ffd09d1659b38ae4a3de346bc7d5b7d6c319e80f0b28981eb643d165581b2dc35ce78ad59c6b97f1d4b1ce6df33127c9e diff --git a/net-misc/blinkperl/blinkperl-20030301-r2.ebuild b/net-misc/blinkperl/blinkperl-20030301-r2.ebuild deleted file mode 100644 index 5887c9930a6f..000000000000 --- a/net-misc/blinkperl/blinkperl-20030301-r2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}-2003-02-08" -S=${WORKDIR}/${PN} - -DESCRIPTION="blinkperl is a telnet server, which plays BlinkenLight movies" -SRC_URI="mirror://sourceforge/blinkserv/${MY_P}.tar.gz" -HOMEPAGE="http://blinkserv.sourceforge.net/" - -SLOT="0" -KEYWORDS="~hppa x86" -LICENSE="GPL-2" -IUSE="" -DEPEND="" -RDEPEND="dev-lang/perl dev-perl/Term-ANSIScreen" - -PATCHES=( "${FILESDIR}"/${P}-fix-pod2man.patch - "${FILESDIR}"/${P}-non-local.patch - "${FILESDIR}"/${P}-Makefile.patch ) - -src_install() { - default - - newinitd "${FILESDIR}"/blinkperl.rc blinkperl - newconfd "${FILESDIR}"/blinkperl.confd blinkperl -} diff --git a/net-misc/blinkperl/files/blinkperl-20030301-Makefile.patch b/net-misc/blinkperl/files/blinkperl-20030301-Makefile.patch deleted file mode 100644 index 1f8d3bee0df6..000000000000 --- a/net-misc/blinkperl/files/blinkperl-20030301-Makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ -Do not install into /usr/man and be consistent about the package name. - ---- blinkperl/Makefile.orig 2003-02-08 15:58:10.000000000 +0100 -+++ blinkperl/Makefile 2008-11-27 21:14:03.000000000 +0100 -@@ -1,12 +1,12 @@ - SHELL=/bin/sh --PREFIX=/usr/local --MANDIR=${PREFIX}/man -+PREFIX=/usr - BINDIR=${PREFIX}/bin - SHAREDIR=${PREFIX}/share -+MANDIR=${SHAREDIR}/man - # - # Be sure to modify $moviedir in blinkserver.pl if you modify it here! - # --BLINKENPERLSHAREDIR=${SHAREDIR}/blinkenperl -+BLINKENPERLSHAREDIR=${SHAREDIR}/blinkperl - MOVIEDIR=${BLINKENPERLSHAREDIR}/movies - - # Enable "make install DESTDIR=some-path" to make it easier diff --git a/net-misc/blinkperl/files/blinkperl-20030301-fix-pod2man.patch b/net-misc/blinkperl/files/blinkperl-20030301-fix-pod2man.patch deleted file mode 100644 index 01f8703feb95..000000000000 --- a/net-misc/blinkperl/files/blinkperl-20030301-fix-pod2man.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- blinkperl/blinkserver.pl.orig 2016-05-03 16:22:49.510379864 -0500 -+++ blinkperl/blinkserver.pl 2016-05-03 16:22:27.172380760 -0500 -@@ -148,6 +148,8 @@ - - =item B<--port>=I<number>: On which Port should the server listen? - -+=back -+ - =head1 DESCRIPTION - - B<This program> will listen on the defined port (current default value: 10001) diff --git a/net-misc/blinkperl/files/blinkperl-20030301-non-local.patch b/net-misc/blinkperl/files/blinkperl-20030301-non-local.patch deleted file mode 100644 index 3394918ebb47..000000000000 --- a/net-misc/blinkperl/files/blinkperl-20030301-non-local.patch +++ /dev/null @@ -1,13 +0,0 @@ -Do not install in locale/share and be consistent about the package name. - ---- blinkperl/blinkserver.pl.orig 2003-02-06 19:38:00.000000000 +0100 -+++ blinkperl/blinkserver.pl 2008-11-27 21:14:24.000000000 +0100 -@@ -21,7 +21,7 @@ - - # be sure to modify ${MOVIEDIR} in the Makefile - # (if you want to use "make install"), if you modify it here! --my $moviedir = "/usr/local/share/blinkenperl/movies" ; # where to find the movies -+my $moviedir = "/usr/share/blinkperl/movies" ; # where to find the movies - my $blmext = "blm" ; # extensions of blm files in the movie directory - - diff --git a/net-misc/blinkperl/files/blinkperl.confd b/net-misc/blinkperl/files/blinkperl.confd deleted file mode 100644 index 3eab7db5a977..000000000000 --- a/net-misc/blinkperl/files/blinkperl.confd +++ /dev/null @@ -1,3 +0,0 @@ -# config what port to listen for telnet connections on -BLINKPORT="10001" - diff --git a/net-misc/blinkperl/files/blinkperl.rc b/net-misc/blinkperl/files/blinkperl.rc deleted file mode 100644 index 4d9aca88eafc..000000000000 --- a/net-misc/blinkperl/files/blinkperl.rc +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - ebegin "Starting blinkserver" - start-stop-daemon -o --background --quiet --start --exec /usr/bin/blinkserver.pl --pidfile /var/run/blinkserver.pid -- --port=${BLINKPORT} - eend $? -} - -stop() { - ebegin "Stopping blinkserver" - start-stop-daemon -o --quiet --stop --name blinkserver.pl - eend $? -} diff --git a/net-misc/blinkperl/metadata.xml b/net-misc/blinkperl/metadata.xml deleted file mode 100644 index 76de869b4002..000000000000 --- a/net-misc/blinkperl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">blinkserv</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/bopm/bopm-3.1.3-r6.ebuild b/net-misc/bopm/bopm-3.1.3-r7.ebuild index ae8dd5a2d897..f511e3b68eab 100644 --- a/net-misc/bopm/bopm-3.1.3-r6.ebuild +++ b/net-misc/bopm/bopm-3.1.3-r7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -14,6 +14,10 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~x86" RDEPEND="acct-user/opm" +BDEPEND=" + acct-user/opm + dev-build/autoconf-archive +" PATCHES=( "${FILESDIR}"/${P}-remove-njabl.patch @@ -29,6 +33,8 @@ src_prepare() { mv configure.{in,ac} || die mv src/libopm/configure.{in,ac} || die + mkdir src/libopm/m4 || die + cp "${BROOT}"/usr/share/aclocal/ax_func_snprintf.m4 src/libopm/m4/ax_func_snprintf.m4 || die default cp bopm.conf{.sample,} || die @@ -37,7 +43,8 @@ src_prepare() { } src_configure() { - econf --localstatedir="${EPREFIX}"/var/log/${PN} + # We need --enable-static to build libopm.a. We don't install it so it's fine. + econf --localstatedir="${EPREFIX}"/var/log/${PN} --enable-static } src_install() { diff --git a/net-misc/bopm/files/bopm-3.1.3-autotools.patch b/net-misc/bopm/files/bopm-3.1.3-autotools.patch index e2927b0b74b6..e336150f430c 100644 --- a/net-misc/bopm/files/bopm-3.1.3-autotools.patch +++ b/net-misc/bopm/files/bopm-3.1.3-autotools.patch @@ -44,94 +44,6 @@ AC_CONFIG_SRCDIR(src/libopm.h) AM_CONFIG_HEADER(src/setup.h) AM_INIT_AUTOMAKE() ---- bopm-3.1.3/src/libopm/m4/ax_func_snprintf.m4 -+++ bopm-3.1.3/src/libopm/m4/ax_func_snprintf.m4 -@@ -0,0 +1,85 @@ -+# =========================================================================== -+# http://www.gnu.org/software/autoconf-archive/ax_func_snprintf.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_FUNC_SNPRINTF -+# -+# DESCRIPTION -+# -+# Checks for a fully C99 compliant snprintf, in particular checks whether -+# it does bounds checking and returns the correct string length; does the -+# same check for vsnprintf. If no working snprintf or vsnprintf is found, -+# request a replacement and warn the user about it. Note: the mentioned -+# replacement is freely available and may be used in any project -+# regardless of it's license. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Ruediger Kuhlmann <info@ruediger-kuhlmann.de> -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 5 -+ -+AU_ALIAS([AC_FUNC_SNPRINTF], [AX_FUNC_SNPRINTF]) -+AC_DEFUN([AX_FUNC_SNPRINTF], -+[AC_CHECK_FUNCS(snprintf vsnprintf) -+AC_MSG_CHECKING(for working snprintf) -+AC_CACHE_VAL(ac_cv_have_working_snprintf, -+[AC_TRY_RUN( -+[#include <stdio.h> -+ -+int main(void) -+{ -+ char bufs[5] = { 'x', 'x', 'x', '\0', '\0' }; -+ char bufd[5] = { 'x', 'x', 'x', '\0', '\0' }; -+ int i; -+ i = snprintf (bufs, 2, "%s", "111"); -+ if (strcmp (bufs, "1")) exit (1); -+ if (i != 3) exit (1); -+ i = snprintf (bufd, 2, "%d", 111); -+ if (strcmp (bufd, "1")) exit (1); -+ if (i != 3) exit (1); -+ exit(0); -+}], ac_cv_have_working_snprintf=yes, ac_cv_have_working_snprintf=no, ac_cv_have_working_snprintf=cross)]) -+AC_MSG_RESULT([$ac_cv_have_working_snprintf]) -+AC_MSG_CHECKING(for working vsnprintf) -+AC_CACHE_VAL(ac_cv_have_working_vsnprintf, -+[AC_TRY_RUN( -+[#include <stdio.h> -+#include <stdarg.h> -+ -+int my_vsnprintf (char *buf, const char *tmpl, ...) -+{ -+ int i; -+ va_list args; -+ va_start (args, tmpl); -+ i = vsnprintf (buf, 2, tmpl, args); -+ va_end (args); -+ return i; -+} -+ -+int main(void) -+{ -+ char bufs[5] = { 'x', 'x', 'x', '\0', '\0' }; -+ char bufd[5] = { 'x', 'x', 'x', '\0', '\0' }; -+ int i; -+ i = my_vsnprintf (bufs, "%s", "111"); -+ if (strcmp (bufs, "1")) exit (1); -+ if (i != 3) exit (1); -+ i = my_vsnprintf (bufd, "%d", 111); -+ if (strcmp (bufd, "1")) exit (1); -+ if (i != 3) exit (1); -+ exit(0); -+}], ac_cv_have_working_vsnprintf=yes, ac_cv_have_working_vsnprintf=no, ac_cv_have_working_vsnprintf=cross)]) -+AC_MSG_RESULT([$ac_cv_have_working_vsnprintf]) -+if test x$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf != "xyesyes"; then -+ AC_LIBOBJ(snprintf) -+ AC_MSG_WARN([Replacing missing/broken (v)snprintf() with version from http://www.ijs.si/software/snprintf/.]) -+ AC_DEFINE(PREFER_PORTABLE_SNPRINTF, 1, "enable replacement (v)snprintf if system (v)snprintf is broken") -+fi]) --- bopm-3.1.3/src/libopm/m4/etr_socket_nsl.m4 +++ bopm-3.1.3/src/libopm/m4/etr_socket_nsl.m4 @@ -0,0 +1,81 @@ diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest index 08ad577c85dd..c3d505c0182b 100644 --- a/net-misc/bridge-utils/Manifest +++ b/net-misc/bridge-utils/Manifest @@ -1,2 +1 @@ -DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02 DIST bridge-utils-1.7.1.tar.xz 29632 BLAKE2B 36b8b9c62e88f6f1510acbf23ab8dc5ec41d3bf97eecd274c91771e116650e30b366ded37e65bde061c1e9bc7b19b7eae1e17d4573fcea9fd31892bf6d937515 SHA512 6a3824853bdaa1733c552973e6a5082280facdddc52c3feeb2c8c9375ba9469a5930b559092c9de1a73b464f388f019e147b45ac1e2d10ce8968057779fcd12c diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild deleted file mode 100644 index 273624c416b4..000000000000 --- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools linux-info toolchain-funcs - -DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" -HOMEPAGE="http://bridge.sourceforge.net/" -#SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz" -SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="selinux" - -DEPEND="virtual/os-headers" -RDEPEND="selinux? ( sec-policy/selinux-brctl )" - -CONFIG_CHECK="~BRIDGE" -WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel" - -get_headers() { - CTARGET=${CTARGET:-${CHOST}} - dir=/usr/include - tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include - echo "${dir}" -} - -src_prepare() { - local PATCHES=( - "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch - ) - default - eautoreconf -} - -src_configure() { - # use santitized headers and not headers from /usr/src - local myeconfargs=( - --prefix=/ - --libdir=/usr/$(get_libdir) - --includedir=/usr/include - --with-linux-headers="$(get_headers)" - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake install DESTDIR="${D}" - dodoc AUTHORS ChangeLog README THANKS TODO \ - doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} - [ -f "${ED%/}"/sbin/brctl ] || die "upstream makefile failed to install binary" -} diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild index e8aa9dc50b6a..268d8c30760e 100644 --- a/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild +++ b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,12 +6,12 @@ EAPI=7 inherit autotools linux-info toolchain-funcs DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" -HOMEPAGE="http://bridge.sourceforge.net/" +HOMEPAGE="https://bridge.sourceforge.net/" SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="selinux" DEPEND="virtual/os-headers" @@ -30,6 +30,7 @@ get_headers() { src_prepare() { local PATCHES=( "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch + "${FILESDIR}"/${P}-musl.patch #828902 ) default eautoreconf diff --git a/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch b/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch new file mode 100644 index 000000000000..618811e80b7a --- /dev/null +++ b/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch @@ -0,0 +1,10 @@ +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -23,6 +23,7 @@ + #include <sys/socket.h> + #include <sys/time.h> + #include <netinet/in.h> ++#include <limits.h> + + #include <linux/if.h> + #include <linux/if_bridge.h> diff --git a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild b/net-misc/bsdwhois/bsdwhois-1.43.2.1-r1.ebuild index 2e825ce486c1..f022a7cb6dbb 100644 --- a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild +++ b/net-misc/bsdwhois/bsdwhois-1.43.2.1-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +inherit autotools flag-o-matic DESCRIPTION="FreeBSD Whois Client" HOMEPAGE="https://www.freebsd.org/" @@ -10,17 +11,26 @@ SRC_URI="http://utenti.gufi.org/~drizzt/codes/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="userland_BSD" PATCHES=( "${FILESDIR}/${PN}-1.43.2.1-musl-cdefs.patch" + "${FILESDIR}/${PN}-1.43.2.1-clang16-build.patch" ) +src_prepare() { + default + eautoreconf +} + +src_configure() { + # bug #875029 + append-cppflags -D_GNU_SOURCE + default +} + src_install() { default - if ! use userland_BSD; then - mv "${ED}"/usr/share/man/man1/{whois,bsdwhois}.1 || die - mv "${ED}"/usr/bin/{whois,bsdwhois} || die - fi + mv "${ED}"/usr/share/man/man1/{whois,bsdwhois}.1 || die + mv "${ED}"/usr/bin/{whois,bsdwhois} || die } diff --git a/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-clang16-build.patch b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-clang16-build.patch new file mode 100644 index 000000000000..7f7052322b0b --- /dev/null +++ b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-clang16-build.patch @@ -0,0 +1,21 @@ +Clang16 will not allow implicit function declarations and implicit integers etc. +This patch overhauls the source code for modern C. + +Bug: https://bugs.gentoo.org/875029 + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/strnstr.c ++++ b/strnstr.c +@@ -46,10 +46,7 @@ static char sccsid[] = "@(#)strstr.c 8.1 (Berkeley) 6/4/93"; + * first slen characters of s. + */ + char * +-strnstr(s, find, slen) +- const char *s; +- const char *find; +- size_t slen; ++strnstr(const char *s, const char *find, size_t slen) + { + char c, sc; + size_t len; diff --git a/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch index 2eec53c2645c..a27f2d5a1665 100644 --- a/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch +++ b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch @@ -1,8 +1,17 @@ -diff --git a/whois.c b/whois.c -index 329559a..d2f6561 100644 +https://bugs.gentoo.org/828901 +--- a/strnstr.c ++++ b/strnstr.c +@@ -38,7 +38,6 @@ + #if defined(LIBC_SCCS) && !defined(lint) + static char sccsid[] = "@(#)strstr.c 8.1 (Berkeley) 6/4/93"; + #endif /* LIBC_SCCS and not lint */ +-#include <sys/cdefs.h> + + #include <string.h> + --- a/whois.c +++ b/whois.c -@@ -43,7 +43,6 @@ static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93"; +@@ -43,7 +43,6 @@ #endif /* not lint */ #endif @@ -10,3 +19,4 @@ index 329559a..d2f6561 100644 #ifdef __FBSDID __FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/whois/whois.c,v 1.43.2.1 2006/01/31 18:11:21 jhay Exp $"); #endif + diff --git a/net-misc/buka/Manifest b/net-misc/buka/Manifest deleted file mode 100644 index 986b739eabe8..000000000000 --- a/net-misc/buka/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST buka-3.0.1.tar.gz 14697 BLAKE2B 2aabbe6bc78105bb0a1a44378c36ec82fef23df70d7600eaaa055d524bd4d38283644c49043f8c9d77cc52d7b1762f5ea4f2ddf896c0cda85ee677018679c1b6 SHA512 6893f1ad63130c55d2023abc0839e20f02ae4cede2162ec1d6e52d43f6b49cfc734b569776172b38bf2c208c2b41d123cb7bba9398ad689a22ce6703fa47eb22 diff --git a/net-misc/buka/buka-3.0.1.ebuild b/net-misc/buka/buka-3.0.1.ebuild deleted file mode 100644 index 1a1c68b1bdfe..000000000000 --- a/net-misc/buka/buka-3.0.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit optfeature - -COMMIT="45e6b32de708759a4e15181a8e2ad5de55cc78ef" -S=${WORKDIR}/${P}-${COMMIT} - -DESCRIPTION="Download manga from buka.cn" -HOMEPAGE="https://gitlab.com/drylemon/buka" -SRC_URI="https://gitlab.com/drylemon/buka/repository/${PV}/archive.tar.gz?ref=${PV} -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-python/beautifulsoup4 - dev-python/requests - sys-process/parallel - net-misc/curl - dev-util/dialog" - -src_install() { - default - doman "${PN}.1" - dobin "${PN}" "${PN}-parse" -} - -pkg_postinst() { - optfeature "pdf support" media-gfx/imagemagick - optfeature "cbz support" app-arch/zip -} diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest index c63115a8d408..3d3d9b0ed6ce 100644 --- a/net-misc/cadaver/Manifest +++ b/net-misc/cadaver/Manifest @@ -1 +1,2 @@ DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41 +DIST cadaver-0.24.tar.gz 808069 BLAKE2B 67e2f45a8c78972df9a972b6126e09ffdc8d7067d78bf748ca5c1b987f4138d0f278194c324206df294d77f7e797787edc612942168c6c78adc30f52bb3c996a SHA512 2c0131fd2f591350f6578385eedb353d81d87bae5582b2c8c96555cb51bf31fd15294898206bc7a8307b0e30e7adb1d47535e792cf28c5c1f5c2276bea0141a4 diff --git a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild index 106581d1064d..422a87282d65 100644 --- a/net-misc/cadaver/cadaver-0.23.3-r1.ebuild +++ b/net-misc/cadaver/cadaver-0.23.3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 2003-2021 Gentoo Authors +# Copyright 2003-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 inherit autotools @@ -11,18 +11,21 @@ SRC_URI="http://webdav.org/cadaver/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86" +KEYWORDS="amd64 ~ppc ppc64 ~sparc x86" IUSE="nls" BDEPEND="sys-devel/gettext" -DEPEND="<net-libs/neon-0.33.0:=" +DEPEND=">=net-libs/neon-0.27.0:=" RDEPEND="${DEPEND}" -DOCS=(BUGS ChangeLog FAQ NEWS README THANKS TODO) +DOCS=( BUGS ChangeLog FAQ NEWS README THANKS TODO ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.23.2-disable-nls.patch +) src_prepare() { - eapply "${FILESDIR}/${PN}-0.23.2-disable-nls.patch" - eapply_user + default rm -r lib/{expat,intl,neon} || die "rm failed" sed \ @@ -31,7 +34,7 @@ src_prepare() { -e "/AC_CONFIG_FILES/s: lib/neon/Makefile lib/intl/Makefile::" \ -i configure.ac || die "sed configure.ac failed" sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed" - cp "${BROOT}/usr/share/gettext/po/Makefile.in.in" po || die "cp failed" + cp "${BROOT}"/usr/share/gettext/po/Makefile.in.in po || die "cp failed" config_rpath_update . AT_M4DIR="m4 m4/neon" eautoreconf diff --git a/net-misc/cadaver/cadaver-0.24.ebuild b/net-misc/cadaver/cadaver-0.24.ebuild new file mode 100644 index 000000000000..b24b103566e3 --- /dev/null +++ b/net-misc/cadaver/cadaver-0.24.ebuild @@ -0,0 +1,47 @@ +# Copyright 2003-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Command-line WebDAV client" +HOMEPAGE="https://notroj.github.io/cadaver/ https://github.com/notroj/cadaver" +SRC_URI="https://notroj.github.io/cadaver/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ppc64 ~sparc x86" +IUSE="nls" + +BDEPEND="sys-devel/gettext" +DEPEND=">=net-libs/neon-0.27.0:=" +RDEPEND="${DEPEND}" + +DOCS=( BUGS ChangeLog FAQ NEWS README.md THANKS TODO ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.23.2-disable-nls.patch + "${FILESDIR}"/${PN}-0.24-neon-0.33.patch + "${FILESDIR}"/${PN}-0.24-autoconf-2.72.patch + "${FILESDIR}"/${PN}-0.24-link-cflags.patch +) + +src_prepare() { + default + + rm -r lib/expat || die "rm failed" + sed \ + -e "/AC_CONFIG_FILES/s: neon/src/Makefile::" \ + -i configure.ac || die "sed configure.ac failed" + sed -e "s:^\(SUBDIRS.*=\).*:\1:" -i Makefile.in || die "sed Makefile.in failed" + cp "${BROOT}"/usr/share/gettext/po/Makefile.in.in po || die "cp failed" + + config_rpath_update . + AT_M4DIR="m4" eautoreconf +} + +src_configure() { + econf \ + $(use_enable nls) +} diff --git a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch index ead3d70553b8..80f029f4f40f 100644 --- a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch +++ b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch @@ -1,7 +1,7 @@ Fix building with --disable-nls. ---- /src/cadaver.c -+++ /src/cadaver.c +--- a/src/cadaver.c ++++ b/src/cadaver.c @@ -838,11 +838,11 @@ progname = argv[0]; diff --git a/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch b/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch new file mode 100644 index 000000000000..6051c719e36f --- /dev/null +++ b/net-misc/cadaver/files/cadaver-0.24-autoconf-2.72.patch @@ -0,0 +1,59 @@ +https://github.com/notroj/cadaver/pull/42 + +From 2eab7a8225b6fc0c6fd4773794abe83561f2d733 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 17 Apr 2024 00:48:11 +0100 +Subject: [PATCH] m4: fix quoting in readline.m4 + +Without this, with autoconf-2.72 at least, we get: +``` +$ ./configure +[...] +checking for pkg-config... /usr/sbin/pkg-config +checking pkg-config is at least version 0.9.0... yes +checking for tputs in -lcurses... ./configure: 5319: ac_fn_c_try_link: not found +no +checking for tputs in -lncurses... no +[...] +``` +--- a/m4/readline.m4 ++++ b/m4/readline.m4 +@@ -9,24 +9,21 @@ AC_ARG_ENABLE(readline, + [use_readline=$enableval], + [use_readline=yes]) dnl Defaults to ON (if found) + +-if test "$use_readline" = "yes"; then +- AC_CHECK_LIB(curses, tputs, LIBS="$LIBS -lcurses", +- AC_CHECK_LIB(ncurses, tputs)) +- AC_CHECK_LIB(readline, readline) ++AS_IF([test "$use_readline" = "yes"], [ ++ AC_CHECK_LIB([curses], [tputs], [LIBS="$LIBS -lcurses"], ++ [AC_CHECK_LIB([ncurses], [tputs])]) ++ AC_CHECK_LIB([readline], [readline]) + +- AC_SEARCH_LIBS(add_history, history, +- AC_DEFINE(HAVE_ADD_HISTORY, 1, [Define if you have the add_history function]) ++ AC_SEARCH_LIBS([add_history], [history], ++ AC_DEFINE([HAVE_ADD_HISTORY], [1], [Define if you have the add_history function]) + ) + +- AC_CHECK_HEADERS(history.h readline/history.h readline.h readline/readline.h) ++ AC_CHECK_HEADERS([history.h readline/history.h readline.h readline/readline.h]) + + # Check for rl_completion_matches as in readline 4.2 +- AC_CHECK_FUNCS(rl_completion_matches) +- ++ AC_CHECK_FUNCS([rl_completion_matches]) ++ + msg_readline="enabled" +-else ++], [ + msg_readline="disabled" +-fi +- +-]) +- ++])]) +-- +2.44.0 + diff --git a/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch new file mode 100644 index 000000000000..d2e18eefade4 --- /dev/null +++ b/net-misc/cadaver/files/cadaver-0.24-link-cflags.patch @@ -0,0 +1,26 @@ +https://github.com/notroj/cadaver/pull/42 + +From e798c0144d3042cf6139d1ab85d84a8416cf5f00 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 17 Apr 2024 00:51:57 +0100 +Subject: [PATCH] Makefile.in: include CFLAGS at link-time + +GCC's documentation recommends this [0] for e.g. LTO. As a trivial silly +example, my -fdiagnostics-color=always was stripped out, so a warning +I got wasn't in colour. + +[0] https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto +--- a/Makefile.in ++++ b/Makefile.in +@@ -56,7 +56,7 @@ all: $(TARGET) + .PHONY: subdirs install clean distclean + + $(TARGET): $(ALLOBJS) subdirs +- $(CC) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS) + + .c.o: + $(CC) $(ALL_CFLAGS) -o $@ -c $< +-- +2.44.0 + diff --git a/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch b/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch new file mode 100644 index 000000000000..9b6d1a2dceb7 --- /dev/null +++ b/net-misc/cadaver/files/cadaver-0.24-neon-0.33.patch @@ -0,0 +1,15 @@ +Trimmed from diffing upstream d0de5ee5276e83ac1b5ff6bde56084a565bff5fb +to 3c8ecfe9bc8a7fbee58425be69aea89ae3f718e9, which included some +extraneous bits. + +--- a/configure.ac ++++ b/configure.ac +@@ -35,7 +35,7 @@ AS_HELP_STRING([--disable-netrc],[enable .netrc support]),, + + NEON_WITH_LIBS + +-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32]) ++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32 33]) + + dnl Don't enable zlib or ACL support in neon + NEON_WITHOUT_ZLIB diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml index 9bb005e5c177..f3445a9a70b0 100644 --- a/net-misc/cadaver/metadata.xml +++ b/net-misc/cadaver/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arfrever.fta@gmail.com</email> - </maintainer> - <maintainer type="person" proxied="proxy"> - <email>floppym@gentoo.org</email> - <name>Mike Gilbert</name> - </maintainer> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">notroj/cadaver</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/calico-cni-plugin/Manifest b/net-misc/calico-cni-plugin/Manifest deleted file mode 100644 index 1f08dd709d96..000000000000 --- a/net-misc/calico-cni-plugin/Manifest +++ /dev/null @@ -1,69 +0,0 @@ -DIST calico-cni-plugin-3.1.3.tar.gz 64054 BLAKE2B 782847ca79306b27fffd0426b9cd7c5b8e34f39634491beafc1c652d26dd0ebd84b46116b12b3f6e8ebdff4a8aa5db52966ac62e1bba595456f41bbdb3c48fd8 SHA512 d4c064d4f7b5e65c933d6b7866ffc077e20da35ae3af03d8b0175f01f9fb87857a5c891f8e15b877e6a1c238c894a8163458197f7921d866b7a180ed52eed527 -DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536 -DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b -DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9 -DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d -DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277 -DIST github.com-containernetworking-cni-a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz 173167 BLAKE2B 9aad6388fd9c307a31a37a746684ed9fc52ff556ef5209e14c2afebf69af0abc28cb9d825245b87a49fd9947f638344b92143868fea7852db0bd2bc39239a2e1 SHA512 0607a4213f1291cff03d21d6860a8830ad998bcb4c6e3489bf0a8c207137fe9b958c3c453e9cf6fe0911a219d250d89f0e8b3c457900893b9ed8bd31dc696777 -DIST github.com-containernetworking-plugins-7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz 789110 BLAKE2B b04688b90503cb01aa18d9c1227b7cb510846f8b42678729fb7a80bf914ef4a06c399a8f165b7f01d6a05aaf98d4e97c17675a3774745a7850862bdd609b5168 SHA512 2aa1a665531c2e6b7800d38abdec4f0b68e778ae27c638b4ab097abb720c66a4863fd1f4b59dc818b91bddbc5c7dce4e1fefddfda11881e2334d7b71122bd60e -DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8 -DIST github.com-coreos-go-iptables-b5b1876b170881a8259f036445ee89c8669db386.tar.gz 13564 BLAKE2B 5d0227229ccb548a8978f0ff4f45d55437995ebf09d6af0f71f2fd6fb9ca6ebee58a75c0eb1b8badafd85dc79651672476b8298404dc13aaf8c602bd914a715c SHA512 df1a5c19ac8cd10602886f0adedce07629f56a055bd401caf64e9b330aa7dc40995d203b446bd5486f67c6f932bfcafe4e6af7ff6f9480ec815763bcccc374c8 -DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc -DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa -DIST github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz 59771 BLAKE2B 91eaedb1f78485b68000b02a9ea86f86a156e8109ea173b3593407ff5779ac1f4652465bd617b13e7ff95ddd7d12d1d39a284fee2c59dcc53e63626b5e1680ab SHA512 c762005454ce5247941d86fb8587ed8229927c1ce81fdac8601ffe41d535d1b3d89f81366be2c0bff13c8fdf2750c7db4b913b0548f19b71e2ab7a7654ab8a71 -DIST github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz 21204 BLAKE2B 4179c708d75c58cfda85d463541055cd772caeeb67edc8446d068443bc5c7dc894e536a4cd3795c2104e4b3a891ac1f766a8c6ceaa4d000884bb3a529d3ae2ad SHA512 91e097bbf4711d203f6e31e73a1d67ca200a7ff707ab4f517f1f61fc2f6347fcd6aa7811bd4036a8f5211623cff45ca6acbb23330b4e453dbeb1f7aafc112fb6 -DIST github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz 11681 BLAKE2B 324d15744ed3c966870108c6a55ad41a275c05457738dcf9be94e8be5c0a17d198a3347b858f788ec60ca1dca0bf0d5b65bca7010aac49cee90fe199f22bf5db SHA512 b8b3d46f3b3a6bb7c59db4623a44c938d6e9ccf521fe271342778261590c5f702af743a845c29d17d4e8c83e7c68228a7c93e3f43af536d6239ea6b4cfb7d2e0 -DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb -DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac -DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a -DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe -DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab -DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz 61555 BLAKE2B 824dd1ba4f97bc7b77f8e511bda1fdc7acbe1828d81d9c88f913f139b46ee0bfca6ec8b901d7b216023b987b28d98a848ccceb0f41bed1eca8004b5f5c71922d SHA512 dadcdf9c03528991672277ab8414e9f2a1b1868c855d80dcff16560c8d4a46ee6b4c17961e5d4dac7ebded3cd423b4ffbc6eb6ff0d05ea3a67e39c0eb4a1afb6 -DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5 -DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459 -DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455 -DIST github.com-golang-crypto-1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz 860438 BLAKE2B a19c673d984177faf078a04b7351258fed56390d09bb74f715409e30a7c99b68ef1861f1890db0683370c290a4fcec8f2a1d82a01e9132160f5a3a2954b9cfe1 SHA512 693f3586a09e2149ceda3b6833154acdd7d924eb6e225697db4d103a9a907147a9b1860efbd0dcecf2db6b39f44b0e6e6414eff318ae4ccaaf36e18f505f438a -DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9 -DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3 -DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a -DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31 -DIST github.com-golang-sys-076b546753157f758b316e59bcb51e6807c04057.tar.gz 596056 BLAKE2B f9b44588375bc50d843fc9e5353744f61e15ea4ca5f62aadedcaabc7f99fdbe6ffbfbcc9a73c8fb1fd60045bcc660e3f282dc0a4f3c5338c680f32ed85c543e9 SHA512 1084079e6d95c9a211282b0a2093719e4ee36e297353f92ab5517cf193e7a083c3ef85df799fdddbe4c9629482424e32045382679b5160a4c074dbb53c242d96 -DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d -DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9 -DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4 -DIST github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557 -DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136 -DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc -DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d -DIST github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz 335349 BLAKE2B b46ce36f6eb708cbc112a472ee094c9b2f624951fb35523fe2a5b3af224bff2c3264e9a457eb00379f1f0686c43509a6186c654eebf04f0c6dc8145ccc616b7d SHA512 dcde974ece3cdcf3f0ab70496c9fb704469b66a98b8d9f1b645f9c9b73fb2edb0116f04caa6af136250131e2875c06a61aca8c7ee0bb2f7a1640d1671f66526d -DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995 -DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c -DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c -DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958 -DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77 -DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf -DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b -DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d -DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9 -DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0 -DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81 -DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec -DIST github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz 12403 BLAKE2B 2c800f93b933a49b292240eef973a01e54fc7e0a3d613629e6e2d506ffdf98c2430de7498adb4ea19b4faf433aff146f70b98e88bd7ce9404cf25c68246b3449 SHA512 ef192dd1239db964e3969fa45bd7f0032cd0d0141cf3af560f40c0a44ce5651101f518363cb7a4fe017375d7cd1ffb23da27b02e3f5805742bb3772bec19bf5d -DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010 -DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4 -DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052 -DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747 -DIST github.com-projectcalico-felix-fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz 400965 BLAKE2B f5516523c7f5e9491c95e3ac4f399e1aeccc13d856c565f0f6756265f30c2654df95bf78220b4f0c68dfde9e9183f39d8609b64379e2268dc2fb31530140c575 SHA512 c89799c49cba672f223900cd83994a6667ccaafa2798a3cc320761b1f28367b2e07903c6d19c901af19e7859179089510b1dfcfc068075fb7e03724e9341215a -DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593 -DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755 -DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e -DIST github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9 -DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a -DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf -DIST github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz 77798 BLAKE2B 3e8daf72d7ca8d702898349617c48a62d4dd7cc5ebeb65bd63d38978f5d8f05e6d0f02237e1fe285630da198aba90783e27eee69ac6a06f90e1a7be3fad50b4c SHA512 bdf0b2f818f9df4685ec7536a7478cb86ab8a8297081c618d92b14bc0296c2c66c9ccb403b2f4af42a7fed769f3ce2020082e2e983e3f2668e14776a6d26828b -DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507 -DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2 -DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51 -DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7 -DIST github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz 85354 BLAKE2B e21e59ec6afe80055fc8e5b59405313afb4dae2dee1afb65f61f3d613b52ff2c3ce413dd40798b46030cca38da7ecfe3d17e17045c331061d48afb731cd64528 SHA512 a9ca7e3391ee1d2b1455f6357a557343a4e0d3800e40806fd20938a1669069228c3e8c273d0f968f3e551d230e93987fa8aac95d74bd838f8653db9824a6e730 -DIST github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz 7783 BLAKE2B afe0ea14577a220bd54eafa04abcef0ce7a7883637be10584d6b52727ecb60462648a54c5048dad1c6bb3202f6c3749b807ec59406e322f850063e79d8aa5cbb SHA512 c2d18179fb265e5fbf6c815797e374067e4dd09e47458908b5180768a4383f97b5599e927eba68905ef50c76e9b1819588256d1aa9a55cb40c05c8e20da0962f diff --git a/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild b/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild deleted file mode 100644 index 5de889537c18..000000000000 --- a/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.3.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_VENDOR=( -"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang" -"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d" -"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb" -"github.com/containernetworking/cni a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88" -"github.com/containernetworking/plugins 7480240de9749f9a0a5c8614b17f1f03e0c06ab9" -"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea" -"github.com/coreos/go-iptables b5b1876b170881a8259f036445ee89c8669db386" -"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8" -"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20" -"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46" -"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6" -"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee" -"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98" -"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272" -"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff" -"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72" -"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7" -"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed" -"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7" -"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017" -"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c" -"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba" -"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961" -"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6" -"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4" -"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" -"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc" -"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e" -"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342" -"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c" -"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0" -"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a" -"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac" -"github.com/onsi/ginkgo fa5fabab2a1bfbd924faf4c067d07ae414e2aedf" -"github.com/onsi/gomega 62bff4df71bdbc266561a0caee19f0594b17c240" -"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4" -"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6" -"github.com/projectcalico/felix fa15f1776244d1db9e30fcd99f51b8b99be509c8" -"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1" -"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2" -"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56" -"github.com/projectcalico/libcalico-go 0417ab6e1ea49be2abb978df365b25f20fdb3c6f" -"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1" -"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2" -"github.com/prometheus/common 7600349dcfe1abd18d72d3a1770870d9800a7801" -"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865" -"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4" -"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e" -"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" -"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba" -"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7" -"github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b" -"github.com/vishvananda/netns be1fbeda19366dea804f00efff2dd73a1642fdcc" -"golang.org/x/crypto 1351f936d976c60a0a48d728281922cf63eafb8d github.com/golang/crypto" -"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net" -"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2" -"golang.org/x/sys 076b546753157f758b316e59bcb51e6807c04057 github.com/golang/sys" -"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text" -"google.golang.org/appengine b1f26356af11148e710935ed1ac8a7f5702c7612 github.com/golang/appengine" -"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go" -"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto" -"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator" -"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf" -"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml" -"k8s.io/api a315a049e7a93e5455f7fefce1ba136d85054687 github.com/kubernetes/api" -"k8s.io/apimachinery 40eaf68ee1889b1da1c528b1a075ecfe94e66837 github.com/kubernetes/apimachinery" -"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go" -"k8s.io/kube-openapi 0c329704159e3b051aafac400b15baacf2a94a04 github.com/kubernetes/kube-openapi" -) - -inherit golang-vcs-snapshot - -KEYWORDS="~amd64" -DESCRIPTION="Calico Networking for CNI" -EGO_PN="github.com/projectcalico/cni-plugin" -HOMEPAGE="https://github.com/projectcalico/cni-plugin" -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -RDEPEND="net-misc/cni-plugins" - -src_prepare() { - default - pushd src/${EGO_PN} || die - sed -i -e "/calico-ipam:/ s/vendor//" -e "/calico:/ s/vendor//"\ - -e "s/git describe.*/echo ${PV})/" -e "s/CGO_ENABLED=0//" Makefile || die - rm -rf vendor/github.com/containernetworking/plugins/vendor/github.com/vishvananda/netlink\ - vendor/github.com/containernetworking/plugins/vendor/github.com/containernetworking/cni || die - popd || die -} - -src_compile() { - pushd src/${EGO_PN} || die - GOPATH="${S}:$(get_golibdir_gopath)" emake binary - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - exeinto /opt/cni/bin - doexe dist/${ARCH}/* - dodoc README.md - popd || die -} diff --git a/net-misc/calico-cni-plugin/metadata.xml b/net-misc/calico-cni-plugin/metadata.xml deleted file mode 100644 index da3c5167aa48..000000000000 --- a/net-misc/calico-cni-plugin/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">projectcalico/cni-plugin</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/calicoctl/Manifest b/net-misc/calicoctl/Manifest deleted file mode 100644 index 46ab2a19b167..000000000000 --- a/net-misc/calicoctl/Manifest +++ /dev/null @@ -1,85 +0,0 @@ -DIST calicoctl-3.1.3.tar.gz 87574 BLAKE2B bd1c00f5ba084bb7bb49af64fed0dfd3cac8da921f8e33ecafea1329d7d09de3d2051680f8f0a3638d1cb98b90a9cddf0a88438844f365ffcc1fc6a9d50d656c SHA512 7369ecbdb4c7afb383e0e47ab088022b020665854a66400ee415dbc64a9ce7fba32ace67e202d13e8feaf2bde7c7e3544ea46e98ea0e2f9fc59c7def4a851479 -DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536 -DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b -DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9 -DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d -DIST github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz 5943 BLAKE2B 35f99d69b58cbdf7b49d9aba5b8456c2702dd2fecec3da6e522e5d97e13b697037afe81c115a0a8980b25d99ad3216d3e07027c912a644a4efcb27c6c1404022 SHA512 431e41870728d86accd7ed78d1e16c92adebfe79cef59b7f656a395e4bf7727ae9521f7e9d291931590680fd32eaef26622d888f30a4a4511dbddcae8dda1c08 -DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf -DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8 -DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc -DIST github.com-dgrijalva-jwt-go-d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz 33471 BLAKE2B bd97ffc4bdef9c3c7007d9af34c2e330d3068379f0718b3f0831379d1ff7fdc2ca63e5579542152d68d546a23e82baeb601cc796cc76a82154b2f488f789721f SHA512 12a26fd70674394fe5dc64695314d85c08370d134c8af0d8047363938c90c23f40e0f8f8b25e9288c40bdb28513cfe64fac738a6e557f5425531d7dac01586e8 -DIST github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz 23844 BLAKE2B 9c999258dde04fdaeb9dd4cab9d5aaa854f99d0bb2fb6d7e9fa67b829c0d5062139eba06abe3323c1c9d79093b45f8c29e33835797a693dd73c217309ef33286 SHA512 1d97e29b2dd84b3ccb619efbffa396ad0f988c5e09e18136edb64ed046d25512e31bd43f5586852d520ef2a38bd98ae2fd9c2e66c49bb52e828c386285bd9391 -DIST github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz 11711 BLAKE2B d024ead4af79692729ebf790a26e53ceefd005efc97017a9ebedfa345640c1f86cbaf1c61267abc478619b41c371887dcc363672a7d4a7cc61476997ca81864e SHA512 378d5ae07b41275c6a1633e26470255210ba62d6fdd6b926ae3f48e37160f659fc050e9866267cbfd86fe07a8c0ef3cd00eeda8cd9deb0ef66af697773d71601 -DIST github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz 3503 BLAKE2B 95a0030b182097aa1fb640f34b60fa094073f57ed576da5180b49e254e20f88a5b3980742b43d55e02c715a8dec9f0a58a5410ab91c88a19ebcf1584ab0f7216 SHA512 7aff388e6908911bee51e0c22be9252981c22980d78f911b96235e2ea0f8ddb38b80bc3c513dbd30f8514ab3012f83e688b0beb959c917b5b45d6db57c15a162 -DIST github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz 59771 BLAKE2B 91eaedb1f78485b68000b02a9ea86f86a156e8109ea173b3593407ff5779ac1f4652465bd617b13e7ff95ddd7d12d1d39a284fee2c59dcc53e63626b5e1680ab SHA512 c762005454ce5247941d86fb8587ed8229927c1ce81fdac8601ffe41d535d1b3d89f81366be2c0bff13c8fdf2750c7db4b913b0548f19b71e2ab7a7654ab8a71 -DIST github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz 21204 BLAKE2B 4179c708d75c58cfda85d463541055cd772caeeb67edc8446d068443bc5c7dc894e536a4cd3795c2104e4b3a891ac1f766a8c6ceaa4d000884bb3a529d3ae2ad SHA512 91e097bbf4711d203f6e31e73a1d67ca200a7ff707ab4f517f1f61fc2f6347fcd6aa7811bd4036a8f5211623cff45ca6acbb23330b4e453dbeb1f7aafc112fb6 -DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8 -DIST github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz 11681 BLAKE2B 324d15744ed3c966870108c6a55ad41a275c05457738dcf9be94e8be5c0a17d198a3347b858f788ec60ca1dca0bf0d5b65bca7010aac49cee90fe199f22bf5db SHA512 b8b3d46f3b3a6bb7c59db4623a44c938d6e9ccf521fe271342778261590c5f702af743a845c29d17d4e8c83e7c68228a7c93e3f43af536d6239ea6b4cfb7d2e0 -DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb -DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac -DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a -DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe -DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab -DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz 61555 BLAKE2B 824dd1ba4f97bc7b77f8e511bda1fdc7acbe1828d81d9c88f913f139b46ee0bfca6ec8b901d7b216023b987b28d98a848ccceb0f41bed1eca8004b5f5c71922d SHA512 dadcdf9c03528991672277ab8414e9f2a1b1868c855d80dcff16560c8d4a46ee6b4c17961e5d4dac7ebded3cd423b4ffbc6eb6ff0d05ea3a67e39c0eb4a1afb6 -DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 5515 BLAKE2B 9ae2c00b43da5958392e0817f448d01374712ce7552c07be0de8204a7f16a7442b195695d51782a375da7aaa83019446438d52a8768317216a7812380be8c1b1 SHA512 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d -DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5 -DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459 -DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455 -DIST github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz 1435086 BLAKE2B 5c9cc162a9a3a17c4423a74717244fb2254db0e83408907a843b3cf684653d71ce4c33fcaca5dc8ca86f99a9b36a7147fced051778e9655f7e6acd01b09df603 SHA512 7335eca4fafdede3f5737900c46ba92ba598ec2e36534b5f507dc7684e5a68a1dc3dde6137172c6fab7445ee811612a5c1da3f8db180188fa4bc91935c9a489e -DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9 -DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3 -DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a -DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31 -DIST github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz 801102 BLAKE2B d23a2bcfaa8fe92313f6e3fa577533e513181f40568c401918d4345c03434a39947e552b20165d4334c8aa981024e146a131a98e8ba9e0d622622e53bc578864 SHA512 7df873ade422b5d45271554325301620fed25a5658d1862d3a63222f406acf17bd39fb67d632387b9438e5291720dae4b086bd09810a8c897c457aba7a60fed0 -DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d -DIST github.com-google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz 12725 BLAKE2B d9db98b01c8b4b3e62fcd8f94e890c58ab80dce88f8a8b811eff9fcd9e35a76a53dabbe591f66b10e281c268806d69b29f558091d0e091612443197dd9ba5ca8 SHA512 16b23b56b7e99ef19b1e8251b646f13be1bac0f41df8077d80235434c1c3f187fec3782667eb7ff022442915ffeca1b28ff18b410bd7c6cb9db29a72beb168c9 -DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4 -DIST github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557 -DIST github.com-googleapis-gnostic-68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz 290203 BLAKE2B 597bc6f65176cb615107b06317ac30ba94b5465d79147ed92e5d41973d714ae091dec237094c7c53e1dcbb192d3f5856daa7eef156339e5081d7c58b1ce4b3bf SHA512 95b65bde3921e31bfefa11a9631d7d6b7908f457695ef4544d7039395c270cd4a2b0bd9ff0a62be4f6bd0e35853823687e5fc6100993384573a309318b6a2e21 -DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc -DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d -DIST github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz 335349 BLAKE2B b46ce36f6eb708cbc112a472ee094c9b2f624951fb35523fe2a5b3af224bff2c3264e9a457eb00379f1f0686c43509a6186c654eebf04f0c6dc8145ccc616b7d SHA512 dcde974ece3cdcf3f0ab70496c9fb704469b66a98b8d9f1b645f9c9b73fb2edb0116f04caa6af136250131e2875c06a61aca8c7ee0bb2f7a1640d1671f66526d -DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995 -DIST github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz 70427 BLAKE2B 3b699fd5923ce6c823bed429fdbaecd0ea3f1a7518e37d7b4698b2b112e24c049a90994c1651fc66f0def3958865b88374ebb39e03618c09a49a5795661d3498 SHA512 d56f15b28e89c638d2d5c4f7859d3612ae7c7f981a6950ea59bb87987ac4db6a3582b00680ccd4f9e579b3d2c5e53958d89941270366e159772959a4c5b1e96f -DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c -DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c -DIST github.com-influxdata-influxdb-0253f6fe05e8aa5d5382ef7a05d5c956a11fac94.tar.gz 1290543 BLAKE2B 6517450c7d4cdac1908ed0a498c4cf6c66ec5f64631edabd5293c3eacae02a4650affc4af80beecc024d34aaa629827b9d116974f2b2bbb978fa57c119b143f7 SHA512 ca66e7fb49c3525222a3dd90bc62cf835218d95018ce093a2464b42b70293c3a7203c9a930e92d788be6f67a90558def5d6c62802280fdf382874acf372ee8ac -DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958 -DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77 -DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf -DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b -DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d -DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9 -DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0 -DIST github.com-magiconair-properties-c2353362d570a7bfa228149c62842019201cfb71.tar.gz 29495 BLAKE2B f394e50ce58dfb59db8e8ef6364cdf494604cec2e042009a8a72250908102ce31bac173291f9c75ad585cc570fb7635b7146b1ec85daf01899945b5bbe1be621 SHA512 fe3e521365758b42df60acd8d582a080eb4828ef56cd20da57b6041074bc4b7673f01a6ee83d8271abf60609efd0c200149ccd7564da1b3a40bbf3e2c9967e66 -DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81 -DIST github.com-mattn-go-runewidth-ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb.tar.gz 22988 BLAKE2B 3fb35426ba8d909d20a1fd939998685efc4b8ae684defe13b27d344350b7de366b05953eecf93ed192263e8d72380c7f4c644334f1192f1482393d8c7390b511 SHA512 1379124ce0f1c83d6677b110ff43ee6b8b003d125b311666de2fc029d25b59ea895dac1bfd812ceb360457379276650f62b8747d9fba15de78f3b57cf7d72af9 -DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec -DIST github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz 12403 BLAKE2B 2c800f93b933a49b292240eef973a01e54fc7e0a3d613629e6e2d506ffdf98c2430de7498adb4ea19b4faf433aff146f70b98e88bd7ce9404cf25c68246b3449 SHA512 ef192dd1239db964e3969fa45bd7f0032cd0d0141cf3af560f40c0a44ce5651101f518363cb7a4fe017375d7cd1ffb23da27b02e3f5805742bb3772bec19bf5d -DIST github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz 7591 BLAKE2B a5f8b5f65740ea93f2dcd753567885530c4ec9cde743780e74fe0fe08056f87464f398ee6fba37b26a2d74342d839df45c7fe649f3857018649c86d96c87ec67 SHA512 143b517ef8b5a8bda86dee77b573b12e051816bb6cd0ba962befa3fde4d849a4b95c02c76d36a08209fa29681bbb39fe28a69ba9fb326f218bb4f3ca70350496 -DIST github.com-mitchellh-mapstructure-bb74f1db0675b241733089d5a1faa5dd8b0ef57b.tar.gz 18671 BLAKE2B a06836438c27cd4386fe3d2fb234a4ecccbc011fefffb52f9cb71f55443360c186c48e603ae745a6266b7356fbfddd92465f246b73b2bd5b9fe233af979bb552 SHA512 b5740447fa3b81ff8b713f328dbbf866f01527ee71f23141595d0c0f39d865f9ea95a04bac118dc223a3ebfc3ebeb5b8f857fec66f4232ef7da8f292ac8cab59 -DIST github.com-olekukonko-tablewriter-d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz 17378 BLAKE2B 23cf5e288d72278f082e1b533ef8324abc268a317b7c11772af89f964e646b22fa246833eff4d0307a89dc89c0c304e3dcb3e37ac1f3252f7213655acdf887b6 SHA512 9418d06e67a72089f0b35f9f7eb1d0da68ee8c433e4577b798a6ba428233b2f9c3bec5723ed6620c5ed257ccb1a1f32262394f21d4d781c3d56e8b2034ac7111 -DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010 -DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4 -DIST github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz 669740 BLAKE2B afecd69c02b30555625e96ae9fde583336620e2ba8129817bf4af60a1db4ce33c630e0d7de47d42996970ec94a781a895ba8a938a3132dca560e8d2c1a0529bd SHA512 5d9da0f1ccb9443e834d32662906c8cda0c4b0a780d61283a433e0a86af97579938ab5814e5c337c3febe57963256db0107564e73884eaf78edb2357fc4eb7b1 -DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052 -DIST github.com-pelletier-go-toml-66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz 56998 BLAKE2B 3971cf040257c6daf6175f25ea01b8026a04b74d5a56dfa0a562fbd6e64ae7111aaf94080c141f2c595ebd38cc3f0611f7f05e419254fc40c63c4493f2a468c7 SHA512 3aa9af45b36d280637231fbab39584542ba0892cc0bab177add01254caf90a49d14c4131249e5615b8035cc61dbaff8b65da27148a1026fb36d32d4ac48dc13f -DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747 -DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593 -DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755 -DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e -DIST github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9 -DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a -DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf -DIST github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz 62671 BLAKE2B ed69c90e91c3a219e9b037a416c730471729fd26498c0648793d54cad6b740a8f27f65371d6b2c8eddf67dda112706e9b166afbf122d0bfc0dc38aeecaf2b1ab SHA512 c12f04e6564bf370919e77fced2500ad09d5ff90a928b031838d73b62092a81d91ece808391d2864f08a7f2ead29087122baebaf8bc7294645997186691b5cb4 -DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507 -DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2 -DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51 -DIST github.com-spf13-afero-63644898a8da0bc22138abf860edaf5277b6102e.tar.gz 45193 BLAKE2B 78dd065841571fee60c41a83af08a97478f8a47599eb4e451717a8460856fd20be7732761b8321514993b65477c92492e81eb69d2548bf2468b5e072b2d2d25d SHA512 c1e1e2af81d6474a0404c3d3152b1ba8b89e6f3f90234e2fe869ffad6003f44773ca9411d96e70c959ea8a5ac9d8ff8fb11360edda71eea2e4de96b815e06d51 -DIST github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz 9864 BLAKE2B e2bca43b06e8cedc63504b716f052ae5d6da90d2336372bdcf1c7bd456e8e60c9f830fa1da6cc6602b4355196c8c0e74e480f55020ead5706f3e0bead1cba08d SHA512 96ed2d94c7e970c9894751245fe4a0b17b6fa2f0fc524d3c8a05463dc5bf81d48bba4d01c0c742ca492f756fd6f21034c2cd1be44047d79f7ab87d2e4c76f1d7 -DIST github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz 6345 BLAKE2B dad5459a45bc35e28f9ed7473a02bbfdfcc8da06e17cee15a1876125829065fd4bcaad35b8ec489f3b308637a3fa9cd829c04836207620e61db1a7f706660c6c SHA512 f98c62d7e74ce3e35c29862244d46fb19fcd615e500713dd7c26b30ebedd7a846e419af6586031b748029b8b4d5e32baff6d36bb1ec35856bb6ad5625a407f14 -DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7 -DIST github.com-spf13-viper-15738813a09db5c8e5b60a19d67d3f9bd38da3a4.tar.gz 32109 BLAKE2B 3d1f8c8d943766a7b7402f30ce80fe78a96b8455f901b6c3dab786682c84ba3a7515e62b1f62f5124564f6ea664abea1e2f77685e259f5e31db3241aeb89c826 SHA512 18fd5063350bec742ec85d7299c678d825be9f6745990264fe98c6b874ab3abe9bc478fb97059b2e675b78dc5bc3f12fc9ae65ce9e7c170f8abf9498b6e78071 -DIST github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz 3684 BLAKE2B 92a9f37acc2c3f497c432be4519edc02db7d5bb371309183a3a52034cf12e4626b8b018f7b17e3128a406edbce24db1d2c5a0176f8221907c27f198696a2d737 SHA512 b007be79389160c27a602f4ec35a969a408abb340ab9b3bd8f44578a6dd9ac95fcede4edc56b1c1c7a2a9f258c5cb448cda54bc91d6dd17f0464cb050b946769 -DIST github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz 85354 BLAKE2B e21e59ec6afe80055fc8e5b59405313afb4dae2dee1afb65f61f3d613b52ff2c3ce413dd40798b46030cca38da7ecfe3d17e17045c331061d48afb731cd64528 SHA512 a9ca7e3391ee1d2b1455f6357a557343a4e0d3800e40806fd20938a1669069228c3e8c273d0f968f3e551d230e93987fa8aac95d74bd838f8653db9824a6e730 -DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86 diff --git a/net-misc/calicoctl/calicoctl-3.1.3.ebuild b/net-misc/calicoctl/calicoctl-3.1.3.ebuild deleted file mode 100644 index 8c4041dc0315..000000000000 --- a/net-misc/calicoctl/calicoctl-3.1.3.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_VENDOR=( -"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang" -"github.com/armon/go-radix 1fca145dffbcaa8fe914309b1ec0cfc67500fe61" -"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d" -"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4" -"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea" -"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8" -"github.com/dgrijalva/jwt-go d2709f9f1f31ebcda9651b03077758c1f3a0018c" -"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f" -"github.com/eapache/channels 47238d5aae8c0fefd518ef2bee46290909cf8263" -"github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d" -"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46" -"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6" -"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9" -"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee" -"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98" -"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272" -"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff" -"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72" -"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7" -"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed" -"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7" -"github.com/google/btree 925471ac9e2131377a91e1595defec898166fe49" -"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c" -"github.com/googleapis/gnostic 68f4ded48ba9414dab2ae69b3f0d69971da73aa5" -"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961" -"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6" -"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4" -"github.com/hashicorp/hcl ef8a98b0bbce4a65b5aa4c368430a80ddc533168" -"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" -"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc" -"github.com/influxdata/influxdb 0253f6fe05e8aa5d5382ef7a05d5c956a11fac94" -"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e" -"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342" -"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c" -"github.com/magiconair/properties c2353362d570a7bfa228149c62842019201cfb71" -"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0" -"github.com/mattn/go-runewidth ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb" -"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a" -"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac" -"github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062" -"github.com/mitchellh/mapstructure bb74f1db0675b241733089d5a1faa5dd8b0ef57b" -"github.com/olekukonko/tablewriter d4647c9c7a84d847478d890b816b7d8b62b0b279" -"github.com/onsi/ginkgo fa5fabab2a1bfbd924faf4c067d07ae414e2aedf" -"github.com/onsi/gomega 62bff4df71bdbc266561a0caee19f0594b17c240" -"github.com/osrg/gobgp bbd1d99396fef6503e308d1851ecf91c31006635" -"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4" -"github.com/pelletier/go-toml 66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12" -"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6" -"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1" -"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2" -"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56" -"github.com/projectcalico/libcalico-go 0417ab6e1ea49be2abb978df365b25f20fdb3c6f" -"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1" -"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2" -"github.com/prometheus/common e3fb1a1acd7605367a2b378bc2e2f893c05174b7" -"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865" -"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4" -"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e" -"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" -"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba" -"github.com/spf13/afero 63644898a8da0bc22138abf860edaf5277b6102e" -"github.com/spf13/cast 8965335b8c7107321228e3e3702cab9832751bac" -"github.com/spf13/jwalterweatherman 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394" -"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7" -"github.com/spf13/viper 15738813a09db5c8e5b60a19d67d3f9bd38da3a4" -"github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c" -"github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b" -"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8" -"golang.org/x/crypto 9419663f5a44be8b34ca85f08abc5fe1be11f8a3 github.com/golang/crypto" -"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net" -"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2" -"golang.org/x/sys 88d2dcc510266da9f7f8c7f34e1940716cab5f5c github.com/golang/sys" -"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text" -"google.golang.org/appengine b1f26356af11148e710935ed1ac8a7f5702c7612 github.com/golang/appengine" -"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto" -"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go" -"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator" -"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf" -"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb" -"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml" -"k8s.io/api a315a049e7a93e5455f7fefce1ba136d85054687 github.com/kubernetes/api" -"k8s.io/apimachinery 40eaf68ee1889b1da1c528b1a075ecfe94e66837 github.com/kubernetes/apimachinery" -"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go" -"k8s.io/kube-openapi 0c329704159e3b051aafac400b15baacf2a94a04 github.com/kubernetes/kube-openapi" -) - -inherit golang-vcs-snapshot - -CALICOCTL_COMMIT="231083c2ce934b7946ebed3ed96f4fc1a3ba4f69" - -KEYWORDS="~amd64" -DESCRIPTION="CLI to manage Calico network and security policy" -EGO_PN="github.com/projectcalico/calicoctl" -HOMEPAGE="https://github.com/projectcalico/calicoctl" -MY_PV=${PV/_/-} -SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -RESTRICT="test" - -src_compile() { - pushd "src/${EGO_PN}" || die - GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o dist/calicoctl -ldflags \ - "-X github.com/projectcalico/calicoctl/calicoctl/commands.VERSION=${PV} \ - -X github.com/projectcalico/calicoctl/calicoctl/commands.BUILD_DATE=$(date -u +'%FT%T%z') \ - -X github.com/projectcalico/calicoctl/calicoctl/commands.GIT_REVISION=${CALICOCTL_COMMIT}" "./calicoctl/calicoctl.go" || die - popd || die -} - -src_install() { - pushd "src/${EGO_PN}" || die - dobin "dist/${PN}" - dodoc README.md -} diff --git a/net-misc/calicoctl/metadata.xml b/net-misc/calicoctl/metadata.xml deleted file mode 100644 index c56a56f4f13d..000000000000 --- a/net-misc/calicoctl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">projectcalico/calicoctl</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild b/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild index bfde1b35807a..4ef170f9f5a7 100644 --- a/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild +++ b/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild @@ -1,21 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2" -HOMEPAGE="https://www.sourceforge.net/projects/cbqinit/" -SRC_URI="mirror://sourceforge/cbqinit/cbq.init-v${PV} -> ${P}" +HOMEPAGE="https://sourceforge.net/projects/cbqinit/" +SRC_URI="https://downloads.sourceforge.net/cbqinit/cbq.init-v${PV} -> ${P}" +S="${WORKDIR}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc sparc x86" -IUSE="" RDEPEND="sys-apps/iproute2" -DEPEND="" - -S=${WORKDIR} src_unpack() { cp "${DISTDIR}"/${P} "${S}"/cbqinit || die diff --git a/net-misc/cbugzilla/Manifest b/net-misc/cbugzilla/Manifest deleted file mode 100644 index 4742c7369e92..000000000000 --- a/net-misc/cbugzilla/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cbugzilla-0.2.1.tar.xz 240824 BLAKE2B ff3332d954d0c3be92b5104e1a13668be66952ee20caaa65ad302a299c87b893f77179415b5a90d0873550f2ddf5646eadd18040851c7bc3ba913e130930db32 SHA512 4a5671bfb222d17841082d123e68250526f6504aee3ba816b454b5d37174391eb464a7e3eaa9fdcfbbb5619b443b4af28ae520dc4bfd49faab1e523d59e2392f diff --git a/net-misc/cbugzilla/cbugzilla-0.2.1.ebuild b/net-misc/cbugzilla/cbugzilla-0.2.1.ebuild deleted file mode 100644 index 72f69a411921..000000000000 --- a/net-misc/cbugzilla/cbugzilla-0.2.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="CLI and C api to get data from Bugzilla" -HOMEPAGE="https://github.com/yaccz/cbugzilla" -SRC_URI="https://dev.gentoo.org/~yac/distfiles/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - app-text/htmltidy - dev-libs/libxdg-basedir - net-misc/curl -" -RDEPEND="${DEPEND}" - -DOCS=( "README.rst" "ChangeLog.rst" ) - -src_configure() { - econf --disable-werror -} diff --git a/net-misc/cbugzilla/metadata.xml b/net-misc/cbugzilla/metadata.xml deleted file mode 100644 index f77025bdfa2c..000000000000 --- a/net-misc/cbugzilla/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!--maintainer-needed--> - <upstream> - <remote-id type="github">yaccz/cbugzilla</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest deleted file mode 100644 index 9c943e341df3..000000000000 --- a/net-misc/cfengine/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc -DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7 SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9 diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild deleted file mode 100644 index 7ade88aede8b..000000000000 --- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit autotools epatch - -MY_PV="${PV//_beta/b}" -MY_PV="${MY_PV/_p/p}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="An automated suite of programs for configuring and maintaining Unix-like computers" -HOMEPAGE="http://www.cfengine.org/" -SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz - masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-${MY_PV}.tar.gz -> ${PN}-masterfiles-${MY_PV}.tar.gz )" - -LICENSE="GPL-3" -SLOT="3" -KEYWORDS="~amd64 ~x86" - -IUSE="acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet vim-syntax xml" - -DEPEND="acl? ( virtual/acl ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql ) - selinux? ( sys-libs/libselinux ) - tokyocabinet? ( dev-db/tokyocabinet ) - qdbm? ( dev-db/qdbm ) - libvirt? ( app-emulation/libvirt ) - xml? ( dev-libs/libxml2:2 ) \ - dev-libs/openssl:= - dev-libs/libpcre:= - net-libs/libnsl:=" -RDEPEND="${DEPEND}" -PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" - -REQUIRED_USE="^^ ( qdbm tokyocabinet )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - epatch "${FILESDIR}/${P}-ifconfig.patch" - epatch "${FILESDIR}/${P}-sysmacros.patch" - eautoreconf -} - -src_unpack() { - unpack ${MY_P}.tar.gz - if use masterfiles; then - unpack ${PN}-masterfiles-${MY_PV}.tar.gz - fi -} - -src_configure() { - # Enforce /var/cfengine for historical compatibility - - econf \ - --enable-fhs \ - --docdir=/usr/share/doc/${PF} \ - --with-workdir=/var/cfengine \ - --with-pcre \ - $(use_with acl libacl) \ - $(use_with qdbm) \ - $(use_with tokyocabinet) \ - $(use_with postgres postgresql) \ - $(use_with mysql mysql check) \ - $(use_with libvirt) \ - $(use_enable selinux) - - # Fix Makefile to skip inputs, see below "examples" - #sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die - - # We install the documentation through portage - sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die -} - -src_install() { - newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd - newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord - newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd - - emake DESTDIR="${D}" install - - # fix ifconfig path in provided promises - find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g" - - # Evil workaround for now.. - mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF} - - dodoc AUTHORS - - if ! use examples; then - rm -rf "${D}"/usr/share/doc/${PF}/example* - fi - - # Create cfengine working directory - dodir /var/cfengine/bin - fperms 700 /var/cfengine - - # Copy cfagent into the cfengine tree otherwise cfexecd won't - # find it. Most hosts cache their copy of the cfengine - # binaries here. This is the default search location for the - # binaries. - for bin in promises agent monitord serverd execd runagent key; do - dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin - done - - if use masterfiles; then - insinto /var/cfengine - doins -r "${WORKDIR}/masterfiles" - fi - - dodir /etc/env.d - echo 'CONFIG_PROTECT=/var/cfengine/masterfiles' >"${ED}/etc/env.d/99${PN}" || die -} - -pkg_postinst() { - echo - elog "NOTE: BDB (BerkelyDB) support has been removed as of ${PN}-3.3.0" - echo - einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided." - einfo - einfo "To run cfengine out of cron every half hour modify your crontab:" - einfo "0,30 * * * * /usr/sbin/cf-execd -F" - echo - - elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:" - elog "emerge --config ${CATEGORY}/${PN}" - - # Fix old cf-servd, remove it after some releases. - local found=0 - for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do - found=1 - rm $fname - ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:') - done - - if [ "${found}" -eq 1 ]; then - echo - elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd" - fi -} - -pkg_config() { - if [ "${ROOT}" == "/" ]; then - if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then - einfo "Generating keys for localhost." - /usr/sbin/cf-key - fi - else - die "cfengine cfkey does not support any value of ROOT other than /." - fi -} diff --git a/net-misc/cfengine/files/cf-execd.rc6 b/net-misc/cfengine/files/cf-execd.rc6 deleted file mode 100644 index 8c3936d8a718..000000000000 --- a/net-misc/cfengine/files/cf-execd.rc6 +++ /dev/null @@ -1,18 +0,0 @@ -#!/sbin/openrc-run - -depend() { - need net - after cf-serverd -} - -start() { - ebegin "Starting cf-execd" - start-stop-daemon --start --exec /usr/sbin/cf-execd -- ${EXTRA_OPTS} - eend $? -} - -stop() { - ebegin "Stopping cf-execd" - start-stop-daemon --stop --pidfile /var/cfengine/cf-execd.pid --exec /usr/sbin/cf-execd - eend $? -} diff --git a/net-misc/cfengine/files/cf-monitord.rc6 b/net-misc/cfengine/files/cf-monitord.rc6 deleted file mode 100644 index 6f985a62b020..000000000000 --- a/net-misc/cfengine/files/cf-monitord.rc6 +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run - -depend() { - need net -} - -start() { - ebegin "Starting cf-monitord" - start-stop-daemon --start --exec /usr/sbin/cf-monitord -- ${EXTRA_OPTS} - eend $? -} - -stop() { - ebegin "Stopping cf-monitord" - start-stop-daemon --stop --pidfile /var/cfengine/cf-monitord.pid --exec /usr/sbin/cf-monitord - eend $? -} diff --git a/net-misc/cfengine/files/cf-serverd.rc6 b/net-misc/cfengine/files/cf-serverd.rc6 deleted file mode 100644 index d73e2bc2c729..000000000000 --- a/net-misc/cfengine/files/cf-serverd.rc6 +++ /dev/null @@ -1,17 +0,0 @@ -#!/sbin/openrc-run - -depend() { - need net -} - -start() { - ebegin "Starting cf-serverd" - start-stop-daemon --start --exec /usr/sbin/cf-serverd -- ${EXTRA_OPTS} - eend $? -} - -stop() { - ebegin "Stopping cf-serverd" - start-stop-daemon --stop --pidfile /var/cfengine/cf-serverd.pid --exec /usr/sbin/cf-serverd - eend $? -} diff --git a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch deleted file mode 100644 index a31b3513ded4..000000000000 --- a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cfengine-3.6.2.orig/libenv/unix_iface.c 2014-09-25 07:53:31.000000000 -0400 -+++ cfengine-3.6.2/libenv/unix_iface.c 2014-11-26 23:55:20.151351070 -0500 -@@ -625,7 +625,7 @@ - return; - } - #else -- if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL) -+ if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL && (pp = cf_popen("/bin/ifconfig -a", "r", true)) == NULL) - { - Log(LOG_LEVEL_VERBOSE, "Could not find interface info"); - return; diff --git a/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch b/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch deleted file mode 100644 index 7aa8e2779253..000000000000 --- a/net-misc/cfengine/files/cfengine-3.6.2-sysmacros.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fixes compile on glibc-2.25 - -Fixes: https://bugs.gentoo.org/612658 ---- cfengine-3.6.2.orig/libutils/platform.h 2014-09-25 04:53:31.000000000 -0700 -+++ cfengine-3.6.2/libutils/platform.h 2017-10-20 15:11:15.676360363 -0700 -@@ -360,12 +360,13 @@ void globfree(glob_t *pglob); - - #ifdef __linux__ - # if defined(__GLIBC__) || defined(__BIONIC__) - # include <net/route.h> - # include <netinet/in.h> - # include <netinet/ip.h> -+# include <sys/sysmacros.h> - # else - # include <linux/route.h> - # include <linux/in.h> - # include <linux/ip.h> - # endif - #endif diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml deleted file mode 100644 index 864d0db466b4..000000000000 --- a/net-misc/cfengine/metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sysadmin@gentoo.org</email> - <name>Gentoo Sysadmin Project</name> - </maintainer> - <use> - <flag name="libvirt">Enable support for virtual machine management through <pkg>app-emulation/libvirt</pkg></flag> - <flag name="masterfiles">Install the Masterfiles Policy Framework</flag> - <flag name="qdbm">Use <pkg>dev-db/qdbm</pkg> as database backend</flag> - <flag name="tokyocabinet">Use <pkg>dev-db/tokyocabinet</pkg> as database backend</flag> - </use> - <longdescription> - Cfengine, or the configuration engine is an autonomous agent and a middle to - high level policy language for building expert systems which administrate - and configure large computer networks. Cfengine uses the idea of classes and - a primitive intelligence to define and automate the configuration and - maintenance of system state, for small to huge configurations. Cfengine is - designed to be a part of a computer immune system, and can be thought of as - a gaming agent. It is ideal for cluster management and has been adopted for - use all over the world in small and huge organizations alike. - </longdescription> - <longdescription lang="ja"> - Cfengine 、つまり the configuration engine (設定エンジン)は大規模 - コンピュータ・ネットワークの管理と設定を行うエキスパート・システム - を構築するためのハイレベルなポリシ言語の自律型エージェントとその - ミドルを指します。莫大な設定を軽減するため、Cfengineはクラス概念と - プリミティブ・インテリジェンスの導入及びシステム状態の設定と保守を - 自動化します。Cfengine は免疫型システムの一部としてデザインされ、 - ゲーム・エージェントにもなります。クラスタ制御には最適で、世界中 - の小さな組織および大きな組織で採用されています。 - </longdescription> -</pkgmetadata> diff --git a/net-misc/cgminer/cgminer-4.10.0-r1.ebuild b/net-misc/cgminer/cgminer-4.10.0-r1.ebuild index 016755b9d44c..7fcba45d1770 100644 --- a/net-misc/cgminer/cgminer-4.10.0-r1.ebuild +++ b/net-misc/cgminer/cgminer-4.10.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit flag-o-matic toolchain-funcs udev DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C" HOMEPAGE="https://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer" @@ -76,8 +76,7 @@ src_install() { # How about using some make install? dobin cgminer if use udev; then - insinto /lib/udev/rules.d - use udev && doins 01-cgminer.rules + udev_dorules 01-cgminer.rules fi if use doc; then @@ -91,3 +90,7 @@ src_install() { # How about using some make install? dodoc api-example.php miner.php API.java api-example.c example.conf fi } + +pkg_postinst() { + use udev && udev_reload +} diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest index 2621d83dcfd5..85898ad78bcb 100644 --- a/net-misc/chrome-remote-desktop/Manifest +++ b/net-misc/chrome-remote-desktop/Manifest @@ -1 +1 @@ -DIST chrome-remote-desktop_96.0.4664.9_amd64.deb 62383372 BLAKE2B b7ac12e2f1c16781225b9c74e558e51d817aad5de2d953d94a06d5d3fa0d937dd317f7157c770e01a91c249f0192542da67911899014360c6fadd252bf0908ae SHA512 86d4ac9b15da2b29f7245866dbc78a131c6aad8efb8ac4f150935afdd5ad95e8f2bc4a59cda52849c96aadaa869b05f9eb7a5cdfda711358e5055e08cf9fbd79 +DIST chrome-remote-desktop_118.0.5993.9_amd64.deb 17677480 BLAKE2B 1f29d8a8d90f12515afbea857e5f4b7ec0ca56a3051e14e7f67c38c906d743c74ca274a00342a8a9745effeb0023a7e88615c886dcbdcbe68bbcafe317b8902d SHA512 ffa0fb28cb7842a13df3228b5ca6e83c2e9d3967c5013b3613cefec7f86f56e6df069f33e65c3a979ce15d971906cb4488b90a4dffc4b95cd5d65346b4a08f87 diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-96.0.4664.9.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild index 65b1951d7a70..98867942b1eb 100644 --- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-96.0.4664.9.ebuild +++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/ @@ -15,7 +15,7 @@ EAPI="7" -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{9..11} ) PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th tr uk vi zh_CN zh_TW" inherit unpacker python-single-r1 optfeature plocale @@ -43,13 +43,16 @@ RDEPEND+=" dev-libs/glib:2 dev-libs/nspr dev-libs/nss - $(python_gen_cond_dep 'dev-python/psutil[${PYTHON_USEDEP}]') - gnome-base/gconf:2 + $(python_gen_cond_dep ' + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + ') media-libs/fontconfig media-libs/freetype:2 sys-apps/dbus sys-devel/gcc sys-libs/glibc + sys-libs/libutempter sys-libs/pam x11-apps/xdpyinfo x11-apps/setxkbmap @@ -71,7 +74,7 @@ RDEPEND+=" # - The config takes over the active display in addition to starting up a virtual one. RDEPEND+=" x11-base/xorg-server[xvfb]" -DEPEND="$(unpacker_src_uri_depends)" +BDEPEND="$(unpacker_src_uri_depends)" S=${WORKDIR} diff --git a/net-misc/chrome-remote-desktop/metadata.xml b/net-misc/chrome-remote-desktop/metadata.xml index 8041df927597..115e9d64a669 100644 --- a/net-misc/chrome-remote-desktop/metadata.xml +++ b/net-misc/chrome-remote-desktop/metadata.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>vapier@gentoo.org</email> -</maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index ee8a90b57aad..4c51ea908345 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,2 +1,2 @@ -DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f -DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff SHA512 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a +DIST chrony-4.5.tar.gz 620287 BLAKE2B e89665e6ff700805b41f89e9349d280579aebab31a30817512a165da939c8f39dc55ef9a17a50e3d7e298015620667638ab119901a71868a9188093606a95d32 SHA512 58a449e23186da799064b16ab16f799c1673296984b152b43e87c620d86e272c55365e83439d410fc89e4e0ba0befd7d5c625eac78a6665813b7ea75444f71b5 +DIST chrony-4.5.tar.gz.asc 833 BLAKE2B 7d680a4f5d86335b067b95cb900761615180701cabae5978d6f924063f7a43748534bb2e4f23cd9cd2e6919ed005014db6d396330fbfb5aa6d5f1c46f3c0c3a0 SHA512 05470e6cc34524fdab494f70cee71d46172b38bdd4acd8173ac79fdec12178239248880db474437690094aae7909002113289ac7f9305130c5e0a1d9364122cb diff --git a/net-misc/chrony/chrony-4.1-r2.ebuild b/net-misc/chrony/chrony-4.5.ebuild index 1f5c3e41f685..8eb587f88c65 100644 --- a/net-misc/chrony/chrony-4.1-r2.ebuild +++ b/net-misc/chrony/chrony-4.5.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit systemd tmpfiles toolchain-funcs +inherit edo systemd tmpfiles toolchain-funcs DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" +HOMEPAGE="https://chrony-project.org/" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.com/chrony/chrony.git" inherit git-r3 else - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc inherit verify-sig - SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" + SRC_URI="https://chrony-project.org/releases/${P/_/-}.tar.gz" + SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86" fi fi @@ -27,7 +27,7 @@ S="${WORKDIR}/${P/_/-}" LICENSE="GPL-2" SLOT="0" -IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux" +IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux" # nettle > nss > libtomcrypt in configure REQUIRED_USE=" sechash? ( || ( nettle nss libtomcrypt ) ) @@ -44,12 +44,12 @@ DEPEND=" acct-user/ntp sys-libs/libcap ) - libedit? ( dev-libs/libedit ) - !libedit? ( sys-libs/readline:= ) + libtomcrypt? ( dev-libs/libtomcrypt:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) + readline? ( dev-libs/libedit ) seccomp? ( sys-libs/libseccomp ) " RDEPEND=" @@ -65,18 +65,25 @@ BDEPEND=" ) " -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then # Needed for doc generation in 9999 REQUIRED_USE+=" html" - BDEPEND+=" virtual/w3m" + BDEPEND+=" + app-alternatives/yacc + virtual/w3m + " else - BDEPEND+=" verify-sig? ( >=app-crypt/openpgp-keys-mlichvar-20210513 )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )" fi PATCHES=( "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch - "${FILESDIR}"/${PN}-4.1-systemd-gentoo.patch - "${FILESDIR}"/${P}-seccomp-glibc-2-3-4.patch + "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch +) + +QA_CONFIG_IMPL_DECL_SKIP=( + # FP, checks with macro afterwards (bug #907877) + recvmmsg ) src_prepare() { @@ -112,23 +119,27 @@ src_configure() { local myconf=( $(use_enable seccomp scfilter) - $(usex caps '' '--disable-linuxcaps') - $(usex cmdmon '' '--disable-cmdmon') - $(usex debug '--enable-debug' '') - $(usex ipv6 '' '--disable-ipv6') - $(usex libedit '' '--without-editline') - $(usex libtomcrypt '' '--without-tomcrypt') - $(usex nettle '' '--without-nettle') - $(usex nss '' '--without-nss') - $(usex ntp '' '--disable-ntp') - $(usex nts '' '--disable-nts') - $(usex nts '' '--without-gnutls') - $(usex phc '' '--disable-phc') - $(usex pps '' '--disable-pps') - $(usex refclock '' '--disable-refclock') - $(usex rtc '' '--disable-rtc') - $(usex samba '--enable-ntp-signd' '') - $(usex sechash '' '--disable-sechash') + $(usev !caps '--disable-linuxcaps') + $(usev !cmdmon '--disable-cmdmon') + $(usev debug '--enable-debug') + + # USE=readline here means "readline-like functionality" + # chrony only supports libedit in terms of the library providing + # it. + $(usev !readline '--without-editline --disable-readline') + + $(usev !libtomcrypt '--without-tomcrypt') + $(usev !nettle '--without-nettle') + $(usev !nss '--without-nss') + $(usev !ntp '--disable-ntp') + $(usev !nts '--disable-nts') + $(usev !nts '--without-gnutls') + $(usev !phc '--disable-phc') + $(usev !pps '--disable-pps') + $(usev !refclock '--disable-refclock') + $(usev !rtc '--disable-rtc') + $(usev samba '--enable-ntp-signd') + $(usev !sechash '--disable-sechash') --chronysockdir="${EPREFIX}/run/chrony" --docdir="${EPREFIX}/usr/share/doc/${PF}" @@ -142,22 +153,24 @@ src_configure() { ) # Print the ./configure call - echo sh ./configure "${myconf[@]}" >&2 - sh ./configure "${myconf[@]}" || die + edo ./configure "${myconf[@]}" || die } src_compile() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == 9999 ]] ; then # Uses w3m emake -C doc man txt fi - emake all docs $(usex html '' 'ADOC=true') + emake all docs $(usev !html 'ADOC=true') } src_install() { default + # Compatibility with other distributions who install to /etc/chrony.conf (bug #835461) + dosym -r /etc/chrony/chrony.conf /etc/chrony.conf + newinitd "${FILESDIR}"/chronyd.init-r2 chronyd newconfd "${T}"/chronyd.conf chronyd @@ -180,8 +193,8 @@ src_install() { # Prepare a directory for the chrony.drift file (a la ntpsec) # Ensures the environment is sane on new installs # bug #711058 - fowners ntp:ntp /var/{lib,log}/chrony - fperms 770 /var/lib/chrony + fowners -R ntp:ntp /var/{lib,log}/chrony + fperms -R 770 /var/lib/chrony fi insinto /etc/logrotate.d @@ -245,7 +258,7 @@ pkg_postinst() { 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 "- ${EROOT}/etc/conf.d/chronyd for OpenRC" elog "- systemctl edit chronyd for systemd" elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)" elog "By default, we now use -F 2 which is a baseline/minimal filter." diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 6051d64c9884..75c467aacec7 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit systemd tmpfiles toolchain-funcs +inherit edo systemd tmpfiles toolchain-funcs DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" +HOMEPAGE="https://chrony-project.org/" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.com/chrony/chrony.git" inherit git-r3 else - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc inherit verify-sig - SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" - SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" + SRC_URI="https://chrony-project.org/releases/${P/_/-}.tar.gz" + SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi fi @@ -27,7 +27,7 @@ S="${WORKDIR}/${P/_/-}" LICENSE="GPL-2" SLOT="0" -IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux" +IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux" # nettle > nss > libtomcrypt in configure REQUIRED_USE=" sechash? ( || ( nettle nss libtomcrypt ) ) @@ -44,12 +44,12 @@ DEPEND=" acct-user/ntp sys-libs/libcap ) - libedit? ( dev-libs/libedit ) - !libedit? ( sys-libs/readline:= ) + libtomcrypt? ( dev-libs/libtomcrypt:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) + readline? ( dev-libs/libedit ) seccomp? ( sys-libs/libseccomp ) " RDEPEND=" @@ -65,17 +65,25 @@ BDEPEND=" ) " -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then # Needed for doc generation in 9999 REQUIRED_USE+=" html" - BDEPEND+=" virtual/w3m" + BDEPEND+=" + app-alternatives/yacc + virtual/w3m + " else - BDEPEND+=" verify-sig? ( >=app-crypt/openpgp-keys-mlichvar-20210513 )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )" fi PATCHES=( "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch - "${FILESDIR}"/${PN}-4.1-systemd-gentoo.patch + "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch +) + +QA_CONFIG_IMPL_DECL_SKIP=( + # FP, checks with macro afterwards (bug #907877) + recvmmsg ) src_prepare() { @@ -111,23 +119,27 @@ src_configure() { local myconf=( $(use_enable seccomp scfilter) - $(usex caps '' '--disable-linuxcaps') - $(usex cmdmon '' '--disable-cmdmon') - $(usex debug '--enable-debug' '') - $(usex ipv6 '' '--disable-ipv6') - $(usex libedit '' '--without-editline') - $(usex libtomcrypt '' '--without-tomcrypt') - $(usex nettle '' '--without-nettle') - $(usex nss '' '--without-nss') - $(usex ntp '' '--disable-ntp') - $(usex nts '' '--disable-nts') - $(usex nts '' '--without-gnutls') - $(usex phc '' '--disable-phc') - $(usex pps '' '--disable-pps') - $(usex refclock '' '--disable-refclock') - $(usex rtc '' '--disable-rtc') - $(usex samba '--enable-ntp-signd' '') - $(usex sechash '' '--disable-sechash') + $(usev !caps '--disable-linuxcaps') + $(usev !cmdmon '--disable-cmdmon') + $(usev debug '--enable-debug') + + # USE=readline here means "readline-like functionality" + # chrony only supports libedit in terms of the library providing + # it. + $(usev !readline '--without-editline --disable-readline') + + $(usev !libtomcrypt '--without-tomcrypt') + $(usev !nettle '--without-nettle') + $(usev !nss '--without-nss') + $(usev !ntp '--disable-ntp') + $(usev !nts '--disable-nts') + $(usev !nts '--without-gnutls') + $(usev !phc '--disable-phc') + $(usev !pps '--disable-pps') + $(usev !refclock '--disable-refclock') + $(usev !rtc '--disable-rtc') + $(usev samba '--enable-ntp-signd') + $(usev !sechash '--disable-sechash') --chronysockdir="${EPREFIX}/run/chrony" --docdir="${EPREFIX}/usr/share/doc/${PF}" @@ -141,22 +153,24 @@ src_configure() { ) # Print the ./configure call - echo sh ./configure "${myconf[@]}" >&2 - sh ./configure "${myconf[@]}" || die + edo ./configure "${myconf[@]}" || die } src_compile() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == 9999 ]] ; then # Uses w3m emake -C doc man txt fi - emake all docs $(usex html '' 'ADOC=true') + emake all docs $(usev !html 'ADOC=true') } src_install() { default + # Compatibility with other distributions who install to /etc/chrony.conf (bug #835461) + dosym -r /etc/chrony/chrony.conf /etc/chrony.conf + newinitd "${FILESDIR}"/chronyd.init-r2 chronyd newconfd "${T}"/chronyd.conf chronyd @@ -179,8 +193,8 @@ src_install() { # Prepare a directory for the chrony.drift file (a la ntpsec) # Ensures the environment is sane on new installs # bug #711058 - fowners ntp:ntp /var/{lib,log}/chrony - fperms 770 /var/lib/chrony + fowners -R ntp:ntp /var/{lib,log}/chrony + fperms -R 770 /var/lib/chrony fi insinto /etc/logrotate.d @@ -244,7 +258,7 @@ pkg_postinst() { 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 "- ${EROOT}/etc/conf.d/chronyd for OpenRC" elog "- systemctl edit chronyd for systemd" elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)" elog "By default, we now use -F 2 which is a baseline/minimal filter." diff --git a/net-misc/chrony/files/chrony-4.1-seccomp-glibc-2-3-4.patch b/net-misc/chrony/files/chrony-4.1-seccomp-glibc-2-3-4.patch deleted file mode 100644 index 56dd89b3ffdc..000000000000 --- a/net-misc/chrony/files/chrony-4.1-seccomp-glibc-2-3-4.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://git.tuxfamily.org/chrony/chrony.git/patch/?id=bbbd80bf03223f181d4abf5c8e5fe6136ab6129a - -From bbbd80bf03223f181d4abf5c8e5fe6136ab6129a Mon Sep 17 00:00:00 2001 -From: Miroslav Lichvar <mlichvar@redhat.com> -Date: Mon, 9 Aug 2021 11:48:21 +0200 -Subject: sys_linux: allow clone3 and pread64 in seccomp filter - -These seem to be needed with the latest glibc. - ---- a/sys_linux.c -+++ b/sys_linux.c -@@ -503,6 +503,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) - - /* Process */ - SCMP_SYS(clone), -+#ifdef __NR_clone3 -+ SCMP_SYS(clone3), -+#endif - SCMP_SYS(exit), - SCMP_SYS(exit_group), - SCMP_SYS(getpid), -@@ -595,6 +598,7 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) - #ifdef __NR_ppoll_time64 - SCMP_SYS(ppoll_time64), - #endif -+ SCMP_SYS(pread64), - SCMP_SYS(pselect6), - #ifdef __NR_pselect6_time64 - SCMP_SYS(pselect6_time64), -cgit v0.10.2 diff --git a/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch b/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch deleted file mode 100644 index ff3b320d1e47..000000000000 --- a/net-misc/chrony/files/chrony-4.1-systemd-gentoo.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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/chrony-4.2-systemd-gentoo.patch b/net-misc/chrony/files/chrony-4.2-systemd-gentoo.patch new file mode 100644 index 000000000000..1852cdeb92e9 --- /dev/null +++ b/net-misc/chrony/files/chrony-4.2-systemd-gentoo.patch @@ -0,0 +1,13 @@ +diff --git a/examples/chronyd.service b/examples/chronyd.service +index 4fb930e..8df627a 100644 +--- a/examples/chronyd.service ++++ b/examples/chronyd.service +@@ -9,7 +9,7 @@ ConditionCapability=CAP_SYS_TIME + Type=forking + PIDFile=/run/chrony/chronyd.pid + EnvironmentFile=-/etc/sysconfig/chronyd +-ExecStart=/usr/sbin/chronyd $OPTIONS ++ExecStart=/usr/sbin/chronyd $OPTIONS -u ntp -F 2 + + CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE + CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_KILL CAP_LEASE CAP_LINUX_IMMUTABLE diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml index dc25a0f1c6a2..33ac8a4febda 100644 --- a/net-misc/chrony/metadata.xml +++ b/net-misc/chrony/metadata.xml @@ -39,5 +39,6 @@ </use> <upstream> <remote-id type="cpe">cpe:/a:chrony_project:chrony</remote-id> + <remote-id type="gitlab">chrony/chrony</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/clockspeed/clockspeed-0.62-r7.ebuild b/net-misc/clockspeed/clockspeed-0.62-r8.ebuild index fc40dd6960bf..29bf5a916bca 100644 --- a/net-misc/clockspeed/clockspeed-0.62-r7.ebuild +++ b/net-misc/clockspeed/clockspeed-0.62-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,8 +22,7 @@ IUSE="static selinux" RESTRICT="mirror bindist test" DEPEND="sys-apps/groff" -RDEPEND="selinux? ( sec-policy/selinux-clockspeed ) - net-dns/djbdns" +RDEPEND="net-dns/djbdns" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) diff --git a/net-misc/clockspeed/clockspeed-0.62-r9.ebuild b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild new file mode 100644 index 000000000000..5607768def91 --- /dev/null +++ b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Simple Network Time Protocol (NTP) client" +HOMEPAGE="https://cr.yp.to/clockspeed.html" + +# this is the trailing part of the name for the latest leapseconds file. +LEAPSECONDS_DATE="20081114" + +SRC_URI="https://cr.yp.to/clockspeed/${P}.tar.gz + https://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat."$LEAPSECONDS_DATE"" + +# http://cr.yp.to/distributors.html +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~mips ~x86" +IUSE="static selinux" +RESTRICT="mirror bindist test" + +DEPEND="sys-apps/groff" +RDEPEND="net-dns/djbdns" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-fix-clang16-build.patch +) + +src_configure() { + echo "$(tc-getCC) ${CFLAGS} ${ASFLAGS}" > conf-cc || die + use static && append-ldflags -static + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die +} + +src_install() { + dobin clockspeed clockadd clockview sntpclock taiclock taiclockd + dosbin "${FILESDIR}"/ntpclockset + + doman *.1 + dodoc BLURB CHANGES INSTALL README THANKS TODO + + insinto /var/lib/clockspeed + newins "${DISTDIR}"/leapsecs.dat."$LEAPSECONDS_DATE" leapsecs.dat +} diff --git a/net-misc/clockspeed/files/clockspeed-0.62-fix-clang16-build.patch b/net-misc/clockspeed/files/clockspeed-0.62-fix-clang16-build.patch new file mode 100644 index 000000000000..66bc89d0c261 --- /dev/null +++ b/net-misc/clockspeed/files/clockspeed-0.62-fix-clang16-build.patch @@ -0,0 +1,212 @@ +Since clang16 implicit function declarations and implicit integers +result in a compilation error. + +Bug: https://bugs.gentoo.org/882307 +Patch has been sent upstream via mail + +Pascal Jäger <pascal.jaeger@leimstift.de> (2023-10-03) + +--- a/clockspeed.c ++++ b/clockspeed.c +@@ -1,6 +1,7 @@ ++#include <stdio.h> ++#include <sys/stat.h> + #include <sys/types.h> + #include <sys/time.h> +-#include "readwrite.h" + #include "exit.h" + #include "select.h" + #include "scan.h" +@@ -11,11 +12,12 @@ + #include "error.h" + #include "auto_home.h" + #include "timing.h" ++#include "unistd.h" + + #ifndef HASRDTSC + #ifndef HASGETHRTIME + +- Error! Need an unadjusted hardware clock. ++#error Need an unadjusted hardware clock. + + #endif + #endif +--- a/clockview.c ++++ b/clockview.c +@@ -1,3 +1,4 @@ ++#include <sys/time.h> + #include <sys/types.h> + #include <time.h> + #include "substdio.h" +--- a/hier.c ++++ b/hier.c +@@ -1,5 +1,24 @@ + #include "auto_home.h" + ++extern void h(char *home, ++int uid, ++int gid, ++int mode); ++ ++extern void d(char *home, ++char *subdir, ++int uid, ++int gid, ++int mode); ++ ++extern void c( ++char *home, ++char *subdir, ++char *file, ++int uid, ++int gid, ++int mode); ++ + void hier() + { + d("/var/lib","clockspeed",-1,-1,0755); +--- a/install.c ++++ b/install.c +@@ -2,8 +2,9 @@ + #include "strerr.h" + #include "error.h" + #include "open.h" +-#include "readwrite.h" + #include "exit.h" ++#include <sys/stat.h> ++#include <unistd.h> + + extern void hier(); + +--- a/instcheck.c ++++ b/instcheck.c +@@ -2,8 +2,9 @@ + #include <sys/stat.h> + #include "strerr.h" + #include "error.h" +-#include "readwrite.h" + #include "exit.h" ++#include <sys/stat.h> ++#include <unistd.h> + + extern void hier(); + +--- a/leapsecs_read.c ++++ b/leapsecs_read.c +@@ -1,7 +1,9 @@ ++#include <stdlib.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> + #include <errno.h> ++#include <unistd.h> + #include "tai.h" + #include "leapsecs.h" + +--- a/sntpclock.c ++++ b/sntpclock.c +@@ -3,12 +3,12 @@ + #include <sys/param.h> + #include <sys/socket.h> + #include <netinet/in.h> ++#include <unistd.h> + #include "strerr.h" + #include "ip.h" + #include "str.h" + #include "byte.h" + #include "substdio.h" +-#include "readwrite.h" + #include "select.h" + #include "scan.h" + #include "leapsecs.h" +@@ -79,7 +79,7 @@ int flagleap; + } + + char outbuf[16]; +-substdio ssout = SUBSTDIO_FDBUF(write,1,outbuf,sizeof outbuf); ++substdio ssout = SUBSTDIO_FDBUF((int(*)())write,1,outbuf,sizeof outbuf); + + #define FATAL "sntpclock: fatal: " + #define WARNING "sntpclock: warning: " +--- a/taiclock.c ++++ b/taiclock.c +@@ -3,17 +3,17 @@ + #include <sys/param.h> + #include <sys/socket.h> + #include <netinet/in.h> ++#include <unistd.h> + #include "strerr.h" + #include "ip.h" + #include "str.h" + #include "byte.h" + #include "substdio.h" +-#include "readwrite.h" + #include "select.h" + #include "taia.h" + + char outbuf[16]; +-substdio ssout = SUBSTDIO_FDBUF(write,1,outbuf,sizeof outbuf); ++substdio ssout = SUBSTDIO_FDBUF((int(*)())write,1,outbuf,sizeof outbuf); + + #define FATAL "taiclock: fatal: " + #define WARNING "taiclock: warning: " + +--- a/auto-str.c ++++ b/auto-str.c +@@ -5,7 +5,7 @@ + char buf1[256]; + substdio ss1 = SUBSTDIO_FDBUF(write,1,buf1,sizeof(buf1)); + +-void puts(s) ++void myputs(s) + char *s; + { + if (substdio_puts(&ss1,s) == -1) _exit(111); +@@ -25,20 +25,20 @@ char **argv; + value = argv[2]; + if (!value) _exit(100); + +- puts("char "); +- puts(name); +- puts("[] = \"\\\n"); ++ myputs("char "); ++ myputs(name); ++ myputs("[] = \"\\\n"); + + while (ch = *value++) { +- puts("\\"); ++ myputs("\\"); + octal[3] = 0; + octal[2] = '0' + (ch & 7); ch >>= 3; + octal[1] = '0' + (ch & 7); ch >>= 3; + octal[0] = '0' + (ch & 7); +- puts(octal); ++ myputs(octal); + } + +- puts("\\\n\";\n"); ++ myputs("\\\n\";\n"); + if (substdio_flush(&ss1) == -1) _exit(111); + _exit(0); + } +--- a/trygethr.c ++++ b/trygethr.c +@@ -1,7 +1,7 @@ + #include <sys/types.h> + #include <sys/time.h> + +-main() ++int main() + { + hrtime_t t; + +--- a/tryrdtsc.c ++++ b/tryrdtsc.c +@@ -1,4 +1,6 @@ +-main() ++#include <unistd.h> ++ ++int main() + { + unsigned long x[2]; + unsigned long y[2]; diff --git a/net-misc/clusterssh/Manifest b/net-misc/clusterssh/Manifest index 953add07cb81..1a8bd15ecf6d 100644 --- a/net-misc/clusterssh/Manifest +++ b/net-misc/clusterssh/Manifest @@ -1,2 +1 @@ -DIST App-ClusterSSH-4.01_05.tar.gz 71502 BLAKE2B f9e1f9de36173c766a382660e34adee3005a64550a90cafe59101fd3f4b66307990e254334fb270398c9e36a9d27657a27e7348b1223a7ccef04181f8c88809b SHA512 4b63b91684c981a28871e5264502c66435b531ae3c4bad2eab2571f8b237d43e5f45ed93d036e7497c713f2982a110d93a3055ae0004d4f33e7786df9aa56ff8 DIST App-ClusterSSH-4.16.tar.gz 96151 BLAKE2B c0b4ee36f42cb26853c264686fa6084133e0a75f9dba6e7233e341a2dedbb3c41642dd255bf6fa01b7285c9c3edd43485d3014b6d41957d6476382dcd00866a2 SHA512 3d4fc2aa681ea815020375bb3bb0f9a070e1638c5a4e38b1b279c58f9644a568bb687e0e611919afa48a32b44ff4e25cd5661c7d1330978f851bc506282f020e diff --git a/net-misc/clusterssh/clusterssh-4.03.03.ebuild b/net-misc/clusterssh/clusterssh-4.03.03.ebuild deleted file mode 100644 index cb2f2702720f..000000000000 --- a/net-misc/clusterssh/clusterssh-4.03.03.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MY_PN="App-ClusterSSH" -MODULE_AUTHOR="DUNCS" -MODULE_VERSION="4.01_05" - -inherit perl-module - -DESCRIPTION="Concurrent Multi-Server Terminal Access" -HOMEPAGE="https://github.com/duncs/clusterssh" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-perl/Exception-Class - dev-perl/Readonly - dev-perl/Test-Pod - dev-perl/Test-Pod-Coverage - dev-perl/Test-Trap - dev-perl/Test-DistManifest - dev-perl/Try-Tiny - dev-perl/Tk - dev-perl/Config-Simple - dev-perl/X11-Protocol - dev-perl/XML-Simple - x11-apps/xlsfonts - x11-terms/xterm" -DEPEND=" - ${RDEPEND} - dev-perl/File-Which - dev-perl/Module-Build - dev-perl/Test-Pod - dev-perl/Test-Differences" - -#S="${WORKDIR}"/${MY_P} - -SRC_TEST="do parallel" - -src_prepare() { - # broken test, check again for new releases - sed \ - -e '/boilerplate/d' \ - -e '/manifest.t/d' \ - -i MANIFEST || die - rm t/boilerplate.t t/manifest.t || die - - perl-module_src_prepare -} diff --git a/net-misc/clusterssh/clusterssh-4.16.ebuild b/net-misc/clusterssh/clusterssh-4.16.ebuild index 7d85bec61967..5cde5cedf0cd 100644 --- a/net-misc/clusterssh/clusterssh-4.16.ebuild +++ b/net-misc/clusterssh/clusterssh-4.16.ebuild @@ -1,24 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Concurrent Multi-Server Terminal Access" HOMEPAGE="https://github.com/duncs/clusterssh" + if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/duncs/clusterssh" inherit git-r3 else - DIST_AUTHOR="DUNCS" - DIST_NAME="App-ClusterSSH" # Use dev-perl/Gentoo-PerlMod-Version to update this on bumps! # DIST_VERSION=$(gentoo-perlmod-version.pl ${UPSTREAM_VERSION}) #DIST_VERSION="$(ver_cut 1-2)" #die "|$(ver_cut 1-2)_$(ver_cut 3)|" + DIST_AUTHOR="DUNCS" + DIST_NAME="App-ClusterSSH" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" fi +DIST_TEST="do parallel" inherit perl-module LICENSE="GPL-2" @@ -51,5 +53,3 @@ BDEPEND=" dev-perl/Module-Build dev-perl/Test-Differences dev-perl/Test-Pod" - -SRC_TEST="do parallel" diff --git a/net-misc/clusterssh/clusterssh-9999.ebuild b/net-misc/clusterssh/clusterssh-9999.ebuild index 7d85bec61967..7627c4d16310 100644 --- a/net-misc/clusterssh/clusterssh-9999.ebuild +++ b/net-misc/clusterssh/clusterssh-9999.ebuild @@ -1,24 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Concurrent Multi-Server Terminal Access" HOMEPAGE="https://github.com/duncs/clusterssh" + if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/duncs/clusterssh" inherit git-r3 else - DIST_AUTHOR="DUNCS" - DIST_NAME="App-ClusterSSH" # Use dev-perl/Gentoo-PerlMod-Version to update this on bumps! # DIST_VERSION=$(gentoo-perlmod-version.pl ${UPSTREAM_VERSION}) #DIST_VERSION="$(ver_cut 1-2)" #die "|$(ver_cut 1-2)_$(ver_cut 3)|" + DIST_AUTHOR="DUNCS" + DIST_NAME="App-ClusterSSH" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi +DIST_TEST="do parallel" inherit perl-module LICENSE="GPL-2" @@ -51,5 +53,3 @@ BDEPEND=" dev-perl/Module-Build dev-perl/Test-Differences dev-perl/Test-Pod" - -SRC_TEST="do parallel" diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest index c3cb7ec8d85c..19ef92df3d5d 100644 --- a/net-misc/cmst/Manifest +++ b/net-misc/cmst/Manifest @@ -1 +1 @@ -DIST cmst-2020.11.01.tar.gz 2818638 BLAKE2B 69cf85abb0beebfcf3a2d6d3af8281de43d795a104a8d9f5bfbb37b6dd1c9541910fad4ce536643ae0cbe8ef1e0bdc31016d9f99056de4279123bb5d8a428d1c SHA512 cb8082ac7e1d377709a7d3fda49ed7a99ef7a9c5eb00ca24423685a5146f519bc810c37140755f4f399957781af09de75e47de8b209517c74ac55f8e5758986c +DIST cmst-2023.03.14.tar.gz 3530182 BLAKE2B 86e873d299bae9d188ebac154b3716ef11c7da12b2b93d9b5cc07b6bf2edb692b81393b0f6c962479d1f23dd61d4466c2b930f29b08601876bb83e43dd8d9833 SHA512 7ebc3f7ca93d6e66c4447f4a4ac8f2eb27617ff8d4919e8878d12a0cdffb7c0d32be9627c73bc74b0f661854c8a2d75975a8fa854924c4edb9c676f1abd6f746 diff --git a/net-misc/cmst/cmst-2020.11.01.ebuild b/net-misc/cmst/cmst-2023.03.14-r1.ebuild index 6464f6f80bf5..4e7967b8e329 100644 --- a/net-misc/cmst/cmst-2020.11.01.ebuild +++ b/net-misc/cmst/cmst-2023.03.14-r1.ebuild @@ -1,31 +1,42 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qmake-utils xdg-utils DESCRIPTION="Qt GUI for Connman with system tray icon" HOMEPAGE="https://github.com/andrew-bibb/cmst" -SRC_URI="https://github.com/andrew-bibb/cmst/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 +IUSE="qt6" + +DEPEND="qt6? ( dev-qt/qtbase:6 ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 +) " RDEPEND="${DEPEND} net-misc/connman " +BDEPEND="qt6? ( dev-qt/qttools:6 ) + !qt6? ( dev-qt/linguist-tools:5 ) +" src_configure() { export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}" - eqmake5 DISTRO=gentoo + if use qt6; then + eqmake6 DISTRO=gentoo + else + eqmake5 DISTRO=gentoo + fi } src_install() { diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest deleted file mode 100644 index dfa22e29a0a0..000000000000 --- a/net-misc/cni-plugins/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST cni-plugins-0.8.6.tar.gz 1993056 BLAKE2B 89276e0f7fdbc782b30ff675abcb0f92f210771bb772269210416e17d6da443fe732774d9af8ae66f69847c8b48ee4dc6485f51e2156814cfd7e3ca8b455428f SHA512 8815de8b375c737c3a1951b0a7ef5786209fdcf723aa1bc7c2dab7e1bbdee4933a7237f41bdee4208828b457bc79ec69ff68db060c52bab13863f42b042480c8 -DIST cni-plugins-0.8.7.tar.gz 1965945 BLAKE2B 592b1f126547363877c657e03d69fcb25874e6d472d731861a1a03e3933901bd618a5097f3d91f6ca7fbedce29a0ff0076a65be1a528a2584a7dcb5940a4b010 SHA512 1b11b080b1f54a8a792b1048573d7d882603b76929f0c9343eeb2e010f97700c0deea4489faeb493a1aeac12557b6847b26784c378d0430c47de6bdaca6aa70f -DIST cni-plugins-0.9.0.tar.gz 2705022 BLAKE2B 82f723501901da40e4ea2f111bd1ed3023a1d11e1715902830f3cd0cf0d46d9f9c57389b3a763448fcd52c40aba97a731986ca1862e2ecd912e8a274abf626c9 SHA512 8d545d17e6bf4180755708e47607c855b99f6ea4183a33930b7d05974d2151c90873f1e2064b806059a26caba6942502d9954fce697bf000995d539c2208811c -DIST cni-plugins-0.9.1.tar.gz 2703099 BLAKE2B 878f476e62f12020b39d33a79723fe246b34d80705d3a336573401743392adca9a57b196d6d191b4a6f281110f47ecbb1525aacd91cd488bea61c7aaed12a6ef SHA512 24e8fcedbff2ae7a83aa96085b546b164de6a0884d593e3b5386e9d2de3c4d9a215db9e9405332020cc45c371709a32b600e263e4f8dee62c51adafdc0180f24 diff --git a/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild deleted file mode 100644 index 5bf8dc6faddd..000000000000 --- a/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module linux-info - -DESCRIPTION="Standard networking plugins for container networking" -HOMEPAGE="https://github.com/containernetworking/plugins" -SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64" -IUSE="hardened" - -CONFIG_CHECK="~BRIDGE_VLAN_FILTERING" -S="${WORKDIR}/plugins-${PV}" - -src_compile() { - CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die -} - -src_install() { - exeinto /opt/cni/bin - doexe bin/* - dodoc README.md - local i - for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do - newdoc README.md ${i##*/}.README.md - done -} diff --git a/net-misc/cni-plugins/cni-plugins-0.8.7.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.7.ebuild deleted file mode 100644 index 838f8dc46a57..000000000000 --- a/net-misc/cni-plugins/cni-plugins-0.8.7.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module linux-info - -DESCRIPTION="Standard networking plugins for container networking" -HOMEPAGE="https://github.com/containernetworking/plugins" -SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="hardened" - -CONFIG_CHECK="~BRIDGE_VLAN_FILTERING" -S="${WORKDIR}/plugins-${PV}" - -src_compile() { - CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die -} - -src_install() { - exeinto /opt/cni/bin - doexe bin/* - dodoc README.md - local i - for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do - newdoc README.md ${i##*/}.README.md - done -} diff --git a/net-misc/cni-plugins/cni-plugins-0.9.0.ebuild b/net-misc/cni-plugins/cni-plugins-0.9.0.ebuild deleted file mode 100644 index 3ef070097fe8..000000000000 --- a/net-misc/cni-plugins/cni-plugins-0.9.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module linux-info - -DESCRIPTION="Standard networking plugins for container networking" -HOMEPAGE="https://github.com/containernetworking/plugins" -SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="hardened" - -CONFIG_CHECK="~BRIDGE_VLAN_FILTERING" -S="${WORKDIR}/plugins-${PV}" - -src_compile() { - CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die -} - -src_install() { - exeinto /opt/cni/bin - doexe bin/* - dodoc README.md - local i - for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do - newdoc README.md ${i##*/}.README.md - done - newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp -} diff --git a/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild b/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild deleted file mode 100644 index 54ca770d58f6..000000000000 --- a/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module linux-info - -DESCRIPTION="Standard networking plugins for container networking" -HOMEPAGE="https://github.com/containernetworking/plugins" -SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" -IUSE="hardened" - -CONFIG_CHECK="~BRIDGE_VLAN_FILTERING" -S="${WORKDIR}/plugins-${PV}" - -src_compile() { - CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die -} - -src_install() { - exeinto /opt/cni/bin - doexe bin/* - dodoc README.md - local i - for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do - newdoc README.md ${i##*/}.README.md - done - newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp -} diff --git a/net-misc/cni-plugins/files/cni-dhcp.initd b/net-misc/cni-plugins/files/cni-dhcp.initd deleted file mode 100644 index 26b838c516bd..000000000000 --- a/net-misc/cni-plugins/files/cni-dhcp.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run - -name="CNI-DHCP" -description="virtual dhcp server for containers" -command="/opt/cni/bin/dhcp" -command_args="daemon" -command_background=true -pidfile="/run/${RC_SVCNAME}.pid" - -depend() { - need net -} - -stop_post() { - if [ -e /run/cni/dhcp.sock ]; then - ebegin "Cleaning socket for ${name}" - rm -f /run/cni/dhcp.sock - eend $? "Failed to cleanup socket" - fi -} diff --git a/net-misc/connect/metadata.xml b/net-misc/connect/metadata.xml index 017669f463e7..8777e56329bf 100644 --- a/net-misc/connect/metadata.xml +++ b/net-misc/connect/metadata.xml @@ -3,15 +3,15 @@ <pkgmetadata> <!-- maintainer-needed --> <longdescription> -connect is the simple relaying command to make network connection via -SOCKS and https proxy. It is mainly intended to be used as proxy -command of OpenSSH. -</longdescription> + connect is the simple relaying command to make network connection via + SOCKS and https proxy. It is mainly intended to be used as proxy + command of OpenSSH. + </longdescription> <longdescription lang="ja"> -Connect は SOCKS 経由のネットワーク接続と HTTP プロクシを実現する単純な -中継用コマンドです。主に OpenSSH のプロクシ・コマンドとして利用されるこ -とを想定してます。 -</longdescription> + Connect は SOCKS 経由のネットワーク接続と HTTP プロクシを実現する単純な + 中継用コマンドです。主に OpenSSH のプロクシ・コマンドとして利用されるこ + とを想定してます。 + </longdescription> <upstream> <remote-id type="github">gotoh/ssh-connect</remote-id> </upstream> diff --git a/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild b/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild index c950b57ae3c2..467860e1aae2 100644 --- a/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild +++ b/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -28,6 +28,10 @@ DEPEND="${CDEOEND} virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-1.1.1-gtk_typecasts.patch +) + src_prepare() { default sed -i -e '/^Categories/ s/$/;/' connman-gtk.desktop.in || die diff --git a/net-misc/connman-gtk/connman-gtk-1.1.1-r2.ebuild b/net-misc/connman-gtk/connman-gtk-1.1.1-r2.ebuild new file mode 100644 index 000000000000..89e484d62819 --- /dev/null +++ b/net-misc/connman-gtk/connman-gtk-1.1.1-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools gnome2-utils + +DESCRIPTION="GTK GUI for Connman" +HOMEPAGE="https://github.com/jgke/connman-gtk" +SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="openconnect" + +CDEPEND=" + >=dev-libs/glib-2.0:2 + >=x11-libs/gtk+-3.10:3 + openconnect? ( >=net-vpn/openconnect-5.99 ) +" +RDEPEND="${CDEPEND} + net-misc/connman +" +DEPEND="${CDEOEND} + >=dev-util/intltool-0.35.0 + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.1-gtk_typecasts.patch +) + +src_prepare() { + default + sed -i -e '/^Categories/ s/$/;/' connman-gtk.desktop.in || die + eautoreconf +} + +src_configure() { + econf \ + --disable-schemas-compile \ + $(use_with openconnect) +} + +pkg_preinst() { + gnome2_schemas_savelist +} + +pkg_postinst() { + gnome2_schemas_update +} + +pkg_postrm() { + gnome2_schemas_update +} diff --git a/net-misc/connman-gtk/files/connman-gtk-1.1.1-gtk_typecasts.patch b/net-misc/connman-gtk/files/connman-gtk-1.1.1-gtk_typecasts.patch new file mode 100644 index 000000000000..25f29649404f --- /dev/null +++ b/net-misc/connman-gtk/files/connman-gtk-1.1.1-gtk_typecasts.patch @@ -0,0 +1,11 @@ +--- a/src/status.c ++++ b/src/status.c +@@ -119,7 +119,7 @@ + + gtk_menu_item_set_submenu(item, GTK_WIDGET(submenu)); + gtk_container_add(GTK_CONTAINER(menu), GTK_WIDGET(item)); +- gtk_widget_set_sensitive(item, has_items); ++ gtk_widget_set_sensitive(GTK_WIDGET(item), has_items); + + } + diff --git a/net-misc/connman-gtk/metadata.xml b/net-misc/connman-gtk/metadata.xml index f349009f7349..71feae52b29b 100644 --- a/net-misc/connman-gtk/metadata.xml +++ b/net-misc/connman-gtk/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="openconnect">Support easier authentication to AnyConnect VPNs</flag> </use> diff --git a/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r2.ebuild b/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r3.ebuild index 2fe35cf86af6..c5fed0b76125 100644 --- a/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r2.ebuild +++ b/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools vcs-snapshot COMMIT="3c34b2ee62d2e188090d20e7ed2fd94bab9c47f2" @@ -10,10 +10,9 @@ DESCRIPTION="An ncurses UI for connman" HOMEPAGE="https://github.com/eurogiciel-oss/connman-json-client" SRC_URI="https://github.com/eurogiciel-oss/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="dev-libs/json-c:0= >=sys-apps/dbus-1.4 diff --git a/net-misc/connman-json-client/metadata.xml b/net-misc/connman-json-client/metadata.xml index da20bb112a7c..3c116b1665f6 100644 --- a/net-misc/connman-json-client/metadata.xml +++ b/net-misc/connman-json-client/metadata.xml @@ -5,4 +5,7 @@ <email>bkohler@gentoo.org</email> <name>Ben Kohler</name> </maintainer> +<upstream> + <remote-id type="github">eurogiciel-oss/connman-json-client</remote-id> +</upstream> </pkgmetadata> diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild deleted file mode 100644 index 7358a56ef944..000000000000 --- a/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit desktop python-single-r1 vcs-snapshot - -MY_COMMIT="4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52" - -DESCRIPTION="Desktop notification integration for connman" -HOMEPAGE="https://gitlab.com/wavexx/connman-notify/" -SRC_URI="https://gitlab.com/wavexx/connman-notify/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2" - -EGIT_REPO_URI="https://gitlab.com/wavexx/connman-notify.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - net-misc/connman - virtual/notification-daemon" - -src_install() { - python_fix_shebang ${PN} - dobin ${PN} - dodoc README.rst - - make_desktop_entry ${PN} ${PN} ${PN} Network -} diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild index 217e156b72ed..da4fd73408b0 100644 --- a/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild +++ b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit desktop python-single-r1 diff --git a/net-misc/connman-notify/metadata.xml b/net-misc/connman-notify/metadata.xml index da20bb112a7c..4a77a7f66f54 100644 --- a/net-misc/connman-notify/metadata.xml +++ b/net-misc/connman-notify/metadata.xml @@ -5,4 +5,7 @@ <email>bkohler@gentoo.org</email> <name>Ben Kohler</name> </maintainer> +<upstream> + <remote-id type="gitlab">wavexx/connman-notify</remote-id> +</upstream> </pkgmetadata> diff --git a/net-misc/connman-ui/connman-ui-0_p20150622.ebuild b/net-misc/connman-ui/connman-ui-0_p20150622-r1.ebuild index 9edf9267b9d3..ab2877fbec31 100644 --- a/net-misc/connman-ui/connman-ui-0_p20150622.ebuild +++ b/net-misc/connman-ui/connman-ui-0_p20150622-r1.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools -inherit autotools vcs-snapshot COMMIT="fce0af94e121bde77c7fa2ebd6a319f0180c5516" DESCRIPTION="A full-featured GTK based trayicon UI for ConnMan" HOMEPAGE="https://github.com/tbursztyka/connman-ui" SRC_URI="https://github.com/tbursztyka/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN}-${COMMIT} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -CDEPEND=" +DEPEND=" dev-libs/glib:2 sys-apps/dbus x11-libs/gtk+:3 " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} net-misc/connman " -DEPEND="${CDEPEND} +BDEPEND=" dev-util/intltool virtual/pkgconfig " diff --git a/net-misc/connman-ui/connman-ui-9999.ebuild b/net-misc/connman-ui/connman-ui-9999.ebuild deleted file mode 100644 index 67ca7343806a..000000000000 --- a/net-misc/connman-ui/connman-ui-9999.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools git-r3 - -DESCRIPTION="A full-featured GTK based trayicon UI for ConnMan" -HOMEPAGE="https://github.com/tbursztyka/connman-ui" -SRC_URI="" -EGIT_REPO_URI="https://github.com/tbursztyka/connman-ui.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="" - -CDEPEND=" - dev-libs/glib:2 - sys-apps/dbus - x11-libs/gtk+:3 -" -RDEPEND="${CDEPEND} - net-misc/connman -" -DEPEND="${CDEPEND} - dev-util/intltool - virtual/pkgconfig -" - -src_prepare() { - default - eautoreconf -} diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest index 1b9d3242e462..f6e7c659594f 100644 --- a/net-misc/connman/Manifest +++ b/net-misc/connman/Manifest @@ -1 +1 @@ -DIST connman-1.40.tar.xz 758516 BLAKE2B 66834032f82e80a6f950d7ff823dc5f1f45090f3444b5a0241cabd0346cf9749b8780b624ce6a8e505305cc1a75423e5a95a7b1f77a282d231845bc33389924a SHA512 33df90814b7499aeafcd51fca4f8ffbc07efacfa29dda46d3b9bcd3ff26264dc53c3991e7e53a8563ca403015c345e59c7ad29427c38ee3d88dd282479db7a0f +DIST connman-1.42.tar.gz 743965 BLAKE2B 1d9eeb4c917978df502de684128a3464bbc7f3960878842a3ac27295dc5d049641cd5218a9542055b5d9ab2b6114fb773fc8a173f54dca3afe37109ab58bde35 SHA512 98ede28854e5948c8b67c5ba03b156ed9966e9fcda2d39168062873b194a192d12af885c63d9a2cb0b7b5b882b69fdbb0e09c4eb0c6772a76db06de7b9e363d7 diff --git a/net-misc/connman/connman-1.40.ebuild b/net-misc/connman/connman-1.42.ebuild index d76ef5ba0be7..55a168136695 100644 --- a/net-misc/connman/connman-1.40.ebuild +++ b/net-misc/connman/connman-1.42.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" inherit autotools systemd tmpfiles if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git" else - SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" - KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" + SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/${P}.tar.gz" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" fi DESCRIPTION="Provides a daemon for managing internet connections" @@ -24,36 +24,56 @@ wispr" REQUIRED_USE="^^ ( iptables nftables )" BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/glib-2.16 +COMMON_DEPEND=">=dev-libs/glib-2.16 + net-libs/gnutls >=sys-apps/dbus-1.2.24 sys-libs/readline:0= - bluetooth? ( net-wireless/bluez ) - iptables? ( >=net-firewall/iptables-1.4.8 ) - iwd? ( net-wireless/iwd ) - l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4:0= - >=net-libs/libmnl-1.0.0:0= ) - ofono? ( net-misc/ofono ) + >=net-libs/libmnl-1.0.0:0= + ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) - policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) - wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) - wireguard? ( >=net-libs/libmnl-1.0.0:0= ) - wispr? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} + wireguard? ( >=net-libs/libmnl-1.0.0:0= )" +RDEPEND="${COMMON_DEPEND} + bluetooth? ( net-wireless/bluez ) + iptables? ( >=net-firewall/iptables-1.4.8 ) + l2tp? ( net-dialup/xl2tpd ) + ofono? ( net-misc/ofono ) + policykit? ( sys-auth/polkit ) + wifi? ( + !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) + iwd? ( net-wireless/iwd ) + )" +DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6.39" +PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" ) + +if [ ! -z ${COMMIT} ]; then + S=${WORKDIR}/${PN}-${COMMIT} +fi + src_prepare() { default eautoreconf + + cp "${FILESDIR}"/connman.initd2 "${T}" + if use iwd; then + sed -i \ + -e "s/need dbus/need dbus iwd/" \ + -e '/start-stop-daemon --start/ s/ -- / -- --wifi=iwd_agent /' \ + "${T}"/connman.initd2 || die + sed -i \ + -e "/^ExecStart/ s/$/ --wifi=iwd_agent/" \ + src/connman.service.in || die + fi } src_configure() { - econf \ + local myeconfargs=( --localstatedir=/var \ --runstatedir=/run \ --with-systemdunitdir=$(systemd_get_systemunitdir) \ @@ -65,7 +85,6 @@ src_configure() { $(use_enable debug) \ $(use_enable ethernet ethernet builtin) \ $(use_enable examples test) \ - $(use_enable iwd) \ $(use_enable l2tp l2tp builtin) \ $(use_enable networkmanager nmcompat) \ $(use_enable ofono ofono builtin) \ @@ -75,12 +94,24 @@ src_configure() { $(use_enable pptp pptp builtin) \ $(use_enable tools) \ $(use_enable vpnc vpnc builtin) \ - $(use_enable wifi wifi builtin) \ $(use_enable wireguard) \ $(use_enable wispr wispr builtin) \ --with-firewall=$(usex iptables "iptables" "nftables" ) \ --disable-iospm \ --disable-hh2serial-gps + ) + # wifi USE logic to match networkmanager ebuild behavior + if use wifi; then + if use iwd; then + myeconfargs+=( --enable-iwd --disable-wifi ) + else + myeconfargs+=( --disable-iwd --enable-wifi=builtin ) + fi + else + myeconfargs+=( --disable-iwd --disable-wifi ) + fi + + econf "${myeconfargs[@]}" } src_install() { @@ -92,7 +123,7 @@ src_install() { fi keepdir /usr/lib/${PN}/scripts keepdir /var/lib/${PN} - newinitd "${FILESDIR}"/${PN}.initd2 ${PN} + newinitd "${T}"/${PN}.initd2 ${PN} newconfd "${FILESDIR}"/${PN}.confd ${PN} } diff --git a/net-misc/connman/connman-9999.ebuild b/net-misc/connman/connman-9999.ebuild index 9f0547208dca..7e8c30b36e79 100644 --- a/net-misc/connman/connman-9999.ebuild +++ b/net-misc/connman/connman-9999.ebuild @@ -1,15 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" inherit autotools systemd tmpfiles +COMMIT="" + if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git" else - SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${COMMIT}.tar.gz" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" fi DESCRIPTION="Provides a daemon for managing internet connections" @@ -24,36 +26,56 @@ wispr" REQUIRED_USE="^^ ( iptables nftables )" BDEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/glib-2.16 +COMMON_DEPEND=">=dev-libs/glib-2.16 + net-libs/gnutls >=sys-apps/dbus-1.2.24 sys-libs/readline:0= - bluetooth? ( net-wireless/bluez ) - iptables? ( >=net-firewall/iptables-1.4.8 ) - iwd? ( net-wireless/iwd ) - l2tp? ( net-dialup/xl2tpd ) nftables? ( >=net-libs/libnftnl-1.0.4:0= - >=net-libs/libmnl-1.0.0:0= ) - ofono? ( net-misc/ofono ) + >=net-libs/libmnl-1.0.0:0= + ) openconnect? ( net-vpn/openconnect ) openvpn? ( net-vpn/openvpn ) - policykit? ( sys-auth/polkit ) pptp? ( net-dialup/pptpclient ) vpnc? ( net-vpn/vpnc ) - wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) - wireguard? ( >=net-libs/libmnl-1.0.0:0= ) - wispr? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} + wireguard? ( >=net-libs/libmnl-1.0.0:0= )" +RDEPEND="${COMMON_DEPEND} + bluetooth? ( net-wireless/bluez ) + iptables? ( >=net-firewall/iptables-1.4.8 ) + l2tp? ( net-dialup/xl2tpd ) + ofono? ( net-misc/ofono ) + policykit? ( sys-auth/polkit ) + wifi? ( + !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) + iwd? ( net-wireless/iwd ) + )" +DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6.39" +PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" ) + +if [ ! -z ${COMMIT} ]; then + S=${WORKDIR}/${PN}-${COMMIT} +fi + src_prepare() { default eautoreconf + + cp "${FILESDIR}"/connman.initd2 "${T}" + if use iwd; then + sed -i \ + -e "s/need dbus/need dbus iwd/" \ + -e '/start-stop-daemon --start/ s/ -- / -- --wifi=iwd_agent /' \ + "${T}"/connman.initd2 || die + sed -i \ + -e "/^ExecStart/ s/$/ --wifi=iwd_agent/" \ + src/connman.service.in || die + fi } src_configure() { - econf \ + local myeconfargs=( --localstatedir=/var \ --runstatedir=/run \ --with-systemdunitdir=$(systemd_get_systemunitdir) \ @@ -65,7 +87,6 @@ src_configure() { $(use_enable debug) \ $(use_enable ethernet ethernet builtin) \ $(use_enable examples test) \ - $(use_enable iwd) \ $(use_enable l2tp l2tp builtin) \ $(use_enable networkmanager nmcompat) \ $(use_enable ofono ofono builtin) \ @@ -75,12 +96,24 @@ src_configure() { $(use_enable pptp pptp builtin) \ $(use_enable tools) \ $(use_enable vpnc vpnc builtin) \ - $(use_enable wifi wifi builtin) \ $(use_enable wireguard) \ $(use_enable wispr wispr builtin) \ --with-firewall=$(usex iptables "iptables" "nftables" ) \ --disable-iospm \ --disable-hh2serial-gps + ) + # wifi USE logic to match networkmanager ebuild behavior + if use wifi; then + if use iwd; then + myeconfargs+=( --enable-iwd --disable-wifi ) + else + myeconfargs+=( --disable-iwd --enable-wifi=builtin ) + fi + else + myeconfargs+=( --disable-iwd --disable-wifi ) + fi + + econf "${myeconfargs[@]}" } src_install() { @@ -92,7 +125,7 @@ src_install() { fi keepdir /usr/lib/${PN}/scripts keepdir /var/lib/${PN} - newinitd "${FILESDIR}"/${PN}.initd2 ${PN} + newinitd "${T}"/${PN}.initd2 ${PN} newconfd "${FILESDIR}"/${PN}.confd ${PN} } diff --git a/net-misc/connman/files/libresolv-musl-fix.patch b/net-misc/connman/files/libresolv-musl-fix.patch new file mode 100644 index 000000000000..c28a7c1e3589 --- /dev/null +++ b/net-misc/connman/files/libresolv-musl-fix.patch @@ -0,0 +1,61 @@ +musl does not implement res_ninit + +diff --exclude '*.*o' -ru connman-1.24.orig/gweb/gresolv.c connman-1.24/gweb/gresolv.c +--- connman-1.24.orig/gweb/gresolv.c 2014-07-18 20:17:25.000000000 -0300 ++++ connman-1.24/gweb/gresolv.c 2014-07-18 20:24:01.874669130 -0300 +@@ -874,8 +874,6 @@ + resolv->index = index; + resolv->nameserver_list = NULL; + +- res_ninit(&resolv->res); +- + return resolv; + } + +@@ -915,8 +913,6 @@ + + flush_nameservers(resolv); + +- res_nclose(&resolv->res); +- + g_free(resolv); + } + +@@ -1019,24 +1015,19 @@ + debug(resolv, "hostname %s", hostname); + + if (!resolv->nameserver_list) { +- int i; +- +- for (i = 0; i < resolv->res.nscount; i++) { +- char buf[100]; +- int family = resolv->res.nsaddr_list[i].sin_family; +- void *sa_addr = &resolv->res.nsaddr_list[i].sin_addr; +- +- if (family != AF_INET && +- resolv->res._u._ext.nsaddrs[i]) { +- family = AF_INET6; +- sa_addr = &resolv->res._u._ext.nsaddrs[i]->sin6_addr; ++ FILE *f = fopen("/etc/resolv.conf", "r"); ++ if (f) { ++ char line[256], *s; ++ int i; ++ while (fgets(line, sizeof(line), f)) { ++ if (strncmp(line, "nameserver", 10) || !isspace(line[10])) ++ continue; ++ for (s = &line[11]; isspace(s[0]); s++); ++ for (i = 0; s[i] && !isspace(s[i]); i++); ++ s[i] = 0; ++ g_resolv_add_nameserver(resolv, s, 53, 0); + } +- +- if (family != AF_INET && family != AF_INET6) +- continue; +- +- if (inet_ntop(family, sa_addr, buf, sizeof(buf))) +- g_resolv_add_nameserver(resolv, buf, 53, 0); ++ fclose(f); + } + + if (!resolv->nameserver_list) + diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml index 7ca0a323aa86..1060aaabf18e 100644 --- a/net-misc/connman/metadata.xml +++ b/net-misc/connman/metadata.xml @@ -7,7 +7,7 @@ </maintainer> <use> <flag name="ethernet">Enable ethernet support.</flag> - <flag name="iwd">Enable wifi support via net-wireless/iwd</flag> + <flag name="iwd">Enable wifi support via <pkg>net-wireless/iwd</pkg></flag> <flag name="l2tp">Use <pkg>net-dialup/xl2tpd</pkg> for L2TP VPN support.</flag> <flag name="iptables">Use <pkg>net-firewall/iptables</pkg> as firewall.</flag> <flag name="nftables">Use <pkg>net-firewall/nftables</pkg> as firewall.</flag> diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest index 489d7afb78c6..cb05f3bc5710 100644 --- a/net-misc/croc/Manifest +++ b/net-misc/croc/Manifest @@ -1,95 +1,4 @@ -DIST croc-9.4.2.tar.gz 2807224 BLAKE2B dce3d065e9e367f9ed472728692f624b759930eb1dd6fa96dbe901efc17d1cf88073ccc68d690610bd5db498f18dc245d2b4f74e56c4f42f3028b68bd5c5afcb SHA512 8207c5c25e9775ec25bdbab7d87ac353e459bda93874122b014e618d173ccff0fbe54a547ba7a36da93e47a6f7532dba5e21df9f1b7339e11d2faf7977eb8b33 -DIST croc-9.5.0.tar.gz 2806464 BLAKE2B 56a15469f31c86a0fd26ba938768fb7a759813a3c974b5f99081231a2da99e5bd517c493338cdf6710ec4d7a37a5bf6af3a723fa360bb84e64f02bd076cb30f0 SHA512 a12b47c1d6fc5ddeac903d7020d82cf21ba8d0efc3275c7282b7a9498632a1ec5b1032b840cc7a66435f17d224f7a499721166d6028594e1f2c59c8aa231a717 -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 -DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.zip 15230 BLAKE2B 0c1948a396a0dff83d93bee74ed9bfd558d6719fc1881d01d060cef8bc231fd6fb5f0c2c2542f9e9b482e893af6fe89e93abc12f7a29e27eb76e7728b8df556e SHA512 7fe3517b3b1a5bf60782d7c15ef44b622090a21d4420e52a2a43a10da9b636eb1abf66b213b19bb699e8f60a96f122c888bd12906b2f2e2644b928f35b8c9139 -DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9 -DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6 -DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d -DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.1.mod 100 BLAKE2B f52c698746c9638de975bcac96fde4bf63f7f2e82d0767b28b4aa07e8900c41f508aedb0204b156cce3d12718b9c17ac1a0873189ed5ebed32282e77cc4b4adc SHA512 d39412bb14c058291d07276337f802547bfb1a682cc65199cb04334f8089b6ea5d4d73587c2765c518f9e27fa3421c276eaea616d7cfbe36a2a244326edf1cb5 -DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.1.zip 12383 BLAKE2B 662b382fe15f30f70d8a88f01d19398ba7e955d6c98f728ec753cb75ba3f9473bbb9dc5b217cb782aa4b3adf402dab1886bbc6ea6ce9f69b7d171b9a96630408 SHA512 ff2673f81d7fab4ab07edd3b3fddba2243931ddbb0dfd104ca389eee137e56fa33f23a4bb8fdd6ccdf325fcaf134adc16dce9e89c9105783afc0fc4ef1419892 -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb -DIST github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod 42 BLAKE2B 82ce41a468f86b7e890b3f78540b186af17a4dba7dc95f9e19ae08a0008af3ab1a4f6dc4038233dad1cc62b9c8e0950c6ea062f03f4502cbccb256a84c4cea45 SHA512 330121b143198b7a6564df33fd8cb6b2526d641c08301f7e26c06a4274e8e038b16b0bc833ec3363770f0c177882fe0e8021d721a2fc32e8050e75a2051febf9 -DIST github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip 32312 BLAKE2B 37cf6c05b306d6d88aaf6455a0068dcd5744657e057529ec6e62b1117b87c09c40d159e1d1205f6751111c4eea3194cbfe199de5d7a74d3a0ada349ceb4b8e51 SHA512 ca740e3296a7699459cfc4ce454277c7b5dc2bacd12ad5959f6d2a77d9d268f6671d4c30b1c84072d53045935838005d2dcc5beeab1acfee6e952c67e0bbc859 -DIST github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod 34 BLAKE2B 86aaf734f424439c38d57c59bb08da879781d897196a6f1c6486fe74677d055bc301fdfd72825e079b50bb04ef2a12db0c0e65a0a59f0be65db12f03c731bed9 SHA512 8664f01b08e210d9f70e72a1c8add0547055979561ebc689e9b7f601f4ee8359d00649a5f8a0bc0c9715009ef8066a1924f5311377b7346685b3bef676481dcc -DIST github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.2.mod 109 BLAKE2B d1745ea6be8862914fbec8575738c7b68bbb210bafc3e385126b8bbb7a553ed60c8a96b2cdc3af3f30b8b492d9741281f8d296c219bc821c0e212912ba9039a0 SHA512 83c81af5529aa71b8465e8b18f402f067b030dbab794fda6d04a872ab6e170598f3ff360d81bf54d150bfea1e63cbc12b09c4ad83826f34db25dc64f2caaacea -DIST github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.2.zip 9680 BLAKE2B a1a9179beef0f7564ede0986f43fe6ac05c93e7766c99d76471cf1bfe65efbac25ee794564e65dfd7862289143b9cb26a19048cec7488153c78a2380e12c6d99 SHA512 d457b81d745e94be4ded5739ea2d15e34118033610f01228b821af8084837bcf493e661df6b875264ae02ebf54a80d84d59868cde3d755bb7e2b0e834396580c -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f -DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.mod 104 BLAKE2B e859512911c1621e5ba3e46249c5b9b5e4b0bae854bb3a18d7e39d6da27c93e133d43851d5e6bf2ede44fdee31801b19fe274b55a1f37b1291bf27262e2f2385 SHA512 23b01eb4023ff5018437ff98b55ada053eba49feab2777eed36d033f426c5456b143f3defbc3131dad1251205f3ffb3553e3c10bd98de80f0a462e8450d6d56c -DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.mod 84 BLAKE2B d78cb89b5321a10aed4ad5abd88952a190c5051dedea0c9f43f06881be807892152edb9be4ecc9eddfc3cd7b75a441ab85559e25c60feeaf560baf829af373ff SHA512 b96cca212a7024f0039ddd3a744fe818ab2e028b8ac2fd4472ce76ee9b496de3abb0960718c1106a98cf7e6df652dcf2884fe5ed95979bd9016399ea4abd324d -DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.zip 20978 BLAKE2B 1114ba9e7289e1a1423e81c4e0ff52860d9232f7e55a626e32282dfbf7a45ef53c21b843f4b6870be92e710db9c619d96f9c197eda0d8c28dac3764160e92105 SHA512 e86a3b69601be1a0a15d7bfd5d93fce8d8c06b52c55c941a9ed62b44f05d3062e436d817661af14bb42838efc45875a63eb6042b196e1684db36e0fe6ed42a7f -DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod 40 BLAKE2B 0f9e6ab0f72f5158dd93a5c57ac4be060f15d7be491b8bca4c5ce0844d79756d25b78a70e5258e77db4d7b9ea7dc39e7eb0ffdf41e0cf6ab193c71a5192d9ebc SHA512 54abe3375058c36dc4e31eca46d3d4a3382ddd027afb15ab161cf2ee32d6e14d5ae643a75d7a911d55f3c065bde539cb24ec9e9366cb6f365b541a72b62d677a -DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip 5985 BLAKE2B db4ca25a009754faf835ed02201c87cc04f82c3d3e9d4698d030984e2ba6eb557dd629d4b48005a44a87d6f333c573cc4b9465cd10456ba5af958a37dbeddc70 SHA512 9ad6acec3cd1b12d46279f0f7fd12d2216f53658eea4181d0331a9c2de4d8e5c7ae5f095c4eb7c1c97a1d14b0f231f23c36ee52d92708eb3dcdfdd4cfefe17c8 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2 -DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc -DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip 45731 BLAKE2B f4a1442027b29625c694298e10ec9c107edd8437d8749110cd56440dae791c0e6d88a68187240cbc521f79fa7bdc4307e4b3b4edad38d57d5834644342a066e0 SHA512 88f37961ebe3a1701265a2f5cb606e97fe4ddd09e36ff13ca8c026e98640af5d35cb930e4d12b6690a97e5d934705102554c6d2912ebbb5ee08976c698cce2db -DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738 -DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738 -DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip 122358 BLAKE2B 8f906d748eda31f9e673fd8eb0978eb9ff17484d38cfef9f5cb7dd623005bb971d131dce52a6089f5a41deded4c4dbb956aa9a56da91b5a5b5eba9e3a9100f59 SHA512 11e29cdd7a8baee7995009755582c26eb819efd715e9dfa1442b5743c7bf5752188f0fa8f5ddb3452f05f371a280324406410b683609f6a510277d3e03b30ca0 -DIST github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod 184 BLAKE2B f67cc91ee946f87065b29c78633866804f158d8dcbfbd6ad24d55f3e44d0ebf32db5666774d7a75920ae456bd16b115c672a2f07af9dcaa92550c1ccac6bee22 SHA512 04fa4c8e8636a01bec227f466844b251cbb74f856e8e1bc04de7401ae1452ecfa2839644a14b33b643d050d8f8edf503681ce0d4ac97bbcf2a5b0a8fdd7018c4 -DIST github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.zip 3453563 BLAKE2B fe5fc340884a6d6fb8090b2f2e3f847c9b440e950e2174796e9b8beb5ebba0e8fe3b634d4b52b44dc43246191ae401c3bb02c5206898f81debe1ef07ff23e23a SHA512 79b574582ed35aba46ca953fba610804a3a42acd9b244175862610df26d1e71c8b2c4ebf3c71df5990ec84b26d403484731cfd649051d73cc56e123788230a19 -DIST github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod 42 BLAKE2B 28d1441e2d219c8194a4acaaea2d072866bef631fec3e10ccf73527337b09da5a4205a4298f60ed823bdc323a7517e69f3fb1cab925baec13a6684688d8f26ad SHA512 db5dd8742ef68cf0e1710f2065435b07f44899cca8c2bcd4df2a127596ff778661531f45a35a59b981b4fcb246757beea26835ddab8e3f5d24954af616067124 -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.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.9.mod 216 BLAKE2B 64dc481114d5b023c2dcce61c230585dc4e78b94918f5273aafffb60a58f750398c627515ce3a3aa43af3574a8ed7c7e502b65c9d45c547e90def848c2b143d2 SHA512 678e2acfe4a5296ac99974a8d50136adc1ccc7d987c356bbd2315685d4b2e865bf22404e55e7f5b8d7e24ce46d9fff9c09a6a24f5a8f8fa9a6ec48cdad88f2ae -DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.9.zip 9468 BLAKE2B 295f884ea1aa05f7db137c6b6087b8da0ea66f41782cc5da1ed61772c3a88d699209238299d0668af4d9a3de98b3b48ed9114cb1c7e6a1d85aea272d19f85d81 SHA512 8ee5004248c49a1b035d8b9c189be1c2e84e0bc08a54a781d6fa3a25a83e99bd1217d5829ccdfbf166eb798fdfe215a81d82ec61a7089c87a8b978f503579ee2 -DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.3.mod 552 BLAKE2B 4198583a40acaddcb10be35144f3d278a41e7cfbd67defeb4a028e5196cd5826171108dc2d0589dab341af8a85b735c436e122442e5d8ac6661dbc91fab4132b SHA512 2cb9b6c9e1a74f18c08a9d65f9523cbfe74299514d6dcf9c4bb81c3ee32dd0dd27f15031bfc5df929ebba5697633a825025f5bacb9fe13f4920e9b94fd78e8fa -DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.3.zip 606672 BLAKE2B e70ea26b06f35a20fce029fe08660e4cc8bbc9cb914715689939576b4cfe93995c1e721489fef3e5d3d65056966d5727f2c877b592159bcbaf7f108172f87b82 SHA512 f63f3d66b90e6aae2eca380b94fd0cfeb80ef656d182c7ddf5d016e0b858f2f42e638ecb1357d747017abf047a1b0b814bbbdc465d94afbf5154755a26020f07 -DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3 -DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25 -DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25 -DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip 9830 BLAKE2B c5d27e8b447082c0a1756354c0a414079fc3b03d0649cee8353490827ff50882a9321b89fdae4e341da1a4718f6db4c4a4c27e937c9bf31111085a449f56f282 SHA512 aff4d1c9bab0fd619496fd6948f05bc88e4147af2fb171c4ce4e44d81c114257abd55f92fee27c4b6d96fde21c6756735c32257de7b00bdb0356509cb4b97374 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f -DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod 32 BLAKE2B 714a7fdeaaa7ea25dedf0279e7edc1939ae954f9214851f3b8ca0baf2be779b323f79dcf86c34026dc48a9c12f448d5b70f0088292a0f5d7e77706eccd7167df SHA512 dbf23e08092d028c7f03935ddf3e1f63b2ab16781d713f1339a0dfd1199217e80e01a4183f1b18c25db99077b9f059baee8016ec069cac6252839f79008ad09f -DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20210707234609-9bdfc483d499.mod 32 BLAKE2B 714a7fdeaaa7ea25dedf0279e7edc1939ae954f9214851f3b8ca0baf2be779b323f79dcf86c34026dc48a9c12f448d5b70f0088292a0f5d7e77706eccd7167df SHA512 dbf23e08092d028c7f03935ddf3e1f63b2ab16781d713f1339a0dfd1199217e80e01a4183f1b18c25db99077b9f059baee8016ec069cac6252839f79008ad09f -DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20210707234609-9bdfc483d499.zip 73692 BLAKE2B 14a73df1ad17271b125d43db3533c7980937625c6c73f2e66bf77cbb16c456115f6d9e541b3c6f88531bc433788f005e85c8335deef1b392ecf56721ccb2b6b2 SHA512 ac10585e471e7109f1b4368211dd3251ecbcdc586bbc33da26e6ba6356bb50778ec4b1375b1a8265c3d8cf33fc43c36650be7943c1dc4a356d17e1216925997f -DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.mod 40 BLAKE2B 0d12dc1fd09b245563e86708118ecc00ddb9712b290b444c1239c190358ff523f24118c5f69c5ad1861d9056bbeafc5d04f038d6ab4df82d64019c489175716b SHA512 1cece428d8224cbbb52f74138f441ba00fdaa13105a523d6374c7674c6b40e1c784782f105ce6ef9dcf3fcbebd4c8342a81674cace5211d73e5d108d1e9f16a7 -DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.6.mod 40 BLAKE2B 0d12dc1fd09b245563e86708118ecc00ddb9712b290b444c1239c190358ff523f24118c5f69c5ad1861d9056bbeafc5d04f038d6ab4df82d64019c489175716b SHA512 1cece428d8224cbbb52f74138f441ba00fdaa13105a523d6374c7674c6b40e1c784782f105ce6ef9dcf3fcbebd4c8342a81674cace5211d73e5d108d1e9f16a7 -DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.6.zip 18380 BLAKE2B e6a082e9d919f1b442b77137e223cff934a24026f0da5981446a28788837159879ec8465c3c0f830c10243398d497f08f4cd27553bd63b578ab86540c0ec4ccf SHA512 61b2fd87fb9817fc990cff7d23547b6a259d4eea8bd9f327ef461a3e4cde4add511919ded2a19f932fcd810d72ace567bdde99f59c856296e44480167fff2dd5 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.zip 1878482 BLAKE2B 0eef87d2e4c8998450fa976e54b3d00625faad61125a442e3c824763e803257061a05d9046e3c95659cb3a18f8c0f37bea529bcf53c79fc5f7034f1f6d9d1130 SHA512 c49fad474be5b84f99f2cf45970bf1bbdf02f4ed6c8c9d6aab8d672e49972059d4f6f0535bae7647b2d5c40c7a2168a20a0557e1cb29d30811b719f50aa6b226 -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-20210929193557-e81a3d93ecf6.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210929193557-e81a3d93ecf6.zip 1576003 BLAKE2B fdefd86810dcfe675adef45315c41659e2d43c91530bfa963072aa0339c3e5723610f6dab17d9805e4300104321505f3fc7f09372beb7e9501f9d82b77ec78c2 SHA512 17153262f765100d4fa7f544887827e2160962c6a8a62ab4230f16a1aa382ec9d77ae55289e68130bf354af699a6db2504fa68e4b3abb470c525489753aef930 -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-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210910150752-751e447fb3d0.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211002104244-808efd93c36d.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211002104244-808efd93c36d.zip 1662575 BLAKE2B a40b19411acdba8dc351204a81a40a3c1e132f2a00c2bd6dd6c2139d64a89f99ab34091a1cec9a3a1a00b5fba973b937e7356c395909eb4aa1b9766ff206a334 SHA512 4cd9489cde94b383388f325620a8e9279306e3fc680dbf1c804d08adf298179ba4397817bc4d8b58c7aa8e4c4525905aaaebce1a7dcc89501d313b349834b343 -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-20210615171337-6886f2dfbf5b.mod 95 BLAKE2B 1d166082ebb4ba2dc69bdce6b84f285aa98967551bbfc1cbadeb2db086ef01b66455cd86b78deeec5ae998a7057c7e4f12026b2e02a9c5053093b9f644a59d1f SHA512 81f571821c669188c4482da38b6921ac4c2c1747f8a803a6846531127cfde25dd04819d971f08f601c2d2cee2e636644c1648eff55dd24d89dfb3777e90fe9a0 -DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210927222741-03fcf44c2211.mod 95 BLAKE2B 1d166082ebb4ba2dc69bdce6b84f285aa98967551bbfc1cbadeb2db086ef01b66455cd86b78deeec5ae998a7057c7e4f12026b2e02a9c5053093b9f644a59d1f SHA512 81f571821c669188c4482da38b6921ac4c2c1747f8a803a6846531127cfde25dd04819d971f08f601c2d2cee2e636644c1648eff55dd24d89dfb3777e90fe9a0 -DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210927222741-03fcf44c2211.zip 21653 BLAKE2B 53f26212f031a9dd420c6e87a1f3e58bd78715475f1e33b7bc2eb65b556d95c8901819ce02be5e7ce6a8842fce670167e302e3311f9c47a9f1ec79bf272c770e SHA512 2f7ff46b02b31f30a73e1d574fafce089e51df788a2b34b18d505d1c191149a70f222b462664218c5451a7beaa7efaf4178470703887f2e438a4455603f359a3 -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.mod 97 BLAKE2B cba29395bf9693152732776bde498cfd90a27c053feb5d1ca655e5e792ff68b9cd0a519bdff559450491e918a171c8a4fdbd4c0b4bcc9b578182f63ca37754db SHA512 e77211a503c35d8b6c392fc1b44daed580659b997673cd312ae8e579d1d715d7a53f8f0f0dd2d4dedbc6c5ca5ab7e3d52269a6536a42824cce267c89eb29cbbd -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.zip 8610883 BLAKE2B 768763b6da537c25448ff274da90261ad33a527e58a5749108d9d889b326051f7bb86a64ffea0a8dc2850260223a8b60ada4615290a9ba1b9a0725bb03c3323c SHA512 fb5d646d5f23fbb33acfe486714d647d7da091fc47cc7ec805afa4f78b070ed3ccc0022428f4672280ff85a7b4d8af3543647647f00ce62f2f3a18a6d425f863 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20211116232009-f0f3c7e86c11.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20211116232009-f0f3c7e86c11.zip 12003 BLAKE2B f3bfdbb691fc949be84a56ab90648ed0ed8dfbdbc8760dd6864da303292dbb1aeb9dca26e968dd476e9a6b288489f70535c5f5c28059a84b619de6a59ab6f10e SHA512 7461106702042165b44c725ff038e0307b959d843097f8ab28dac0a22ba606741f31052af3eb9fb8caaf6fa1439991cda336de83588812035e3b5209dd80f083 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d -DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod 29 BLAKE2B 19c591a3bcec66342d2e3b47488fa4975e9b0e48628091fd8c36b77a2dfca279ca5be1d2fac9b97b8f43db6315fe24b4597ad91c4b26d963746b3022ff31e1fb SHA512 aaa83d3edd25827dc6a4f3ef13c8c726f518c91343ba85ecc09cbfbf9a318b66394506db5b72c3e9117b21b9ebc9cf81d1d6ec4cbd4246f8de32123cbea0ea24 -DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip 6816 BLAKE2B 44b63e4a425a5b52504f3fd58c5f8452a550633d79407310c27ee0ecc66c612e7011937a1e220bb67e8fbc47d2bf9d88ccdad6088d967ea541f4a7e302dbe441 SHA512 d371c8a87ec7ea2f7fc4af4818292d4882c15de1709f6d939adbf86a6a81537d066aceb0538c4fcf9849e05018755caa472be5f3e3894cdb462c9fa2ee3b0a44 -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 +DIST croc-9.6.15-deps.tar.xz 30217856 BLAKE2B 87c34fa60f0bda194ca022648be2ce11da7b4b9a3f3a5f5b16a5127d5b25197ec99bdba1ef388c38b9e632ed4ef0f89a68e3b58368d9df7b07a1f3129b2b9145 SHA512 caa944dc9e8fb0d4883f4447c979282826e2364fe8b196e412861189953c23a09b6de38306aa00eabfeeb12fb4d3ab9e9794494da8ece10c3ee5a0cd72161d17 +DIST croc-9.6.15.tar.gz 512614 BLAKE2B 2a87593b5d944c2b5ea970d30f0b64b2a8325cca672421aaa58e6fd07e440aad88de6acad564fcb9963256a9f499421dd9343f51395babd724deeffe875cc6f7 SHA512 8ae76dc5029e7adc809b0083e147c57c7249e9fbb07f263a0b10d21539ebfc69c5d9d8e60811cca06bbb313ec9a3a143baaef73f77ca599dc102626dc9fccf29 +DIST croc-9.6.17-deps.tar.xz 29935608 BLAKE2B 1bdcd2e86f09f3a112faa9f671705a5cabb3f6d9037ba71f0947ee2ce3863d840a8e6847167017c7e02de422900bfbfc8ca285933dd23b95a4232e67c0e30c50 SHA512 0787600d6ca9d46da1e66b27e5f3cc2c88020fa8bb9119c1455209680eb886245f05a7650727759f7624ec59e4b4cec7910f58e83b79d0f87b26375de17b13b2 +DIST croc-9.6.17.tar.gz 514013 BLAKE2B ac0819791329085d91a57a170981d5b42739c098bba7c6ba523d6f02dee06868d9ac45fc4b264a7dff670550d38aa90be10a9be99d07417fb5754529022583d4 SHA512 a9bc1b4325ae8066874f40cad1ff63e8f69cd7d36189f553e6865efb456fed319384710d86ad81cdfebdd3d70cfa82f7ce84d458898d1016ccc652b6b692d120 diff --git a/net-misc/croc/croc-9.4.2.ebuild b/net-misc/croc/croc-9.4.2.ebuild deleted file mode 100644 index 0b58de198139..000000000000 --- a/net-misc/croc/croc-9.4.2.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 go-module systemd - -DESCRIPTION="Easily and securely send things from one computer to another" -HOMEPAGE="https://github.com/schollz/croc" - -EGO_SUM=( - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/OneOfOne/xxhash v1.2.2/go.mod" - "github.com/OneOfOne/xxhash v1.2.5" - "github.com/OneOfOne/xxhash v1.2.5/go.mod" - "github.com/cespare/xxhash v1.1.0" - "github.com/cespare/xxhash v1.1.0/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.1" - "github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/denisbrodbeck/machineid v1.0.1" - "github.com/denisbrodbeck/machineid v1.0.1/go.mod" - "github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod" - "github.com/kalafut/imohash v1.0.2" - "github.com/kalafut/imohash v1.0.2/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/mattn/go-isatty v0.0.14/go.mod" - "github.com/mattn/go-runewidth v0.0.13" - "github.com/mattn/go-runewidth v0.0.13/go.mod" - "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db" - "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/rivo/uniseg v0.2.0" - "github.com/rivo/uniseg v0.2.0/go.mod" - "github.com/russross/blackfriday/v2 v2.0.1/go.mod" - "github.com/russross/blackfriday/v2 v2.1.0" - "github.com/russross/blackfriday/v2 v2.1.0/go.mod" - "github.com/schollz/cli/v2 v2.2.1" - "github.com/schollz/cli/v2 v2.2.1/go.mod" - "github.com/schollz/logger v1.2.0" - "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.2" - "github.com/schollz/pake/v3 v3.0.2/go.mod" - "github.com/schollz/peerdiscovery v1.6.9" - "github.com/schollz/peerdiscovery v1.6.9/go.mod" - "github.com/schollz/progressbar/v3 v3.8.3" - "github.com/schollz/progressbar/v3 v3.8.3/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" - "github.com/spaolacci/murmur3 v1.1.0/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.6.1" - "github.com/stretchr/testify v1.6.1/go.mod" - "github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod" - "github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499" - "github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499/go.mod" - "github.com/twmb/murmur3 v1.1.5/go.mod" - "github.com/twmb/murmur3 v1.1.6" - "github.com/twmb/murmur3 v1.1.6/go.mod" - "golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod" - "golang.org/x/crypto v0.0.0-20210921155107-089bfa567519" - "golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod" - "golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod" - "golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6" - "golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod" - "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" - "golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod" - "golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod" - "golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod" - "golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod" - "golang.org/x/sys v0.0.0-20211002104244-808efd93c36d" - "golang.org/x/sys v0.0.0-20211002104244-808efd93c36d/go.mod" - "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod" - "golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod" - "golang.org/x/term v0.0.0-20210927222741-03fcf44c2211" - "golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/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/go.mod" - "golang.org/x/text v0.3.7" - "golang.org/x/text v0.3.7/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/tylerb/is.v1 v1.1.2" - "gopkg.in/tylerb/is.v1 v1.1.2/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" - ) -go-module_set_globals - -SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -LICENSE="Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - -RDEPEND=" - acct-group/croc - acct-user/croc -" - -PATCHES=( - "${FILESDIR}/${PN}-disable-network-tests-r1.patch" - "${FILESDIR}/${P}-tcp-const.patch" -) - -DOCS=( README.md ) - -src_prepare() { - default - # Replace User=nobody with User=croc - sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die - # Rename bash completion function - sed -i -e "s|_cli_bash_autocomplete|_croc|g" \ - src/install/bash_autocomplete || die -} - -src_compile() { - go build || die -} - -src_install() { - dobin croc - systemd_dounit croc.service - newbashcomp src/install/bash_autocomplete croc - einstalldocs -} - -src_test() { - go test -work ./... || die -} diff --git a/net-misc/croc/croc-9.5.0.ebuild b/net-misc/croc/croc-9.5.0.ebuild deleted file mode 100644 index c8aedcc71fc8..000000000000 --- a/net-misc/croc/croc-9.5.0.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 go-module systemd - -DESCRIPTION="Easily and securely send things from one computer to another" -HOMEPAGE="https://github.com/schollz/croc" - -EGO_SUM=( - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/OneOfOne/xxhash v1.2.2/go.mod" - "github.com/OneOfOne/xxhash v1.2.5" - "github.com/OneOfOne/xxhash v1.2.5/go.mod" - "github.com/cespare/xxhash v1.1.0" - "github.com/cespare/xxhash v1.1.0/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.1" - "github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/denisbrodbeck/machineid v1.0.1" - "github.com/denisbrodbeck/machineid v1.0.1/go.mod" - "github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod" - "github.com/kalafut/imohash v1.0.2" - "github.com/kalafut/imohash v1.0.2/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/mattn/go-isatty v0.0.14/go.mod" - "github.com/mattn/go-runewidth v0.0.13" - "github.com/mattn/go-runewidth v0.0.13/go.mod" - "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db" - "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/rivo/uniseg v0.2.0" - "github.com/rivo/uniseg v0.2.0/go.mod" - "github.com/russross/blackfriday/v2 v2.0.1/go.mod" - "github.com/russross/blackfriday/v2 v2.1.0" - "github.com/russross/blackfriday/v2 v2.1.0/go.mod" - "github.com/schollz/cli/v2 v2.2.1" - "github.com/schollz/cli/v2 v2.2.1/go.mod" - "github.com/schollz/logger v1.2.0" - "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.2" - "github.com/schollz/pake/v3 v3.0.2/go.mod" - "github.com/schollz/peerdiscovery v1.6.9" - "github.com/schollz/peerdiscovery v1.6.9/go.mod" - "github.com/schollz/progressbar/v3 v3.8.3" - "github.com/schollz/progressbar/v3 v3.8.3/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" - "github.com/spaolacci/murmur3 v1.1.0/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.6.1" - "github.com/stretchr/testify v1.6.1/go.mod" - "github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod" - "github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499" - "github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499/go.mod" - "github.com/twmb/murmur3 v1.1.5/go.mod" - "github.com/twmb/murmur3 v1.1.6" - "github.com/twmb/murmur3 v1.1.6/go.mod" - "golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod" - "golang.org/x/crypto v0.0.0-20210921155107-089bfa567519" - "golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod" - "golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod" - "golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6" - "golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod" - "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" - "golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod" - "golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod" - "golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod" - "golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod" - "golang.org/x/sys v0.0.0-20211002104244-808efd93c36d" - "golang.org/x/sys v0.0.0-20211002104244-808efd93c36d/go.mod" - "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod" - "golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod" - "golang.org/x/term v0.0.0-20210927222741-03fcf44c2211" - "golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/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/go.mod" - "golang.org/x/text v0.3.7" - "golang.org/x/text v0.3.7/go.mod" - "golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11" - "golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/tylerb/is.v1 v1.1.2" - "gopkg.in/tylerb/is.v1 v1.1.2/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" - ) -go-module_set_globals - -SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -LICENSE="Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - -RDEPEND=" - acct-group/croc - acct-user/croc -" - -PATCHES=( - "${FILESDIR}/${PN}-disable-network-tests-r1.patch" -) - -DOCS=( README.md ) - -src_prepare() { - default - # Replace User=nobody with User=croc - sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die - # Rename bash completion function - sed -i -e "s|_cli_bash_autocomplete|_croc|g" \ - src/install/bash_autocomplete || die -} - -src_compile() { - go build || die -} - -src_install() { - dobin croc - systemd_dounit croc.service - newbashcomp src/install/bash_autocomplete croc - einstalldocs -} - -src_test() { - go test -work ./... || die -} diff --git a/net-misc/croc/croc-9.6.15.ebuild b/net-misc/croc/croc-9.6.15.ebuild new file mode 100644 index 000000000000..84a3ce1e3b97 --- /dev/null +++ b/net-misc/croc/croc-9.6.15.ebuild @@ -0,0 +1,47 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 go-module systemd + +DESCRIPTION="Easily and securely send things from one computer to another" +HOMEPAGE="https://github.com/schollz/croc" +SRC_URI="https://github.com/schollz/croc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz +https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz +" + +LICENSE="Apache-2.0 BSD BSD-2 MIT" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" + +RDEPEND=" + acct-group/croc + acct-user/croc +" + +DOCS=( README.md ) + +src_prepare() { + default + # Replace User=nobody with User=croc + sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die + # Rename bash completion function + sed -i -e "s|_cli_bash_autocomplete|_croc|g" \ + src/install/bash_autocomplete || die +} + +src_compile() { + ego build +} + +src_install() { + dobin croc + systemd_dounit croc.service + newbashcomp src/install/bash_autocomplete croc + einstalldocs +} + +src_test() { + ego test -skip "Test(Comm|Send|PublicIP|LocalIP)" -work ./... +} diff --git a/net-misc/croc/croc-9.6.17.ebuild b/net-misc/croc/croc-9.6.17.ebuild new file mode 100644 index 000000000000..edfe827fbac5 --- /dev/null +++ b/net-misc/croc/croc-9.6.17.ebuild @@ -0,0 +1,47 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 go-module systemd + +DESCRIPTION="Easily and securely send things from one computer to another" +HOMEPAGE="https://github.com/schollz/croc" +SRC_URI="https://github.com/schollz/croc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz +https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz +" + +LICENSE="Apache-2.0 BSD BSD-2 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + +RDEPEND=" + acct-group/croc + acct-user/croc +" + +DOCS=( README.md ) + +src_prepare() { + default + # Replace User=nobody with User=croc + sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die + # Rename bash completion function + sed -i -e "s|_cli_bash_autocomplete|_croc|g" \ + src/install/bash_autocomplete || die +} + +src_compile() { + ego build +} + +src_install() { + dobin croc + systemd_dounit croc.service + newbashcomp src/install/bash_autocomplete croc + einstalldocs +} + +src_test() { + ego test -skip "Test(Comm|Send|PublicIP|LocalIP)" -work ./... +} diff --git a/net-misc/croc/files/croc-9.4.2-tcp-const.patch b/net-misc/croc/files/croc-9.4.2-tcp-const.patch deleted file mode 100644 index bcd6823983b9..000000000000 --- a/net-misc/croc/files/croc-9.4.2-tcp-const.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 2ffb20201c00a4de9c8082c909e2428c2b46d5c2 Mon Sep 17 00:00:00 2001 -From: jolheiser <john.olheiser@gmail.com> -Date: Sun, 3 Oct 2021 16:23:29 -0500 -Subject: [PATCH] Fix TCP constant - -Signed-off-by: jolheiser <john.olheiser@gmail.com> ---- - src/tcp/tcp.go | 7 +++---- - src/tcp/tcp_test.go | 4 ++-- - 2 files changed, 5 insertions(+), 6 deletions(-) - -diff --git a/src/tcp/tcp.go b/src/tcp/tcp.go -index 2714e5f1..d271756b 100644 ---- a/src/tcp/tcp.go -+++ b/src/tcp/tcp.go -@@ -37,10 +37,9 @@ type roomMap struct { - sync.Mutex - } - --const ( -- timeToRoomDeletion = 10 * time.Minute -- pingRoom = "pinglkasjdlfjsaldjf" --) -+const pingRoom = "pinglkasjdlfjsaldjf" -+ -+var timeToRoomDeletion = 10 * time.Minute - - // Run starts a tcp listener, run async - func Run(debugLevel, host, port, password string, banner ...string) (err error) { -diff --git a/src/tcp/tcp_test.go b/src/tcp/tcp_test.go -index 165f9537..6ba99677 100644 ---- a/src/tcp/tcp_test.go -+++ b/src/tcp/tcp_test.go -@@ -25,13 +25,13 @@ func TestTCP(t *testing.T) { - log.SetLevel("error") - timeToRoomDeletion = 100 * time.Millisecond - go Run("debug", "localhost", "8281", "pass123", "8282") -- time.Sleep(100 * time.Millisecond) -+ time.Sleep(timeToRoomDeletion) - err := PingServer("localhost:8281") - assert.Nil(t, err) - err = PingServer("localhost:8333") - assert.NotNil(t, err) - -- time.Sleep(100 * time.Millisecond) -+ time.Sleep(timeToRoomDeletion) - c1, banner, _, err := ConnectToTCPServer("localhost:8281", "pass123", "testRoom", 1*time.Minute) - assert.Equal(t, banner, "8282") - assert.Nil(t, err) diff --git a/net-misc/croc/files/croc-disable-network-tests-r1.patch b/net-misc/croc/files/croc-disable-network-tests-r1.patch deleted file mode 100644 index 04540e14b9d4..000000000000 --- a/net-misc/croc/files/croc-disable-network-tests-r1.patch +++ /dev/null @@ -1,32 +0,0 @@ -Disable tests that fail with network-sandbox - ---- 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/schollz/croc/v9/src/models" -@@ -189,19 +188,6 @@ func TestHashFile(t *testing.T) { - assert.Equal(t, "e66c561610ad51e2", 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() - fmt.Println(name) diff --git a/net-misc/croc/metadata.xml b/net-misc/croc/metadata.xml index b17cf663fb79..c51b4929e88d 100644 --- a/net-misc/croc/metadata.xml +++ b/net-misc/croc/metadata.xml @@ -1,11 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>sultan@gentoo.org</email> - <name>Stephan Hartmann</name> - </maintainer> - <upstream> - <remote-id type="github">schollz/croc</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <name>Armas Spann</name> + <email>zappel@simple-co.de</email> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">schollz/croc</remote-id> + <doc>https://schollz.com/tinker/croc6/</doc> + <bugs-to>https://github.com/schollz/croc/issues</bugs-to> + </upstream> </pkgmetadata> diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest deleted file mode 100644 index d9dc7b493031..000000000000 --- a/net-misc/csync/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST csync-0.50.0.tar.xz 2705992 BLAKE2B b59ee573eea9bd7c46302d3db782b46f978d62219e3a3e70e97a012d1ea32681a1aa3133505c3833c5d1e6d0fcb90cc985d21553086ed8de28c7ca9fc8aa0099 SHA512 babe44af3a4f0bf58e011f1c33c7a6df9bc7751e03714dd64d8269c7c51bcc7f2ab32c4d286e5a11465c9498c988d1812c426a4f415f1138a4fb9fa341e1e29a diff --git a/net-misc/csync/csync-0.50.0-r2.ebuild b/net-misc/csync/csync-0.50.0-r2.ebuild deleted file mode 100644 index d749dab20f3e..000000000000 --- a/net-misc/csync/csync-0.50.0-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="lightweight file synchronizer utility" -HOMEPAGE="https://www.csync.org/" -SRC_URI="https://open.cryptomilk.org/attachments/download/27/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc iconv samba +sftp test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-db/sqlite-3.4:3 - net-libs/neon[ssl] - iconv? ( virtual/libiconv ) - samba? ( >=net-fs/samba-3.5 ) - sftp? ( >=net-libs/libssh-0.5[sftp] ) - !net-misc/ocsync" -DEPEND="${RDEPEND} - app-text/asciidoc - doc? ( app-doc/doxygen ) - test? ( dev-util/cmocka )" - -PATCHES=( "${FILESDIR}"/${P}-gcc_5_and_8.patch - "${FILESDIR}"/${P}-libssh-version.patch ) -src_prepare() { - cmake_src_prepare - - # proper docdir - sed -e "s:/doc/${PN}:/doc/${PF}:" \ - -i doc/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -DWITH_ICONV="$(usex iconv)" - -DUNIT_TESTING="$(usex test)" - $(cmake_use_find_package doc Doxygen) - $(cmake_use_find_package samba SMBClient) - $(cmake_use_find_package sftp LibSSH) - ) - cmake_src_configure -} diff --git a/net-misc/csync/files/csync-0.50.0-gcc_5_and_8.patch b/net-misc/csync/files/csync-0.50.0-gcc_5_and_8.patch deleted file mode 100644 index 44bcc3ed6819..000000000000 --- a/net-misc/csync/files/csync-0.50.0-gcc_5_and_8.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur csync-0.50.0.orig/modules/csync_smb.c csync-0.50.0/modules/csync_smb.c ---- csync-0.50.0.orig/modules/csync_smb.c 2013-07-29 14:04:37.000000000 +0200 -+++ csync-0.50.0/modules/csync_smb.c 2018-12-06 23:08:05.320992985 +0100 -@@ -49,7 +49,7 @@ - char *pw, int pwlen) - { - static int try_krb5 = 1; -- char *h; -+ const char *h; - - (void) smb_ctx; - (void) shr; -diff -Naur csync-0.50.0.orig/src/csync_log.h csync-0.50.0/src/csync_log.h ---- csync-0.50.0.orig/src/csync_log.h 2013-07-29 14:04:37.000000000 +0200 -+++ csync-0.50.0/src/csync_log.h 2018-12-06 23:11:34.280239832 +0100 -@@ -55,7 +55,7 @@ - }; - - #define CSYNC_LOG(priority, ...) \ -- csync_log(priority, __FUNCTION__, __VA_ARGS__) -+ csync_log(priority, __func__, __VA_ARGS__) - - void csync_log(int verbosity, - const char *function, -diff -Naur csync-0.50.0.orig/tests/csync_tests/check_csync_log.c csync-0.50.0/tests/csync_tests/check_csync_log.c ---- csync-0.50.0.orig/tests/csync_tests/check_csync_log.c 2013-04-22 13:00:35.000000000 +0200 -+++ csync-0.50.0/tests/csync_tests/check_csync_log.c 2018-12-06 23:11:34.280239832 +0100 -@@ -115,7 +115,7 @@ - rc = csync_set_log_callback(check_log_callback); - assert_int_equal(rc, 0); - -- csync_log(1, __FUNCTION__, "rc = %d", rc); -+ csync_log(1, __func__, "rc = %d", rc); - - rc = _tstat(path, &sb); - diff --git a/net-misc/csync/files/csync-0.50.0-libssh-version.patch b/net-misc/csync/files/csync-0.50.0-libssh-version.patch deleted file mode 100644 index 77ce1cdafa14..000000000000 --- a/net-misc/csync/files/csync-0.50.0-libssh-version.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: csync-0.50.0/cmake/Modules/FindLibSSH.cmake -=================================================================== ---- csync-0.50.0.orig/cmake/Modules/FindLibSSH.cmake -+++ csync-0.50.0/cmake/Modules/FindLibSSH.cmake -@@ -20,7 +20,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD - - find_path(LIBSSH_INCLUDE_DIR - NAMES -- libssh/libssh.h -+ libssh/libssh_version.h - PATHS - /usr/include - /usr/local/include -@@ -58,15 +58,15 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD - ) - - if (LibSSH_FIND_VERSION) -- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR -+ file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MAJOR - REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+") - # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR - if (LIBSSH_VERSION_MAJOR) - string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR}) -- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR -+ file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MINOR - REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+") - string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR}) -- file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH -+ file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_PATCH - REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+") - string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH}) - -@@ -75,7 +75,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD - include(FindPackageVersionCheck) - find_package_version_check(LibSSH DEFAULT_MSG) - else (LIBSSH_VERSION_MAJOR) -- message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h, assuming libssh is too old") -+ message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h, assuming libssh is too old") - set(LIBSSH_FOUND FALSE) - endif (LIBSSH_VERSION_MAJOR) - endif (LibSSH_FIND_VERSION)
\ No newline at end of file diff --git a/net-misc/csync/metadata.xml b/net-misc/csync/metadata.xml deleted file mode 100644 index 634008a187ee..000000000000 --- a/net-misc/csync/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>voyageur@gentoo.org</email> - <name>Bernard Cafarelli</name> - </maintainer> - <use> - <flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag> - </use> -</pkgmetadata> diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 1b80c12eb2e7..a42c74f10ce3 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,2 +1,4 @@ -DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d -DIST curl-7.80.0.tar.xz 2474492 BLAKE2B 0452ecb6943bc56b20ad8f1223135c9cae68cf31089b0e17e84d81af98dc5a47f5edfc271c5b4c23f232db6cea7ff5a9bffa9c7c319255d9afdb06fa5b8f761f SHA512 e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab +DIST curl-8.7.1.tar.xz 2707016 BLAKE2B a2a9f48d0b69c0d92fcbbda535ce55082a5243abe3ab2db80d6fa3f32fb2c98b65026d69fc45c94e966398cf9ba8d9c95b6b91f4768b54749ed3275dd21838ef SHA512 5bbde9d5648e9226f5490fa951690aaf159149345f3a315df2ba58b2468f3e59ca32e8a49734338afc861803a4f81caac6d642a4699b72c6310ebfb1f618aad2 +DIST curl-8.7.1.tar.xz.asc 488 BLAKE2B 1c91d116aecc8e98d8ec3aad68b7c96f11151e6c2716f531e5d2989e9b6b1199e180603673891d7967cdcdaee1d6b5e15160ccabe9b51590e2887022db03c2ed SHA512 f98c393997c4a32f545a8982226e8cd612395210915a4576c2ce227d0f650cff341be7bf15e989d1789abf32ac4fd9c190b9250b81e650b569e8532048746b37 +DIST curl-8.8.0.tar.xz 2748860 BLAKE2B c14903bad4cbd1752a5335afa6bcc78be1a484692fce0e0a6c2061963e0e6b4e56defb8332cef32d0dbddb481ad0443b71faf3a52a6e9d945c89ecbce373d2a3 SHA512 9d2c0d3a0d8f6c31ba4fabe48f801910f886fde43dc198dc4213708d6967ed5e040a1bb7348aa1cb126577ee508a3ec36fe65256d027d861d6ffb70f6383967a +DIST curl-8.8.0.tar.xz.asc 488 BLAKE2B d80c0ff357b344d7ec2b975a92f1eeb7557993b61a69e7adaaeab89c9b5a53ddade5104fe1a0ad260145db9c90fc0aae36dfc22320492db6696f290da9ff675b SHA512 37b501770225dff6b1e7bde1157f556f10ec1c597fcbbb5c8b8c370efb97a3a70f585f2f5c201b96380d68466696474a5f65a07da59b704678d6927567d25359 diff --git a/net-misc/curl/curl-7.79.1.ebuild b/net-misc/curl/curl-7.79.1.ebuild deleted file mode 100644 index 9a26258ec6b1..000000000000 --- a/net-misc/curl/curl-7.79.1.ebuild +++ /dev/null @@ -1,291 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools prefix multilib-minimal - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.haxx.se/" -SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" - -LICENSE="curl" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd" -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" -IUSE+=" nghttp3 quiche" -IUSE+=" elibc_Winnt" - -# c-ares must be disabled for threads -# only one default ssl provider can be enabled -REQUIRED_USE=" - winssl? ( elibc_Winnt ) - threads? ( !adns ) - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_winssl - ) - )" - -# lead to lots of false negatives, bug #285669 -RESTRICT="!test? ( test )" - -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - mbedtls? ( - net-libs/mbedtls:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - openssl? ( - dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] - ) - nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - ) - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) - nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] - ) - quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) - idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - sys-libs/zlib[${MULTILIB_USEDEP}] - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) - -# ssl providers to be added: -# fbopenssl $(use_with spnego) - -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl - virtual/pkgconfig - test? ( - sys-apps/diffutils - dev-lang/perl - )" - -DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-7.30.0-prefix.patch - "${FILESDIR}"/${PN}-respect-cflags-3.patch -) - -src_prepare() { - default - - eprefixify curl-config.in - eautoreconf -} - -multilib_src_configure() { - # We make use of the fact that later flags override earlier ones - # So start with all ssl providers off until proven otherwise - # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) - local myconf=() - - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - #myconf+=( --without-default-ssl-backend ) - if use ssl ; then - if use gnutls || use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - myconf+=( --with-gnutls --with-nettle ) - fi - if use mbedtls || use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - fi - if use nss || use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss ) - fi - if use openssl || use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use winssl || use curl_ssl_winssl; then - einfo "SSL provided by Windows" - myconf+=( --with-winssl ) - fi - - if use curl_ssl_gnutls; then - einfo "Default SSL provided by gnutls" - myconf+=( --with-default-ssl-backend=gnutls ) - elif use curl_ssl_mbedtls; then - einfo "Default SSL provided by mbedtls" - myconf+=( --with-default-ssl-backend=mbedtls ) - elif use curl_ssl_nss; then - einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) - elif use curl_ssl_openssl; then - einfo "Default SSL provided by openssl" - myconf+=( --with-default-ssl-backend=openssl ) - elif use curl_ssl_winssl; then - einfo "Default SSL provided by Windows" - myconf+=( --with-default-ssl-backend=winssl ) - else - eerror "We can't be here because of REQUIRED_USE." - fi - - else - einfo "SSL disabled" - fi - - # These configuration options are organized alphabetically - # within each category. This should make it easier if we - # ever decide to make any of them contingent on USE flags: - # 1) protocols first. To see them all do - # 'grep SUPPORT_PROTOCOLS configure.ac' - # 2) --enable/disable options second. - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort - # 3) --with/without options third. - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort - - myconf+=( - $(use_enable alt-svc) - --enable-crypto-auth - --enable-dict - --disable-ech - --enable-file - $(use_enable ftp) - $(use_enable gopher) - $(use_enable hsts) - --enable-http - $(use_enable imap) - $(use_enable ldap) - $(use_enable ldap ldaps) - --enable-ntlm - --disable-ntlm-wb - $(use_enable pop3) - --enable-rt - --enable-rtsp - $(use_enable samba smb) - $(use_with ssh libssh2) - $(use_enable smtp) - $(use_enable telnet) - $(use_enable tftp) - --enable-tls-srp - $(use_enable adns ares) - --enable-cookies - --enable-dateparse - --enable-dnsshuffle - --enable-doh - --enable-hidden-symbols - --enable-http-auth - $(use_enable ipv6) - --enable-largefile - --enable-manual - --enable-mime - --enable-netrc - $(use_enable progress-meter) - --enable-proxy - --disable-sspi - $(use_enable static-libs static) - $(use_enable threads threaded-resolver) - $(use_enable threads pthreads) - --disable-versioned-symbols - --without-amissl - --without-bearssl - $(use_with brotli) - --without-cyassl - --without-fish-functions-dir - $(use_with http2 nghttp2) - --without-hyper - $(use_with idn libidn2) - $(use_with kerberos gssapi "${EPREFIX}"/usr) - --without-libgsasl - --without-libpsl - $(use_with nghttp3) - $(use_with nghttp3 ngtcp2) - $(use_with quiche) - $(use_with rtmp librtmp) - --without-rustls - --without-schannel - --without-secure-transport - --without-spnego - --without-winidn - --without-wolfssl - --with-zlib - $(use_with zstd) - ) - - ECONF_SOURCE="${S}" \ - econf "${myconf[@]}" - - if ! multilib_is_native_abi; then - # avoid building the client - sed -i -e '/SUBDIRS/s:src::' Makefile || die - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die - fi - - # Fix up the pkg-config file to be more robust. - # https://github.com/curl/curl/issues/864 - local priv=() libs=() - # We always enable zlib. - libs+=( "-lz" ) - priv+=( "zlib" ) - if use http2; then - libs+=( "-lnghttp2" ) - priv+=( "libnghttp2" ) - fi - if use quiche; then - libs+=( "-lquiche" ) - priv+=( "quiche" ) - fi - if use nghttp3; then - libs+=( "-lnghttp3" "-lngtcp2" ) - priv+=( "libnghttp3" "-libtcp2" ) - fi - if use ssl && use curl_ssl_openssl; then - libs+=( "-lssl" "-lcrypto" ) - priv+=( "openssl" ) - fi - grep -q Requires.private libcurl.pc && die "need to update ebuild" - libs=$(printf '|%s' "${libs[@]}") - sed -i -r \ - -e "/^Libs.private/s:(${libs#|})( |$)::g" \ - libcurl.pc || die - echo "Requires.private: ${priv[*]}" >> libcurl.pc -} - -multilib_src_test() { - multilib_is_native_abi && default_src_test -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die - rm -rf "${ED}"/etc/ || die -} diff --git a/net-misc/curl/curl-7.80.0.ebuild b/net-misc/curl/curl-7.80.0.ebuild deleted file mode 100644 index 261d977f06d5..000000000000 --- a/net-misc/curl/curl-7.80.0.ebuild +++ /dev/null @@ -1,290 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools prefix multilib-minimal - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.haxx.se/" -SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" - -LICENSE="curl" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd" -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" -IUSE+=" nghttp3 quiche" -IUSE+=" elibc_Winnt" - -# c-ares must be disabled for threads -# only one default ssl provider can be enabled -REQUIRED_USE=" - winssl? ( elibc_Winnt ) - threads? ( !adns ) - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_winssl - ) - )" - -# lead to lots of false negatives, bug #285669 -RESTRICT="!test? ( test )" - -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - mbedtls? ( - net-libs/mbedtls:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - openssl? ( - dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] - ) - nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - ) - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) - nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] - ) - quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) - idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - sys-libs/zlib[${MULTILIB_USEDEP}] - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) - -# ssl providers to be added: -# fbopenssl $(use_with spnego) - -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl - virtual/pkgconfig - test? ( - sys-apps/diffutils - )" - -DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-7.30.0-prefix.patch - "${FILESDIR}"/${PN}-respect-cflags-3.patch -) - -src_prepare() { - default - - eprefixify curl-config.in - eautoreconf -} - -multilib_src_configure() { - # We make use of the fact that later flags override earlier ones - # So start with all ssl providers off until proven otherwise - # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) - local myconf=() - - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - #myconf+=( --without-default-ssl-backend ) - if use ssl ; then - if use gnutls || use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - myconf+=( --with-gnutls --with-nettle ) - fi - if use mbedtls || use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - fi - if use nss || use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss ) - fi - if use openssl || use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use winssl || use curl_ssl_winssl; then - einfo "SSL provided by Windows" - myconf+=( --with-winssl ) - fi - - if use curl_ssl_gnutls; then - einfo "Default SSL provided by gnutls" - myconf+=( --with-default-ssl-backend=gnutls ) - elif use curl_ssl_mbedtls; then - einfo "Default SSL provided by mbedtls" - myconf+=( --with-default-ssl-backend=mbedtls ) - elif use curl_ssl_nss; then - einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) - elif use curl_ssl_openssl; then - einfo "Default SSL provided by openssl" - myconf+=( --with-default-ssl-backend=openssl ) - elif use curl_ssl_winssl; then - einfo "Default SSL provided by Windows" - myconf+=( --with-default-ssl-backend=winssl ) - else - eerror "We can't be here because of REQUIRED_USE." - fi - - else - einfo "SSL disabled" - fi - - # These configuration options are organized alphabetically - # within each category. This should make it easier if we - # ever decide to make any of them contingent on USE flags: - # 1) protocols first. To see them all do - # 'grep SUPPORT_PROTOCOLS configure.ac' - # 2) --enable/disable options second. - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort - # 3) --with/without options third. - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort - - myconf+=( - $(use_enable alt-svc) - --enable-crypto-auth - --enable-dict - --disable-ech - --enable-file - $(use_enable ftp) - $(use_enable gopher) - $(use_enable hsts) - --enable-http - $(use_enable imap) - $(use_enable ldap) - $(use_enable ldap ldaps) - --enable-ntlm - --disable-ntlm-wb - $(use_enable pop3) - --enable-rt - --enable-rtsp - $(use_enable samba smb) - $(use_with ssh libssh2) - $(use_enable smtp) - $(use_enable telnet) - $(use_enable tftp) - --enable-tls-srp - $(use_enable adns ares) - --enable-cookies - --enable-dateparse - --enable-dnsshuffle - --enable-doh - --enable-symbol-hiding - --enable-http-auth - $(use_enable ipv6) - --enable-largefile - --enable-manual - --enable-mime - --enable-netrc - $(use_enable progress-meter) - --enable-proxy - --disable-sspi - $(use_enable static-libs static) - $(use_enable threads threaded-resolver) - $(use_enable threads pthreads) - --disable-versioned-symbols - --without-amissl - --without-bearssl - $(use_with brotli) - --without-cyassl - --without-fish-functions-dir - $(use_with http2 nghttp2) - --without-hyper - $(use_with idn libidn2) - $(use_with kerberos gssapi "${EPREFIX}"/usr) - --without-libgsasl - --without-libpsl - $(use_with nghttp3) - $(use_with nghttp3 ngtcp2) - $(use_with quiche) - $(use_with rtmp librtmp) - --without-rustls - --without-schannel - --without-secure-transport - --without-spnego - --without-winidn - --without-wolfssl - --with-zlib - $(use_with zstd) - ) - - ECONF_SOURCE="${S}" \ - econf "${myconf[@]}" - - if ! multilib_is_native_abi; then - # avoid building the client - sed -i -e '/SUBDIRS/s:src::' Makefile || die - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die - fi - - # Fix up the pkg-config file to be more robust. - # https://github.com/curl/curl/issues/864 - local priv=() libs=() - # We always enable zlib. - libs+=( "-lz" ) - priv+=( "zlib" ) - if use http2; then - libs+=( "-lnghttp2" ) - priv+=( "libnghttp2" ) - fi - if use quiche; then - libs+=( "-lquiche" ) - priv+=( "quiche" ) - fi - if use nghttp3; then - libs+=( "-lnghttp3" "-lngtcp2" ) - priv+=( "libnghttp3" "-libtcp2" ) - fi - if use ssl && use curl_ssl_openssl; then - libs+=( "-lssl" "-lcrypto" ) - priv+=( "openssl" ) - fi - grep -q Requires.private libcurl.pc && die "need to update ebuild" - libs=$(printf '|%s' "${libs[@]}") - sed -i -r \ - -e "/^Libs.private/s:(${libs#|})( |$)::g" \ - libcurl.pc || die - echo "Requires.private: ${priv[*]}" >> libcurl.pc -} - -multilib_src_test() { - multilib_is_native_abi && default_src_test -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die - rm -rf "${ED}"/etc/ || die -} diff --git a/net-misc/curl/curl-8.7.1-r3.ebuild b/net-misc/curl/curl-8.7.1-r3.ebuild new file mode 100644 index 000000000000..7877669d822a --- /dev/null +++ b/net-misc/curl/curl-8.7.1-r3.ebuild @@ -0,0 +1,370 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc +inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.se/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="BSD curl ISC test? ( BSD-4 )" +SLOT="0" +IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3" +IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +# These select the default SSL implementation +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls" +RESTRICT="!test? ( test )" + +# Only one default ssl provider can be enabled +# The default ssl provider needs its USE satisfied +# nghttp3 = https://bugs.gentoo.org/912029 +REQUIRED_USE=" + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_openssl + curl_ssl_rustls + ) + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) + nghttp3? ( + !openssl + alt-svc ) +" + +# cURL's docs and CI/CD are great resources for confirming supported versions +# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.: +# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions) +# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly) +# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2) +# However 'supported' vs 'works' are two entirely different things; be sane but +# don't be afraid to require a later version. + +RDEPEND=" + >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) + nghttp3? ( + >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] + ) + psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:=[${MULTILIB_USEDEP}] + ) + mbedtls? ( + app-misc/ca-certificates + net-libs/mbedtls:=[${MULTILIB_USEDEP}] + ) + openssl? ( + >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + rustls? ( >=net-libs/rustls-ffi-0.12.1:=[${MULTILIB_USEDEP}] + <net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}] + ) + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + test? ( + sys-apps/diffutils + http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) + nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +QA_CONFIG_IMPL_DECL_SKIP=( + __builtin_available + closesocket + CloseSocket + getpass_r + ioctlsocket + IoctlSocket + mach_absolute_time + setmode + _fseeki64 + # custom AC_LINK_IFELSE code fails to link even without -Werror + OSSL_QUIC_client_method +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${PN}-8.7.1-rustls-fixes.patch + "${FILESDIR}"/${P}-chunked-post.patch + "${FILESDIR}"/${P}-fix-compress-option.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + if use ssl; then + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) + + if use gnutls; then + multilib_is_native_abi && einfo "SSL provided by gnutls" + myconf+=( --with-gnutls ) + fi + if use mbedtls; then + multilib_is_native_abi && einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use openssl; then + multilib_is_native_abi && einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use rustls; then + multilib_is_native_abi && einfo "SSL provided by rustls" + myconf+=( --with-rustls ) + fi + if use curl_ssl_gnutls; then + multilib_is_native_abi && einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + multilib_is_native_abi && einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_openssl; then + multilib_is_native_abi && einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_rustls; then + multilib_is_native_abi && einfo "Default SSL provided by rustls" + myconf+=( --with-default-ssl-backend=rustls ) + else + eerror "We can't be here because of REQUIRED_USE." + die "Please file a bug, hit impossible condition w/ USE=ssl handling." + fi + + else + myconf+=( --without-ssl ) + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + --enable-ipv6 + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --enable-socketpair + --disable-sspi + $(use_enable static-libs static) + --enable-pthreads + --enable-threaded-resolver + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + $(use_with psl libpsl) + --without-msh3 + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + --without-quiche + $(use_with rtmp librtmp) + --without-schannel + --without-secure-transport + --without-test-caddy + --without-test-httpd + --without-test-nghttpx + $(use_enable websockets) + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions + ) + + if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + fi + + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # Avoid building the client (we just want libcurl for multilib) + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts + fi +} + +# There is also a pytest harness that tests for bugs in some very specific +# situations; we can rely on upstream for this rather than adding additional test deps. +multilib_src_test() { + # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 + # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) + # -v: verbose + # -a: keep going on failure (so we see everything which breaks, not just 1st test) + # -k: keep test files after completion + # -am: automake style TAP output + # -p: print logs if test fails + # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging + # or just read https://github.com/curl/curl/tree/master/tests#run. + # Note: we don't run the testsuite for cross-compilation. + # Upstream recommend 7*nproc as a starting point for parallel tests, but + # this ends up breaking when nproc is huge (like -j80). + # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped + # as most gentoo users don't have an 'ip6-localhost' + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install + fi +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/curl/curl-8.7.1-r4.ebuild b/net-misc/curl/curl-8.7.1-r4.ebuild new file mode 100644 index 000000000000..d9502c6ca227 --- /dev/null +++ b/net-misc/curl/curl-8.7.1-r4.ebuild @@ -0,0 +1,375 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Maintainers should subscribe to the 'curl-distros' ML for backports etc +# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/ +# https://lists.haxx.se/listinfo/curl-distros + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc +inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.se/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="BSD curl ISC test? ( BSD-4 )" +SLOT="0" +IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3" +IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +# These select the default SSL implementation +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls" +RESTRICT="!test? ( test )" + +# Only one default ssl provider can be enabled +# The default ssl provider needs its USE satisfied +# nghttp3 = https://bugs.gentoo.org/912029 +REQUIRED_USE=" + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_openssl + curl_ssl_rustls + ) + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) + nghttp3? ( + !openssl + alt-svc ) +" + +# cURL's docs and CI/CD are great resources for confirming supported versions +# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.: +# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions) +# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly) +# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2) +# However 'supported' vs 'works' are two entirely different things; be sane but +# don't be afraid to require a later version. + +RDEPEND=" + >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) + nghttp3? ( + >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] + ) + psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:=[${MULTILIB_USEDEP}] + ) + mbedtls? ( + app-misc/ca-certificates + net-libs/mbedtls:=[${MULTILIB_USEDEP}] + ) + openssl? ( + >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + rustls? ( >=net-libs/rustls-ffi-0.12.1:=[${MULTILIB_USEDEP}] + <net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}] + ) + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + test? ( + sys-apps/diffutils + http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) + nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +QA_CONFIG_IMPL_DECL_SKIP=( + __builtin_available + closesocket + CloseSocket + getpass_r + ioctlsocket + IoctlSocket + mach_absolute_time + setmode + _fseeki64 + # custom AC_LINK_IFELSE code fails to link even without -Werror + OSSL_QUIC_client_method +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${PN}-8.7.1-rustls-fixes.patch + "${FILESDIR}"/${P}-chunked-post.patch + "${FILESDIR}"/${P}-fix-compress-option.patch + "${FILESDIR}"/${P}-http2-git-clone.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + if use ssl; then + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) + + if use gnutls; then + multilib_is_native_abi && einfo "SSL provided by gnutls" + myconf+=( --with-gnutls ) + fi + if use mbedtls; then + multilib_is_native_abi && einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use openssl; then + multilib_is_native_abi && einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use rustls; then + multilib_is_native_abi && einfo "SSL provided by rustls" + myconf+=( --with-rustls ) + fi + if use curl_ssl_gnutls; then + multilib_is_native_abi && einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + multilib_is_native_abi && einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_openssl; then + multilib_is_native_abi && einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_rustls; then + multilib_is_native_abi && einfo "Default SSL provided by rustls" + myconf+=( --with-default-ssl-backend=rustls ) + else + eerror "We can't be here because of REQUIRED_USE." + die "Please file a bug, hit impossible condition w/ USE=ssl handling." + fi + + else + myconf+=( --without-ssl ) + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + --enable-ipv6 + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --enable-socketpair + --disable-sspi + $(use_enable static-libs static) + --enable-pthreads + --enable-threaded-resolver + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + $(use_with psl libpsl) + --without-msh3 + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + --without-quiche + $(use_with rtmp librtmp) + --without-schannel + --without-secure-transport + --without-test-caddy + --without-test-httpd + --without-test-nghttpx + $(use_enable websockets) + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions + ) + + if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + fi + + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # Avoid building the client (we just want libcurl for multilib) + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts + fi +} + +# There is also a pytest harness that tests for bugs in some very specific +# situations; we can rely on upstream for this rather than adding additional test deps. +multilib_src_test() { + # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 + # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) + # -v: verbose + # -a: keep going on failure (so we see everything which breaks, not just 1st test) + # -k: keep test files after completion + # -am: automake style TAP output + # -p: print logs if test fails + # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging + # or just read https://github.com/curl/curl/tree/master/tests#run. + # Note: we don't run the testsuite for cross-compilation. + # Upstream recommend 7*nproc as a starting point for parallel tests, but + # this ends up breaking when nproc is huge (like -j80). + # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped + # as most gentoo users don't have an 'ip6-localhost' + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install + fi +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/curl/curl-8.8.0.ebuild b/net-misc/curl/curl-8.8.0.ebuild new file mode 100644 index 000000000000..db51f02670f5 --- /dev/null +++ b/net-misc/curl/curl-8.8.0.ebuild @@ -0,0 +1,372 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Maintainers should subscribe to the 'curl-distros' ML for backports etc +# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/ +# https://lists.haxx.se/listinfo/curl-distros + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc +inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.se/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="BSD curl ISC test? ( BSD-4 )" +SLOT="0" +IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3" +IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +# These select the default SSL implementation +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls" +RESTRICT="!test? ( test )" + +# Only one default ssl provider can be enabled +# The default ssl provider needs its USE satisfied +# nghttp3 = https://bugs.gentoo.org/912029 +REQUIRED_USE=" + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_openssl + curl_ssl_rustls + ) + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) + nghttp3? ( + !openssl + alt-svc ) +" + +# cURL's docs and CI/CD are great resources for confirming supported versions +# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.: +# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions) +# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly) +# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2) +# However 'supported' vs 'works' are two entirely different things; be sane but +# don't be afraid to require a later version. + +RDEPEND=" + >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] + adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) + nghttp3? ( + >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] + ) + psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:=[${MULTILIB_USEDEP}] + ) + mbedtls? ( + app-misc/ca-certificates + net-libs/mbedtls:=[${MULTILIB_USEDEP}] + ) + openssl? ( + >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + rustls? ( + >=net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}] + ) + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + test? ( + sys-apps/diffutils + http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) + nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +QA_CONFIG_IMPL_DECL_SKIP=( + __builtin_available + closesocket + CloseSocket + getpass_r + ioctlsocket + IoctlSocket + mach_absolute_time + setmode + _fseeki64 + # custom AC_LINK_IFELSE code fails to link even without -Werror + OSSL_QUIC_client_method +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix-2.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${P}-install-manpage.patch + "${FILESDIR}"/${P}-mbedtls.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + if use ssl; then + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) + + if use gnutls; then + multilib_is_native_abi && einfo "SSL provided by gnutls" + myconf+=( --with-gnutls ) + fi + if use mbedtls; then + multilib_is_native_abi && einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use openssl; then + multilib_is_native_abi && einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use rustls; then + multilib_is_native_abi && einfo "SSL provided by rustls" + myconf+=( --with-rustls ) + fi + if use curl_ssl_gnutls; then + multilib_is_native_abi && einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + multilib_is_native_abi && einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_openssl; then + multilib_is_native_abi && einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_rustls; then + multilib_is_native_abi && einfo "Default SSL provided by rustls" + myconf+=( --with-default-ssl-backend=rustls ) + else + eerror "We can't be here because of REQUIRED_USE." + die "Please file a bug, hit impossible condition w/ USE=ssl handling." + fi + + else + myconf+=( --without-ssl ) + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + --enable-ipv6 + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --enable-socketpair + --disable-sspi + $(use_enable static-libs static) + --enable-pthreads + --enable-threaded-resolver + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + $(use_with psl libpsl) + --without-msh3 + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + --without-quiche + $(use_with rtmp librtmp) + --without-schannel + --without-secure-transport + --without-test-caddy + --without-test-httpd + --without-test-nghttpx + $(use_enable websockets) + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions + ) + + if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + fi + + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # Avoid building the client (we just want libcurl for multilib) + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts + fi +} + +# There is also a pytest harness that tests for bugs in some very specific +# situations; we can rely on upstream for this rather than adding additional test deps. +multilib_src_test() { + # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 + # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) + # -v: verbose + # -a: keep going on failure (so we see everything which breaks, not just 1st test) + # -k: keep test files after completion + # -am: automake style TAP output + # -p: print logs if test fails + # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging + # or just read https://github.com/curl/curl/tree/master/tests#run. + # Note: we don't run the testsuite for cross-compilation. + # Upstream recommend 7*nproc as a starting point for parallel tests, but + # this ends up breaking when nproc is huge (like -j80). + # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped + # as most gentoo users don't have an 'ip6-localhost' + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install + fi +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild new file mode 100644 index 000000000000..17ec871e7e2a --- /dev/null +++ b/net-misc/curl/curl-9999.ebuild @@ -0,0 +1,370 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Maintainers should subscribe to the 'curl-distros' ML for backports etc +# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/ +# https://lists.haxx.se/listinfo/curl-distros + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc +inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.se/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="BSD curl ISC test? ( BSD-4 )" +SLOT="0" +IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3" +IUSE+=" +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +# These select the default SSL implementation +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls" +RESTRICT="!test? ( test )" + +# Only one default ssl provider can be enabled +# The default ssl provider needs its USE satisfied +# nghttp3 = https://bugs.gentoo.org/912029 +REQUIRED_USE=" + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_openssl + curl_ssl_rustls + ) + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) + nghttp3? ( + !openssl + alt-svc ) +" + +# cURL's docs and CI/CD are great resources for confirming supported versions +# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.: +# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions) +# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly) +# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2) +# However 'supported' vs 'works' are two entirely different things; be sane but +# don't be afraid to require a later version. + +RDEPEND=" + >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] + adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) + nghttp3? ( + >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] + ) + psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:=[${MULTILIB_USEDEP}] + ) + mbedtls? ( + app-misc/ca-certificates + net-libs/mbedtls:=[${MULTILIB_USEDEP}] + ) + openssl? ( + >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + rustls? ( + >=net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}] + ) + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + test? ( + sys-apps/diffutils + http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) + nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +QA_CONFIG_IMPL_DECL_SKIP=( + __builtin_available + closesocket + CloseSocket + getpass_r + ioctlsocket + IoctlSocket + mach_absolute_time + setmode + _fseeki64 + # custom AC_LINK_IFELSE code fails to link even without -Werror + OSSL_QUIC_client_method +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix-2.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + if use ssl; then + myconf+=( --without-gnutls --without-mbedtls --without-rustls ) + + if use gnutls; then + multilib_is_native_abi && einfo "SSL provided by gnutls" + myconf+=( --with-gnutls ) + fi + if use mbedtls; then + multilib_is_native_abi && einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use openssl; then + multilib_is_native_abi && einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use rustls; then + multilib_is_native_abi && einfo "SSL provided by rustls" + myconf+=( --with-rustls ) + fi + if use curl_ssl_gnutls; then + multilib_is_native_abi && einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + multilib_is_native_abi && einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_openssl; then + multilib_is_native_abi && einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_rustls; then + multilib_is_native_abi && einfo "Default SSL provided by rustls" + myconf+=( --with-default-ssl-backend=rustls ) + else + eerror "We can't be here because of REQUIRED_USE." + die "Please file a bug, hit impossible condition w/ USE=ssl handling." + fi + + else + myconf+=( --without-ssl ) + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + --enable-ipv6 + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --enable-socketpair + --disable-sspi + $(use_enable static-libs static) + --enable-pthreads + --enable-threaded-resolver + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + $(use_with psl libpsl) + --without-msh3 + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + --without-quiche + $(use_with rtmp librtmp) + --without-schannel + --without-secure-transport + --without-test-caddy + --without-test-httpd + --without-test-nghttpx + $(use_enable websockets) + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions + ) + + if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + fi + + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # Avoid building the client (we just want libcurl for multilib) + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts + fi +} + +# There is also a pytest harness that tests for bugs in some very specific +# situations; we can rely on upstream for this rather than adding additional test deps. +multilib_src_test() { + # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 + # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) + # -v: verbose + # -a: keep going on failure (so we see everything which breaks, not just 1st test) + # -k: keep test files after completion + # -am: automake style TAP output + # -p: print logs if test fails + # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging + # or just read https://github.com/curl/curl/tree/master/tests#run. + # Note: we don't run the testsuite for cross-compilation. + # Upstream recommend 7*nproc as a starting point for parallel tests, but + # this ends up breaking when nproc is huge (like -j80). + # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped + # as most gentoo users don't have an 'ip6-localhost' + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install + fi +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/curl/files/curl-8.7.1-chunked-post.patch b/net-misc/curl/files/curl-8.7.1-chunked-post.patch new file mode 100644 index 000000000000..9d1fef73d383 --- /dev/null +++ b/net-misc/curl/files/curl-8.7.1-chunked-post.patch @@ -0,0 +1,57 @@ +https://github.com/curl/curl/commit/721941aadf4adf4f6aeb3f4c0ab489bb89610c36 +From: Stefan Eissing <stefan@eissing.org> +Date: Mon, 1 Apr 2024 15:41:18 +0200 +Subject: [PATCH] http: with chunked POST forced, disable length check on read + callback + +- when an application forces HTTP/1.1 chunked transfer encoding + by setting the corresponding header and instructs curl to use + the CURLOPT_READFUNCTION, disregard any POST length information. +- this establishes backward compatibility with previous curl versions + +Applications are encouraged to not force "chunked", but rather +set length information for a POST. By setting -1, curl will +auto-select chunked on HTTP/1.1 and work properly on other HTTP +versions. + +Reported-by: Jeff King +Fixes #13229 +Closes #13257 +--- a/lib/http.c ++++ b/lib/http.c +@@ -2046,8 +2046,19 @@ static CURLcode set_reader(struct Curl_easy *data, Curl_HttpReq httpreq) + else + result = Curl_creader_set_null(data); + } +- else { /* we read the bytes from the callback */ +- result = Curl_creader_set_fread(data, postsize); ++ else { ++ /* we read the bytes from the callback. In case "chunked" encoding ++ * is forced by the application, we disregard `postsize`. This is ++ * a backward compatibility decision to earlier versions where ++ * chunking disregarded this. See issue #13229. */ ++ bool chunked = FALSE; ++ char *ptr = Curl_checkheaders(data, STRCONST("Transfer-Encoding")); ++ if(ptr) { ++ /* Some kind of TE is requested, check if 'chunked' is chosen */ ++ chunked = Curl_compareheader(ptr, STRCONST("Transfer-Encoding:"), ++ STRCONST("chunked")); ++ } ++ result = Curl_creader_set_fread(data, chunked? -1 : postsize); + } + return result; + +@@ -2115,6 +2126,13 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy *data, + data->req.upload_chunky = + Curl_compareheader(ptr, + STRCONST("Transfer-Encoding:"), STRCONST("chunked")); ++ if(data->req.upload_chunky && ++ Curl_use_http_1_1plus(data, data->conn) && ++ (data->conn->httpversion >= 20)) { ++ infof(data, "suppressing chunked transfer encoding on connection " ++ "using HTTP version 2 or higher"); ++ data->req.upload_chunky = FALSE; ++ } + } + else { + curl_off_t req_clen = Curl_creader_total_length(data); diff --git a/net-misc/curl/files/curl-8.7.1-fix-compress-option.patch b/net-misc/curl/files/curl-8.7.1-fix-compress-option.patch new file mode 100644 index 000000000000..a06a53729533 --- /dev/null +++ b/net-misc/curl/files/curl-8.7.1-fix-compress-option.patch @@ -0,0 +1,153 @@ +https://github.com/curl/curl/commit/b30d694a027eb771c02a3db0dee0ca03ccab7377 +From: Stefan Eissing <stefan@eissing.org> +Date: Thu, 28 Mar 2024 11:08:15 +0100 +Subject: [PATCH] content_encoding: brotli and others, pass through 0-length + writes + +- curl's transfer handling may write 0-length chunks at the end of the + download with an EOS flag. (HTTP/2 does this commonly) + +- content encoders need to pass-through such a write and not count this + as error in case they are finished decoding + +Fixes #13209 +Fixes #13212 +Closes #13219 +--- a/lib/content_encoding.c ++++ b/lib/content_encoding.c +@@ -300,7 +300,7 @@ static CURLcode deflate_do_write(struct Curl_easy *data, + struct zlib_writer *zp = (struct zlib_writer *) writer; + z_stream *z = &zp->z; /* zlib state structure */ + +- if(!(type & CLIENTWRITE_BODY)) ++ if(!(type & CLIENTWRITE_BODY) || !nbytes) + return Curl_cwriter_write(data, writer->next, type, buf, nbytes); + + /* Set the compressed input when this function is called */ +@@ -457,7 +457,7 @@ static CURLcode gzip_do_write(struct Curl_easy *data, + struct zlib_writer *zp = (struct zlib_writer *) writer; + z_stream *z = &zp->z; /* zlib state structure */ + +- if(!(type & CLIENTWRITE_BODY)) ++ if(!(type & CLIENTWRITE_BODY) || !nbytes) + return Curl_cwriter_write(data, writer->next, type, buf, nbytes); + + if(zp->zlib_init == ZLIB_INIT_GZIP) { +@@ -669,7 +669,7 @@ static CURLcode brotli_do_write(struct Curl_easy *data, + CURLcode result = CURLE_OK; + BrotliDecoderResult r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT; + +- if(!(type & CLIENTWRITE_BODY)) ++ if(!(type & CLIENTWRITE_BODY) || !nbytes) + return Curl_cwriter_write(data, writer->next, type, buf, nbytes); + + if(!bp->br) +@@ -762,7 +762,7 @@ static CURLcode zstd_do_write(struct Curl_easy *data, + ZSTD_outBuffer out; + size_t errorCode; + +- if(!(type & CLIENTWRITE_BODY)) ++ if(!(type & CLIENTWRITE_BODY) || !nbytes) + return Curl_cwriter_write(data, writer->next, type, buf, nbytes); + + if(!zp->decomp) { +@@ -916,7 +916,7 @@ static CURLcode error_do_write(struct Curl_easy *data, + (void) buf; + (void) nbytes; + +- if(!(type & CLIENTWRITE_BODY)) ++ if(!(type & CLIENTWRITE_BODY) || !nbytes) + return Curl_cwriter_write(data, writer->next, type, buf, nbytes); + + failf(data, "Unrecognized content encoding type. " +--- a/tests/http/test_02_download.py ++++ b/tests/http/test_02_download.py +@@ -394,6 +394,19 @@ def test_02_27_paused_no_cl(self, env: Env, httpd, nghttpx, repeat): + r = client.run(args=[url]) + r.check_exit_code(0) + ++ @pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3']) ++ def test_02_28_get_compressed(self, env: Env, httpd, nghttpx, repeat, proto): ++ if proto == 'h3' and not env.have_h3(): ++ pytest.skip("h3 not supported") ++ count = 1 ++ urln = f'https://{env.authority_for(env.domain1brotli, proto)}/data-100k?[0-{count-1}]' ++ curl = CurlClient(env=env) ++ r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[ ++ '--compressed' ++ ]) ++ r.check_exit_code(code=0) ++ r.check_response(count=count, http_status=200) ++ + def check_downloads(self, client, srcfile: str, count: int, + complete: bool = True): + for i in range(count): +--- a/tests/http/testenv/env.py ++++ b/tests/http/testenv/env.py +@@ -129,10 +129,11 @@ def __init__(self): + self.htdocs_dir = os.path.join(self.gen_dir, 'htdocs') + self.tld = 'http.curl.se' + self.domain1 = f"one.{self.tld}" ++ self.domain1brotli = f"brotli.one.{self.tld}" + self.domain2 = f"two.{self.tld}" + self.proxy_domain = f"proxy.{self.tld}" + self.cert_specs = [ +- CertificateSpec(domains=[self.domain1, 'localhost'], key_type='rsa2048'), ++ CertificateSpec(domains=[self.domain1, self.domain1brotli, 'localhost'], key_type='rsa2048'), + CertificateSpec(domains=[self.domain2], key_type='rsa2048'), + CertificateSpec(domains=[self.proxy_domain, '127.0.0.1'], key_type='rsa2048'), + CertificateSpec(name="clientsX", sub_specs=[ +@@ -376,6 +377,10 @@ def htdocs_dir(self) -> str: + def domain1(self) -> str: + return self.CONFIG.domain1 + ++ @property ++ def domain1brotli(self) -> str: ++ return self.CONFIG.domain1brotli ++ + @property + def domain2(self) -> str: + return self.CONFIG.domain2 +--- a/tests/http/testenv/httpd.py ++++ b/tests/http/testenv/httpd.py +@@ -50,6 +50,7 @@ class Httpd: + 'alias', 'env', 'filter', 'headers', 'mime', 'setenvif', + 'socache_shmcb', + 'rewrite', 'http2', 'ssl', 'proxy', 'proxy_http', 'proxy_connect', ++ 'brotli', + 'mpm_event', + ] + COMMON_MODULES_DIRS = [ +@@ -203,6 +204,7 @@ def _mkpath(self, path): + + def _write_config(self): + domain1 = self.env.domain1 ++ domain1brotli = self.env.domain1brotli + creds1 = self.env.get_credentials(domain1) + domain2 = self.env.domain2 + creds2 = self.env.get_credentials(domain2) +@@ -285,6 +287,24 @@ def _write_config(self): + f'</VirtualHost>', + f'', + ]) ++ # Alternate to domain1 with BROTLI compression ++ conf.extend([ # https host for domain1, h1 + h2 ++ f'<VirtualHost *:{self.env.https_port}>', ++ f' ServerName {domain1brotli}', ++ f' Protocols h2 http/1.1', ++ f' SSLEngine on', ++ f' SSLCertificateFile {creds1.cert_file}', ++ f' SSLCertificateKeyFile {creds1.pkey_file}', ++ f' DocumentRoot "{self._docs_dir}"', ++ f' SetOutputFilter BROTLI_COMPRESS', ++ ]) ++ conf.extend(self._curltest_conf(domain1)) ++ if domain1 in self._extra_configs: ++ conf.extend(self._extra_configs[domain1]) ++ conf.extend([ ++ f'</VirtualHost>', ++ f'', ++ ]) + conf.extend([ # https host for domain2, no h2 + f'<VirtualHost *:{self.env.https_port}>', + f' ServerName {domain2}', diff --git a/net-misc/curl/files/curl-8.7.1-http2-git-clone.patch b/net-misc/curl/files/curl-8.7.1-http2-git-clone.patch new file mode 100644 index 000000000000..b07a3b0a8817 --- /dev/null +++ b/net-misc/curl/files/curl-8.7.1-http2-git-clone.patch @@ -0,0 +1,342 @@ +https://bugs.gentoo.org/930633 +https://github.com/curl/curl/issues/13474 +--- a/lib/http2.c ++++ b/lib/http2.c +@@ -187,6 +187,7 @@ struct h2_stream_ctx { + + int status_code; /* HTTP response status code */ + uint32_t error; /* stream error code */ ++ CURLcode xfer_result; /* Result of writing out response */ + uint32_t local_window_size; /* the local recv window size */ + int32_t id; /* HTTP/2 protocol identifier for stream */ + BIT(resp_hds_complete); /* we have a complete, final response */ +@@ -945,12 +946,39 @@ fail: + return rv; + } + +-static CURLcode recvbuf_write_hds(struct Curl_cfilter *cf, ++static void h2_xfer_write_resp_hd(struct Curl_cfilter *cf, + struct Curl_easy *data, +- const char *buf, size_t blen) ++ struct h2_stream_ctx *stream, ++ const char *buf, size_t blen, bool eos) + { +- (void)cf; +- return Curl_xfer_write_resp(data, (char *)buf, blen, FALSE); ++ ++ /* If we already encountered an error, skip further writes */ ++ if(!stream->xfer_result) { ++ stream->xfer_result = Curl_xfer_write_resp(data, (char *)buf, blen, eos); ++ if(stream->xfer_result) ++ CURL_TRC_CF(data, cf, "[%d] error %d writing %zu bytes of headers", ++ stream->id, stream->xfer_result, blen); ++ } ++} ++ ++static void h2_xfer_write_resp(struct Curl_cfilter *cf, ++ struct Curl_easy *data, ++ struct h2_stream_ctx *stream, ++ const char *buf, size_t blen, bool eos) ++{ ++ ++ /* If we already encountered an error, skip further writes */ ++ if(!stream->xfer_result) ++ stream->xfer_result = Curl_xfer_write_resp(data, (char *)buf, blen, eos); ++ /* If the transfer write is errored, we do not want any more data */ ++ if(stream->xfer_result) { ++ struct cf_h2_ctx *ctx = cf->ctx; ++ CURL_TRC_CF(data, cf, "[%d] error %d writing %zu bytes of data, " ++ "RST-ing stream", ++ stream->id, stream->xfer_result, blen); ++ nghttp2_submit_rst_stream(ctx->h2, 0, stream->id, ++ NGHTTP2_ERR_CALLBACK_FAILURE); ++ } + } + + static CURLcode on_stream_frame(struct Curl_cfilter *cf, +@@ -960,7 +988,6 @@ static CURLcode on_stream_frame(struct Curl_cfilter *cf, + struct cf_h2_ctx *ctx = cf->ctx; + struct h2_stream_ctx *stream = H2_STREAM_CTX(data); + int32_t stream_id = frame->hd.stream_id; +- CURLcode result; + int rv; + + if(!stream) { +@@ -1008,9 +1035,7 @@ static CURLcode on_stream_frame(struct Curl_cfilter *cf, + stream->status_code = -1; + } + +- result = recvbuf_write_hds(cf, data, STRCONST("\r\n")); +- if(result) +- return result; ++ h2_xfer_write_resp_hd(cf, data, stream, STRCONST("\r\n"), stream->closed); + + if(stream->status_code / 100 != 1) { + stream->resp_hds_complete = TRUE; +@@ -1229,7 +1254,6 @@ static int on_data_chunk_recv(nghttp2_session *session, uint8_t flags, + struct cf_h2_ctx *ctx = cf->ctx; + struct h2_stream_ctx *stream; + struct Curl_easy *data_s; +- CURLcode result; + (void)flags; + + DEBUGASSERT(stream_id); /* should never be a zero stream ID here */ +@@ -1252,9 +1276,7 @@ static int on_data_chunk_recv(nghttp2_session *session, uint8_t flags, + if(!stream) + return NGHTTP2_ERR_CALLBACK_FAILURE; + +- result = Curl_xfer_write_resp(data_s, (char *)mem, len, FALSE); +- if(result && result != CURLE_AGAIN) +- return NGHTTP2_ERR_CALLBACK_FAILURE; ++ h2_xfer_write_resp(cf, data_s, stream, (char *)mem, len, FALSE); + + nghttp2_session_consume(ctx->h2, stream_id, len); + stream->nrcvd_data += (curl_off_t)len; +@@ -1465,16 +1487,12 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame, + result = Curl_headers_push(data_s, buffer, CURLH_PSEUDO); + if(result) + return NGHTTP2_ERR_CALLBACK_FAILURE; +- result = recvbuf_write_hds(cf, data_s, STRCONST("HTTP/2 ")); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; +- result = recvbuf_write_hds(cf, data_s, (const char *)value, valuelen); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; ++ h2_xfer_write_resp_hd(cf, data_s, stream, STRCONST("HTTP/2 "), FALSE); ++ h2_xfer_write_resp_hd(cf, data_s, stream, ++ (const char *)value, valuelen, FALSE); + /* the space character after the status code is mandatory */ +- result = recvbuf_write_hds(cf, data_s, STRCONST(" \r\n")); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; ++ h2_xfer_write_resp_hd(cf, data_s, stream, STRCONST(" \r\n"), FALSE); ++ + /* if we receive data for another handle, wake that up */ + if(CF_DATA_CURRENT(cf) != data_s) + Curl_expire(data_s, 0, EXPIRE_RUN_NOW); +@@ -1487,18 +1505,13 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame, + /* nghttp2 guarantees that namelen > 0, and :status was already + received, and this is not pseudo-header field . */ + /* convert to an HTTP1-style header */ +- result = recvbuf_write_hds(cf, data_s, (const char *)name, namelen); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; +- result = recvbuf_write_hds(cf, data_s, STRCONST(": ")); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; +- result = recvbuf_write_hds(cf, data_s, (const char *)value, valuelen); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; +- result = recvbuf_write_hds(cf, data_s, STRCONST("\r\n")); +- if(result) +- return NGHTTP2_ERR_CALLBACK_FAILURE; ++ h2_xfer_write_resp_hd(cf, data_s, stream, ++ (const char *)name, namelen, FALSE); ++ h2_xfer_write_resp_hd(cf, data_s, stream, STRCONST(": "), FALSE); ++ h2_xfer_write_resp_hd(cf, data_s, stream, ++ (const char *)value, valuelen, FALSE); ++ h2_xfer_write_resp_hd(cf, data_s, stream, STRCONST("\r\n"), FALSE); ++ + /* if we receive data for another handle, wake that up */ + if(CF_DATA_CURRENT(cf) != data_s) + Curl_expire(data_s, 0, EXPIRE_RUN_NOW); +@@ -1799,7 +1812,12 @@ static ssize_t stream_recv(struct Curl_cfilter *cf, struct Curl_easy *data, + + (void)buf; + *err = CURLE_AGAIN; +- if(stream->closed) { ++ if(stream->xfer_result) { ++ CURL_TRC_CF(data, cf, "[%d] xfer write failed", stream->id); ++ *err = stream->xfer_result; ++ nread = -1; ++ } ++ else if(stream->closed) { + CURL_TRC_CF(data, cf, "[%d] returning CLOSE", stream->id); + nread = http2_handle_stream_close(cf, data, stream, err); + } +--- a/lib/vquic/curl_ngtcp2.c ++++ b/lib/vquic/curl_ngtcp2.c +@@ -152,6 +152,7 @@ struct h3_stream_ctx { + uint64_t error3; /* HTTP/3 stream error code */ + curl_off_t upload_left; /* number of request bytes left to upload */ + int status_code; /* HTTP status code */ ++ CURLcode xfer_result; /* result from xfer_resp_write(_hd) */ + bool resp_hds_complete; /* we have a complete, final response */ + bool closed; /* TRUE on stream close */ + bool reset; /* TRUE on stream reset */ +@@ -759,10 +760,39 @@ static int cb_h3_stream_close(nghttp3_conn *conn, int64_t stream_id, + return 0; + } + +-static CURLcode write_resp_hds(struct Curl_easy *data, +- const char *buf, size_t blen) ++static void h3_xfer_write_resp_hd(struct Curl_cfilter *cf, ++ struct Curl_easy *data, ++ struct h3_stream_ctx *stream, ++ const char *buf, size_t blen, bool eos) + { +- return Curl_xfer_write_resp(data, (char *)buf, blen, FALSE); ++ ++ /* If we already encountered an error, skip further writes */ ++ if(!stream->xfer_result) { ++ stream->xfer_result = Curl_xfer_write_resp(data, (char *)buf, blen, eos); ++ if(stream->xfer_result) ++ CURL_TRC_CF(data, cf, "[%"PRId64"] error %d writing %zu " ++ "bytes of headers", stream->id, stream->xfer_result, blen); ++ } ++} ++ ++static void h3_xfer_write_resp(struct Curl_cfilter *cf, ++ struct Curl_easy *data, ++ struct h3_stream_ctx *stream, ++ const char *buf, size_t blen, bool eos) ++{ ++ ++ /* If we already encountered an error, skip further writes */ ++ if(!stream->xfer_result) ++ stream->xfer_result = Curl_xfer_write_resp(data, (char *)buf, blen, eos); ++ /* If the transfer write is errored, we do not want any more data */ ++ if(stream->xfer_result) { ++ struct cf_ngtcp2_ctx *ctx = cf->ctx; ++ CURL_TRC_CF(data, cf, "[%"PRId64"] error %d writing %zu bytes " ++ "of data, cancelling stream", ++ stream->id, stream->xfer_result, blen); ++ nghttp3_conn_close_stream(ctx->h3conn, stream->id, ++ NGHTTP3_H3_REQUEST_CANCELLED); ++ } + } + + static int cb_h3_recv_data(nghttp3_conn *conn, int64_t stream3_id, +@@ -773,7 +803,6 @@ static int cb_h3_recv_data(nghttp3_conn *conn, int64_t stream3_id, + struct cf_ngtcp2_ctx *ctx = cf->ctx; + struct Curl_easy *data = stream_user_data; + struct h3_stream_ctx *stream = H3_STREAM_CTX(data); +- CURLcode result; + + (void)conn; + (void)stream3_id; +@@ -781,12 +810,7 @@ static int cb_h3_recv_data(nghttp3_conn *conn, int64_t stream3_id, + if(!stream) + return NGHTTP3_ERR_CALLBACK_FAILURE; + +- result = Curl_xfer_write_resp(data, (char *)buf, blen, FALSE); +- if(result) { +- CURL_TRC_CF(data, cf, "[%" PRId64 "] DATA len=%zu, ERROR receiving %d", +- stream->id, blen, result); +- return NGHTTP3_ERR_CALLBACK_FAILURE; +- } ++ h3_xfer_write_resp(cf, data, stream, (char *)buf, blen, FALSE); + if(blen) { + CURL_TRC_CF(data, cf, "[%" PRId64 "] ACK %zu bytes of DATA", + stream->id, blen); +@@ -819,7 +843,6 @@ static int cb_h3_end_headers(nghttp3_conn *conn, int64_t stream_id, + struct Curl_cfilter *cf = user_data; + struct Curl_easy *data = stream_user_data; + struct h3_stream_ctx *stream = H3_STREAM_CTX(data); +- CURLcode result = CURLE_OK; + (void)conn; + (void)stream_id; + (void)fin; +@@ -828,10 +851,7 @@ static int cb_h3_end_headers(nghttp3_conn *conn, int64_t stream_id, + if(!stream) + return 0; + /* add a CRLF only if we've received some headers */ +- result = write_resp_hds(data, "\r\n", 2); +- if(result) { +- return -1; +- } ++ h3_xfer_write_resp_hd(cf, data, stream, STRCONST("\r\n"), stream->closed); + + CURL_TRC_CF(data, cf, "[%" PRId64 "] end_headers, status=%d", + stream_id, stream->status_code); +@@ -874,7 +894,7 @@ static int cb_h3_recv_header(nghttp3_conn *conn, int64_t stream_id, + ncopy = msnprintf(line, sizeof(line), "HTTP/3 %03d \r\n", + stream->status_code); + CURL_TRC_CF(data, cf, "[%" PRId64 "] status: %s", stream_id, line); +- result = write_resp_hds(data, line, ncopy); ++ h3_xfer_write_resp_hd(cf, data, stream, line, ncopy, FALSE); + if(result) { + return -1; + } +@@ -884,22 +904,12 @@ static int cb_h3_recv_header(nghttp3_conn *conn, int64_t stream_id, + CURL_TRC_CF(data, cf, "[%" PRId64 "] header: %.*s: %.*s", + stream_id, (int)h3name.len, h3name.base, + (int)h3val.len, h3val.base); +- result = write_resp_hds(data, (const char *)h3name.base, h3name.len); +- if(result) { +- return -1; +- } +- result = write_resp_hds(data, ": ", 2); +- if(result) { +- return -1; +- } +- result = write_resp_hds(data, (const char *)h3val.base, h3val.len); +- if(result) { +- return -1; +- } +- result = write_resp_hds(data, "\r\n", 2); +- if(result) { +- return -1; +- } ++ h3_xfer_write_resp_hd(cf, data, stream, ++ (const char *)h3name.base, h3name.len, FALSE); ++ h3_xfer_write_resp_hd(cf, data, stream, ": ", 2, FALSE); ++ h3_xfer_write_resp_hd(cf, data, stream, ( ++ const char *)h3val.base, h3val.len, FALSE); ++ h3_xfer_write_resp_hd(cf, data, stream, "\r\n", 2, FALSE); + } + return 0; + } +@@ -1083,7 +1093,13 @@ static ssize_t cf_ngtcp2_recv(struct Curl_cfilter *cf, struct Curl_easy *data, + goto out; + } + +- if(stream->closed) { ++ if(stream->xfer_result) { ++ CURL_TRC_CF(data, cf, "[%" PRId64 "] xfer write failed", stream->id); ++ *err = stream->xfer_result; ++ nread = -1; ++ goto out; ++ } ++ else if(stream->closed) { + nread = recv_closed_stream(cf, data, stream, err); + goto out; + } +--- a/tests/http/test_02_download.py ++++ b/tests/http/test_02_download.py +@@ -257,6 +257,34 @@ class TestDownload: + ]) + r.check_response(count=count, http_status=200) + ++ @pytest.mark.parametrize("proto", ['h2', 'h3']) ++ def test_02_14_not_found(self, env: Env, httpd, nghttpx, repeat, proto): ++ if proto == 'h3' and not env.have_h3(): ++ pytest.skip("h3 not supported") ++ if proto == 'h3' and env.curl_uses_lib('msh3'): ++ pytest.skip("msh3 stalls here") ++ count = 10 ++ urln = f'https://{env.authority_for(env.domain1, proto)}/not-found?[0-{count-1}]' ++ curl = CurlClient(env=env) ++ r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[ ++ '--parallel' ++ ]) ++ r.check_stats(count=count, http_status=404, exitcode=0) ++ ++ @pytest.mark.parametrize("proto", ['h2', 'h3']) ++ def test_02_15_fail_not_found(self, env: Env, httpd, nghttpx, repeat, proto): ++ if proto == 'h3' and not env.have_h3(): ++ pytest.skip("h3 not supported") ++ if proto == 'h3' and env.curl_uses_lib('msh3'): ++ pytest.skip("msh3 stalls here") ++ count = 10 ++ urln = f'https://{env.authority_for(env.domain1, proto)}/not-found?[0-{count-1}]' ++ curl = CurlClient(env=env) ++ r = curl.http_download(urls=[urln], alpn_proto=proto, extra_args=[ ++ '--fail' ++ ]) ++ r.check_stats(count=count, http_status=404, exitcode=22) ++ + @pytest.mark.skipif(condition=Env().slow_network, reason="not suitable for slow network tests") + @pytest.mark.skipif(condition=Env().ci_run, reason="not suitable for CI runs") + def test_02_20_h2_small_frames(self, env: Env, httpd, repeat): + diff --git a/net-misc/curl/files/curl-8.7.1-rustls-fixes.patch b/net-misc/curl/files/curl-8.7.1-rustls-fixes.patch new file mode 100644 index 000000000000..81bcb0734339 --- /dev/null +++ b/net-misc/curl/files/curl-8.7.1-rustls-fixes.patch @@ -0,0 +1,49 @@ +From a866b062b17ab94b16b817ab9969c561364a4d72 Mon Sep 17 00:00:00 2001 +From: Matt Jolly <Matt.Jolly@footclan.ninja> +Date: Mon, 1 Apr 2024 08:36:51 +1000 +Subject: [PATCH] m4: fix rustls builds + +This patch consolidates the following commits to do with rustls +detection using pkg-config: + +- https://github.com/curl/curl/commit/9c4209837094781d5eef69ae6bcad0e86b64bf99 +- https://github.com/curl/curl/commit/5a50cb5a18a141a463148562dab83fa3be1a3b90 +--- + m4/curl-rustls.m4 | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/m4/curl-rustls.m4 b/m4/curl-rustls.m4 +index 7c55230..8082cf9 100644 +--- a/m4/curl-rustls.m4 ++++ b/m4/curl-rustls.m4 +@@ -142,6 +142,11 @@ if test "x$OPT_RUSTLS" != xno; then + LIBS="$SSL_LIBS $LIBS" + USE_RUSTLS="yes" + ssl_msg="rustls" ++ AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled]) ++ AC_SUBST(USE_RUSTLS, [1]) ++ USE_RUSTLS="yes" ++ RUSTLS_ENABLED=1 ++ test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes + else + AC_MSG_ERROR([pkg-config: Could not find rustls]) + fi +@@ -174,5 +179,15 @@ if test "x$OPT_RUSTLS" != xno; then + fi + + test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg" ++ ++ if test X"$OPT_RUSTLS" != Xno && ++ test "$RUSTLS_ENABLED" != "1"; then ++ AC_MSG_NOTICE([OPT_RUSTLS: $OPT_RUSTLS]) ++ AC_MSG_NOTICE([RUSTLS_ENABLED: $RUSTLS_ENABLED]) ++ AC_MSG_ERROR([--with-rustls was given but Rustls could not be detected]) ++ fi + fi + ]) ++ ++ ++RUSTLS_ENABLED +-- +2.44.0 + diff --git a/net-misc/curl/files/curl-8.8.0-install-manpage.patch b/net-misc/curl/files/curl-8.8.0-install-manpage.patch new file mode 100644 index 000000000000..f58ddae1c302 --- /dev/null +++ b/net-misc/curl/files/curl-8.8.0-install-manpage.patch @@ -0,0 +1,22 @@ +https://patch-diff.githubusercontent.com/raw/curl/curl/pull/13741 +From: Daniel Stenberg <daniel@haxx.se> +Date: Wed, 22 May 2024 08:43:43 +0200 +Subject: [PATCH] docs/Makefile.am: make curl-config.1 install + +on "make install" like it should +--- + docs/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/docs/Makefile.am b/docs/Makefile.am +index 83f5b0c461cc0f..e9ef6284860555 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -28,6 +28,7 @@ if BUILD_DOCS + # if we disable man page building, ignore these + MK_CA_DOCS = mk-ca-bundle.1 + CURLCONF_DOCS = curl-config.1 ++man_MANS = curl-config.1 + endif + + CURLPAGES = curl-config.md mk-ca-bundle.md diff --git a/net-misc/curl/files/curl-8.8.0-mbedtls.patch b/net-misc/curl/files/curl-8.8.0-mbedtls.patch new file mode 100644 index 000000000000..8fa4d6ef7cfe --- /dev/null +++ b/net-misc/curl/files/curl-8.8.0-mbedtls.patch @@ -0,0 +1,42 @@ +https://github.com/curl/curl/pull/13749 +From: Stefan Eissing <stefan@eissing.org> +Date: Wed, 22 May 2024 14:44:56 +0200 +Subject: [PATCH] mbedtls, check version for cipher id + +- mbedtls_ssl_get_ciphersuite_id_from_ssl() seems to have + been added in mbedtls 3.2.0. Check for that version. +--- a/lib/vtls/mbedtls.c ++++ b/lib/vtls/mbedtls.c +@@ -902,8 +902,6 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) + (struct mbed_ssl_backend_data *)connssl->backend; + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + const mbedtls_x509_crt *peercert; +- char cipher_str[64]; +- uint16_t cipher_id; + #ifndef CURL_DISABLE_PROXY + const char * const pinnedpubkey = Curl_ssl_cf_is_proxy(cf)? + data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY]: +@@ -932,11 +930,18 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) + return CURLE_SSL_CONNECT_ERROR; + } + +- cipher_id = (uint16_t) +- mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); +- mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); +- infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); +- ++#if MBEDTLS_VERSION_NUMBER >= 0x03020000 ++ { ++ char cipher_str[64]; ++ uint16_t cipher_id; ++ cipher_id = (uint16_t) ++ mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); ++ mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); ++ infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); ++ } ++#else ++ infof(data, "mbedTLS: Handshake complete"); ++#endif + ret = mbedtls_ssl_get_verify_result(&backend->ssl); + + if(!conn_config->verifyhost) diff --git a/net-misc/curl/files/curl-prefix-2.patch b/net-misc/curl/files/curl-prefix-2.patch new file mode 100644 index 000000000000..0372038e7d59 --- /dev/null +++ b/net-misc/curl/files/curl-prefix-2.patch @@ -0,0 +1,34 @@ +From a3033ee39f2cc43cb17386b23cb304b010c2c96f Mon Sep 17 00:00:00 2001 +From: Matt Jolly <Matt.Jolly@footclan.ninja> +Date: Wed, 22 May 2024 16:18:51 +1000 +Subject: [PATCH] Update prefix patch for 8.8.0 + +--- + curl-config.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/curl-config.in b/curl-config.in +index 085bb1e..c0bc6ce 100644 +--- a/curl-config.in ++++ b/curl-config.in +@@ -145,7 +145,7 @@ while test "$#" -gt 0; do + else + CPPFLAG_CURL_STATICLIB="" + fi +- if test "X@includedir@" = "X/usr/include"; then ++ if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then + echo "${CPPFLAG_CURL_STATICLIB}" + else + echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@" +@@ -153,7 +153,7 @@ while test "$#" -gt 0; do + ;; + + --libs) +- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then ++ if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then + CURLLIBDIR="-L@libdir@ " + else + CURLLIBDIR="" +-- +2.45.0 + diff --git a/net-misc/curl/files/curl-7.30.0-prefix.patch b/net-misc/curl/files/curl-prefix.patch index fd495c49b132..fd495c49b132 100644 --- a/net-misc/curl/files/curl-7.30.0-prefix.patch +++ b/net-misc/curl/files/curl-prefix.patch diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml index 48461136292e..d79a1ed4affd 100644 --- a/net-misc/curl/metadata.xml +++ b/net-misc/curl/metadata.xml @@ -2,39 +2,41 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> + <email>kangie@gentoo.org</email> + <name>Matt Jolly</name> + </maintainer> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> </maintainer> <use> <flag name="alt-svc">Enable alt-svc support</flag> - <flag name="brotli">Enable brotli compression support</flag> <flag name="ftp">Enable FTP support</flag> <flag name="gnutls">Enable gnutls ssl backend</flag> <flag name="gopher">Enable Gopher protocol support</flag> <flag name="hsts">Enable HTTP Strict Transport Security</flag> - <flag name="http2">Enable HTTP/2.0 support</flag> <flag name="imap">Enable Internet Message Access Protocol support</flag> <flag name="mbedtls">Enable mbedtls ssl backend</flag> <flag name="nghttp3">Enable HTTP/3.0 support using <pkg>net-libs/nghttp3</pkg> and <pkg>net-libs/ngtcp2</pkg></flag> - <flag name="quiche">Enable HTTP/3.0 support using <pkg>net-libs/quiche</pkg></flag> - <flag name="nss">Enable nss ssl backend</flag> <flag name="openssl">Enable openssl ssl backend</flag> <flag name="pop3">Enable Post Office Protocol 3 support</flag> <flag name="progress-meter">Enable the progress meter</flag> + <flag name="psl">Enable Public Suffix List (PSL) support. See https://daniel.haxx.se/blog/2024/01/10/psl-in-curl/.</flag> <flag name="rtmp">Enable RTMP Streaming Media support</flag> + <flag name="rustls">Enable Rustls ssl backend</flag> <flag name="smtp">Enable Simple Mail Transfer Protocol support</flag> <flag name="ssh">Enable SSH urls in curl using libssh2</flag> <flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag> <flag name="sslv3">Support for the old/insecure SSLv3 protocol</flag> <flag name="telnet">Enable Telnet protocol support</flag> <flag name="tftp">Enable TFTP support</flag> - <flag name="winssl">Enable winssl ssl backend</flag> - <flag name="zstd">Enable zstd compression</flag> + <flag name="websockets">Enable websockets support</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:curl:curl</remote-id> <remote-id type="cpe">cpe:/a:curl:libcurl</remote-id> <remote-id type="cpe">cpe:/a:haxx:curl</remote-id> <remote-id type="cpe">cpe:/a:haxx:libcurl</remote-id> + <remote-id type="github">curl/curl</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest deleted file mode 100644 index 72e63527c043..000000000000 --- a/net-misc/dahdi-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694 diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild deleted file mode 100644 index 33e37114b885..000000000000 --- a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 perl-functions - -DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" -HOMEPAGE="https://www.asterisk.org" -SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -IUSE="ppp" -PATCHES=( - "${FILESDIR}/dahdi-nondigium-blacklist.patch" - "${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch" - "${FILESDIR}/dahdi-tools-3.1.0-fno-common.patch" - "${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch" - "${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch" -) - -DEPEND="dev-libs/newt - net-misc/dahdi - sys-kernel/linux-headers - virtual/libusb:0 - ppp? ( net-dialup/ppp:= )" -RDEPEND="${DEPEND} - dev-lang/perl:= - dev-perl/CGI" -BDEPEND="dev-lang/perl - sys-apps/file" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)" - sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed." - sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed." -} - -src_install() { - local bashcompdir="$(get_bashcompdir)" - local bashcmd bashcmdtarget - - emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir=/lib/udev/rules.d install - emake DESTDIR="${ED}" install-config - - dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest - - # install init scripts - newinitd "${FILESDIR}"/dahdi.init2 dahdi - newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf - newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf - - bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" || - die "Error parsing dahdi bash completion file for commands") - - rm "${ED}"/usr/$(get_libdir)/libtonezone.a || die "Unable to remove static libs from install." - # Delete *if* the libtool file exists, bug #778380 - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.conf2 b/net-misc/dahdi-tools/files/dahdi-autoconf.conf2 deleted file mode 100644 index a46545231911..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-autoconf.conf2 +++ /dev/null @@ -1,40 +0,0 @@ -# Global settings -# Set this to your country code. -DAHDI_ZONE=za -DAHDI_ECHOCAN=oslec # mg2,jpah,kb1,sec,sec2 (there may be more, we recommend oslec) - -# Settings for analog -#Analog signal types, one of: -# ks - KewlStart (recommended, default) -# ls - LoopStart -# gs - GroundStart - -# Signalling to be used on FXO ports -DAHDI_FXO_SIGNALLING=ks - -# Signalling to be used on FXS ports -DAHDI_FXS_SIGNALLING=ks - -# Whether or not to echocan: -DAHDI_FXO_ECHOCAN=yes -DAHDI_FXS_ECHOCAN=yes - -# These settings will be used for BRI cards. -# Known options: B8ZS,AMI,HDB3 -DAHDI_BRI_CODING=AMI - -# Known options: ESF,D4,CCS,CRC4 -DAHDI_BRI_FRAMING=CCS - -# Our experience is that it's not required (still defaults to yes) -DAHDI_BRI_NT_ECHOCAN=yes -DAHDI_BRI_TE_ECHOCAN=yes - -# These settings are for PRI cards. Note that only E1 currently supported. -DAHDI_E1_CPE_ECHOCAN=yes -DAHDI_E1_NET_ECHOCAN=yes - -# PRI will default to CPE mode (remote end provides signalling). -# If you really want to provide signalling set the appropriate spans -# here (eg, set span 1 to NET mode). -#PRI_SPAN_1_NET=yes diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init2 b/net-misc/dahdi-tools/files/dahdi-autoconf.init2 deleted file mode 100644 index 9e3de84bac26..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-autoconf.init2 +++ /dev/null @@ -1,225 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Ultimate Linux Solutions CC -# Distributed under the terms of the GNU General Public License v2 - -depend() { - before dahdi -} - -dahdi_load_modules() { - local hwlist loc status mod mod_vname pciid desc - - hwlist=$(/usr/sbin/dahdi_hardware) - - if [ -z "${hwlist}" ]; then - einfo "No digium hardware found." - ebegin "Loading module dahdi_dummy" - /sbin/modprobe dahdi_dummy - eend $? - return - fi - - echo "${hwlist}" | while read loc mod pciid desc; do - status="${mod:${#mod}-1:1}" - mod="${mod%[+-]}" - mod_vname="mod_${mod}" - - einfo "Found $desc at $loc (module: $mod)" - - if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then - ebegin "Loading module $mod" - /sbin/modprobe $mod - eend - - [ $? -eq 0 ] && eval "$mod_vname=loaded" - fi - done -} - -dahdi_module_unload() { - local mod=$1 s - [ -d /sys/module/${mod} ] || return 0 - - for s in $(find /sys/module/${mod}/holders -type l); do - dahdi_module_unload $(basename $s) - done - - ebegin "Removing dahdi module: $mod" - /sbin/rmmod $mod - eend $? -} - -dahdi_gen_fxo_config() { - local port=$1 - - echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}" - [ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}" -} - -dahdi_gen_fxs_config() { - local port=$1 - - echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}" - [ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}" -} - -dahdi_gen_bri_te_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}" - echo "bchan=${basechan}-$(( basechan + 1 ))" - echo "hardhdlc=$(( basechan + 2 ))" - [ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))" -} - -dahdi_gen_bri_nt_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}" - echo "bchan=${basechan}-$(( basechan + 1 ))" - echo "hardhdlc=$(( basechan + 2 ))" - [ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))" -} - -dahdi_gen_e1_cpe_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}" - bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))" - echo "bchan=${bchans}" - echo "dchan=$(( basechan + 15 ))" - [ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" -} - -dahdi_gen_e1_net_config() { - span=$1 - port=$2 - basechan=$3 - - echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}" - bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))" - echo "bchan=${bchans}" - echo "dchan=$(( basechan + 15 ))" - [ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" -} - -dahdi_conf_span() { - local span=$1 - local type=$2 - local desc=$3 - local port=$4 - local basechan=$5 - local vname="" - - # Analog we need to deal with on a port-by-port basis. - [ "${type}" = "analog" ] && return 0 - - echo -e "\n# ${desc}" - case "${type}" in - digital-TE) - dahdi_gen_bri_te_config "${span}" "${port}" "${basechan}" - ;; - digital-NT) - dahdi_gen_bri_nt_config "${span}" "${port}" "${basechan}" - ;; - digital-E1) - # Use CPE by default. Unfortunately there is no easy - # way to detect CPE vs NET as far as I know and specifying - # in a config that you want NET mode seems the sanest way. - vname="PRI_SPAN_${span}_NET" - if [[ "${!vname}" = [Yy][Ee][Ss] ]]; then - dahdi_gen_e1_net_config "${span}" "${port}" "${basechan}" - else - dahdi_gen_e1_cpe_config "${span}" "${port}" "${basechan}" - fi - ;; - *) - echo "# Don't know how to configure this (type=${type})." - echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC." - ;; - esac -} - -dahdi_gen_config() { - local type manufacturer devicetype basechan aport atype - local span= - local tfile="$(mktemp)" - local sfile="$(mktemp)" - local plocation="" - local isdnport=0 - - /usr/sbin/dahdi_scan > "${sfile}" - exec 3<"${sfile}" - - echo "# Automatically dahdi-autoconf generated file ($(date))." >> "${tfile}" - echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >> "${tfile}" - - while read LINE <&3; do - case "$LINE" in - [[]*[]]) - [ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}" - span="${LINE%?}" - span="${span#?}" - ;; - type=*|manufacturer=*|devicetype=*|basechan=*|name=*) - eval "${LINE%%=*}='${LINE#*=}'" - ;; - location=*) - eval "${LINE%%=*}='${LINE#*=}'" - if [ "${location}" == "${plocation}" ]; then - (( ++isdnport )) - else - plocation="${location}" - isdnport=1 - fi - ;; - port=*) - # For analog cards only. - aport="${LINE#*=}"; aport="${aport%,*}" - atype="${LINE#*,}" - [ "${aport}" -eq "${basechan}" ] && echo -e "\n# ${manufacturer} ${devicetype} (${name})" >> "${tfile}" - case "${atype}" in - FXO) - dahdi_gen_fxo_config $aport >> "${tfile}" - ;; - FXS) - dahdi_gen_fxs_config $aport >> "${tfile}" - ;; - esac - ;; - esac - done - - [ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}" - - echo -e "\nloadzone = ${DAHDI_ZONE}\ndefaultzone = ${DAHDI_ZONE}\n## END OF AUTOCONFIGURED FILE ##" >> "${tfile}" - - exec 3<&- - - rm -f "${sfile}" - mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck - mv "${tfile}" /etc/dahdi/system.conf -} - -start() { - dahdi_load_modules - - if [ ! -r /dev/dahdi/ctl ]; then - eerror "No DAHDI compatible cards detected." - return 1 - fi - - ebegin "Generating DAHDI Configuration" - dahdi_gen_config - eend $? -} - -stop() { - dahdi_module_unload dahdi -} diff --git a/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch b/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch deleted file mode 100644 index 3df8f166a56c..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr dahdi-tools-2.8.0.ORIG/blacklist.sample dahdi-tools-2.8.0/blacklist.sample ---- dahdi-tools-2.8.0/blacklist.sample.ORIG 2009-04-02 10:34:32.000000000 +0200 -+++ dahdi-tools-2.8.0/blacklist.sample 2010-05-24 20:46:05.000000000 +0200 -@@ -14,6 +14,8 @@ - blacklist wcb4xxp - blacklist wcaxx - blacklist wcte43x -+blacklist wcopenpci -+blacklist zaphfc - - # Some mISDN drivers may try to attach to cards supported by DAHDI. If you - # have a card which is *not* supported by DAHDI but supported by one of the diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch deleted file mode 100644 index 37d1402c404f..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/./dahdi-tools-3.1.0/xpp/hexfile.h.o b/./dahdi-tools-3.1.0/xpp/hexfile.h -index 33ff50d..3d03f98 100644 ---- a/xpp/hexfile.h -+++ b/xpp/hexfile.h -@@ -70,7 +70,9 @@ struct hexdata { - }; - - --__BEGIN_DECLS -+#ifdef __cpluplus -+extern "C" { -+#endif - - typedef void (*parse_hexfile_report_func_t)(int level, const char *msg, ...) - #ifdef __GNUC__ -@@ -86,6 +88,9 @@ int dump_hexfile2(struct hexdata *hexdata, const char *outfile, uint8_t maxwidth - void dump_binary(struct hexdata *hexdata, const char *outfile); - void gen_hexline(const uint8_t *data, uint16_t addr, size_t len, FILE *output); - int bsd_checksum(struct hexdata *hexdata); --__END_DECLS -+ -+#ifdef __cpluplus -+} -+#endif - - #endif diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch deleted file mode 100644 index b222a85d8cb9..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/configure.ac 2020-03-28 22:28:35.614340050 +0200 -+++ b/configure.ac 2020-03-28 22:28:55.084181570 +0200 -@@ -161,6 +161,7 @@ - # Checks for header files. - AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h]) - AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h]) -+AC_CHECK_HEADERS([execinfo.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_INLINE ---- a/xpp/xtalk/debug.c 2020-03-28 22:41:43.507810560 +0200 -+++ b/xpp/xtalk/debug.c 2020-03-28 22:41:10.538087608 +0200 -@@ -27,8 +27,10 @@ - #include <stdarg.h> - #include <syslog.h> --#include <execinfo.h> - #include <xtalk/debug.h> - #include <autoconfig.h> -+#ifdef HAVE_EXECINFO_H -+#include <execinfo.h> -+#endif - - int verbose = LOG_INFO; - int debug_mask; -@@ -61,6 +63,7 @@ - /* from glibc info(1) */ - void print_backtrace(FILE *fp) - { -+#ifdef HAVE_EXECINFO_H - void *array[10]; - size_t size; - char **strings; -@@ -71,4 +74,7 @@ - for (i = 0; i < size; i++) - fprintf(fp, "%s\n", strings[i]); - free(strings); -+#else -+ fprintf(fp, "backtrace information only available if execinfo.h is available.\n"); -+#endif - } diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch deleted file mode 100644 index 3ca5bd2aa09b..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/xpp/mpptalk.c b/xpp/mpptalk.c -index fdb34f1..8fb3687 100644 ---- a/xpp/mpptalk.c -+++ b/xpp/mpptalk.c -@@ -237,7 +237,7 @@ union XTALK_PDATA(MPP) { - MEMBER(MPP, TWS_PORT_GET_REPLY); - MEMBER(MPP, TWS_PWR_GET); - MEMBER(MPP, TWS_PWR_GET_REPLY); --} PACKED members; -+} PACKED; - - /* - * Statuses -diff --git a/xpp/xtalk/xtalk_raw.c b/xpp/xtalk/xtalk_raw.c -index 49e47d5..251a502 100644 ---- a/xpp/xtalk/xtalk_raw.c -+++ b/xpp/xtalk/xtalk_raw.c -@@ -48,7 +48,7 @@ CMD_DEF(XTALK, ACK, - - union XTALK_PDATA(XTALK) { - MEMBER(XTALK, ACK); --} PACKED members; -+} PACKED; - - const struct xtalk_protocol xtalk_raw_proto = { - .name = "XTALK-RAW", -diff --git a/xpp/xtalk/xtalk_sync.c b/xpp/xtalk/xtalk_sync.c -index 18a5cad..ffa79d2 100644 ---- a/xpp/xtalk/xtalk_sync.c -+++ b/xpp/xtalk/xtalk_sync.c -@@ -60,7 +60,7 @@ union XTALK_PDATA(XTALK) { - MEMBER(XTALK, ACK); - MEMBER(XTALK, PROTO_GET); - MEMBER(XTALK, PROTO_GET_REPLY); --} PACKED members; -+} PACKED; - - const struct xtalk_protocol xtalk_sync_proto = { - .name = "XTALK-SYNC", diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch deleted file mode 100644 index 9575966435e7..000000000000 --- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- dahdi-tools-3.1.0/Makefile.am.o 2020-01-09 12:23:37.943059915 +0200 -+++ dahdi-tools-3.1.0/Makefile.am 2020-01-09 12:23:58.863036654 +0200 -@@ -1,7 +1,7 @@ - ACLOCAL_AMFLAGS = -I m4 - - LEGACY_MAKE = \ -- $(MAKE) -f $(srcdir)/Makefile.legacy \ -+ +$(MAKE) -f $(srcdir)/Makefile.legacy \ - top_srcdir=$(top_srcdir) \ - srcdir=$(srcdir) - -@@ -131,7 +131,6 @@ - install -m644 init.conf.sample $(DESTDIR)$(dahdiconfdir)/init.conf - install -m644 blacklist.sample $(DESTDIR)$(sysconfdir)/modprobe.d/dahdi-blacklist.conf - install -m644 modprobe.conf.sample $(DESTDIR)$(sysconfdir)/modprobe.d/dahdi.conf -- $(LEGACY_MAKE) config - - dahdiconfdir = @sysconfdir@/dahdi - dahdiconf_DATA = \ diff --git a/net-misc/dahdi-tools/files/dahdi.init2 b/net-misc/dahdi-tools/files/dahdi.init2 deleted file mode 100644 index d3abf3c4e61e..000000000000 --- a/net-misc/dahdi-tools/files/dahdi.init2 +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -checkconfig() { - if [ ! -f /etc/dahdi/system.conf ]; then - eerror "/etc/dahdi/system.conf not found. Nothing to do." - return 1 - fi - - return 0 -} - -start() { - checkconfig || return 1 - - ebegin "Starting DAHDI" - /usr/sbin/dahdi_cfg - eend $? - - if [ $? -eq 0 -a -r /etc/fxotune.conf ]; then - ebegin "Loading DAHDI fxotune.conf" - /usr/sbin/fxotune -s - eend $? - fi -} - -stop() { - ebegin "Stopping DAHDI" - /usr/sbin/dahdi_cfg -s - eend -} diff --git a/net-misc/dahdi-tools/metadata.xml b/net-misc/dahdi-tools/metadata.xml deleted file mode 100644 index c3fad2fc57e4..000000000000 --- a/net-misc/dahdi-tools/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>jaco@uls.co.za</email> - <name>Jaco Kroon</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="ppp">Enables PPP/DAHDIRAS support</flag> - </use> -</pkgmetadata> diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest deleted file mode 100644 index fd12a6dd7e2b..000000000000 --- a/net-misc/dahdi/Manifest +++ /dev/null @@ -1,21 +0,0 @@ -DIST dahdi-fw-a4a-a0017.tar.gz 181429 BLAKE2B fb1285eb7d06c8bca5c91b421c408c7f494c05e4ccb89eb0703457059efef78f248a471e0d5ca03fdca97882531eb3b7e0c52e3231b7ef7a90b58c33882772db SHA512 e42cb83e05edb359949acd888a743c665d228cd3b9424fc8f3b60676d6799f4455e65cc269d1e2ac0e3bb5613607dad4fb37c433067832fb68b15bfddf6f4a2a -DIST dahdi-fw-a4b-d001e.tar.gz 239591 BLAKE2B f09c2ee17c9d14b95d5bc90de84cdb57a49c33d44e21c66b8ea29908d9ac58b979a0d0eb3cae80efc5e96de19226a850b2ca36aa2b462af66e02043bc8c3def1 SHA512 ab72cf6d469e44f3a8b9dda5e7acae9ae435b6f12b1491079155b8df4c9cf83aed48ccbda4acb4a9943dd6228846f5b82998a0bf575d454ac3b81b72c585d58c -DIST dahdi-fw-a8a-1d0017.tar.gz 181958 BLAKE2B f7955ba62a94a1edd0c859e71c4f820ab789e098e2fd2c48e3fb453fee6ca5b056fe4144f83bd926f61e8f48fa223b84ce6912bf4a384ee9068fbe63538c1047 SHA512 2f80d24170f0efdebc318f238abb04664dfa97e3ca47a330b5a5e1d695c8ba5c535ad1302bf338667912b46cd5b4bbb76ab5bdbe6e736edd4f0e9239d818d05d -DIST dahdi-fw-a8b-1f001e.tar.gz 236508 BLAKE2B 830cc01cc14eca0367e92e5d6dc10b019e42072da5a69b18095c52633d7dcddade920fd2cf2c43f101effc2319c43a803f433faad244e096fc9854d3d652da7a SHA512 68041e5cb53d8ff6beb9f667abca5a5a1c752357c224f5c7cfcb81732bd417671cf6dc03b5c5bafd6a0864f6c5451165c0f26908b0f40ed3408961f448f2a9a4 -DIST dahdi-fw-hx8-2.06.tar.gz 29252 BLAKE2B f3c635108032ff06b51a140f2f665a6a41638eb027d88c33822da9d47fe907eecfaab937ce6199f0d9eeeafbd36919366e039b0bc1a1be605c339055a8b6843b SHA512 d113d2bd10d5a851087e04fadb3427ec07634960d47e2292320f0d195c65075fb24ab173e0985c257eaf8e46f595f29af034fb380382cdbff7bfbc7381dff4ae -DIST dahdi-fw-oct6114-032-1.05.01.tar.gz 165866 BLAKE2B 527d49f66924e91b6689cf905f365804be02707476d425e563db763bb158431f0e8bccc8ed38cbe3f4ec91747e53769ab5526cb3949218fc3b8041839796fcbc SHA512 ec47a7aac6a6abc73fe0c7ec3b31eebc868c516aeb1bb584f145f36c28abec21afa12dcec554bceb914c058c83255e32fb8d967ef4d8a5d0161b6053af464a24 -DIST dahdi-fw-oct6114-064-1.05.01.tar.gz 165869 BLAKE2B 9b21e9a5a9bf85ac18db67b14a457676d32958e1a2316fbf33fb802c1393ef2759a3637a80eafb77e2c496002c76f49705ac9eb2d427b8e079503a31bf930893 SHA512 6dcc6a3413c6c0561b08c4949a746cbebc58b8a068481f568007fdc663cfc6ef90417fbd81398055a781367e7db57f0a694745cddcd3c697a4f857be15981549 -DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 BLAKE2B 8621538d16e028eb2de64fa61c7475874525a302af5603f07a8a948a3c2cc1bd776feeeaf51c4d0c2edc4577156addc27905ecb06c9db6f43400258905cad6bf SHA512 17e83aa57ea8e9d3353027184adb48f664b177a528006d67112a53127fcb19c1011d4f44c2980ab77d27b3bf7f7a74d44f15aaf115e05fa3df8e16d3c30fc267 -DIST dahdi-fw-oct6114-256-1.05.01.tar.gz 171685 BLAKE2B 2f831da3043c6c73a4a38085d1c2b685acae94d92deba776e47a4d292f1ae65e5686ec3e8c73f0672ea8f390404717662f106b084083af4a8635447cd2f539fe SHA512 e447fe8d24963892339d895450cf7a04da3bdcf1de22630dea68119dbd9da84878478adf8ce0e5ef859e6d677c2a051aa6272de4e0692f5ce0e8b5d0fba4096b -DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 BLAKE2B b16a2c77dc0222851af25a11e64e40f2648ec870444373ad2310b8b5157b2a2d5a4a4bf2850551758080e87f43371ff55a11f5f381bd08b060f5062f0faa7587 SHA512 88a986d22ead41a3dabc320e13f7a3e6e6ab9e2752aca2cc940ad9c1ec570d4f01e82c46d0ec1b6dc1a87a1df7e94cfb8aa638b44b4fe2254af8962f1fdbac86 -DIST dahdi-fw-te133-7a001e.tar.gz 242987 BLAKE2B f6e5fedc742061b0ee26b33c20cb16a7a5efd68de827963dbb5fe3ddeed5bb491643e20818d39c8d0876ab3971c339ce43f03e97af3aff2286b70e020d2e05a4 SHA512 acd273bcf9b8e009b986e2c9f068121fad8b9cf8f500b79fd5456225ec4ef81d22f32960246a1e9b49ca7f47efb2f7d346c8727fe3b7b80c700d2dc609784acc -DIST dahdi-fw-te134-780017.tar.gz 185478 BLAKE2B c301362e7433f9c3c9991ae50c0536ad4315fe966dced38fd2be7a9c3b01ce4829d4ecb8ef9756f4ad05b507bb4b6739a861264eb6975512ce8aa5b89b1ca14c SHA512 b6f93ff060512b15bb8462805d8f8a435e56a83be362770d2c3b39b876d2171c5e1e6c1bc42c893eaa382ccd2f19534536612618c4ef4ff8c25976cf3719d4fb -DIST dahdi-fw-te435-13001e.tar.gz 238504 BLAKE2B c348a1e0d187ac4008254c78680dcd2b2ccce3f1af92bced190936c8ace88973e7d6854ed6de0480869ccd687d398958193ad90a648c8fe90464c3d1b5ddf974 SHA512 1cd5c191db62f87f87c9f6913bcbc3ed9f3d77a51578cd0bc5fdb9d17e128bcaf66d04c5a9e6417e9d7543fc8f18b6f635f0e8c1cb1bc19b11bc8ddffaa6be08 -DIST dahdi-fw-te436-10017.tar.gz 210601 BLAKE2B 8aceaa093b457a374db89599779315458a91af3d6f58e74a35ee08d3c91a556b64f78244a9e3e05d9bc8b200be2b3be83d159eb85681f3afb20329f16b2f2445 SHA512 56e8a26a737ac45e137324b635e5f489fe05a5939324af038f881b64ddabf486eb3830ff0ada1561ffedb3d6bc8338b11f4dccbc9b2ca9e00cd2bcc85abf83c0 -DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43dd21170fc16669de064e92615e5b049cf5cdf49f9c9d03d9e795172eafad83cd3b0636fb1491df5612358757a2e9d5 SHA512 3189df3dd680353d5520773ac8ea7fe638ea05e3c656379c1a245bd3ab8a6ae0c8a1c22c2068be9c758996e5993b0d19376b159b4e868ebc3d817dcce3b9aec7 -DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3 -DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047 -DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 -DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304 -DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de -DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66 diff --git a/net-misc/dahdi/dahdi-3.1.0-r2.ebuild b/net-misc/dahdi/dahdi-3.1.0-r2.ebuild deleted file mode 100644 index 1bde322e9f43..000000000000 --- a/net-misc/dahdi/dahdi-3.1.0-r2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-mod toolchain-funcs - -MY_P="${P/dahdi/dahdi-linux}" -JNET=1.0.14 -GENTOO=3.1.0-r1-v2 -S="${WORKDIR}/${MY_P}" - -JNET_DRIVERS="cwain qozap ztgsm" - -DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)" -HOMEPAGE="https://www.asterisk.org" -SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz - https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz - https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2 - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz -" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -IUSE="flash oslec" - -PATCHES=( "${WORKDIR}/dahdi-patchset" ) - -CONFIG_CHECK="MODULES PCI ~CRC_CCITT" - -pkg_pretend() { - use oslec && CONFIG_CHECK+=" ECHO" - check_extra_config -} - -src_unpack() { - unpack ${A} - # Copy the firmware tarballs over, the makefile will try and download them otherwise - for file in ${A} ; do - [[ "${file}" = dahdi-fw* ]] || continue - cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ || - die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/" - done - # But without the .bin's it'll still fall over and die, so copy those too. - mv *.bin "${MY_P}"/drivers/dahdi/firmware/ || - die "Error moving firmware files into the right folders." - - for drv in ${JNET_DRIVERS}; do - ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" || - die "Error linking ${drv}.c from jnet to DAHDI." - ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" || - die "Error linking ${drv}.h from jnet to DAHDI." - done -} - -src_prepare() { - if use flash; then - sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || - die "Failed to define FXSFLASH" - sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \ - include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" - fi - if use oslec; then - sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \ - drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files." - fi - default -} - -src_compile() { - unset ARCH - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \ - DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ - LDFLAGS="$(raw-ldflags)" all -} - -src_install() { - einfo "Installing kernel module" - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \ - DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ - LDFLAGS="$(raw-ldflags)" install - - # Remove the blank "version" files (these files are all empty, and root owned). - find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files" - - # If the kernel sources have a System.map, and there a suitable depmod - # available (seemingly when we're not cross-compiling), then the kernel - # sources depmod kicks in. Remove the files caused by that. - find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files" -} diff --git a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild deleted file mode 100644 index 5dc1b0089be5..000000000000 --- a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-mod linux-info toolchain-funcs - -MY_P="${P/dahdi/dahdi-linux}" -JNET=1.0.14 -GENTOO=3.1.0-r3 -S="${WORKDIR}/${MY_P}" - -JNET_DRIVERS="cwain qozap ztgsm" - -DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)" -HOMEPAGE="https://www.asterisk.org" -SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz - https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz - https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2 - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz - https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz -" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -IUSE="flash oslec" - -PATCHES=( "${WORKDIR}/dahdi-patchset" ) - -CONFIG_CHECK="MODULES PCI ~CRC_CCITT" - -pkg_pretend() { - use oslec && CONFIG_CHECK+=" ECHO" - check_extra_config -} - -src_unpack() { - unpack ${A} - # Copy the firmware tarballs over, the makefile will try and download them otherwise - for file in ${A} ; do - [[ "${file}" = dahdi-fw* ]] || continue - cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ || - die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/" - done - # But without the .bin's it'll still fall over and die, so copy those too. - mv *.bin "${MY_P}"/drivers/dahdi/firmware/ || - die "Error moving firmware files into the right folders." - - for drv in ${JNET_DRIVERS}; do - ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" || - die "Error linking ${drv}.c from jnet to DAHDI." - ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" || - die "Error linking ${drv}.h from jnet to DAHDI." - done -} - -src_prepare() { - if use flash; then - sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || - die "Failed to define FXSFLASH" - sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \ - include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" - fi - if use oslec; then - sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \ - drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files." - fi - default -} - -src_compile() { - unset ARCH - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \ - DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ - LDFLAGS="$(raw-ldflags)" all -} - -src_install() { - einfo "Installing kernel module" - emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \ - DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \ - LDFLAGS="$(raw-ldflags)" install - - # Remove the blank "version" files (these files are all empty, and root owned). - find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files" - - # If the kernel sources have a System.map, and there a suitable depmod - # available (seemingly when we're not cross-compiling), then the kernel - # sources depmod kicks in. Remove the files caused by that. - find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files" -} diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml deleted file mode 100644 index 55eff7ad9e4b..000000000000 --- a/net-misc/dahdi/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>jaco@uls.co.za</email> - <name>Jaco Kroon</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="flash">Support (short) flash on FXS</flag> - <flag name="oslec">Enable OSLEC (software) echo canceller (require ECHO in kernel)</flag> - </use> -</pkgmetadata> diff --git a/net-misc/datapipe/datapipe-1.0-r2.ebuild b/net-misc/datapipe/datapipe-1.0-r2.ebuild index 840d7da32660..622423b24877 100644 --- a/net-misc/datapipe/datapipe-1.0-r2.ebuild +++ b/net-misc/datapipe/datapipe-1.0-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs -DESCRIPTION="bind a local port and connect it to a remote socket" -HOMEPAGE="http://http.distributed.net/pub/dcti/unsupported/" -SRC_URI="ftp://ftp.distributed.net/pub/dcti/unsupported/${P}.tar.gz http://http.distributed.net/pub/dcti/unsupported/${P}.tar.gz" +DESCRIPTION="Bind a local port and connect it to a remote socket" +HOMEPAGE="https://http.distributed.net/pub/dcti/unsupported/" +SRC_URI="ftp://ftp.distributed.net/pub/dcti/unsupported/${P}.tar.gz + https://http.distributed.net/pub/dcti/unsupported/${P}.tar.gz" LICENSE="public-domain" SLOT="0" diff --git a/net-misc/dhcdrop/dhcdrop-0.5-r1.ebuild b/net-misc/dhcdrop/dhcdrop-0.5-r1.ebuild index 5757f718f4d5..a8e991173aaa 100644 --- a/net-misc/dhcdrop/dhcdrop-0.5-r1.ebuild +++ b/net-misc/dhcdrop/dhcdrop-0.5-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Effectively suppresses illegal DHCP servers on the LAN" HOMEPAGE="http://www.netpatch.ru/dhcdrop.html" @@ -19,13 +19,18 @@ DEPEND="static? ( net-libs/libpcap[static-libs] ) DOCS=( AUTHORS ChangeLog INSTALL NEWS README ) +PATCHES=( + # Fix building with -flto, bug #861608 + "${FILESDIR}/${P}-lto.patch" +) + src_prepare() { # Fix building with clang, bug #731694 sed -i \ -e '/^PACKAGE_/s/"//g' \ configure || die - eapply_user + default } src_configure() { diff --git a/net-misc/dhcdrop/files/dhcdrop-0.5-lto.patch b/net-misc/dhcdrop/files/dhcdrop-0.5-lto.patch new file mode 100644 index 000000000000..240303aa2bf2 --- /dev/null +++ b/net-misc/dhcdrop/files/dhcdrop-0.5-lto.patch @@ -0,0 +1,33 @@ +--- a/src/dhcdrop.h 2022-08-23 09:57:15.594679182 +0300 ++++ b/src/dhcdrop.h 2022-08-23 09:57:31.034678048 +0300 +@@ -207,9 +207,9 @@ + inline void replace_semicolons(char * str_ether); + + /* Print ethernet address as hex-digits string */ +-inline void print_ether(const uint8_t * ether_addr); ++static void print_ether(const uint8_t * ether_addr); + + /* Create random ethernet address and store to string 'str_mac_addr' */ +-inline void rand_ether_addr(char * str_mac_addr); ++static void rand_ether_addr(char * str_mac_addr); + + #endif /* ifdef DHCDROP_H*/ +--- a/src/dhcdrop.c 2022-08-23 09:57:09.522679628 +0300 ++++ b/src/dhcdrop.c 2022-08-23 09:57:47.810676815 +0300 +@@ -1879,14 +1879,14 @@ + } + } + +-inline void print_ether(const uint8_t * ether_addr) ++static void print_ether(const uint8_t * ether_addr) + { + int i; + for(i = 0; i < ETH_ALEN; ++i) + printf((i == (ETH_ALEN - 1) ) ? "%02X" :"%02X:", ether_addr[i]); + } + +-inline void rand_ether_addr(char * str_mac_addr) /* Minimal size of str_mac_addr must be STR_MAC_LEN (18) */ ++static void rand_ether_addr(char * str_mac_addr) /* Minimal size of str_mac_addr must be STR_MAC_LEN (18) */ + { + /* Fill first byte */ + strncat(str_mac_addr, "00:", 3); diff --git a/net-misc/dhcdrop/metadata.xml b/net-misc/dhcdrop/metadata.xml index b1b27e6aea57..3a96a89524db 100644 --- a/net-misc/dhcdrop/metadata.xml +++ b/net-misc/dhcdrop/metadata.xml @@ -5,10 +5,6 @@ <email>spiderx@spiderx.dp.ua</email> <name>Vladimir Pavljuchenkov</name> </maintainer> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index bc614fc3a8dd..47b71db74f8f 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -1 +1,2 @@ -DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040 +DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10af7361da079c48a5eff0d9e310f475dcc82e984c20936c64867183402d00d26e5366e75bf7463ec2aea4a6f68a4 SHA512 d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154 +DIST dhcp-4.4.3-patches.tar.xz 15276 BLAKE2B 4750833f986eccdc60b63de55f0b0633039806d75e1bbb79ea6974990399f2ec33836fd22ec3a0981aaeffc3fcfd914deff96d139f4ea3c2ad1b9010ec737d06 SHA512 c8071f48e4074a7a83e74706868a782c7dc4bcb6df4b9035411e419a95bf90de66ece2b2aacc8f8f3ca517287599cb178704402ff276a4620c941733ce03c57b diff --git a/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild index 7ae208514c67..d8539208aefd 100644 --- a/net-misc/dhcp/dhcp-4.4.2_p1-r1.ebuild +++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,12 +18,15 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="+client ipv6 ldap selinux +server ssl vim-syntax" -DEPEND=" +BDEPEND=" acct-group/dhcp - acct-user/dhcp + acct-user/dhcp" + +DEPEND=" + sys-libs/zlib:= client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) @@ -31,10 +34,12 @@ DEPEND=" ) ) ldap? ( - net-nds/openldap - ssl? ( dev-libs/openssl:0= ) + net-nds/openldap:= + ssl? ( dev-libs/openssl:= ) )" -RDEPEND="${DEPEND} +RDEPEND=" + ${BDEPEND} + ${DEPEND} selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax )" @@ -50,24 +55,29 @@ src_unpack() { PATCHES=( # Gentoo patches - these will probably never be accepted upstream # Fix some permission issues - "${FILESDIR}/${PN}-3.0-fix-perms.patch" + "${FILESDIR}/${PN}-4.4.3-fix-perms.patch" # Enable dhclient to equery NTP servers - "${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch" - "${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch" + "${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch" + "${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch" # Enable dhclient to get extra configuration from stdin - "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch" - "${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531 - "${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921 - "${FILESDIR}/${PN}-4.4.0-always-accept-4.patch" #437108 - "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636 - "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142 - "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832 + "${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch" + # bug #265531 + "${FILESDIR}/${PN}-4.4.3-nogateway.patch" + # bug #296921 + "${FILESDIR}/${PN}-4.4.3-quieter-ping.patch" + # bug #437108 + "${FILESDIR}/${PN}-4.4.3-always-accept-4.patch" + # bug #480636 + "${FILESDIR}/${PN}-4.4.3-iproute2-path.patch" + # bug #471142 + "${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch" + # bug #559832 + "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch" # Possible upstream candidates - "${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194 - "${FILESDIR}/${PN}-4.4.2-variable-name.patch" #752402 + "${FILESDIR}/${PN}-4.4.3-configure-clang16.patch" ) src_prepare() { @@ -124,7 +134,7 @@ src_prepare() { binddir=${binddir} GMAKE=${MAKE:-gmake} EOF - eapply -p2 "${FILESDIR}"/${PN}-4.4.0-bind-disable.patch + eapply -p2 "${FILESDIR}"/${PN}-4.4.3-bind-disable.patch # Only use the relevant subdirs now that ISC #removed the lib/export structure in bind. sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \ @@ -163,10 +173,8 @@ src_configure() { # bug #787935 append-flags -fno-strict-aliasing - # https://bugs.gentoo.org/720806 - if use ppc || use arm || use hppa; then - append-libs -latomic - fi + # bug #720806, bug #801592 + append-atomic-flags local myeconfargs=( --enable-paranoia @@ -181,7 +189,7 @@ src_configure() { econf "${myeconfargs[@]}" # configure local bind cruft. symtable option requires - # perl and we don't want to require that #383837. + # perl and we don't want to require that. bug #383837. cd bind/bind-*/ || die local el eval econf \ @@ -192,7 +200,7 @@ src_configure() { } src_compile() { - # build local bind cruft first + # Build local bind cruft first emake -C bind/bind-*/lib install # then build standard dhcp code emake AR="$(tc-getAR)" @@ -204,9 +212,10 @@ src_install() { dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters} docinto html dodoc doc/References.html + newtmpfiles "${FILESDIR}"/dhcp.tmpfiles dhcp.conf if [[ -e client/dhclient ]] ; then - # move the client to / + # Move the client to / dodir /sbin mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die @@ -232,7 +241,6 @@ src_install() { newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6 newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6 - newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf systemd_dounit "${FILESDIR}"/dhcpd4.service systemd_dounit "${FILESDIR}"/dhcpd6.service systemd_dounit "${FILESDIR}"/dhcrelay4.service @@ -249,9 +257,6 @@ src_install() { mv "${f}" "${f%.example}" || die done sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die - - diropts -m0750 -o dhcp -g dhcp - keepdir /var/lib/dhcp } pkg_preinst() { @@ -271,11 +276,14 @@ pkg_preinst() { } pkg_postinst() { - if use server ; then - tmpfiles_process dhcpd.conf + tmpfiles_process dhcp.conf + + if use client ; then + ewarn "The client and relay functionality will be removed in the next release!" + ewarn "Upstream have decided to discontinue this functionality." fi - if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then + if [[ -e "${EROOT}"/etc/init.d/dhcp ]] ; then ewarn ewarn "WARNING: The dhcp init script has been renamed to dhcpd" ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and" diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r6.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r6.ebuild new file mode 100644 index 000000000000..82f6478828a7 --- /dev/null +++ b/net-misc/dhcp/dhcp-4.4.3_p1-r6.ebuild @@ -0,0 +1,301 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd toolchain-funcs flag-o-matic tmpfiles + +MY_PV="${PV//_alpha/a}" +MY_PV="${MY_PV//_beta/b}" +MY_PV="${MY_PV//_rc/rc}" +MY_PV="${MY_PV//_p/-P}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" +HOMEPAGE="https://www.isc.org/dhcp" +SRC_URI=" + https://downloads.isc.org/isc/dhcp/${MY_P}.tar.gz + https://downloads.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/dhcp-4.4.3-patches.tar.xz +" +S="${WORKDIR}/${MY_P}" + +LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="+client ipv6 ldap selinux +server ssl vim-syntax" + +BDEPEND=" + acct-group/dhcp + acct-user/dhcp +" +DEPEND=" + sys-libs/zlib:= + client? ( + kernel_linux? ( + ipv6? ( sys-apps/iproute2 ) + sys-apps/net-tools + ) + ) + ldap? ( + net-nds/openldap:= + ssl? ( dev-libs/openssl:= ) + )" +RDEPEND=" + ${BDEPEND} + ${DEPEND} + selinux? ( sec-policy/selinux-dhcp ) + vim-syntax? ( app-vim/dhcpd-syntax ) +" + +PATCHES=( + # Gentoo patches - these will probably never be accepted upstream + # Fix some permission issues + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-fix-perms.patch" + + # Enable dhclient to equery NTP servers + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-ntp.patch" + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-resolvconf.patch" + + # Enable dhclient to get extra configuration from stdin + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-dhclient-stdin-conf.patch" + # bug #265531 + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-nogateway.patch" + # bug #296921 + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-quieter-ping.patch" + # bug #437108 + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-always-accept-4.patch" + # bug #480636 + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-iproute2-path.patch" + # bug #471142 + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-bindtodevice-inet6.patch" + # bug #559832 + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-ldap-ipv6-client-id.patch" + # bug #908986 + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-infiniband.patch" + + # Possible upstream candidates + "${WORKDIR}/dhcp-4.4.3-patches/${PN}-4.4.3-configure-clang16.patch" +) + +src_unpack() { + unpack ${A} + # handle local bind hell + cd "${S}"/bind || die + unpack ./bind.tar.gz +} + +src_prepare() { + default + + # Brand the version with Gentoo + sed -i \ + -e "/VERSION=/s:'$: Gentoo-${PR}':" \ + configure || die + + # Change the hook script locations of the scripts + sed -i \ + -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \ + -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \ + client/scripts/* || die + + # No need for the linux script to force bash #158540 + sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die + + # Quiet the freebsd logger a little + sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die + + # Remove these options from the sample config + sed -i -r \ + -e "/(script|host-name|domain-name) /d" \ + client/dhclient.conf.example || die + + if use client && ! use server ; then + sed -i -r \ + -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \ + Makefile.in || die + elif ! use client && use server ; then + sed -i -r \ + -e '/^SUBDIRS/s:\<client\>::' \ + Makefile.in || die + fi + + # Only install different man pages if we don't have en + if [[ " ${LINGUAS} " != *" en "* ]]; then + # Install Japanese man pages + if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then + einfo "Installing Japanese documention" + cp doc/ja_JP.eucJP/dhclient* client || die + cp doc/ja_JP.eucJP/dhcp* common || die + fi + fi + # Now remove the non-english docs so there are no errors later + rm -r doc/ja_JP.eucJP || die + + # make the bind build work - do NOT make "binddir" local! + binddir="${S}/bind" + cd "${binddir}" || die + cat <<-EOF > bindvar.tmp + binddir=${binddir} + GMAKE=${MAKE:-gmake} + EOF + eapply -p2 "${WORKDIR}"/dhcp-4.4.3-patches/${PN}-4.4.3-bind-disable.patch + # Only use the relevant subdirs now that ISC + #removed the lib/export structure in bind. + sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \ + -i bind-*/lib/Makefile.in || die +} + +src_configure() { + # bind defaults to stupid `/usr/bin/ar` + tc-export AR BUILD_CC + export ac_cv_path_AR=${AR} + + # this is tested for by the bind build system, and can cause trouble + # when cross-building; since dhcp itself doesn't make use of libcap, + # simply disable it. + export ac_cv_lib_cap_cap_set_proc=no + + # Use FHS sane paths ... some of these have configure options, + # but not all, so just do it all here. + local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp" + cat <<-EOF >> includes/site.h + #define _PATH_DHCPD_CONF "${e}/dhcpd.conf" + #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf" + #define _PATH_DHCPD_DB "${l}/dhcpd.leases" + #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases" + #define _PATH_DHCLIENT_DB "${l}/dhclient.leases" + #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases" + #define _PATH_DHCPD_PID "${r}/dhcpd.pid" + #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid" + #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid" + #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid" + #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid" + #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid" + EOF + + # Breaks with -O3 because of reliance on undefined behaviour + # bug #787935 + append-flags -fno-strict-aliasing + + # bug #720806, bug #801592 + append-atomic-flags + + local myeconfargs=( + --enable-paranoia + --enable-early-chroot + --sysconfdir=${e} + --with-randomdev=/dev/random + $(use_enable ipv6 dhcpv6) + $(use_with ldap) + $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto) + LIBS="${LIBS}" + ) + econf "${myeconfargs[@]}" + + # configure local bind cruft. symtable option requires + # perl and we don't want to require that. bug #383837. + cd bind/bind-*/ || die + local el + eval econf \ + $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \ + --with-randomdev=/dev/random \ + --disable-symtable \ + --without-make-clean +} + +src_compile() { + # Build local bind cruft first + emake -C bind/bind-*/lib install + # then build standard dhcp code + emake AR="$(tc-getAR)" + emake -C keama AR="$(tc-getAR)" +} + +src_install() { + default + + emake -C keama DESTDIR="${D}" install + + dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters} + docinto html + dodoc doc/References.html + newtmpfiles "${FILESDIR}"/dhcp.tmpfiles dhcp.conf + + if [[ -e client/dhclient ]] ; then + # Move the client to / + dodir /sbin + mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die + + exeinto /sbin + if use kernel_linux ; then + newexe "${S}"/client/scripts/linux dhclient-script + else + newexe "${S}"/client/scripts/freebsd dhclient-script + fi + fi + + if [[ -e server/dhcpd ]] ; then + if use ldap ; then + insinto /etc/openldap/schema + doins contrib/ldap/dhcp.* + dosbin contrib/ldap/dhcpd-conf-to-ldap + fi + + newinitd "${FILESDIR}"/dhcpd.init5 dhcpd + newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd + newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay + newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay + newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6 + newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6 + + systemd_dounit "${FILESDIR}"/dhcpd4.service + systemd_dounit "${FILESDIR}"/dhcpd6.service + systemd_dounit "${FILESDIR}"/dhcrelay4.service + systemd_dounit "${FILESDIR}"/dhcrelay6.service + systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf + systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf + + sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560 + fi + + # the default config files aren't terribly useful #384087 + local f + for f in "${ED}"/etc/dhcp/*.conf.example ; do + mv "${f}" "${f%.example}" || die + done + sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die +} + +pkg_preinst() { + # Keep the user files over the sample ones. The + # hashing is to ignore the crappy defaults #384087. + local f h + for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do + h=${f#*:} + f="/etc/dhcp/${f%:*}.conf" + if [ -e "${EROOT}"${f} ] ; then + case $(md5sum "${EROOT}"${f}) in + ${h}*) ;; + *) cp -p "${EROOT}"${f} "${ED}"${f};; + esac + fi + done +} + +pkg_postinst() { + tmpfiles_process dhcp.conf + + if use client ; then + ewarn "The client and relay functionality will be removed in the next release!" + ewarn "Upstream have decided to discontinue this functionality." + fi + + if [[ -e "${EROOT}"/etc/init.d/dhcp ]] ; then + ewarn + ewarn "WARNING: The dhcp init script has been renamed to dhcpd" + ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and" + ewarn "and dhcp should be removed from the default runlevel" + ewarn + fi +} diff --git a/net-misc/dhcp/files/dhcp-4.4.0-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.4.0-bind-disable.patch deleted file mode 100644 index b74255ca4e97..000000000000 --- a/net-misc/dhcp/files/dhcp-4.4.0-bind-disable.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- dhcp-4.4.0/bind/Makefile.in -+++ dhcp-4.4.0/bind/Makefile.in -@@ -37,6 +37,7 @@ - @BIND_ATF_TRUE@all: bind1 atf bind2 - - bind1: -+disable: - # Extract the source from the tarball, if it hasn't been already. - @if test -d ${bindsrcdir} ; then \ - echo ${bindsrcdir} already unpacked... ; \ -@@ -60,6 +61,7 @@ - fi - - atf: -+disable: - # Build and copy the ATF support if not yet installed. - @if test -d ./atf ; then \ - echo ATF support already installed ; \ ---- dhcp-4.4.0/bind/test -+++ dhcp-4.4.0/bind/test -@@ -0,0 +1 @@ -+--disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --with-gssapi=no --enable-threads=no @BINDCONFIG@ --includedir=${binddir}/include --libdir=${binddir}/lib diff --git a/net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch b/net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch deleted file mode 100644 index 5d0b7bdd5352..000000000000 --- a/net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/client/dhclient.c -+++ b/client/dhclient.c -@@ -83,8 +83,6 @@ - static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/"; - #endif /* UNIT_TEST */ - --u_int16_t local_port = 0; --u_int16_t remote_port = 0; - #if defined(DHCPv6) && defined(DHCP4o6) - int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */ - #endif ---- a/relay/dhcrelay.c -+++ b/relay/dhcrelay.c -@@ -95,9 +95,6 @@ - forward_untouched, /* Forward without changes. */ - discard } agent_relay_mode = forward_and_replace; - --u_int16_t local_port; --u_int16_t remote_port; -- - /* Relay agent server list. */ - struct server_list { - struct server_list *next; ---- a/server/mdb.c -+++ b/server/mdb.c -@@ -67,8 +67,6 @@ - - int numclasseswritten; - --omapi_object_type_t *dhcp_type_host; -- - isc_result_t enter_class(cd, dynamicp, commit) - struct class *cd; - int dynamicp; diff --git a/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch deleted file mode 100644 index 9f5085dd5e23..000000000000 --- a/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 261c84d91d1b4581df9f7f0ec031908299de7726 Mon Sep 17 00:00:00 2001 -From: Mark Andrews <marka@isc.org> -Date: Thu, 19 Dec 2019 09:27:44 +1100 -Subject: [PATCH] fix variable name in conditional block - ---- - lib/isc/stats.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/isc/stats.c b/lib/isc/stats.c -index 5bce3c1100..a7ab97ce53 100644 ---- a/bind/bind-9.11.14/lib/isc/stats.c -+++ b/bind/bind-9.11.14/lib/isc/stats.c -@@ -297,7 +297,7 @@ setcounter(isc_stats_t *stats, - isc_atomic_store((int32_t *)&stats->counters[counter].lo, - (uint32_t)(value & 0xffffffff)); - # else -- stats->counters[counter] = val; -+ stats->counters[counter] = value; - # endif - #endif - } --- -GitLab - diff --git a/net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch index bbb25eb194bd..bbb25eb194bd 100644 --- a/net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch diff --git a/net-misc/dhcp/files/dhcp-4.4.3-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.4.3-bind-disable.patch new file mode 100644 index 000000000000..7f99f771cd11 --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.4.3-bind-disable.patch @@ -0,0 +1,27 @@ +diff --git a/bind/Makefile.in b/bind/Makefile.in +index 2e60091..a155194 100644 +--- a/bind/Makefile.in ++++ b/bind/Makefile.in +@@ -37,6 +37,7 @@ installdirs = includedir=${binddir}/include libdir=${binddir}/lib + @BIND_ATF_TRUE@all: bind1 atf bind2 + + bind1: ++disable: + # Extract the source from the tarball, if it hasn't been already. + @if test -d ${bindsrcdir} ; then \ + echo ${bindsrcdir} already unpacked... ; \ +@@ -60,6 +61,7 @@ bind1: + fi + + atf: bind1 ++disable: + # Build and copy the ATF support if not yet installed. + @if test -d ./atf ; then \ + echo ATF support already installed ; \ +diff --git a/bind/test b/bind/test +new file mode 100644 +index 0000000..713671f +--- /dev/null ++++ b/bind/test +@@ -0,0 +1 @@ +++--disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --with-gssapi=no --enable-threads=no @BINDCONFIG@ --includedir=${binddir}/include --libdir=${binddir}/lib diff --git a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch b/net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch index 77254c32e2b0..f6ea0f858c6d 100644 --- a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch @@ -5,15 +5,14 @@ snipped from fedora # dhclient -6: bind socket to interface (#1001742) # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #34784]) -diff -up dhcp-4.2.5/common/socket.c.bindtodevice_inet6 dhcp-4.2.5/common/socket.c ---- dhcp-4.2.5/common/socket.c.bindtodevice_inet6 2013-09-17 16:47:05.000000000 +0200 -+++ dhcp-4.2.5/common/socket.c 2013-09-17 16:48:18.975997842 +0200 -@@ -245,7 +245,7 @@ if_register_socket(struct interface_info +--- a/common/socket.c ++++ b/common/socket.c +@@ -266,7 +266,7 @@ #if defined(SO_BINDTODEVICE) /* Bind this socket to this interface. */ - if ((local_family != AF_INET6) && (info->ifp != NULL) && + if (((do_multicast == 0)||(*do_multicast == 0)) && (info->ifp != NULL) && setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, - (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) { - log_fatal("setsockopt: SO_BINDTODEVICE: %m"); + (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) { + log_fatal("Can't set SO_BINDTODEVICE on dhcp socket for" diff --git a/net-misc/dhcp/files/dhcp-4.4.3-configure-clang16.patch b/net-misc/dhcp/files/dhcp-4.4.3-configure-clang16.patch new file mode 100644 index 000000000000..38c24ff9f2bb --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.4.3-configure-clang16.patch @@ -0,0 +1,143 @@ +https://src.fedoraproject.org/rpms/dhcp/blob/5a0c1922defd9dbb94fa7d9fd3294031ffe72df9/f/0030-bind-configure-c99.patch + +Downstream-only patch. +Upstream bind9 development has changed configure significantly: +https://gitlab.isc.org/isc-projects/bind9 + +From 035224d94d4cf93257cf5440a2e4e129540e81e8 Mon Sep 17 00:00:00 2001 +From: Arjun Shankar <arjun@redhat.com> +Date: Thu, 20 Apr 2023 15:34:01 +0200 +Subject: [PATCH] Port to C99 + +--- a/bind/bind-9.11.36/configure ++++ b/bind/bind-9.11.36/configure +@@ -20016,7 +20016,7 @@ else + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-main() { ++int main() { + char a[16],b[64]; return(inet_ntop(AF_INET6, a, b, sizeof(b)) == (char*)0);} + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : +@@ -20056,7 +20056,7 @@ else + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 : ++int main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 : + inet_pton(AF_INET, "1.2.3.04", a) == 1 ? 1 : + (inet_pton(AF_INET6, "::1.2.3.4", a) != 1)); } + _ACEOF +@@ -21346,7 +21346,7 @@ else + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));} ++int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));} + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5 +@@ -21363,7 +21363,7 @@ else + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));} ++int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));} + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: long int" >&5 +@@ -21380,7 +21380,7 @@ else + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +-main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));} ++int main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));} + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: long long int" >&5 +@@ -21759,7 +21759,7 @@ int + main () + { + +- main() { asm("ics"); exit(0); } ++ int main() { asm("ics"); exit(0); } + + ; + return 0; +@@ -21782,7 +21782,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +- main() { asm("ics"); exit(0); } ++ int main() { asm("ics"); exit(0); } + + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : +--- a/bind/bind-9.11.36/configure.ac ++++ b/bind/bind-9.11.36/configure.ac +@@ -3274,7 +3274,7 @@ AC_TRY_RUN([ + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-main() { ++int main() { + char a[16],b[64]; return(inet_ntop(AF_INET6, a, b, sizeof(b)) == (char*)0);}], + [AC_MSG_RESULT(yes) + ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP"], +@@ -3297,7 +3297,7 @@ AC_TRY_RUN([ + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 : ++int main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 : + inet_pton(AF_INET, "1.2.3.04", a) == 1 ? 1 : + (inet_pton(AF_INET6, "::1.2.3.4", a) != 1)); }], + [AC_MSG_RESULT(yes) +@@ -3901,7 +3901,7 @@ AC_TRY_RUN([ + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}], ++int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}], + [AC_MSG_RESULT(int) + ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE int"], + [ +@@ -3909,7 +3909,7 @@ AC_TRY_RUN([ + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}], ++int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}], + [AC_MSG_RESULT(long int) + ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long int"], + [ +@@ -3917,7 +3917,7 @@ AC_TRY_RUN([ + #include <sys/types.h> + #include <sys/time.h> + #include <sys/resource.h> +-main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}], ++int main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}], + [AC_MSG_RESULT(long long int) + ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int"], + [AC_MSG_ERROR([unable to determine sizeof rlim_cur]) +@@ -4117,7 +4117,7 @@ case "$enable_atomic" in + if test "X$GCC" = "Xyes"; then + AC_MSG_CHECKING([if asm("ics"); works]) + AC_TRY_COMPILE(,[ +- main() { asm("ics"); exit(0); } ++ int main() { asm("ics"); exit(0); } + ], + [AC_MSG_RESULT(yes) + use_atomic=yes], +@@ -4125,7 +4125,7 @@ case "$enable_atomic" in + saved_cflags="$CFLAGS" + CFLAGS="$CFLAGS -Wa,-many" + AC_TRY_RUN([ +- main() { asm("ics"); exit(0); } ++ int main() { asm("ics"); exit(0); } + ], + [AC_MSG_RESULT([yes, required -Wa,-many]) + use_atomic=yes], +-- +2.40.0 diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch index a504840dd5ab..a504840dd5ab 100644 --- a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-resolvconf.patch index ccfdbcf4a206..63a67b7b1151 100644 --- a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-resolvconf.patch @@ -1,5 +1,5 @@ ---- dhcp-4.3.6/client/scripts/bsdos -+++ dhcp-4.3.6/client/scripts/bsdos +--- a/client/scripts/bsdos ++++ b/client/scripts/bsdos @@ -1,27 +1,25 @@ #!/bin/sh @@ -55,10 +55,10 @@ + chmod 644 /etc/resolv.conf + fi fi - } - ---- dhcp-4.3.6/client/scripts/freebsd -+++ dhcp-4.3.6/client/scripts/freebsd + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf +--- a/client/scripts/freebsd ++++ b/client/scripts/freebsd @@ -11,54 +11,23 @@ fi @@ -160,9 +160,9 @@ + chmod 644 /etc/resolv.conf fi fi - } ---- dhcp-4.3.6/client/scripts/linux -+++ dhcp-4.3.6/client/scripts/linux + # If we're making confs, may as well make an ntp.conf too +--- a/client/scripts/linux ++++ b/client/scripts/linux @@ -35,16 +35,16 @@ # update /etc/resolv.conf based on received values # This updated version mostly follows Debian script by Andrew Pollock et al. @@ -248,10 +248,10 @@ fi - mv -f $new_resolv_conf /etc/resolv.conf fi - } ---- dhcp-4.3.6/client/scripts/netbsd -+++ dhcp-4.3.6/client/scripts/netbsd + # If we're making confs, may as well make an ntp.conf too +--- a/client/scripts/netbsd ++++ b/client/scripts/netbsd @@ -1,27 +1,25 @@ #!/bin/sh @@ -308,10 +308,10 @@ + chmod 644 /etc/resolv.conf + fi fi - } - ---- dhcp-4.3.6/client/scripts/openbsd -+++ dhcp-4.3.6/client/scripts/openbsd + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf +--- a/client/scripts/openbsd ++++ b/client/scripts/openbsd @@ -1,27 +1,25 @@ #!/bin/sh @@ -369,10 +369,10 @@ + chmod 644 /etc/resolv.conf + fi fi - } - ---- dhcp-4.3.6/client/scripts/solaris -+++ dhcp-4.3.6/client/scripts/solaris + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf +--- a/client/scripts/solaris ++++ b/client/scripts/solaris @@ -1,21 +1,39 @@ #!/bin/sh @@ -418,5 +418,5 @@ + chmod 644 /etc/resolv.conf + fi fi - } - + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf diff --git a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-stdin-conf.patch index bf5a54c32153..bf5a54c32153 100644 --- a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-stdin-conf.patch diff --git a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch b/net-misc/dhcp/files/dhcp-4.4.3-fix-perms.patch index f4b3fd18e167..5b3a8ab2c20a 100644 --- a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-fix-perms.patch @@ -1,6 +1,6 @@ --- a/server/dhcpd.c +++ b/server/dhcpd.c -@@ -602,6 +602,12 @@ +@@ -892,6 +892,12 @@ if (lftest) exit (0); @@ -11,5 +11,5 @@ +#endif /* PARANOIA */ + /* Discover all the network interfaces and initialize them. */ - discover_interfaces (DISCOVER_SERVER); - + #if defined(DHCPv6) && defined(DHCP4o6) + if (dhcpv4_over_dhcpv6) { diff --git a/net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch b/net-misc/dhcp/files/dhcp-4.4.3-iproute2-path.patch index 18b04e620c14..18b04e620c14 100644 --- a/net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-iproute2-path.patch diff --git a/net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch b/net-misc/dhcp/files/dhcp-4.4.3-ldap-ipv6-client-id.patch index 2a7f8183d4e0..2a7f8183d4e0 100644 --- a/net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-ldap-ipv6-client-id.patch diff --git a/net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch b/net-misc/dhcp/files/dhcp-4.4.3-nogateway.patch index d299cc503f60..d299cc503f60 100644 --- a/net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-nogateway.patch diff --git a/net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch b/net-misc/dhcp/files/dhcp-4.4.3-quieter-ping.patch index 3efb6459ebf9..3efb6459ebf9 100644 --- a/net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-quieter-ping.patch diff --git a/net-misc/dhcp/files/dhcp.tmpfiles b/net-misc/dhcp/files/dhcp.tmpfiles new file mode 100644 index 000000000000..c5b18352eda4 --- /dev/null +++ b/net-misc/dhcp/files/dhcp.tmpfiles @@ -0,0 +1,2 @@ +d /var/lib/dhcp 0750 dhcp dhcp +f /var/lib/dhcp/dhcpd.leases 0640 dhcp dhcp diff --git a/net-misc/dhcp/files/dhcpd.conf2 b/net-misc/dhcp/files/dhcpd.conf2 index 5cd2eeca3f71..ac173f8a3576 100644 --- a/net-misc/dhcp/files/dhcpd.conf2 +++ b/net-misc/dhcp/files/dhcpd.conf2 @@ -16,7 +16,9 @@ # All file paths below are relative to the chroot. # You can specify a different chroot directory but MAKE SURE it's empty. -# Specify a configuration file - the default is /etc/dhcp/dhcpd.conf +# Specify a configuration file - the default is based on the service name, +# so dhcpd would use /etc/dhcp/dhcpd.conf and dhcpd.foo would use +# /etc/dhcp/dhcpd.foo.conf # DHCPD_CONF="/etc/dhcp/dhcpd.conf" # Configure which interface or interfaces to for dhcpd to listen on. diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5 index f0ea9b0c7904..8e05625e6345 100644 --- a/net-misc/dhcp/files/dhcpd.init5 +++ b/net-misc/dhcp/files/dhcpd.init5 @@ -1,8 +1,11 @@ #!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +description="ISC DHCP server" + extra_commands="configtest" +description_configtest="Test the syntax of the configuration file" : ${DHCPD_CONF:=/etc/dhcp/${SVCNAME}.conf} @@ -77,11 +80,9 @@ start() { local leasefile="$(get_var lease-file-name /var/lib/dhcp/${SVCNAME}.leases)" checkpath -f -o dhcp:dhcp "${chroot}${leasefile}" - # Setup LD_PRELOAD so name resolution works in our chroot. if [ -n "${chroot}" ] ; then checkpath -d -o root:root -m 755 "${chroot}"/dev "${chroot}"/etc "${chroot}"/proc cp -pP /etc/localtime /etc/resolv.conf "${chroot}"/etc/ - export LD_PRELOAD="${LD_PRELOAD} libresolv.so libnss_dns.so" if ! mountinfo -q "${chroot}/proc" ; then mount --bind /proc "${chroot}/proc" fi diff --git a/net-misc/dhcp/files/dhcpd.tmpfiles b/net-misc/dhcp/files/dhcpd.tmpfiles deleted file mode 100644 index ee2f4deeaadf..000000000000 --- a/net-misc/dhcp/files/dhcpd.tmpfiles +++ /dev/null @@ -1,2 +0,0 @@ -d /var/lib/dhcp/ 0755 dhcp dhcp -f /var/lib/dhcp/dhcpd.leases 0644 dhcp dhcp
\ No newline at end of file diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest index e8b0b7cd46dd..833a02dd0790 100644 --- a/net-misc/dhcpcd-ui/Manifest +++ b/net-misc/dhcpcd-ui/Manifest @@ -1 +1,2 @@ DIST dhcpcd-ui-0.7.8.tar.xz 135028 BLAKE2B f3e79bb00708e2ce2ebb93d917506bb0fb015071b415768c47979d7f2b5e35d6f22bf71a58c43989dedc6561f0a8be738824f06627d2fa0995e335d7ef1925cd SHA512 5f0d2c32c32fc141feca0ab43a531d9b4f45e071a8a1e3ee1923d6394a3e5d6322e6f7e607b91154af4cfee93d649164c7ed3b805731dfc242c3ac367ec156c4 +DIST dhcpcd-ui-0.7.9.tar.xz 104100 BLAKE2B 7e2bbbb9ad657deccc16296a0c7191f35fa15dbc84f1f8ac4f8ac5de4c56e5948da457398409527774ffc62e58659cac2dd37aa66842179f710db04a9791ab9e SHA512 fe0c9ff2f777e7b97438eb50507fce765b8e18b1a71883d76e9b6570a18e6f13414f8e64d8034f9c3352496775c283a0540e331ec449d6fbe48ddc8d64e14691 diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild new file mode 100644 index 000000000000..52148a4f3933 --- /dev/null +++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.9.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils systemd toolchain-funcs xdg + +DESCRIPTION="Desktop notification and configuration for dhcpcd" +HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd-ui https://roy.marples.name/projects/dhcpcd-ui/" +SRC_URI="https://github.com/NetworkConfiguration/dhcpcd-ui/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="debug gtk libnotify ncurses qt5" + +# Qt handles notifications separately, no need for libnotify there +REQUIRED_USE=" + libnotify? ( gtk ) +" + +BDEPEND=" + media-gfx/cairosvg + virtual/libintl +" +DEPEND=" + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + ) + libnotify? ( x11-libs/libnotify ) + ncurses? ( sys-libs/ncurses:= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + media-libs/mesa + ) +" +RDEPEND=" + ${DEPEND} + >=net-misc/dhcpcd-6.4.4 +" + +src_configure() { + local myeconfargs=( + --without-qt + --without-qt5 + $(use_enable debug) + $(use_enable libnotify notification) + $(use_with gtk gtk 'gtk+-3.0') + $(use_with ncurses curses) + ) + + tc-export AR CC CXX + + econf "${myeconfargs[@]}" + + if use qt5 ; then + cd src/dhcpcd-qt || die + eqmake5 PREFIX="${EPREFIX}/usr" SYSCONFDIR="${EPREFIX}/etc" + fi +} + +src_compile() { + default + + use qt5 && emake -C src/dhcpcd-qt +} + +src_install() { + emake DESTDIR="${D}" INSTALL_ROOT="${D}" install + use qt5 && emake -C src/dhcpcd-qt DESTDIR="${D}" INSTALL_ROOT="${D}" install + systemd_dounit src/dhcpcd-online/dhcpcd-wait-online.service +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 8f429acc35b4..f2059325c3bb 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,2 +1,3 @@ -DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f -DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45 +DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 4afd08cf7377b2262d33bf3f7ac503e081572a7c1ffd53b285842a92d99d88fae44e7e6384134bbe1eb839001f822fa7fb43718c42f9e8e6d11a05ec66fa2fc6 SHA512 403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004 +DIST dhcpcd-10.0.8.tar.xz 272116 BLAKE2B 1bf27387c13f192c6216e2f1ecad06bfa82267d5d6e08ddaa123789699fe9154222c33b1aa1f603e65ae8dce510cb24d48e72701494e0793c766e81f024f8bc5 SHA512 8c9bcd49a828dbc1089f49b73decefb6d1c3ef47fecaae242b08e3bdc8c3c49540d1d3551ab879d58df0dca64dcc64d7a29c665d1b1ebbd72d6a52662529eea4 +DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee diff --git a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild index abe76a4939a1..96731da4de1c 100644 --- a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild +++ b/net-misc/dhcpcd/dhcpcd-10.0.6-r2.ebuild @@ -1,42 +1,53 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd toolchain-funcs -if [[ ${PV} == "9999" ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" else MY_P="${P/_alpha/-alpha}" MY_P="${MY_P/_beta/-beta}" MY_P="${MY_P/_rc/-rc}" - SRC_URI="https://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" + SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" + + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd https://roy.marples.name/projects/dhcpcd" -LICENSE="BSD-2" +HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" + +LICENSE="BSD-2 BSD ISC MIT" SLOT="0" -IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev" +IUSE="debug +embedded ipv6 privsep +udev" -COMMON_DEPEND="udev? ( virtual/udev )" -DEPEND="${COMMON_DEPEND}" +DEPEND="udev? ( virtual/udev )" RDEPEND=" - ${COMMON_DEPEND} + ${DEPEND} privsep? ( acct-group/dhcpcd acct-user/dhcpcd ) " +QA_CONFIG_IMPL_DECL_SKIP=( + # These don't exist on Linux/glibc (bug #900264) + memset_explicit + memset_s + setproctitle + strtoi + consttime_memequal + SHA256_Init + hmac +) + PATCHES=( - "${FILESDIR}/${P}-memleak_fix.patch" - "${FILESDIR}/${P}-unlink_socket.patch" - "${FILESDIR}/${P}-sparc_privsep.patch" #776178 + "${FILESDIR}"/${PN}-10.0.6-rebinding.patch + "${FILESDIR}"/${PN}-10.0.6-crash.patch ) src_configure() { diff --git a/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild new file mode 100644 index 000000000000..492b2eca8327 --- /dev/null +++ b/net-misc/dhcpcd/dhcpcd-10.0.6-r3.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" +else + MY_P="${P/_alpha/-alpha}" + MY_P="${MY_P/_beta/-beta}" + MY_P="${MY_P/_rc/-rc}" + SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" + S="${WORKDIR}/${MY_P}" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" +HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" + +LICENSE="BSD-2 BSD ISC MIT" +SLOT="0" +IUSE="debug +embedded ipv6 privsep +udev" + +DEPEND=" + app-crypt/libmd + udev? ( virtual/udev ) +" +RDEPEND=" + ${DEPEND} + privsep? ( + acct-group/dhcpcd + acct-user/dhcpcd + ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + # These don't exist on Linux/glibc (bug #900264) + memset_explicit + memset_s + setproctitle + strtoi + consttime_memequal + SHA256_Init + hmac + # These may exist on some glibc versions, but the checks fail due to + # -Werror / undefined reference no matter what. bug #924825 + arc4random + arc4random_uniform +) + +PATCHES=( + "${FILESDIR}"/${PN}-10.0.6-rebinding.patch + "${FILESDIR}"/${PN}-10.0.6-crash.patch + "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch +) + +src_configure() { + local myeconfargs=( + --dbdir="${EPREFIX}/var/lib/dhcpcd" + --libexecdir="${EPREFIX}/lib/dhcpcd" + --localstatedir="${EPREFIX}/var" + --prefix="${EPREFIX}" + --with-hook=ntp.conf + $(use_enable debug) + $(use_enable embedded) + $(use_enable ipv6) + $(use_enable privsep) + $(usex elibc_glibc '--with-hook=yp.conf' '') + --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") + $(usex privsep '--privsepuser=dhcpcd' '') + $(usex udev '' '--without-dev --without-udev') + CC="$(tc-getCC)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + keepdir /var/lib/dhcpcd + newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd + systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service +} + +pkg_postinst() { + local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() + + local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid + local old_duid="${EROOT}"/etc/dhcpcd.duid + local new_duid="${dbdir}"/duid + if [[ -e "${old_old_duid}" ]] ; then + # Upgrade the duid file to the new format if needed + if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then + sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" + fi + + # Move the duid to /etc, a more sensible location + if [[ ! -e "${old_duid}" ]] ; then + cp -p "${old_old_duid}" "${new_duid}" + fi + old_files+=( "${old_old_duid}" ) + fi + + # dhcpcd-7 moves the files out of /etc + if [[ -e "${old_duid}" ]] ; then + if [[ ! -e "${new_duid}" ]] ; then + cp -p "${old_duid}" "${new_duid}" + fi + old_files+=( "${old_duid}" ) + fi + local old_secret="${EROOT}"/etc/dhcpcd.secret + local new_secret="${dbdir}"/secret + if [[ -e "${old_secret}" ]] ; then + if [[ ! -e "${new_secret}" ]] ; then + cp -p "${old_secret}" "${new_secret}" + fi + old_files+=( "${old_secret}" ) + fi + + # dhcpcd-7 renames some files in /var/lib/dhcpcd + local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic + local new_rdm="${dbdir}"/rdm_monotonic + if [[ -e "${old_rdm}" ]] ; then + if [[ ! -e "${new_rdm}" ]] ; then + cp -p "${old_rdm}" "${new_rdm}" + fi + old_files+=( "${old_rdm}" ) + fi + local lease= + for lease in "${dbdir}"/dhcpcd-*.lease*; do + [[ -f "${lease}" ]] || continue + old_files+=( "${lease}" ) + local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") + [[ -e "${dbdir}/${new_lease}" ]] && continue + cp "${lease}" "${dbdir}/${new_lease}" + done + + # Warn about removing stale files + if [[ -n "${old_files[@]}" ]] ; then + elog + elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" + elog "${EROOT}/etc to ${dbdir}" + elog "and copied leases in ${dbdir} to new files with the dhcpcd-" + elog "prefix dropped." + elog + elog "You should remove these files if you don't plan on reverting" + elog "to an older version:" + local old_file= + for old_file in ${old_files[@]}; do + elog " ${old_file}" + done + fi + + if [ -z "${REPLACING_VERSIONS}" ]; then + elog + elog "dhcpcd has zeroconf support active by default." + elog "This means it will always obtain an IP address even if no" + elog "DHCP server can be contacted, which will break any existing" + elog "failover support you may have configured in your net configuration." + elog "This behaviour can be controlled with the noipv4ll configuration" + elog "file option or the -L command line switch." + elog "See the dhcpcd and dhcpcd.conf man pages for more details." + + elog + elog "Dhcpcd has duid enabled by default, and this may cause issues" + elog "with some dhcp servers. For more information, see" + elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" + fi + + if ! has_version net-dns/bind-tools; then + elog + elog "If you activate the lookup-hostname hook to look up your hostname" + elog "using the dns, you need to install net-dns/bind-tools." + fi +} diff --git a/net-misc/dhcpcd/dhcpcd-10.0.8.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.8.ebuild new file mode 100644 index 000000000000..56307d8d8f09 --- /dev/null +++ b/net-misc/dhcpcd/dhcpcd-10.0.8.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" +else + MY_P="${P/_alpha/-alpha}" + MY_P="${MY_P/_beta/-beta}" + MY_P="${MY_P/_rc/-rc}" + SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" + S="${WORKDIR}/${MY_P}" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" +HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" + +LICENSE="BSD-2 BSD ISC MIT" +SLOT="0" +IUSE="debug +embedded ipv6 privsep +udev" + +DEPEND=" + app-crypt/libmd + udev? ( virtual/udev ) +" +RDEPEND=" + ${DEPEND} + privsep? ( + acct-group/dhcpcd + acct-user/dhcpcd + ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + # These don't exist on Linux/glibc (bug #900264) + memset_explicit + memset_s + setproctitle + strtoi + consttime_memequal + SHA256_Init + hmac + # These may exist on some glibc versions, but the checks fail due to + # -Werror / undefined reference no matter what. bug #924825 + arc4random + arc4random_uniform +) + +PATCHES=( + "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch +) + +src_configure() { + local myeconfargs=( + --dbdir="${EPREFIX}/var/lib/dhcpcd" + --libexecdir="${EPREFIX}/lib/dhcpcd" + --localstatedir="${EPREFIX}/var" + --prefix="${EPREFIX}" + --with-hook=ntp.conf + $(use_enable debug) + $(use_enable embedded) + $(use_enable ipv6) + $(use_enable privsep) + $(usex elibc_glibc '--with-hook=yp.conf' '') + --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd") + $(usex privsep '--privsepuser=dhcpcd' '') + $(usex udev '' '--without-dev --without-udev') + CC="$(tc-getCC)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + keepdir /var/lib/dhcpcd + newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd + systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service +} + +pkg_postinst() { + local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() + + local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid + local old_duid="${EROOT}"/etc/dhcpcd.duid + local new_duid="${dbdir}"/duid + if [[ -e "${old_old_duid}" ]] ; then + # Upgrade the duid file to the new format if needed + if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then + sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}" + fi + + # Move the duid to /etc, a more sensible location + if [[ ! -e "${old_duid}" ]] ; then + cp -p "${old_old_duid}" "${new_duid}" + fi + old_files+=( "${old_old_duid}" ) + fi + + # dhcpcd-7 moves the files out of /etc + if [[ -e "${old_duid}" ]] ; then + if [[ ! -e "${new_duid}" ]] ; then + cp -p "${old_duid}" "${new_duid}" + fi + old_files+=( "${old_duid}" ) + fi + local old_secret="${EROOT}"/etc/dhcpcd.secret + local new_secret="${dbdir}"/secret + if [[ -e "${old_secret}" ]] ; then + if [[ ! -e "${new_secret}" ]] ; then + cp -p "${old_secret}" "${new_secret}" + fi + old_files+=( "${old_secret}" ) + fi + + # dhcpcd-7 renames some files in /var/lib/dhcpcd + local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic + local new_rdm="${dbdir}"/rdm_monotonic + if [[ -e "${old_rdm}" ]] ; then + if [[ ! -e "${new_rdm}" ]] ; then + cp -p "${old_rdm}" "${new_rdm}" + fi + old_files+=( "${old_rdm}" ) + fi + local lease= + for lease in "${dbdir}"/dhcpcd-*.lease*; do + [[ -f "${lease}" ]] || continue + old_files+=( "${lease}" ) + local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//") + [[ -e "${dbdir}/${new_lease}" ]] && continue + cp "${lease}" "${dbdir}/${new_lease}" + done + + # Warn about removing stale files + if [[ -n "${old_files[@]}" ]] ; then + elog + elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" + elog "${EROOT}/etc to ${dbdir}" + elog "and copied leases in ${dbdir} to new files with the dhcpcd-" + elog "prefix dropped." + elog + elog "You should remove these files if you don't plan on reverting" + elog "to an older version:" + local old_file= + for old_file in ${old_files[@]}; do + elog " ${old_file}" + done + fi + + if [ -z "${REPLACING_VERSIONS}" ]; then + elog + elog "dhcpcd has zeroconf support active by default." + elog "This means it will always obtain an IP address even if no" + elog "DHCP server can be contacted, which will break any existing" + elog "failover support you may have configured in your net configuration." + elog "This behaviour can be controlled with the noipv4ll configuration" + elog "file option or the -L command line switch." + elog "See the dhcpcd and dhcpcd.conf man pages for more details." + + elog + elog "Dhcpcd has duid enabled by default, and this may cause issues" + elog "with some dhcp servers. For more information, see" + elog "https://bugs.gentoo.org/show_bug.cgi?id=477356" + fi + + if ! has_version net-dns/bind-tools; then + elog + elog "If you activate the lookup-hostname hook to look up your hostname" + elog "using the dns, you need to install net-dns/bind-tools." + fi +} diff --git a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.5.1.ebuild index 5726f78a3a5f..f32fbc9d2b4e 100644 --- a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9.5.1.ebuild @@ -1,32 +1,32 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd toolchain-funcs -if [[ ${PV} == "9999" ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" else MY_P="${P/_alpha/-alpha}" MY_P="${MY_P/_beta/-beta}" MY_P="${MY_P/_rc/-rc}" - SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" - S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${P}.tar.xz" + + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd https://roy.marples.name/projects/dhcpcd" +HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" + LICENSE="BSD-2" SLOT="0" -IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev" +IUSE="debug +embedded ipv6 privsep +udev" -COMMON_DEPEND="udev? ( virtual/udev )" -DEPEND="${COMMON_DEPEND}" +DEPEND="udev? ( virtual/udev )" RDEPEND=" - ${COMMON_DEPEND} + ${DEPEND} privsep? ( acct-group/dhcpcd acct-user/dhcpcd diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild index 5726f78a3a5f..56307d8d8f09 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild @@ -1,38 +1,61 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd toolchain-funcs -if [[ ${PV} == "9999" ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git" else MY_P="${P/_alpha/-alpha}" MY_P="${MY_P/_beta/-beta}" MY_P="${MY_P/_rc/-rc}" - SRC_URI="https://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" + SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client" -HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd https://roy.marples.name/projects/dhcpcd" -LICENSE="BSD-2" +HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/" + +LICENSE="BSD-2 BSD ISC MIT" SLOT="0" -IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev" +IUSE="debug +embedded ipv6 privsep +udev" -COMMON_DEPEND="udev? ( virtual/udev )" -DEPEND="${COMMON_DEPEND}" +DEPEND=" + app-crypt/libmd + udev? ( virtual/udev ) +" RDEPEND=" - ${COMMON_DEPEND} + ${DEPEND} privsep? ( acct-group/dhcpcd acct-user/dhcpcd ) " +QA_CONFIG_IMPL_DECL_SKIP=( + # These don't exist on Linux/glibc (bug #900264) + memset_explicit + memset_s + setproctitle + strtoi + consttime_memequal + SHA256_Init + hmac + # These may exist on some glibc versions, but the checks fail due to + # -Werror / undefined reference no matter what. bug #924825 + arc4random + arc4random_uniform +) + +PATCHES=( + "${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch +) + src_configure() { local myeconfargs=( --dbdir="${EPREFIX}/var/lib/dhcpcd" diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch new file mode 100644 index 000000000000..5b61e3ca37ef --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-10.0.6-crash.patch @@ -0,0 +1,46 @@ +https://github.com/NetworkConfiguration/dhcpcd/issues/179 +https://github.com/NetworkConfiguration/dhcpcd/issues/283 +https://bugzilla.redhat.com/2262996 +https://github.com/NetworkConfiguration/dhcpcd/commit/727c78f503d456875e2a3cee7609288b537d9d25 + +From 727c78f503d456875e2a3cee7609288b537d9d25 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com> +Date: Fri, 16 Feb 2024 17:15:35 +0100 +Subject: [PATCH] Move dhcp(v4) packet size check earlier (#295) + +dhcp_handlebootp handled zero sized packets correctly, but +dhcp_redirect_dhcp did not have such protection. Move size check before +both of them. Size when called from dhcp_packet is checked by +is_packet_udp_bootp call. Only dhcp_recvmsg needs earlier checking to be +added. + +Fixes #283 +--- a/src/dhcp.c ++++ b/src/dhcp.c +@@ -3532,12 +3532,6 @@ dhcp_handlebootp(struct interface *ifp, struct bootp *bootp, size_t len, + { + size_t v; + +- if (len < offsetof(struct bootp, vend)) { +- logerrx("%s: truncated packet (%zu) from %s", +- ifp->name, len, inet_ntoa(*from)); +- return; +- } +- + /* Unlikely, but appeases sanitizers. */ + if (len > FRAMELEN_MAX) { + logerrx("%s: packet exceeded frame length (%zu) from %s", +@@ -3670,6 +3664,13 @@ dhcp_recvmsg(struct dhcpcd_ctx *ctx, struct msghdr *msg) + logerr(__func__); + return; + } ++ ++ if (iov->iov_len < offsetof(struct bootp, vend)) { ++ logerrx("%s: truncated packet (%zu) from %s", ++ ifp->name, iov->iov_len, inet_ntoa(from->sin_addr)); ++ return; ++ } ++ + state = D_CSTATE(ifp); + if (state == NULL) { + /* Try re-directing it to another interface. */ diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch new file mode 100644 index 000000000000..0d609822aad1 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-10.0.6-fix-lib-check.patch @@ -0,0 +1,16 @@ +--- a/configure ++++ b/configure +@@ -361,11 +361,8 @@ if [ -e "$LDELF" ]; then + echo "LDFLAGS+= -Wl,-rpath=${LIBDIR}" >>$CONFIG_MK + fi + +-if [ -z "$PREFIX" ] || [ "$PREFIX" = / ]; then +- ALLOW_USR_LIBS=false +-else +- ALLOW_USR_LIBS=true +-fi ++ALLOW_USR_LIBS=true ++ + case "$OS" in + linux*|solaris*|sunos*|kfreebsd*|dragonfly*|freebsd*) ;; + *) diff --git a/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch b/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch new file mode 100644 index 000000000000..6457368f1150 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-10.0.6-rebinding.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/920652#c2 +https://github.com/NetworkConfiguration/dhcpcd/commit/8ab7ca1eb4e9bb797d6e6d955c83d8a82f69a663 + +From 8ab7ca1eb4e9bb797d6e6d955c83d8a82f69a663 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Sun, 24 Dec 2023 12:07:25 +0000 +Subject: [PATCH] DHCP: DECLINE address on ARP defend failure + +Also, drop the lease. +This should get us a new address from the DHCP server when we +re-enter DISCOVER to avoid looping on the same address and fail +again. +--- + src/dhcp.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/dhcp.c b/src/dhcp.c +index 014ce6cf..a58e1db2 100644 +--- a/src/dhcp.c ++++ b/src/dhcp.c +@@ -1944,7 +1944,11 @@ dhcp_expire(void *arg) + static void + dhcp_decline(struct interface *ifp) + { ++ struct dhcp_state *state = D_STATE(ifp); + ++ // Set the expired state so we send over BPF as this could be ++ // an address defence failure. ++ state->added |= STATE_EXPIRED; + send_message(ifp, DHCP_DECLINE, NULL); + } + #endif +@@ -2098,8 +2102,12 @@ static void + dhcp_arp_defend_failed(struct arp_state *astate) + { + struct interface *ifp = astate->iface; ++ struct dhcp_state *state = D_STATE(ifp); + ++ if (!(ifp->options->options & (DHCPCD_INFORM | DHCPCD_STATIC))) ++ dhcp_decline(ifp); + dhcp_drop(ifp, "EXPIRED"); ++ dhcp_unlink(ifp->ctx, state->leasefile); + dhcp_start1(ifp); + } + #endif + diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch deleted file mode 100644 index 61aed69656d3..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ba9f3823ae825c341ea30f45b46d942b4ce5b8d9 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Sun, 24 Jan 2021 22:53:20 +0000 -Subject: [PATCH] Linux: fix a memory leak when dhcpcd exits or the log is - reopened - ---- - src/logerr.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/logerr.c b/src/logerr.c -index 21e933b8..35268870 100644 ---- a/src/logerr.c -+++ b/src/logerr.c -@@ -484,13 +484,14 @@ logclose(void) - #endif - - closelog(); -+#if defined(__linux__) -+ free(_logprog); -+ _logprog = NULL; -+#endif - #ifndef SMALL - if (ctx->log_file == NULL) - return; - fclose(ctx->log_file); - ctx->log_file = NULL; - #endif --#if defined(__linux__) -- free(_logprog); --#endif - } --- -2.30.0 - - diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch deleted file mode 100644 index a91db28d08c7..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch +++ /dev/null @@ -1,40 +0,0 @@ -From dcfd7a23f002793a855156255e81662ef84064d3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Fri, 5 Feb 2021 09:25:12 +0100 -Subject: [PATCH] src/privsep-linux: fix build on sparc (#26) - -Fix the following build failure: - -privsep-linux.c:203: warning: "AUDIT_ARCH_SPARC64" redefined - 203 | # define AUDIT_ARCH_SPARC64 - | -In file included from privsep-linux.c:35: -/srv/storage/autobuild/run/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/linux/audit.h:392: note: this is the location of the previous definition - 392 | #define AUDIT_ARCH_SPARC64 (EM_SPARCV9|__AUDIT_ARCH_64BIT) - | -In file included from privsep-linux.c:36: -privsep-linux.c:215:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? - 215 | BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), - | ^~~~~~~~~~~~~~~~~~ - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - src/privsep-linux.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index d00894ab..5c80c1b3 100644 ---- a/src/privsep-linux.c -+++ b/src/privsep-linux.c -@@ -222,9 +222,9 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) - # endif - #elif defined(__sparc__) - # if defined(__arch64__) --# define AUDIT_ARCH_SPARC64 -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC64 - # else --# define AUDIT_ARCH_SPARC -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC - # endif - #elif defined(__xtensa__) - # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch deleted file mode 100644 index 493e9c342f51..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d55f8e440389fbf333e14fe9f1a7d7f4da2b5197 Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Tue, 26 Jan 2021 17:37:29 +0000 -Subject: [PATCH] control: unlink privileged socket when shutting down - without privsep - -Otherwise we have a connection refused when dhcpcd starts again -as it sees the stale socket file. ---- - src/control.c | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/src/control.c b/src/control.c -index 71405ed1..a601ad0a 100644 ---- a/src/control.c -+++ b/src/control.c -@@ -50,7 +50,7 @@ - - #ifndef SUN_LEN - #define SUN_LEN(su) \ -- (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) -+ (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) - #endif - - static void -@@ -350,12 +350,12 @@ control_start1(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family, - } - #endif - -- if ((fmode & S_PRIV) == S_PRIV) -- strlcpy(ctx->control_sock, sa.sun_path, -- sizeof(ctx->control_sock)); -- else -+ if ((fmode & S_UNPRIV) == S_UNPRIV) - strlcpy(ctx->control_sock_unpriv, sa.sun_path, - sizeof(ctx->control_sock_unpriv)); -+ else -+ strlcpy(ctx->control_sock, sa.sun_path, -+ sizeof(ctx->control_sock)); - return fd; - } - -@@ -368,7 +368,8 @@ control_start(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family) - if (IN_PRIVSEP_SE(ctx)) { - make_path(ctx->control_sock, sizeof(ctx->control_sock), - ifname, family, false); -- make_path(ctx->control_sock_unpriv, sizeof(ctx->control_sock), -+ make_path(ctx->control_sock_unpriv, -+ sizeof(ctx->control_sock_unpriv), - ifname, family, true); - return 0; - } --- -2.30.0 - diff --git a/net-misc/dhcping/dhcping-1.2.ebuild b/net-misc/dhcping/dhcping-1.2-r1.ebuild index b288cce6699a..57e443ea7948 100644 --- a/net-misc/dhcping/dhcping-1.2.ebuild +++ b/net-misc/dhcping/dhcping-1.2-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit autotools DESCRIPTION="Utility to send DHCP requests to DHCP servers to see if responding" HOMEPAGE="http://www.mavetju.org/unix/general.php" @@ -10,3 +12,10 @@ SRC_URI="http://www.mavetju.org/download/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" + +src_prepare() { + default + + # Clang 16 + eautoreconf +} diff --git a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild index be80b56206bd..0568063a62b9 100644 --- a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild +++ b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit readme.gentoo-r1 systemd +inherit flag-o-matic readme.gentoo-r1 systemd DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)" HOMEPAGE="http://klub.com.pl/dhcpv6/" @@ -25,6 +25,12 @@ DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.co to suit your needs. They are stored in /etc/dibbler" src_configure() { + # ODR violations, bug #861611 + filter-lto + + # Uses removed 'register' keyword + append-cxxflags -std=c++14 + econf $(use_enable resolvconf) } diff --git a/net-misc/dibbler/dibbler-1.0.1-r4.ebuild b/net-misc/dibbler/dibbler-1.0.1-r4.ebuild new file mode 100644 index 000000000000..fb3201a46045 --- /dev/null +++ b/net-misc/dibbler/dibbler-1.0.1-r4.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic readme.gentoo-r1 systemd + +DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)" +HOMEPAGE="http://klub.com.pl/dhcpv6/" +SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~x86" +IUSE="doc resolvconf" + +RDEPEND="resolvconf? ( virtual/resolvconf )" +DEPEND="${RDEPEND} + doc? ( dev-texlive/texlive-latexextra )" + +PATCHES=( + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-gnu-ism.patch + "${FILESDIR}"/${P}-clang-16-musl-fix.patch +) + +DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf +to suit your needs. They are stored in /etc/dibbler" + +src_configure() { + # ODR violations, bug #861611 + filter-lto + + # Uses removed 'register' keyword + append-cxxflags -std=c++14 + + econf \ + --cache-file="${S}"/config.cache \ + $(use_enable resolvconf) +} + +src_compile() { + default + # devel documentation is broken and users should consult the online version + # http://klub.com.pl/dhcpv6/doxygen/ + use doc && emake -C doc/ user +} + +src_install() { + default + readme.gentoo_create_doc + + dosbin dibbler-{client,relay,server} + doman doc/man/*.8 + + insinto /etc/dibbler + doins doc/examples/*.conf + keepdir /var/lib/dibbler + + dodoc AUTHORS CHANGELOG RELNOTES TODO + use doc && dodoc doc/dibbler-user.pdf + + doinitd "${FILESDIR}"/dibbler-{client,relay,server} + systemd_dounit "${FILESDIR}"/dibbler-client.service +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-misc/dibbler/files/dibbler-1.0.1-clang-16-musl-fix.patch b/net-misc/dibbler/files/dibbler-1.0.1-clang-16-musl-fix.patch new file mode 100644 index 000000000000..99fdc342b229 --- /dev/null +++ b/net-misc/dibbler/files/dibbler-1.0.1-clang-16-musl-fix.patch @@ -0,0 +1,74 @@ +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Wed, 31 May 2023 06:27:08 +0000 +Subject: [PATCH] Fix build with clang 16 + +Especially on musl libc. + +On musl libc with clang-16, the function pthread_kill can't be found, as its +only available if the FTM is enabled. Hence defining _GNU_SOURCE makes thie +function available. + +Other than that this patch also renames the variable lock, to fix the following +error: ./Port-linux/dibbler-client.cpp:48:27: error: reference to 'lock' is +ambiguous. I'm exactly not sure what the errors are, but I'm guessing it's +related to CPP namespaces. Not sure either why its not reproducable under glibc +llvm. + +Bug: https://bugs.gentoo.org/897944 +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/Port-linux/dibbler-client.cpp ++++ b/Port-linux/dibbler-client.cpp +@@ -26,7 +26,7 @@ using namespace std; + + #define IF_RECONNECTED_DETECTED -1 + +-extern pthread_mutex_t lock; ++extern pthread_mutex_t plock; + + TDHCPClient* ptr = 0; + +@@ -44,8 +44,8 @@ void signal_handler(int n) { + #ifdef MOD_CLNT_CONFIRM + void signal_handler_of_linkstate_change(int n) { + Log(Notice) << "Network switch off event detected. initiating CONFIRM." << LogEnd; +- pthread_mutex_lock(&lock); +- pthread_mutex_unlock(&lock); ++ pthread_mutex_lock(&plock); ++ pthread_mutex_unlock(&plock); + } + #endif + +--- a/Port-linux/lowlevel-linux-link-state.c ++++ b/Port-linux/lowlevel-linux-link-state.c +@@ -10,6 +10,7 @@ + #ifdef MOD_CLNT_CONFIRM + + #define __USE_UNIX98 ++#define _GNU_SOURCE + + #include <stdio.h> + #include <signal.h> +@@ -34,7 +35,7 @@ volatile int * notifier = 0; + int isDone = 0; + pthread_t parent_id; + pthread_t ntid; +-pthread_mutex_t lock; ++pthread_mutex_t plock; + + struct state { + int id; +@@ -86,9 +87,9 @@ void link_state_changed(int ifindex) + { + if (changed_links->cnt<16) + changed_links->ifindex[changed_links->cnt++] = ifindex; +- pthread_mutex_lock(&lock); ++ pthread_mutex_lock(&plock); + *notifier = 1; /* notify that change has occured */ +- pthread_mutex_unlock(&lock); ++ pthread_mutex_unlock(&plock); + pthread_kill(parent_id,SIGUSR1); + } else + { +-- +2.40.1 + diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest deleted file mode 100644 index 3c6388e36b4b..000000000000 --- a/net-misc/dleyna-server/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dleyna-server-0.7.0-r1-patchset.tar.xz 1680 BLAKE2B fd6494dc04bb0fc20e677c69b360df30c89b35b6a990a2ce78e87101291307c485a5cb133152eabbd117691eff4d738fa2e33303128c4305a0c1e5137c67781d SHA512 7f37ba456f84bd9e45b732d40467e08ba5ce775c0f1d30011157e10a6f3010b904fc52a4d699a211dd66b66c54ff6e98b109aa5ba9c04112f81de1529d55c425 -DIST dleyna-server-0.7.0.tar.gz 105020 BLAKE2B 01e4459631fef66e88aabcadfd85a4b01a5b95d33b5c1734decd1b0667876d7e5834bf23f754361772faebd7daf63d5f37cff9cb9bd11ff47c62aeb7afdb4969 SHA512 16bcab369a4d4624f75ed5d40bb5a06cafa1907b3ceceeb0de95f9f00750c257b69202f29f9c2d1ebcd61c541ee930d7a2747dab979e15a74e9a6e109eae6800 diff --git a/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild deleted file mode 100644 index e154df66320a..000000000000 --- a/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="Service that allows to discover and manipulate DLNA Digital Media servers (DMS)" -HOMEPAGE="https://github.com/phako/dleyna-server" -SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PF}-patchset.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" - -RDEPEND=" - >=dev-libs/glib-2.36:2 - >=net-libs/gssdp-1.2:0= - >=net-libs/gupnp-1.2:0= - >=net-libs/gupnp-av-0.11.5:= - >=media-libs/gupnp-dlna-0.9.4:2.0= - >=net-libs/libsoup-2.28.2:2.4 - >=net-libs/dleyna-core-0.6.0:1.0= -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${WORKDIR}"/patches -) diff --git a/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild deleted file mode 100644 index 40dfe39201cd..000000000000 --- a/net-misc/dleyna-server/dleyna-server-0.7.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="Service that allows to discover and manipulate DLNA Digital Media servers (DMS)" -HOMEPAGE="https://github.com/phako/dleyna-server" -SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - >=dev-libs/glib-2.36:2 - >=net-libs/gssdp-1.2:0= - >=net-libs/gupnp-1.2:0= - >=net-libs/gupnp-av-0.11.5 - >=media-libs/gupnp-dlna-0.9.4:2.0 - >=net-libs/libsoup-2.28.2:2.4 - >=net-libs/dleyna-core-0.6.0:1.0= -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" diff --git a/net-misc/dleyna-server/metadata.xml b/net-misc/dleyna-server/metadata.xml deleted file mode 100644 index f453528b934f..000000000000 --- a/net-misc/dleyna-server/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> -</pkgmetadata> diff --git a/net-misc/downloader-cli/Manifest b/net-misc/downloader-cli/Manifest new file mode 100644 index 000000000000..c8987c2f78c8 --- /dev/null +++ b/net-misc/downloader-cli/Manifest @@ -0,0 +1 @@ +DIST downloader_cli-0.3.4.tar.gz 14479 BLAKE2B d45ec6399b6ccd76141a85440faeac040b11565c1d7db6316c23026008238e11601346ff433ec2f18516fef2f34f2e87d94460b64bfe875569c6da236e4ba63e SHA512 ace252bc6129b463c644ef7c34d07cd37759030fc4b4b853e049a2377226cdc73a6661f4e8ca7721b7af11f9daf548c81f25f73fde405e633091d614a05ed4f6 diff --git a/net-misc/downloader-cli/downloader-cli-0.3.4.ebuild b/net-misc/downloader-cli/downloader-cli-0.3.4.ebuild new file mode 100644 index 000000000000..75b02a2b00c8 --- /dev/null +++ b/net-misc/downloader-cli/downloader-cli-0.3.4.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Simple downloader with an customizable progressbar" +HOMEPAGE="https://github.com/deepjyoti30/downloader-cli/ + https://pypi.org/project/downloader-cli/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + dev-python/urllib3[${PYTHON_USEDEP}] +" + +EPYTEST_DESELECT=( + tests/test_download.py::test__preprocess_conn + tests/test_download.py::test_file_integrity +) + +distutils_enable_tests pytest diff --git a/net-misc/downloader-cli/metadata.xml b/net-misc/downloader-cli/metadata.xml new file mode 100644 index 000000000000..4b324089ce25 --- /dev/null +++ b/net-misc/downloader-cli/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/deepjyoti30/downloader-cli/issues/</bugs-to> + <remote-id type="github">deepjyoti30/downloader-cli</remote-id> + <remote-id type="pypi">downloader-cli</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/drive/Manifest b/net-misc/drive/Manifest deleted file mode 100644 index 08f772e0a580..000000000000 --- a/net-misc/drive/Manifest +++ /dev/null @@ -1,516 +0,0 @@ -DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f -DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea -DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c -DIST cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod 1129 BLAKE2B 975226b22ad0291e83a5e47d901c79ac5a7c684010972581dc15f9713154141f3d6dd7231407255240620e29cbfeb877f05f5b5d388100a70d381f8f54f7db5f SHA512 70400a50eedc5305fef765d38f0428f636f439195d09cbb283ee7779b8aba1f881f83d894acbc6ee90ff016358aa9b117c79557da15d10fc60264eb36ed3fe3c -DIST cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod 1226 BLAKE2B d0544ce288b6beec6b76bfd106924e8a9ad50913946ae7e8243dc3e61356363a361384ee6c827bb4040976d783b217ad1619be3a34cba533940ed4ecfce4be41 SHA512 104e7cd0eb1c4a3bccfca3feb31f1530973d4829d853ee30e8e03c2ef80ccef784bc0560342d31d8dcdc6d410fe8f64a302140e452fb77d96ea2b342bfb8b319 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod 1149 BLAKE2B bc4e8c16d0c809b4f5d46d8b29112192ff51066e7df99242923eed643339599ca3d1180afe571c3e826d656d935ccc9ff1ba1b79701de859cc15364415bb35ae SHA512 de15381b36dd6691bf40592be83b4ae5b58fc92111a3ccb8cb4b540e1230dc0798d86c149884e8dfb6f93ec827447acdd7ccca2f2942c81aeafd1b035f5c482a -DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod 982 BLAKE2B 9e5e32bacbfe15d8c72b4ee66a6e4124a3d58b989ecf022cdcda38e99b83924382f412067de8f6bdf3b1ecf8deffdf8fc74a8be671221f39fc2c8b11b2919e88 SHA512 86e2e042bcb371780189029b21afe24ba8ee166a9c0a4eacc314444844cfca3dfdace1678b01a213b7452cd69acd1d46b7051614569b99ac6fed84887b0e3097 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod 1048 BLAKE2B 8e1306450c5e8dbba561b9b24ed532f78fdd40a27c989b2bb6a981f4583959f4ab71e913685444c291648254455662909243a547bd623aecc426a1a6971d0376 SHA512 deb18eadb388fdf52fc6345b05c30a459777f3cfc67ed44d072a16e214c4ad1ef88d4775d38a3abf03df26d42fad13405f6fba081c5c19c129ec39df1973d8fd -DIST cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod 1096 BLAKE2B 6e3982479d332fbcf74ee167d41289e6f4cb4c2982e85e0631bb4b2bad291d3b76d86a8c4e18b7aec9e6494b54e67a0ff2b2b65ff3f113f530501ba964f93e60 SHA512 cbd08504799b151d34a9f3594f0713077ed5b421ef9c0fe9dd90b773638617e6f6aa153e6241dbbffa891fdaad4b14e0523834cb45e84d28f7e213b007e7e08c -DIST cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod 810 BLAKE2B 50cf503d994003d7974ad786a741c1429b44d6764bd9d9ba58139fc5fb88c0264a7e908699ee35667f4e827cbc59733f7fbb8b38837b495d4c23c2d10b1da114 SHA512 b6dd5fa24e928bad836e791a19a0d707c755d6c2b75c8f60f42a9e0410e91034373b01baa61104c24bf1565adade99656948c75be08cec2f945bb8bde91046d3 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod 831 BLAKE2B 9d34710c0f721d3f471c3da32555b4a3e559474afb8d30237b0935ce167e7bcb5507d2b19bd6675da724927109ed74ba79dc9dc3b3d8cb271515ef2c6bb0c7c1 SHA512 d1a718c4ba19ee0d4221858dd0710cc480fdf6c0b134f1ce5c4a805b15cac88a77e73f26e79f480b0852a6c0f499c63876dacdb3038ea40d38e9f8ae577ce219 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod 762 BLAKE2B e6349d349c8249101b89b3fd324ef16b7fcf65dc5a87f751a8738b00619942abd06511247ee0e425b3f9b380a669475061f64cdb27c7c8f8f9007bd6067da13d SHA512 57501aa2452b72ec72fe2fc0cb2e2dc7e53f28895b0a9e829f4bcbf6e87464b9f1d05283f72c066fe7e5665b300112db1b92533affb36db3894ab5dbc04a0cbf -DIST cloud.google.com%2Fgo%2F@v%2Fv0.72.0.zip 1737967 BLAKE2B 4580c9de4f1019942fe55228724d595af0a625e0c8ca6564017b90cc4b24b40c1d330fa6016681790bc99a37ae80212e75e9351d889f17b1f71359b570eb0408 SHA512 f4871321667a46d236720c1009603801adc3c8f9d7545c7b5465e8f41c0762895aec49a3aadd9e3ca3ba6d255cf46feebe39377ccc9d478bf4e145bbbd30b27f -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1 -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039 -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod 489 BLAKE2B 036e068699429032701dd26044fd2353645e54260a7aab7f924fbfa1e1954eb814addbd9a0751ed1c786ed6c44566db5289cd4ba9e54727d5b24b6edd38a8562 SHA512 5f6a8f8f2d4ab26bdf3f150f22e6ef4feb26f264630315fdde8c171b6c2da5314057c4d763d4c61a66bc42badeba2745f576d52009c4549919e4afafa748b3be -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod 649 BLAKE2B d4ef60eed1eb5c4b84623a6bfb8bcdd52be49ea6723e2c39f8c7c87e34943aed3629d7413fbffbbac9e888bfbafd6f0f07ee84002901afb3a8cf1090b87b53a3 SHA512 3adbceec8b4bd989e804054b56e271f73658adc8a4a8bd53e32ced709a8796b33d9cf09f5ea3165dff931acc942de45508ae79634dcd9722c2220814b275f425 -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod 639 BLAKE2B dfcb82794bc8e88465ca9c754b798d6f1f270e1fe5891221d482f6b5854524d09e3d19b6f75e494f69b4861e2f1b2329c08fe9e4235005f2dff41928950dccc3 SHA512 74886885016c92ce56b584665bdcc925404bab745a25ace03dacc2ace3f812a0d568ab8d19044097906b9da479037c41468c33f1243e6d55b36fba4571117607 -DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382 -DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52 -DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c -DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c -DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a -DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod 625 BLAKE2B 43378388e5a3391a431d0e842e23ef1fc74263a797bfefacebb61ad88b42f21d133d99638f06e03cadb7894d271884f06d1f3ad9743648c31b7d22bf7e19283d SHA512 0e2dc636df1de8119b3b4153466d8f31b4e2e9fa637c625ea0a7fd94951ee38edc02064cc00d7fe9a4d9f7e3d1ed521809003602398d68508772b11939755cdf -DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b -DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod 622 BLAKE2B eda541042b6fe3c3f77512f322d535505b5545eb72dec0f4f3440af05e037bda987f1f97faf7a94ec946201e8ca26a2220bc570d7a9c40a08cfadd724fc2973e SHA512 2825d124965f45e40b36bc1d2f8133f8a1fb5ff94dd95d2ae4383bc4a300ddfe0efb75ace2f9408582525c377769bd1f75cd3c0c655c74aa75708f7a66c56352 -DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba -DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0 -DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38 -DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1 -DIST drive-0.3.9.1.tar.gz 333217 BLAKE2B 8cc3ef6f22f674ade50c7953812f881a1c5c460c61b39e7f891ed5cd13409051c24c1a864c546643b4b58c632cf5991f72a837f2ff1e6a422d32a300dd58e0be SHA512 5d8f6aaf08ad600915bac4c30626998069d1c6fa676948eb1e03235562dfdf447c0f9f05dbf2c5ffbf6e3e05003b3cee180b9fd28ceb7e83746a52d6640dcfa1 -DIST drive-0.4.0_p20210208.tar.gz 353706 BLAKE2B 67af7651e7024109e3b4a64104d89c8ff349ad5cb28e51ccc30cce9c4c4591527c153779cef726522999c9308d461c9fa4340137aa8811ca04501dc80f129434 SHA512 ed34f88ff6fe2c77efe06c53102282bbdcb33fe3a95f275d1755e33172f3cc262a180aa57d50ee5b1a465fa8bcb3e37d34e00aa92a422c8c3e7226c1d3d27774 -DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146 -DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d -DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f -DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip 99852 BLAKE2B 9151e6475685ff3b550d1ae1291778a01793f691a3ddb007d64fa49f02ee85927c834ad709dee5fcba0f071630cd62504a65fd4344d4ea5b9fb713787bf6b725 SHA512 837cbbdb0a91efd765e697e01bc64f0206897d6363b303c96ba53062d674623b19d8c86d96a867529f1dfd6689240e18ae7c25dee268542d46e2877dcbf83848 -DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4 -DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod 212 BLAKE2B 96a3430ed3030a25f9264f4eadce7424c385a031932829b4975143af2ec4ea64af9119f6cdfe5242b1ac83c5d6f3b577516c36e9ba534e768ba1fe48b907b3dd SHA512 cd34cadb035275e861d1ce0c1abe3c49ed4a1300b3467767f4106cebf001ac36c33a48036ba6135748d887e7bda4a81afeaa70e18e2ac695c53ccc7e0c41d41b -DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.zip 22029 BLAKE2B f0f24688215047332024efee25710b0fa53492add944cd2b538216e908e1e35f2c1eb7270276afb5fdbe294c5d0b7a6af3f07fa75b2d4d6618d549e6dad06009 SHA512 f6f979061a60ea45d2062e60e7e8e1ffc1ee1ba728c9c4eb71b5a5e4a9bb8a86a8ff71a0d7e885334899699317d02410e08dd30d51f48f1ae52e9423e0c5d6bc -DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2 -DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d -DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556 -DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5 -DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014 -DIST github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.mod 37 BLAKE2B 2eba24c8176edb0f06c1c186ae603a840629c759182375dab9d574ed3a0b5fd28ba9d329ff01b3fa6bb908b3f50a6a739863cce2b808067d89bcc121edb31e6e SHA512 e31d6cb7f9669adba2a4b79be3af5724ba5807233750bb2273ac1aa4817c58477fffa079775709eb2f93a6c2accf0f1291c663f068b31ec20ebe22b39b6b6249 -DIST github.com%2Fcodegangsta%2Finject%2F@v%2Fv0.0.0-20150114235600-33e0aa1cb7c0.zip 7438 BLAKE2B a70c27d0c79e95186e9d21fee8a4c70011c21c06c1f351d1d02bde12818a3df4b0af98566470a3d39713c8b0d21811af63421944cc39e372d250e512b9dea650 SHA512 c6b9ea0ed6bcc33e0c11e2ef4d8034480f73d89e840f1855130d674f6ff7d462762fec6f5ebd9b61b5155e1ddf18962e18e1b686c3fc7e30870a3acb617df53e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58 -DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58 -DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf -DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa -DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0 -DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163 -DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8 -DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e -DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e -DIST github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.mod 37 BLAKE2B 2ebc74d62cb97bf929cc59df3774562560bc2c1c5e1717380b05fd79f98b1a4396082d62c4992751207915c03c7ea983f8eb91b604d03f628b06d3dc804815dc SHA512 94811e2f653bfc9aa65b2f21212d65e96e0415541152a8607f9ab0d44bc1ab46175f39362cc9c1174aa0b1ea60e00fa977287905096a66a0ecfe62ee75ae1c6d -DIST github.com%2Fgo-martini%2Fmartini%2F@v%2Fv0.0.0-20170121215854-22fa46961aab.zip 93913 BLAKE2B 083da0dda5ec6e4d8c9bb983caded3c5cd6e723b15f4f9ea8e643d578b171208347a72f34765daeb80551a3c16819bcecf70a9ebc37d3bd587b1ad1f19e50ed0 SHA512 0355660d8521b8853c9449d2fdbc45c3b0243b456fa6fcf627c611c4edbbd7ed8faac5505f464d13b2609c5dc12996332884fdf78b78a2ff7ebf74c8d6184831 -DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip 39701 BLAKE2B ecac1c4212267252571babe2c7332b517c22a7c535777a40b6e318299bc284ba3676ca75df60670dad69698450e97dc614b98c6c9fa793a4f3daa3bf88859167 SHA512 e4cc88b9e484d43a328c2ce80b812d4886fee13b915a41fb64b28cacb163960059de066b9be8aec33be081fdcd3db847ee491aeeb1a74b25aadca2c206c9587f -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96 -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96 -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32 -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae4b156ab646ab37acec93f14ef00beb21d4ea93100e13a7f25e7d7bd3860b603ba18923075ccb2e106376f6f55ff261cdaa37ae325c554c SHA512 4e386a43067044e410312e3d6015ae59d6e77506b0db35d08fe7e6cda7b3908a5bcf6fa7432fbc5391252dd4dcb346bf359727680250af1311d5c839a4cbf4d7 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod 154 BLAKE2B 8645404d124dde54c3e9c284b1243b1faf2124f2b7d6c5e6566ca600d3c965f7787f09f6825840f5e3ea6d36c016ef2c7fef10e8e12dce354593f7a8a3210a33 SHA512 4c9416c4777123a39b23b49ecf6265295fc3432de083a04dbefc87264b8c69f0d9e342ebb7e8e488f30c3efdc02951fd7dec23dfd1fef0802c8f0250f96612a8 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip 206951 BLAKE2B da403116137f70222d2028df84c6f872d324e6aef808ceb2f58dae257e9b7cd2fb37b477c2b61bda55888f5aa72fe6f46afc79ed4fb440f1212c5105f8b6dcc2 SHA512 8df603b906846c265342236e7bff8ad4f37fbac2ab425b6002201ec727602bc2454708985d44de11bd91212e15e338ce1942f33a3e38c328f2ab9e3b990a2ab5 -DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410 -DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.zip 128896 BLAKE2B 4981d158f2cbe026d5b56192173ff9da3ee72a91c766235e485530d30524066f4c619e7beb7e8daaf8f38746239516e754be3915126a908910faa812fcc55b38 SHA512 371abaf9db7012c40704d4f5ff322dafa27211f434b477a632f88e57db3f2cda168cef55c293262425a1039caed3bee9a65d48fa8b3d71680d66d3cc041de845 -DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df -DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa -DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81 -DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b -DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73 -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19 -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d -DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1 -DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1 -DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9 -DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9 -DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c -DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667 -DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9 -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d -DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce -DIST github.com%2Fmartini-contrib%2Fbinding%2F@v%2Fv0.0.0-20160701174519-05d3e151b6cf.mod 42 BLAKE2B 91467a3165fc0dfa8984ce7a1be669d9a18faea140c18bf2b5be527ee8b34941629fadc9bd4904e1b673c7c163802ebd63ebe59228756f8daa8c74f8e5ece2de SHA512 eea248164a1e4a4431c1631531d8d0c5b7d5b3b59de204edae1825019b4bbecc134688a89161539a7d074973ee3494c10a8613a4409cc8025c1e4e6088568701 -DIST github.com%2Fmartini-contrib%2Fbinding%2F@v%2Fv0.0.0-20160701174519-05d3e151b6cf.zip 25554 BLAKE2B 3b84406b10eef3c4286a741f982e06a4d51ec8eaafcc1e703320a39500a0f75f0fad29677ee432b38e35dbbc54f21c5f0990936d595182cd7db7b2bab0bf9c97 SHA512 6f16ee999277739cb736722ea6fa1ec2be1857c09e2ceaea425961b9acd4f7eb1495dcd0e9873fe0983858a18ed576ca7c630dac51e71c12393eed03d299ddfb -DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526 -DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65 -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99 -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503 -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098 -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405 -DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475 -DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068 -DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a -DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip 8705 BLAKE2B 905de677e6b1baf15fab1e19177c6f45f7b84aaa1e6426f8aa1c9c77d81b491d4c334ec542d45729e380017a91619b99c8e79451768b1cd9bacdcfb7e9e0981b SHA512 a7983e1a07e1e7fcb047ed7f210cc131c1ac43f4bcb1863c8c17f557e2e2f946624d793e8446632ab127d109ee5d8c1de96f914d6183494ec46145ccd5e75da3 -DIST github.com%2Fodeke-em%2Fcache%2F@v%2Fv0.0.0-20151107100604-baf8e436bc97.mod 33 BLAKE2B e0a3c58082b469e441ec886240da0968b2f37d4b226fdeca0da53fd898c54ce79a6ad0d2122d18df6d074b6caf03ab26447d937bfb6a184c9077beda02b5092d SHA512 c1ee01b237a0c8729419e5424fba1eee5d0a50f569141faad085f06a8c04ae323eff7b6c1816742673a5caf12dc395adb35d4f9672157a2b60df930c9fff7149 -DIST github.com%2Fodeke-em%2Fcache%2F@v%2Fv0.0.0-20151107100604-baf8e436bc97.zip 5476 BLAKE2B 74964bd6ced05d4763418d5ad76c91726c5aaeefce766900b8248b0c3ad6f988f34259d111110a0dbb25c52917fa6e9b866b4ccffe6c0feb390d47fd0a526bcc SHA512 e065209d4126b2a19ba3293e6e376cafbe31c32af7e601e1410fa1a56098d37e5a9f11af323e429e4708ebbd753fac5e57241c82c987e6c930529b00bd5e1f00 -DIST github.com%2Fodeke-em%2Fcli-spinner%2F@v%2Fv0.0.0-20150423150528-610063bb4aee.mod 39 BLAKE2B dda922dd135746990fe902de27101074cb70054e13d184b61bff1ea83619adcb24a0478a61cbd40d20ed07e66d18e3e933b456315c828a8abcd39272e421fd60 SHA512 37658a176a5915ebd31ce13bb8a1ed055afc7e311079629a4547f04040d67279ee18b873c668125e64474b94e529300dfa5dcd18ca3c4f552424436f9e243073 -DIST github.com%2Fodeke-em%2Fcli-spinner%2F@v%2Fv0.0.0-20150423150528-610063bb4aee.zip 3610 BLAKE2B ac4f8552da643f876cd360ac25eb77d0dd78d668880a7972a05b283d3110592b03faea625433cfeb87012105cae637e4562d6c518094a88998e13dabe4b632d9 SHA512 686671f3d7c086a095e81240fd4cd288ca5e6ba3b10b3df836aa1be458818ea23a9e44e87f6df8239b4680e336009ff1ece98959e594f30ae30aca32781d407d -DIST github.com%2Fodeke-em%2Fcommand%2F@v%2Fv0.0.0-20151021022416-91ca5ec5e9a1.mod 35 BLAKE2B bdc57fb2814cc2c2402d1bdad23901cd6831ebe6888a21cef96eb264c47a2262965be750fd552fda30cd4acaefb58ea7b34a0aa92580ce6cbd6e8186acda9d7b SHA512 6a1a5c46408f93d888462b583c3a715968b17dbf19a107aec1f81075eadba299b25fd4dd7959afa753679c6f770a07dd55fe193d88e63f96e8fa7160a7a99fb5 -DIST github.com%2Fodeke-em%2Fcommand%2F@v%2Fv0.0.0-20151021022416-91ca5ec5e9a1.zip 5772 BLAKE2B 60e3ed73413d596f17bb158375796c714ca9cec7c1c479521302cf7d0b0840f1a37457ffb27f62fa8171f33cc9dbd7226cda341f55acb078e8034551b38f233d SHA512 d8802e51840ac0029f9d25c6bdd36be167c84c5325c411b99bf30d3ac93be5cb0c9dcd70f87cecee0b94e6f5e6f35ffc3084c2f663b164cb890eaf7c2c901bdc -DIST github.com%2Fodeke-em%2Fexponential-backoff%2F@v%2Fv0.0.0-20150606110550-96e25d36ae36.mod 47 BLAKE2B 645236ff5c157ecee21cd9440db55d1937b808cd94aa97cfb1606ddb9d6796566b2ea1ba113330a6b1d4a7991a798120be8a09710eeff88d2a69644776775ce3 SHA512 edfbfc46854a899bd0cd9274d46e5e1268bc9c593752bebd191ab3bda39303367f34bf3e57ead8559242b30bce263ed980dc5b65f9290d0e129521df3a5a9ab6 -DIST github.com%2Fodeke-em%2Fexponential-backoff%2F@v%2Fv0.0.0-20150606110550-96e25d36ae36.zip 3628 BLAKE2B 80172e17b110ecbe6eb4ae4fd7538c6979f64f9611db58e3dfd81d886a859861203e1ded2297fb04838ddc32850e1c779b514c67d40185d4848d7bfec580f065 SHA512 b47a370e0adabb19ad941d526f2b182e42e908599ccbb0f983353c8e933bb3878fa4ab68323c2c2b532125e6baa266e0a9c24312373925dd7e0f61b62dad3a46 -DIST github.com%2Fodeke-em%2Fextractor%2F@v%2Fv0.0.0-20150727035912-801861aedb85.mod 37 BLAKE2B c0ff760415c716fc8c620cc56575ebb710de8eed9340af7a6aa3d0392c635fd3462aa6b863cc1b78924f6c6d5eb19c3cff33dab54791a8bd41d0fe1af783a4c6 SHA512 86d228c053a9e91161f4bd3cdb097907714435a175309618ab7fbf88284d9228e74febd6c8c1e8d5cafdd03de97c5e0b4ff4243f915f1e5b2e9dc5306ea4cfe5 -DIST github.com%2Fodeke-em%2Fextractor%2F@v%2Fv0.0.0-20150727035912-801861aedb85.zip 2705 BLAKE2B 270b86273c2a0b43b6bc618ef3854cecea5cd706b4d88e5f869c98d7bf94ef3df82a1a5c74c86dc5249dfe2e22fc5ac2b17a417461c40bedef950ced775614af SHA512 94164727d4d58e1f8e0d26a4816f645c19894777be5569987d97cfe945d72828e66e15ec4657502e42fe5b8d080c63f3fdfc6fbfe8e746cc27fe91f40e60e0d1 -DIST github.com%2Fodeke-em%2Fgo-utils%2F@v%2Fv0.0.0-20170224015737-e8ebaed0777a.mod 36 BLAKE2B 22b4f10011ca1a3ed3c0b48a2c1f6cfedd60d92fcb10272befe0fe1be390c0db22cb0089d688fbac74c8a71e69efc80c01f2794ab72987b508c0fd83fde018ce SHA512 cbf1fbdde872430c15142e84c9a0c8fcaca4a64a504cb40018db6e17a722a3f921c1ed12f96f42aee760a2758ccf216be96725830804fe0fe7e5826966e6ba46 -DIST github.com%2Fodeke-em%2Fgo-utils%2F@v%2Fv0.0.0-20170224015737-e8ebaed0777a.zip 11441 BLAKE2B 9e2ddfb89f24c69f884c4318cf48e627fe99bb339cd39aad142f8d67e47934c39103710f87653311efa6911aeb47e4b8c272347932a790af236ddeaf4dc033a5 SHA512 50afa7966eda6ba0e04bcd0ac13b68e1b57b269eff88b0890fc51bf355783c2afd42b1a8fd29bd79c0abce52680f14771018bc3107c6dd6f142dcb5a8e1e3ed9 -DIST github.com%2Fodeke-em%2Fgo-uuid%2F@v%2Fv0.0.0-20151221120446-b211d769a9aa.mod 35 BLAKE2B b924b274c12044ae74c7927515d42fe8883ca2d0a662e04ec95a13a07c4e93d732cf1eb56bbf2d77762bb67c0d1c4aa6f5b232cf8ac44a7b8ed4974fa43a53b8 SHA512 0811507868b5f497aee6b64808d7d56918e75079ec88e61e72f4a22d788c9bea747ecb5dfeb5be4a7ee965e9dc5a14d8c5bb71f5707f317f38c210f0fe9d8eac -DIST github.com%2Fodeke-em%2Fgo-uuid%2F@v%2Fv0.0.0-20151221120446-b211d769a9aa.zip 17588 BLAKE2B 1c1dfc552f8f3ca8afd2215574f0336569a1fbe7e06672c4ef1be874bb49dd9fabbc80f204af983c4c92ab5a4b67f946bb2d944a70a6623c64bf8c39ad74b63a SHA512 d62702acd6d39e2c03837ea9ff2632e2cec4626dfcf5744fb89ce6192f2690498b895ce8bbe47e393ab91462effa599a9c59198fb24aae13f341e3ee62501082 -DIST github.com%2Fodeke-em%2Flog%2F@v%2Fv0.0.0-20170107003526-8d60a6917853.mod 31 BLAKE2B cb4ef8c9d79c9e3c43151997612c0fe151220fb7c984ada4e9a8f2998ad154cbf2be49ca9bfe2d2c9e50f32f5143f522824c66b13a97947047574aa97dee45ff SHA512 684f47f72b05bdc6422bb8ff5c8c2057e389b90678c3381a5be9be066e10dd346731dfdcb595a260d743a0cb3b8c47c58df6aa47378974fc3d4f6a20b0a7a448 -DIST github.com%2Fodeke-em%2Flog%2F@v%2Fv0.0.0-20170107003526-8d60a6917853.zip 3315 BLAKE2B 3624dd1ede22afe9cb5c4f8658a072f271b9c9079bf7fc55dc56fba8b32aef859ca5eec8e05881aa4060fe252d915452e386fcb52a82f00116baeb87ee43b4ef SHA512 92b71c7403d30f6b793460130f1b67cd3da7c71b1a701d27c78a3c8ab14b3e83aaeccb1616ea6c848e57979fcc3777a56e40c9e874932a610545a310d552325e -DIST github.com%2Fodeke-em%2Fmeddler%2F@v%2Fv0.0.0-20151019050616-d2b51d2b40e7.mod 35 BLAKE2B 4ba5f130cf5a1871003c9dabe25c56007f37f6d9c5c0c1f91163a7816260bd69d7c00ade242c279c6c98241e2521166cdec074956f51e335baed71db9da20d48 SHA512 4d9ed21fa91040c2687a6e7ac450ab255237724f07a2c65c9805d4d0c9979bec9e18668a921c0139800903b3b61528eb36f62a6ad7c27d277f7f52232a1494f2 -DIST github.com%2Fodeke-em%2Fmeddler%2F@v%2Fv0.0.0-20151019050616-d2b51d2b40e7.zip 2660 BLAKE2B 049ed1bc2fb52802fdc97f62e9c0ba8fc0380421b53214b4ea5c4483248398d7bdfe92f7b119226db4534dc587be9e5dac22db955cd8edf29704bd9de6ce207a SHA512 1e4390b027bf0293070ad55f2e8c5f024ec43c867904836c1e7635cf5e9e3ac686220dbf00588fe960b3e36cb82473130fc727b4028f4ec2fce6a681ccde889e -DIST github.com%2Fodeke-em%2Fnamespace%2F@v%2Fv0.0.0-20161218061609-0ab79ba44f13.mod 37 BLAKE2B 640f1aa87f80c03a21d2340e4d5a1e43ea53de1d9edb31985b3bb6d45f4ebf8c899e5d83278314dc780ea9099d3ef312082bad0c85b472615bd2f8c6d28bcd75 SHA512 d9433ad9848bab566e29e4b9889a43f673ed9350a6317e53c30c4d27c613d25e88ea6b7e2cdd3c73eb100520138e45c74e6270e0b4ec478074b1e572d09fa21a -DIST github.com%2Fodeke-em%2Fnamespace%2F@v%2Fv0.0.0-20161218061609-0ab79ba44f13.zip 3830 BLAKE2B d0925c61c8f4e3183dd066f76cff7096dd2f28b2a69d8d2089138d8e14b5ebe2be538e3a32958bd0dd5f38797db56d1314e31ed3d0ee731c57b15d80b4e9e475 SHA512 d5c3d6eeb79fa7206f1d4fe16d77079406da8d85f9d3376ea1b6bf66636ff597ba9ed28dcae0881b72809d6c479f01987f6f6838b7026ef3ae7a7a28dfd5f767 -DIST github.com%2Fodeke-em%2Fpretty-words%2F@v%2Fv0.0.0-20151007025238-9d37a7fcb4ae.mod 40 BLAKE2B bdff86150cd43f92259b6306f43d0ee57e40e95b45809ec66ce546aeafc4a0aa8ec1333ecff2a394ce1c9cc84d6c943532f373a1c5f791a51e337c91508e6106 SHA512 5d59bd7938807b53ab44e7d7db8776842569b95afd7843b2996ca5f50da5e19bc765f654fe06044c5c374592d10c083b8612f3ad03a6ada5e9d08ca6a40640c4 -DIST github.com%2Fodeke-em%2Fpretty-words%2F@v%2Fv0.0.0-20151007025238-9d37a7fcb4ae.zip 3764 BLAKE2B 580999353b180f3be9656a7ce5502d1c8faadf2b5c9c60aa91072a7b3805c78ae37b28e9c7595cfe45df10d622d06671f497edbf90a11ac6233f391eda43dd7f SHA512 2275d35129f630ab005832b8c46353e0a2257630bc561d164192909a7efaf3617ba822ac064c4e5802fd7257a58ddcebf2acd2056eb047a2a580ea4cb339efb9 -DIST github.com%2Fodeke-em%2Fripper%2F@v%2Fv0.0.0-20150415060325-bd1a682568fc.mod 34 BLAKE2B 8ec7998339df2bf7c1065c349df88c1abaa1999741863a215356ca83f2964ea6e003e6c03cc90316d7c4c158516f440a8207beb01b6b928e9446ada2e900b56a SHA512 b5ce888dbbe7111f6a38c937bd2e09736c39883a28ceb38d60bb0522ec57af91c46f2631c977d8e3a88185acd281197724ae6ca7e82e20383d119811ec3d1815 -DIST github.com%2Fodeke-em%2Fripper%2F@v%2Fv0.0.0-20150415060325-bd1a682568fc.zip 8528 BLAKE2B a98cbd1037303aebfb917e6dbb873fad2ac63c40f1e02d613cfb2abc2d73c9a65443995a9dba1fd4929eefc01973dcfaa76950b6705aa335493d1f4fa46deb00 SHA512 4ce79101b100b1879729ada99f00274d7c2d99971b225ee75eff41bc9d3cd76235f92f0c51ff98eea589171392820078aae79627c901941d46d99c53b1716a72 -DIST github.com%2Fodeke-em%2Fsemalim%2F@v%2Fv0.0.0-20151225075036-9c88bf5f9156.mod 35 BLAKE2B d2926835a8d67f079ef7ae077a5e785ac601f3a59f5a2d234df47339e52aadb45f8c9102406f2edeada794f4018286ec9f8e3b950a56f656f6f295ed78d155e5 SHA512 340f2a8e50a48dab1fc497050c2a63dbcb6fd374b1fbb4b71331018fc29f6d0219ad29c59db9bb3e7537cb9264377db1532d1440a9e7a4cc618319c7974c1f7e -DIST github.com%2Fodeke-em%2Fsemalim%2F@v%2Fv0.0.0-20151225075036-9c88bf5f9156.zip 4431 BLAKE2B bdce265751bf0e450a00f5f03bdf080c7f25c8e3da440910fac05a962845e8b4b962d0ddcfdab5ee1d769406a7c72e97a22834aed9306a1bc41654e5ff730782 SHA512 93f8dd0d447f1d56c69dd1d4a332d9ec23930f8ab0fc904b4f79ece4df61a4ed44b6bf4b1be77b608f86d4370d5cc4bf6ba90bf2b5e3bd79493cdad360241563 -DIST github.com%2Fodeke-em%2Fstatos%2F@v%2Fv0.0.0-20161104082728-292960a201e2.mod 34 BLAKE2B 769de0fba4eba931592682be4bd1e27340e819a3e37c9fb8c5ce3fd35a9fc387f900727e1402ffea6fe8bd3238a0d994cf6bc565e660517b13ac8ce4b247cb78 SHA512 0fb930910686a838edd96f9c90b5e3b51c9b09873f8b879d3cecd1486d9f427fea42dfbb12fd0e51d696679afa09300986d93d76ce20913eac9bbe36b30a848e -DIST github.com%2Fodeke-em%2Fstatos%2F@v%2Fv0.0.0-20161104082728-292960a201e2.zip 5431 BLAKE2B 20407709e43544dc0a569e956046436c075587acc9e3b8075aefc7b0aff32ac8d0cf37fa42cd57d4e11abfaf0c79aad82cceb1e2edd5828a78ed03c6e5efae55 SHA512 d4a395c933e622b3938b9ef559f455e4ed80828af99faba82d9669e9b30b10897e9333324d3e8fc47b200ca71574813f76a3302cf6b6a2c4b926308ff0409852 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6 -DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613 -DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.mod 43 BLAKE2B 7190cd8561b8a4ec93fe2c1512a3207a5d0d81553ad9705b5c91eac8a72ba52d69ef728c3202134787f60b29bff5b9231bba009cb1cf116b1e86bce6e051e441 SHA512 f40e45d730137deb85788b5b5f63140d6e02b5af6892a10352e14599f9eaaf6315b10c8497568f965253b995fe7fa454101db5cd4a8378f0ad3eb10bad9e51ce -DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip 47370 BLAKE2B 7c9d7c015d07c664f15e50b5f84add0149ac2ef72cf4a0aacb46aa5edf15f40b3d61efc95f4bba001bf67f8042a2a29da3a740888b55fad7581738e660435bca SHA512 fcab30f5f11cadfc0e443520d4fb01c567da10048d840588c90fd1f29a9b3adbc28a53beeb0675dd14cf1da0b70553f24b44f5790f98e3f7f4a9f4efeb6782d6 -DIST github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20200116055534-eef842397966.mod 41 BLAKE2B da40259a83c14d444c933f97bb673c4edee72b95d5c19ef021479afe2ebfb6f01bc157527214a19e35d100a6f4d353eeefc60badf51cb85dcd735a773aa5b033 SHA512 7a7b948320e1df47d23498732e5fd7e63fcd7e905299e11f74ee86a8146fe8df29dfea06abd59185810d75c7ff670e2ecba07ccc461b681a9469beafcfb7801b -DIST github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20200116055534-eef842397966.zip 10942 BLAKE2B 4a005718197a71d02645058b05709d48b8fa5b47abd6b09510e49f2ccebd4df64e44c2384738620df78ea9374916526df8c32b3a57862d27c781546bdee1d15d SHA512 c6c281f254babe495259203720ee46fc6a5efdaec50d2504781289d7ca6358cdcac6cff4ce2556d505926bb8f9a352ac55caa5a8389fb5c15a2de5d2919cf24a -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52 -DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950 -DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950 -DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950 -DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950 -DIST github.com-GoogleCloudPlatform-gcloud-golang-a5e721bf760c8055ea3ae8b732da1dc6a10fc3f9.tar.gz 846769 BLAKE2B 0e9ba48fb3d5d026eee52642ab8f04df2b23bef28ef7d2c04ceb7f634ecd6325038572994966fa6273c174c430291dca4d83914791765ea45ce24cbc49752260 SHA512 85bf289a4daea998bbcdfc7c4da9539305c4847f005b5f180ca5f056288d6c6b1f4cee88ce7e91d594358b0dfec2f5cc8e0c9e0c9d436ff199fb217c7b86f835 -DIST github.com-boltdb-bolt-fa5367d20c994db73282594be0146ab221657943.tar.gz 83957 BLAKE2B 14c29a394454944dde249bc4a135395f4382500557aeae3d2ad63500acb0271c7cf41fcdbc2463fc73918f7cfc7cd8fdcbc573bef9a4ae17b150d8064a1b6da3 SHA512 d877c68da702a5bd0cbec5d7f7c2d2f6d58e1fe1dd0071b095d1ba1d12e5a9844e53dbef7d4855e56852e4669c976dc0705358ad8ee5466e49cc4a2a5ca5202a -DIST github.com-boltdb-bolt-fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5.tar.gz 83950 BLAKE2B 04b9aa5632ccf231f319e8d25309f024a2a60c84e8eafac8b4bc16152fb7581d1a563903034e47668d7e9c61fdd6828294342c5b84d843e70367e578864ba4dd SHA512 5effccc7dadb214ef5ce53092db48c04ae25a388962c58732190c34f4537b579ef645ae579df5d0de30645574ff753486a6f743bf4fd58ec1d2aff76ba537694 -DIST github.com-census-instrumentation-opencensus-go-65310139a05de5c10077b75ac45eac743aa01214.tar.gz 160417 BLAKE2B f3279539f4ef60d5e895ba4813e082684bda0e9311fdb47439d01c2f07159858cd458078c588ee5d9115b08a1703489ebd5f9d31838a821afe29e0c3d340ebe6 SHA512 ae1a05f0d2938bb55d2f66be48c92b3717b4c0c29246736a26a87aa14cca50254b5e29801be9b4e3e53bf7a331be6d984eaf40ecd5e5e13b6f8d72febfba9a66 -DIST github.com-cheggaaa-pb-657164d0228d6bebe316fdf725c69f131a50fb10.tar.gz 11372 BLAKE2B 1b4b4094b1891fed8d3bd57bb062495cca1241868c9a127b9fc99b906b9b5454bb6e39a0e8d63e0ea443d45c76c5e1ded792c246c9b24c07a5deccb93ed82b79 SHA512 ef1d88b9cc4c939841680fa2a6ecc02de55c7c954224491ea9bba4c13c9c70e8c8a66524c748557b96b8998196f21c2fd712720a717a8e349f0e97d5ce9943c1 -DIST github.com-cheggaaa-pb-ca06a0216aa3e3429a8b9667219931c48417bced.tar.gz 29243 BLAKE2B 41effb6e4b048145a3a18c905394ef1fea11a93de7b4b1fb0cb146c3aeba766a0d9c2f41bfd88196fe50d78772d482a1ef6d9fab9cd84504120a81d2ef035b10 SHA512 e8c3dfb8087e5bf8c11cf6a839873537f6f4c2674f14de129940d40ecf77be5a12cbf2d5a6fb87d7e01a6dacd8ad06d1128da0933a2e4b9ae60209bd0722f6db -DIST github.com-codegangsta-inject-33e0aa1cb7c019ccc3fbe049a8262a6403d30504.tar.gz 5059 BLAKE2B 52219f8424bfcaa4f4dfc2b68e38dd1be378ed05040457cc21bab932c4a509664c37d312394272577199acd416ff82c024ceb005dff3b94e410b653425ac75dd SHA512 f6c062c41587e998020099888c370c5ece39a664c014bd809ad57533191dca5aa46d00cbe438588abb6f24d7275c3a3c86c7a6d37f9928fd530e1724741b2c1e -DIST github.com-go-martini-martini-22fa46961aabd2665cf3f1343b146d20028f5071.tar.gz 66063 BLAKE2B 51fc1044718d0490d6af675ac173a9f1ecb73f336996dbb8c84f313d5ee549dda8941e77e5e915c567a1584987a79ddf0cf7ea1d771f4e5df75ccac92d80bd01 SHA512 f5b01ccd3045df4e3cfa92ae31540754f50fc5b29850341d6df3afb6db41cafdd3a0e0b4b78fce9361c7069b6ce6926270604565b8fec028c0a6b1911171585a -DIST github.com-golang-crypto-227b76d455e791cb042b03e633e2f7fbcfdf74a5.tar.gz 1693346 BLAKE2B 70921e8cba675b687cc389777f1d264959aa8896606e294afb65a4f42b0600005e08fc1e55c30d78b4b3a32b7a02b963c81eb7196331c5d070b7340abf340b76 SHA512 108fe3b650756ea7218377dabe19f112980271f0a26f4260de6b420b38ad298d8b305c7c77203242f02c544ea352c7d3d5d47465f38b9ccc664828a0a90bd2d4 -DIST github.com-golang-crypto-faadfbdc035307d901e69eea569f5dda451a3ee3.tar.gz 1432695 BLAKE2B 2cfee911a611bb463007ed5709371fa68e673defe4af2500cefc1d2e8c04e94f725b7970275b192ed473e19e01629f5ea928867e396e0666d965073f9a3d9fce SHA512 dc11930e69b5552559b8fb906bd6cd302468d397f4d43087f215ea2afc74aa4ab014a532d6005b0f4cf600887da51acc4584333077334204351200bfecb44adc -DIST github.com-golang-groupcache-869f871628b6baa9cfbc11732cdf6546b17c1298.tar.gz 26038 BLAKE2B 154828b6d5f8be97ee9b462a766834e36f8012e7e15a8d7d30f0a5a8a3d1773aeb9b103b3dd1470f7553fb5a5ddff52860565dc6d47f0c49af608309d1be67b2 SHA512 0245e645d9cdca84f8413d58f507a9bdcd8b047784aed2a9175cf31ecdd9de19a088afdd28a1079200fd13ad1ba6f647d29ba54bbeff10811af8cccdd0bc2837 -DIST github.com-golang-net-859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz 920336 BLAKE2B 4a80a4cbf866ff64c699860bef3a971b6ba6bc002e85106e2268b494f40b8a87c61f923c70818e4dc59bf898986393a8c8e972c50152a3abc48545d780ee5474 SHA512 49ccb64c9b675460d12ea6d0456bb1124a92d56e70b04398d14b33dd5879c4e188dcc3e6c79c1aa6f491507f854911a9298fbc61aed60cbdab0205b6995bb4a3 -DIST github.com-golang-net-a8b05e9114ab0cb08faec337c959aed24b68bf50.tar.gz 1100877 BLAKE2B 38c1463616a78757114cb5b860a77859dee25a2cecfeb0185495c444bcc9338b491bc61c71263df3cbbf9490cc4852aed7c0af6114e96c118410e805c3e45ce7 SHA512 b6f5c3d5082b7005080a4d4c61bd45cf986afb0a64aa2a625466206a964805b78c1c1070150bab6b7234abdf5b4b52d64f4563e8265009ecfcd8849ebdf9ed05 -DIST github.com-golang-oauth2-0f29369cfe4552d0e4bcddc57cc75f4d7e672a33.tar.gz 45476 BLAKE2B 42a97cfb38a2633d99e5995b75f055a6ae5bc3f34b3a501fd4b016c129a0e85fdf1412f5f8e5614ccaf19b1abf018e3b5da7339c9c796ed9d2bb40c25ee477fb SHA512 f7b55b531c924bcdae71beeae0191b0ba002a7551012e8a6e1c088fc74dc4c985353af362138fa9276eb5d965f25b45b3c87c8e1a756d8c0e89893816b825661 -DIST github.com-golang-oauth2-13449ad91cb26cb47661c1b080790392170385fd.tar.gz 38610 BLAKE2B d966e904199bbaa5a566e1d042e6bcc29d91aa9ef812bff3d5f01dac69a51542d6a5cc8b68bdb7d7e986977a47b67d030014447d4b8a893a8ee07713db37abfd SHA512 9301e42d43ff421f85949b1fd7e60baa183842b0d128c0f4895708c30a91e4e614032a08dda03c2564b41251037c453f95aa21fe1876672e033c83890a96d660 -DIST github.com-golang-protobuf-11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz 267933 BLAKE2B be018eea3f65b35bea4f4d92c973370dfbdcb85151df40df7976ff6ea0186f90a62e42444f9e6e562a8615333f2798aafcaf40b9226861a5bb9f8844ee3dcd4e SHA512 7b6ac268d15fc5e2c07a22784565466abca6257deef90183bab45e1935c915dbebe5560e6583d76b2ba8b58fa22b0c07f5f512c188b6503ebbf47937f844afe9 -DIST github.com-golang-protobuf-822fe56949f5d56c9e2f02367c657e0e9b4d27d1.tar.gz 312851 BLAKE2B 059908a4117b73cf97c4d25ac31dc6b1a220df61fcb5f9ac89b12030cb20dec1f0bb38bdce594126182ecddefa9cba7759e91aee11096e5044317c83ec78f714 SHA512 2d08221f87e8f1b66e1899cde7e1ac05aea37529facf265868c3c88f6b4432b6fee03fc91a4b7220a88bafe58eab05105f8d466803e852807cacc13f6765a02e -DIST github.com-golang-sys-b4ddaad3f8a36719f2b8bc6486c14cc468ca2bb5.tar.gz 1475029 BLAKE2B a5af729102365be07894b2b9c355f98a40f95968a6774175186ee629c847e2d97fec79b8d5668094d84dba1568b5c171d100157a262f5e86d00c5162ad01ca55 SHA512 0fa28c91ae4f284db7828ea35b4d5507a5599c4cd19ed9e7017592d13b05327205ea32febcabdea22460e4bd55566fac3a1ad1f7d1a66f2a532388c370bb70d3 -DIST github.com-golang-text-14c0d48ead0cd47e3104ada247d91be04afc7a5a.tar.gz 4618483 BLAKE2B c627b2edbf87e88e89bb7bf3f93a4e96cbc2fdacbcc2133dd747273f11814030feb687b80b6a540f02f6c3e1b067888c704fea306505913ea717d5cc5a70069b SHA512 3878ad8e044c46bb005b245ea2d23cfd3dc3810a0c93a70eb12a04705deb0342223a250e9466c3e407504cbe3514917f0d1b50873c0375c945688b8869ba5f9d -DIST github.com-golang-text-3d0f7978add91030e5e8976ff65ccdd828286cba.tar.gz 7167109 BLAKE2B e436d8cd5a5a1e87b050e129b7d0cac07ee6b20eccc947c1c1ea7cbb2aa6ac356350ea2cd5e32c72eda2c5f47c579c52bd99b03aae8642685a4d95844e9e9c10 SHA512 d295eda8a620e279ffbb173792489283f1ee428c83a6969ef01952e492d5010d0e38206b6566b13c7d221ed4793fd426a2b01b041b2a23656c88610b3a4def5e -DIST github.com-google-go-genproto-595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz 988349 BLAKE2B aee32d0d4139172442699412756f6429944b8ef2389e539d1717c4962642e3b63e3d725c28cc4c15189b4b1f286c7c93aee3fe190054b757b2362dea1463b925 SHA512 1cfcc16d9eb8d6414e943d7a62ea6606527b34135e8baa905f92e1e4f438f245d9cc4db9711c9b191b979bab6eef404adb84c2c85fd2af2c91bc0d8e89a7b1cf -DIST github.com-google-google-api-go-client-39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz 6388385 BLAKE2B 32a0337f4d105742571f76919f15e1c99df19c5bd9999e70dbf02e85713905ff8daecd80d51cebeba76d1af0757868929c502529a97fc7a983983555258c4ee7 SHA512 5d5d66abff2bad1a758e0a9cd9b12b9d9d2f02df8b9eb6ff0b38ae505808c1a6e78eb46ee0516b92ab04e1241aac827287b2dc050adf84c867168e0b441864ba -DIST github.com-googleapis-gax-go-317e0006254c44a0ac427cc52a0e083ff0b9622f.tar.gz 6194 BLAKE2B 1989ec7d4037c79b9bff29517e710003c52930e43f80f6c3afffa88a97ae4dffa073122326b7544cef3e86d72025707a5f888e6df0d934bb629078fa7aaaa821 SHA512 880d9a46a9ed3814546049f50b71824f9b59bd89dfc8c8d0d2710a69eef5036f70a553495c72783d9d8336d05a6caf89bcecc2be2f5ad2667d1380d4ad8ac2e3 -DIST github.com-googleapis-gax-go-7cb21a99a18735dde62f5d3cc0244f3f35bd9515.tar.gz 14417 BLAKE2B 80dbb6603214ae778fcb1e6582a4c0fe26575fa28f8763068a9b1128a95305182a6f1bda154e340018023c859b846b5e2f25706b0bffe8c38e2deebb025a239d SHA512 e10b1dff53617f64fca7afe206f129b3bec4be6c86f9cc49877d918800174d0fa5f14eb406ae2a5e129737a622669e74d8b5d7f151bcac175896ccb00523ea71 -DIST github.com-googleapis-go-genproto-f660b865573183437d2d868f703fe88bb8af0b55.tar.gz 5446313 BLAKE2B 2ff837abb3d06d442cd2dd457502ac4c80e606c8b39f772cbc1012434ecfc03fd8e4ec91e830ca8296dfb9ac6b04333f8ea145510c3c18e93ab8aca4c340524b SHA512 e2c2a975352726d306885c33a0233307e911901da3764aae67395a754569a21c2a26ec493cb429776c8c758b95269839ae4c8f9f7fe86e80a0c45550c165d023 -DIST github.com-googleapis-google-api-go-client-634b73c1f50be990f1ba97c3f325fb7f88b13775.tar.gz 12246570 BLAKE2B 432ab16fb03f7914ec868e6739f8d88d07759124bf18aab3cd1b3a90381f22486a5fe663748734597d19364fa40d54517703180465b0b3b99e0bd5927c3052d0 SHA512 6559b7d49b4cb3bf52dee7cdcbe7a9c8280485258d97be19e59bfa7b7c7f0ab90877f5e3fb5fddd233ceccb92f5b3182566ede956301f4a26ee10f9bf8749ee3 -DIST github.com-googleapis-google-cloud-go-ce902a9872e454f175f5e84ceae12514cd33953f.tar.gz 2290706 BLAKE2B 4bab420a1c69629494a3f0befb6f8fb41de5b9b32aebed5be58006fe2227bfd83d388b38ea91b26ec30e302631dccad3651ee14224643ac6476697f34ef551de SHA512 e676d7667c52f75286d52a19eaac873e21f0081bd849140b779eb4b868e072037eba2797bc7798995de60eaeed5bdb79fad485c82ae38dfb542fd48254602129 -DIST github.com-grpc-grpc-go-bb78878767b96d411e740439ac820f118e95ae2f.tar.gz 315770 BLAKE2B 346a0195b46220cd0309417e64c5fa0c473570ecfdd5de0aa22c8f24385186b206ff5038b102928201972d627f5bebcc93899e539f8d3b64811faefd11a0de5c SHA512 9c54f853ca37d0493f17a2532b8d6f4c4a445fb26aa96f9220ab3abf92b00143233c4c38784dda4dbcf02fb181aa2bae6b37f29eaa45f5ae97ee5510f9115a9f -DIST github.com-grpc-grpc-go-e2cfd1c28f4a49333263cf65123aae57b081750b.tar.gz 755225 BLAKE2B e9121d18f80ddd79c4f1125e8f175f7d8753e126a799e0d49b0e2d62e376ea5cd43fd227b6c3ff60a044bd31a43d1d9032f231c4b75c14ef435a266d30c7f024 SHA512 6c58a0cc54eec91dca18e9e7efd03bd106e37260d9c4515764bd295aba75bd1150a9d3d66e7df598fac7dd73006ef4d2ed41628484c362fa63bf836450ab6218 -DIST github.com-martini-contrib-binding-05d3e151b6cf34dacac6306226a33db68459a3b5.tar.gz 16976 BLAKE2B d23b52cc1591e65e9bc685d10000e5f17952418c11e2bcf0ce8e3ea4083daadbc3a111ac93d0a8d7e739b9567d4a1898e99f1e9c641af8a19d54700fa19c474a SHA512 c53c61cc3904d9c5c25a3d1b22bb3651242e89f2975c783a60edd25ae387d51dd5566624dd030d1b4697ab09b99f828a628e917e8079e27356e9971ac2e1c028 -DIST github.com-mattn-go-isatty-bf9a1dea1961e1d831824fb135332bfb8c10e8b8.tar.gz 4313 BLAKE2B c7e6a555b5430913d497c49f4b27893f30c297a2fc7f57418a6ca0d834b2a0f13d25139eb9d2cdd8ba4bc63958f656f759058b3a64be52385ad8fca8dce0789b SHA512 cf0f3e672782ede02e6ed5d6e646b25c0db6e2b15fce60b7242c7606324fea3b0105f9a2d0e766e656f8bcc8d168678e603878ffff38098d7b1c736dbbf8dfa5 -DIST github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz 3262 BLAKE2B 6b64f8ae69fdd8beb3cb783a80bfc827af3797903065de3bc3253c90fbf0a2b706c3a5bd63560b19d765d6a9e0b19413436a9f999ac3c483075e9431e0971eab SHA512 8627d22f5ee5a087744bbf4dd391f8f87ebabe8940564206935dec9e406e40a98976479ea973e61afeb1774df211992cd61c67ee198d546e22fbf60826b64ac9 -DIST github.com-mattn-go-runewidth-703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211.tar.gz 19903 BLAKE2B 03718136abfcb4f076d42f018e61556ed57060ed114b3a9e711f7265bc9adf349f3b2f888a24a3f4ec45c9a85258b7baf6b08243bf1b9a2991f2bb3fc9b482fe SHA512 2add2c422ce926792aed92e130e9dd3e58cc8aa93aa8e66715146e35d789deed76a0c0fa6b7b6755dbabf63eab20a374b380c073b90e8a2a85ae719193e1747a -DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 BLAKE2B e9f1d0da4d69c110a9b9ef0ec640dcb53bcc101288b15411367760b5710808f64eb8fe6f0d61f77ba89cad2f965da2d4f72d92e42a07986e1cc39777a050a8f8 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70 -DIST github.com-odeke-em-cache-baf8e436bc97557118cb0bf118ab8ac6aeeda381.tar.gz 3525 BLAKE2B e3c919432a9b3b084e36a6d7f77447a2a1e35e22c13a05f020abed5c84f91a48716d79950d00393922dcd88d1e1259fef9c75c43a34c384dcecc8e81263365df SHA512 547f5923824fe422bb3bc6240dd7bc2c13fa499352c168ba69bc650549e4f39e5f52cfd0ab30fc86221bebe600401e72a530b3365575e40e9d0e72b1f83bd522 -DIST github.com-odeke-em-cli-spinner-610063bb4aeef25f7645b3e6080456655ec0fb33.tar.gz 2376 BLAKE2B 24a933e09d4c749561bb8f670dfc5dab88f99432a16d3fbf47d594438ec3433275e2ab3a3a1a16fdb27ef5eed38d4210e1684575c93bc0bb2b5709c9ca7d83fc SHA512 91dcf9cf1634691685c091a78609cc6cbd87b4bc9677092bb4d078cb3680b75dec131444e0afe813dc35f5703a164029a77497482b44e11f7d88ee976d73ed26 -DIST github.com-odeke-em-command-91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561.tar.gz 4078 BLAKE2B 2ce74955b0bd6c0d15dd98c0c61e3ab760651b9caa8bf9da147a86f6b15227f50c153a13df2a2fdd6876409632fb05af38276fd41481f23f85665d3bf3bc4c66 SHA512 2efb78236313bd0ddc82f7322f752e0b0bf351e8bcd1f1643efeeec7185ba1757a34d6c640b89429b60bae29cffe0ee093b0af7e63861deab38ee5feaf5bb73a -DIST github.com-odeke-em-exponential-backoff-96e25d36ae36ad09ac02cbfe653b44c4043a8e09.tar.gz 2188 BLAKE2B f9bccd4996529187c3339f383924ac39aeee47b03583c250a80cce81dc7991e3728dc0658403b9d0a2690904cea6fed420cdce64241796c5dc4e9bb343811b1d SHA512 3bca870fc1e2b9920442ac8672f937e6a346ec5794e3acbd831b01d287e1bcc7c9cbbf1996766369e2ee65e886aced2e1a6d3274818d7b69b6ed13cbf4e5595e -DIST github.com-odeke-em-extractor-801861aedb854c7ac5e1329e9713023e9dc2b4d4.tar.gz 1750 BLAKE2B a93c4e60a74db245c595e3de52a407ff070c59809a4fc9d3753c8049ae2f14c47e43f75398680563938afb04325d3f82863f8aeb0964cded92cba87c18a2b5be SHA512 6cc47a2aa73357e6a6ca1f0fd0ae5750db1efe9f0eb966b654b670b14f672bf872310dd633a5530d8d0bc05c745f401ad2f3985e477706bb012b5477f2975856 -DIST github.com-odeke-em-go-utils-e8ebaed0777a55fa09937617a157dd51386136c2.tar.gz 6256 BLAKE2B fb5543f1b02f69f75f58a50925947721c4ed3578c5f1483bb8e075308dac9e0d6534dcbf0784e0271fd5a08b98684770cb14443dab2c94cacb1ac276991ededf SHA512 c0497264181b42a7b794b913c863a84e2b0d44659db3ed27fbb073c48f875c57a418e2350d43c759397697ee5d5db566bf427705eadfe7bde48828bc69456df8 -DIST github.com-odeke-em-go-uuid-b211d769a9aaba5b2b8bdbab5de3c227116f3c39.tar.gz 10400 BLAKE2B dac628ffd9e8d2579c0674c2872ef2125ddc86489199e994efe188f4dbec0b33b2a3abfa58753b0f4ff954576543792af4e108009a993131c5d4de8f1ff97c71 SHA512 e8b53aa2ee88cea20052091eb6b7022dcb5bc1a2d1ef342b18468c2ea53a3c43c64941f57fc777244ab72bb105d061de1f255d257b044d048fbae3044d93e528 -DIST github.com-odeke-em-log-8d60a6917853243fd746612e6ba47843a794fa82.tar.gz 2426 BLAKE2B 475645ba7dd46a19b5fa0ee989fca86f34b3323b4b33e4b7f28d416a9ce51df8eac17ae4aa04c70d9555d62feb1c062ffd22b261289f8aab286ae01eae7caee6 SHA512 de24de185b05d448a37d9b38a415ed8f47757ba0b12171d0bac217a040f3b43d31716ae351194c89c289855cd61d37be38887419c14c584de8686555bb4be675 -DIST github.com-odeke-em-meddler-d2b51d2b40e786ab5f810d85e65b96404cf33570.tar.gz 1972 BLAKE2B d2bc1667b18ac7ee98d053542b6d025d0415955bc2ba33e1dae57ef6eccb26c73f91c4dabc6ec874c49284adc0f43018b98dfee02fbd21c7211a7fbceb75c252 SHA512 7d27ab87bc97994d053f4396fe4419c74afbab210e7f7d172472779263ff2878fa0d8bd5eb242167403e53d40b66683bc3c19fc83f5b8f374e12273d58949630 -DIST github.com-odeke-em-namespace-0ab79ba44f1328b1ec75ea985ad5c338ba3d56a6.tar.gz 2825 BLAKE2B e30a0bdd8817f53116ba5cb8375dc3cb8a40e654ee93c4919d6ca5c71ffffc9c42a36350708ce52ebd712cf5f8e6032c60cbd12a015401085b7e82ee77c0a78b SHA512 d22d4f561d5278211957203e27faeb29234f9d103757aed8413386c3b9b2e4bbd210cade9511c6f4168a6c615fa637f36639c9d6b3f161836611a40db30994b5 -DIST github.com-odeke-em-pretty-words-9d37a7fcb4ae6f94b288d371938482994458cecb.tar.gz 2377 BLAKE2B ace1fe3cc0239a5e7798851e501cc0643244db398a31dfbe913e5de2ab8eb52131e8c30ddc98d4788d330f114b92d1c0558b0aabfb1df2706d8c90500cd9cf7f SHA512 e5dffef8840aafe77302f33dd4c22489df6a3f15850cf05bc9adb052bad1f449be972703543a610303a19b355730109d98be35d4397dc2c1751e560fe16bac5c -DIST github.com-odeke-em-rsc-6ad75e1e26192f3d140b6486deb99c9dbd289846.tar.gz 2130311 BLAKE2B 363705a46ffe45949ab256ddda12b97831a159871beca3fa2be656797d599fb3af6aaa561337f569db31f791b4163947886b628d4e430b54567f7625857c1765 SHA512 220162a67229ddc1b234b3b6e4fc446c834b8c08348dcbb3d3a71767c7099c5b77d46c01d5cb91ca83745686ec66fd8184ad3eea300e4db63b89c1557568acba -DIST github.com-odeke-em-semalim-9c88bf5f9156ed06ec5110a705d41b8580fd96f7.tar.gz 2742 BLAKE2B c29a6584d9d651391383cf3f004fec29721f658ad50451fc06186c59dec3944ef6b2bcc8457abc7d214832f3b108a86a29ced5e60520f2a657e8bd5fb64d4e95 SHA512 f2d6ae78d017f7603dd6a7737803bf3633dad1abb029a069001fd4d8af63fa52220f8c3942433970e4d9e68fa3ca7be7945d68fa84b99f599164eca88d81cb29 -DIST github.com-odeke-em-statos-292960a201e2310a667eac7796f4e11cd51021a3.tar.gz 2874 BLAKE2B 9f06fd0f687162a69f9c62e47a4edb37115282f52d32a43ed6ea425891530e6a3b6032b40a93b28b48d7fb6143e594162df42847779a961e1e5d07f1358bbdea SHA512 359fbdc4f03ce7477c5dd08a7ea6892193fa0ea976497cfa5e5e8bc3b8ac57c7a479b02b6d54e615842c4ab8d3f4d369b865408654cb18b2ccac2511e87ccdd8 -DIST github.com-skratchdot-open-golang-75fb7ed4208cf72d323d7d02fd1a5964a7a9073c.tar.gz 7012 BLAKE2B 9eb3ac6232df0c2ef5921bc0c7f160635a44ea01732b7858b5edd0d4c0bd06679c16097311ed0180d20d321c2a676c3c18179a277ffdeaaa2190dfcc8a3f61f7 SHA512 c9255b599d6f743c00bb0acd7f6b3c3078c34b2dfb1c30dc2f8a4e4f4c466efb2115749d0b0ab8595c925efc8e67f9e769ab6183d1676743f279289e8c5b3744 -DIST github.com-skratchdot-open-golang-79abb63cd66e41cb1473e26d11ebdcd68b04c8e5.tar.gz 7073 BLAKE2B 6960cad397a1f82e3d6ff183b3e4cce1d99a21fde9d0cf3f089e911dd9c5f7b35e825fab5a13660805a6725b1b00593e018be1bb161514f90425a12e1da41c68 SHA512 3a0c5539931dd8e9f459c9f3758682ab7f4c5bd5f134dcd6e5e176e0536ce81d58d46950f5ac91165e247b635ad199c02efa6fa8820a30802b8b7ea15d12d8e8 -DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8 -DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1 -DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0 -DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0 -DIST go.opencensus.io%2F@v%2Fv0.22.4.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0 -DIST go.opencensus.io%2F@v%2Fv0.22.5.mod 478 BLAKE2B aa63f336c10d04557c0f24301afc55f32d5d9062c70a03307bf7b5b7626e7f2125be07c7b6900cec97e1af9429d4930bac4d67179d87575e90acaf68d7fc3ffe SHA512 e94311fef653435875bf2c670a9c19e0e1fa2d6761b9323115504d2acb154596818d5ec9d4f65c662e607f4089cbbb6be0cfef0bb41631260ff8474c759c1323 -DIST go.opencensus.io%2F@v%2Fv0.22.5.zip 304246 BLAKE2B e0fec87affb4467ce127e62d6e86dd371bd32d4b8a7193e5c3cc39f306e289f67f3026b43930a23b60f6c42367f29c28a0d31a146cf19c13a79fed0e961af9b6 SHA512 905c4a03641b7978a06132f43f9fb2402ef4fdbea7438ca8e8524e48a142c0ff00656abc9857c7bf64bf0de159e7d3f972c3dac1cdf7f608afd3ba7506b8518b -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-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201217014255-9d1352758620.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201217014255-9d1352758620.zip 1864836 BLAKE2B c331a603ac81675e360574e3d7f199f749b260e414b70fd80bca0319cbdfe18e6e2c37240912cb4d23a8781f23c6103a2201e1e895e64c740c664e5061b88c50 SHA512 7958f77c6dd8df0cb4b6ff71fc6f9b77e03d3a5e071016680893dcfa988598f9cb45ab5af36ac9f5d8345e843b8a02ba2f5793a4f818040ca881a0adf60acbc7 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb -DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8 -DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe -DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32 -DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -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-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201031054903-ff519b6c9102.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201216054612-986b41b23924.zip 1583477 BLAKE2B d962b57eb9ab20a1924ff5fee8d1fcc699b7b5359688f118c89692a6ebe94d6ea2f9ecd895c4a7412fa0cbe22da0bc75f4da599d40724163c71d8208a3bfccc7 SHA512 1b55d167b50ed2c0e35fba56e774d9a2df6ab884f0f576a7a46f5b9daa891c8846ffce7828ee5af1247fd458bc8b9bfc8ca554b9a0f7ca945f73268ea1862a55 -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5 -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732 -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732 -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732 -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.zip 103831 BLAKE2B ccd6bfab9e9992c5f7f086bae06ffcd35764cf5b1ff392146045409ed51d2db6ffd8970051bab3d788a06dadb2d0d10b6b6df049661e993f0d195b20b2de3b47 SHA512 f0ffe4460113bad0f9bb79c86691a68e0c77e08af3680b07304585f4b7b311d5e8378250031a18182a2310af99ded8363f35bbcd8458a5fec86063ba0b0fd7ae -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -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-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -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-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.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-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200905004654-be1d3432aa8f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.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-20201201145000-ef89a241ccb3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.zip 1529486 BLAKE2B 3d16c77453863e514e36d22712e3673efa29d8bc2e2db1fc09aacd0a18d476b2129b209ad6920342501f3a9b82c1e13a9887da70c96a43cf5bda6edf40ead76e SHA512 ddc7c95d0a5a188838bfced4e2f29da4984789b5a60c3ee6d496ade59b3089567d7f6eddb35ffdf3fbb90cae8ccc3f95ae7c2976f5b39320060ce591e8ff5b38 -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%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884 -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip 8605233 BLAKE2B 3e9c66a40249df3915ab9de2a8de2ae0b92e4f7d645f9753e66e585ebaf86992484fcb933510b3400595182e9bc667434894697953d7078bf43f617f5ea1905d SHA512 26d09376646c1e7d99581f0fe03ea109b00879dc351996f77e6442b0fd72817d056f630a56cc167014acb55532baa4be5437bf40b4a933cfe450854c618b3508 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod 271 BLAKE2B daceb2d4e388208a2619f2476085e0daa6b6546122a32355a3e005e6ac51ce72069c959a72c76078dedf82201fb217941091d3cc2b1bf4be8c77949b78ef6cd5 SHA512 c2c79e2a50a05d79909d58a13703e35f9cc9cf209be9593546c84883ac272e4e31a8ec9b2247d750b7cb42b088ad90214279c04b83a48173388fa13a71b6572d -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod 270 BLAKE2B a160bf39c4d5efcdab43134808910d37ca9029684c921d91d4dea4e264bf24b592db0f063029f1c0b50e6dc8e1822394503b7acba305a82330371bf9cb5f2017 SHA512 9124d96cde52e0dee04886ef164f35a03a7c05b11398d3667cf0d28f84aac0bb5b44a0f52343033d62886ff62728cbdfa045e5f865c1d96203844f3986f95957 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051 -DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330 -DIST google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330 -DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330 -DIST google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d -DIST google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d -DIST google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d -DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d -DIST google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d -DIST google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67 -DIST google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67 -DIST google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod 582 BLAKE2B cc82a660be4095a67922226ab37e8331301128d10332fe60fab27f17e1556b90031bf0c11dd53401fb0805632711296b561c1a7526d93545eaccb92c3ca5506a SHA512 930fb5295538f738db5258811eb8cb03e35f916a882cf271ef5175f0ea0d8fe905d040f5974b34cc9594b008f03fa7f4653ef7bcf5160d8498e18af0bc54d9af -DIST google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod 582 BLAKE2B 9551c78d14cf644fc943fc5fd7446eb42482bcb793f5f20db40e61f44178a306ce9aa8d49fddc9e36fff3cd0874d4c7b84b2a2a2139f32e915c938f9c6cd5af5 SHA512 936dc2fb686660be7aa7982ff5b224ac0dabb22d3bceb27287453a8dff62d846b81316588db4f7cbbd9bd172faee0eea6f2a55a8bf0e0ccc7af6414808ca4c02 -DIST google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod 582 BLAKE2B c48eded2a495e3b15d0e72fe82347bf3ea517ee9fc06011b1f3b7a634fab445fdabc88391b802cb0d2376bf322c9dbdb135c2125ac8a95f4f225cd16a1e5aff5 SHA512 7182d531a7ead6167213f15a305e853f1c8cfc92189f4390a0572c735b7c1100584b7572b7b1fe44eb5539ac846a3e5fc66bc2f2c841e5110ee9ae5e5886c063 -DIST google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod 582 BLAKE2B 6144aaa4d8f028d41ecbc807a0286e1d703bbd248c2741c117d78e380c3d84c004a2f7552899c3fd7f241441b8931db63c904b4e8d81e860c5236d921074402a SHA512 a80b81fe93766e995ce621dd5459b203f694e7b4fefbfcd06ff7f75a07c31d23b4575c9d1947ad570efa969083d120f7bdcfecaacd8a386efedad7c740088f69 -DIST google.golang.org%2Fapi%2F@v%2Fv0.36.0.zip 18625897 BLAKE2B e7b8830bf5afe18cfb37306a8bfcab1145a7bbf93028482b81d525395be95ce04050d0c09aa5366d7aba9b8574bc3b8ff87b6d5f52151c2a47cc4e9a2157555b SHA512 42444e77a374ff825ddc9be57d20c33c3a9384ba32ca38fafc2b790d6ed7b00a3229aaae4a4ca31325476927f37b107021aa60a24a4706d7d532a0d5296c4946 -DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a -DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c -DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e -DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e -DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip 417823 BLAKE2B 3ba5afeec03711fd1e2ecb11739fcc4dd770d5f1c23489549c7b3697fd7bb8eb8471fa76569a73b7ad4a2b634a126a055e1d67ab654e399005398655f0bf8a31 SHA512 cb047087045fe995e28b96c1a3ea3cef8b46facfcca80fdc14707f4f09d1429daeca9cbc456ecd9bb2e3d32dde145b75929506b10ffd67d35b3604674dc27b01 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod 340 BLAKE2B 70822d80e0c64a18bea901e30359c66d790629dfcfd7b4512b215b2c29bcfcc862bb68f9480357118c7adbe6a1b42754ef7703bb28e608abef8f8cdcbf6d2396 SHA512 461bf9e9c747d61500f3884c67f82cdf9394b186b512f6ff7537620a8f7a8de7a5c30af81c9a1303c0babfbc748c80460313e6b8e440e1f553fd4e1e8e12321c -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod 323 BLAKE2B 76123f14f32c6702557406271ddd9e0304f0c9d5bb53c2b503a0a1ca74892da8a685270b6463faf7fe746f7398080f8364afc94b6f7ac8ba1170d645328ce5ca SHA512 67bb03661d5b872932d9a18ee7edc2908612a31db6391a8797e1cfa9aec45c6a3643b7943c4157db60f7e7aa235368a844c5e1fb382fa705074fc721c855a441 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200618031413-b414f8b61790.mod 323 BLAKE2B 264c38a1d0b5dec10ed5c1d4a073c68817dd538b602446ea3db3b53569f14dc1bd88250b6bc14656c5206d23e17858b986188fe0c217bf8853c76121d999b08f SHA512 ab15d32d1f044b9b5806dcf075f3cc4e32f2c79e9a273e5dd30848b6ebb26d71270627536f34010cfe23c130badcb02e5b6f306a1cc1f73ba76bb86bc5ba21b5 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200729003335-053ba62fc06f.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200804131852-c06518451d9c.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200825200019-8632dd797987.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201109203340-2640f1f9cdfb.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20201201144952-b05cb90ed32e.zip 8795922 BLAKE2B 27403e2effea6ebe77b5d0f537d45791d77b3c277d96846b6f4e180f723048c471d518f7995302afd09b36f4116c2e3d14200a9701fbe80c7895d7044a839bcd SHA512 5b5b3241643e2acf306ad0d114c5b16dc374d9a7edae70a63ec0c0d2b9d8e52dd4cd9ab49c48f1154c31cb5a7ad4a39a789e1d84d62a3317153a7b14a6ae9944 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod 532 BLAKE2B ebe5fc28123fed2d7c497a7e237039a4a90f6eeb389b61650cede1d3bb850a1cd09c1574ee57fe65b6f4d338bb440a67ff802a28805b044bcc78b39ce2acd5b6 SHA512 85a0f6a03de8c151aacca3944a75738ac01ba368be98d6e4756a772976fccfd0faac55df170feb51ac86a10241a613b2ce1ac7d7c5cbef41ee2ed8eb93416801 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.31.1.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod 578 BLAKE2B db5963bd3e0da1108af3ae72d613cc24fbe23c0569e137ff8c4ba94e393b2b574612e0133a263e8a264cf781469983363a8f147a7f0d9e0f21ed4831772565a0 SHA512 3c04e477a21db637ce07078cb89ad236db3151ca0fe474eab32c326e7e849b41abfa873045d2214bc95e34ebec7767a68f9d5a9828ef286abb4636a14677c479 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.zip 1360328 BLAKE2B 09032b3d1e7204f83d1a7d74f636e45d7dccf773e962a63d58cfc505315e20697acaba7e374f2b03ef5f31f37dd81acb28397c5ec3fdf5750061cd9c4aed34fd SHA512 3f70e3a88f9688fe1d17c7851809051a35d3556204ca7664ceb440f96715db284cd5b5fb62b95aa69a11c3835679aff5566e838954bbb73a6a760143504eb2f9 -DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6 -DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414 -DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378 -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9 -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65 -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9 -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9 -DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774 -DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5 -DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863 diff --git a/net-misc/drive/drive-0.3.9.1-r1.ebuild b/net-misc/drive/drive-0.3.9.1-r1.ebuild deleted file mode 100644 index b1fe7886e7ab..000000000000 --- a/net-misc/drive/drive-0.3.9.1-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=7 - -KEYWORDS="~amd64" -DESCRIPTION="Google Drive client for the commandline" -HOMEPAGE="https://github.com/odeke-em/drive" -LICENSE="Apache-2.0 BSD MIT" -SLOT="0" -IUSE="" -EGO_PN="${HOMEPAGE#*//}" -EGIT_COMMIT="v${PV}" -EGO_VENDOR=( - "cloud.google.com/go ce902a9872e454f175f5e84ceae12514cd33953f github.com/googleapis/google-cloud-go" - "github.com/boltdb/bolt fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5" - "github.com/cheggaaa/pb ca06a0216aa3e3429a8b9667219931c48417bced" - "github.com/codegangsta/inject 33e0aa1cb7c019ccc3fbe049a8262a6403d30504" - "github.com/golang/groupcache 869f871628b6baa9cfbc11732cdf6546b17c1298" - "github.com/golang/protobuf 822fe56949f5d56c9e2f02367c657e0e9b4d27d1" - "github.com/go-martini/martini 22fa46961aabd2665cf3f1343b146d20028f5071" - "github.com/googleapis/gax-go 7cb21a99a18735dde62f5d3cc0244f3f35bd9515" - "github.com/martini-contrib/binding 05d3e151b6cf34dacac6306226a33db68459a3b5" - "github.com/mattn/go-isatty bf9a1dea1961e1d831824fb135332bfb8c10e8b8" - "github.com/mattn/go-runewidth 703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211" - "github.com/odeke-em/cache baf8e436bc97557118cb0bf118ab8ac6aeeda381" - "github.com/odeke-em/cli-spinner 610063bb4aeef25f7645b3e6080456655ec0fb33" - "github.com/odeke-em/command 91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561" - "github.com/odeke-em/exponential-backoff 96e25d36ae36ad09ac02cbfe653b44c4043a8e09" - "github.com/odeke-em/extractor 801861aedb854c7ac5e1329e9713023e9dc2b4d4" - "github.com/odeke-em/go-utils e8ebaed0777a55fa09937617a157dd51386136c2" - "github.com/odeke-em/go-uuid b211d769a9aaba5b2b8bdbab5de3c227116f3c39" - "github.com/odeke-em/log 8d60a6917853243fd746612e6ba47843a794fa82" - "github.com/odeke-em/meddler d2b51d2b40e786ab5f810d85e65b96404cf33570" - "github.com/odeke-em/namespace 0ab79ba44f1328b1ec75ea985ad5c338ba3d56a6" - "github.com/odeke-em/pretty-words 9d37a7fcb4ae6f94b288d371938482994458cecb" - "github.com/odeke-em/rsc 6ad75e1e26192f3d140b6486deb99c9dbd289846" - "github.com/odeke-em/semalim 9c88bf5f9156ed06ec5110a705d41b8580fd96f7" - "github.com/odeke-em/statos 292960a201e2310a667eac7796f4e11cd51021a3" - "github.com/skratchdot/open-golang 79abb63cd66e41cb1473e26d11ebdcd68b04c8e5" - "golang.org/x/crypto 227b76d455e791cb042b03e633e2f7fbcfdf74a5 github.com/golang/crypto" - "golang.org/x/net a8b05e9114ab0cb08faec337c959aed24b68bf50 github.com/golang/net" - "golang.org/x/oauth2 0f29369cfe4552d0e4bcddc57cc75f4d7e672a33 github.com/golang/oauth2" - "golang.org/x/sys b4ddaad3f8a36719f2b8bc6486c14cc468ca2bb5 github.com/golang/sys" - "golang.org/x/text 3d0f7978add91030e5e8976ff65ccdd828286cba github.com/golang/text" - "google.golang.org/api 634b73c1f50be990f1ba97c3f325fb7f88b13775 github.com/googleapis/google-api-go-client" - "google.golang.org/genproto f660b865573183437d2d868f703fe88bb8af0b55 github.com/googleapis/go-genproto" - "google.golang.org/grpc e2cfd1c28f4a49333263cf65123aae57b081750b github.com/grpc/grpc-go" - "go.opencensus.io 65310139a05de5c10077b75ac45eac743aa01214 github.com/census-instrumentation/opencensus-go" -) -inherit golang-vcs-snapshot - -SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -src_compile() { - export -n GOCACHE XDG_CACHE_HOME - GOPATH="${S}" \ - go install -v -work -x ${EGO_BUILD_FLAGS} \ - "${EGO_PN}"/{cmd/drive,drive-server} || die -} - -src_install() { - dodoc "${S}/src/${EGO_PN}/README.md" - dobin "${S}/bin/drive"{,-server} -} diff --git a/net-misc/drive/drive-0.3.9.1.ebuild b/net-misc/drive/drive-0.3.9.1.ebuild deleted file mode 100644 index 8ddfbb9f66f5..000000000000 --- a/net-misc/drive/drive-0.3.9.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KEYWORDS="amd64" -DESCRIPTION="Google Drive client for the commandline" -HOMEPAGE="https://github.com/odeke-em/drive" -LICENSE="Apache-2.0 BSD MIT" -SLOT="0" -IUSE="" -EGO_PN="${HOMEPAGE#*//}" -EGIT_COMMIT="v${PV}" -EGO_VENDOR=( - "cloud.google.com/go a5e721bf760c8055ea3ae8b732da1dc6a10fc3f9 github.com/GoogleCloudPlatform/gcloud-golang" - "github.com/boltdb/bolt fa5367d20c994db73282594be0146ab221657943" - "github.com/cheggaaa/pb 657164d0228d6bebe316fdf725c69f131a50fb10" - "github.com/codegangsta/inject 33e0aa1cb7c019ccc3fbe049a8262a6403d30504" - "github.com/go-martini/martini 22fa46961aabd2665cf3f1343b146d20028f5071" - "github.com/golang/protobuf 11b8df160996e00fd4b55cbaafb3d84ec6d50fa8" - "github.com/googleapis/gax-go 317e0006254c44a0ac427cc52a0e083ff0b9622f" - "github.com/martini-contrib/binding 05d3e151b6cf34dacac6306226a33db68459a3b5" - "github.com/mattn/go-isatty fc9e8d8ef48496124e79ae0df75490096eccf6fe" - "github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d" - "github.com/odeke-em/cache baf8e436bc97557118cb0bf118ab8ac6aeeda381" - "github.com/odeke-em/cli-spinner 610063bb4aeef25f7645b3e6080456655ec0fb33" - "github.com/odeke-em/command 91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561" - "github.com/odeke-em/exponential-backoff 96e25d36ae36ad09ac02cbfe653b44c4043a8e09" - "github.com/odeke-em/extractor 801861aedb854c7ac5e1329e9713023e9dc2b4d4" - "github.com/odeke-em/go-utils e8ebaed0777a55fa09937617a157dd51386136c2" - "github.com/odeke-em/go-uuid b211d769a9aaba5b2b8bdbab5de3c227116f3c39" - "github.com/odeke-em/log 8d60a6917853243fd746612e6ba47843a794fa82" - "github.com/odeke-em/meddler d2b51d2b40e786ab5f810d85e65b96404cf33570" - "github.com/odeke-em/namespace 0ab79ba44f1328b1ec75ea985ad5c338ba3d56a6" - "github.com/odeke-em/pretty-words 9d37a7fcb4ae6f94b288d371938482994458cecb" - "github.com/odeke-em/rsc 6ad75e1e26192f3d140b6486deb99c9dbd289846" - "github.com/odeke-em/semalim 9c88bf5f9156ed06ec5110a705d41b8580fd96f7" - "github.com/odeke-em/statos 292960a201e2310a667eac7796f4e11cd51021a3" - "github.com/skratchdot/open-golang 75fb7ed4208cf72d323d7d02fd1a5964a7a9073c" - "golang.org/x/crypto faadfbdc035307d901e69eea569f5dda451a3ee3 github.com/golang/crypto" - "golang.org/x/net 859d1a86bb617c0c20d154590c3c5d3fcb670b07 github.com/golang/net" - "golang.org/x/oauth2 13449ad91cb26cb47661c1b080790392170385fd github.com/golang/oauth2" - "golang.org/x/text 14c0d48ead0cd47e3104ada247d91be04afc7a5a github.com/golang/text" - "google.golang.org/api 39c3dd417c5a443607650f18e829ad308da08dd2 github.com/google/google-api-go-client" - "google.golang.org/genproto 595979c8a7bf586b2d293fb42246bf91a0b893d9 github.com/google/go-genproto" - "google.golang.org/grpc bb78878767b96d411e740439ac820f118e95ae2f github.com/grpc/grpc-go" -) -inherit golang-vcs-snapshot - -SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -src_compile() { - export -n GOCACHE XDG_CACHE_HOME - GOPATH="${S}" \ - go install -v -work -x ${EGO_BUILD_FLAGS} \ - "${EGO_PN}"/{cmd/drive,drive-server} || die -} - -src_install() { - dodoc "${S}/src/${EGO_PN}/README.md" - dobin "${S}/bin/drive"{,-server} -} diff --git a/net-misc/drive/drive-0.4.0_p20210208.ebuild b/net-misc/drive/drive-0.4.0_p20210208.ebuild deleted file mode 100644 index 0c3afc3d4bfa..000000000000 --- a/net-misc/drive/drive-0.4.0_p20210208.ebuild +++ /dev/null @@ -1,501 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module - -DESCRIPTION="Google Drive client for the commandline" -HOMEPAGE="https://github.com/odeke-em/drive" -EGIT_COMMIT="bede608f250a9333d55c43396fc5e72827e806fd" -EGO_SUM=( -"cloud.google.com/go v0.26.0/go.mod" -"cloud.google.com/go v0.34.0/go.mod" -"cloud.google.com/go v0.38.0/go.mod" -"cloud.google.com/go v0.44.1/go.mod" -"cloud.google.com/go v0.44.2/go.mod" -"cloud.google.com/go v0.45.1/go.mod" -"cloud.google.com/go v0.46.3/go.mod" -"cloud.google.com/go v0.50.0/go.mod" -"cloud.google.com/go v0.52.0/go.mod" -"cloud.google.com/go v0.53.0/go.mod" -"cloud.google.com/go v0.54.0/go.mod" -"cloud.google.com/go v0.56.0/go.mod" -"cloud.google.com/go v0.57.0/go.mod" -"cloud.google.com/go v0.62.0/go.mod" -"cloud.google.com/go v0.65.0/go.mod" -"cloud.google.com/go v0.72.0" -"cloud.google.com/go v0.72.0/go.mod" -"cloud.google.com/go/bigquery v1.0.1/go.mod" -"cloud.google.com/go/bigquery v1.3.0/go.mod" -"cloud.google.com/go/bigquery v1.4.0/go.mod" -"cloud.google.com/go/bigquery v1.5.0/go.mod" -"cloud.google.com/go/bigquery v1.7.0/go.mod" -"cloud.google.com/go/bigquery v1.8.0/go.mod" -"cloud.google.com/go/datastore v1.0.0/go.mod" -"cloud.google.com/go/datastore v1.1.0/go.mod" -"cloud.google.com/go/pubsub v1.0.1/go.mod" -"cloud.google.com/go/pubsub v1.1.0/go.mod" -"cloud.google.com/go/pubsub v1.2.0/go.mod" -"cloud.google.com/go/pubsub v1.3.1/go.mod" -"cloud.google.com/go/storage v1.0.0/go.mod" -"cloud.google.com/go/storage v1.5.0/go.mod" -"cloud.google.com/go/storage v1.6.0/go.mod" -"cloud.google.com/go/storage v1.8.0/go.mod" -"cloud.google.com/go/storage v1.10.0/go.mod" -"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod" -"github.com/BurntSushi/toml v0.3.1/go.mod" -"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod" -"github.com/boltdb/bolt v1.3.1" -"github.com/boltdb/bolt v1.3.1/go.mod" -"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod" -"github.com/cheggaaa/pb v1.0.29" -"github.com/cheggaaa/pb v1.0.29/go.mod" -"github.com/chzyer/logex v1.1.10/go.mod" -"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod" -"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" -"github.com/client9/misspell v0.3.4/go.mod" -"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod" -"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0" -"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod" -"github.com/davecgh/go-spew v1.1.0/go.mod" -"github.com/envoyproxy/go-control-plane v0.9.0/go.mod" -"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod" -"github.com/envoyproxy/go-control-plane v0.9.4/go.mod" -"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod" -"github.com/fatih/color v1.9.0" -"github.com/fatih/color v1.9.0/go.mod" -"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod" -"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod" -"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod" -"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab" -"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod" -"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" -"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod" -"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod" -"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e" -"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod" -"github.com/golang/mock v1.1.1/go.mod" -"github.com/golang/mock v1.2.0/go.mod" -"github.com/golang/mock v1.3.1/go.mod" -"github.com/golang/mock v1.4.0/go.mod" -"github.com/golang/mock v1.4.1/go.mod" -"github.com/golang/mock v1.4.3/go.mod" -"github.com/golang/mock v1.4.4/go.mod" -"github.com/golang/protobuf v1.2.0/go.mod" -"github.com/golang/protobuf v1.3.1/go.mod" -"github.com/golang/protobuf v1.3.2/go.mod" -"github.com/golang/protobuf v1.3.3/go.mod" -"github.com/golang/protobuf v1.3.4/go.mod" -"github.com/golang/protobuf v1.3.5/go.mod" -"github.com/golang/protobuf v1.4.0-rc.1/go.mod" -"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod" -"github.com/golang/protobuf v1.4.0-rc.2/go.mod" -"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod" -"github.com/golang/protobuf v1.4.0/go.mod" -"github.com/golang/protobuf v1.4.1/go.mod" -"github.com/golang/protobuf v1.4.2/go.mod" -"github.com/golang/protobuf v1.4.3" -"github.com/golang/protobuf v1.4.3/go.mod" -"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" -"github.com/google/btree v1.0.0/go.mod" -"github.com/google/go-cmp v0.2.0/go.mod" -"github.com/google/go-cmp v0.3.0/go.mod" -"github.com/google/go-cmp v0.3.1/go.mod" -"github.com/google/go-cmp v0.4.0/go.mod" -"github.com/google/go-cmp v0.4.1/go.mod" -"github.com/google/go-cmp v0.5.0/go.mod" -"github.com/google/go-cmp v0.5.1/go.mod" -"github.com/google/go-cmp v0.5.2/go.mod" -"github.com/google/go-cmp v0.5.4" -"github.com/google/go-cmp v0.5.4/go.mod" -"github.com/google/martian v2.1.0+incompatible/go.mod" -"github.com/google/martian/v3 v3.0.0/go.mod" -"github.com/google/martian/v3 v3.1.0/go.mod" -"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod" -"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod" -"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod" -"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod" -"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod" -"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod" -"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod" -"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod" -"github.com/google/renameio v0.1.0/go.mod" -"github.com/google/uuid v1.1.2/go.mod" -"github.com/googleapis/gax-go/v2 v2.0.4/go.mod" -"github.com/googleapis/gax-go/v2 v2.0.5" -"github.com/googleapis/gax-go/v2 v2.0.5/go.mod" -"github.com/hashicorp/golang-lru v0.5.0/go.mod" -"github.com/hashicorp/golang-lru v0.5.1/go.mod" -"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod" -"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod" -"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod" -"github.com/jstemmer/go-junit-report v0.9.1/go.mod" -"github.com/kisielk/gotool v1.0.0/go.mod" -"github.com/kr/pretty v0.1.0/go.mod" -"github.com/kr/pty v1.1.1/go.mod" -"github.com/kr/text v0.1.0/go.mod" -"github.com/martini-contrib/binding v0.0.0-20160701174519-05d3e151b6cf" -"github.com/martini-contrib/binding v0.0.0-20160701174519-05d3e151b6cf/go.mod" -"github.com/mattn/go-colorable v0.1.4" -"github.com/mattn/go-colorable v0.1.4/go.mod" -"github.com/mattn/go-isatty v0.0.8/go.mod" -"github.com/mattn/go-isatty v0.0.11/go.mod" -"github.com/mattn/go-isatty v0.0.12" -"github.com/mattn/go-isatty v0.0.12/go.mod" -"github.com/mattn/go-runewidth v0.0.4" -"github.com/mattn/go-runewidth v0.0.4/go.mod" -"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f" -"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod" -"github.com/odeke-em/cache v0.0.0-20151107100604-baf8e436bc97" -"github.com/odeke-em/cache v0.0.0-20151107100604-baf8e436bc97/go.mod" -"github.com/odeke-em/cli-spinner v0.0.0-20150423150528-610063bb4aee" -"github.com/odeke-em/cli-spinner v0.0.0-20150423150528-610063bb4aee/go.mod" -"github.com/odeke-em/command v0.0.0-20151021022416-91ca5ec5e9a1" -"github.com/odeke-em/command v0.0.0-20151021022416-91ca5ec5e9a1/go.mod" -"github.com/odeke-em/exponential-backoff v0.0.0-20150606110550-96e25d36ae36" -"github.com/odeke-em/exponential-backoff v0.0.0-20150606110550-96e25d36ae36/go.mod" -"github.com/odeke-em/extractor v0.0.0-20150727035912-801861aedb85" -"github.com/odeke-em/extractor v0.0.0-20150727035912-801861aedb85/go.mod" -"github.com/odeke-em/go-utils v0.0.0-20170224015737-e8ebaed0777a" -"github.com/odeke-em/go-utils v0.0.0-20170224015737-e8ebaed0777a/go.mod" -"github.com/odeke-em/go-uuid v0.0.0-20151221120446-b211d769a9aa" -"github.com/odeke-em/go-uuid v0.0.0-20151221120446-b211d769a9aa/go.mod" -"github.com/odeke-em/log v0.0.0-20170107003526-8d60a6917853" -"github.com/odeke-em/log v0.0.0-20170107003526-8d60a6917853/go.mod" -"github.com/odeke-em/meddler v0.0.0-20151019050616-d2b51d2b40e7" -"github.com/odeke-em/meddler v0.0.0-20151019050616-d2b51d2b40e7/go.mod" -"github.com/odeke-em/namespace v0.0.0-20161218061609-0ab79ba44f13" -"github.com/odeke-em/namespace v0.0.0-20161218061609-0ab79ba44f13/go.mod" -"github.com/odeke-em/pretty-words v0.0.0-20151007025238-9d37a7fcb4ae" -"github.com/odeke-em/pretty-words v0.0.0-20151007025238-9d37a7fcb4ae/go.mod" -"github.com/odeke-em/ripper v0.0.0-20150415060325-bd1a682568fc" -"github.com/odeke-em/ripper v0.0.0-20150415060325-bd1a682568fc/go.mod" -"github.com/odeke-em/semalim v0.0.0-20151225075036-9c88bf5f9156" -"github.com/odeke-em/semalim v0.0.0-20151225075036-9c88bf5f9156/go.mod" -"github.com/odeke-em/statos v0.0.0-20161104082728-292960a201e2" -"github.com/odeke-em/statos v0.0.0-20161104082728-292960a201e2/go.mod" -"github.com/pmezard/go-difflib v1.0.0/go.mod" -"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod" -"github.com/rogpeppe/go-internal v1.3.0/go.mod" -"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e" -"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod" -"github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966" -"github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod" -"github.com/stretchr/objx v0.1.0/go.mod" -"github.com/stretchr/testify v1.4.0/go.mod" -"github.com/yuin/goldmark v1.1.25/go.mod" -"github.com/yuin/goldmark v1.1.27/go.mod" -"github.com/yuin/goldmark v1.1.32/go.mod" -"github.com/yuin/goldmark v1.2.1/go.mod" -"go.opencensus.io v0.21.0/go.mod" -"go.opencensus.io v0.22.0/go.mod" -"go.opencensus.io v0.22.2/go.mod" -"go.opencensus.io v0.22.3/go.mod" -"go.opencensus.io v0.22.4/go.mod" -"go.opencensus.io v0.22.5" -"go.opencensus.io v0.22.5/go.mod" -"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" -"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod" -"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod" -"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod" -"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod" -"golang.org/x/crypto v0.0.0-20201217014255-9d1352758620" -"golang.org/x/crypto v0.0.0-20201217014255-9d1352758620/go.mod" -"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" -"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod" -"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod" -"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod" -"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod" -"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod" -"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod" -"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod" -"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod" -"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod" -"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod" -"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod" -"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" -"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" -"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod" -"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" -"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod" -"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod" -"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod" -"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod" -"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod" -"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod" -"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod" -"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod" -"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod" -"golang.org/x/mod v0.1.0/go.mod" -"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod" -"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod" -"golang.org/x/mod v0.2.0/go.mod" -"golang.org/x/mod v0.3.0/go.mod" -"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" -"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" -"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod" -"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod" -"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" -"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" -"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod" -"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" -"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod" -"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" -"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod" -"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod" -"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod" -"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod" -"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod" -"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod" -"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod" -"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod" -"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod" -"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod" -"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod" -"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod" -"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod" -"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod" -"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod" -"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod" -"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod" -"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod" -"golang.org/x/net v0.0.0-20201216054612-986b41b23924" -"golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod" -"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" -"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod" -"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod" -"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod" -"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod" -"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod" -"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod" -"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5" -"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod" -"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" -"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" -"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" -"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" -"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" -"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" -"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod" -"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod" -"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod" -"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" -"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" -"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod" -"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod" -"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" -"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" -"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod" -"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod" -"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod" -"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod" -"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod" -"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" -"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod" -"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod" -"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod" -"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" -"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod" -"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod" -"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod" -"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod" -"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod" -"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" -"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod" -"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod" -"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod" -"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod" -"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod" -"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod" -"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod" -"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod" -"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" -"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3" -"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/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/text v0.0.0-20170915032832-14c0d48ead0c/go.mod" -"golang.org/x/text v0.3.0/go.mod" -"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod" -"golang.org/x/text v0.3.2/go.mod" -"golang.org/x/text v0.3.3/go.mod" -"golang.org/x/text v0.3.4" -"golang.org/x/text v0.3.4/go.mod" -"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod" -"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" -"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod" -"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" -"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" -"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" -"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" -"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod" -"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod" -"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod" -"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod" -"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" -"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod" -"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod" -"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod" -"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod" -"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod" -"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod" -"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod" -"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod" -"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod" -"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod" -"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod" -"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod" -"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod" -"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod" -"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod" -"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod" -"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod" -"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod" -"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod" -"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod" -"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod" -"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod" -"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod" -"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod" -"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod" -"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod" -"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod" -"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod" -"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod" -"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod" -"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod" -"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod" -"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod" -"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod" -"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" -"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" -"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" -"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1" -"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod" -"google.golang.org/api v0.4.0/go.mod" -"google.golang.org/api v0.7.0/go.mod" -"google.golang.org/api v0.8.0/go.mod" -"google.golang.org/api v0.9.0/go.mod" -"google.golang.org/api v0.13.0/go.mod" -"google.golang.org/api v0.14.0/go.mod" -"google.golang.org/api v0.15.0/go.mod" -"google.golang.org/api v0.17.0/go.mod" -"google.golang.org/api v0.18.0/go.mod" -"google.golang.org/api v0.19.0/go.mod" -"google.golang.org/api v0.20.0/go.mod" -"google.golang.org/api v0.22.0/go.mod" -"google.golang.org/api v0.24.0/go.mod" -"google.golang.org/api v0.28.0/go.mod" -"google.golang.org/api v0.29.0/go.mod" -"google.golang.org/api v0.30.0/go.mod" -"google.golang.org/api v0.35.0/go.mod" -"google.golang.org/api v0.36.0" -"google.golang.org/api v0.36.0/go.mod" -"google.golang.org/appengine v1.1.0/go.mod" -"google.golang.org/appengine v1.4.0/go.mod" -"google.golang.org/appengine v1.5.0/go.mod" -"google.golang.org/appengine v1.6.1/go.mod" -"google.golang.org/appengine v1.6.5/go.mod" -"google.golang.org/appengine v1.6.6/go.mod" -"google.golang.org/appengine v1.6.7" -"google.golang.org/appengine v1.6.7/go.mod" -"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" -"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod" -"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod" -"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" -"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod" -"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod" -"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" -"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod" -"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod" -"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod" -"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod" -"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod" -"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod" -"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod" -"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod" -"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod" -"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod" -"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod" -"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod" -"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod" -"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod" -"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod" -"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod" -"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod" -"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod" -"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod" -"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod" -"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod" -"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod" -"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod" -"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod" -"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e" -"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod" -"google.golang.org/grpc v1.19.0/go.mod" -"google.golang.org/grpc v1.20.1/go.mod" -"google.golang.org/grpc v1.21.1/go.mod" -"google.golang.org/grpc v1.23.0/go.mod" -"google.golang.org/grpc v1.25.1/go.mod" -"google.golang.org/grpc v1.26.0/go.mod" -"google.golang.org/grpc v1.27.0/go.mod" -"google.golang.org/grpc v1.27.1/go.mod" -"google.golang.org/grpc v1.28.0/go.mod" -"google.golang.org/grpc v1.29.1/go.mod" -"google.golang.org/grpc v1.30.0/go.mod" -"google.golang.org/grpc v1.31.0/go.mod" -"google.golang.org/grpc v1.31.1/go.mod" -"google.golang.org/grpc v1.33.2" -"google.golang.org/grpc v1.33.2/go.mod" -"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod" -"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod" -"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod" -"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod" -"google.golang.org/protobuf v1.21.0/go.mod" -"google.golang.org/protobuf v1.22.0/go.mod" -"google.golang.org/protobuf v1.23.0/go.mod" -"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod" -"google.golang.org/protobuf v1.24.0/go.mod" -"google.golang.org/protobuf v1.25.0" -"google.golang.org/protobuf v1.25.0/go.mod" -"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" -"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" -"gopkg.in/errgo.v2 v2.1.0/go.mod" -"gopkg.in/yaml.v2 v2.2.2/go.mod" -"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" -"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod" -"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod" -"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" -"honnef.co/go/tools v0.0.1-2019.2.3/go.mod" -"honnef.co/go/tools v0.0.1-2020.1.3/go.mod" -"honnef.co/go/tools v0.0.1-2020.1.4/go.mod" -"rsc.io/binaryregexp v0.2.0/go.mod" -"rsc.io/quote/v3 v3.1.0/go.mod" -"rsc.io/sampler v1.3.0/go.mod" -) -go-module_set_globals - -SRC_URI="https://github.com/odeke-em/drive/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -KEYWORDS="~amd64" -LICENSE="Apache-2.0 BSD MIT" -SLOT="0" -IUSE="" -S=${WORKDIR}/${PN}-${EGIT_COMMIT} - -src_prepare() { - sed -e "s|qrcode.Encode(uri,|\0 qrcode.Medium,|" -i drive-server/main.go || die - default -} - -src_compile() { - CGO_ENABLED=0 go build -o ./bin/drive ./cmd/drive || die - CGO_ENABLED=0 go build -o ./bin/drive-server ./drive-server || die -} - -src_install() { - dodoc "README.md" - dobin bin/drive bin/drive-server -} diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index 9c19bcaada0f..f3d702c62cb0 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -1 +1,4 @@ -DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da +DIST dropbear-2022.83.tar.bz2 2322904 BLAKE2B 4e26667458fb068a8c997b44dfd3c4f15146f051713a3ea90980db04c6345174d34214269665d74c863c1c1947d6837034aa4c264101b11971c8a3e97f491393 SHA512 c63afa615d64b0c8c5e739c758eb8ae277ecc36a4223b766bf562702de69910904cbc3ea98d22989df478ae419e1f81057fe1ee09616c80cb859f58f44175422 +DIST dropbear-2022.83.tar.bz2.asc 833 BLAKE2B 7dfcf13804738aed3136c264412f8c2f96cd3ff71482815af736346c9441c8f00adef26f4e8f89082cbbb4033249501adbc545c08f678e1cac4afc88a8fc9ed0 SHA512 e5cbd01dcbaeabb04dc473bd11933a422fda03ceb5bc02fb5c99abafd0841e3ac1f436cc1798500b33fbbc81923fa03c2a28c971fa26794ed5888d496fb7e2ad +DIST dropbear-2024.85.tar.bz2 2304594 BLAKE2B 631b71733437a256267057a1c4846afa4d520fa9e29d9c14dfa7df09109c30cc2d649ada990a15c615567f7a1d6ff02340799216b7fa41327d72cb43dd9096e0 SHA512 09619e9874172658b7fc284823e0a619b6a4346a5db41487d1628768b46c1f8eac962bfd8ef73e2a59e466fc4022395f7a194b4309195c954b0d7e0d13254f67 +DIST dropbear-2024.85.tar.bz2.asc 833 BLAKE2B 1d0cc37fb1c528c6f7f6e064d3ec3d7c63617b568d8889592ca162171a325a46e84a23f24c16069b5396c806b2270434552833138ba95c7f34c8b5e6e425fcc7 SHA512 d2ad10b60f53d8d598a7a57337fe890c26c60bea115fb919f6135a01fe3f8f7e5863b0a7ed6c7eacbd5a3b810169b600c0004251a8d748d4b40584933c2c7383 diff --git a/net-misc/dropbear/dropbear-2020.81-r3.ebuild b/net-misc/dropbear/dropbear-2022.83.ebuild index 15ac003888ba..94e79a2f42d8 100644 --- a/net-misc/dropbear/dropbear-2020.81-r3.ebuild +++ b/net-misc/dropbear/dropbear-2022.83.ebuild @@ -1,19 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit savedconfig pam +PYTHON_COMPAT=( python3_{9..11} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc +inherit savedconfig pam python-any-r1 verify-sig -DESCRIPTION="small SSH 2 client/server designed for small memory environments" +DESCRIPTION="Small SSH 2 client/server designed for small memory environments" HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html" SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( + https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2.asc + https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2.asc + )" LICENSE="MIT GPL-2" # (init script is GPL-2 #426056) SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib" +IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib" +RESTRICT="!test? ( test ) test" LIB_DEPEND=" virtual/libcrypt[static-libs(+)] @@ -34,11 +41,27 @@ DEPEND=" static? ( ${LIB_DEPEND} ) " RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )" +BDEPEND=" + test? ( + $(python_gen_any_dep ' + dev-python/attrs[${PYTHON_USEDEP}] + dev-python/iniconfig[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pluggy[${PYTHON_USEDEP}] + dev-python/py[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + ') + ) + verify-sig? ( sec-keys/openpgp-keys-dropbear ) +" REQUIRED_USE="pam? ( !static )" PATCHES=( "${FILESDIR}"/${PN}-0.46-dbscp.patch + "${FILESDIR}"/${PN}-2022.82-tests.patch ) set_options() { @@ -51,7 +74,20 @@ set_options() { ) } +python_check_deps() { + python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/iniconfig[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/pluggy[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/py[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" +} + pkg_setup() { + use test && python-any-r1_pkg_setup + if use static ; then ewarn "Using bundled copies of libtommath and libtomcrypt" fi @@ -76,6 +112,11 @@ src_configure() { # by default as is appropriate for the target. local myeconfargs=( --disable-harden + + # bug #836900 + $(use_enable !elibc_musl lastlog) + $(use_enable !elibc_musl wtmp) + $(use_enable static bundled-libtom) $(use_enable zlib) $(use_enable pam) diff --git a/net-misc/dropbear/dropbear-2024.85.ebuild b/net-misc/dropbear/dropbear-2024.85.ebuild new file mode 100644 index 000000000000..257cdc04ca87 --- /dev/null +++ b/net-misc/dropbear/dropbear-2024.85.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc +inherit pam python-any-r1 savedconfig verify-sig + +DESCRIPTION="Small SSH 2 client/server designed for small memory environments" +HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html" +SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2 + https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( + https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2.asc + https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2.asc + )" + +LICENSE="MIT GPL-2" # (init script is GPL-2 #426056) +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib" +RESTRICT="!test? ( test )" + +LIB_DEPEND=" + virtual/libcrypt[static-libs(+)] + zlib? ( sys-libs/zlib[static-libs(+)] ) +" +RDEPEND=" + acct-group/sshd + acct-user/sshd + !static? ( + >=dev-libs/libtomcrypt-1.18.2-r2[libtommath] + >=dev-libs/libtommath-1.2.0 + ${LIB_DEPEND//\[static-libs(+)]} + ) + pam? ( sys-libs/pam ) +" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )" +BDEPEND=" + test? ( + sys-libs/nss_wrapper + $(python_gen_any_dep ' + dev-python/attrs[${PYTHON_USEDEP}] + dev-python/iniconfig[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pluggy[${PYTHON_USEDEP}] + dev-python/py[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + ') + ) + verify-sig? ( sec-keys/openpgp-keys-dropbear ) +" + +REQUIRED_USE="pam? ( !static )" + +PATCHES=( + "${FILESDIR}"/${PN}-2024.84-dbscp.patch + "${FILESDIR}"/${PN}-2022.82-tests.patch + "${FILESDIR}"/${PN}-2024.84-non-interactive-tests.patch + "${FILESDIR}"/${PN}-2024.84-fix-channels-tests.patch + "${FILESDIR}"/${PN}-2024.84-test-bg-sleep.patch +) + +set_options() { + progs=( + dropbear dbclient dropbearkey + $(usev !minimal "dropbearconvert scp") + ) + makeopts=( + MULTI=$(usex multicall 1 0) + ) +} + +python_check_deps() { + python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/iniconfig[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/pluggy[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/py[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \ + python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup + + if use static ; then + ewarn "Using bundled copies of libtommath and libtomcrypt" + fi +} + +src_prepare() { + default + sed \ + -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \ + -e '/DROPBEAR_X11FWD/s:0:1:' \ + src/default_options.h > localoptions.h || die + sed \ + -e '/pam_start/s:sshd:dropbear:' \ + -i src/svr-authpam.c || die + restore_config localoptions.h + + # remove tests that fail + rm test/test_aslr.py || die + + # dropbearconver is not build with USE minimal + if use minimal; then + rm test/test_dropbearconvert.py || die + fi +} + +src_configure() { + # Notes: + # 1) We use bundled libtom* when static build is enabled because + # libtomcrypt lacks it and we don't particularly want to add it. + # 2) We disable the hardening flags as our compiler already enables them + # by default as is appropriate for the target. + local myeconfargs=( + --disable-harden + + # bug #836900 + $(use_enable !elibc_musl lastlog) + $(use_enable !elibc_musl wtmp) + + $(use_enable static bundled-libtom) + $(use_enable zlib) + $(use_enable pam) + $(use_enable !bsdpty openpty) + $(use_enable shadow) + $(use_enable static) + $(use_enable syslog) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + set_options + emake "${makeopts[@]}" PROGRAMS="${progs[*]}" + + # need symlinks for tests + if use multicall && use test; then + local x + for x in "${progs[@]}" ; do + ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed" + done + fi +} + +src_install() { + set_options + emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install + doman manpages/*.8 + newinitd "${FILESDIR}"/dropbear.init.d dropbear + newconfd "${FILESDIR}"/dropbear.conf.d dropbear + dodoc CHANGES README.md SMALL.md MULTI.md + + # The multi install target does not install the links right. + if use multicall ; then + pushd "${ED}"/usr/bin &> /dev/null || die + local x + for x in "${progs[@]}" ; do + ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed" + done + rm -f dropbear + dodir /usr/sbin + dosym -r /usr/bin/dropbearmulti /usr/sbin/dropbear + popd &> /dev/null || die + fi + save_config localoptions.h + + if ! use minimal ; then + mv "${ED}"/usr/bin/{,db}scp || die + fi + + if use pam; then + pamd_mimic system-remote-login dropbear auth account password session + fi +} diff --git a/net-misc/dropbear/files/dropbear-2022.82-tests.patch b/net-misc/dropbear/files/dropbear-2022.82-tests.patch new file mode 100644 index 000000000000..6619e6c07551 --- /dev/null +++ b/net-misc/dropbear/files/dropbear-2022.82-tests.patch @@ -0,0 +1,25 @@ +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -4,18 +4,13 @@ SHELL=bash + + all: test + +-test: venv/bin/pytest fakekey +- (source ./venv/bin/activate; pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) ) ++test: fakekey ++ pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) + +-one: venv/bin/pytest fakekey +- (source ./venv/bin/activate; pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) -k exit) ++one: fakekey ++ pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) -k exit + + fakekey: + ../dropbearkey -t ecdsa -f $@ + +-venv/bin/pytest: $(srcdir)/requirements.txt +- python3 -m venv init venv +- ./venv/bin/pip install --upgrade pip +- ./venv/bin/pip install -r $(srcdir)/requirements.txt +- + .PHONY: test diff --git a/net-misc/dropbear/files/dropbear-2024.84-dbscp.patch b/net-misc/dropbear/files/dropbear-2024.84-dbscp.patch new file mode 100644 index 000000000000..52095e1427de --- /dev/null +++ b/net-misc/dropbear/files/dropbear-2024.84-dbscp.patch @@ -0,0 +1,20 @@ +--- a/src/dbmulti.c ++++ b/src/dbmulti.c +@@ -60,7 +60,7 @@ + } + #endif + #ifdef DBMULTI_scp +- if (strcmp(progname, "scp") == 0) { ++ if ((strcmp(progname, "scp") == 0) || (strcmp(progname, "dbscp") == 0)) { + return scp_main(argc, argv); + } + #endif +@@ -81,7 +81,7 @@ + "'dropbearconvert' - the key converter\n" + #endif + #ifdef DBMULTI_scp +- "'scp' - secure copy\n" ++ "'dbscp' - secure copy\n" + #endif + , + DROPBEAR_VERSION); diff --git a/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch b/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch new file mode 100644 index 000000000000..0db292da8332 --- /dev/null +++ b/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch @@ -0,0 +1,36 @@ +dbclient obeys $HOME, but dropbear (the server) resolves HOME using getpwnam. +Use sys-libs/nss_wrapper to fake it during tests. + +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -4,7 +4,15 @@ SHELL=bash + + all: test + ++uid:=$(shell id -u) ++gid:=$(shell id -g) + test: fakekey ++ mkdir -p ~/.ssh ++ ../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear ++ ../dropbearkey -y -f ~/.ssh/id_dropbear | grep ^ecdsa > ~/.ssh/authorized_keys ++ echo "$(LOGNAME)::$(uid):$(gid):$(USER):$(HOME):/bin/bash" >> ~/passwd ++ echo "$(LOGNAME)::$(gid):" >> ~/group ++ chmod 0700 ~ ~/.ssh ~/.ssh/authorized_keys ~/passwd ~/group + pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) + + one: fakekey +--- a/test/test_dropbear.py ++++ b/test/test_dropbear.py +@@ -27,7 +27,11 @@ def dropbear(request): + ] + print("subprocess args: ", args) + +- p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True) ++ env = os.environ ++ env['LD_PRELOAD'] = 'libnss_wrapper.so' ++ env['NSS_WRAPPER_PASSWD'] = env['HOME'] + '/passwd' ++ env['NSS_WRAPPER_GROUP'] = env['HOME'] + '/group' ++ p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True, env=env) + # Wait until it has started listening + for l in p.stderr: + if "Not backgrounding" in l: diff --git a/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch b/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch new file mode 100644 index 000000000000..84314f5fd7fa --- /dev/null +++ b/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch @@ -0,0 +1,13 @@ +Force tests to be non-interactive + +--- a/test/test_dropbear.py ++++ b/test/test_dropbear.py +@@ -23,7 +23,7 @@ + args = opt.dropbear.split() + [ + "-p", LOCALADDR + ":" + opt.port, # bind locally only + "-r", opt.hostkey, +- "-F", "-E", ++ "-F", "-E", "-s", + ] + print("subprocess args: ", args) + diff --git a/net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch b/net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch new file mode 100644 index 000000000000..a078eb2e68b6 --- /dev/null +++ b/net-misc/dropbear/files/dropbear-2024.84-test-bg-sleep.patch @@ -0,0 +1,14 @@ +One test passes when run with ebuild ... test, but fails when run by portage. +Mark it as xfail. + +--- a/test/test_channels.py ++++ b/test/test_channels.py +@@ -45,7 +45,7 @@ + r.check_returncode() + assert r.stdout.decode() == dat + +-@pytest.mark.parametrize("fd", [1, 2]) ++@pytest.mark.parametrize("fd", [1, pytest.param(2, marks=pytest.mark.xfail(reason="Fails sometimes"))]) + def test_bg_sleep(request, fd, dropbear): + # https://lists.ucc.asn.au/pipermail/dropbear/2006q1/000362.html + # Rob Landley "Is this a bug?" 24 Mar 2006 diff --git a/net-misc/dropbear/metadata.xml b/net-misc/dropbear/metadata.xml index eaa1bd1c2bb8..80473cbd3d8f 100644 --- a/net-misc/dropbear/metadata.xml +++ b/net-misc/dropbear/metadata.xml @@ -6,20 +6,20 @@ <name>Embedded Gentoo</name> </maintainer> <longdescription> -I was looking for a small and secure SSH server to fit on a laptop with 4 megs ram and no hard -disk, and couldn't find one which was satisfactory. I decided to write my own, and Dropbear is -the result. It implements most required features of the SSH 2 protocol, and other features such -as X11, TCP and Authentication Agent forwarding. Dropbear is Open Source software, distributed -under a MIT-style license. -</longdescription> + I was looking for a small and secure SSH server to fit on a laptop with 4 megs ram and no hard + disk, and couldn't find one which was satisfactory. I decided to write my own, and Dropbear is + the result. It implements most required features of the SSH 2 protocol, and other features such + as X11, TCP and Authentication Agent forwarding. Dropbear is Open Source software, distributed + under a MIT-style license. + </longdescription> <longdescription lang="ja"> -私は 4MB の RAM とハードディスクを搭載しないラップトップ型にぴったりな小さ -くて安全な SSH サーバを探していました。しかし満足するものは見つけられません -でした。私は自身で作ろうと決意しました。その結果が Dropbear です。SSH 2 プ -ロトコルに必要な機能の大半、他にも X11 や TCP、認証エージェント・フォワーデ -ィングといった機能が実装してあります。Dropbear はオープンソースで、MIT スタ -イルのライセンス下で配布されます。 -</longdescription> + 私は 4MB の RAM とハードディスクを搭載しないラップトップ型にぴったりな小さ + くて安全な SSH サーバを探していました。しかし満足するものは見つけられません + でした。私は自身で作ろうと決意しました。その結果が Dropbear です。SSH 2 プ + ロトコルに必要な機能の大半、他にも X11 や TCP、認証エージェント・フォワーデ + ィングといった機能が実装してあります。Dropbear はオープンソースで、MIT スタ + イルのライセンス下で配布されます。 + </longdescription> <use> <flag name="bsdpty">Add support for legacy BSD pty's rather than dynamic UNIX pty's -- do not use this flag unless you are absolutely sure you actually want it</flag> <flag name="multicall">Build all the programs as one little binary (to save space)</flag> @@ -27,5 +27,6 @@ under a MIT-style license. </use> <upstream> <remote-id type="cpe">cpe:/a:matt_johnston:dropbear_ssh_server</remote-id> + <remote-id type="github">mkj/dropbear</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest index bcb1d61f5c13..6805cc564f55 100644 --- a/net-misc/dropbox-cli/Manifest +++ b/net-misc/dropbox-cli/Manifest @@ -1 +1,2 @@ -DIST dropbox-cli-2020.03.04.py.xz 14304 BLAKE2B 600378cbacd6e96c16e1c8464261b260f2d8919ef5f361c4f337386d3849294cf8557d44f1c5d4f5682eadb2f15885a16b0a8fa162929665e518801d23ec35cc SHA512 c6c8f2f3fb08818388f5ac812821a1530214ad18d58191b08092852aa953e2947871145b46a4df4debeb629a870e1182a47fd5a8bdf8b22144e686e19ede689a +DIST dropbox-cli-2023.py.xz 14308 BLAKE2B e0e1f28c911e5744f26bc3854e1283884f7daa57c247f0a13cd5f571124edca1f11e61ea487bccae294b34c4ce30884758662f95d0438efd1e0e3e64ead6a819 SHA512 c11928de24c6ab10c142eedfa244a903795b37bb75e7e805dbf28fe5b18f524db210eb432bf43eb3c99d67b0caca51c85bbe533b3d7d877cfdc7595925483294 +DIST dropbox-cli-2024.01.22.py.xz 14316 BLAKE2B c2bc33a6d1f74103a3685340747c8d9c974f75e0deec4cd97690333b7697730aa61beef1b315f1375a29d02c6bdf2609464b8ff41cffe7b7ec6efd5978762207 SHA512 272ad65476c8ebd55154feb848e1027b891c91252ca3fa3f50c7db84a7c71697843ae999716a671f697b891721b5c536927c2e63fd2c2afd298a37770aebf123 diff --git a/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild b/net-misc/dropbox-cli/dropbox-cli-2023.ebuild index 44de1f5f0fb6..62034ba7f496 100644 --- a/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild +++ b/net-misc/dropbox-cli/dropbox-cli-2023.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-r1 bash-completion-r1 @@ -14,12 +14,12 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" +IUSE="+gpg" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="net-misc/dropbox ${PYTHON_DEPS} - dev-python/pygpgme[${PYTHON_USEDEP}] + gpg? ( app-crypt/gpgme[python] ) dev-python/pygobject:3[${PYTHON_USEDEP}]" S=${WORKDIR} diff --git a/net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild b/net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild new file mode 100644 index 000000000000..d28cac9b0dd3 --- /dev/null +++ b/net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit python-r1 bash-completion-r1 + +DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox" +HOMEPAGE="https://www.dropbox.com/" +# https://linux.dropbox.com/packages/dropbox.py +# https://www.dropbox.com/download?dl=packages/dropbox.py +# https://raw.githubusercontent.com/dropbox/nautilus-dropbox/master/dropbox.in +SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz" +S=${WORKDIR} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+gpg" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="net-misc/dropbox + ${PYTHON_DEPS} + gpg? ( app-crypt/gpgme[python] ) + dev-python/pygobject:3[${PYTHON_USEDEP}]" + +src_install() { + newbin ${P}.py ${PN} + python_replicate_script "${D}"/usr/bin/${PN} + newbashcomp "${FILESDIR}"/${PN}-19-completion ${PN} +} diff --git a/net-misc/dropbox-cli/metadata.xml b/net-misc/dropbox-cli/metadata.xml index c5941bf7de12..1f35bc0d6b20 100644 --- a/net-misc/dropbox-cli/metadata.xml +++ b/net-misc/dropbox-cli/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="person"> <email>grozin@gentoo.org</email> </maintainer> + <use> + <flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> to verify signatures</flag> + </use> </pkgmetadata> diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index ea4b1b56af50..154df373c00b 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -1,2 +1,3 @@ -DIST dropbox-lnx.x86-135.4.4221.tar.gz 99891129 BLAKE2B 0f5e651f3305b89e7635c5df5a184c32fa17203734d0b6e33929497b2e18aa24c5eae77fd8266bbd6b50d805c439cf58c2f329656f7bde22eab7e78c5353d526 SHA512 d3859b79eebe7148452861cc248ae209c473aaa42f0098bbc281badf6a96b1b85ff76cd017376024a01d1f2f0ac2eafc7e2b235cf37e710e04eed9460b47e62f -DIST dropbox-lnx.x86_64-135.4.4221.tar.gz 101696081 BLAKE2B 43aff5b95430c98c67ce58bd838500ea915e6da4c7500da86b1cf9d125b9f4c7c6ef2ab93da77ee17542c0b929f654df470a481135463deb623fe7135569d0c9 SHA512 4ee3b489d1ccce44ce27c06aff7e12f83cf82113d4f032d2a23ad981ed1d21dccb4be12aca801a45a221d1e75fdc6651da27c2fb404f3340ac7043cb8288493e +DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712 +DIST dropbox-lnx.x86-199.4.6287.tar.gz 113741255 BLAKE2B bb7a9b52bfdad485de61fb5b36f4d0651a39769194fcc4a3960b72d0ebe35f0e82024ac449cc2b5a5f4d05eb23b9aa99faada56887049f2108ee931b59a35d22 SHA512 c9dfc4b19736f4b8eeb5ecde6badace4f6023cecf39a61b9729a96f73da6d866dbb4e46d9f5dd1e937ad85ea9966ad590ec80c7af4ff96b18b5cf3d2e6e4651d +DIST dropbox-lnx.x86_64-199.4.6287.tar.gz 116574689 BLAKE2B 8ab6032081b296d08a60fa4a7dd61399ecf333776381d7832dd3d5cc703c071d3991ca735283bc9421ace08b522cbac31ae0764727c34987c199e0c3506686cf SHA512 244f3f7601722bf2f4a821271187472c8bbbb088cfbf61891a6cdb8f9202cc3ec5deec0df88c1e9c39ca27a3addfa97261c75c880444d6cb393c0d15c815182a diff --git a/net-misc/dropbox/dropbox-135.4.4221.ebuild b/net-misc/dropbox/dropbox-199.4.6287.ebuild index 83389e2d0ede..e90baaad900e 100644 --- a/net-misc/dropbox/dropbox-135.4.4221.ebuild +++ b/net-misc/dropbox/dropbox-199.4.6287.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop pax-utils systemd xdg @@ -9,7 +9,9 @@ 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 )" + x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz ) + https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg +" LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" SLOT="0" @@ -85,9 +87,12 @@ src_install() { fperms a+x "${targetdir}"/{dropbox,dropboxd} dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" - use X && doicon -s 16 -c status "${T}"/status + if use X; then + doicon -s 16 -c status "${T}"/status + newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg + fi - make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo" + make_desktop_entry "${PN}" "Dropbox" "dropbox" newinitd "${FILESDIR}"/dropbox.initd dropbox newconfd "${FILESDIR}"/dropbox.conf dropbox diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest deleted file mode 100644 index f4811f08640d..000000000000 --- a/net-misc/econnman/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b diff --git a/net-misc/econnman/econnman-1.1-r2.ebuild b/net-misc/econnman/econnman-1.1-r2.ebuild deleted file mode 100644 index 9e8ccac3016b..000000000000 --- a/net-misc/econnman/econnman-1.1-r2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit python-single-r1 - -DESCRIPTION="ConnMan User Interface written with EFL & python" -HOMEPAGE="https://phab.enlightenment.org/w/projects/econnman/ https://www.enlightenment.org/" -SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - dev-libs/efl[X,connman] - $(python_gen_cond_dep ' - dev-python/python-efl[${PYTHON_USEDEP}] - ')" - -src_prepare() { - default - python_fix_shebang econnman-bin.in - sed -e \ - 's/Categories=Network;Settings;Enlightenment;/Categories=Network;Settings;Dialup;Monitor;/g' \ - -i data/desktop/econnman{.desktop,-agent.desktop} || die -} diff --git a/net-misc/efax/efax-0.9a_p19_p1.ebuild b/net-misc/efax/efax-0.9a_p19_p1.ebuild index f15a6494aef2..cc28377d9026 100644 --- a/net-misc/efax/efax-0.9a_p19_p1.ebuild +++ b/net-misc/efax/efax-0.9a_p19_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -38,7 +38,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_install() { diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest index a58a2b1edc16..ac4a3f1698a5 100644 --- a/net-misc/electron-cash/Manifest +++ b/net-misc/electron-cash/Manifest @@ -1,2 +1 @@ -DIST electron-cash-4.0.2.tar.gz 8967992 BLAKE2B 081546d148dbc7da5e192154818831e125437c00093e1fe434ef0a67f8c06ceb1d2b1f44de9e71aac5786f995aeffd8fb6b74c64f6aa249f5cc9c06c9a276845 SHA512 dad17906f1dc2e53d4c6bff15a38d3276d16377f71b4d4e260b7b667f2b045da49f504483606d4515cdf71300b67108301b6cce971d1cca16c3856023b3e3f3a -DIST electron-cash-4.2.3.tar.gz 7593885 BLAKE2B 902e1b93958b2796e2679327e81c9c5637f57ac1a840291b30a515bcd8c2b12724dfa075e38f1265eebc2a734bc715ddcbd98eaf13903d99b78fa3dd4f704d03 SHA512 0917d67501bb29dc49be25d7845a892c42f08718e7ff0560c27e34a6ba093acfd7ccf15cd1f5d09b03ff01b41c8d9cce84a9968388fae3d52f6a13f1cfb01a0a +DIST electron-cash-4.2.11.tar.gz 8039918 BLAKE2B 3139647fd22aaa88ff9a514b83e12dd3b36abb6affe9b51b270e1936f4d37ec3ea867ebcfe388f428392093996d2bf7d1268ee0b2447c5d559a39c3e35745dfc SHA512 7b01d2d94b29a3f054738cd89344a7c15136f90d6aa66dd587da315471aeb053bee1d7bbeab46016054b7dd98915bb2225a381d082a8fd137997c05957e2d44a diff --git a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild b/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild deleted file mode 100644 index 35dac74afdd3..000000000000 --- a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7..9} ) - -PYTHON_REQ_USE="ncurses?" - -inherit desktop distutils-r1 gnome2-utils xdg-utils - -MY_P="Electron-Cash-${PV}" -DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)" -HOMEPAGE="https://github.com/fyookball/electrum/" -SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb - l10n_es l10n_ja l10n_pt l10n_zh-CN" - -REQUIRED_USE=" - || ( cli ncurses qt5 ) - audio_modem? ( qt5 ) - cosign? ( qt5 ) - digitalbitbox? ( qt5 ) - email? ( qt5 ) - qrcode? ( qt5 ) - sync? ( qt5 ) - vkb? ( qt5 ) -" - -RDEPEND=" - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/ecdsa[${PYTHON_USEDEP}] - dev-python/jsonrpclib[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( dev-lang/python ) - dev-libs/libsecp256k1 -" - -S="${WORKDIR}/${MY_P}" - -DOCS="RELEASE-NOTES" - -src_prepare() { - eapply "${FILESDIR}/3.3.6-no-user-root.patch" - - # Prevent icon from being installed in the wrong location - sed -i '/icons/d' setup.py || die - - if use qt5; then - pyrcc5 icons.qrc -o gui/qt/icons_rc.py || die - else - sed "s|'electroncash_gui.qt',||" -i setup.py || die - fi - - local wordlist= - for wordlist in \ - $(usex l10n_ja '' japanese) \ - $(usex l10n_pt '' portuguese) \ - $(usex l10n_es '' spanish) \ - $(usex l10n_zh-CN '' chinese_simplified) \ - ; do - rm -f "lib/wordlist/${wordlist}.txt" || die - sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die - done - - # Remove unrequested GUI implementations: - local gui setup_py_gui - for gui in \ - $(usex cli '' stdio) \ - kivy \ - $(usex qt5 '' qt ) \ - $(usex ncurses '' text ) \ - ; do - rm gui/"${gui}"* -r || die - done - - # And install requested ones... - for gui in \ - $(usex qt5 qt '') \ - ; do - setup_py_gui="${setup_py_gui}'electrum_gui.${gui}'," - done - - sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die - - local bestgui - if use qt5; then - bestgui=qt - elif use ncurses; then - bestgui=text - else - bestgui=stdio - fi - sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' "${PN}" || die - - local plugin - # trezor requires python trezorlib module - # keepkey requires trezor - for plugin in \ - $(usex audio_modem '' audio_modem ) \ - $(usex cosign '' cosigner_pool ) \ - $(usex digitalbitbox '' digitalbitbox ) \ - $(usex email '' email_requests ) \ - hw_wallet \ - ledger \ - keepkey \ - $(usex sync '' labels ) \ - trezor \ - $(usex vkb '' virtualkeyboard ) \ - ; do - rm -r plugins/"${plugin}"* || die - sed -i "/${plugin}/d" setup.py || die - done - - eapply_user - - distutils-r1_src_prepare -} - -src_install() { - doicon -s 128 icons/${PN}.png - distutils-r1_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electron-cash/electron-cash-4.2.3.ebuild b/net-misc/electron-cash/electron-cash-4.2.11.ebuild index 2bd6c9e8666a..993cd0db3cc4 100644 --- a/net-misc/electron-cash/electron-cash-4.2.3.ebuild +++ b/net-misc/electron-cash/electron-cash-4.2.11.ebuild @@ -1,27 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517=setuptools PYTHON_REQ_USE="ncurses?" -inherit desktop distutils-r1 gnome2-utils xdg-utils +inherit desktop distutils-r1 xdg-utils MY_P="Electron-Cash-${PV}" DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)" -HOMEPAGE="https://github.com/fyookball/electrum/" -SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/Electron-Cash/Electron-Cash" +SRC_URI="https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="amodem audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb +IUSE="amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb l10n_es l10n_ja l10n_pt l10n_zh-CN" +RESTRICT+=" test" REQUIRED_USE=" - !audio_modem || ( cli ncurses qt5 ) amodem? ( qt5 ) cosign? ( qt5 ) @@ -32,10 +33,13 @@ REQUIRED_USE=" vkb? ( qt5 ) " +BDEPEND="${DISTUTILS_DEPS}" + RDEPEND=" dev-python/dnspython[${PYTHON_USEDEP}] dev-python/ecdsa[${PYTHON_USEDEP}] dev-python/jsonrpclib[${PYTHON_USEDEP}] + dev-python/pathvalidate[${PYTHON_USEDEP}] dev-python/pbkdf2[${PYTHON_USEDEP}] dev-python/pyaes[${PYTHON_USEDEP}] dev-python/PySocks[${PYTHON_USEDEP}] @@ -54,6 +58,8 @@ RDEPEND=" dev-libs/libsecp256k1 " +distutils_enable_tests pytest + S="${WORKDIR}/${MY_P}" DOCS="RELEASE-NOTES" @@ -62,7 +68,9 @@ src_prepare() { eapply "${FILESDIR}/3.3.6-no-user-root.patch" # Prevent icon from being installed in the wrong location - sed -i '/icons/d' setup.py || die + sed -e '/icons/d' \ + -e "s:\\(os.path.join(\\)share_dir:\\1'share':" \ + -i setup.py || die if use qt5; then pyrcc5 icons.qrc -o electroncash_gui/qt/icons_rc.py || die @@ -144,11 +152,11 @@ pkg_preinst() { } pkg_postinst() { - gnome2_icon_cache_update + xdg_icon_cache_update xdg_desktop_database_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update xdg_desktop_database_update } diff --git a/net-misc/electron-cash/metadata.xml b/net-misc/electron-cash/metadata.xml index 1b7e4b952e85..213f5fe41bbc 100644 --- a/net-misc/electron-cash/metadata.xml +++ b/net-misc/electron-cash/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="cli">Enables the CLI interface</flag> <flag name="amodem">Enable plugin to support Audio Modem</flag> - <flag name="audio_modem">Deprecated name for amodem</flag> <flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag> <flag name="digitalbitbox">Enable plugin to support Digital Bitbox hardware wallet</flag> <flag name="email">Enable plugin to support emailing invoices</flag> @@ -17,6 +16,6 @@ <flag name="vkb">Enable plugin for virtual keyboard</flag> </use> <upstream> - <remote-id type="github">fyookball/electrum</remote-id> + <remote-id type="github">Electron-Cash/Electron-Cash</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/electrum-ltc/Manifest b/net-misc/electrum-ltc/Manifest index 52912f963035..37e653f60e61 100644 --- a/net-misc/electrum-ltc/Manifest +++ b/net-misc/electrum-ltc/Manifest @@ -1 +1 @@ -DIST electrum-ltc-4.0.9.1.tar.gz 4464915 BLAKE2B 2c328f9fc433f39b11aa2bfc4e397b75aadd07adc66576ae985c5b41b32d663df80bb67dafbbce210f3581f6fb43e666070d090bf189eb4907efd07d306fc945 SHA512 926ad16246d0609a787614b84cadfa893ed792ab2a54a3c0b9d707019e29874b1ae1c42dba098f34b61f915d85578809ff87dc9026c85563264a2d2b583c8823 +DIST electrum-ltc-4.2.2.1.tar.gz 5109859 BLAKE2B b3327f6bcf23b5caca6196e380e62f154a9f56a5b636a8d0cc49e08ed0ab5a05b4b1a81d9869b92125526339924ccb9b555a704eb7fa98bce59eac6088c7ebfe SHA512 1ac44a29cd0db7de9570e339892ff42bd72abbe3eeb9f8106eda7be67dbb492cc830881d52f915ffde776892d461f9cff1b88a9ee20bf3c64139c407118e4eb9 diff --git a/net-misc/electrum-ltc/electrum-ltc-4.0.9.1.ebuild b/net-misc/electrum-ltc/electrum-ltc-4.0.9.1.ebuild deleted file mode 100644 index 7cdd8f438e5b..000000000000 --- a/net-misc/electrum-ltc/electrum-ltc-4.0.9.1.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_8 ) -PYTHON_REQ_USE="ncurses?" - -inherit desktop distutils-r1 gnome2-utils xdg-utils - -EGIT_COMMIT="${PV}" -DESCRIPTION="Litecoin thin client" -HOMEPAGE="https://electrum-ltc.org/" -SRC_URI="https://github.com/pooler/electrum-ltc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb - l10n_es l10n_ja l10n_pt-BR l10n_pt-PT l10n_zh-CN" - -REQUIRED_USE=" - || ( cli ncurses qt5 ) - audio_modem? ( qt5 ) - cosign? ( qt5 ) - digitalbitbox? ( qt5 ) - email? ( qt5 ) - qrcode? ( qt5 ) - sync? ( qt5 ) - vkb? ( qt5 ) -" - -RDEPEND="${PYTHON_DEPS} - dev-python/aiohttp-socks[${PYTHON_USEDEP}] - =dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}] - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/ecdsa[${PYTHON_USEDEP}] - dev-python/jsonrpclib[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] - qrcode? ( media-gfx/zbar[v4l] ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - ncurses? ( dev-lang/python ) -" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -DOCS="RELEASE-NOTES" - -src_prepare() { - eapply "${FILESDIR}/3.1.2-no-user-root.patch" - eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch" - eapply "${FILESDIR}/3.3.2-desktop.patch" - - # unbind aiorpcX dep - sed -e '/aiorpcx/s:,<0.19::' \ - -i contrib/requirements/requirements.txt || die - - # Prevent icon from being installed in the wrong location - sed -i '/icons_dirname/d' setup.py || die - - if ! use qt5; then - sed "/'electrum_ltc.gui.qt',/d" -i setup.py || die - fi - - local wordlist= - for wordlist in \ - $(usex l10n_ja '' japanese) \ - $(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \ - $(usex l10n_es '' spanish) \ - $(usex l10n_zh-CN '' chinese_simplified) \ - ; do - rm -f "${PN}/wordlist/${wordlist}.txt" || die - sed -i "/${wordlist}\\.txt/d" ${PN/-/_}/mnemonic.py || die - done - - # Remove unrequested GUI implementations: - local gui setup_py_gui - for gui in \ - $(usex cli '' stdio) \ - kivy \ - $(usex qt5 '' qt ) \ - $(usex ncurses '' text ) \ - ; do - rm ${PN/-/_}/gui/"${gui}"* -r || die - done - - # And install requested ones... - for gui in \ - $(usex qt5 qt '') \ - ; do - setup_py_gui="${setup_py_gui}'electrum_gui.${gui}'," - done - - sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die - - local bestgui - if use qt5; then - bestgui=qt - elif use ncurses; then - bestgui=text - else - bestgui=stdio - fi - sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN/-/_}/${PN} || die - - local plugin - # trezor requires python trezorlib module - # keepkey requires trezor - for plugin in \ - $(usex audio_modem '' audio_modem ) \ - $(usex cosign '' cosigner_pool ) \ - $(usex digitalbitbox '' digitalbitbox ) \ - $(usex email '' email_requests ) \ - ledger \ - keepkey \ - $(usex sync '' labels ) \ - trezor \ - $(usex vkb '' virtualkeyboard ) \ - ; do - rm -r ${PN/-/_}/plugins/"${plugin}"* || die - sed -i "/${plugin}/d" setup.py || die - done - - eapply_user - - xdg_environment_reset - distutils-r1_src_prepare -} - -src_install() { - doicon -s 128 ${PN/-/_}/gui/icons/${PN}.png - distutils-r1_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-misc/electrum/electrum-4.1.5.ebuild b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild index 1efda47c7185..bc67b230cfc0 100644 --- a/net-misc/electrum/electrum-4.1.5.ebuild +++ b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -PYTHON_COMPAT=( python3_{8..9} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="ncurses?" -inherit desktop distutils-r1 xdg-utils +inherit distutils-r1 xdg-utils desktop -DESCRIPTION="User friendly Bitcoin client" -HOMEPAGE="https://electrum.org/" -SRC_URI=" - https://github.com/spesmilo/electrum/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz" +DESCRIPTION="User friendly Litecoin client" +HOMEPAGE="https://electrum-ltc.org/" +SRC_URI="https://github.com/pooler/electrum-ltc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="cli ncurses qrcode +qt5" REQUIRED_USE="|| ( cli ncurses qt5 )" -RDEPEND="${PYTHON_DEPS} +RDEPEND=" + ${PYTHON_DEPS} dev-libs/libsecp256k1 + dev-python/scrypt[${PYTHON_USEDEP}] >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}] - =dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}] + =dev-python/aiorpcx-0.22*[${PYTHON_USEDEP}] >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] dev-python/bitstring[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}] @@ -51,20 +52,11 @@ BDEPEND=" distutils_enable_tests pytest src_prepare() { - eapply "${FILESDIR}/3.1.2-no-user-root.patch" - eapply "${FILESDIR}/3.3.2-desktop.patch" - - # unbind aiorpcX dep - sed -e '/aiorpcx/s:,<0.19::' \ - -i contrib/requirements/requirements.txt || die - sed -e '/aiorpcx/s:raise.*:pass:' \ - -i run_electrum || die - - # Prevent icon from being installed in the wrong location - sed -i '/icons_dirname/d' setup.py || die - # use backwards-compatible cryptodome API - sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die + sed -i -e 's:Cryptodome:Crypto:' electrum_ltc/crypto.py || die + + # make qdarkstyle dep optional + sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die local bestgui if use qt5; then @@ -74,7 +66,6 @@ src_prepare() { else bestgui=stdio fi - sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die eapply_user @@ -83,9 +74,10 @@ src_prepare() { } src_install() { - doicon -s 128 electrum/gui/icons/${PN}.png dodoc RELEASE-NOTES distutils-r1_src_install + domenu electrum-ltc.desktop + doicon electrum_ltc/gui/icons/electrum-ltc.png } pkg_postinst() { diff --git a/net-misc/electrum-ltc/files/3.1.2-no-user-root.patch b/net-misc/electrum-ltc/files/3.1.2-no-user-root.patch deleted file mode 100644 index 0d4781717714..000000000000 --- a/net-misc/electrum-ltc/files/3.1.2-no-user-root.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur Electrum-3.1.2.orig/setup.py Electrum-3.1.2/setup.py ---- Electrum-3.1.2.orig/setup.py 2018-03-28 04:51:11.000000000 -0400 -+++ Electrum-3.1.2/setup.py 2018-03-31 15:05:45.540757981 -0400 -@@ -28,13 +28,6 @@ - opts, _ = parser.parse_known_args(sys.argv[1:]) - usr_share = os.path.join(sys.prefix, "share") - icons_dirname = 'pixmaps' -- if not os.access(opts.root_path + usr_share, os.W_OK) and \ -- not os.access(opts.root_path, os.W_OK): -- icons_dirname = 'icons' -- if 'XDG_DATA_HOME' in os.environ.keys(): -- usr_share = os.environ['XDG_DATA_HOME'] -- else: -- usr_share = os.path.expanduser('~/.local/share') - data_files += [ - (os.path.join(usr_share, 'applications/'), ['electrum.desktop']), - (os.path.join(usr_share, icons_dirname), ['icons/electrum.png']) diff --git a/net-misc/electrum-ltc/files/3.2.3-pip-optional-pkgs.patch b/net-misc/electrum-ltc/files/3.2.3-pip-optional-pkgs.patch deleted file mode 100644 index 6d62f5675764..000000000000 --- a/net-misc/electrum-ltc/files/3.2.3-pip-optional-pkgs.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2018-09-17 12:56:34.000000000 +0100 -+++ b/setup.py 2018-10-14 14:46:16.524385198 +0100 -@@ -72,7 +72,6 @@ - name="Electrum", - version=version.ELECTRUM_VERSION, - install_requires=requirements, -- extras_require=extras_require, - packages=[ - 'electrum', - 'electrum.gui', diff --git a/net-misc/electrum-ltc/files/3.3.2-desktop.patch b/net-misc/electrum-ltc/files/3.3.2-desktop.patch deleted file mode 100644 index c75f282182e7..000000000000 --- a/net-misc/electrum-ltc/files/3.3.2-desktop.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/electrum-ltc.desktop -+++ b/electrum-ltc.desktop -@@ -3,7 +3,7 @@ - - [Desktop Entry] - Comment=Lightweight Litecoin Client --Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-ltc %u" -+Exec=electrum-ltc %u - GenericName[en_US]=Litecoin Wallet - GenericName=Litecoin Wallet - Icon=electrum-ltc -@@ -15,8 +15,3 @@ - Terminal=false - Type=Application - MimeType=x-scheme-handler/litecoin; --Actions=Testnet; -- --[Desktop Action Testnet] --Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-ltc --testnet %u" --Name=Testnet mode diff --git a/net-misc/electrum-ltc/metadata.xml b/net-misc/electrum-ltc/metadata.xml index b26064ef2ca1..ba01051095fc 100644 --- a/net-misc/electrum-ltc/metadata.xml +++ b/net-misc/electrum-ltc/metadata.xml @@ -7,12 +7,9 @@ </maintainer> <use> <flag name="cli">Enables the CLI interface</flag> - <flag name="audio_modem">Enable plugin to support Audio Modem</flag> - <flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag> - <flag name="digitalbitbox">Enable plugin to support Digital Bitbox hardware wallet</flag> - <flag name="email">Enable plugin to support emailing invoices</flag> <flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag> - <flag name="sync">Enable plugin to sync wallet metadata across multiple Electrum clients</flag> - <flag name="vkb">Enable plugin for virtual keyboard</flag> </use> + <upstream> + <remote-id type="github">pooler/electrum-ltc</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index 13cc592bad43..fac2490a9d79 100644 --- a/net-misc/electrum/Manifest +++ b/net-misc/electrum/Manifest @@ -1 +1 @@ -DIST electrum-4.1.5.gh.tar.gz 4998188 BLAKE2B c33f1a8fa2af68370319a4f4fefe4d1814a20870114f4929d53bf90eca6bbb555cf9e52681f329d18dec32642ee21ee0e32558ec817936291296ce8e196c8fb1 SHA512 9430dfde6d6e78bb71db416cd35f474b44e234d69421b370dc7e4b09584ad86e095051dcf1366c142d5e6c3029aca617b4fb383f50904fc43d2f7f99053b1c92 +DIST electrum-4.5.4.gh.tar.gz 4911082 BLAKE2B 89a58966426b705e0ddfadd75d4c2996976abb66695edd5d426c0232f58a2da701f20112f31a2498858c61a4a1cd9e048b44072bad128b54651929b96341c1c3 SHA512 3fda9a931067e35d8bc11da8855553a1208428975fe65b0fc20eb26bdd2c3840b5c3ed4261e60344c7256461887d286e432568ef385d9c6b1216e708e099b34b diff --git a/net-misc/electrum/electrum-4.5.4.ebuild b/net-misc/electrum/electrum-4.5.4.ebuild new file mode 100644 index 000000000000..2c984c185636 --- /dev/null +++ b/net-misc/electrum/electrum-4.5.4.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="ncurses?" + +inherit distutils-r1 xdg-utils + +DESCRIPTION="User friendly Bitcoin client" +HOMEPAGE=" + https://electrum.org/ + https://github.com/spesmilo/electrum/ +" +SRC_URI=" + https://github.com/spesmilo/electrum/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="cli ncurses qrcode +qt5" +REQUIRED_USE="|| ( cli ncurses qt5 )" + +RDEPEND=" + ${PYTHON_DEPS} + <dev-libs/libsecp256k1-0.4 + >=dev-python/aiohttp-socks-0.8.4[${PYTHON_USEDEP}] + =dev-python/aiorpcx-0.22*[${PYTHON_USEDEP}] + >=dev-python/attrs-20.1.0[${PYTHON_USEDEP}] + dev-python/bitstring[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + >=dev-python/dnspython-2[${PYTHON_USEDEP}] + dev-python/jsonpatch[${PYTHON_USEDEP}] + dev-python/pbkdf2[${PYTHON_USEDEP}] + dev-python/pyperclip[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-3.20[${PYTHON_USEDEP}] + qrcode? ( media-gfx/zbar[v4l] ) + qt5? ( + dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + ) + ncurses? ( $(python_gen_impl_dep 'ncurses') ) +" +BDEPEND=" + test? ( + dev-python/pyaes[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +EPYTEST_IGNORE=( + # test for qml/PyQt6 GUI that doesn't work anyway + tests/test_qml_types.py +) + +src_prepare() { + # use backwards-compatible cryptodome API + sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die + + # make qdarkstyle dep optional + sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die + + # remove upper bounds from deps + sed -i -e 's:,<[0-9.]*::' contrib/requirements/requirements.txt || die + + local bestgui + if use qt5; then + bestgui=qt + elif use ncurses; then + bestgui=text + else + bestgui=stdio + fi + sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die + + eapply_user + + xdg_environment_reset + distutils-r1_src_prepare +} + +src_install() { + dodoc RELEASE-NOTES + distutils-r1_src_install +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + + local v + for v in ${REPLACING_VERSIONS}; do + ver_test "${v}" -ge 4.3.4 && return + done + + ewarn "If you are new to BitCoin, please be aware that:" + ewarn "1. Cryptocurrencies are volatile. BTC has been subject to rapid" + ewarn " changes of value in the past." + ewarn "2. Cryptocurrency ownership is determined solely by the access to" + ewarn " the private key. If the key is lost or stolen, BTC are unrevocably" + ewarn " lost." + ewarn "3. Proof-of-work based cryptocurrencies have negative environmental" + ewarn " impact. BTC mining is consuming huge amounts of electricity." +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/net-misc/electrum/files/3.1.2-no-user-root.patch b/net-misc/electrum/files/3.1.2-no-user-root.patch deleted file mode 100644 index 0d4781717714..000000000000 --- a/net-misc/electrum/files/3.1.2-no-user-root.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur Electrum-3.1.2.orig/setup.py Electrum-3.1.2/setup.py ---- Electrum-3.1.2.orig/setup.py 2018-03-28 04:51:11.000000000 -0400 -+++ Electrum-3.1.2/setup.py 2018-03-31 15:05:45.540757981 -0400 -@@ -28,13 +28,6 @@ - opts, _ = parser.parse_known_args(sys.argv[1:]) - usr_share = os.path.join(sys.prefix, "share") - icons_dirname = 'pixmaps' -- if not os.access(opts.root_path + usr_share, os.W_OK) and \ -- not os.access(opts.root_path, os.W_OK): -- icons_dirname = 'icons' -- if 'XDG_DATA_HOME' in os.environ.keys(): -- usr_share = os.environ['XDG_DATA_HOME'] -- else: -- usr_share = os.path.expanduser('~/.local/share') - data_files += [ - (os.path.join(usr_share, 'applications/'), ['electrum.desktop']), - (os.path.join(usr_share, icons_dirname), ['icons/electrum.png']) diff --git a/net-misc/electrum/files/3.3.2-desktop.patch b/net-misc/electrum/files/3.3.2-desktop.patch deleted file mode 100644 index e932623be246..000000000000 --- a/net-misc/electrum/files/3.3.2-desktop.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur Electrum-3.3.2.orig/electrum.desktop Electrum-3.3.2/electrum.desktop ---- Electrum-3.3.2.orig/electrum.desktop 2000-11-11 06:11:11.000000000 -0500 -+++ Electrum-3.3.2/electrum.desktop 2019-01-08 20:47:55.628978706 -0500 -@@ -3,7 +3,7 @@ - - [Desktop Entry] - Comment=Lightweight Bitcoin Client --Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u" -+Exec=electrum %u - GenericName[en_US]=Bitcoin Wallet - GenericName=Bitcoin Wallet - Icon=electrum -@@ -14,8 +14,3 @@ - Terminal=false - Type=Application - MimeType=x-scheme-handler/bitcoin; --Actions=Testnet; -- --[Desktop Action Testnet] --Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u" --Name=Testnet mode diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml index 8f2706737ba4..59934e878784 100644 --- a/net-misc/electrum/metadata.xml +++ b/net-misc/electrum/metadata.xml @@ -5,10 +5,6 @@ <email>mgorny@gentoo.org</email> <name>Michał Górny</name> </maintainer> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> <maintainer type="person" proxied="yes"> <email>luke-jr+gentoobugs@utopios.org</email> <name>Luke Dashjr</name> @@ -18,4 +14,7 @@ <flag name="cli">Enables the CLI interface</flag> <flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag> </use> + <upstream> + <remote-id type="github">spesmilo/electrum</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/email-validator/Manifest b/net-misc/email-validator/Manifest new file mode 100644 index 000000000000..0b9fbb98d60d --- /dev/null +++ b/net-misc/email-validator/Manifest @@ -0,0 +1 @@ +DIST email-validator-1.1.0.tar.gz 17544 BLAKE2B a738c0828881fc65b4fd9a6ec0d660f39ed8337338afd8def452871149907f871b5938f03dd94bd7469be544eb3281dcd82f89fd6f80dcaaf9c5ee402194baa4 SHA512 c6714db0fbaf7aa03e5171347c4efe2485a367345a8a9d50f9143f73c18a0ab609aed62816868826d180370d5020f626fd8e31c08d4524cf5157227d0b200c31 diff --git a/net-misc/email-validator/email-validator-1.1.0.ebuild b/net-misc/email-validator/email-validator-1.1.0.ebuild new file mode 100644 index 000000000000..6157158555f4 --- /dev/null +++ b/net-misc/email-validator/email-validator-1.1.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CABAL_FEATURES="test-suite" +inherit haskell-cabal + +DESCRIPTION="Basic syntax and deliverability checks on email addresses" +HOMEPAGE="https://michael.orlitzky.com/code/email-validator.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +RESTRICT=test # Ambiguous module name ‘Network.DNS’: dns-4.0.1 resolv-0.1.2.0 + +RDEPEND=">=dev-haskell/cmdargs-0.10:= + >=dev-haskell/dns-2:= + >=dev-haskell/email-validate-2:= + >=dev-haskell/hunit-1.2:= + >=dev-haskell/parallel-io-0.3:= + >=dev-haskell/pcre-light-0.4:= + >=dev-haskell/tasty-0.8:= + >=dev-haskell/tasty-hunit-0.8:= + >=dev-lang/ghc-7.6.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.16.0 + test? ( >=dev-haskell/doctest-0.9 ) +" + +src_install() { + haskell-cabal_src_install + doman "${S}/doc/man1/${PN}.1" +} diff --git a/net-misc/email-validator/metadata.xml b/net-misc/email-validator/metadata.xml new file mode 100644 index 000000000000..ffea1c02a1d2 --- /dev/null +++ b/net-misc/email-validator/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>mjo@gentoo.org</email> + </maintainer> + <longdescription> + Validate an email address using three techniques: + + * Ensuring that the length of local and domain parts is within the + RFC-specified limits. + + * A syntax check using a regular expression, or the full RFC 5322 + grammar. + + * Confirmation of valid MX records (or, optionally, 'A' + records) for the domain. + </longdescription> +</pkgmetadata> diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest index f654d01261bf..14ed10641ef4 100644 --- a/net-misc/ena-driver/Manifest +++ b/net-misc/ena-driver/Manifest @@ -1,2 +1,3 @@ -DIST ena-driver-2.0.3-linux.zip 446695 BLAKE2B 43d4dc947f53c42c6ccda7a0fd3e32cda2c49aadee67ac7d719739f49c91b704aff04fa47f943667c7dd29f6ee0a573ceb43001a9dcdc6492cdbeb85091dd957 SHA512 08e8c1caecff3d7e19fd847e102506e501aafbefec1867fcc88d535fa728abfa7f0d292bdc9c4dff6c3d4d303002ab8b9a62bfc855cfda5130880fb237eb57c2 -DIST ena-driver-2.2.3-linux.tar.gz 406557 BLAKE2B 3e77bcb8e5bd00e0a643c17ad780e3abb5ff71859cdcb1257f9c73c7d5a14b0922cf97132ed40195a69e233b2850cb62f1854b49c8ab5c92b6b83dadb32bd7bd SHA512 257c959a6727213df6600cfb09741f5036d4efb950c1460be85bab3026d7f0fa5af252550bf395665dcf0de5dbee75f751516ac80ecf3d470aee996d12796770 +DIST ena-driver-2.11.1-linux.tar.gz 1441591 BLAKE2B 39db9d21efd0d7f810304a1be0be13dd0c944419a9e5aee5a60c3dee310f990af9787cb297e36e718aa3f62ff3a7e9ce4e8302a19efcc3b151438869827b540d SHA512 f27c556a902ee276022ddafec7cda70790280587f470968f233e3de09a7dac3b49f43a2b7dba1018489c9ff5f0f554201fe63b82533c6a627b7f533c2b4910c5 +DIST ena-driver-2.12.0-linux.tar.gz 1443210 BLAKE2B f8e13e6c8cbaa6946221c9ca09fdda1a1233b5c7b728bac92a26b8afcb19e5187f9fafd00cad795d3815b399fc7421c50efde08b0684ea31e4a9cea363766263 SHA512 34871c46a907c868dbe511761c43104fc00965850011ac8d9efe4103460858dd79ae57576cd5dea038f84901cf23c4dad00c49a167333d60743b84cf2169125c +DIST ena-driver-2.12.1-linux.tar.gz 1443454 BLAKE2B 4a1e96e7160db3f27a81f23aa027df8f7e8c1dbe3dc59a09b18e70a12458d8a0f67f923fdcd7d79f55d67fe03147eaa9d92dc0a76826c0c77669dc669359d92b SHA512 11312fcef724566a1204eb88ce9aefc6d3387cad4dc8667b8feb6bd4dc61dbc110fdb620ccb1268a6170db45e6e31b7f514d5823c9cdf48a4bf8dd849d862012 diff --git a/net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild b/net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild deleted file mode 100644 index 37619f91213a..000000000000 --- a/net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info linux-mod - -DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver" -HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html" -SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.zip -> ${P}-linux.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" - -MODULE_NAMES="ena(net:${S}:${S})" -BUILD_TARGETS="all" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="CONFIG_MODULE_SIG=n KERNEL_DIR=${KV_DIR}" -} - -src_prepare() { - default - - sed -i -e 's!/lib/modules/\$(BUILD_KERNEL)/build!$(KERNEL_DIR)!g' \ - "Makefile" || die "Unable to fix Makefile" -} - -src_install() { - linux-mod_src_install - dodoc README RELEASENOTES.md -} diff --git a/net-misc/ena-driver/ena-driver-2.2.3-r1.ebuild b/net-misc/ena-driver/ena-driver-2.11.1.ebuild index cb3d20bddedc..098c3b683de7 100644 --- a/net-misc/ena-driver/ena-driver-2.2.3-r1.ebuild +++ b/net-misc/ena-driver/ena-driver-2.11.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit linux-info linux-mod +inherit linux-mod-r1 DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver" HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html" @@ -11,30 +11,21 @@ SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" BDEPEND="app-arch/unzip" S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" -MODULE_NAMES="ena(net:${S}:${S})" -BUILD_TARGETS="all" - CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="CONFIG_MODULE_SIG=n KERNEL_DIR=${KV_DIR}" -} - -src_prepare() { - default - - sed -i -e 's!/lib/modules/\$(BUILD_KERNEL)/build!$(KERNEL_DIR)!g' \ - "Makefile" || die "Unable to fix Makefile" -} - -src_install() { - linux-mod_src_install - dodoc README RELEASENOTES.md +DOCS=( + README.rst + RELEASENOTES.md + ENA_Linux_Best_Practices.rst +) + +src_compile() { + local modlist=( ena=net ) + local modargs=( CONFIG_MODULE_SIG=n BUILD_KERNEL="${KV_FULL}" ) + linux-mod-r1_src_compile } diff --git a/net-misc/ena-driver/ena-driver-2.12.0.ebuild b/net-misc/ena-driver/ena-driver-2.12.0.ebuild new file mode 100644 index 000000000000..098c3b683de7 --- /dev/null +++ b/net-misc/ena-driver/ena-driver-2.12.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver" +HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html" +SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> ${P}-linux.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +BDEPEND="app-arch/unzip" + +S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" + +CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB" +DOCS=( + README.rst + RELEASENOTES.md + ENA_Linux_Best_Practices.rst +) + +src_compile() { + local modlist=( ena=net ) + local modargs=( CONFIG_MODULE_SIG=n BUILD_KERNEL="${KV_FULL}" ) + linux-mod-r1_src_compile +} diff --git a/net-misc/ena-driver/ena-driver-2.12.1.ebuild b/net-misc/ena-driver/ena-driver-2.12.1.ebuild new file mode 100644 index 000000000000..3d3ab17ac267 --- /dev/null +++ b/net-misc/ena-driver/ena-driver-2.12.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver" +HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html" +SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> ${P}-linux.tar.gz" +S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +BDEPEND="app-arch/unzip" + +CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB" +DOCS=( + README.rst + RELEASENOTES.md + ENA_Linux_Best_Practices.rst +) + +src_compile() { + local modlist=( ena=net ) + local modargs=( CONFIG_MODULE_SIG=n BUILD_KERNEL="${KV_FULL}" ) + linux-mod-r1_src_compile +} diff --git a/net-misc/ena-driver/metadata.xml b/net-misc/ena-driver/metadata.xml index c5f10b85aa4b..018f626e73b8 100644 --- a/net-misc/ena-driver/metadata.xml +++ b/net-misc/ena-driver/metadata.xml @@ -5,6 +5,10 @@ <email>dilfridge@gentoo.org</email> <name>Andreas K. Huettel</name> </maintainer> + <maintainer type="person"> + <email>eras@gentoo.org</email> + <name>Eray Aslan</name> + </maintainer> <upstream> <remote-id type="github">amzn/amzn-drivers</remote-id> </upstream> diff --git a/net-misc/endlessh/endlessh-1.1-r1.ebuild b/net-misc/endlessh/endlessh-1.1-r2.ebuild index 6b88d25a68ab..5112f7ee494f 100644 --- a/net-misc/endlessh/endlessh-1.1-r1.ebuild +++ b/net-misc/endlessh/endlessh-1.1-r2.ebuild @@ -37,7 +37,7 @@ src_prepare() { Makefile || die sed -i -e "/^ExecStart=/ s:=/usr/local:=${EPREFIX}/usr:" \ - util/endlessh.service || die + -e /InaccessiblePaths/d util/endlessh.service || die } src_install() { diff --git a/net-misc/endlessh/endlessh-9999.ebuild b/net-misc/endlessh/endlessh-9999.ebuild deleted file mode 100644 index 6a1cf2d9165f..000000000000 --- a/net-misc/endlessh/endlessh-9999.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd toolchain-funcs - -DESCRIPTION="SSH tarpit that slowly sends and endless banner" -HOMEPAGE="https://github.com/skeeto/endlessh" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/skeeto/${PN}.git" -else - SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ppc64 x86" -fi - -LICENSE="Unlicense" -SLOT="0" - -src_prepare() { - default - - tc-export CC - - sed -i \ - -e 's/^CC/CC?/' \ - -e 's/^CFLAGS =/CFLAGS +=/' \ - -e 's/ -Os//' \ - -e 's/^LDFLAGS/LDFLAGS?/' \ - -e 's/^PREFIX/PREFIX?/' \ - Makefile || die - - sed -i -e "/^ExecStart=/ s:=/usr/local:=${EPREFIX}/usr:" \ - util/endlessh.service || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - - einstalldocs - - newinitd "${FILESDIR}"/endlessh.initd endlessh - newconfd "${FILESDIR}"/endlessh.confd endlessh - - systemd_dounit util/endlessh.service - - insinto /usr/share/${PN} - doins util/{pivot.py,schema.sql} -} - -pkg_postinst() { - elog "Log parsing script installed to ${EPREFIX}/usr/share/${PN}" - elog "Install dev-python/pyrfc3339 if you are going to use it" -} diff --git a/net-misc/ethercard-diag/ethercard-diag-20050321.1g-r1.ebuild b/net-misc/ethercard-diag/ethercard-diag-20050321.1g-r2.ebuild index 4c7c7138bffa..892adaedf6f7 100644 --- a/net-misc/ethercard-diag/ethercard-diag-20050321.1g-r1.ebuild +++ b/net-misc/ethercard-diag/ethercard-diag-20050321.1g-r2.ebuild @@ -1,33 +1,38 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs -DESCRIPTION="low level mii diagnostic tools including mii-diag and etherwake (merge of netdiag/isa-diag)" +DESCRIPTION="Low level mii diagnostic tools including mii-diag and etherwake" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="mirror://gentoo/${P}.tar.lzma" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND="!sys-apps/nictools" src_prepare() { default + # Since the binary is `ether-wake`, make sure the man page is # `man ether-wake` and not `man etherwake`. #439504 sed -i \ -e 's/ETHERWAKE/ETHER-WAKE/' \ -e 's/etherwake/ether-wake/' \ pub/diag/{etherwake.8,Makefile} patches/* || die + mv pub/diag/ether{,-}wake.8 || die } src_compile() { tc-export CC AR + + # bug #861614 + filter-lto + default } diff --git a/net-misc/etherdfs/Manifest b/net-misc/etherdfs/Manifest index b4852cf947ee..2560fb8bb15c 100644 --- a/net-misc/etherdfs/Manifest +++ b/net-misc/etherdfs/Manifest @@ -1,2 +1,2 @@ -DIST etherdfs-20180203.zip 13081 BLAKE2B 53b0d12c272aa8a64a1980b6c4aae8c6789647026590ee948bc4d84be265479a816d8ae4df033a9a8be4038eb10b934b6ee8d188bf88e47c21f2e81123a572f0 SHA512 c254647fb35b7456b08eb27e6bc6b339d65c55ffd28fdc658f54bb1346a94a7056959a6e3e0b1a97add9e7919a224a0cef831ee14fc19219885274c9649a3439 +DIST etherdfs-tsr-0.8.3.zip 13139 BLAKE2B 5907974d9c4c2f97f737ead66ab5a3f0934d5086a07cfdc2483e7ef236d993d784a3686811bdf615f85a6112647e9d538de463d6453536e13c04a5ae7c082393 SHA512 489d61f13a1233ce94ce8ce4b0ad7400cceab3fd4b864efff94fe142f0703b6d76713a66ebd941b979af2d515192ed196ba1b33ae283647b5181dfbed27a8d97 DIST ethersrv-linux-20180203.tar.xz 18160 BLAKE2B 45293b596489a290146bfb5ec5ca89c06a01bd0377cb29f33f604ac84c3d1d8f18f09058dded28e38f611a19d690c0a190ec38d45498cacd90a4cbff841115e1 SHA512 522f5ce5353c6eabaac2106d43d09cf341a2da96e56ffb06c5b2d705a997986117246cf3cb2b4a4e5b2c6f1caf96dfd68d1ddc56bb6db8140aa3761c7e6e6f7e diff --git a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild b/net-misc/etherdfs/etherdfs-20180203-r5.ebuild index 0245ab3d16a3..9329f40b7423 100644 --- a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild +++ b/net-misc/etherdfs/etherdfs-20180203-r5.ebuild @@ -1,10 +1,10 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN="ethersrv-linux" -MY_PV_TSR="0.8.2" +MY_PV_TSR="0.8.3" MY_P="${MY_PN}-${PV}" inherit systemd toolchain-funcs @@ -12,9 +12,10 @@ inherit systemd toolchain-funcs DESCRIPTION="An ethernet-based file system for DOS" HOMEPAGE="http://etherdfs.sourceforge.net/" SRC_URI=" - mirror://sourceforge/${PN}/${MY_P}.tar.xz - tsr? ( mirror://sourceforge/${PN}/v${MY_PV_TSR}/${PN}.zip -> ${P}.zip ) + https://downloads.sourceforge.net/${PN}/${MY_P}.tar.xz + tsr? ( https://downloads.sourceforge.net/${PN}/v${MY_PV_TSR}/${PN}.zip -> ${PN}-tsr-${MY_PV_TSR}.zip ) " +S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" @@ -23,20 +24,19 @@ IUSE="tsr" BDEPEND="tsr? ( app-arch/unzip )" -S="${WORKDIR}/${MY_P}" +DOCS=( "ethersrv-linux.txt" "history.txt" ) PATCHES=( "${FILESDIR}/${P}-makefile.patch" "${FILESDIR}/${P}-musl.patch" ) -DOCS=( "ethersrv-linux.txt" "history.txt" ) - src_prepare() { default # Respect users LDFLAGS - sed -e 's/$(CFLAGS)/& $(LDFLAGS)/' -i Makefile || die + # Don't redefine FORTIFY_SOURCE + sed -e 's/$(CFLAGS)/& $(LDFLAGS)/' -e 's/-D_FORTIFY_SOURCE=1//g' -i Makefile || die } src_compile() { @@ -57,7 +57,7 @@ src_install() { newinitd "${FILESDIR}"/etherdfs.initd etherdfs newconfd "${FILESDIR}"/etherdfs.confd etherdfs - systemd_dounit "${FILESDIR}"/etherdfs.service + systemd_newunit "${FILESDIR}"/etherdfs.service-r1 etherdfs.service einstalldocs } diff --git a/net-misc/etherdfs/files/etherdfs.service b/net-misc/etherdfs/files/etherdfs.service-r1 index d5a6ed474a6a..ed56b2dfbdab 100644 --- a/net-misc/etherdfs/files/etherdfs.service +++ b/net-misc/etherdfs/files/etherdfs.service-r1 @@ -4,7 +4,7 @@ After=network-online.target [Service] EnvironmentFile=/etc/conf.d/etherdfs -ExecStart=/usr/bin/ethersrv-linux ${INTERFACE} ${STORAGEDIR} +ExecStart=/usr/bin/ethersrv-linux lo /tmp [Install] WantedBy=multi-user.target diff --git a/net-misc/etherdfs/metadata.xml b/net-misc/etherdfs/metadata.xml index d9337e277c43..24fb39b58029 100644 --- a/net-misc/etherdfs/metadata.xml +++ b/net-misc/etherdfs/metadata.xml @@ -11,7 +11,7 @@ to a local drive letter, using raw ethernet frames to communicate. </longdescription> <use> - <flag name="tsr">Build the TSR program for DOS, which acts as a client.</flag> + <flag name="tsr">Install the precompiled TSR program for DOS, which acts as a client.</flag> </use> <upstream> <remote-id type="sourceforge">etherdfs</remote-id> diff --git a/net-misc/ethertypes/ethertypes-0.ebuild b/net-misc/ethertypes/ethertypes-0.ebuild index 7990052a3340..239376930d4e 100644 --- a/net-misc/ethertypes/ethertypes-0.ebuild +++ b/net-misc/ethertypes/ethertypes-0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND=" !<net-firewall/ebtables-2.0.10.4-r2 diff --git a/net-misc/ethflop/ethflop-20191003.ebuild b/net-misc/ethflop/ethflop-20191003-r2.ebuild index 2849cf041382..714882673aba 100644 --- a/net-misc/ethflop/ethflop-20191003.ebuild +++ b/net-misc/ethflop/ethflop-20191003-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd toolchain-funcs DESCRIPTION="A network-backed floppy emulator for DOS" HOMEPAGE="http://ethflop.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.zip" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.zip" +S="${WORKDIR}" LICENSE="ISC" SLOT="0" @@ -21,8 +22,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) -S="${WORKDIR}" - src_compile() { tc-export CC default @@ -40,7 +39,7 @@ src_install() { newinitd "${FILESDIR}"/ethflopd.initd ethflopd newconfd "${FILESDIR}"/ethflopd.confd ethflopd - systemd_dounit "${FILESDIR}"/ethflopd.service + systemd_newunit "${FILESDIR}"/ethflopd.service-r1 ethflopd.service dodoc ethflop.txt } diff --git a/net-misc/ethflop/files/ethflopd.service b/net-misc/ethflop/files/ethflopd.service-r1 index 2b6c31902ec6..39fa29a52171 100644 --- a/net-misc/ethflop/files/ethflopd.service +++ b/net-misc/ethflop/files/ethflopd.service-r1 @@ -4,7 +4,7 @@ After=network-online.target [Service] EnvironmentFile=/etc/conf.d/ethflopd -ExecStart=/usr/bin/ethflopd ${INTERFACE} ${STORAGEDIR} +ExecStart=/usr/bin/ethflopd lo /tmp [Install] WantedBy=multi-user.target diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest index f2c37465e8c6..c7fbadd8f952 100644 --- a/net-misc/eventd/Manifest +++ b/net-misc/eventd/Manifest @@ -1 +1 @@ -DIST eventd-0.27.0.tar.xz 188000 BLAKE2B 06779168e9049714aabc051f8a85a5e5764509c3deceddd300c103f4831b6679f082748858bebb9629dcd47fa0b570158c6cf2b665167ab8e20a7dc0f12cc00f SHA512 586fdf36742cfda5a3c5e4cf4600307b8d699701fdf32eec25a7b294c815ded6e7e41210e65c706c34c5f2d911cadec89b677f082dad183f486fb7d1a55a2302 +DIST eventd-0.29.0.tar.xz 196276 BLAKE2B 5d9fd352df65a8bb00e6bf1f7600dadc1bf3d3c98ed02eb3ad3cb6148dc8370dd2bc2ecda7e2b8f60d90b7adebb2187490bb6c934bc0bf8b5d0cd38bb26a8c36 SHA512 32407049df0abba68eb6310a86f8c6ec42774bd55934e5927d92f9eb75fc11f32e790904641a0113d8668c66591a0a82246b3240ba1a9517b243301bb96227b8 diff --git a/net-misc/eventd/eventd-0.27.0-r1.ebuild b/net-misc/eventd/eventd-0.29.0-r2.ebuild index e533b5124a7e..0c6729f4ee5b 100644 --- a/net-misc/eventd/eventd-0.27.0-r1.ebuild +++ b/net-misc/eventd/eventd-0.29.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit linux-info meson systemd @@ -12,7 +12,7 @@ SRC_URI="https://www.eventd.org/download/eventd/${P}.tar.xz" LICENSE="GPL-3+ LGPL-3+ ISC MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification +IUSE="debug fbcon +introspection libcanberra libnotify +notification pulseaudio purple speech systemd test upnp webhook websocket +X zeroconf" RESTRICT="!test? ( test )" @@ -37,43 +37,37 @@ COMMON_DEPEND=" x11-libs/gdk-pixbuf:2 X? ( x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb:=[xkb] + x11-libs/libxcb:=[xkb(+)] x11-libs/xcb-util x11-libs/xcb-util-wm ) ) pulseaudio? ( + media-libs/libpulse media-libs/libsndfile - media-sound/pulseaudio ) purple? ( net-im/pidgin ) speech? ( app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd:= ) - upnp? ( >=net-libs/gssdp-1.2:0= ) - webhook? ( net-libs/libsoup:2.4 ) - websocket? ( net-libs/libsoup:2.4 ) + upnp? ( net-libs/gssdp:1.6= ) + webhook? ( net-libs/libsoup:3.0 ) + websocket? ( net-libs/libsoup:3.0 ) zeroconf? ( net-dns/avahi[dbus] ) " -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt +DEPEND=" + ${COMMON_DEPEND} fbcon? ( virtual/os-headers ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND=" + ${COMMON_DEPEND} net-libs/glib-networking[ssl] " -BDEPEND="virtual/pkgconfig" -PATCHES=( - "${FILESDIR}"/${PN}-0.27.0-fno-common.patch -) - -pkg_setup() { - if use ipv6; then - CONFIG_CHECK=$(usex test 'IPV6' '~IPV6') - linux-info_pkg_setup - fi -} +BDEPEND=" + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig +" src_configure() { # wayland disabled due to missing dep in ::gentoo, wayland-wall @@ -82,10 +76,11 @@ src_configure() { -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" -Ddbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" -Dnd-wayland=false + -Dvapi=false $(meson_feature websocket) $(meson_feature zeroconf dns-sd) $(meson_feature upnp ssdp) - $(meson_use ipv6) + -Dipv6=true $(meson_use systemd) $(meson_use notification notification-daemon) $(meson_use X nd-xcb) diff --git a/net-misc/eventd/files/eventd-0.27.0-fno-common.patch b/net-misc/eventd/files/eventd-0.27.0-fno-common.patch deleted file mode 100644 index 5f731666738c..000000000000 --- a/net-misc/eventd/files/eventd-0.27.0-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/plugins/nd/src/backend.h -+++ b/plugins/nd/src/backend.h -@@ -37,7 +37,7 @@ - _EVENTD_ND_BACKENDS_SIZE - } EventdNdBackends; - --const gchar *eventd_nd_backends_names[_EVENTD_ND_BACKENDS_SIZE]; -+extern const gchar *eventd_nd_backends_names[_EVENTD_ND_BACKENDS_SIZE]; - - typedef struct { - EventdNdContext *context; diff --git a/net-misc/eventd/metadata.xml b/net-misc/eventd/metadata.xml index 8f637f01963e..d6a2d2e180c9 100644 --- a/net-misc/eventd/metadata.xml +++ b/net-misc/eventd/metadata.xml @@ -8,7 +8,6 @@ (Note: not required for local notifications via <pkg>net-misc/eventd</pkg>)</flag> <flag name="notification">Enable plugin to display on-screen notifications</flag> <flag name="purple">Enable plugin for IM notifications via libpurple</flag> - <flag name="speech">Enable plugin for Text-To-Speech support</flag> <flag name="webhook">Enable plugin to send payloads to webhook handlers</flag> <flag name="websocket">Enable support for WebSocket protocol</flag> </use> diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest index 60dfd124da04..1d1bd126e5f8 100644 --- a/net-misc/exabgp/Manifest +++ b/net-misc/exabgp/Manifest @@ -1,2 +1 @@ -DIST exabgp-4.2.11.tar.gz 2931753 BLAKE2B e5241619db24e2e82dfb42bc613d6b2c28efac205d2bedf732a665a5a9eff1b384833cb1fec3e68a285fc01269c2eaca55b311650e59bcda13d8f024e5294dc3 SHA512 61c143e90fd81323b03682ad46f2861576ab0328e2030259eff15bb9ef965477c514fb355112cbaf3dc138fb9f5582b6e1e1efb8d0d4313a9b9924ced156a155 -DIST exabgp-4.2.16.tar.gz 2933071 BLAKE2B bc66ece537cb175811233d26f3445e1bb3f7d4f8950bf0839ced014430db17a4df614661448f275fb3a890bb2af6b2459f938f830c82f03a586829e7fe31caca SHA512 06731612df6f0f6623e8ad58c3b52fc4b5dee6b4bb3bb29cee272a4061ef087e2f98739a75cd07ae51e66fb633069926899882e6bab801010ad1db3333666471 +DIST exabgp-4.2.21.tar.gz 2933721 BLAKE2B 1d4b7cb6d053d2a9b8a338b6cf5f84d8d4ea2e1d1685cac8fb9b4b02cbdb8b9d5de41d4072d9379892e4bf89444f301f88243e5d5145d213956be7319861b723 SHA512 0efc7143191e8b557297e9329354c01e2418e0c4c45753941eba3a1f063e77d17a0efa7a14a3062764e45e709f0598f491c10e2c02e751590bb7c0943b61932b diff --git a/net-misc/exabgp/exabgp-4.2.11-r1.ebuild b/net-misc/exabgp/exabgp-4.2.11-r1.ebuild deleted file mode 100644 index 1ec8278c5641..000000000000 --- a/net-misc/exabgp/exabgp-4.2.11-r1.ebuild +++ /dev/null @@ -1,60 +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 tmpfiles systemd distutils-r1 - -DESCRIPTION="The BGP swiss army knife of networking" -HOMEPAGE="https://github.com/Exa-Networks/exabgp" -SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/exabgp - acct-user/exabgp -" -BDEPEND=" - test? ( - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/exabgp-4.2.7-paths.patch" - "${FILESDIR}/exabgp-4.2.10-ip-path.patch" -) - -python_test() { - ./qa/bin/parsing || die "tests fail with ${EPYTHON}" - nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - - newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf - systemd_dounit etc/systemd/* - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - keepdir /etc/exabgp - - doman doc/man/*.? -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild b/net-misc/exabgp/exabgp-4.2.11-r2.ebuild deleted file mode 100644 index 0c9b22c44818..000000000000 --- a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit tmpfiles systemd distutils-r1 - -DESCRIPTION="The BGP swiss army knife of networking" -HOMEPAGE="https://github.com/Exa-Networks/exabgp" -SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/exabgp - acct-user/exabgp -" -BDEPEND=" - test? ( - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/exabgp-4.2.7-paths.patch" - "${FILESDIR}/exabgp-4.2.10-ip-path.patch" - "${FILESDIR}/exabgp-4.2.11-healthcheck-allow-disable-metric.patch" - "${FILESDIR}/exabgp-4.2.11-healthcheck-fix-log-crash.patch" - "${FILESDIR}/exabgp-4.2.11-less-verbose-logging.patch" -) - -python_test() { - ./qa/bin/parsing || die "tests fail with ${EPYTHON}" - nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - newinitd "${FILESDIR}/${PN}.initd-r1" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - - newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf - systemd_dounit etc/systemd/* - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - keepdir /etc/exabgp - - doman doc/man/*.? -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/net-misc/exabgp/exabgp-4.2.16.ebuild b/net-misc/exabgp/exabgp-4.2.21-r1.ebuild index b04278316850..40fa0522f040 100644 --- a/net-misc/exabgp/exabgp-4.2.16.ebuild +++ b/net-misc/exabgp/exabgp-4.2.21-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools inherit tmpfiles systemd distutils-r1 DESCRIPTION="The BGP swiss army knife of networking" @@ -24,7 +24,6 @@ RDEPEND=" BDEPEND=" test? ( dev-python/psutil[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] ) " @@ -35,11 +34,15 @@ PATCHES=( "${FILESDIR}/exabgp-4.2.11-healthcheck-allow-disable-metric.patch" "${FILESDIR}/exabgp-4.2.11-healthcheck-fix-log-crash.patch" "${FILESDIR}/exabgp-4.2.11-less-verbose-logging.patch" + "${FILESDIR}/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch" + "${FILESDIR}/exabgp-4.2.21-patch-embedded-six-for-py312.patch" ) +distutils_enable_tests pytest + python_test() { - ./qa/bin/parsing || die "tests fail with ${EPYTHON}" - nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}" + ./qa/bin/parsing || die "parsing tests fail with ${EPYTHON}" + epytest } python_install_all() { diff --git a/net-misc/exabgp/files/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch b/net-misc/exabgp/files/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch new file mode 100644 index 000000000000..78d26f73f093 --- /dev/null +++ b/net-misc/exabgp/files/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch @@ -0,0 +1,38 @@ +From: Vincent Bernat <vincent@bernat.ch> +Date: Sun, 2 May 2021 17:47:10 +0200 +Subject: Patch exabgp.service to fix socket creation on start + +Patch from Marco d'Itri. + +Closes: #886568. +--- + etc/systemd/exabgp.service | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +diff --git a/etc/systemd/exabgp.service b/etc/systemd/exabgp.service +index 17ce886..b2da5ba 100644 +--- a/etc/systemd/exabgp.service ++++ b/etc/systemd/exabgp.service +@@ -7,16 +7,13 @@ After=network.target + ConditionPathExists=/etc/exabgp/exabgp.conf + + [Service] +-#User=exabgp +-#Group=exabgp + Environment=exabgp_daemon_daemonize=false +-PermissionsStartOnly=true +-ExecStartPre=-mkfifo /run/exabgp.in +-ExecStartPre=-mkfifo /run/exabgp.out +-ExecStartPre=chmod 600 /run/exabgp.in +-ExecStartPre=chmod 600 /run/exabgp.out +-ExecStartPre=chown exabgp.exabgp /run/exabgp.in +-ExecStartPre=chown exabgp.exabgp /run/exabgp.out ++User=exabgp ++Group=exabgp ++RuntimeDirectory=exabgp ++RuntimeDirectoryMode=0750 ++ExecStartPre=-/usr/bin/mkfifo /run/exabgp/exabgp.in ++ExecStartPre=-/usr/bin/mkfifo /run/exabgp/exabgp.out + ExecStart=/usr/sbin/exabgp /etc/exabgp/exabgp.conf + ExecReload=/bin/kill -USR1 $MAINPID + Restart=always diff --git a/net-misc/exabgp/files/exabgp-4.2.21-patch-embedded-six-for-py312.patch b/net-misc/exabgp/files/exabgp-4.2.21-patch-embedded-six-for-py312.patch new file mode 100644 index 000000000000..ccbf33021d87 --- /dev/null +++ b/net-misc/exabgp/files/exabgp-4.2.21-patch-embedded-six-for-py312.patch @@ -0,0 +1,52 @@ +From: Vincent Bernat <bernat@debian.org> +Date: Mon, 1 Jan 2024 09:15:39 +0100 +Subject: Patch embedded six for Python 3.12 + +Closes: #1058181 +--- + lib/exabgp/vendoring/six.py | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/lib/exabgp/vendoring/six.py b/lib/exabgp/vendoring/six.py +index 20e866a..5f8f3b0 100644 +--- a/lib/exabgp/vendoring/six.py ++++ b/lib/exabgp/vendoring/six.py +@@ -71,6 +71,11 @@ def __len__(self): + MAXSIZE = int((1 << 63) - 1) + del X + ++if PY34: ++ from importlib.util import spec_from_loader ++else: ++ spec_from_loader = None ++ + + def _add_doc(func, doc): + """Add documentation to a function.""" +@@ -182,6 +187,11 @@ def find_module(self, fullname, path=None): + return self + return None + ++ def find_spec(self, fullname, path, target=None): ++ if fullname in self.known_modules: ++ return spec_from_loader(fullname, self) ++ return None ++ + def __get_module(self, fullname): + try: + return self.known_modules[fullname] +@@ -217,9 +227,13 @@ def get_code(self, fullname): + Required, if is_package is implemented""" + self.__get_module(fullname) # eventually raises ImportError + return None +- + get_source = get_code # same as get_code + ++ def create_module(self, spec): ++ return self.load_module(spec.name) ++ ++ def exec_module(self, module): ++ pass + + _importer = _SixMetaPathImporter(__name__) + diff --git a/net-misc/exabgp/files/exabgp.initd-r1 b/net-misc/exabgp/files/exabgp.initd-r1 deleted file mode 100644 index 1d942d850253..000000000000 --- a/net-misc/exabgp/files/exabgp.initd-r1 +++ /dev/null @@ -1,64 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# default arguments -: "${EXABGP_ARGS:=--env=/etc/${RC_SVCNAME}/exabgp.env /etc/${RC_SVCNAME}/exabgp.conf}" - -command="capsh" -command_args=" - --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}\"" - -supervisor=supervise-daemon - -: "${pidfile:=/run/exabgp/${RC_SVCNAME}-supervisor.pid}" -: "${output_log:=/var/log/${RC_SVCNAME}/exabgp.log}" -: "${error_log:=/var/log/${RC_SVCNAME}/exabgp.log}" - -extra_started_commands="routes sessions" -extra_commands="checkconfig" - -depend() { - need net -} - -start_pre() { - checkpath -q -d -m 0755 -o "${EXABGP_USER}:${EXABGP_GROUP}" \ - /run/exabgp || return - - checkpath -q -p -m 0600 -o "${EXABGP_USER}:${EXABGP_GROUP}" \ - /run/exabgp/${RC_SVCNAME}.{in,out} || return - - checkpath -q -d -m 0755 -o "${EXABGP_USER}:${EXABGP_GROUP}" \ - "/var/log/${RC_SVCNAME}" || return - - checkconfig || return -} - -stop_pre() { - # don't restart if the configuration is bad - if [ "${RC_CMD}" = restart ]; then - checkconfig || return - fi -} - -checkconfig() { - ebegin "Checking configuration for ${RC_SVCNAME}" - exabgp -t ${EXABGP_ARGS} - eend ${?} "Invalid configuration" -} - -sessions() { - ebegin "Querying sessions" - exabgpcli --env /etc/${RC_SVCNAME}/exabgp.env show neighbor summary - eend ${?} "exabgpcli failed" -} - -routes() { - ebegin "Querying routes" - exabgpcli --env /etc/${RC_SVCNAME}/exabgp.env show adj-rib out - eend ${?} "exabgpcli failed" -} diff --git a/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild b/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild index a1b1584dfa28..60a633ebe65a 100644 --- a/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild +++ b/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs +inherit edo toolchain-funcs DESCRIPTION="A static, secure identd. One source file only!" HOMEPAGE="http://www.guru-group.fi/~too/sw/" @@ -13,22 +13,16 @@ SRC_URI="http://www.guru-group.fi/~too/sw/identd.readme -> ${P}.readme LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="" - -echoit() { - echo "$@" - "$@" -} src_unpack() { - mkdir -p "${S}" - echoit cp "${DISTDIR}"/${P}.{c,readme} "${S}" || die + mkdir -p "${S}" || die + edo cp "${DISTDIR}"/${P}.{c,readme} "${S}" } src_compile() { - echoit $(tc-getCC) ${CFLAGS} ${LDFLAGS} \ + edo $(tc-getCC) ${CFLAGS} ${LDFLAGS} \ -DTRG=\"${PN}\" -DUSE_UNIX_OS -DVERSION=\"${PV}\" \ - -o ${PN} ${P}.c || die + -o ${PN} ${P}.c } src_install() { diff --git a/net-misc/fakeidentd/metadata.xml b/net-misc/fakeidentd/metadata.xml index 85e4ed814fa2..115e9d64a669 100644 --- a/net-misc/fakeidentd/metadata.xml +++ b/net-misc/fakeidentd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest deleted file mode 100644 index ba261e5f4710..000000000000 --- a/net-misc/felix/Manifest +++ /dev/null @@ -1,81 +0,0 @@ -DIST felix-3.1.3.tar.gz 467553 BLAKE2B 80fc599d5b2d6f57a251b6d679cd7b3ea461827e8f37fd3c798f1b8bbfd319449d037c0a5a6b7dcc77594a8f557897f7a228567fca8f95c00c028a8c4433e425 SHA512 2ba79babd27016a83ad525611917f1ed43707ccbdfda80bf40973698ac343255896aa978a38be58b58e13ecf6956a028caa5c2d0f1cbbef8a088961f449646ff -DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536 -DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b -DIST github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz 78903 BLAKE2B b2480753213e2c387d969c8dc68994cb6d107ebc970ecb986d4bf22b542d460814d0ba0e40b82e9022072142b201cd794fc8dc7bcfcb1531c9613f2c3408b7a3 SHA512 192b544268bd10048ca877d70b35faceb9c648e7298124678b21d727a27d569e61536f42a7030b7e40610ea5822c0bc2264cac03c340ecc90e43f9120b6734d9 -DIST github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz 43033 BLAKE2B 69ce67e0633e03f569908a567831a4625661855e466a072850ce5ca5ce60c31f92e2057fee31ab90a357ea5c563ed7525d3e4e2ae2f09ebe27d762018464ae75 SHA512 f1dd4d3768da18a5aeb2c2af5422400d4adc194c31c79e7208d96d1bd3c65d9a78dda67d174ebc6a8b3dbb7734c50f15bc445e6e834073188135a0b6ebcb4c38 -DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9 -DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d -DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277 -DIST github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz 804453 BLAKE2B 6dff8674476a5667ce4b43922acc1ba752a64d26f720c3554c73b88d5114d211a93fb994bba161911732a61d279b7f5610b5fc218b2985b87ef8a8353e3ca658 SHA512 13716991e01d8192137fa5551607f7320b7a369a5ca7ae29110060a5d9116a0d1c147b9f1fe6539eacbdf331bea2c6abb64c9da4bc921c3621e49e8bc397590e -DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8 -DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc -DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa -DIST github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz 23844 BLAKE2B 9c999258dde04fdaeb9dd4cab9d5aaa854f99d0bb2fb6d7e9fa67b829c0d5062139eba06abe3323c1c9d79093b45f8c29e33835797a693dd73c217309ef33286 SHA512 1d97e29b2dd84b3ccb619efbffa396ad0f988c5e09e18136edb64ed046d25512e31bd43f5586852d520ef2a38bd98ae2fd9c2e66c49bb52e828c386285bd9391 -DIST github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz 74285 BLAKE2B f2fe94848736a4f798e3ea31bc8a4e7259c11da56ab2811f47faf0d510ea66888e18ea9b805aa51b58f356809c3208dfd39be075b06811d0d40d1d289808709d SHA512 2ecce57da67d149e3329d76b6f811097760c42de3346c4353b1932af293cef32cb5b9913ec385619e932e632416f44b878aa621665a4cd6db0293e951ee2bb97 -DIST github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz 21204 BLAKE2B 4179c708d75c58cfda85d463541055cd772caeeb67edc8446d068443bc5c7dc894e536a4cd3795c2104e4b3a891ac1f766a8c6ceaa4d000884bb3a529d3ae2ad SHA512 91e097bbf4711d203f6e31e73a1d67ca200a7ff707ab4f517f1f61fc2f6347fcd6aa7811bd4036a8f5211623cff45ca6acbb23330b4e453dbeb1f7aafc112fb6 -DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e -DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb -DIST github.com-go-ini-ini-06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz 34203 BLAKE2B 8eda5e022be1507d92f17ef3d2ca9f02df7a63d4bdae14d3486af05981d4007be0f32d1930341d5a724d20fd6f37d19dbfa9f1a703c14a86923f2940a5b3e2a6 SHA512 fdeb9b80afb13697b9b3084ea17e92fe2c528fec57bc4a18beafa18160201c94a9e31f85751d8eac836f2e41f818e547f5f2038c3a001c3f91a1187e1ba7846f -DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac -DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a -DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe -DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab -DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz 61555 BLAKE2B 824dd1ba4f97bc7b77f8e511bda1fdc7acbe1828d81d9c88f913f139b46ee0bfca6ec8b901d7b216023b987b28d98a848ccceb0f41bed1eca8004b5f5c71922d SHA512 dadcdf9c03528991672277ab8414e9f2a1b1868c855d80dcff16560c8d4a46ee6b4c17961e5d4dac7ebded3cd423b4ffbc6eb6ff0d05ea3a67e39c0eb4a1afb6 -DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5 -DIST github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz 1732674 BLAKE2B 2dfc3538a0f7e4b77f90795a6e76a0c962bcfdb7fe557e64484481cb6ad053ddd738abd1415cea69fc1305dd2d4e2301510c6715243c76e2251304b6f74d6649 SHA512 2b40b3eed0fe85fb111d49b0eaea33be382539c1829ab43da6da0cbe3f5f7db44422ee38e425d660e85d0541031364a8def3b2e4589cad326c29a1bc4ed8a6a6 -DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455 -DIST github.com-golang-crypto-ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz 1611750 BLAKE2B 510395566152cfb558ad71d8c5e9ad5821948265d58bf6e7943fc4889e92b6a6c95f627feab2750c119d5b303588152772cc5005e0d83fdfdba96256f7c513c5 SHA512 21ef1940bc1f1f854fa9497eb27a87b554e38d608e1ce5e0884fbf7203591f2fd52127062e85c50cbd366edceecbd226d4f75e96bb0014603200ada7d268abd5 -DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9 -DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3 -DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a -DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31 -DIST github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz 801102 BLAKE2B d23a2bcfaa8fe92313f6e3fa577533e513181f40568c401918d4345c03434a39947e552b20165d4334c8aa981024e146a131a98e8ba9e0d622622e53bc578864 SHA512 7df873ade422b5d45271554325301620fed25a5658d1862d3a63222f406acf17bd39fb67d632387b9438e5291720dae4b086bd09810a8c897c457aba7a60fed0 -DIST github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz 4549739 BLAKE2B a124e96048fe4bf231b3e87e012d40f84de8541eefc4b3136451c75b6d45991b20893656fb920d014cb53a8ab5177a877c5ca48fc0dc43f92e50aa50d20d7ade SHA512 a4542d75a6326255d2cdfa48a454dcabf577fc04527973b6de00abb6d8bd4b04cfa4e6cf6b26fd3b2a546e6b4de7a36eaae409981dfe790b88a841a85348c83e -DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9 -DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4 -DIST github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557 -DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136 -DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc -DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d -DIST github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz 335349 BLAKE2B b46ce36f6eb708cbc112a472ee094c9b2f624951fb35523fe2a5b3af224bff2c3264e9a457eb00379f1f0686c43509a6186c654eebf04f0c6dc8145ccc616b7d SHA512 dcde974ece3cdcf3f0ab70496c9fb704469b66a98b8d9f1b645f9c9b73fb2edb0116f04caa6af136250131e2875c06a61aca8c7ee0bb2f7a1640d1671f66526d -DIST github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz 5497 BLAKE2B 104080651e0cac64abdc78169b4a184e9c8fda803a6f629fa3ef4210015f0a76df7fc478ea88e3fc460ab49288633a27ceb452979b610d49475040b74cd2ece6 SHA512 8e444831301404454b0f1506a7cf20347bc42639691ad7946e36e30492e7d8108d83ffc974934632eec9c75f03e28ce75e9caf1e92980803a43fff82849145bc -DIST github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz 2806 BLAKE2B c41d5bd53f9f4bdff9e5b1cde8af46f3b3c8518af88b45a33625fa6cc4d89052fd6588d99dcaa1f6fe3ddc2a3e566b2da6ae30a1d218256f6707db4f0ca01c32 SHA512 e8f0a888f8103fca6714f6a13ba80434560488c9be389b47ca505e84a45bd18ecd08a19e88684c6af2ed550ca5c11c6a215791420426a89a79cce0dead452d47 -DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995 -DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c -DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c -DIST github.com-ipfs-go-log-b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz 28143 BLAKE2B a2ef3db0067c5cf86ad17376c08f28efdc2d735a62dd10aec5b55ef5e4b711f0f6b281fbd6916a0f91fc9ef1e26415bac3d1184f6281c478506a17b4e6f31ba4 SHA512 e01209547e95f45d51d3794e912fe0a4343c61d54c3fca5f7ec6c13d859aeb7a2eab61b14ddeaa451acd8c7aa6f57bb000cf9b9c77c53a8fd0212be5e5df4687 -DIST github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz 12680 BLAKE2B 852a4445fa50334de624395ea375945e273b7bfdc2a2dccf677e75a18bde34408ddfc9c0f4329edadec31cbe148cb139cd8659b4e7ba5dde829c58e39228de9f SHA512 729b41f0302aeb23b077a7ad913cb70f06982c243a37ccc264d5475d3db693c6e019c5cf9eb6307d809c2c99a4d68d711d4e11fe062e907750247d3f3e1d519d -DIST github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz 5584 BLAKE2B 60e968bab9171dc1f09dfa3bfbe98324b4a536fc7664465154173a97f3a4a28a1adb1b8f659c5494b15c03ab8c788e8f9459fca2d6f0b37b7815da20d74e2072 SHA512 055351c704c9227b8d6cbb95177c2dbd554d582cc0ba4dfb5f8f0f550f80cfbd264c82b2a84010b8b1e9f02d9c759b4317f277f0f1b873a5eeb181cd0b672284 -DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958 -DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77 -DIST github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz 4860 BLAKE2B 8f5958f711e86899267876fa27d534a34e8d48d07eddb14a82cdad1bd4056e525e74e41161be398e7da9c8c4bf7e03a1dd90e897bda7463dd7c425a20b94c8f3 SHA512 924fb47d68a300e7a17e67259c1ca6f395c23a2d630cabccdcea7ff76a9087597b317c2cdc9cecc42d885ce1e8faab338539f210681f02c695657d7b17039bc7 -DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf -DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b -DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d -DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9 -DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0 -DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81 -DIST github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz 8208 BLAKE2B 4cd558c21bd893f17280c05550015f2f8148344d50dbd958f7cc7fa68d06223d0e732ace81c445f0091357d6d0a1564efd7d246af5cf432de0d8728f5cb1d250 SHA512 fc274e5699b637e953b31e5014b759f0367d925c289f9eabd7538eaf916ec8a7613e3eaf6d8f9294869f54e943448cca21130daccf1717525aa123761026902e -DIST github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz 3383 BLAKE2B 2034048312c4abc88a813d8ad83013f57e9a23477ecd847e92c3cf30e909e209f9a65acacf41d80b3569770c1400e338115c42fd48d358b66f68ccde69a9008d SHA512 1714a9e9ac7ad2ff30825328723b4c9a5c5f7544e876c6fe79b84c72ba1dd9bfcd6ded2308f6fcae8f1c893d22b84d6c72dfd30742edaa2a5b0d8e88eee27421 -DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec -DIST github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz 3009 BLAKE2B b68ad69058837306d4988760ab7a052d988a9ea8c297001698aadff3eb0c404b3f0953faca4b2f12a174aae9e5b6f77dbb793b44b356cb9a420bfdabd72d76b0 SHA512 21392e0a444215f0345548e38e5bd439c1d97742fe705060c9e6dd41c0646d4cffb2932b886f7080c4b849fa4f075a8496328f37112dbf87a81967b229f255c9 -DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010 -DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4 -DIST github.com-opentracing-opentracing-go-6c572c00d1830223701e155de97408483dfcd14a.tar.gz 32162 BLAKE2B 4e7a0c8e4f84c6495f866f12f1da176c99d5ed7bed65238585b177a8edaaadc5981748b2d1c16fe9c8d9b4ec3d065212584462635ef3b25574c859834769adb8 SHA512 1e90f596f2888de1f61247d3f8ea084dd1248f17552408f14fc1dc7b794ddf547c288858d920b43fa5b340703a5385489ecde7b9065392324d457499560f07a7 -DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052 -DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747 -DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593 -DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755 -DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e -DIST github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9 -DIST github.com-projectcalico-typha-5374e9f32bde159a4aa19c821618920f491004be.tar.gz 231051 BLAKE2B 0d799bcfa6396dc264bcfe1d90343f35444c6f21a5efad57e3358815c939fff4a6af587e75250f259ea243337fa27f2d0405163b002b2a05708016b663c17767 SHA512 c89213b92b36d509714be314bbe4db171e5682afb3ca69d771b4b53ead24e7105b03420040b6d57a7a5836a22f9dd1ef87da28b08e4726eef65ee5987385c4ec -DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a -DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf -DIST github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz 77798 BLAKE2B 3e8daf72d7ca8d702898349617c48a62d4dd7cc5ebeb65bd63d38978f5d8f05e6d0f02237e1fe285630da198aba90783e27eee69ac6a06f90e1a7be3fad50b4c SHA512 bdf0b2f818f9df4685ec7536a7478cb86ab8a8297081c618d92b14bc0296c2c66c9ccb403b2f4af42a7fed769f3ce2020082e2e983e3f2668e14776a6d26828b -DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507 -DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2 -DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51 -DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7 -DIST github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz 122308 BLAKE2B 3b7e1486b64c0dfd9658b7e7e631b1fc4ae19155dee5392ab57929a51e0734b744399c7902ff558091046ea64f5f1ecacfb2594011d3077880356d659a42c9c7 SHA512 65251591bec228edadf1b0193d4b47f97cefd8eac1a54edd623d20186c70dbf49631562826bc193e81f3af3262a0211dde9b9638ee5a9ca7ded6841a2ebe65ec -DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86 -DIST github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz 34843 BLAKE2B ec139b3eb8f034ca9243c99497380097056a19e3fa8541e2075c1c7e108c96b4e97004fd47f1590dad0ad155db6c33ecdb5ea1162498f343c9c07c2f73d3476b SHA512 29ac7f9ebc485fd09d1c65c71457add052c7faa975591a0be1ffb20608cdcad61ed427b284d99340d1ac647d0a3bf99938522d90299a26172e74bac2d7f3e498 diff --git a/net-misc/felix/felix-3.1.3.ebuild b/net-misc/felix/felix-3.1.3.ebuild deleted file mode 100644 index 97d86ba45d4a..000000000000 --- a/net-misc/felix/felix-3.1.3.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_VENDOR=( -"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang" -"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d" -"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb" -"github.com/containernetworking/cni 137b4975ecab6e1f0c24c1e3c228a50a3cfba75e" -"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea" -"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8" -"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20" -"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f" -"github.com/emicklei/go-restful 777bb3f19bcafe2575ffb2a3e46af92509ae9594" -"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6" -"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7" -"github.com/go-ini/ini 06f5f3d67269ccec1fe5fe4134ba6e982984f7f5" -"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98" -"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272" -"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff" -"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72" -"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02" -"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed" -"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7" -"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017" -"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c" -"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba" -"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961" -"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6" -"github.com/gxed/eventfd 80a92cca79a8041496ccc9dd773fcb52a57ec6f9" -"github.com/gxed/GoEndian 0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7" -"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4" -"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" -"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc" -"github.com/ipfs/go-log b9df188d0fae32d69c1a519fa81741668a12f55a" -"github.com/jbenet/go-reuseport 7eed93a5b50b20c209baefe9fafa53c3d965a33c" -"github.com/jbenet/go-sockaddr 2e7ea655c10e4d4d73365f0f073b81b39cb08ee1" -"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e" -"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342" -"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14" -"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c" -"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0" -"github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade" -"github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c" -"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a" -"github.com/Microsoft/go-winio 78439966b38d69bf38227fbf57ac8a6fee70f69a" -"github.com/Microsoft/hcsshim 34a629f78a5d50f7de07727e41a948685c45e026" -"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852" -"github.com/onsi/ginkgo fa5fabab2a1bfbd924faf4c067d07ae414e2aedf" -"github.com/onsi/gomega 62bff4df71bdbc266561a0caee19f0594b17c240" -"github.com/opentracing/opentracing-go 6c572c00d1830223701e155de97408483dfcd14a" -"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4" -"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6" -"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1" -"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2" -"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56" -"github.com/projectcalico/libcalico-go 0417ab6e1ea49be2abb978df365b25f20fdb3c6f" -"github.com/projectcalico/typha 5374e9f32bde159a4aa19c821618920f491004be" -"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1" -"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2" -"github.com/prometheus/common 7600349dcfe1abd18d72d3a1770870d9800a7801" -"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865" -"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4" -"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e" -"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" -"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba" -"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7" -"github.com/vishvananda/netlink dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb" -"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8" -"github.com/whyrusleeping/go-logging 0457bb6b88fc1973573aaf6b5145d8d3ae972390" -"golang.org/x/crypto ab813273cd59e1333f7ae7bff5d027d4aadf528c github.com/golang/crypto" -"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net" -"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2" -"golang.org/x/sys 88d2dcc510266da9f7f8c7f34e1940716cab5f5c github.com/golang/sys" -"golang.org/x/text 4ee4af566555f5fbe026368b75596286a312663a github.com/golang/text" -"google.golang.org/appengine b1f26356af11148e710935ed1ac8a7f5702c7612 github.com/golang/appengine" -"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto" -"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go" -"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator" -"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf" -"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml" -"k8s.io/api a315a049e7a93e5455f7fefce1ba136d85054687 github.com/kubernetes/api" -"k8s.io/apimachinery 40eaf68ee1889b1da1c528b1a075ecfe94e66837 github.com/kubernetes/apimachinery" -"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go" -"k8s.io/kube-openapi 0c329704159e3b051aafac400b15baacf2a94a04 github.com/kubernetes/kube-openapi" -) - -inherit golang-vcs-snapshot systemd user - -FELIX_COMMIT="dba3279377fd6ec7baf0ee560bcaec685f25fa86" - -KEYWORDS="~amd64" -DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy" -EGO_PN="github.com/projectcalico/felix" -HOMEPAGE="https://github.com/projectcalico/felix" -SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+bird" - -RESTRICT="test" - -DEPEND=">=dev-libs/protobuf-3 - dev-go/gogo-protobuf" - -RDEPEND="net-firewall/ipset - bird? ( net-misc/bird )" - -src_compile() { - pushd "src/${EGO_PN}" || die - protoc --gogofaster_out=plugins=grpc:. proto/*.proto || die - GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \ - "-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \ - -X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \ - -X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die - popd || die -} - -src_install() { - pushd "src/${EGO_PN}" || die - dobin "bin/calico-${PN}" - dodoc README.md - insinto /etc/logrotate.d - doins debian/calico-felix.logrotate - insinto /etc/felix - doins etc/felix.cfg.example - newinitd "${FILESDIR}"/felix.initd felix - newconfd "${FILESDIR}"/felix.confd felix -} diff --git a/net-misc/felix/files/felix.confd b/net-misc/felix/files/felix.confd deleted file mode 100644 index 566b9b5aaaf9..000000000000 --- a/net-misc/felix/files/felix.confd +++ /dev/null @@ -1,7 +0,0 @@ -### -# Calico Felix Agent config -# -# The following values are used to configure calico-felix -# - -command_args="" diff --git a/net-misc/felix/files/felix.initd b/net-misc/felix/files/felix.initd deleted file mode 100644 index 92adbb10f489..000000000000 --- a/net-misc/felix/files/felix.initd +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Calico Felix host agent" -pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} -user=${user:-root} -group=${group:-root} - -command="/usr/bin/calico-felix" -command_args="${command_args}" -command_background="true" -start_stop_daemon_args="--user ${user} --group ${group} \ - --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \ - --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log" - -depend() { - need net -} diff --git a/net-misc/felix/metadata.xml b/net-misc/felix/metadata.xml deleted file mode 100644 index e27dcb92b466..000000000000 --- a/net-misc/felix/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="bird">Use BIRD, e.g. for route reflection</flag> - </use> - <upstream> - <remote-id type="github">projectcalico/felix</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index b476f9d6e9ab..83c12c3df495 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1 +1,9 @@ -DIST freerdp-2.4.1.tar.gz 7300797 BLAKE2B cd14cadfbad9f30ab6ee6ba80c3a3bfb191b68dc0cf576082044a20489f558e222e618ed314a7fefdefcb480f201f384df5d77db8699d2e4530559fd3d5b4398 SHA512 9bacd6a7219690ed62d6a646616a54770293ff45b59211aff73dc8d67300a79ba22e72cbe56803d301b60964e4acccea9b7c6d7e2d698b91eafcf6ba561cd66a +DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd +DIST freerdp-2.11.6.tar.gz 7337387 BLAKE2B 6d6b338710fccc4ad5067f4cf7f17190409f5313cb0c2c4ad84c82326b605897e01e03e2f334346ae5e20642c7813b415d0123558c00565b4b8c11257ebac226 SHA512 4facaff07bc26434474776e2463c9ebf0111190cb6bcf7d3dc7a6b3d8e2de991925a92b7889b2c5dec50ee4cf28f94bb1016c36da207a00ead09005ea0ace36d +DIST freerdp-2.11.6.tar.gz.asc 228 BLAKE2B cfcd673da04fcd749883b5dbbc27f12d6680442991d884006401521222385c7b325af35828683d96e1de866850a9c4eaae5f26d4b3cff4111391dc31f94ca1bd SHA512 4ef9a1fcb6f97295affbe080657a5a812d73e3448e1f480b382774e6f6fd3276a4e251e94cac66fdc83ae974ccc0b9ca9ca2b82b76b5128915885a35fafd18e4 +DIST freerdp-2.11.7.tar.gz 7337520 BLAKE2B ad579b4c36d96a17ccceb26c4c34124a050c05c49c05e2d8b4fd46789929dd4581d26aad88de7a3b3e6ecdd330b9b2ac2d45616537c1c635d10706f14a36f5ca SHA512 e1b4ac112090f2364ef2c360453f91b4643680cad75785cb214b48ebbc78c5eeca9fa8fe9f84f241a70825eefb5273e4e380483a5cdc86c92aa6ac1eb22c188e +DIST freerdp-2.11.7.tar.gz.asc 228 BLAKE2B a374c22ada6da59fb66fcb8021d5bb27545df0c0875b929766dc9b468e9fbfb4a79b1c38b2dbf5c44f925fd44305b1798e5ede0e6726a85c98cac96ceb8020f2 SHA512 18a1b8f18bba14e0156e5eca8fad28efdadd2f87fa29221629ffd9cf53f74606392de0df0e11ae41809fad0509c87462ee29d1e01e9df0dfe08b29832378be76 +DIST freerdp-3.4.0.tar.gz 9331562 BLAKE2B 888d6c5786c7b3c5eea89e41bca23ef2b323377b8115c5f5bfd0dd38e5ed2d3701ffc7603e4aa4253e9116804a12268f4b59dadeb2f60f5c39e8170e78ba6bd1 SHA512 b69f2a2a5f6c70b4a21f0768ce2050020af47b83a3cf06d3b3b46a0e6aa7c062ed2b9de04782a8d6651002ded4c267f8653dfdc2517323926aaab3675924b6c5 +DIST freerdp-3.5.0.tar.gz 9335565 BLAKE2B fc417336cda9dd14a2c7605a2b0172220f711599356b38d4d346130fc865c1ef563e627b57bcb20843dae231d8cfda272261db30d956ea98c29ebf7908c4722c SHA512 5f6f6fc84d0fb3581b3debd8dde8ed7054275af46f71b6ebd618d240b196e26352cf5ea260bd819a2b4464101012184910715b546701a95fc1aa951433150b07 +DIST freerdp-3.5.1.tar.gz 9338947 BLAKE2B dd004333a52046300a5f319346da46ddb460e8acbb5902dc4daa18e3d0b6e3d9ee1d43f43e54f0887fec68cf6a952567be4c7995e807099585b9062a56058506 SHA512 6c7861131e1ae2cf824659fe8cff34e0f608c4e3796b64f02a61aeeaa12dce76aad2bfa5096c821f0f86fde82ffed7e4876f20cd4016ea1adb7555e4828551d8 +DIST freerdp-3.5.1.tar.gz.asc 228 BLAKE2B ae5826e539f0078d3adf7a4886f0b0c249c73fd2fc7ae21dcf815d876ec26f4482c242c076dbd9dcadd18927f4f97199f16fac3b40c0c04b1e43482865af15dc SHA512 ba52d6a5aa3d91fdab988d91b8591ccb075ce3d52bbee0596ffdb50902b54e650b397995f273463296a484199b969bab47708b5dbfc76c4128aa54ec5afcfdf2 diff --git a/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch b/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch new file mode 100644 index 000000000000..8d45331bd95b --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch @@ -0,0 +1,329 @@ +https://github.com/FreeRDP/FreeRDP/issues/9616 + +From 8b349f4f2b5d14e28a6a73e9c2b9860d7f275bc4 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Thu, 7 Dec 2023 15:54:38 -0500 +Subject: [PATCH] Revert "[codec] encode messages considering endianness" + +This reverts commit e3ef8a02ddf079bcf6dfa58888db69a709ce50c9. +--- + libfreerdp/codec/nsc_encode.c | 76 +++++++++++++---------------------- + libfreerdp/codec/rfx_encode.c | 74 +++++++++++++--------------------- + 2 files changed, 58 insertions(+), 92 deletions(-) + +diff --git a/libfreerdp/codec/nsc_encode.c b/libfreerdp/codec/nsc_encode.c +index 477318cc1..fd9626a6d 100644 +--- a/libfreerdp/codec/nsc_encode.c ++++ b/libfreerdp/codec/nsc_encode.c +@@ -119,8 +119,6 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI + UINT16 rw; + BYTE ccl; + const BYTE* src; +- const UINT32* src_32; +- const UINT16* src_16; + BYTE* yplane = NULL; + BYTE* coplane = NULL; + BYTE* cgplane = NULL; +@@ -142,85 +140,69 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI + coplane = context->priv->PlaneBuffers[1] + y * rw; + cgplane = context->priv->PlaneBuffers[2] + y * rw; + aplane = context->priv->PlaneBuffers[3] + y * context->width; +- src_32 = (UINT32*)src; +- src_16 = (UINT16*)src; + + for (x = 0; x < context->width; x++) + { + switch (context->format) + { + case PIXEL_FORMAT_BGRX32: +- b_val = (INT16)(*src_32 & 0xFF); +- g_val = (INT16)((*src_32 >> 8) & 0xFF); +- r_val = (INT16)((*src_32 >> 16) & 0xFF); ++ b_val = *src++; ++ g_val = *src++; ++ r_val = *src++; ++ src++; + a_val = 0xFF; +- src_32++; + break; + + case PIXEL_FORMAT_BGRA32: +- b_val = (INT16)(*src_32 & 0xFF); +- g_val = (INT16)((*src_32 >> 8) & 0xFF); +- r_val = (INT16)((*src_32 >> 16) & 0xFF); +- a_val = (INT16)((*src_32 >> 24) & 0xFF); +- src_32++; ++ b_val = *src++; ++ g_val = *src++; ++ r_val = *src++; ++ a_val = *src++; + break; + + case PIXEL_FORMAT_RGBX32: +- r_val = (INT16)(*src_32 & 0xFF); +- g_val = (INT16)((*src_32 >> 8) & 0xFF); +- b_val = (INT16)((*src_32 >> 16) & 0xFF); ++ r_val = *src++; ++ g_val = *src++; ++ b_val = *src++; ++ src++; + a_val = 0xFF; +- src_32++; + break; + + case PIXEL_FORMAT_RGBA32: +- r_val = (INT16)(*src_32 & 0xFF); +- g_val = (INT16)((*src_32 >> 8) & 0xFF); +- b_val = (INT16)((*src_32 >> 16) & 0xFF); +- a_val = (INT16)((*src_32 >> 24) & 0xFF); +- src_32++; ++ r_val = *src++; ++ g_val = *src++; ++ b_val = *src++; ++ a_val = *src++; + break; + + case PIXEL_FORMAT_BGR24: +-#ifdef __LITTLE_ENDIAN__ + b_val = *src++; + g_val = *src++; + r_val = *src++; +-#else +- r_val = *src++; +- g_val = *src++; +- b_val = *src++; +-#endif + a_val = 0xFF; + break; + + case PIXEL_FORMAT_RGB24: +-#ifdef __LITTLE_ENDIAN__ + r_val = *src++; + g_val = *src++; + b_val = *src++; +-#else +- b_val = *src++; +- g_val = *src++; +- r_val = *src++; +-#endif + a_val = 0xFF; + break; + + case PIXEL_FORMAT_BGR16: +- b_val = (INT16)((*src_16) & 0x1F); +- g_val = (INT16)((*src_16 >> 5) & 0x3F); +- r_val = (INT16)((*src_16 >> 11) & 0x1F); ++ b_val = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5)); ++ g_val = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3)); ++ r_val = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07)); + a_val = 0xFF; +- src_16++; ++ src += 2; + break; + + case PIXEL_FORMAT_RGB16: +- r_val = (INT16)((*src_16) & 0x1F); +- g_val = (INT16)((*src_16 >> 5) & 0x3F); +- b_val = (INT16)((*src_16 >> 11) & 0x1F); ++ r_val = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5)); ++ g_val = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3)); ++ b_val = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07)); + a_val = 0xFF; +- src_16++; ++ src += 2; + break; + + case PIXEL_FORMAT_A4: +@@ -228,17 +210,17 @@ static BOOL nsc_encode_argb_to_aycocg(NSC_CONTEXT* context, const BYTE* data, UI + int shift; + BYTE idx; + shift = (7 - (x % 8)); +- idx = (BYTE)(((*src_32 & 0xFF) >> shift) & 1); +- idx |= (BYTE)(((((*src_32 >> 8) & 0xFF) >> shift) & 1) << 1); +- idx |= (BYTE)(((((*src_32 >> 16) & 0xFF) >> shift) & 1) << 2); +- idx |= (BYTE)(((((*src_32 >> 24) & 0xFF) >> shift) & 1) << 3); ++ idx = ((*src) >> shift) & 1; ++ idx |= (((*(src + 1)) >> shift) & 1) << 1; ++ idx |= (((*(src + 2)) >> shift) & 1) << 2; ++ idx |= (((*(src + 3)) >> shift) & 1) << 3; + idx *= 3; + r_val = (INT16)context->palette[idx]; + g_val = (INT16)context->palette[idx + 1]; + b_val = (INT16)context->palette[idx + 2]; + + if (shift == 0) +- src_32++; ++ src += 4; + } + + a_val = 0xFF; +diff --git a/libfreerdp/codec/rfx_encode.c b/libfreerdp/codec/rfx_encode.c +index 355f74340..b4f393605 100644 +--- a/libfreerdp/codec/rfx_encode.c ++++ b/libfreerdp/codec/rfx_encode.c +@@ -49,8 +49,6 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + int x_exceed; + int y_exceed; + const BYTE* src; +- const UINT32* src_32; +- const UINT16* src_16; + INT16 r, g, b; + INT16 *r_last, *g_last, *b_last; + x_exceed = 64 - width; +@@ -59,8 +57,6 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + for (y = 0; y < height; y++) + { + src = rgb_data + y * rowstride; +- src_32 = (UINT32*)src; +- src_16 = (UINT16*)src; + + switch (pixel_format) + { +@@ -68,10 +64,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_BGRA32: + for (x = 0; x < width; x++) + { +- *b_buf++ = (INT16)(*src_32 & 0xFF); +- *g_buf++ = (INT16)((*src_32 >> 8) & 0xFF); +- *r_buf++ = (INT16)((*src_32 >> 16) & 0xFF); +- src_32++; ++ *b_buf++ = (INT16)(*src++); ++ *g_buf++ = (INT16)(*src++); ++ *r_buf++ = (INT16)(*src++); ++ src++; + } + + break; +@@ -80,10 +76,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_ABGR32: + for (x = 0; x < width; x++) + { +- *b_buf++ = (INT16)((*src_32 >> 8) & 0xFF); +- *g_buf++ = (INT16)((*src_32 >> 16) & 0xFF); +- *r_buf++ = (INT16)((*src_32 >> 24) & 0xFF); +- src_32++; ++ src++; ++ *b_buf++ = (INT16)(*src++); ++ *g_buf++ = (INT16)(*src++); ++ *r_buf++ = (INT16)(*src++); + } + + break; +@@ -92,10 +88,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_RGBA32: + for (x = 0; x < width; x++) + { +- *r_buf++ = (INT16)(*src_32 & 0xFF); +- *g_buf++ = (INT16)((*src_32 >> 8) & 0xFF); +- *b_buf++ = (INT16)((*src_32 >> 16) & 0xFF); +- src_32++; ++ *r_buf++ = (INT16)(*src++); ++ *g_buf++ = (INT16)(*src++); ++ *b_buf++ = (INT16)(*src++); ++ src++; + } + + break; +@@ -104,10 +100,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_ARGB32: + for (x = 0; x < width; x++) + { +- *r_buf++ = (INT16)((*src_32 >> 8) & 0xFF); +- *g_buf++ = (INT16)((*src_32 >> 16) & 0xFF); +- *b_buf++ = (INT16)((*src_32 >> 24) & 0xFF); +- src_32++; ++ src++; ++ *r_buf++ = (INT16)(*src++); ++ *g_buf++ = (INT16)(*src++); ++ *b_buf++ = (INT16)(*src++); + } + + break; +@@ -115,15 +111,9 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_BGR24: + for (x = 0; x < width; x++) + { +-#ifdef __LITTLE_ENDIAN__ + *b_buf++ = (INT16)(*src++); + *g_buf++ = (INT16)(*src++); + *r_buf++ = (INT16)(*src++); +-#else +- *r_buf++ = (INT16)(*src++); +- *g_buf++ = (INT16)(*src++); +- *b_buf++ = (INT16)(*src++); +-#endif + } + + break; +@@ -131,15 +121,9 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_RGB24: + for (x = 0; x < width; x++) + { +-#ifdef __LITTLE_ENDIAN__ + *r_buf++ = (INT16)(*src++); + *g_buf++ = (INT16)(*src++); + *b_buf++ = (INT16)(*src++); +-#else +- *b_buf++ = (INT16)(*src++); +- *g_buf++ = (INT16)(*src++); +- *r_buf++ = (INT16)(*src++); +-#endif + } + + break; +@@ -147,10 +131,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_BGR16: + for (x = 0; x < width; x++) + { +- *b_buf++ = (INT16)((*src_16) & 0x1F); +- *g_buf++ = (INT16)((*src_16 >> 5) & 0x3F); +- *r_buf++ = (INT16)((*src_16 >> 11) & 0x1F); +- src_16++; ++ *b_buf++ = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5)); ++ *g_buf++ = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3)); ++ *r_buf++ = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07)); ++ src += 2; + } + + break; +@@ -158,10 +142,10 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + case PIXEL_FORMAT_RGB16: + for (x = 0; x < width; x++) + { +- *r_buf++ = (INT16)((*src_16 & 0x1F)); +- *g_buf++ = (INT16)((*src_16 >> 5) & 0x3F); +- *b_buf++ = (INT16)((*src_16 >> 11) & 0x1F); +- src_16++; ++ *r_buf++ = (INT16)(((*(src + 1)) & 0xF8) | ((*(src + 1)) >> 5)); ++ *g_buf++ = (INT16)((((*(src + 1)) & 0x07) << 5) | (((*src) & 0xE0) >> 3)); ++ *b_buf++ = (INT16)((((*src) & 0x1F) << 3) | (((*src) >> 2) & 0x07)); ++ src += 2; + } + + break; +@@ -175,17 +159,17 @@ static void rfx_encode_format_rgb(const BYTE* rgb_data, int width, int height, i + int shift; + BYTE idx; + shift = (7 - (x % 8)); +- idx = (BYTE)(((*src_32 & 0xFF) >> shift) & 1); +- idx |= (BYTE)(((((*src_32 >> 8) & 0xFF) >> shift) & 1) << 1); +- idx |= (BYTE)(((((*src_32 >> 16) & 0xFF) >> shift) & 1) << 2); +- idx |= (BYTE)(((((*src_32 >> 24) & 0xFF) >> shift) & 1) << 3); ++ idx = ((*src) >> shift) & 1; ++ idx |= (((*(src + 1)) >> shift) & 1) << 1; ++ idx |= (((*(src + 2)) >> shift) & 1) << 2; ++ idx |= (((*(src + 3)) >> shift) & 1) << 3; + idx *= 3; + *r_buf++ = (INT16)palette[idx]; + *g_buf++ = (INT16)palette[idx + 1]; + *b_buf++ = (INT16)palette[idx + 2]; + + if (shift == 0) +- src_32++; ++ src += 4; + } + + break; +-- +2.43.0 + diff --git a/net-misc/freerdp/files/freerdp-2.11.2-clang.patch b/net-misc/freerdp/files/freerdp-2.11.2-clang.patch new file mode 100644 index 000000000000..b05492a3effd --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2.11.2-clang.patch @@ -0,0 +1,29 @@ +https://github.com/FreeRDP/FreeRDP/pull/9373 +https://bugs.gentoo.org/916515 + +From 88dd68153c834e1d5f59beb59496bfd1bf9697a8 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Mon, 11 Sep 2023 00:31:54 +0000 +Subject: [PATCH] Fixes clang error error: incompatible function pointer types + assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(void *)') from 'void *(const + void *)' [-Wincompatible-function-pointer-types] | obj->fnObjectNew = + uwac_event_clone; | ^ ~~~~~~~~~~~~~~~~ + +Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> +--- + client/Wayland/wlfreerdp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/Wayland/wlfreerdp.c b/client/Wayland/wlfreerdp.c +index 5be10aae2c1b..ef3539383f55 100644 +--- a/client/Wayland/wlfreerdp.c ++++ b/client/Wayland/wlfreerdp.c +@@ -598,7 +598,7 @@ static void wlf_client_free(freerdp* instance, rdpContext* context) + DeleteCriticalSection(&wlf->critical); + } + +-static void* uwac_event_clone(const void* val) ++static void* uwac_event_clone(void* val) + { + UwacEvent* copy; + const UwacEvent* ev = (const UwacEvent*)val; diff --git a/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch b/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch new file mode 100644 index 000000000000..34720aef4b5b --- /dev/null +++ b/net-misc/freerdp/files/freerdp-2.11.7-type-mismatch.patch @@ -0,0 +1,23 @@ +From d2b6771c748e54e659d5f1243a92e499c3beaa36 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Wed, 22 May 2024 17:04:43 -0400 +Subject: [PATCH] X11: fix pointer/integer type mismatch + +Fixed on master in 2da280b8a1748052b70b3f5a1ef0d8e932c33adc. +--- + client/X11/xf_graphics.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c +index 5aa1fd48b5a3..fe81e0ed91cb 100644 +--- a/client/X11/xf_graphics.c ++++ b/client/X11/xf_graphics.c +@@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) + + #endif + fail: +- WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1); ++ WLog_DBG(TAG, "%s: %p", __func__, rc ? pointer : NULL); + return rc; + } + diff --git a/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch b/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch deleted file mode 100644 index d6e73631c6e2..000000000000 --- a/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a0ce57541f4f22c4a7201de317e603103d6ffdc6 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Sun, 24 Oct 2021 10:04:38 -0400 -Subject: [PATCH] channels/rdpei: avoid calling free() on contactPoints array - -This was fixed on master as part of -268bc2e8ef7b76887d14d50702bb8446ce15a4c1. Backporting that change seems -like too much for the stable branch. ---- - channels/rdpei/client/rdpei_main.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c -index f20d58a13..1d95054a0 100644 ---- a/channels/rdpei/client/rdpei_main.c -+++ b/channels/rdpei/client/rdpei_main.c -@@ -1386,7 +1386,6 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints) - return CHANNEL_RC_OK; - error_out: - free(context); -- free(rdpei->contactPoints); - free(rdpei); - return error; - } --- -2.33.1 - diff --git a/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch b/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch new file mode 100644 index 000000000000..549c813f774b --- /dev/null +++ b/net-misc/freerdp/files/freerdp-3.4.0-incompatible-pointer.patch @@ -0,0 +1,279 @@ +https://github.com/FreeRDP/FreeRDP/pull/9992 +https://bugs.gentoo.org/921252 + +From 0242240ba7a61945607b835f378ff077e4582780 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:05:30 +0100 +Subject: [PATCH 1/8] [winpr,clipboard] fix incompatible WCHAR pointer + +--- + winpr/libwinpr/clipboard/synthetic_file.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c +index 14219806c76e..e748f8bea399 100644 +--- a/winpr/libwinpr/clipboard/synthetic_file.c ++++ b/winpr/libwinpr/clipboard/synthetic_file.c +@@ -276,7 +276,13 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l + const WCHAR* remote_name, wArrayList* files) + { + BOOL result = FALSE; +- const WCHAR* wildcard = "/\0*\0\0\0"; ++ union ++ { ++ const char* c; ++ const WCHAR* w; ++ } wildcard; ++ const char buffer[4] = "/\0*\0\0\0"; ++ wildcard.c = buffer; + const size_t wildcardLen = 3; + + WINPR_ASSERT(clipboard); +@@ -290,7 +296,7 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l + return FALSE; + + _wcsncat(namebuf, local_name, len); +- _wcsncat(namebuf, wildcard, wildcardLen); ++ _wcsncat(namebuf, wildcard.w, wildcardLen); + + result = do_add_directory_contents_to_list(clipboard, local_name, remote_name, namebuf, files); + + +From b1f60a1d117da2a6775dc12ab7e9b62c95615550 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:07:17 +0100 +Subject: [PATCH 2/8] [winpr,smartcard] fix incompatible PCSC_SCardListReaders + pointer + +--- + winpr/libwinpr/smartcard/smartcard_pcsc.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c +index fb04d5684aa0..c94b4caafe1e 100644 +--- a/winpr/libwinpr/smartcard/smartcard_pcsc.c ++++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c +@@ -992,8 +992,14 @@ static LONG WINAPI PCSC_SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR mszGrou + return SCARD_E_NO_MEMORY; + } + +- status = +- PCSC_SCardListReaders_Internal(hContext, mszGroupsA, (LPSTR*)&mszReadersA, pcchReaders); ++ union ++ { ++ LPSTR* ppc; ++ LPSTR pc; ++ } cnv; ++ cnv.ppc = &mszReadersA; ++ ++ status = PCSC_SCardListReaders_Internal(hContext, mszGroupsA, cnv.pc, pcchReaders); + if (status == SCARD_S_SUCCESS) + { + size_t size = 0; + +From 48eaca08048918260d4dca05e9522118657e8210 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:10:39 +0100 +Subject: [PATCH 3/8] [core,license] fix incompatible WCHAR pointer + +--- + libfreerdp/core/license.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/libfreerdp/core/license.c b/libfreerdp/core/license.c +index 99d4fa25fc84..e6c622a6b087 100644 +--- a/libfreerdp/core/license.c ++++ b/libfreerdp/core/license.c +@@ -2802,18 +2802,25 @@ BOOL license_server_send_request(rdpLicense* license) + return license_set_state(license, LICENSE_STATE_REQUEST); + } + +-static BOOL license_set_string(const char* what, const char* value, WCHAR** dst, UINT32* dstLen) ++static BOOL license_set_string(const char* what, const char* value, BYTE** bdst, UINT32* dstLen) + { + WINPR_ASSERT(what); + WINPR_ASSERT(value); +- WINPR_ASSERT(dst); ++ WINPR_ASSERT(bdst); + WINPR_ASSERT(dstLen); + ++ union ++ { ++ WCHAR** w; ++ BYTE** b; ++ } cnv; ++ cnv.b = bdst; ++ + size_t len = 0; +- *dst = (BYTE*)ConvertUtf8ToWCharAlloc(value, &len); +- if (!*dst || (len > UINT32_MAX / sizeof(WCHAR))) ++ *cnv.w = ConvertUtf8ToWCharAlloc(value, &len); ++ if (!*cnv.w || (len > UINT32_MAX / sizeof(WCHAR))) + { +- WLog_ERR(TAG, "license->ProductInfo: %s == %p || %" PRIu32 " > UINT32_MAX", what, *dst, ++ WLog_ERR(TAG, "license->ProductInfo: %s == %p || %" PRIu32 " > UINT32_MAX", what, *cnv.w, + len); + return FALSE; + } + +From 0717b4de1549390a3404af823bd36db66772abd2 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:10:59 +0100 +Subject: [PATCH 4/8] [winpr,crt] fix incompatible WCHAR pointer + +--- + winpr/libwinpr/crt/test/TestUnicodeConversion.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/winpr/libwinpr/crt/test/TestUnicodeConversion.c b/winpr/libwinpr/crt/test/TestUnicodeConversion.c +index a5c4c75e8f71..187a068aedaa 100644 +--- a/winpr/libwinpr/crt/test/TestUnicodeConversion.c ++++ b/winpr/libwinpr/crt/test/TestUnicodeConversion.c +@@ -24,10 +24,12 @@ typedef struct + // TODO: The unit tests do not check for valid code points, so always end the test + // strings with a simple ASCII symbol for now. + static const testcase_t unit_testcases[] = { +- { "foo", 3, "f\x00o\x00o\x00\x00\x00", 3 }, +- { "foo", 4, "f\x00o\x00o\x00\x00\x00", 4 }, ++ { "foo", 3, (const WCHAR*)"f\x00o\x00o\x00\x00\x00", 3 }, ++ { "foo", 4, (const WCHAR*)"f\x00o\x00o\x00\x00\x00", 4 }, + { "✊🎅ęʥ꣸𑗊a", 19, +- "\x0a\x27\x3c\xd8\x85\xdf\x19\x01\xa5\x02\xf8\xa8\x05\xd8\xca\xdd\x61\x00\x00\x00", 9 } ++ (const WCHAR*)"\x0a\x27\x3c\xd8\x85\xdf\x19\x01\xa5\x02\xf8\xa8\x05\xd8\xca\xdd\x61\x00\x00" ++ "\x00", ++ 9 } + }; + + static void create_prefix(char* prefix, size_t prefixlen, size_t buffersize, SSIZE_T rc, + +From cab7b59fccabc0f09d659bd499c03dab7e911ffa Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:13:40 +0100 +Subject: [PATCH 5/8] [codec,rfx] explicitly cast return + +cast to avoid compilation issues with incompatible-pointer-types +--- + libfreerdp/codec/rfx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c +index c83cfd5c1ac3..66ed1e04aea2 100644 +--- a/libfreerdp/codec/rfx.c ++++ b/libfreerdp/codec/rfx.c +@@ -1368,7 +1368,7 @@ const RFX_TILE** rfx_message_get_tiles(const RFX_MESSAGE* message, UINT16* numTi + WINPR_ASSERT(message); + if (numTiles) + *numTiles = message->numTiles; +- return message->tiles; ++ return (const RFX_TILE**)message->tiles; + } + + UINT16 rfx_message_get_tile_count(const RFX_MESSAGE* message) + +From 86966912502a3667c111d35dc9ba577a8b209a6d Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:17:29 +0100 +Subject: [PATCH 6/8] [client,common] fix incompatible-pointer-types + +use a union to cast to expected types. +--- + client/common/file.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/client/common/file.c b/client/common/file.c +index feb37967fc5a..39b08f18c916 100644 +--- a/client/common/file.c ++++ b/client/common/file.c +@@ -2299,9 +2299,15 @@ BOOL freerdp_client_populate_settings_from_rdp_file(const rdpFile* file, rdpSett + if (~file->RedirectLocation) + { + size_t count = 0; +- char** str = CommandLineParseCommaSeparatedValuesEx(LOCATION_CHANNEL_NAME, NULL, &count); +- const BOOL rc = freerdp_client_add_dynamic_channel(settings, count, str); +- free(str); ++ union ++ { ++ void* pv; ++ char** str; ++ const char** cstr; ++ } cnv; ++ cnv.str = CommandLineParseCommaSeparatedValuesEx(LOCATION_CHANNEL_NAME, NULL, &count); ++ const BOOL rc = freerdp_client_add_dynamic_channel(settings, count, cnv.cstr); ++ free(cnv.pv); + if (!rc) + return FALSE; + } + +From dfdb8a849ef78a6e5d1530489ad7f899c62c9c22 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:18:09 +0100 +Subject: [PATCH 7/8] [channels,drive] fix wrong function usage + +_wcslen is for WCHAR, wcslen for wchar_t +--- + channels/drive/client/drive_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/channels/drive/client/drive_main.c b/channels/drive/client/drive_main.c +index 0fdc2e08ff50..04f8d837fa6b 100644 +--- a/channels/drive/client/drive_main.c ++++ b/channels/drive/client/drive_main.c +@@ -511,7 +511,7 @@ static UINT drive_process_irp_query_volume_information(DRIVE_DEVICE* drive, IRP* + /* http://msdn.microsoft.com/en-us/library/cc232101.aspx */ + const WCHAR* diskType = + InitializeConstWCharFromUtf8("FAT32", LabelBuffer, ARRAYSIZE(LabelBuffer)); +- const size_t diskTypeLen = (wcslen(diskType) + 1) * sizeof(WCHAR); ++ const size_t diskTypeLen = (_wcslen(diskType) + 1) * sizeof(WCHAR); + const size_t length = 12ul + diskTypeLen; + Stream_Write_UINT32(output, length); /* Length */ + + +From 00ec91dc16724f7aad8866b4f988baad4c1216a8 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 10:25:00 +0100 +Subject: [PATCH 8/8] [server,shadow] cast incompatible pointer + +the context pointer to WTSOpenServerA is intentional, cast to LPSTR to +match definition +--- + server/shadow/shadow_client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/server/shadow/shadow_client.c b/server/shadow/shadow_client.c +index 0fd52363eb6d..f2a5f63cb188 100644 +--- a/server/shadow/shadow_client.c ++++ b/server/shadow/shadow_client.c +@@ -252,7 +252,7 @@ static BOOL shadow_client_context_new(freerdp_peer* peer, rdpContext* context) + goto fail; + + region16_init(&(client->invalidRegion)); +- client->vcm = WTSOpenServerA(peer->context); ++ client->vcm = WTSOpenServerA((LPSTR)peer->context); + + if (!client->vcm || client->vcm == INVALID_HANDLE_VALUE) + goto fail; +From 00f4c9612a924f1b87a7dcdd2a5728d9e9616ee6 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 18 Mar 2024 19:57:02 +0100 +Subject: [PATCH] [winpr,clipboard] fix WCHAR buffer size + +--- + winpr/libwinpr/clipboard/synthetic_file.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/winpr/libwinpr/clipboard/synthetic_file.c b/winpr/libwinpr/clipboard/synthetic_file.c +index e748f8bea399..ce70e1efc26e 100644 +--- a/winpr/libwinpr/clipboard/synthetic_file.c ++++ b/winpr/libwinpr/clipboard/synthetic_file.c +@@ -281,9 +281,9 @@ static BOOL add_directory_contents_to_list(wClipboard* clipboard, const WCHAR* l + const char* c; + const WCHAR* w; + } wildcard; +- const char buffer[4] = "/\0*\0\0\0"; ++ const char buffer[6] = "/\0*\0\0\0"; + wildcard.c = buffer; +- const size_t wildcardLen = 3; ++ const size_t wildcardLen = ARRAYSIZE(buffer) / sizeof(WCHAR); + + WINPR_ASSERT(clipboard); + WINPR_ASSERT(local_name); diff --git a/net-misc/freerdp/freerdp-2.11.5-r10.ebuild b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild new file mode 100644 index 000000000000..6c9b29344718 --- /dev/null +++ b/net-misc/freerdp/freerdp-2.11.5-r10.ebuild @@ -0,0 +1,168 @@ +# Copyright 2011-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" + case ${PV} in + 2.*) EGIT_BRANCH="stable-2.0";; + esac +else + MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="2" +IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto +" + +COMMON_DEPEND=" + dev-libs/openssl:0= + sys-libs/zlib:0 + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ffmpeg? ( media-video/ffmpeg:0= ) + !ffmpeg? ( + x11-libs/cairo:0= + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + x11-libs/libXrandr + ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-libs/libpulse ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( sys-apps/pcsc-lite ) + systemd? ( sys-apps/systemd:0= ) + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:3[client] ) + server? ( !net-misc/freerdp:3[server] ) +" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/freerdp-2.11.2-clang.patch" + "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" + ) + cmake_src_prepare +} + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + +src_configure() { + # bug #881695 + filter-lto + + local mycmakeargs=( + -Wno-dev + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_ALSA=$(option alsa) + -DWITH_CCACHE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_CLIENT=$(option client) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_ICU=$(option icu) + -DWITH_JPEG=$(option jpeg) + -DWITH_GSSAPI=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_PCSC=$(option smartcard) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WINPR_TOOLS=$(option server) + ) + cmake_src_configure +} + +src_test() { + local myctestargs=( -E TestBacktrace ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die +} diff --git a/net-misc/freerdp/freerdp-2.11.6.ebuild b/net-misc/freerdp/freerdp-2.11.6.ebuild new file mode 100644 index 000000000000..2a7209cfab84 --- /dev/null +++ b/net-misc/freerdp/freerdp-2.11.6.ebuild @@ -0,0 +1,172 @@ +# Copyright 2011-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" + case ${PV} in + 2.*) EGIT_BRANCH="stable-2.0";; + esac +else + inherit verify-sig + MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="2" +IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" +RESTRICT="!test? ( test )" + +BDEPEND+=" + virtual/pkgconfig + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto +" + +COMMON_DEPEND=" + dev-libs/openssl:0= + sys-libs/zlib:0 + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ffmpeg? ( media-video/ffmpeg:0= ) + !ffmpeg? ( + x11-libs/cairo:0= + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + X? ( x11-libs/libXrandr ) + ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-libs/libpulse ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( sys-apps/pcsc-lite ) + systemd? ( sys-apps/systemd:0= ) + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:3[client] ) + server? ( !net-misc/freerdp:3[server] ) +" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/freerdp-2.11.2-clang.patch" + "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" + ) + cmake_src_prepare +} + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + +src_configure() { + # bug #881695 + filter-lto + + local mycmakeargs=( + -Wno-dev + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_ALSA=$(option alsa) + -DWITH_CCACHE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_CLIENT=$(option client) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_ICU=$(option icu) + -DWITH_JPEG=$(option jpeg) + -DWITH_GSSAPI=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_PCSC=$(option smartcard) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WINPR_TOOLS=$(option server) + ) + cmake_src_configure +} + +src_test() { + local myctestargs=( -E TestBacktrace ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die +} diff --git a/net-misc/freerdp/freerdp-2.11.7.ebuild b/net-misc/freerdp/freerdp-2.11.7.ebuild new file mode 100644 index 000000000000..966ad5d7d626 --- /dev/null +++ b/net-misc/freerdp/freerdp-2.11.7.ebuild @@ -0,0 +1,176 @@ +# Copyright 2011-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" + case ${PV} in + 2.*) EGIT_BRANCH="stable-2.0";; + esac +else + inherit verify-sig + MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="2" +IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" +RESTRICT="!test? ( test )" + +BDEPEND+=" + virtual/pkgconfig + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto +" + +COMMON_DEPEND=" + dev-libs/openssl:0= + sys-libs/zlib:0 + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ffmpeg? ( media-video/ffmpeg:0= ) + !ffmpeg? ( + x11-libs/cairo:0= + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + X? ( x11-libs/libXrandr ) + ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-libs/libpulse ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( sys-apps/pcsc-lite ) + systemd? ( sys-apps/systemd:0= ) + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:3[client] ) + server? ( !net-misc/freerdp:3[server] ) +" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/freerdp-2.11.2-clang.patch" + "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" + "${FILESDIR}/freerdp-2.11.7-type-mismatch.patch" + ) + cmake_src_prepare +} + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + +src_configure() { + # bug #881695 + filter-lto + + # https://bugs.gentoo.org/927731 + append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) + + local mycmakeargs=( + -Wno-dev + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_ALSA=$(option alsa) + -DWITH_CCACHE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_CLIENT=$(option client) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_ICU=$(option icu) + -DWITH_JPEG=$(option jpeg) + -DWITH_GSSAPI=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_PCSC=$(option smartcard) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WINPR_TOOLS=$(option server) + ) + cmake_src_configure +} + +src_test() { + local myctestargs=( -E TestBacktrace ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die +} diff --git a/net-misc/freerdp/freerdp-2.4.1-r1.ebuild b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild deleted file mode 100644 index 6494b88b6bfb..000000000000 --- a/net-misc/freerdp/freerdp-2.4.1-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 2011-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" - case ${PV} in - 2.*) EGIT_BRANCH="stable-2.0";; - esac -else - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86" -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="http://www.freerdp.com/" - -LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib:0 - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ffmpeg? ( media-video/ffmpeg:0= ) - !ffmpeg? ( - x11-libs/cairo:0= - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - x11-libs/libXrandr - ) - jpeg? ( virtual/jpeg:0 ) - openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-sound/pulseaudio ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) -" - -PATCHES=( - "${FILESDIR}/freerdp-2.4.1-rdpei-free.patch" -) - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) - -DWITH_CCACHE=OFF - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) - -DWITH_MANPAGES=$(usex doc ON OFF) - -DWITH_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_SWSCALE=$(usex ffmpeg ON OFF) - -DWITH_CAIRO=$(usex ffmpeg OFF ON) - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_X11=$(usex X ON OFF) - -DWITH_XINERAMA=$(usex xinerama ON OFF) - -DWITH_XV=$(usex xv ON OFF) - -DWITH_WAYLAND=$(usex wayland ON OFF) - ) - cmake_src_configure -} diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild index 50350a7d1f9e..b17a66b5c459 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 2011-2021 Gentoo Authors +# Copyright 2011-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake +inherit cmake flag-o-matic if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -12,21 +12,31 @@ if [[ ${PV} == *9999 ]]; then 2.*) EGIT_BRANCH="stable-2.0";; esac else + inherit verify-sig MY_P=${P/_/-} S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="http://www.freerdp.com/" +HOMEPAGE="https://www.freerdp.com/" LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" +SLOT="2" +IUSE="alsa cpu_flags_arm_neon client cups debug +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" -RDEPEND=" +BDEPEND+=" + virtual/pkgconfig + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto +" + +COMMON_DEPEND=" dev-libs/openssl:0= sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) @@ -52,11 +62,13 @@ RDEPEND=" gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 - x11-libs/libXrandr + X? ( x11-libs/libXrandr ) ) - jpeg? ( virtual/jpeg:0 ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-sound/pulseaudio ) + pulseaudio? ( media-libs/libpulse ) server? ( X? ( x11-libs/libXcursor @@ -70,49 +82,94 @@ RDEPEND=" ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) ) X? ( x11-libs/libX11 x11-libs/libxkbfile ) " -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:3[client] ) + server? ( !net-misc/freerdp:3[server] ) " +src_prepare() { + local PATCHES=( + "${FILESDIR}/freerdp-2.11.2-clang.patch" + "${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch" + ) + cmake_src_prepare +} + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + src_configure() { + # bug #881695 + filter-lto + + # https://bugs.gentoo.org/927731 + append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) + local mycmakeargs=( - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) + -Wno-dev + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_ALSA=$(option alsa) -DWITH_CCACHE=OFF - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) - -DWITH_MANPAGES=$(usex doc ON OFF) - -DWITH_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_SWSCALE=$(usex ffmpeg ON OFF) - -DWITH_CAIRO=$(usex ffmpeg OFF ON) - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_X11=$(usex X ON OFF) - -DWITH_XINERAMA=$(usex xinerama ON OFF) - -DWITH_XV=$(usex xv ON OFF) - -DWITH_WAYLAND=$(usex wayland ON OFF) + -DWITH_CUPS=$(option cups) + -DWITH_CLIENT=$(option client) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_ICU=$(option icu) + -DWITH_JPEG=$(option jpeg) + -DWITH_GSSAPI=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_PCSC=$(option smartcard) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WINPR_TOOLS=$(option server) ) cmake_src_configure } + +src_test() { + local myctestargs=( -E TestBacktrace ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,2}.7 || die +} diff --git a/net-misc/freerdp/freerdp-3.4.0-r11.ebuild b/net-misc/freerdp/freerdp-3.4.0-r11.ebuild new file mode 100644 index 000000000000..a616aab29951 --- /dev/null +++ b/net-misc/freerdp/freerdp-3.4.0-r11.ebuild @@ -0,0 +1,187 @@ +# Copyright 2011-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" + case ${PV} in + 2.*) EGIT_BRANCH="stable-2.0";; + esac +else + MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="3" +IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + app-text/docbook-xsl-stylesheets + dev-libs/libxslt +" +COMMON_DEPEND=" + dev-libs/openssl:0= + sys-libs/zlib:0 + aad? ( dev-libs/cJSON ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ffmpeg? ( media-video/ffmpeg:0= ) + !ffmpeg? ( + x11-libs/cairo:0= + ) + fuse? ( sys-fs/fuse:3 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + X? ( x11-libs/libXrandr ) + ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-libs/libpulse ) + sdl? ( + media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)] + media-libs/sdl2-ttf + ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( + dev-libs/pkcs11-helper + sys-apps/pcsc-lite + ) + systemd? ( sys-apps/systemd:0= ) + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:2[client] ) + server? ( !net-misc/freerdp:2[server] ) +" + +src_prepare() { + local PATCHES=( + "${FILESDIR}/freerdp-3.4.0-incompatible-pointer.patch" + ) + cmake_src_prepare +} + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + +src_configure() { + # bug #881695 + filter-lto + + local mycmakeargs=( + -Wno-dev + + # https://bugs.gentoo.org/927037 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF + + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_AAD=$(option aad) + -DWITH_ALSA=$(option alsa) + -DWITH_CCACHE=OFF + -DWITH_CLIENT=$(option client) + -DWITH_CLIENT_SDL=$(option sdl) + -DWITH_SAMPLE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_FUSE=$(option fuse) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_JPEG=$(option jpeg) + -DWITH_KRB5=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PCSC=$(option smartcard) + -DWITH_PKCS11=$(option smartcard) + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_UNICODE_BUILTIN=$(option !icu) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WEBVIEW=OFF + -DWITH_WINPR_TOOLS=$(option server) + ) + cmake_src_configure +} + +src_test() { + local myctestargs=( -E TestBacktrace ) + has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die +} diff --git a/net-misc/freerdp/freerdp-3.5.0.ebuild b/net-misc/freerdp/freerdp-3.5.0.ebuild new file mode 100644 index 000000000000..78789fee28fc --- /dev/null +++ b/net-misc/freerdp/freerdp-3.5.0.ebuild @@ -0,0 +1,180 @@ +# Copyright 2011-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" + case ${PV} in + 2.*) EGIT_BRANCH="stable-2.0";; + esac +else + MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="3" +IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + app-text/docbook-xsl-stylesheets + dev-libs/libxslt +" +COMMON_DEPEND=" + dev-libs/openssl:0= + sys-libs/zlib:0 + aad? ( dev-libs/cJSON ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ffmpeg? ( media-video/ffmpeg:0= ) + !ffmpeg? ( + x11-libs/cairo:0= + ) + fuse? ( sys-fs/fuse:3 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + X? ( x11-libs/libXrandr ) + ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-libs/libpulse ) + sdl? ( + media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)] + media-libs/sdl2-ttf + ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( + dev-libs/pkcs11-helper + sys-apps/pcsc-lite + ) + systemd? ( sys-apps/systemd:0= ) + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:2[client] ) + server? ( !net-misc/freerdp:2[server] ) +" + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + +src_configure() { + # bug #881695 + filter-lto + + local mycmakeargs=( + -Wno-dev + + # https://bugs.gentoo.org/927037 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF + + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_AAD=$(option aad) + -DWITH_ALSA=$(option alsa) + -DWITH_CCACHE=OFF + -DWITH_CLIENT=$(option client) + -DWITH_CLIENT_SDL=$(option sdl) + -DWITH_SAMPLE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_FUSE=$(option fuse) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_JPEG=$(option jpeg) + -DWITH_KRB5=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PCSC=$(option smartcard) + -DWITH_PKCS11=$(option smartcard) + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_UNICODE_BUILTIN=$(option !icu) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WEBVIEW=OFF + -DWITH_WINPR_TOOLS=$(option server) + ) + cmake_src_configure +} + +src_test() { + local myctestargs=( -E TestBacktrace ) + has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die +} diff --git a/net-misc/freerdp/freerdp-3.5.1.ebuild b/net-misc/freerdp/freerdp-3.5.1.ebuild new file mode 100644 index 000000000000..0c7ce6eacd22 --- /dev/null +++ b/net-misc/freerdp/freerdp-3.5.1.ebuild @@ -0,0 +1,184 @@ +# Copyright 2011-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" + case ${PV} in + 2.*) EGIT_BRANCH="stable-2.0";; + esac +else + inherit verify-sig + MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="https://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="3" +IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" +RESTRICT="!test? ( test )" + +BDEPEND+=" + virtual/pkgconfig + app-text/docbook-xsl-stylesheets + dev-libs/libxslt +" +COMMON_DEPEND=" + dev-libs/openssl:0= + sys-libs/zlib:0 + aad? ( dev-libs/cJSON ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ffmpeg? ( media-video/ffmpeg:0= ) + !ffmpeg? ( + x11-libs/cairo:0= + ) + fuse? ( sys-fs/fuse:3 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + X? ( x11-libs/libXrandr ) + ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-libs/libpulse ) + sdl? ( + media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)] + media-libs/sdl2-ttf + ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( + dev-libs/pkcs11-helper + sys-apps/pcsc-lite + ) + systemd? ( sys-apps/systemd:0= ) + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:2[client] ) + server? ( !net-misc/freerdp:2[server] ) +" + +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + +src_configure() { + # bug #881695 + filter-lto + + local mycmakeargs=( + -Wno-dev + + # https://bugs.gentoo.org/927037 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF + + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_AAD=$(option aad) + -DWITH_ALSA=$(option alsa) + -DWITH_CCACHE=OFF + -DWITH_CLIENT=$(option client) + -DWITH_CLIENT_SDL=$(option sdl) + -DWITH_SAMPLE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_FUSE=$(option fuse) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_JPEG=$(option jpeg) + -DWITH_KRB5=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PCSC=$(option smartcard) + -DWITH_PKCS11=$(option smartcard) + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_UNICODE_BUILTIN=$(option !icu) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WEBVIEW=OFF + -DWITH_WINPR_TOOLS=$(option server) + ) + cmake_src_configure +} + +src_test() { + local myctestargs=( -E TestBacktrace ) + has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die +} diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 50350a7d1f9e..0c7ce6eacd22 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 2011-2021 Gentoo Authors +# Copyright 2011-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake +inherit cmake flag-o-matic if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -12,23 +12,33 @@ if [[ ${PV} == *9999 ]]; then 2.*) EGIT_BRANCH="stable-2.0";; esac else + inherit verify-sig MY_P=${P/_/-} S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz + verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )" + VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="http://www.freerdp.com/" +HOMEPAGE="https://www.freerdp.com/" LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" +SLOT="3" +IUSE="aad alsa cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv" RESTRICT="!test? ( test )" -RDEPEND=" +BDEPEND+=" + virtual/pkgconfig + app-text/docbook-xsl-stylesheets + dev-libs/libxslt +" +COMMON_DEPEND=" dev-libs/openssl:0= sys-libs/zlib:0 + aad? ( dev-libs/cJSON ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) usb? ( @@ -49,14 +59,21 @@ RDEPEND=" !ffmpeg? ( x11-libs/cairo:0= ) + fuse? ( sys-fs/fuse:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 - x11-libs/libXrandr + X? ( x11-libs/libXrandr ) ) - jpeg? ( virtual/jpeg:0 ) + icu? ( dev-libs/icu:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + kerberos? ( virtual/krb5 ) openh264? ( media-libs/openh264:0= ) - pulseaudio? ( media-sound/pulseaudio ) + pulseaudio? ( media-libs/libpulse ) + sdl? ( + media-libs/libsdl2[haptic(+),joystick(+),sound(+),video(+)] + media-libs/sdl2-ttf + ) server? ( X? ( x11-libs/libXcursor @@ -68,51 +85,100 @@ RDEPEND=" xinerama? ( x11-libs/libXinerama ) ) ) - smartcard? ( sys-apps/pcsc-lite ) + smartcard? ( + dev-libs/pkcs11-helper + sys-apps/pcsc-lite + ) systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon + client? ( + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) ) X? ( x11-libs/libX11 x11-libs/libxkbfile ) " -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) +DEPEND="${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/freerdp:0 + client? ( !net-misc/freerdp:2[client] ) + server? ( !net-misc/freerdp:2[server] ) " +option() { + usex "$1" ON OFF +} + +option_client() { + if use client; then + option "$1" + else + echo OFF + fi +} + src_configure() { + # bug #881695 + filter-lto + local mycmakeargs=( - -DBUILD_TESTING=$(usex test ON OFF) - -DCHANNEL_URBDRC=$(usex usb ON OFF) - -DWITH_ALSA=$(usex alsa ON OFF) + -Wno-dev + + # https://bugs.gentoo.org/927037 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF + + -DBUILD_TESTING=$(option test) + -DCHANNEL_URBDRC=$(option usb) + -DWITH_AAD=$(option aad) + -DWITH_ALSA=$(option alsa) -DWITH_CCACHE=OFF - -DWITH_CUPS=$(usex cups ON OFF) - -DWITH_DEBUG_ALL=$(usex debug ON OFF) - -DWITH_MANPAGES=$(usex doc ON OFF) - -DWITH_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_SWSCALE=$(usex ffmpeg ON OFF) - -DWITH_CAIRO=$(usex ffmpeg OFF ON) - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) - -DWITH_OPENH264=$(usex openh264 ON OFF) - -DWITH_PULSE=$(usex pulseaudio ON OFF) - -DWITH_SERVER=$(usex server ON OFF) - -DWITH_PCSC=$(usex smartcard ON OFF) - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) - -DWITH_X11=$(usex X ON OFF) - -DWITH_XINERAMA=$(usex xinerama ON OFF) - -DWITH_XV=$(usex xv ON OFF) - -DWITH_WAYLAND=$(usex wayland ON OFF) + -DWITH_CLIENT=$(option client) + -DWITH_CLIENT_SDL=$(option sdl) + -DWITH_SAMPLE=OFF + -DWITH_CUPS=$(option cups) + -DWITH_DEBUG_ALL=$(option debug) + -DWITH_MANPAGES=ON + -DWITH_FFMPEG=$(option ffmpeg) + -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON + -DWITH_SWSCALE=$(option ffmpeg) + -DWITH_CAIRO=$(option !ffmpeg) + -DWITH_DSP_FFMPEG=$(option ffmpeg) + -DWITH_FUSE=$(option fuse) + -DWITH_GSTREAMER_1_0=$(option gstreamer) + -DWITH_JPEG=$(option jpeg) + -DWITH_KRB5=$(option kerberos) + -DWITH_NEON=$(option cpu_flags_arm_neon) + -DWITH_OPENH264=$(option openh264) + -DWITH_OSS=OFF + -DWITH_PCSC=$(option smartcard) + -DWITH_PKCS11=$(option smartcard) + -DWITH_PULSE=$(option pulseaudio) + -DWITH_SERVER=$(option server) + -DWITH_LIBSYSTEMD=$(option systemd) + -DWITH_UNICODE_BUILTIN=$(option !icu) + -DWITH_VALGRIND_MEMCHECK=$(option valgrind) + -DWITH_X11=$(option X) + -DWITH_XINERAMA=$(option xinerama) + -DWITH_XV=$(option xv) + -DWITH_WAYLAND=$(option_client wayland) + -DWITH_WEBVIEW=OFF + -DWITH_WINPR_TOOLS=$(option server) ) cmake_src_configure } + +src_test() { + local myctestargs=( -E TestBacktrace ) + has network-sandbox ${FEATURES} && myctestargs+=( -E TestConnect ) + cmake_src_test +} + +src_install() { + cmake_src_install + mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die +} diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml index cdc60d1ae1df..ff51b9ab1df0 100644 --- a/net-misc/freerdp/metadata.xml +++ b/net-misc/freerdp/metadata.xml @@ -6,6 +6,9 @@ <name>Mike Gilbert</name> </maintainer> <use> + <flag name="aad">Enable login via Azure AD</flag> + <flag name="client">Build client binaries</flag> + <flag name="fuse">Clipboard with FUSE file copy support</flag> <flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag> <flag name="server">Build server binaries</flag> </use> diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest index 85e2cbf0397a..ed66d088a7ac 100644 --- a/net-misc/frr/Manifest +++ b/net-misc/frr/Manifest @@ -1,2 +1,2 @@ -DIST frr-8.0.1.tar.gz 8206852 BLAKE2B ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a SHA512 d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f -DIST frr-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa +DIST frr-9.0.2.tar.gz 10341186 BLAKE2B e9c32bf48dc0adc7dd6c23ad1a2779065c762dc6e461a3f86d6b7afbef245345dc65b33d9dd5b499d4c4a7fb3b80a4416bdec9b42e7d15f2864d80c088e2ad4f SHA512 2cfd1a63cf073b8767fd67d9992d9a775d856234a532b13699304b6b1f15eb68bf1301f2f4c503b151fd5c8191bff67aeac9c7a4dc4a3ddb06f9a5db081423b9 +DIST frr-9.1.tar.gz 10779477 BLAKE2B ba64f9455c38441f8cadce4eed435fb86344244e98bd1b675335887fb098be29adc035d722d3c128e136a4c6b0aa1adcbdc0e22815702e52170da940a5caf20a SHA512 77b278a3ea87da9dfd7b87e4f9ae67f08ed0f24809f6dd228d2ab2e2c29e2b3191d59d50fc474e53e159ac6c79c302481b462125d0657889516f07b8e05e8562 diff --git a/net-misc/frr/files/frr-8.4.1-logrotate.patch b/net-misc/frr/files/frr-8.4.1-logrotate.patch new file mode 100644 index 000000000000..e1507455ae38 --- /dev/null +++ b/net-misc/frr/files/frr-8.4.1-logrotate.patch @@ -0,0 +1,168 @@ +--- a/redhat/frr.logrotate 2022-11-18 08:31:08.000000000 +0300 ++++ b/redhat/frr.logrotate 2022-12-08 15:49:11.162739743 +0300 +@@ -1,4 +1,5 @@ + /var/log/frr/frr.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -7,6 +8,7 @@ + } + + /var/log/frr/zebra.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -15,6 +17,7 @@ + } + + /var/log/frr/babeld.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -23,6 +26,7 @@ + } + + /var/log/frr/bgpd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -31,6 +35,7 @@ + } + + /var/log/frr/isisd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -39,6 +44,7 @@ + } + + /var/log/frr/ospfd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -47,6 +53,7 @@ + } + + /var/log/frr/ospf6d.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -55,6 +62,7 @@ + } + + /var/log/frr/ripd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -63,6 +71,7 @@ + } + + /var/log/frr/ripngd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -71,6 +80,7 @@ + } + + /var/log/frr/ldpd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -79,6 +89,7 @@ + } + + /var/log/frr/nhrpd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -87,6 +98,7 @@ + } + + /var/log/frr/eigrpd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -95,6 +107,7 @@ + } + + /var/log/frr/bfdd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -103,6 +116,7 @@ + } + + /var/log/frr/fabricd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -111,6 +125,7 @@ + } + + /var/log/frr/pathd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -119,6 +134,7 @@ + } + + /var/log/frr/pbrd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -127,6 +143,7 @@ + } + + /var/log/frr/pimd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -135,6 +152,7 @@ + } + + /var/log/frr/pim6d.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -143,6 +161,7 @@ + } + + /var/log/frr/sharpd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -151,6 +170,7 @@ + } + + /var/log/frr/staticd.log { ++ su frr frr + notifempty + missingok + postrotate +@@ -159,6 +179,7 @@ + } + + /var/log/frr/vrrpd.log { ++ su frr frr + notifempty + missingok + postrotate diff --git a/net-misc/frr/files/frr-openrc-v1 b/net-misc/frr/files/frr-openrc-v2 index 3f9da62e2a18..24e326ed84a7 100644 --- a/net-misc/frr/files/frr-openrc-v1 +++ b/net-misc/frr/files/frr-openrc-v2 @@ -106,7 +106,7 @@ _frr_start() { # Apply MAX_FDS configuration if set. if [ ! -z $MAX_FDS ]; then veinfo " Setting maximum file descriptors to ${MAX_FDS}" - ulimit -n $MAX_FDS >/dev/null 2>/dev/null + prlimit -n $MAX_FDS >/dev/null 2>/dev/null fi # Save started daemons to state database. diff --git a/net-misc/frr/frr-8.0.1.ebuild b/net-misc/frr/frr-9.0.2.ebuild index 75fd3b38166f..87227382bd64 100644 --- a/net-misc/frr/frr-8.0.1.ebuild +++ b/net-misc/frr/frr-9.0.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools pam python-single-r1 systemd DESCRIPTION="The FRRouting Protocol Suite" @@ -14,8 +14,8 @@ S="${WORKDIR}/frr-${P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test" +KEYWORDS="amd64 ~arm64 ~x86" +IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -23,34 +23,37 @@ COMMON_DEPEND=" ${PYTHON_DEPS} acct-user/frr dev-libs/json-c:0= + dev-libs/protobuf-c:0= >=net-libs/libyang-2.0.0 + <net-libs/libyang-2.1.111 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) - rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) + rpki? ( >=net-libs/rtrlib-0.8.0[ssh] ) snmp? ( net-analyzer/net-snmp:= ) " BDEPEND=" ~dev-util/clippy-${PV} - sys-devel/flex - virtual/yacc + app-alternatives/lex + app-alternatives/yacc doc? ( dev-python/sphinx ) " DEPEND=" ${COMMON_DEPEND} + elibc_musl? ( sys-libs/queue-standalone ) test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) " RDEPEND=" ${COMMON_DEPEND} $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]') - !net-misc/quagga " PATCHES=( "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch + "${FILESDIR}"/${PN}-8.4.1-logrotate.patch ) src_prepare() { @@ -74,7 +77,6 @@ src_configure() { --localstatedir="${EPREFIX}"/run/frr --with-moduledir="${EPREFIX}"/usr/lib/frr/modules --with-clippy="${BROOT}"/usr/bin/clippy - --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples --enable-user=frr --enable-group=frr --enable-vty-group=frr @@ -90,7 +92,6 @@ src_configure() { $(usex ospfapi '--enable-ospfclient' '' '' '') $(use_enable rpki) $(use_enable snmp) - $(use_enable systemd) ) econf "${myconf[@]}" @@ -142,7 +143,7 @@ src_install() { # Install init scripts systemd_dounit tools/frr.service - newinitd "${FILESDIR}"/frr-openrc-v1 frr + newinitd "${FILESDIR}"/frr-openrc-v2 frr # Conflict files, installed by net-libs/libsmi, bug #758383 rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-9.1.ebuild index 1fcbac9b2687..71a6eb44675c 100644 --- a/net-misc/frr/frr-8.1-r1.ebuild +++ b/net-misc/frr/frr-9.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools pam python-single-r1 systemd DESCRIPTION="The FRRouting Protocol Suite" @@ -12,10 +12,10 @@ SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz" # FRR tarballs have weird format. S="${WORKDIR}/frr-${P}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp test" +KEYWORDS="amd64 ~arm64 ~x86" +IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -23,34 +23,36 @@ COMMON_DEPEND=" ${PYTHON_DEPS} acct-user/frr dev-libs/json-c:0= + dev-libs/protobuf-c:0= >=net-libs/libyang-2.0.0 + <net-libs/libyang-2.1.111 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) - rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) + rpki? ( >=net-libs/rtrlib-0.8.0[ssh] ) snmp? ( net-analyzer/net-snmp:= ) " BDEPEND=" - ~dev-util/clippy-${PV} - sys-devel/flex - virtual/yacc + app-alternatives/lex + app-alternatives/yacc doc? ( dev-python/sphinx ) " DEPEND=" ${COMMON_DEPEND} + elibc_musl? ( sys-libs/queue-standalone ) test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) " RDEPEND=" ${COMMON_DEPEND} $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]') - !net-misc/quagga " PATCHES=( "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch + "${FILESDIR}"/${PN}-8.4.1-logrotate.patch ) src_prepare() { @@ -62,18 +64,15 @@ src_prepare() { src_configure() { local myconf=( - --disable-static --with-pkg-extra-version="-gentoo" --enable-configfile-mask=0640 --enable-logfile-mask=0640 - --prefix="${EPREFIX}"/usr --libdir="${EPREFIX}"/usr/lib/frr --sbindir="${EPREFIX}"/usr/lib/frr --libexecdir="${EPREFIX}"/usr/lib/frr --sysconfdir="${EPREFIX}"/etc/frr --localstatedir="${EPREFIX}"/run/frr --with-moduledir="${EPREFIX}"/usr/lib/frr/modules - --with-clippy="${BROOT}"/usr/bin/clippy --enable-user=frr --enable-group=frr --enable-vty-group=frr @@ -100,6 +99,11 @@ src_compile() { use doc && emake -C doc html } +src_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + default +} + src_install() { default find "${ED}" -name '*.la' -delete || die @@ -108,28 +112,17 @@ src_install() { use doc && dodoc -r doc/user/_build/html # Create configuration directory with correct permissions - keepdir /etc/frr - fowners frr:frr /etc/frr - fperms 775 /etc/frr - # Create logs directory with the correct permissions - keepdir /var/log/frr - fowners frr:frr /var/log/frr - fperms 775 /var/log/frr + diropts -ofrr -gfrr -m0775 + keepdir /var/log/frr /etc/frr # Install the default configuration files insinto /etc/frr - doins tools/etc/frr/vtysh.conf - doins tools/etc/frr/frr.conf - doins tools/etc/frr/daemons + doins tools/etc/frr/{vtysh.conf,frr.conf,daemons} # Fix permissions/owners. - fowners frr:frr /etc/frr/vtysh.conf - fowners frr:frr /etc/frr/frr.conf - fowners frr:frr /etc/frr/daemons - fperms 640 /etc/frr/vtysh.conf - fperms 640 /etc/frr/frr.conf - fperms 640 /etc/frr/daemons + fowners frr:frr /etc/frr/{vtysh.conf,frr.conf,daemons} + fperms 640 /etc/frr/{vtysh.conf,frr.conf,daemons} # Install logrotate configuration insinto /etc/logrotate.d @@ -140,7 +133,7 @@ src_install() { # Install init scripts systemd_dounit tools/frr.service - newinitd "${FILESDIR}"/frr-openrc-v1 frr + newinitd "${FILESDIR}"/frr-openrc-v2 frr # Conflict files, installed by net-libs/libsmi, bug #758383 rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml index 69bd9b16f701..9cd33eb40e66 100644 --- a/net-misc/frr/metadata.xml +++ b/net-misc/frr/metadata.xml @@ -1,13 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> + <maintainer type="person" proxied="yes"> + <name>Alarig Le Lay</name> + <email>alarig@swordarmor.fr</email> </maintainer> - <maintainer type="person"> - <email>jsmolic@gentoo.org</email> - <name>Jakov Smolić</name> + <maintainer type="person" proxied="yes"> + <email>jaco@uls.co.za</email> + <name>Jaco Kroon</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <use> <flag name="grpc">Enable gRPC plugin</flag> @@ -17,4 +21,7 @@ <flag name="pam">Add support for PAM (via <pkg>sys-libs/pam</pkg>) to the Virtual Terminal Interface Shell (vtysh)</flag> <flag name="ospfapi">Build OSPFAPI support</flag> </use> + <upstream> + <remote-id type="github">FRRouting/frr</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest index fd779f03be68..36f39dcc40a0 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -1,3 +1,2 @@ -DIST gallery-dl-1.18.1.tar.gz 368692 BLAKE2B f92eb7a876563ed5bc78ca1222b8c45fe78ad6d899a55bf2edefece14209acfc784bc3ac84c7e84397746f5a5ab01c2c6f94efcb0f28d2aacac3cbd68ebcd545 SHA512 20e4f983160870a646a66963505d2c53f5498b9bbbb869a603ae53848ee788f26c6df4c5951805d99f225954ddbe692c2da5501a409650cc3e522d97f34a7c0d -DIST gallery-dl-1.19.2.tar.gz 393664 BLAKE2B cae6b2cdd9f940892032498c0450918481aea22a701b236f580e6c7d2f77b7ce5fb2336a93c882b35063eb0193b9ebb956f8d12e8b6794255318b6eb65ee9de9 SHA512 7aa014e0e84d856bd9ca45131baed513f1d3c73c1500df32c39b5a40f17cd951e80b819130254f9b563a504866e5feebabf6b5c8bf517a43a6ad7a15e41f0476 -DIST gallery-dl-1.19.3.tar.gz 399869 BLAKE2B cef40ac7759bffb42536fed866df946e6c22e333ddae98db149109779dd9439c775722b887898e322de26860aee0990a440aa0812620dadb9d223da09f25d662 SHA512 b50c0e341a0b2b08ddd8f5674c1f4df097b862827f8bca2270d3fd62be619fab8a4c097de9d3193e8161ebcb64eb6c77676c243bca4cabc7dc1d3f192b485ad3 +DIST gallery-dl-1.26.9-5227bb6.patch 3415 BLAKE2B 864d6877ba9f6ee6449465ebce9b6648325c176f2ae4062c27e7059852b05983a99f203aabc9e3c361214b14d489bdb450920879171385474ddec50d83f1b937 SHA512 6931eeb00f6fcd6b9005672aa23ed2b0270846758a762a8a86ef51ca860bea2563673b02881abd5a1a224b7518a89e66de46da5cc0a7994d58078886aa090c64 +DIST gallery-dl-1.26.9.gh.tar.gz 670467 BLAKE2B 849d20ff6fd802915b3bc4f6bb11d638d1e8f24f1dbdcfd5946461798044d59bf9243faa370cdddcdffe40a24d39d44a43abc79b4c8e89e7c60b40e5e204603a SHA512 54c2a86a67c53b7d5c62e6c23c549fd89503386549dc9d2f9c7de058b52ecb60b5089555e97dd0b63d33686e1bd08a3be940152715a6d26647e6949e641df9cb diff --git a/net-misc/gallery-dl/gallery-dl-1.18.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.18.1.ebuild deleted file mode 100644 index f202ee3c50b3..000000000000 --- a/net-misc/gallery-dl/gallery-dl-1.18.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=(python3_{8,9}) -PYTHON_REQ_USE="sqlite,ssl,xml" - -inherit distutils-r1 optfeature - -DESCRIPTION="Download image galleries and collections from several image hosting sites" -HOMEPAGE="https://github.com/mikf/gallery-dl" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mikf/${PN}.git" -else - SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="GPL-2" -SLOT="0" -# tests require network access -RESTRICT="test" - -RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" - -distutils_enable_tests setup.py - -python_compile_all() { - emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man -} - -pkg_postinst() { - optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg - optfeature "video downloads" net-misc/youtube-dl -} diff --git a/net-misc/gallery-dl/gallery-dl-1.19.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.19.2.ebuild deleted file mode 100644 index 79c29ccc0450..000000000000 --- a/net-misc/gallery-dl/gallery-dl-1.19.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=(python3_{8,9}) -PYTHON_REQ_USE="sqlite,ssl,xml" - -inherit distutils-r1 optfeature - -DESCRIPTION="Download image galleries and collections from several image hosting sites" -HOMEPAGE="https://github.com/mikf/gallery-dl" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mikf/${PN}.git" -else - SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="GPL-2" -SLOT="0" -# tests require network access -RESTRICT="test" - -RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" - -distutils_enable_tests setup.py - -python_compile_all() { - emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man -} - -pkg_postinst() { - optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg - optfeature "video downloads" net-misc/youtube-dl -} diff --git a/net-misc/gallery-dl/gallery-dl-1.19.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.19.3.ebuild deleted file mode 100644 index 79c29ccc0450..000000000000 --- a/net-misc/gallery-dl/gallery-dl-1.19.3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=(python3_{8,9}) -PYTHON_REQ_USE="sqlite,ssl,xml" - -inherit distutils-r1 optfeature - -DESCRIPTION="Download image galleries and collections from several image hosting sites" -HOMEPAGE="https://github.com/mikf/gallery-dl" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mikf/${PN}.git" -else - SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="GPL-2" -SLOT="0" -# tests require network access -RESTRICT="test" - -RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" - -distutils_enable_tests setup.py - -python_compile_all() { - emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man -} - -pkg_postinst() { - optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg - optfeature "video downloads" net-misc/youtube-dl -} diff --git a/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild b/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild new file mode 100644 index 000000000000..74f78f4c094c --- /dev/null +++ b/net-misc/gallery-dl/gallery-dl-1.26.9.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="sqlite,ssl,xml(+)" + +inherit distutils-r1 optfeature + +DESCRIPTION="Download image galleries and collections from several image hosting sites" +HOMEPAGE="https://github.com/mikf/gallery-dl/" + +if [[ "${PV}" == *9999* ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/mikf/${PN}.git" +else + SRC_URI=" + https://github.com/mikf/${PN}/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + https://github.com/mikf/${PN}/commit/5227bb6b1d62ecef5b281592b0d001e7f9c101e3.patch + -> ${P}-5227bb6.patch + " + + KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +RDEPEND=" + >=dev-python/requests-2.11.0[${PYTHON_USEDEP}] +" + +PATCHES=( "${DISTDIR}/${P}-5227bb6.patch" ) + +distutils_enable_tests unittest + +src_prepare() { + # Tests against real servers, some tests always fail and some are subject to change. + rm test/test_results.py || die + + distutils-r1_src_prepare +} + +python_compile_all() { + emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man +} + +pkg_postinst() { + optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg + optfeature "video downloads" net-misc/yt-dlp +} diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild index 79c29ccc0450..1e6696f28666 100644 --- a/net-misc/gallery-dl/gallery-dl-9999.ebuild +++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild @@ -1,38 +1,49 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=(python3_{8,9}) -PYTHON_REQ_USE="sqlite,ssl,xml" +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="sqlite,ssl,xml(+)" inherit distutils-r1 optfeature DESCRIPTION="Download image galleries and collections from several image hosting sites" -HOMEPAGE="https://github.com/mikf/gallery-dl" +HOMEPAGE="https://github.com/mikf/gallery-dl/" -if [[ ${PV} == 9999 ]]; then +if [[ "${PV}" == *9999* ]]; then inherit git-r3 + EGIT_REPO_URI="https://github.com/mikf/${PN}.git" else - SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz" + + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2" SLOT="0" -# tests require network access -RESTRICT="test" -RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]" +RDEPEND=" + >=dev-python/requests-2.11.0[${PYTHON_USEDEP}] +" + +distutils_enable_tests unittest -distutils_enable_tests setup.py +src_prepare() { + # Tests against real servers, some tests always fail and some are subject to change. + rm test/test_results.py || die + + distutils-r1_src_prepare +} python_compile_all() { - emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man + emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man } pkg_postinst() { optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg - optfeature "video downloads" net-misc/youtube-dl + optfeature "video downloads" net-misc/yt-dlp } diff --git a/net-misc/gallery-dl/metadata.xml b/net-misc/gallery-dl/metadata.xml index fb14489e739b..175585149331 100644 --- a/net-misc/gallery-dl/metadata.xml +++ b/net-misc/gallery-dl/metadata.xml @@ -7,8 +7,11 @@ <name>Maciej Barć</name> </maintainer> <upstream> + <bugs-to>https://github.com/mikf/gallery-dl/issues/</bugs-to> <remote-id type="github">mikf/gallery-dl</remote-id> + <remote-id type="pypi">gallery-dl</remote-id> </upstream> + <stabilize-allarches/> <longdescription> gallery-dl is a command-line program to download image-galleries and -collections from several image hosting sites. diff --git a/net-misc/geckodriver/Manifest b/net-misc/geckodriver/Manifest new file mode 100644 index 000000000000..d2b94a05ab3d --- /dev/null +++ b/net-misc/geckodriver/Manifest @@ -0,0 +1,182 @@ +DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b +DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 +DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c +DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077 +DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191 +DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3 +DIST anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244 +DIST base64-0.21.5.crate 77134 BLAKE2B 901cf92d7dd8af2bbb789ffbe60972c1fd295b16690ecebbcb500e4613afa057ab2b294bbafdcaa4007f46412825260a0711d89e55664418a503dde02c8afd1a SHA512 40b1d8470a932c8b7f31717e33bf26742c1bf920caae639b8a992f77e64d5e6d287569742c1348daa25b7325f8ca8d8a312754a743dab3932181f37149d91b16 +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b +DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb +DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b +DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f +DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3 +DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089 +DIST clap-4.4.12.crate 54784 BLAKE2B d5825ac67b7b7f1567024d1d3c2a54027819e0d6da87e022ec02867060952d2727f9413a2cea8ba11185649c25863a506e1fdd9421bd92eba79399fae86eaf02 SHA512 003c7ee7b71254a1d8977282bde75b57a8e191abb0439f66695c047cbe63ad1bf7ab1a14ed79b415c7bd6144f82d49a77325f618a34c932f258bed98903bb97c +DIST clap_builder-4.4.12.crate 163345 BLAKE2B 37e655a7c9ca21dff4445629e041d5ae2aec1ef0d44e21c09dcb860253c3f52d04dc2bcfd37e2ed7e9839d5c01fa86bb2613d5aba1b4112cda51e879f35f80d2 SHA512 7edcd85a45f17d4f6f87e463bfd9f5e0348067907b13a1f625007f0527544af21476b3805988e2b6f5baabce8ab5deb08f80b3d94ab5d5535fd310c6c668a21e +DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e +DIST cookie-0.16.2.crate 34632 BLAKE2B 095c8c4fbd8bd2aca5f1bc2bf7f37f231878e3ea9e2646e7c2e63bc7ff824ed0a55f80216e9d1f0466e6fab306a0f211d08c093278f4f23c07762ded9e2033c5 SHA512 f006bb19f63065c6ba9a7553c1d97643e261723f3d5087586811acfe595b3c7d90f7e5c83431a44a50d0b4a36667635ad09e5cb307e323cde14820dfd38e57c6 +DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100 +DIST cpufeatures-0.2.11.crate 12727 BLAKE2B 5b91dffb779e437606db9b75d2b05c2de19069575a8272112e9a0389f5bd8de0f753cd90330b5a5bb6a3f84c9e794e96328664557db31c43853ba43097229efc SHA512 af179e269a4d5f48b50134a5e98ac541a9a0d6aa34f13fb8fd9ce8d5092352e1b322437254449ecb1bce608d8558b1cca2c79232ac1327efd887193bd1d36031 +DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 +DIST crossbeam-utils-0.8.18.crate 42383 BLAKE2B f0b58626f3d40c5a889572e0f5fdb468e4c13ce0afc09aec1a75e1c5888cab56fbc644f592c620e1d28aae79687c4446146d9f783d96f8bd177d0a4a559fe8dd SHA512 977f41d7596a8d206fab665570f155479e15a83698fa54e714305d56ce32d78abc6f778b5f6e3c379ed1da27e241639cf4d0cd12922383f774ae85b32a4dc550 +DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f +DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43 +DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c +DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b +DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f +DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 +DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d +DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9 +DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284 +DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 +DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 +DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c +DIST futures-core-0.3.30.crate 14071 BLAKE2B 76a9fa5aedd0d4ae8dd9db9639839b6b342125759c1b9f9bbf58aacb4ecca316ff1f24ff8f3c15f559ffbf974e4c2cd02a5418cb4c4d7612dac8449c8234eeb8 SHA512 3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4 +DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3 +DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d +DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951 +DIST geckodriver-0.34.0.tar.gz 109474 BLAKE2B fd2b0815b02668eafbc4fc37e81d7adcc7466b366edcf17c50b391a1f1dc466b1e64925dd589c75f8d59d4387ff2285141130b8432f778238a1139070977a221 SHA512 4ef85427db7b3c8a3171d3c9808eb26ad276c734829d3916e1a6b937294befe3e6f0c3980624a21005433aa5caaf270746ce0a383c3fede3ba77b86f6f862b0b +DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d +DIST getrandom-0.2.11.crate 35391 BLAKE2B cc3af20769f8effebcd6fe4f48bb762211f78cfad016b796ce4b6b83a25d0a758ecee4352af18ef97e84c17fb4efb0c7bf113b53d2dd30eaa32067fed97978fa SHA512 2230c219e1080b4b13f207bdfd54b1acff37d9e5fec5263ec9952df9c0279939b231c722b54524deab85002caf1047a471f3fba8090428d918e99d53edf82345 +DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25 +DIST h2-0.3.22.crate 166413 BLAKE2B 058456b6799d1ff73dc914b37279c4ad2cf5f8cf4fa2532dc6e1fab76c3f8ba67589c3fd481f5fb02b2df3927ea75c8a4c359943565ef81af6d5759bd679fce5 SHA512 70cc7e246ac554c9a15bf2d53a5473e878f426fa426fa266fd91fc2ebf4071b7b207c4f7f104f84242f6f9163ff4c790432f73b61b43e1ef5231b0ff424ceaab +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356 +DIST headers-0.3.9.crate 68290 BLAKE2B 32cce72c68bc1bf162eb733f0e90bdeeb06c13a622b22d74e0d3e1f0d2f82137d9a691ab080bc204ac35cccdb21783e456e2c5db3c00f775bbbe36849ccd0212 SHA512 d7b191ce9bfe0103bb4e6ea308f4f6943c1df12bace405bd8b733ade8f0a89b3d156ef7c77aa04233c51e6d34d832a837c12ea9c2f9693fa12f2cca49c1740e1 +DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd +DIST http-0.2.11.crate 100478 BLAKE2B 1ef12d67fc52392322c24f79ca49c52fcd7dcad0145b761c8aea21fef38682919d664161f242c606a1f3737987368c08432f33e2abfa53d681c6c2aa5cb000cb SHA512 71d98f5fa55c7bdb9fb31e36f898e8b2b7596dcb30ef9b5df3e34581b7306b66a782e82c2797732e28626eec5c9e432cc0475703e5a0e0e47aa1d6f22235ef51 +DIST http-body-0.4.6.crate 10773 BLAKE2B 828a43f8ec79a7187cd6f5379edd50127cefa8e80e9bc1205e80c567f506f4778387dcb1d2808e68f1b88bfc7e2d6405ddf9ede9403d35584e31bc62db0b7756 SHA512 fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462 +DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f +DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a +DIST hyper-0.14.28.crate 197204 BLAKE2B b99c91eaf65947642e217d159372750ce57e332675705cabfdcafdcc9ed3cd90130a9c600118c76e167b927a481b2120d0f4b499772e4fa710803abbec5385cf SHA512 deb26e3815e6315dd193c4db22efe1e73e44bc7c1d400bc7654e950bd074a200b7cbb730ca30faac0940c88529fea60d5737a4fc7ccd4fa24c2ecdb2a0b450a7 +DIST iana-time-zone-0.1.59.crate 27033 BLAKE2B 5d7c9fa38c85a99ae9da34c881e1b6b626c6a1356d7de412868a26fbb469bdc8408a0baac4fc940354d5223b3004924819a1d1663b129d9addb22689a55f900c SHA512 3c9da44a31423b451cda42b1fd340b29f18c05fc88f4e3c5b0ad5d1e6cf426691cc87b7ffcb9f47c12c4e8d9a3b504e44edc7f6975b867cf8612e93e6eac1f91 +DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 +DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST indexmap-2.1.0.crate 68224 BLAKE2B 9d833570cbb63ecae138ca234b998bd0e5b11b1a7e3d5ef4a21212bb32d0998395f1fc609f66860bdbab198081687630f583f5a2e495fac1afa40ff48bee8a0f SHA512 9d303eef918b9264b9fe326cc1d71f4095f7ed5639ed8696efa3e9be65dff2c50ada4495409e109e7718997db51ae1fd865cf8e88978107d7823faba14380600 +DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538 +DIST js-sys-0.3.66.crate 80765 BLAKE2B 366f2741a1f7bc76f78068e183080bc221d45fb9adca257da61fd05a3f9044b7c6dd9d1c317e29af30effb28fb969bee2f766ff348f14d9d036f1a7e6bc2e599 SHA512 7244c856b2455d441e02eb12227517a101af28596d676797ae45098512052c09650612a93d912378d27254c5ac64dba9b37057c7493c1e3d3e0d52b2169340ac +DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 +DIST libc-0.2.151.crate 736640 BLAKE2B ba8ea6d22b0eefdc5c1c5ee9fab960b6ea0eb7098a21b032563ec78b5d6e2a8f1d7ca4d5bb721c71de2c5de28e105029f229b9b03cd5168c78a65c7164e6d07d SHA512 2039bdfd704c5a876ff7d609622bb968260d6e0fd264ca457e92b75660503eca10e1ff21864b3c919d2656de521f03ef443895f5c0150271ae2502857742b0ec +DIST libredox-0.0.1.crate 4212 BLAKE2B fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92 SHA512 31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41 +DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb +DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707 +DIST linux-raw-sys-0.4.12.crate 1465800 BLAKE2B 2f70a344c427093fd55732b68239f771cf6563edfe2db4b2f50cdbc904dfc7565b30bf06454b91482eaeea787b9cd4214979665bfa32f3c1c586551333cf4d2e SHA512 d9564d02d5f41356478066592e438629adb3275df0e5a1a44030cc99bf8856b8af64f18f27371f84122a828b34712aae16495a1a16050fbdbece6d95e9cdace9 +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST marionette-0.5.0.crate 9683 BLAKE2B cd0205fc7d3951467ac73289a405e57dcede6aeb29d4a52886249a17f2e48f6f90f6fd3a0d886cba44aaf6bf02010306fb03a50589303bcc0101c03429c0ca39 SHA512 ccb3ff896b931601de72bd1d6fc2158fc8af61efe26b33c5a1896639ed2178e3afc3dd33eae2d8a9b19107b5fcb8391a854fec743b3a2e1d2d6b04024c28c210 +DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 +DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1 +DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908 +DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c +DIST mio-0.8.10.crate 102345 BLAKE2B 82bba95cfbb51a02efda75dc85d973825f038f7d23e7fd0a93a60293fbafd304ae064f395a1aeb63a1bc7bc664a0c0dfa3721ac8a553ea5161c0ab2862a6edcb SHA512 680371f7da07824fcdc1e8c10a6771a71b97308c47bb5b295e0338fbcb56e211dfd91e1b400a080984c57055f08db24ca675c167f298a3dd4842a185bde62fb2 +DIST mozdevice-0.5.2.crate 14449 BLAKE2B a3119d355da681ca8abd7db5ae655ec654a271696e0978567ad07d1ac08e3e80548908c995103024f03a20fda42aeda186dd0a77a977b29c1ba0dca23fe23163 SHA512 bd63863bc711083a047c38b2856870ba88bf6d678e050d02d6775ce4956adb70e0d4ec3e6ffaa271f3b60c583c62cb0595fd7637e8a4e096d2f6976e95d36085 +DIST mozprofile-0.9.2.crate 9786 BLAKE2B a5e4e20c11ba6fc009c40dd0b5606bc3d6360d35e6bbed4a2ff7bc8b761e94845ef4a981012fc13130325c6ff9c9d5d86ec4b90f0e930a1888c8ac091c2f2d34 SHA512 031ab3f61ea18d0e23ae2f0212eb6c72984f19859c738ba240a49217ef83aeeacc6f2e4038421b25bcb97001a214dc91c969236485f6af95d0fa3994280d188a +DIST mozrunner-0.15.2.crate 12767 BLAKE2B 791aee5dabfccba57f711678f5e62780539867de5d5e221935ea3f5c0d19846c1bf11551a8569f7dde07a0334c2f52287dda735c00559c22be65a1ef2abe9c2f SHA512 39b9f52b462af39fed42c5a3db0bf4e7b2582ea788710dae8182ee50f608c8be16b2d5d11824911d47e4183878a5bc8660c1545afdfd4254487cf1e222cf0240 +DIST mozversion-0.5.2.crate 4126 BLAKE2B 0d8c72c1f5fe474cd46ce654b835169845bdda568ad945df8b7f30c098cc649c72f86f11ee0ded0450faff3a8274f3bd3436b3a819cab1d8e62d9399005aa026 SHA512 7def4945e11aee02464c1cd11e5954c442101029e546859a72c03c12459e2486f874d24bce2b0daaaed3e4a02df8756f8688f323df9f403833633fedf90897b4 +DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e +DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96 +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c +DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 +DIST pin-project-1.1.3.crate 57740 BLAKE2B 5201a01cee2e98caa0d3ed1ff25d4af8c4a74bb0a6f5a4382c3e2d90bfd5a2cc588759867e77553225f5bef547bd6be8bf1f613516748ecb26da9181d4460b85 SHA512 91b5e0a66e620dbad6b189cc45c41dfe2493d5ce09783f1bd556cee0ac1b3b103507c39c77a393c45fb6eb93dc1f1b9efd4ba5e2a9d4507240978f1020f12aaf +DIST pin-project-internal-1.1.3.crate 27824 BLAKE2B 23b59024481710102677ba35aa8db8e27f6ce0973941addc11bc8a994031c2a4fe04cac197f04fb13c61110e554953883f50b4df15dd632e4c59fc8422fb26b0 SHA512 d2aef23074cdce910fbed47130636dfe3fcb6ab255c6fb4ff822d364d54d181f007c80755ae6f8c7519054888c1a763738d523217a8157542aa35007a77f2288 +DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee +DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +DIST plist-1.6.0.crate 47932 BLAKE2B 1996f016b12205fee8a22d52e78d5fccd309407728bc7ef516d7c54e998e76051f405032cc9fd72b8f2d81d509ce6e0aff28e088fe97e1f222e5af0f18a43705 SHA512 025f7a04cc0f16a3f44af0c63b5fbad49bcb7227460ba4e7849499a4436836b86d331c81c936ed246ee700fa2556598f9f745c1d2bf5196e0222625db0a2633b +DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029 +DIST proc-macro2-1.0.74.crate 45383 BLAKE2B 926802f43624216a01d355f78e0d14a113b72a2d01cf0a754c7dc29f3722a394546184e157c9a3475de495b8bf8f824847812314d3620d8ea083e53d9419a9c3 SHA512 7bb247f7b0274f4011032fad056bf5c11f2887364479eb997a62ca5659c0c8b1949f020bc9d1c12a50e5bc6ce03d025be55dd1a1c68b3377eef4469af6514c3b +DIST quick-xml-0.31.0.crate 172236 BLAKE2B b83c7f485a30576027a4ae77aa23cd6284942d786f0f0a14faafdfecff646371ba15133b3ba90f820183c8537c8ac47ad3e1e7deaad65e56761bc662be406026 SHA512 9b1f4f9c32694ccb244938a9a4e9373c3902314afb6af5d2f6b1be55e5ec63fee5cf1085f8f32161570cc10fdd96f3375c7564b1d884bb152542b86593f175de +DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 +DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d +DIST redox_users-0.4.4.crate 15438 BLAKE2B 5f44e9ef20f1a6c8b22239838f8f6a6648dbebd5b4386b3a2c417e39add8c4a0dc32e4369b8bb4e0ea17678140f596b9bc981b1d56f06de6a38a503600420481 SHA512 7c208116d1171b1f52f22aedcf8ad00076a3d1f062f4018f4a9f5fb2c38d7ed83258589062d1559f64e43f3e2a9ddf789799f57cf87a49ad8a37463ea09aa269 +DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3 +DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8 +DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 +DIST rust-ini-0.10.3.crate 9938 BLAKE2B dd8956128b164de522b42d6637f984a5f97a1f330afa92517c6a2c459435fb972f39517d036413423c5629bfaa3789a1d7406d66d10e2fa6dd3bd040777710ce SHA512 0ca4cd15d81ed8c5cdf659e6b5ec91bc6a2e014380d6891936711d2ee2639dea3141f825147e4fecd21205fb1df95909798272368a50db5c69e7ede7856b8169 +DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247 +DIST rustix-0.38.28.crate 365398 BLAKE2B cd9401511363c806f0c8de5076031aebd22a9c6cdc49963277bd7a58ebdccaa59c33710ee625bc0a07fe2102f370e39143adca0651d123a0dfeb562d32e7a537 SHA512 a48c959c0fbc9700294b1ab0fb71a303bcef89a01b4407c2d7dc7c83b35dfbdb69bb6ac9a364ba7d68b4e561445e6c227af586cab15d9799de9e6622e89ada12 +DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37 +DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10 +DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72 +DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c +DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25 +DIST semver-1.0.21.crate 30445 BLAKE2B 1c779c25576723ee7e44e7c831eacc5dc6bb33cbf051bd0748f688573e01595d05808cdef4ae48a6423df15e474cea58a0664ad7fa5cad490a61f89473f426d7 SHA512 bc3ceb11f2b729be086120c06ca2cefc34c5141d2d4af64279b0868456894eb9097b234b326249f2aa83d8b99086fcac4c5b7ef4a1e14b1198ae808fde245c35 +DIST serde-1.0.194.crate 76863 BLAKE2B f77db1450d3be27cd2304433d2964745c0de0752c80f4aac03017f097d43470bee8e45af82934b77c182e1a6bb08b39a1008145ebf399bb86a0a2cf5483d4c2f SHA512 8bff0dce77f270303c5a14f9b41bf8f955efd4c794bec2b59e8e0cc1940ad462abb8711cc1a8e2ff6f51cb3ece354be526f81cb27350e0595b92c66a5acde7a9 +DIST serde_derive-1.0.194.crate 55685 BLAKE2B 18e8e061be5f9085c2f0bf8e44baeff2a50248f26365b1a4cf5d64aeec518a0e11ea610bc3cc28965dba69c658e6d645e5c1ca6d5d4714000ead3192495bf8d7 SHA512 4219d286d279aadbc5791f4a8bd922a302458ee5056e75052d4653024b9ec7353c2337dc8ac716488d603aa791c5d848912ed0ef90bc235c4e9d47629245ab02 +DIST serde_json-1.0.110.crate 146448 BLAKE2B 9fb35fa711ea16660bf433dfeb02475b15f216c8f579f70a131a6b7d49cee95e74f88b87e8ca50d1ab35e43e2a5e36f4562f5e3bbf5e4f0da3e2f6c7d5df50e1 SHA512 fb163784981093f30de15e920aa68c8e58179ddcb536d5cdba2318d41f88529c30b8b03193a6900efe954dcd933d4577422756670f4df8841ca70a1196b31284 +DIST serde_repr-0.1.18.crate 9974 BLAKE2B f6a8b2c8bc759bc8cfb3826489faf67da13b1cbe2432c30ec877036924869b9cf7c1ead2809b8e5852e352b51c91f40fa892ca68832ea567e4a7df29f8590a98 SHA512 09d77ccc60a748f8c95998632459f52268cf45949c0e22250f751eeaceb7336c03a457587af7bdc6fbc188cea4e15e77c8bf63d9741a9ae31fd0b8e787cabcde +DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60 +DIST serde_yaml-0.8.26.crate 40670 BLAKE2B 78ed7b0d45677e2ff5bb94e9a12be0ab72eb2229e064a3e357a7ea3566648f10fc6c2ad5c07ce6067841392c97d4034da5d54d51939a08d81f64815ccd798642 SHA512 f6bde42539fe35dcb09fd506149c564f2056102f15ce275034b33c40ae666e22d6beaecfed8a0048704547f153fe13d52b8b305c95a61007784ee42f6a8372dd +DIST sha1-0.10.6.crate 13517 BLAKE2B 85ad8dcd237125945f6f9c2d7a48bc9802dfe8398a2bac86ddb96763486092fa18e80a2e69f89cfd6e95599d34d60ced33b26a68cbbe39bf158238a79433584b SHA512 fd37be7e3f1d4b6addd313a36b55215fb70abd21be7831b71de28bd3eb03b7352817d8a7b1a166df002c3a23eadc8224e49edd4a37556c0e5357565305d4128f +DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 +DIST socket2-0.5.5.crate 54863 BLAKE2B 4237b540dfaa96d3f8a8b9178519e5ea37b6b96480a2aed5287f462845231427a18f5add26756c7b03c18d4d4aa617a5a36c5462258ebd8be326e8fed1c48641 SHA512 afa8df546234d4e8f89289622448aa42d8c2ba74a0a3a4b13c0ff7bc30fa435a7d6d6e8c9e2a6933cfa23ebdfb4908c865e82c657611defbc16e1f1bf66f9f8c +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST syn-2.0.46.crate 250537 BLAKE2B d963daa4b6bffb4de6823cc2e37bece7266f6fb4415f32cd0c33a2840870766e04231ab6ea2d7d09b0886797bce13ac433c8ad30a541e66a98c221b42358d8a5 SHA512 5219718a0f3e8d76066212df4d52f04ab0953e4c2333d64b24a8bd9651de9f5caa41b1b7a6657b9707f2303f4a5db7fc038bfebd25aa08700417f9f9d76e0178 +DIST tempfile-3.9.0.crate 32182 BLAKE2B 4e802990988aff3ab5173bd96dbd906651a8df46b2619e6a500a3b9e7f4a3cd01dc7ee977791343f7875afdc4793a845000bb363d8c1a6599aeb6b1efcce5d56 SHA512 04e06c966bfa7a1567e7185ebd5c2876b96e46e36af14931bf0eba63795cd20d1c3427b6709a4cab2a68b8d289fdabd5537a50e5407a76e3a9fa0dcc7d3ce6d7 +DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681 +DIST thiserror-1.0.56.crate 20592 BLAKE2B e98c8bba8d21342c981646e88b72a7cbc146c695a200aae3e076b55948791cc51a29e8818d64451b17233ed4d095d0ef63ba4fb07502f4ffde5af738b8629c37 SHA512 6b7c856745256d6ef9e7ab2ea0027f9c1ed2c75ed5b075068af57cf706abfd835fd4552d9ec7578bece1f820086828c5dec85a9cbada409569838cdc9d63936c +DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde +DIST time-0.3.31.crate 121762 BLAKE2B af9097f5e44bf1a2d3bfd26e094e5c3bd17697b35ace2549167ce9f766e422d34f619b230fa81e5de6296f6d01de74a58923d7e69f7db04d6ad055d21f177bfa SHA512 e1cf8197f1eb9556e6320268eea35ca4e5ef33020fae94b181cc21d97b56c074b87ea783804cd7b7ff072736e498f0890b7af8e16c5492a12a4597a4cf33c4fa +DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52 +DIST time-macros-0.2.16.crate 24356 BLAKE2B 807f56609924cf66dd57eba1d39b0b9302dbadff468562bd624c5413e5e9c36c416f670d558d519a89c0399b9b5aeaa41b2fa2bdbac9113e61bc830d7494a470 SHA512 19345f2bdf626cdc8c44bc11fbe9e13466cb7223cae89228c20ae83e7e9d71e8fe6a037b0461c289f9ceb6c8f08885458bc1db09adeeaddbbb0fbfb0dbfbf6c5 +DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c +DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e +DIST tokio-1.35.1.crate 744407 BLAKE2B a3fed316542c4275aaa5c5b16353ae7e15306c9c6e06b86035b43df3b2a223ee4dbd9e8adbaf5a2426513279b68249afae5162bd53e14a6736b71bb1c0d01167 SHA512 75c14b714341db3764d2fde645c6ffac6f4e32be83b3ccf6315f3240fed96b65c75b8a0936df6e04a0a45cec49b3a781b5b8001282c91704f6a19ce7d188675f +DIST tokio-stream-0.1.14.crate 35881 BLAKE2B ae77512f93bb58c33036c1c0e7b8f29dd1d56274b6168a51b262c39184f0a3d366375414a3fca2a7c6c836f618e236189fdea3dbec39a861155409ffc9a77d3f SHA512 b600ef2dd90e0f46d21e94cd04baba91ec3f586832125cc2f51f350b47e7f9cc1ff5bc7529843347fc60043a61243e5b846d8db8406014969a8935385f161303 +DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c +DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005 +DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275 +DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521 +DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08 +DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508 +DIST unicase-2.7.0.crate 23783 BLAKE2B 2b74b932b45c9d5b984b57bfe8249496c192944e2e66916919177eac81c509e2d7a5d30a85ea58e8cd5a0b47fec746bdb18723f3f14002fc64af3a0d320a9e7d SHA512 c2b05a3bbd8996e1cf65d7458f5ad95de9797c8349484f8db04967bde15c1f057f62b2f7a60e7367871512071ed5076c0da042169dbbdcaf4d6c16cae62da828 +DIST unicode-bidi-0.3.14.crate 56429 BLAKE2B 8670c2bb1ad98d4540d7837e8b395078b5e0eacc0dcb7ef3ecf6ddaff9d69ce136a883b99cc5bdafd3a3d657834432d0145b11a44ea1d8b776a5394e56ba04f1 SHA512 8793d415e33f1f693ba5928d8aa09ad6dc10bca6d8ad338fca527e5b142d1ea1cb84515459a9fa0a821ae68747cae570bd3872646fcf218ebc7167ad41c97379 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c +DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b +DIST unix_path-1.0.1.crate 22226 BLAKE2B 0a0fbd0e0489cc9f31139c12d93549990160b140e67c789bf0900468f17b8f3623b72aa2bda89e23e545d6a84efef796166d12a685745a4f9ec9142d50b693ae SHA512 7648ad86bd45f8ca536b33f582d2a9e9772afbec5508abd28de42d5d6eeecdcfcf9905ee85632be4653d1fc15a370fd27825879e285e0c642aeb1663d19b6a46 +DIST unix_str-1.0.0.crate 16226 BLAKE2B 8cebac54cf69825f651067e1ecf3d8cc6387e898775da1440eec9f3f5186bef6fd1dfb983ddaa11fe8dadfc9b2e50beb1653de4e026040d6e71994d2bead3c00 SHA512 3fa234e8a371fe964a2ede29e0be9f1fb91a6858111fa5bd164bd1eb2a248e71db16f9e9faae86a7ab709458d8fee96cdedf51f7894c7bf667cd3dfb1e757859 +DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3 +DIST uuid-1.6.1.crate 55554 BLAKE2B f9b8eb34f9197734ae9a1437ded396f5e5a8551b54e532053016e0c00c8007644f4fbbd3827c9878cdbf8acaa981d8ae9c94739af7edb6939ec299075ee4b443 SHA512 b9f3dbad176b3640b4b943d127ac8fcd0938e7bc750430626cc603efdcf5faf479f8de7940d64ed1b5b6e6378b42a1aaf3c1e791ee59b9db9394409261cf3c55 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9 +DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526 +DIST warp-0.3.6.crate 116794 BLAKE2B ee3396698ba62593e80fe4d0090ada41919f056dadcafdb9533741cbecadb7203a9f436ecfc2d07c21be5034198f12b8c42b6a10e6ae19995d199d71e2a13a6a SHA512 a150a55e1625e2c95aaa0ca3bfc0e9b79e75c5d04898a6ae8cd91fdaad342ebb5c1b2305a6d10640eb0d67b19b3ba8f3fdad3c45b345967da11e29210a131255 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST wasm-bindgen-0.2.89.crate 181935 BLAKE2B 88ff35daace267087750053eacdcf81f1d6cfd7653e1b21cd8436799688615a2840ab733e0196cde747dd4a49ffc3d4efc7c64f48e4e75bd9a240a689f7c037c SHA512 e9e3b95547423ac7acb0f0b327b9fde6c8ef3160296509332fe5d9cbf9eb6a4ed6ad30b29552cdcd113a94e95fab4e3ecc1e7a03811514f84fac569972febf5b +DIST wasm-bindgen-backend-0.2.89.crate 28205 BLAKE2B d280d04a6e8df72c0eb0d99b134c017be8c7d378578e23505ebb184510e6eab746fc06ca25333a62c24405565531b6e1c79a5010ae31aebb280c7820d5fe41fd SHA512 9ff63a2401e741013753fbbbc86990948e0e8820ffdb4b16167d2c72f12626306e5d077fef37d8d956acc73eefd699dc7f03250926a5609639b127d4e46daf1b +DIST wasm-bindgen-macro-0.2.89.crate 13906 BLAKE2B 93e4b784eaf75a070f471d7d60b802d42b4bdbfd0c7ec21ecf1dbda554ed2bed62d99c2b28ba1527ad8f6f3e5b6083d132f36f9c36efcfa9f6a9cfab73b1ca0d SHA512 060e0f300bdc42557798f4d7348165ac9dde60e4f7760acca5da6ec02bdf8bac22e2e5b80f733aae625a0c699dbe831e0afc6e66b2af8fe445aa6513c5180381 +DIST wasm-bindgen-macro-support-0.2.89.crate 20008 BLAKE2B 867ed0049f076d37e8c0587928d67209d69071a6beb80afaba35b947c16958d2c61ef1c762d1706de6744f23ed811815cd94f7059b3ad823aa99f30929cc3a33 SHA512 4ff50819d989733b51e6614b8b14992dc7e53e4c283b89c4e21dd50659cdc49a8cec379df7630ee26e04be62f4ff0bc5eeee9153dbeaec213e8217964a149e76 +DIST wasm-bindgen-shared-0.2.89.crate 7265 BLAKE2B 78668ee6af47357983788161c2a50562ff37a8d584e6be61142c5609360aa712571c3fac6b3395215c5d132edb864e0ce8e7b648fd7225433a81f2ae3e6a586b SHA512 02b2252b5b2e6bc8723404ee8cc750684f488b3e80ab60210d97fd7b343a67db2ef8d62aa792a5f02bb351467f4ffbc887512a215007f6fd089b29f8d3a23be3 +DIST webdriver-0.50.0.crate 32046 BLAKE2B 77522b682f4a82ef4450aead5f785a335348deb630588969546633b92b20381da3ba5d1401f5339b5c7dacf1357821f41466179c745dd6925106b5a59c163bd3 SHA512 2f116dc7d2b11432e8343dc888c1854972d754a0ec91cf19e24e4068a7074d54d4b3215daaf2547adac4ac922afe05c323c9b7c4d3c854cc8470b3959c0101dc +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 +DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9 +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36 +DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed +DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 +DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c +DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0 +DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78fc0eac3ac430af78f320ed839f8683bd96fa1a03c457d6ac568d42bd703a902bc37bd126791d8b4c709 SHA512 affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef diff --git a/net-misc/geckodriver/files/geckodriver-0.34.0-firefox-125.0-unchained.patch b/net-misc/geckodriver/files/geckodriver-0.34.0-firefox-125.0-unchained.patch new file mode 100644 index 000000000000..a366693def38 --- /dev/null +++ b/net-misc/geckodriver/files/geckodriver-0.34.0-firefox-125.0-unchained.patch @@ -0,0 +1,17 @@ +diff --git a/src/capabilities.rs b/src/capabilities.rs +--- a/src/capabilities.rs ++++ b/src/capabilities.rs +@@ -226,10 +226,7 @@ impl<'a> BrowserCapabilities for FirefoxCapabilities<'a> { + if !data.contains_key("androidPackage") + && self.version(Some(Path::new(binary))).is_err() + { +- return Err(WebDriverError::new( +- ErrorStatus::InvalidArgument, +- format!("{} is not a Firefox executable", &**key), +- )); ++ warn!("{} is not a Mozilla Firefox executable", &**key); + } + } else { + return Err(WebDriverError::new( +-- +2.40.1 diff --git a/net-misc/geckodriver/geckodriver-0.34.0.ebuild b/net-misc/geckodriver/geckodriver-0.34.0.ebuild new file mode 100644 index 000000000000..197a6abe6005 --- /dev/null +++ b/net-misc/geckodriver/geckodriver-0.34.0.ebuild @@ -0,0 +1,229 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Autogenerated by pycargoebuild 0.13.2 + +EAPI=8 + +CRATES=" + addr2line@0.21.0 + adler@1.0.2 + aho-corasick@1.1.2 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anstyle@1.0.4 + anyhow@1.0.79 + autocfg@1.1.0 + backtrace@0.3.69 + base64@0.21.5 + bitflags@1.3.2 + bitflags@2.4.1 + block-buffer@0.10.4 + bumpalo@3.14.0 + byteorder@1.5.0 + bytes@1.5.0 + cc@1.0.83 + cfg-if@1.0.0 + chrono@0.4.31 + clap@4.4.12 + clap_builder@4.4.12 + clap_lex@0.6.0 + cookie@0.16.2 + core-foundation-sys@0.8.6 + cpufeatures@0.2.11 + crc32fast@1.3.2 + crossbeam-utils@0.8.18 + crypto-common@0.1.6 + deranged@0.3.11 + digest@0.10.7 + dirs-sys@0.3.7 + dirs@4.0.0 + equivalent@1.0.1 + errno@0.3.8 + fastrand@2.0.1 + flate2@1.0.28 + fnv@1.0.7 + form_urlencoded@1.2.1 + futures-channel@0.3.30 + futures-core@0.3.30 + futures-sink@0.3.30 + futures-task@0.3.30 + futures-util@0.3.30 + generic-array@0.14.7 + getrandom@0.2.11 + gimli@0.28.1 + h2@0.3.22 + hashbrown@0.12.3 + hashbrown@0.14.3 + headers-core@0.2.0 + headers@0.3.9 + http-body@0.4.6 + http@0.2.11 + httparse@1.8.0 + httpdate@1.0.3 + hyper@0.14.28 + iana-time-zone-haiku@0.1.2 + iana-time-zone@0.1.59 + idna@0.5.0 + indexmap@1.9.3 + indexmap@2.1.0 + itoa@1.0.10 + js-sys@0.3.66 + lazy_static@1.4.0 + libc@0.2.151 + libredox@0.0.1 + line-wrap@0.1.1 + linked-hash-map@0.5.6 + linux-raw-sys@0.4.12 + log@0.4.20 + marionette@0.5.0 + memchr@2.7.1 + mime@0.3.17 + mime_guess@2.0.4 + miniz_oxide@0.7.1 + mio@0.8.10 + mozdevice@0.5.2 + mozprofile@0.9.2 + mozrunner@0.15.2 + mozversion@0.5.2 + num-traits@0.2.17 + object@0.32.2 + once_cell@1.19.0 + percent-encoding@2.3.1 + pin-project-internal@1.1.3 + pin-project-lite@0.2.13 + pin-project@1.1.3 + pin-utils@0.1.0 + plist@1.6.0 + powerfmt@0.2.0 + proc-macro2@1.0.74 + quick-xml@0.31.0 + quote@1.0.35 + redox_syscall@0.4.1 + redox_users@0.4.4 + regex-automata@0.4.3 + regex-syntax@0.8.2 + regex@1.10.2 + rust-ini@0.10.3 + rustc-demangle@0.1.23 + rustix@0.38.28 + rustls-pemfile@1.0.4 + ryu@1.0.16 + safemem@0.3.3 + same-file@1.0.6 + scoped-tls@1.0.1 + semver@1.0.21 + serde@1.0.194 + serde_derive@1.0.194 + serde_json@1.0.110 + serde_repr@0.1.18 + serde_urlencoded@0.7.1 + serde_yaml@0.8.26 + sha1@0.10.6 + slab@0.4.9 + socket2@0.5.5 + strsim@0.10.0 + syn@2.0.46 + tempfile@3.9.0 + terminal_size@0.3.0 + thiserror-impl@1.0.56 + thiserror@1.0.56 + time-core@0.1.2 + time-macros@0.2.16 + time@0.3.31 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio-stream@0.1.14 + tokio-util@0.7.10 + tokio@1.35.1 + tower-service@0.3.2 + tracing-core@0.1.32 + tracing@0.1.40 + try-lock@0.2.5 + typenum@1.17.0 + unicase@2.7.0 + unicode-bidi@0.3.14 + unicode-ident@1.0.12 + unicode-normalization@0.1.22 + unicode-segmentation@1.10.1 + unix_path@1.0.1 + unix_str@1.0.0 + url@2.5.0 + uuid@1.6.1 + version_check@0.9.4 + walkdir@2.4.0 + want@0.3.1 + warp@0.3.6 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.89 + wasm-bindgen-macro-support@0.2.89 + wasm-bindgen-macro@0.2.89 + wasm-bindgen-shared@0.2.89 + wasm-bindgen@0.2.89 + webdriver@0.50.0 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.6 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-core@0.52.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 + winreg@0.10.1 + yaml-rust@0.4.5 + zip@0.6.6 +" + +inherit cargo + +DESCRIPTION="Proxy for using WebDriver clients to interact with Gecko-based browsers" +HOMEPAGE="https://firefox-source-docs.mozilla.org/testing/geckodriver/ https://github.com/mozilla/geckodriver" +SRC_URI="https://github.com/mozilla/geckodriver/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS}" + +LICENSE="MPL-2.0" +# Dependent crate licenses +LICENSE+=" Apache-2.0 MIT MPL-2.0 Unicode-DFS-2016" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + +IUSE="unchained" + +RDEPEND="!www-client/firefox[geckodriver]" + +pkg_setup() { + QA_FLAGS_IGNORED="/usr/$(get_libdir)/firefox/geckodriver" +} + +src_prepare() { + # Apply the unchained patch from https://github.com/rafiibrahim8/geckodriver-unchained - + # makes geckodriver available on Gecko-based non-Firefox browsers, e.g. Librewolf. + # bgo#930568 + use unchained && eapply "${FILESDIR}"/geckodriver-0.34.0-firefox-125.0-unchained.patch + + default +} + +src_install() { + einstalldocs + + mkdir -p "${D}"/usr/$(get_libdir)/firefox || die "Failed to create /usr/lib*/firefox directory." + exeinto /usr/$(get_libdir)/firefox + doexe target/release/geckodriver + dosym -r /usr/$(get_libdir)/firefox/geckodriver /usr/bin/geckodriver +} diff --git a/net-misc/npapi-sdk/metadata.xml b/net-misc/geckodriver/metadata.xml index 7b2b093df953..d1062f0eabec 100644 --- a/net-misc/npapi-sdk/metadata.xml +++ b/net-misc/geckodriver/metadata.xml @@ -1,15 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> <maintainer type="project"> <email>mozilla@gentoo.org</email> <name>Gentoo Mozilla Team</name> </maintainer> + <use> + <flag name="unchained">Apply the geckodriver-unchained patch, for Gecko-based non-Firefox browsers (e.g. Librewolf)</flag> + </use> <upstream> - <remote-id type="github">mgorny/npapi-sdk</remote-id> + <remote-id type="github">mozilla/geckodriver</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest index 1ffb42d96ae8..2a432023cafd 100644 --- a/net-misc/geoipupdate/Manifest +++ b/net-misc/geoipupdate/Manifest @@ -1,37 +1,6 @@ -DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f99111931646e8d194d493cf6992ac76a065a02816e5eaf0c974f752aeabb9cde7e7f8ec70d70529402b0b58072c44994e39e53 SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1 -DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f -DIST geoipupdate-4.3.0.tar.gz 28170 BLAKE2B 4a7cf9820a37b063665cd0494003fedd4b8a9835dc0746477f28287ccee619efe07c7af608ccb04293b817151fbe409f24c828a0c5f2bd4d60f8570b4df8d4f7 SHA512 2cc40ef436b67e114e854230c439778a139adb05c766e8fdaf70269c23bee4cecee35d5b1a0b12ce9b70185e28231eb97486120fbd2900b8f61c2e6ce6601ad3 -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb -DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb -DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip 11234 BLAKE2B d806e8bf8671c1e1adf0dc95ea61efdba9a53ffd1e4b2cdd469030964c7137a51cc77ed65b2788ff4a692ab6ca46572f30e20b6b8c7887eb304c07d8f835fadc SHA512 bacd8f76999947d61c25839c38fa102b4cd7c2998573727309032db6ea47019147f51d2c03d38744e739b2e26afe0ad49c330e936649ad848d332ab1d04c3bca -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928 -DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f -DIST github.com%2Fmaxmind%2Fgeoipupdate%2F@v%2Fv4.0.2+incompatible.zip 32231 BLAKE2B ebccf1282f99c7b889969d9a11be3aa98d662adb463ede02bc4ff2e2db757be5a9187f6ff0568ed08fde2438d2f66974972f25128ff252a4bafafef786448091 SHA512 46dc6e891a4bcd57ffae0777ac4c3b9bcebbb8d8a661704d9fada707221ad9fe9b37fe0a053824e4ee362a0fc4cd625e0379c4522f5526dd1353beffb62149e4 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.zip 18663 BLAKE2B ccec7bae555b0c549b5da7d2ca1a16d261721473c638aafee7bd80a1be86b3a377654e32bbcad0c040186767b2f3f92017c0df47f7b86a0c926aabfdbf708450 SHA512 13d7c1acdffefb28bdd1c9efdaa579cf94d02a187e1952fe5da1cccb4934c34329792776fa46e801b43fee8df15c3f9dcd0a7a3fe85b78942dcbafca6e106b7b -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2 -DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5 -DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 34637 BLAKE2B 9e26766ed5717903173455e60ee1b690779e286b6be3cc22f633ccf26592839d149f813a1b92775ab2a447f0c1a20960f956fe5aa4a7c56abc6642b58b7973e3 SHA512 968b76a138261cfee0d1f58ede483741328968e24d073b24affdc7ab9cbf9bb76dd9fa1785423c49471c02ea4804810ebe673bc623c4f72389b2654a64a565e1 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip 92066 BLAKE2B bc321a8dde64189df65fef0a931a54a1c8dce62de17b011149c1f78a3db2c6bc50e0694c4dac2bb77291dda45fdaaca68901f5a6a584cf8b78117231c2a417ae SHA512 f40c1d8fc0c0edd78abec113f71601ccbc6a320e7eceb9ded2e6a047a05c9ad54bfdd7aea3f476fb10983b92e5d0fdf3cc716b93ad5a93793f40dc3d830c8d28 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920 +DIST geoipupdate-4.9.0-deps.tar.xz 911156 BLAKE2B 136df3a0e94ab0934b48e8860b152edacffae093d26bdbe9593c24f540ce0d6cff215e4cf4ea158bd8dc9a9f3157d5634fea4d66315c5dbc537b42041d0625e6 SHA512 88579ba0e804d7dd9f6cab24d2ac01186f39c47f1ae79d395a77b0725d25e8675928ce34532506f164157cbce4fb2e947efbd2e66c23ed18d61bc67be74ce74d +DIST geoipupdate-4.9.0.tar.gz 36646 BLAKE2B 9eb5e16c39e8c599d3b0fa60804f179d1fb726c44f9f4ed4ed6ff3b853c31c9dece809dcd690e14157f1290c4a9088e696e967f3baeeb7f2762638c70aad6b6a SHA512 29d0639fe636885b1527b4cb795332c103c011d028ada80eb7b07805d91f575554fc0b9fa9a506c644236a2ceab5509f54f0cc1a03a300480350c520484d959c +DIST geoipupdate-6.0.0-deps.tar.xz 864256 BLAKE2B 6f9a7adf4bfef6c38a06b3f5e8b49362218dd8b698eec29921ac1d587094c49b26bc307924327600cb06327aae7171a6865cc79134eddee9e08004a82dfcbb84 SHA512 678ecb798b9b736a82d3e2b64c426e966408bbf3858a32e84dd142f0392444248c34c78dec07a5f8c0f04752c965c5cfb1602d96a541462e40a4c84039c71237 +DIST geoipupdate-6.0.0.tar.gz 46523 BLAKE2B ff14026acf39797f69b7cde527c826b78740a65ac4e0914cdffc6276473e3f4367e87e962dfa4634114b7f5b02c33a4a8e675518f4de85238a2342cb367c9f25 SHA512 2b2a6573b6af30ad1ad4c8ed3b97df41bba96212a0e6d90e4a92bd0615f02c9e989168ad56a651d8f35a7d2534e223de5a6f8a34d587f3c8a7a8e19f3b913ca4 +DIST geoipupdate-6.1.0-deps.tar.xz 866588 BLAKE2B aabda8132d0f8866e3450b5c2f07dccc7b1555cac0a987fea48ffe3f07a8c66c72bb41ca1478d47f03cb61bd29a6183bd0621126222decc4e29b8525c3ba991e SHA512 4a03b35258dc77659471299fe119da1e435b1360df08b0b8a19f6374e3880c1c6153fcdb5146f74900ebf540c2c66a3007228f05b702f526ed9e75e01f51f98d +DIST geoipupdate-6.1.0.tar.gz 47557 BLAKE2B ef33058f8504c06dc2c2a350421866cd88a6b87624874cf6bd29d99c77637c3b99468a6ba615d71310e0c5d49d6ee2820d9a3841c1127437fa602864a014d77d SHA512 b20a3101fb055ed71fe999fe924b71f6d0eb76da8bc4444f7281a3deceac1ee7d1854f3d672b93edabf152cc69551933dd951419ab484259d47f56b243e568eb diff --git a/net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch b/net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch new file mode 100644 index 000000000000..aa48a97ef155 --- /dev/null +++ b/net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch @@ -0,0 +1,26 @@ +From 250049909d1f9ed3c8ab06e07fcb10487942953a Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Wed, 13 Dec 2023 18:59:31 +0200 +Subject: [PATCH] Use go-md2man instead of perl script with pandoc + +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- a/Makefile ++++ b/Makefile +@@ -53,10 +53,11 @@ $(BUILDDIR)/GeoIP.conf.md: $(BUILDDIR) doc/GeoIP.conf.md + $(BUILDDIR)/geoipupdate.md: $(BUILDDIR) doc/geoipupdate.md + sed -e 's|CONFFILE|$(CONFFILE)|g' -e 's|DATADIR|$(DATADIR)|g' -e 's|$$|$(MAYBE_CR)|g' doc/geoipupdate.md > $(BUILDDIR)/geoipupdate.md + +-$(BUILDDIR)/GeoIP.conf.5: $(BUILDDIR)/GeoIP.conf.md $(BUILDDIR)/geoipupdate.md +- dev-bin/make-man-pages.pl "$(BUILDDIR)" ++$(BUILDDIR)/GeoIP.conf.5: %.5 : %.md ++ go-md2man -in $< -out $@ + +-$(BUILDDIR)/geoipupdate.1: $(BUILDDIR)/GeoIP.conf.5 ++$(BUILDDIR)/geoipupdate.1: %.1: %.md ++ go-md2man -in $< -out $@ + + clean: + rm -rf $(BUILDDIR)/GeoIP.conf \ +-- +2.43.0 + diff --git a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild b/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild deleted file mode 100644 index 7d7efeb504fe..000000000000 --- a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" -HOMEPAGE="https://github.com/maxmind/geoipupdate" -SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" - -DEPEND=" - net-misc/curl - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} - !<dev-libs/geoip-1.6.0 -" - -src_install() { - default - keepdir /usr/share/GeoIP -} diff --git a/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild b/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild deleted file mode 100644 index b80672ca8484..000000000000 --- a/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" -HOMEPAGE="https://github.com/maxmind/geoipupdate" -SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" - -DEPEND=" - net-misc/curl - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} - !<dev-libs/geoip-1.6.0 -" - -src_install() { - default - keepdir /usr/share/GeoIP -} diff --git a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild deleted file mode 100644 index 9e77ca2c2a40..000000000000 --- a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_PN="github.com/maxmind/${PN}" - -inherit go-module - -DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" -HOMEPAGE="https://github.com/maxmind/geoipupdate" -EGO_SUM=( - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" # SPDX:ISC - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/gofrs/flock v0.7.1" # SPDX:BSD-3-Clause - "github.com/gofrs/flock v0.7.1/go.mod" - "github.com/kr/pretty v0.2.0" # SPDX:MIT - "github.com/kr/pretty v0.2.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" # SPDX:MIT - "github.com/kr/text v0.1.0/go.mod" - "github.com/maxmind/geoipupdate v4.0.2+incompatible" # SPDX:MIT, SPDX:Apache - "github.com/pkg/errors v0.9.0" # SPDX:BSD-2-Clause - "github.com/pkg/errors v0.9.0/go.mod" - "github.com/pkg/errors v0.9.1" # SPDX:BSD-2-Clause - "github.com/pkg/errors v0.9.1/go.mod" - "github.com/pmezard/go-difflib v1.0.0" # SPDX:BSD-3-Clause - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/spf13/pflag v1.0.5" # SPDX:BSD-3-Clause - "github.com/spf13/pflag v1.0.5/go.mod" - "github.com/stretchr/objx v0.1.0" # SPDX:MIT - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/testify v1.4.0" # SPDX:MIT - "github.com/stretchr/testify v1.4.0/go.mod" - "github.com/stretchr/testify v1.5.0" # SPDX:MIT - "github.com/stretchr/testify v1.5.0/go.mod" - "github.com/stretchr/testify v1.5.1" # SPDX:MIT - "github.com/stretchr/testify v1.5.1/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" # SPDX:BSD-2-Clause - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/yaml.v2 v2.2.2" # SPDX:Apache-2.0, SPDX:MIT - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.7" # SPDX:Apache-2.0, SPDX:MIT - "gopkg.in/yaml.v2 v2.2.7/go.mod" -) -go-module_set_globals -SRC_URI=" - https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI} -" - -LICENSE="ISC BSD BSD-2 MIT Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm ppc64 x86" - -DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md ) - -# Do not let these leak from outside into the package -export GOBIN= GOPATH= GOCODE= - -src_compile() { - # requires pandoc but the information is still in the distributed md files - sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die - #sed -i -e 's/go build/go build -x/' Makefile || die - - # the horror, the horror ... but it's all automagic - export CONFFILE=/etc/GeoIP.conf - export DATADIR=/usr/share/GeoIP - export VERSION=${PV} - default -} - -src_install() { - dobin build/geoipupdate - keepdir /usr/share/GeoIP - insinto /etc - doins build/GeoIP.conf - einstalldocs -} diff --git a/net-misc/geoipupdate/geoipupdate-4.9.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.9.0.ebuild new file mode 100644 index 000000000000..2936adefa8da --- /dev/null +++ b/net-misc/geoipupdate/geoipupdate-4.9.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" +HOMEPAGE="https://github.com/maxmind/geoipupdate" +SRC_URI="https://github.com/maxmind/geoipupdate/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="ISC BSD BSD-2 MIT Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm ppc64 ~s390 x86" + +DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md ) + +src_compile() { + # Do not let these leak from outside into the package + unset GOBIN GOPATH GOCODE + + # requires pandoc but the information is still in the distributed md files + sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die + #sed -i -e 's/go build/go build -x/' Makefile || die + + # the horror, the horror ... but it's all automagic + export CONFFILE=/etc/GeoIP.conf + export DATADIR=/usr/share/GeoIP + export VERSION=${PV} + + default +} + +src_install() { + dobin build/geoipupdate + + keepdir /usr/share/GeoIP + + insinto /etc + doins build/GeoIP.conf + + einstalldocs +} diff --git a/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild b/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild new file mode 100644 index 000000000000..eeedc3970bee --- /dev/null +++ b/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" +HOMEPAGE="https://github.com/maxmind/geoipupdate" +SRC_URI="https://github.com/maxmind/geoipupdate/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="BSD MIT Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86" + +BDEPEND="dev-go/go-md2man" + +DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md ) + +PATCHES=( + "${FILESDIR}/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch" +) + +src_compile() { + # Do not let these leak from outside into the package + unset GOBIN GOPATH GOCODE + + # the horror, the horror ... but it's all automagic + export CONFFILE=/etc/GeoIP.conf + export DATADIR=/usr/share/GeoIP + export VERSION=${PV} + + default +} + +src_install() { + dobin build/geoipupdate + + keepdir /usr/share/GeoIP + + insinto /etc + doins build/GeoIP.conf + + doman build/GeoIP.conf.5 build/geoipupdate.1 + + einstalldocs +} diff --git a/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild b/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild new file mode 100644 index 000000000000..e614b260fb7e --- /dev/null +++ b/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" +HOMEPAGE="https://github.com/maxmind/geoipupdate" +SRC_URI="https://github.com/maxmind/geoipupdate/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="ISC BSD BSD-2 MIT Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm ppc64 ~s390 x86" + +DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md ) + +src_compile() { + # Do not let these leak from outside into the package + unset GOBIN GOPATH GOCODE + + # requires pandoc but the information is still in the distributed md files + sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die + #sed -i -e 's/go build/go build -x/' Makefile || die + + # the horror, the horror ... but it's all automagic + export CONFFILE=/etc/GeoIP.conf + export DATADIR=/usr/share/GeoIP + export VERSION=${PV} + + default +} + +src_install() { + dobin build/geoipupdate + + keepdir /usr/share/GeoIP + + insinto /etc + doins build/GeoIP.conf + + einstalldocs +} diff --git a/net-misc/geoipyupdate/Manifest b/net-misc/geoipyupdate/Manifest new file mode 100644 index 000000000000..69b30316f27f --- /dev/null +++ b/net-misc/geoipyupdate/Manifest @@ -0,0 +1 @@ +DIST geoipyupdate-0.0.1.tar.gz 17000 BLAKE2B e68d044fc748f0876745a21cb77e8098367ab7e260ff53e0e6b68ad88d7c1deb4b6f3977eeaf61a1b0a54f30f0fc32e302a89e996a9ccb69f9dc9c48c3d0df03 SHA512 8e78866f083b3ab8ef445d82e4d9081f7f59437348638e951c615f610e382ac5b7f9dc08c3a28735322442a22d276cfed12dcd375ac613f0d18f10ef94b200b7 diff --git a/net-misc/geoipyupdate/geoipyupdate-0.0.1.ebuild b/net-misc/geoipyupdate/geoipyupdate-0.0.1.ebuild new file mode 100644 index 000000000000..6212aa8469a4 --- /dev/null +++ b/net-misc/geoipyupdate/geoipyupdate-0.0.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{11..12} ) + +inherit distutils-r1 + +DESCRIPTION="Simple python replacement for the MaxMind geoipupdate program" +HOMEPAGE="https://michael.orlitzky.com/code/geoipyupdate.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-python/requests[${PYTHON_USEDEP}]" + +DOCS=( README.rst doc/geoipyupdate-sample.toml ) + +src_install() { + distutils-r1_src_install + doman doc/man1/geoipyupdate.1 +} diff --git a/net-misc/econnman/metadata.xml b/net-misc/geoipyupdate/metadata.xml index a1fbf3c0c993..c6418674131d 100644 --- a/net-misc/econnman/metadata.xml +++ b/net-misc/geoipyupdate/metadata.xml @@ -2,7 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>juippis@gentoo.org</email> - <name>Joonas Niilola</name> + <email>mjo@gentoo.org</email> </maintainer> </pkgmetadata> diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest index 80daa6666b7c..61b389f74027 100644 --- a/net-misc/geomyidae/Manifest +++ b/net-misc/geomyidae/Manifest @@ -1 +1,2 @@ DIST geomyidae-v0.34.tgz 22242 BLAKE2B bc25f50c49c10e5a04b83a12cdcd7546b33f6a7d93eab504122bcfb2fdacfbcb82205890d5fd999d1b8b681c65dc0ef0dc5f95ea2d56a795fa371031c4af43b8 SHA512 55b7845c8b9fbee70b2e2bd71d2e3bb8e34c3029a1ea410cb39750763c81d5c31af8c703f7b673aa28fbfd61dd7915300ed4ff22f94c8430ac754681bc30ce41 +DIST geomyidae-v0.69.tar.gz 34631 BLAKE2B a1d7e33d403df5d6bb4d5fdc0999fdcfa94da058dd5dc1c0f22c49b9cc1b06cf45fafdb839eb91dec78be0aa778e3a74bf26d8ffa5054d45e5c6e86918480ad4 SHA512 c66f751472c35107c2c91f1675ab40bf68da1d3d5742ec94125c8ecba54b2832e82c8106a3627da53216cf3802ae7900ef8457c383160614ecce2a07b318662a diff --git a/net-misc/geomyidae/geomyidae-0.69.ebuild b/net-misc/geomyidae/geomyidae-0.69.ebuild new file mode 100644 index 000000000000..3bd6b1bc1db3 --- /dev/null +++ b/net-misc/geomyidae/geomyidae-0.69.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A daemon to serve the gopher protocol" +HOMEPAGE="http://r-36.net/scm/geomyidae/" +SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tar.gz" + +S="${WORKDIR}/${PN}-v${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +RDEPEND=" + acct-group/gopherd + acct-user/gopherd + dev-libs/libretls:0= +" +DEPEND="${RDEPEND}" + +src_prepare() { + # remove /usr/lib from LDFLAGS, bug #731672 + sed -i \ + -e '/GEOM_LDFLAGS/s:-L/usr/lib ::' \ + Makefile || die 'sed on Makefile failed' + + eapply_user +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dosbin ${PN} + + newinitd rc.d/Gentoo.init.d ${PN} + newconfd rc.d/Gentoo.conf.d ${PN} + + insinto /var/gopher + doins index.gph + fowners -R root:gopherd /var/gopher + fperms -R g=rX,o=rX /var/gopher + + doman ${PN}.8 + dodoc CGI.md README +} diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest index 9fb05e28eae3..96b7358aac52 100644 --- a/net-misc/gerbera/Manifest +++ b/net-misc/gerbera/Manifest @@ -1,2 +1 @@ -DIST gerbera-1.8.2.tar.gz 3589779 BLAKE2B 120654d5a9d1ac7dd29da401f2ca040e3331a27dd22a52fdc9c9a958a1a8e918ae6ca76926e636184f3b91475797432728462106eb4fbdc146737e88da07d8e7 SHA512 3831030b4960613e487bdba92323a4b8d7ed63352c1c9eb1ca5eacd3c91d4864d48ef1d1bec19a98b6abed0a827d18ba7940a814fe174b44c2808ad7b85a8756 -DIST gerbera-1.9.2.tar.gz 3671452 BLAKE2B 1553370fe35c32ca5925559da05fb4a27db4c8b765eeecabf9c5be967dbd2bd99c2726129e0c2e49930b8e95ddbabb7829c65107c75cda4d6885ff72b695b512 SHA512 91c7215b0bae000d4d8b29797947b29609e81c9387547e199936ce385ef679048a7554d24cd80ab73fc83c4288b29fc4928a23add6f67a1da05501c87afdf7a3 +DIST gerbera-1.12.1.tar.gz 4368573 BLAKE2B 870b1296b89d51086048c5c5a52109f336facbf0bce02313487cb5c80ca4bb9a5590f64683f5ac92a3c3026ef9c3e22275a38fdc52fd8cbe887ec6f3c7b38ab9 SHA512 54f4b9fe38f4890d1cac16d433bd70cb2892f3659fffcd5f52814d2f9377c4a8eb68deb3a13053531609727f7ae6cb5ee12bbf652bc41dd1eabd83e6f8dcc1f2 diff --git a/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch b/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch new file mode 100644 index 000000000000..9e84f53b3ef4 --- /dev/null +++ b/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch @@ -0,0 +1,81 @@ +From 07f78866608c8f1094696615932e2d8382e5fd8c Mon Sep 17 00:00:00 2001 +From: Kostadin Shishmanov <kocelfc@tutanota.com> +Date: Thu, 16 Nov 2023 21:17:34 +0200 +Subject: [PATCH] Add #include <algorithm> to fix building with gcc 14 + +Gentoo bug: https://bugs.gentoo.org/917136 + +Upstream PR: https://github.com/gerbera/gerbera/pull/2899 + +Signed-off-by: Kostadin Shishmanov <kocelfc@tutanota.com> +--- + src/cds/cds_objects.h | 1 + + src/iohandler/io_handler_buffer_helper.cc | 2 ++ + src/iohandler/mem_io_handler.cc | 2 ++ + src/util/tools.h | 1 + + src/util/upnp_clients.cc | 2 ++ + 5 files changed, 8 insertions(+) + +diff --git a/src/cds/cds_objects.h b/src/cds/cds_objects.h +index 4283a3af5..a4b9c1d01 100644 +--- a/src/cds/cds_objects.h ++++ b/src/cds/cds_objects.h +@@ -34,6 +34,7 @@ + #ifndef __CDS_OBJECTS_H__ + #define __CDS_OBJECTS_H__ + ++#include <algorithm> + #include <map> + #include <memory> + #include <vector> +diff --git a/src/iohandler/io_handler_buffer_helper.cc b/src/iohandler/io_handler_buffer_helper.cc +index ee1de602e..49afd3c8c 100644 +--- a/src/iohandler/io_handler_buffer_helper.cc ++++ b/src/iohandler/io_handler_buffer_helper.cc +@@ -36,6 +36,8 @@ + + #include "config/config_manager.h" + ++#include <algorithm> ++ + IOHandlerBufferHelper::IOHandlerBufferHelper(std::shared_ptr<Config> config, std::size_t bufSize, std::size_t initialFillSize) + : config(std::move(config)) + , bufSize(bufSize) +diff --git a/src/iohandler/mem_io_handler.cc b/src/iohandler/mem_io_handler.cc +index 534c452da..230f4aa85 100644 +--- a/src/iohandler/mem_io_handler.cc ++++ b/src/iohandler/mem_io_handler.cc +@@ -34,6 +34,8 @@ + + #include "mem_io_handler.h" // API + ++#include <algorithm> ++ + MemIOHandler::MemIOHandler(const void* buffer, int length) + : buffer(new char[length]) + , length(length) +diff --git a/src/util/tools.h b/src/util/tools.h +index 177f09900..de2481c87 100644 +--- a/src/util/tools.h ++++ b/src/util/tools.h +@@ -33,6 +33,7 @@ + #ifndef __TOOLS_H__ + #define __TOOLS_H__ + ++#include <algorithm> + #include <map> + #include <optional> + #include <vector> +diff --git a/src/util/upnp_clients.cc b/src/util/upnp_clients.cc +index e07fb4508..d95f426fb 100644 +--- a/src/util/upnp_clients.cc ++++ b/src/util/upnp_clients.cc +@@ -33,6 +33,8 @@ + + #include <upnp.h> + ++#include <algorithm> ++ + std::shared_ptr<ClientStatusDetail> ClientStatusDetail::clone() const + { + return std::make_shared<ClientStatusDetail>(group, itemId, playCount, lastPlayed.count(), lastPlayedPosition.count(), bookMarkPos.count()); diff --git a/net-misc/gerbera/gerbera-1.9.2.ebuild b/net-misc/gerbera/gerbera-1.12.1-r1.ebuild index 49bd780a49a0..c7fbd27a2fa3 100644 --- a/net-misc/gerbera/gerbera-1.9.2.ebuild +++ b/net-misc/gerbera/gerbera-1.12.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake linux-info @@ -9,8 +9,8 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" inherit git-r3 else - SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/${P}" fi @@ -19,51 +19,55 @@ HOMEPAGE="https://gerbera.io" LICENSE="GPL-2" SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib" -DEPEND=" +RDEPEND=" acct-user/gerbera - >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] - >=dev-db/sqlite-3 - dev-libs/spdlog:= - dev-libs/pugixml - dev-libs/libfmt:0= + dev-db/sqlite dev-libs/libebml:= - mysql? ( dev-db/mysql-connector-c ) - javascript? ( dev-lang/duktape:= ) - taglib? ( >=media-libs/taglib-1.11 ) - lastfm? ( >=media-libs/lastfmlib-0.4 ) + dev-libs/libfmt:= + dev-libs/pugixml + dev-libs/spdlog:= + >=net-libs/libupnp-1.14.12:=[ipv6(+),reuseaddr,-blocking-tcp] + sys-apps/util-linux + sys-libs/zlib + virtual/libiconv + curl? ( net-misc/curl ) exif? ( media-libs/libexif ) - exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) + exiv2? ( media-gfx/exiv2:= ) + ffmpeg? ( media-video/ffmpeg:= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - curl? ( net-misc/curl ) + javascript? ( dev-lang/duktape:= ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska:= ) - sys-apps/util-linux - sys-libs/zlib - virtual/libiconv + mysql? ( dev-db/mysql-connector-c ) + taglib? ( media-libs/taglib ) " -RDEPEND="${DEPEND}" + +DEPEND="${RDEPEND}" CONFIG_CHECK="~INOTIFY_USER" +PATCHES=( + "${FILESDIR}/${PN}-1.12.1-gcc14.patch" +) + src_configure() { local mycmakeargs=( + -DWITH_AVCODEC=$(usex ffmpeg) -DWITH_CURL=$(usex curl) -DWITH_DEBUG=$(usex debug) -DWITH_EXIF=$(usex exif) -DWITH_EXIV2=$(usex exiv2) - -DWITH_AVCODEC=$(usex ffmpeg) -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) + -DWITH_INOTIFY=1 -DWITH_JS=$(usex javascript) - -DWITH_LASTFM=$(usex lastfm) + -DWITH_LASTFM=NO -DWITH_MAGIC=$(usex magic) -DWITH_MATROSKA=$(usex matroska) -DWITH_MYSQL=$(usex mysql) -DWITH_SYSTEMD=$(usex systemd) -DWITH_TAGLIB=$(usex taglib) - -DWITH_INOTIFY=1 ) cmake_src_configure @@ -82,7 +86,7 @@ src_install() { } pkg_postinst() { - if use mysql ; then + if use mysql; then elog "Gerbera has been built with MySQL support and needs" elog "to be configured before being started. By default" elog "SQLite will be used." diff --git a/net-misc/gerbera/gerbera-1.8.2.ebuild b/net-misc/gerbera/gerbera-1.8.2.ebuild deleted file mode 100644 index d68414c66ed6..000000000000 --- a/net-misc/gerbera/gerbera-1.8.2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake linux-info - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S="${WORKDIR}/${P}" -fi - -DESCRIPTION="UPnP Media Server" -HOMEPAGE="https://gerbera.io" - -LICENSE="GPL-2" -SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" - -DEPEND=" - acct-user/gerbera - >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] - >=dev-db/sqlite-3 - dev-libs/spdlog:= - dev-libs/pugixml - dev-libs/libfmt:0= - mysql? ( dev-db/mysql-connector-c ) - javascript? ( dev-lang/duktape:= ) - taglib? ( >=media-libs/taglib-1.11 ) - lastfm? ( >=media-libs/lastfmlib-0.4 ) - exif? ( media-libs/libexif ) - exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - curl? ( net-misc/curl ) - magic? ( sys-apps/file ) - matroska? ( media-libs/libmatroska ) - sys-apps/util-linux - sys-libs/zlib - virtual/libiconv -" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~INOTIFY_USER" - -src_configure() { - local mycmakeargs=( - -DWITH_CURL="$(usex curl)" \ - -DWITH_DEBUG="$(usex debug)" \ - -DWITH_EXIF="$(usex exif)" \ - -DWITH_EXIV2="$(usex exiv2)" \ - -DWITH_AVCODEC="$(usex ffmpeg)" \ - -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \ - -DWITH_JS="$(usex javascript)" \ - -DWITH_LASTFM="$(usex lastfm)" \ - -DWITH_MAGIC="$(usex magic)" \ - -DWITH_MATROSKA="$(usex matroska)" \ - -DWITH_MYSQL="$(usex mysql)" - -DWITH_SYSTEMD="$(usex systemd)" \ - -DWITH_TAGLIB="$(usex taglib)" \ - -DWITH_INOTIFY=1 - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}" - newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}" - - insinto /etc/${PN} - newins "${FILESDIR}/${PN}-1.3.0.config" config.xml - fperms 0640 /etc/${PN}/config.xml - fowners root:gerbera /etc/${PN}/config.xml -} - -pkg_postinst() { - if use mysql ; then - elog "Gerbera has been built with MySQL support and needs" - elog "to be configured before being started. By default" - elog "SQLite will be used." - fi -} diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild index d68414c66ed6..2691f65a7c4f 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake linux-info @@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" inherit git-r3 else - SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/${P}" fi @@ -19,50 +19,51 @@ HOMEPAGE="https://gerbera.io" LICENSE="GPL-2" SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript +magic +matroska mysql systemd +taglib" -DEPEND=" +RDEPEND=" acct-user/gerbera - >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] - >=dev-db/sqlite-3 - dev-libs/spdlog:= + dev-db/sqlite + dev-libs/libebml:= + dev-libs/libfmt:= dev-libs/pugixml - dev-libs/libfmt:0= - mysql? ( dev-db/mysql-connector-c ) - javascript? ( dev-lang/duktape:= ) - taglib? ( >=media-libs/taglib-1.11 ) - lastfm? ( >=media-libs/lastfmlib-0.4 ) - exif? ( media-libs/libexif ) - exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - curl? ( net-misc/curl ) - magic? ( sys-apps/file ) - matroska? ( media-libs/libmatroska ) + dev-libs/spdlog:= + >=net-libs/libupnp-1.14.12:=[ipv6(+),reuseaddr,-blocking-tcp] sys-apps/util-linux sys-libs/zlib virtual/libiconv + curl? ( net-misc/curl ) + exif? ( media-libs/libexif ) + exiv2? ( media-gfx/exiv2:= ) + ffmpeg? ( media-video/ffmpeg:= ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + javascript? ( dev-lang/duktape:= ) + magic? ( sys-apps/file ) + matroska? ( media-libs/libmatroska:= ) + mysql? ( dev-db/mysql-connector-c ) + taglib? ( media-libs/taglib ) " -RDEPEND="${DEPEND}" + +DEPEND="${RDEPEND}" CONFIG_CHECK="~INOTIFY_USER" src_configure() { local mycmakeargs=( - -DWITH_CURL="$(usex curl)" \ - -DWITH_DEBUG="$(usex debug)" \ - -DWITH_EXIF="$(usex exif)" \ - -DWITH_EXIV2="$(usex exiv2)" \ - -DWITH_AVCODEC="$(usex ffmpeg)" \ - -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \ - -DWITH_JS="$(usex javascript)" \ - -DWITH_LASTFM="$(usex lastfm)" \ - -DWITH_MAGIC="$(usex magic)" \ - -DWITH_MATROSKA="$(usex matroska)" \ - -DWITH_MYSQL="$(usex mysql)" - -DWITH_SYSTEMD="$(usex systemd)" \ - -DWITH_TAGLIB="$(usex taglib)" \ + -DWITH_AVCODEC=$(usex ffmpeg) + -DWITH_CURL=$(usex curl) + -DWITH_DEBUG=$(usex debug) + -DWITH_EXIF=$(usex exif) + -DWITH_EXIV2=$(usex exiv2) + -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) -DWITH_INOTIFY=1 + -DWITH_JS=$(usex javascript) + -DWITH_LASTFM=NO + -DWITH_MAGIC=$(usex magic) + -DWITH_MATROSKA=$(usex matroska) + -DWITH_MYSQL=$(usex mysql) + -DWITH_SYSTEMD=$(usex systemd) + -DWITH_TAGLIB=$(usex taglib) ) cmake_src_configure @@ -71,17 +72,17 @@ src_configure() { src_install() { cmake_src_install - newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}" - newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}" + newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN} + newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN} insinto /etc/${PN} - newins "${FILESDIR}/${PN}-1.3.0.config" config.xml + newins "${FILESDIR}"/${PN}-1.3.0.config config.xml fperms 0640 /etc/${PN}/config.xml fowners root:gerbera /etc/${PN}/config.xml } pkg_postinst() { - if use mysql ; then + if use mysql; then elog "Gerbera has been built with MySQL support and needs" elog "to be configured before being started. By default" elog "SQLite will be used." diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml index 2196a8fa3a35..cf60dbc1bf7e 100644 --- a/net-misc/gerbera/metadata.xml +++ b/net-misc/gerbera/metadata.xml @@ -1,17 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription> - <use> - <flag name="curl">Support HTTP media sources (e.g. internet radio)</flag> - <flag name="exiv2">Use <pkg>media-gfx/exiv2</pkg> to extract EXIF information</flag> - <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag> - <flag name="lastfm">Enable last.fm support</flag> - <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag> - <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata</flag> - </use> - <upstream> - <remote-id type="github">gerbera/gerbera</remote-id> - </upstream> + <!-- maintainer-needed --> + <longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription> + <use> + <flag name="curl">Support HTTP media sources (e.g. internet radio)</flag> + <flag name="exiv2">Use <pkg>media-gfx/exiv2</pkg> to extract EXIF information</flag> + <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag> + <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag> + <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata</flag> + </use> + <upstream> + <remote-id type="github">gerbera/gerbera</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/getdate/files/getdate-1.2-clang16.patch b/net-misc/getdate/files/getdate-1.2-clang16.patch new file mode 100644 index 000000000000..7b578e37bb26 --- /dev/null +++ b/net-misc/getdate/files/getdate-1.2-clang16.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/874501 +--- a/getdate.c ++++ b/getdate.c +@@ -250,3 +250,3 @@ + +-main (int argc, char *argv[]) ++int main (int argc, char *argv[]) + { diff --git a/net-misc/getdate/getdate-1.2-r2.ebuild b/net-misc/getdate/getdate-1.2-r2.ebuild index 21c21d60ba86..d06f3c2be84e 100644 --- a/net-misc/getdate/getdate-1.2-r2.ebuild +++ b/net-misc/getdate/getdate-1.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,6 +21,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${PN}-glibc-2.31.patch" + "${FILESDIR}/${P}-clang16.patch" ) src_prepare() { diff --git a/net-misc/gnome-connections/Manifest b/net-misc/gnome-connections/Manifest new file mode 100644 index 000000000000..a6090987ecdf --- /dev/null +++ b/net-misc/gnome-connections/Manifest @@ -0,0 +1 @@ +DIST gnome-connections-45.0.tar.xz 4009108 BLAKE2B 10f3f98df6fd6a090c226192229c3eeba7d707c1a109eaaf3a6427b9eadd375a136da9f089b904b66d9e94f27b9b6f982f1c0392ac9eb00936f46450b48bfbf6 SHA512 a2c5f8cd3076fc370cdd34f909bd02d07b9391a606133a46d17a5fd92644ee971c7dddb09674d660a462b9f0d99e83ef2b595095173274e54bbdc0f8411fffe4 diff --git a/net-misc/gnome-connections/gnome-connections-45.0-r2.ebuild b/net-misc/gnome-connections/gnome-connections-45.0-r2.ebuild new file mode 100644 index 000000000000..de42f7e3e3c6 --- /dev/null +++ b/net-misc/gnome-connections/gnome-connections-45.0-r2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson vala xdg + +DESCRIPTION="A remote desktop client for the GNOME desktop environment" +HOMEPAGE="https://gitlab.gnome.org/GNOME/connections" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~loong" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/gobject-introspection + >=dev-libs/glib-2.50:2 + >=x11-libs/gtk+-3.22:3[introspection] + >=sys-fs/fuse-3.9.1 + >=net-libs/gtk-vnc-0.4.4[pulseaudio,vala] + >=gui-libs/libhandy-1.6.0:1[vala] + >=dev-libs/libxml2-2.7.8 + app-crypt/libsecret[vala] + + >=net-misc/freerdp-2.0.0:2= +" +RDEPEND="${DEPEND}" +BDEPEND=" + $(vala_depend) + dev-libs/glib + dev-util/glib-utils + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig + + test? ( + dev-libs/appstream-glib + dev-util/desktop-file-utils + ) +" + +src_prepare() { + default + vala_setup +} + +src_configure() { + local emesonargs=( + -Dprofile=default + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/net-misc/gnome-connections/metadata.xml b/net-misc/gnome-connections/metadata.xml new file mode 100644 index 000000000000..ca87166729c7 --- /dev/null +++ b/net-misc/gnome-connections/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/connections</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest deleted file mode 100644 index 1b2bf9cb3706..000000000000 --- a/net-misc/gnome-online-miners/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-online-miners-3.34.0.tar.xz 272324 BLAKE2B 3718b649cd08a03a7e974607975992f4779926c08cbdeb724c314aa431f161599f6d74c2114dc1bd6fa0896781bf07df024f4a53a3f2fadaf1e9d849f8054e5a SHA512 bfcdd7f11607663eda491314c34a9b50f2885f6fb39e7c9e68a77927bbcc326979fb8900ab5dfac1494ac575dbf0e3f3b7459ec3f38cb1eb8961158e3fe44464 diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild deleted file mode 100644 index 0330845cb380..000000000000 --- a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="Crawls through your online content" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="flickr" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" - -# libgdata[gnome] needed for goa support -RDEPEND=" - >=app-misc/tracker-2:0= - >=dev-libs/glib-2.35.1:2 - >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] - media-libs/grilo:0.3 - >=net-libs/gnome-online-accounts-3.13.3:= - >=net-libs/libgfbgraph-0.2.2:0.2 - >=net-libs/libzapojit-0.0.2 - flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -src_configure() { - gnome2_src_configure \ - $(use_enable flickr) \ - --disable-static \ - --enable-facebook \ - --enable-google \ - --enable-media-server \ - --enable-owncloud \ - --enable-windows-live -} diff --git a/net-misc/gnome-online-miners/metadata.xml b/net-misc/gnome-online-miners/metadata.xml deleted file mode 100644 index 70b5901d6ce5..000000000000 --- a/net-misc/gnome-online-miners/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="flickr">Enable Flickr support</flag> -</use> -</pkgmetadata> diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest index e484471b0dc1..8535efbfff27 100644 --- a/net-misc/gnome-remote-desktop/Manifest +++ b/net-misc/gnome-remote-desktop/Manifest @@ -1,2 +1 @@ -DIST gnome-remote-desktop-40.1.tar.xz 63980 BLAKE2B 6f5ebe7f00e2038f88740a994ee90f55b7f3ce6e4ea8898b7326d2f36dea2d89c721cffd253f92cde388b1273ad8d086242bfadaa86e4b87361844b3a3bca5b7 SHA512 39116afa16256820a69e020b71de5458fc5da8154bc8255d2157ff56fc679c39f4608f790d74eb4a0cb10cc61bd27d4172cfc547582100cab5b897644a700ee3 -DIST gnome-remote-desktop-40.2.tar.xz 65400 BLAKE2B 47be88529c365e5ab72b225aae1ad0fdca4748c39476ea1251db8f317e7fc25e90acf0b908f64f0a2111e0c59d8a213ede6945fe75151cdca6ab2cf8a77351cc SHA512 f39feb5b4b89d1c504a07c5dcf5962a4340cfc45c70d806a2b6739512ca80671dd8b7928a6dad83165dbba50b17c7961e329ecae0dd59f3f57f4fcf0f7969466 +DIST gnome-remote-desktop-45.1.tar.xz 213504 BLAKE2B 78dd348cf15b677f52ca327ac824b2bd5276d53e7b6578bef0634e00e81993c1a1802ee861a31527af03351e6640cc9fcdc5f86fd44f20ec56138837dd9f05b6 SHA512 4572fefa03ee433783c822cf0405bd17b645f3aa08e8d88c04165859fd30643d612e5d7516a64ded8c1a0d2007026d6df877930b5ea127d7e1e939c1bb60f379 diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.1.ebuild deleted file mode 100644 index 700f245f2103..000000000000 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg - -DESCRIPTION="Remote desktop daemon for GNOME using pipewire" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+rdp +vnc" -REQUIRED_USE="|| ( rdp vnc )" -RESTRICT="test" # Tests run xvfb-run directly - -DEPEND=" - x11-libs/cairo - >=dev-libs/glib-2.68:2 - >=media-video/pipewire-0.3.0:0/0.3 - app-crypt/libsecret - x11-libs/libnotify - rdp? ( - >=net-misc/freerdp-2.3:=[server] - >=sys-fs/fuse-3.9.1 - >=x11-libs/libxkbcommon-1.0.0 - ) - vnc? ( - net-libs/libvncserver - ) -" -RDEPEND="${DEPEND} - x11-wm/mutter[screencast] -" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/gdbus-codegen - dev-util/glib-utils - virtual/pkgconfig -" - -src_prepare() { - default - sed -i -e '/systemd_dep/d' meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_use rdp) - $(meson_use vnc) - -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-r1.ebuild index 8df01c6524eb..61bc7a28c45c 100644 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2.ebuild +++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-45.1-r1.ebuild @@ -1,30 +1,39 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) -inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg +EAPI=8 + +inherit gnome.org gnome2-utils meson systemd xdg DESCRIPTION="Remote desktop daemon for GNOME using pipewire" HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64" -IUSE="+rdp +vnc" -REQUIRED_USE="|| ( rdp vnc )" +KEYWORDS="~amd64 ~arm64" +IUSE="aac doc +rdp systemd +vnc" +REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )" RESTRICT="test" # Tests run xvfb-run directly DEPEND=" x11-libs/cairo + x11-libs/libdrm + >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 - >=media-video/pipewire-0.3.0:0/0.3 - app-crypt/libsecret + >=dev-libs/libei-1.0.901 x11-libs/libnotify + app-crypt/libsecret + >=media-video/pipewire-0.3.49:= + app-crypt/tpm2-tss:= rdp? ( - >=net-misc/freerdp-2.3:=[server] - >=sys-fs/fuse-3.9.1 + >=media-libs/nv-codec-headers-11.1.5.0 + >=net-misc/freerdp-2.10.0:2=[server] + >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 + + aac? ( + media-libs/fdk-aac:= + ) ) vnc? ( net-libs/libvncserver @@ -34,22 +43,24 @@ RDEPEND="${DEPEND} x11-wm/mutter[screencast] " BDEPEND=" - ${PYTHON_DEPS} + dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig + doc? ( + app-text/asciidoc + ) " -src_prepare() { - default - sed -i -e '/systemd_dep/d' meson.build || die -} - src_configure() { local emesonargs=( + $(meson_use doc man) + $(meson_use aac fdk_aac) $(meson_use rdp) $(meson_use vnc) + $(meson_use systemd) -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" + -Dtests=false # Tests run xvfb-run directly ) meson_src_configure } diff --git a/net-misc/gnome-remote-desktop/metadata.xml b/net-misc/gnome-remote-desktop/metadata.xml index f453528b934f..a1a029905dfd 100644 --- a/net-misc/gnome-remote-desktop/metadata.xml +++ b/net-misc/gnome-remote-desktop/metadata.xml @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="aac">Use <pkg>media-libs/fdk-aac</pkg> for audio output redirection of the RDP backend</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gnome-remote-desktop</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest index 5d6d58439126..91cce69b657b 100644 --- a/net-misc/gns3-gui/Manifest +++ b/net-misc/gns3-gui/Manifest @@ -1,2 +1,2 @@ -DIST gns3-gui-2.2.25.tar.gz 5043324 BLAKE2B bd9a04dc91a35b80cdbf8fee7e8bed98ae5d4d8dd887e8902c3f8d2b08c405b9d6ec707fc9b0202053b1409b3326d9b09be7804cb85d0f14eb90af2db13ea5cd SHA512 d70806efa9251e8be419d838ebf0361bcc7d1ca923962dc4c9b364032772e37f2ae9d646b5e6b96b6c54cc7100dc3b1814eb85270d09e21c1f2679a4a3afda53 -DIST gns3-gui-2.2.26.tar.gz 5043462 BLAKE2B 119c7ff65fde1624e6742215d23976137e13c90761314cbb8cfb5abb3772e5893c21b600acc5dca6e9874654088a3ebbdfb123d41acd9f1ee456c57f87aa3bdc SHA512 b994ae1b844956e4303b23688b71ccb70c2bc1d0803a316ad489fd5de61b7adbf126693e551618f6cf3c15c2404dadb02344e4821fe7e52a2ec8c42293e9a8f6 +DIST gns3-gui-2.2.46.tar.gz 5058596 BLAKE2B 1b3b84d3677c815bfe950f0fe2bf618bca12d1c854bf9d6328611feb41344b952a8579716db936a6010bbe4db772e9d3cc2e57b365b2e66264b9fd4dee576c4b SHA512 25ca6a9bf626182ae16662bc7d9f571c14b107c4036ccba0b4c2d562aa4f26fd7af23765de53e4159f67e48632548d3148dbb9c9ae19bffbef50c48a10f85a01 +DIST gns3-gui-2.2.47.tar.gz 5064818 BLAKE2B 8d8fea47e6ed0256e8e22659a8eed24dc18183b44d4ca3c1a863b0c8f5e45471b5ffc82c267ad18f4e97f5587f0a615586364ed26a340e409f11b74375916c3f SHA512 e9637d0789c7ee656a8fd366be150e70d9045240fff962b30b9beff5b11dd22a3ede9565c18b02f934ad610bf05687fce7a7dbd6c8f5cea6cf22db2c1871781e diff --git a/net-misc/gns3-gui/gns3-gui-2.2.25.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.46.ebuild index aa3b783123d6..9ced99155546 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.25.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.46.ebuild @@ -1,27 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{11..12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 virtualx xdg DESCRIPTION="Graphical Network Simulator" -HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui" +HOMEPAGE="https://www.gns3.com https://github.com/GNS3/gns3-gui" SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" #net-misc/gns3-server version should always match gns3-gui version RDEPEND=" - >=dev-python/distro-1.6.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}] + >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.8[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.34.0[${PYTHON_USEDEP}] + >=dev-python/truststore-0.8.0[${PYTHON_USEDEP}] ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}] dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] " diff --git a/net-misc/gns3-gui/gns3-gui-2.2.26.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.47.ebuild index aa3b783123d6..7779fe5303e9 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.26.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.47.ebuild @@ -1,27 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{11..12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 virtualx xdg DESCRIPTION="Graphical Network Simulator" -HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui" +HOMEPAGE="https://www.gns3.com https://github.com/GNS3/gns3-gui" SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" #net-misc/gns3-server version should always match gns3-gui version RDEPEND=" - >=dev-python/distro-1.6.0[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}] + >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.22.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.8[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-2.1.1[${PYTHON_USEDEP}] + >=dev-python/truststore-0.9.1[${PYTHON_USEDEP}] ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}] dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] " diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest index 60149d0c7250..13c92ff78744 100644 --- a/net-misc/gns3-server/Manifest +++ b/net-misc/gns3-server/Manifest @@ -1,2 +1,2 @@ -DIST gns3-server-2.2.25.tar.gz 10229566 BLAKE2B 73827940698335dcf9ef6d4b6c4c88b162852ec493f8ea05eebbdca20df3c84e4f5ee2ac218ed72755350df2f0e27cfc6cbd34b541e9e5bc0eada2fcb8e266ac SHA512 c7fa163eedc064fd266100658d7d2084ab0c542280d6689938a06943534df320f905c0e46175580bd3792218369936c55f9e135a12577f8a4b7eb86ac8fe9739 -DIST gns3-server-2.2.26.tar.gz 10230386 BLAKE2B 9b9de96cc22aeb1da92a48c9c04a0bf0271f3e47909bf09de76f357d727a4dfc2aa8181c47713192a9c88e55497ca3d8577f34635bf1f2f353387008c1bd13b7 SHA512 80a3e2939374b7a8f7e961f565b16d8a7575414793a3772235b41eadc184d02543ddae18122e90a2602ca51ce24513e1add17b1e7732f44c108daf3d6bc9dc7a +DIST gns3-server-2.2.46.tar.gz 10745825 BLAKE2B 280c16e76a73b638ea66c1c8a674a0e11eab3f0dee612b40c480d604244bf6e78d32c79f6a4587a95b88ce601ba3911672b6402831fce8c7a721465dcdd2da9d SHA512 6f7e52c0f1fcdbb0af7963cfaf1cd17c7d6af36e1ac89b4b2e725c14ff17d1560a50d286ea351ab2649560c09dcac62b35add9492f06c5068010129751b0848e +DIST gns3-server-2.2.47.tar.gz 10850105 BLAKE2B c83cdf6495ddc4997347ff41416a684b6c6a516eefa6d1811e8855a4954edbace53aefb817ddce8cb08526c798b02fad11b5bb3b70a076be97a4a1ab92dd48b7 SHA512 1634e813feaaef9b7d44256a34c58fc1e339fce2d57dc41d7ff8ba86c2ed3999f19063754d5bc928d99319f3d2e8949a72ebbe087f82a8dc56dfbd6ba06f8bd4 diff --git a/net-misc/gns3-server/gns3-server-2.2.25.ebuild b/net-misc/gns3-server/gns3-server-2.2.46.ebuild index 9d91356deda2..3a083dab53e0 100644 --- a/net-misc/gns3-server/gns3-server-2.2.25.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.46.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{11..12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 optfeature systemd DESCRIPTION="GNS3 server to asynchronously manage emulators" -HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server" +HOMEPAGE="https://www.gns3.com https://github.com/GNS3/gns3-server" SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" @@ -17,19 +17,21 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" + acct-group/gns3 + acct-user/gns3 app-emulation/dynamips - >=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}] - >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}] + >=dev-python/aiofiles-23.2.1[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.9.3[${PYTHON_USEDEP}] >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] - >=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}] - >=dev-python/distro-1.6.0[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}] - >=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}] + >=dev-python/async-timeout-4.0.3[${PYTHON_USEDEP}] + >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.3[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.8[${PYTHON_USEDEP}] + >=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-1.34.0[${PYTHON_USEDEP}] net-misc/ubridge - sys-apps/busybox + sys-apps/busybox[static] " BDEPEND=" test? ( @@ -44,18 +46,13 @@ src_prepare() { # newer python packages are fine sed -i -e 's/[<>=].*//' requirements.txt || die - - # Remove Pre-built busybox binary - rm gns3server/compute/docker/resources/bin/busybox || die } python_install() { distutils-r1_python_install systemd_dounit init/gns3.service.systemd - - mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die - ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die + newinitd init/gns3.service.openrc gns3server } pkg_postinst() { @@ -63,7 +60,7 @@ pkg_postinst() { elog "" optfeature "QEMU Support" "app-emulation/qemu" optfeature "Virtualbox Support" "app-emulation/virtualbox" - optfeature "Docker Support" "app-emulation/docker" + optfeature "Docker Support" "app-containers/docker" optfeature "Wireshark Support" "net-analyzer/wireshark" elog "" elog "The following packages are currently unsupported:" diff --git a/net-misc/gns3-server/gns3-server-2.2.26.ebuild b/net-misc/gns3-server/gns3-server-2.2.47.ebuild index 9d91356deda2..59b7d69fdc36 100644 --- a/net-misc/gns3-server/gns3-server-2.2.26.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.47.ebuild @@ -1,35 +1,39 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{11..12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 optfeature systemd DESCRIPTION="GNS3 server to asynchronously manage emulators" -HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server" +HOMEPAGE="https://www.gns3.com https://github.com/GNS3/gns3-server" SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" RDEPEND=" + acct-group/gns3 + acct-user/gns3 app-emulation/dynamips - >=dev-python/aiofiles-0.7.0[${PYTHON_USEDEP}] - >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}] + >=dev-python/aiofiles-23.2.1[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.9.5[${PYTHON_USEDEP}] >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] - >=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}] - >=dev-python/distro-1.6.0[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0.1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] - >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}] - >=dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}] - >=dev-python/sentry-sdk-1.3.1[${PYTHON_USEDEP}] + >=dev-python/async-timeout-4.0.3[${PYTHON_USEDEP}] + >=dev-python/distro-1.9.0[${PYTHON_USEDEP}] + >=dev-python/jinja-3.1.4[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.22.0[${PYTHON_USEDEP}] + >=dev-python/platformdirs-2.4.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.8[${PYTHON_USEDEP}] + >=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}] + >=dev-python/sentry-sdk-2.1.1[${PYTHON_USEDEP}] + >=dev-python/truststore-0.9.1[${PYTHON_USEDEP}] net-misc/ubridge - sys-apps/busybox + sys-apps/busybox[static] " BDEPEND=" test? ( @@ -44,18 +48,13 @@ src_prepare() { # newer python packages are fine sed -i -e 's/[<>=].*//' requirements.txt || die - - # Remove Pre-built busybox binary - rm gns3server/compute/docker/resources/bin/busybox || die } python_install() { distutils-r1_python_install systemd_dounit init/gns3.service.systemd - - mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die - ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die + newinitd init/gns3.service.openrc gns3server } pkg_postinst() { @@ -63,7 +62,7 @@ pkg_postinst() { elog "" optfeature "QEMU Support" "app-emulation/qemu" optfeature "Virtualbox Support" "app-emulation/virtualbox" - optfeature "Docker Support" "app-emulation/docker" + optfeature "Docker Support" "app-containers/docker" optfeature "Wireshark Support" "net-analyzer/wireshark" elog "" elog "The following packages are currently unsupported:" diff --git a/net-misc/gofish/gofish-1.2-r1.ebuild b/net-misc/gofish/gofish-1.2-r2.ebuild index ab81b6ae1b8b..6cfd91bf172d 100644 --- a/net-misc/gofish/gofish-1.2-r1.ebuild +++ b/net-misc/gofish/gofish-1.2-r2.ebuild @@ -1,20 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Gofish gopher server" HOMEPAGE="http://gofish.sourceforge.net" -SRC_URI="mirror://sourceforge/gofish/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/gofish/${P}.tar.gz" S="${WORKDIR}/${PN}" LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc ~x86" +# See bug #905314 for bsd-games blocker. RDEPEND=" acct-group/gopher acct-user/gopher + !games-misc/bsd-games " DOCS=( Configure_GoFish ) diff --git a/net-misc/gofish/metadata.xml b/net-misc/gofish/metadata.xml index ef42757472da..d6dbc3c876ea 100644 --- a/net-misc/gofish/metadata.xml +++ b/net-misc/gofish/metadata.xml @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>matt@offtopica.uk</email> - <name>Matt Smith</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <maintainer type="person"> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> </maintainer> <upstream> <remote-id type="sourceforge">gofish</remote-id> diff --git a/net-misc/grdesktop/Manifest b/net-misc/grdesktop/Manifest deleted file mode 100644 index ac6b20fc9343..000000000000 --- a/net-misc/grdesktop/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST grdesktop-0.23-patchset.tar.xz 17912 BLAKE2B 0252f3c7fa1779df05d1f7d4315e18e4cce5d4acf69e2a914805d072de25730206bf906b9fe767b777fdfde701ce033563f96087bdc2d85d11271b835947f029 SHA512 0327a17b48ff0f5eb8ab88c683f91deec612cf202cabcde3f150b4be5b19afb612a83ff9dcb965b29899a35c214a7334603263b42c0d2605b48209018845b04b -DIST grdesktop-0.23.tar.gz 299914 BLAKE2B 0a00c721c8d962dd1ad885f4d85130486b3ad9973d21817068f4147ade03d59a2d13dd5e5b26376a0415120521e283a20d79627b62a8bcca15fb2f0213c05bc4 SHA512 a0993d7589d0b22b26535de0cf562604c89ce580fede076c15d8d7f2e7a3bd2fd5ec0a35c6a8ec07fcc8f53a0635381fefe9c2e67d9ff75cec7af47cdd25732f diff --git a/net-misc/grdesktop/grdesktop-0.23-r2.ebuild b/net-misc/grdesktop/grdesktop-0.23-r2.ebuild deleted file mode 100644 index 15edde92c9a0..000000000000 --- a/net-misc/grdesktop/grdesktop-0.23-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -inherit gnome2 - -DESCRIPTION="Gtk3 frontend for rdesktop" -HOMEPAGE="http://www.nongnu.org/grdesktop/" -SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="" - -RDEPEND=" - >=x11-libs/gtk+-3.21.4:3 - net-misc/rdesktop -" -DEPEND="${RDEPEND} - app-text/rarian - virtual/pkgconfig -" - -PATCHES=( - # Patches from debian: - # Correct icon path. See bug #50295. - # Fix compilation with format-security, bug #517662 - # gsettings, gtk3 port, gcc10 compat, etc - "${WORKDIR}"/grdesktop-0.23+d040330-7 -) - -src_prepare() { - gnome2_src_prepare - # Fix desktop file validation after debian patchset (it removes Action line, but not the action itself - remove that here) - sed -e '/Desktop Action Full/,+1d' -i grdesktop.desktop -} - -src_configure() { - gnome2_src_configure \ - --with-keymap-path=/usr/share/rdesktop/keymaps/ -} diff --git a/net-misc/grdesktop/metadata.xml b/net-misc/grdesktop/metadata.xml deleted file mode 100644 index 7b343b06be8a..000000000000 --- a/net-misc/grdesktop/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest index 4725836d3a39..32c918f3481c 100644 --- a/net-misc/grive/Manifest +++ b/net-misc/grive/Manifest @@ -1,2 +1 @@ -DIST grive-0.5.1.tar.gz 169929 BLAKE2B a8f8fc9f3bcf019b7b713178f6a39ca6c62f6531054329d4ff8ac6fbfdfa5579f9e51aa8f9c493b90005194c3ab77934575e541c0986404a32e807c5c87c4cfd SHA512 609837fc93ad78d143dcb4d1f558743d413c887fec2e9aaac81edd58549b812db859aab5ce7f664f06564779cff4bae32d43529e47fcc36640f1a9b52c5b5888 -DIST grive-0.5.2_pre20200205.tar.gz 170384 BLAKE2B dac8d75bdefe0c206f443010093e73b34ae8257a5ced87917cca240fb7134a6aac8e5f018eeb7bf7dec46d5043e144efb2c9586ca2b5ff55a1d0fe022f72675a SHA512 d1058649d2a3dce773eab53b1704c5dd8bb1998089099ed9c3bacdaa5d3f995fa08c1b2c2b723bbce0efa2c9c04729d97aade6df6130da32f975e2bb45f339e6 +DIST grive-0.5.2_pre20211128.tar.gz 171412 BLAKE2B 62e966917959ed4306a7a787948bc1533cca6a5521f262450658c81f6dc88cb7914df6c3a8271d87fdc189ff74ada421f76c38bd9b89157cd27ef0f2ba531e67 SHA512 33e6a382f979a0a7a6c4236bce1779bbda0b3817b7d2f1750f6759350d7de79bd999bd0f4f7cb72fd32586683053ef1d21dc830403a9d1225b6e9a3408f830fa diff --git a/net-misc/grive/files/299.patch b/net-misc/grive/files/299.patch deleted file mode 100644 index a5e030f2534a..000000000000 --- a/net-misc/grive/files/299.patch +++ /dev/null @@ -1,113 +0,0 @@ -From b4d6ac055f8f16ac735a70036243bc4ea2334039 Mon Sep 17 00:00:00 2001 -From: Giuseppe Corbelli <corbelligiuseppe@mesdan.it> -Date: Tue, 14 Jan 2020 11:50:20 +0100 -Subject: [PATCH] [SymbolInfo.cc] Support compilation with binutils >= 2.33.1 - on Debian. - -bfd_get_section_vma macro was removed. -bfd_section_size changed signature. - -See inline comment for details. ---- - libgrive/src/bfd/SymbolInfo.cc | 35 ++++++++++++++++++++-------------- - 1 file changed, 21 insertions(+), 14 deletions(-) - -diff --git a/libgrive/src/bfd/SymbolInfo.cc b/libgrive/src/bfd/SymbolInfo.cc -index 5876cc0..cdb5d7c 100644 ---- a/libgrive/src/bfd/SymbolInfo.cc -+++ b/libgrive/src/bfd/SymbolInfo.cc -@@ -49,9 +49,9 @@ SymbolInfo::SymbolInfo( ) - m_impl->m_bfd = 0 ; - m_impl->m_symbols = 0 ; - m_impl->m_symbol_count = 0 ; -- -+ - bfd_init( ) ; -- -+ - // opening itself - bfd *b = bfd_openr( "/proc/self/exe", 0 ) ; - if ( b == NULL ) -@@ -60,13 +60,13 @@ SymbolInfo::SymbolInfo( ) - << bfd_errmsg( bfd_get_error() ) << std::endl ; - return ; - } -- -+ - if ( bfd_check_format( b, bfd_archive ) ) - { - bfd_close( b ) ; - return ; - } -- -+ - char **matching ; - if ( !bfd_check_format_matches( b, bfd_object, &matching ) ) - { -@@ -78,7 +78,7 @@ SymbolInfo::SymbolInfo( ) - std::cerr << bfd_get_filename( b ) << ": Matching formats: " ; - for ( char **p = matching ; *p != 0 ; p++ ) - std::cerr << " " << *p ; -- -+ - std::cerr << std::endl ; - std::free( matching ) ; - } -@@ -107,7 +107,7 @@ struct SymbolInfo::BacktraceInfo - const char *m_func_name ; - unsigned int m_lineno ; - unsigned int m_is_found ; -- -+ - static void Callback( bfd *abfd, asection *section, void* addr ) ; - } ; - -@@ -117,17 +117,24 @@ void SymbolInfo::BacktraceInfo::Callback( bfd *abfd, asection *section, - BacktraceInfo *info = (BacktraceInfo *)data ; - if ((section->flags & SEC_ALLOC) == 0) - return ; -- -- bfd_vma vma = bfd_get_section_vma(abfd, section); -- -+ -+ // bfd_get_section_vma works up to 7b1cfbcf1a27951fb1b3a212995075dd6fdf985b, -+ // removed in 7c13bc8c91abf291f0206b6608b31955c5ea70d8 (binutils 2.33.1 or so) -+ // so it's substituted by its implementation to avoid checking for binutils -+ // version (which at least on Debian SID it's not that easy because the -+ // version.h is not included with the official package) -+ bfd_vma vma = section->vma; -+ - unsigned long address = (unsigned long)(info->m_addr); - if ( address < vma ) - return; -- -- bfd_size_type size = bfd_section_size(abfd, section); -+ -+ // bfd_section_size changed between the two objects described above, -+ // same rationale applies -+ bfd_size_type size = section->size; - if ( address > (vma + size)) - return ; -- -+ - const SymbolInfo *pthis = info->m_pthis ; - info->m_is_found = bfd_find_nearest_line( abfd, section, - pthis->m_impl->m_symbols, -@@ -149,7 +156,7 @@ void SymbolInfo::PrintTrace( void *addr, std::ostream& os, std::size_t idx ) - { - this, addr, 0, 0, 0, false - } ; -- -+ - Dl_info sym ; - bfd_map_over_sections( m_impl->m_bfd, - &SymbolInfo::BacktraceInfo::Callback, -@@ -165,7 +172,7 @@ if ( btinfo.m_is_found ) - filename.erase( pos, std::strlen( SRC_DIR ) ) ; - #endif - os << "#" << idx << " " << addr << " " -- << filename << ":" << btinfo.m_lineno -+ << filename << ":" << btinfo.m_lineno - << " " - << (btinfo.m_func_name != 0 ? Demangle(btinfo.m_func_name) : "" ) - << std::endl ; diff --git a/net-misc/grive/files/363.patch b/net-misc/grive/files/363.patch new file mode 100644 index 000000000000..c3e57460f386 --- /dev/null +++ b/net-misc/grive/files/363.patch @@ -0,0 +1,21 @@ +From 3cf1c058a3e61deb370dde36024a106a213ab2c6 Mon Sep 17 00:00:00 2001 +From: Christoph Junghans <junghans@gentoo.org> +Date: Sat, 21 May 2022 09:36:52 -0600 +Subject: [PATCH] Syncer.hh: fix build with gcc-12 + +--- + libgrive/src/base/Syncer.hh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libgrive/src/base/Syncer.hh b/libgrive/src/base/Syncer.hh +index 237b8949..9b6ae4f7 100644 +--- a/libgrive/src/base/Syncer.hh ++++ b/libgrive/src/base/Syncer.hh +@@ -21,6 +21,7 @@ + + #include "util/FileSystem.hh" + ++#include <memory> + #include <string> + #include <vector> + #include <iosfwd> diff --git a/net-misc/grive/grive-0.5.1-r1.ebuild b/net-misc/grive/grive-0.5.1-r1.ebuild deleted file mode 100644 index 323a194002ef..000000000000 --- a/net-misc/grive/grive-0.5.1-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git" -else - inherit vcs-snapshot - SRC_URI="https://github.com/vitalif/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="An open source Linux client for Google Drive" -HOMEPAGE="https://github.com/vitalif/grive2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-libs/boost:= - dev-libs/expat - >=dev-libs/json-c-0.11-r1:= - dev-libs/libgcrypt:0= - dev-libs/yajl - || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) - sys-libs/binutils-libs:0= - sys-libs/glibc -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}/299.patch" ) diff --git a/net-misc/grive/grive-0.5.2_pre20200205.ebuild b/net-misc/grive/grive-0.5.2_pre20211128-r1.ebuild index fdaaf8147839..c656088b952d 100644 --- a/net-misc/grive/grive-0.5.2_pre20200205.ebuild +++ b/net-misc/grive/grive-0.5.2_pre20211128-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git" else inherit vcs-snapshot - COMMIT="ffb744a59b1496f86ec71581345355715d846f7b" + COMMIT="6901fbb169eaae51acb61778760ba2ac019675ae" SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" fi @@ -33,3 +33,5 @@ RDEPEND=" sys-libs/glibc " DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/363.patch" ) diff --git a/net-misc/grive/metadata.xml b/net-misc/grive/metadata.xml index ec69db578ff8..cd02838d531c 100644 --- a/net-misc/grive/metadata.xml +++ b/net-misc/grive/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>junghans@gentoo.org</email> - <name>Christoph Junghans</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">Grive/grive</remote-id> </upstream> diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest index 3acb881dc9b4..2db805085bc1 100644 --- a/net-misc/gsasl/Manifest +++ b/net-misc/gsasl/Manifest @@ -1 +1,3 @@ -DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c1a31dba1edc632de78a529fc2acf2b5e4df3a7bc9a721c6bdb819aade85d65245dbb14405413b933220454a79 SHA512 8b1dc87e85dbfd0255b3b43c4b7f9c2e896cb03efe4cd4af86393b62fd193665aae4ce59e66db736722e32babfcea6d4f6ddd3c5f069dcc4210f7e9531043e4a +DIST gsasl-2.0.1.tar.gz 3279632 BLAKE2B a25d121a5043455ed827a6bdc776c10d467a49b4dc6b73d2f4b08fecbf1ca5f423ffdcfd39e0d2bf71f724ed8302ffd8acda4fda3ef10ceadece60509ac73500 SHA512 01c6f6bd9f986c942a25b89fee0052aef8c10bf914ead29983abdf0cc8fcaa7223fd9d9eeafb4be07e4bc318f087f6f6258facaaeb7f83bca8de512406812be5 +DIST gsasl-2.2.0.tar.gz 3290469 BLAKE2B ca57765f299939a6f9457aac3d51132f7b5a0e2f0788523349083a65e5de0b780573000c378e0fff844cf9f882239e7ff6e0b520ae66a60f3e928c16d6f74857 SHA512 0ae318a8616fe675e9718a3f04f33731034f9a7ba03d83ccb1a72954ded54ced35dc7c7e173fdcb6fa0f0813f8891c6cbcedf8bf70b37d00b8ec512eb9f07f5f +DIST gsasl-2.2.1.tar.gz 3344807 BLAKE2B 3bb1f7dee8510c19215dc8fdc5efd8e53318ab967b4d4af9e48474857a112b0e08872016a5c5bcbd6b1b340f29fbd77623efc6c41a1f87fb734623e2f173e1bf SHA512 161b8a315862a79807ba067c5ae840175b0d8ec14806aceafc3f92d571713b94d1b8c1a5b188c47bf94a79b9a1f133065f96b087baa5e7f360ae7fb8336381ab diff --git a/net-misc/gsasl/gsasl-1.10.0.ebuild b/net-misc/gsasl/gsasl-1.10.0.ebuild deleted file mode 100644 index 62338661d0ef..000000000000 --- a/net-misc/gsasl/gsasl-1.10.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -# NOTE: Please bump with net-libs/libgsasl -DESCRIPTION="The GNU SASL client, server, and library" -HOMEPAGE="https://www.gnu.org/software/gsasl/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -# Before giving keywords, please check https://www.gnu.org/software/gsasl/ to see -# if it's a stable release or not! -KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads" - -DEPEND=" - gcrypt? ( dev-libs/libgcrypt:0= ) - idn? ( net-dns/libidn:= ) - kerberos? ( virtual/krb5 ) - nls? ( >=sys-devel/gettext-0.18.1 ) - ntlm? ( net-libs/libntlm ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -i -e '/gl_WARN_ADD(\[-Werror/d' \ - -e 's/ -Werror//' configure.ac || die - sed -i -e 's/ -Werror//' lib/configure.ac || die - - eautoreconf -} - -src_configure() { - local krb5_impl - - if use kerberos; then - krb5_impl="--with-gssapi-impl=" - - # These are the two providers of virtual/krb5 - if has_version app-crypt/mit-krb5; then - krb5_impl+="mit" - else - krb5_impl+="heimdal" - fi - fi - - econf \ - --enable-client \ - --enable-server \ - --disable-valgrind-tests \ - --disable-rpath \ - --without-libshishi \ - --without-libgss \ - --disable-kerberos_v5 \ - $(use_enable kerberos gssapi) \ - ${krb5_impl} \ - $(use_enable kerberos gs2) \ - $(use_with gcrypt libgcrypt) \ - $(use_enable nls) \ - $(use_with idn stringprep) \ - $(use_enable ntlm) \ - $(use_with ntlm libntlm) \ - $(use_enable static-libs static) \ - $(use_enable threads) -} - -src_install() { - default - - if ! use static-libs; then - rm -f "${ED}"/usr/lib*/lib*.la || die - fi - - doman doc/gsasl.1 doc/man/*.3 - - if use doc; then - dodoc doc/*.{eps,ps,pdf} - docinto html - dodoc doc/*.html - docinto examples - dodoc examples/*.c - fi -} diff --git a/net-misc/gsasl/gsasl-2.0.1-r2.ebuild b/net-misc/gsasl/gsasl-2.0.1-r2.ebuild new file mode 100644 index 000000000000..79cabd639fd3 --- /dev/null +++ b/net-misc/gsasl/gsasl-2.0.1-r2.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="The GNU SASL client, server, and library" +HOMEPAGE="https://www.gnu.org/software/gsasl/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see +# if it's a stable release or not! +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs" +REQUIRED_USE="|| ( client server )" + +DEPEND=" + !net-libs/libgsasl + sys-libs/readline:= + gcrypt? ( dev-libs/libgcrypt:= ) + gnutls? ( net-libs/gnutls:= ) + idn? ( net-dns/libidn:= ) + kerberos? ( >=net-libs/libgssglue-0.5-r1 ) + nls? ( >=sys-devel/gettext-0.18.1 ) + ntlm? ( >=net-libs/libntlm-0.3.5 ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i \ + -e '/gl_WARN_ADD(\[-Werror/d' \ + -e 's/ -Werror//' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + local krb5_impl="--with-gssapi-impl=no" + + # See https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/ + if use kerberos; then + krb5_impl="--with-gssapi-impl=gssglue" + fi + + local myeconfargs=( + --disable-valgrind-tests + --disable-rpath + + --with-packager="Gentoo Linux" + --with-packager-bug-reports="https://bugs.gentoo.org" + --with-packager-version="r${PR}" + + $(use_enable client) + $(use_enable server) + + $(use_enable kerberos gssapi) + ${krb5_impl} + $(use_enable kerberos gs2) + + $(use_with gcrypt libgcrypt) + $(use_with gnutls) + $(use_enable nls) + $(use_with idn stringprep) + $(use_enable ntlm) + $(use_enable static-libs static) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if ! use static-libs; then + rm -f "${ED}"/usr/lib*/lib*.la || die + fi + + doman doc/gsasl.1 doc/man/*.3 +} + +pkg_postinst() { + ewarn "For USE=kerberos, ${PN} now uses libgssglue to allow choosing" + ewarn "the Kerberos implementation at runtime." + elog "See https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/" + elog "for more details." +} diff --git a/net-misc/gsasl/gsasl-2.0.1.ebuild b/net-misc/gsasl/gsasl-2.0.1.ebuild new file mode 100644 index 000000000000..d8b4db232b4c --- /dev/null +++ b/net-misc/gsasl/gsasl-2.0.1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="The GNU SASL client, server, and library" +HOMEPAGE="https://www.gnu.org/software/gsasl/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see +# if it's a stable release or not! +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs" +REQUIRED_USE="|| ( client server )" + +DEPEND=" + !net-libs/libgsasl + gcrypt? ( dev-libs/libgcrypt:0= ) + gnutls? ( net-libs/gnutls:= ) + idn? ( net-dns/libidn:= ) + kerberos? ( virtual/krb5 ) + nls? ( >=sys-devel/gettext-0.18.1 ) + ntlm? ( >=net-libs/libntlm-0.3.5 ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i \ + -e '/gl_WARN_ADD(\[-Werror/d' \ + -e 's/ -Werror//' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + local krb5_impl="--with-gssapi-impl=no" + + # Could do net-libs/libgssglue in future? + if use kerberos; then + krb5_impl="--with-gssapi-impl=" + + # These are the two providers of virtual/krb5 + if has_version app-crypt/mit-krb5; then + krb5_impl+="mit" + else + krb5_impl+="heimdal" + fi + fi + + local myeconfargs=( + --disable-valgrind-tests + --disable-rpath + + --with-packager-bug-reports="https://bugs.gentoo.org" + --with-packager-version="r${PR}" + --with-packager="Gentoo Linux" + + $(use_enable client) + $(use_enable server) + + $(use_enable kerberos gssapi) + ${krb5_impl} + $(use_enable kerberos gs2) + + $(use_with gcrypt libgcrypt) + $(use_with gnutls) + $(use_enable nls) + $(use_with idn stringprep) + $(use_enable ntlm) + $(use_enable static-libs static) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if ! use static-libs; then + rm -f "${ED}"/usr/lib*/lib*.la || die + fi + + doman doc/gsasl.1 doc/man/*.3 +} diff --git a/net-misc/gsasl/gsasl-2.2.0.ebuild b/net-misc/gsasl/gsasl-2.2.0.ebuild new file mode 100644 index 000000000000..17ade65eed5d --- /dev/null +++ b/net-misc/gsasl/gsasl-2.2.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="The GNU SASL client, server, and library" +HOMEPAGE="https://www.gnu.org/software/gsasl/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see +# if it's a stable release or not! +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs" +REQUIRED_USE="|| ( client server )" + +DEPEND=" + !net-libs/libgsasl + sys-libs/readline:= + gcrypt? ( dev-libs/libgcrypt:= ) + gnutls? ( net-libs/gnutls:= ) + idn? ( net-dns/libidn:= ) + kerberos? ( >=net-libs/libgssglue-0.5-r1 ) + nls? ( >=sys-devel/gettext-0.18.1 ) + ntlm? ( >=net-libs/libntlm-0.3.5 ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i \ + -e '/gl_WARN_ADD(\[-Werror/d' \ + -e 's/ -Werror//' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + local krb5_impl="--with-gssapi-impl=no" + + # See https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/ + if use kerberos; then + krb5_impl="--with-gssapi-impl=gssglue" + fi + + local myeconfargs=( + --disable-valgrind-tests + --disable-rpath + + --with-packager="Gentoo Linux" + --with-packager-bug-reports="https://bugs.gentoo.org" + --with-packager-version="r${PR}" + + $(use_enable client) + $(use_enable server) + + $(use_enable kerberos gssapi) + ${krb5_impl} + $(use_enable kerberos gs2) + + $(use_with gcrypt libgcrypt) + $(use_with gnutls) + $(use_enable nls) + $(use_with idn stringprep) + $(use_enable ntlm) + $(use_enable static-libs static) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if ! use static-libs; then + rm -f "${ED}"/usr/lib*/lib*.la || die + fi + + doman doc/gsasl.1 doc/man/*.3 +} + +pkg_postinst() { + ewarn "For USE=kerberos, ${PN} now uses libgssglue to allow choosing" + ewarn "the Kerberos implementation at runtime." + elog "See https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/" + elog "for more details." +} diff --git a/net-misc/gsasl/gsasl-2.2.1.ebuild b/net-misc/gsasl/gsasl-2.2.1.ebuild new file mode 100644 index 000000000000..35e903c6643b --- /dev/null +++ b/net-misc/gsasl/gsasl-2.2.1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="The GNU SASL client, server, and library" +HOMEPAGE="https://www.gnu.org/software/gsasl/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see +# if it's a stable release or not! +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs" +REQUIRED_USE="|| ( client server )" + +DEPEND=" + !net-libs/libgsasl + sys-libs/readline:= + gcrypt? ( dev-libs/libgcrypt:= ) + gnutls? ( net-libs/gnutls:= ) + idn? ( net-dns/libidn:= ) + kerberos? ( >=net-libs/libgssglue-0.5-r1 ) + nls? ( >=sys-devel/gettext-0.18.1 ) + ntlm? ( >=net-libs/libntlm-0.3.5 ) +" +RDEPEND="${DEPEND}" + +QA_CONFIG_IMPL_DECL_SKIP=( + # gnulib FPs + unreachable + MIN + alignof + static_assert +) + +src_prepare() { + default + + sed -i \ + -e '/gl_WARN_ADD(\[-Werror/d' \ + -e 's/ -Werror//' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + local krb5_impl="--with-gssapi-impl=no" + + # See https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/ + if use kerberos; then + krb5_impl="--with-gssapi-impl=gssglue" + fi + + local myeconfargs=( + --disable-gcc-warnings + --disable-valgrind-tests + --disable-rpath + + --with-packager="Gentoo Linux" + --with-packager-bug-reports="https://bugs.gentoo.org" + --with-packager-version="r${PR}" + + $(use_enable client) + $(use_enable server) + + $(use_enable kerberos gssapi) + ${krb5_impl} + $(use_enable kerberos gs2) + + $(use_with gcrypt libgcrypt) + $(use_with gnutls) + $(use_enable nls) + $(use_with idn stringprep) + $(use_enable ntlm) + $(use_enable static-libs static) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + if ! use static-libs; then + rm -f "${ED}"/usr/lib*/lib*.la || die + fi + + doman doc/gsasl.1 doc/man/*.3 +} + +pkg_postinst() { + ewarn "For USE=kerberos, ${PN} now uses libgssglue to allow choosing" + ewarn "the Kerberos implementation at runtime." + elog "See https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/" + elog "for more details." +} diff --git a/net-misc/gsasl/metadata.xml b/net-misc/gsasl/metadata.xml index 3f80b3d7f44a..165c218f0155 100644 --- a/net-misc/gsasl/metadata.xml +++ b/net-misc/gsasl/metadata.xml @@ -2,12 +2,21 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> -<use> -<flag name="gcrypt"> - Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto -</flag> -<flag name="ntlm"> - Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg> -</flag> -</use> + <use> + <flag name="client"> + Build client component + </flag> + <flag name="gcrypt"> + Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto + </flag> + <flag name="ntlm"> + Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg> + </flag> + <flag name="server"> + Build server component + </flag> + </use> + <upstream> + <remote-id type="gitlab">gsasl/gsasl</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest deleted file mode 100644 index b939cc4aba91..000000000000 --- a/net-misc/gsutil/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gsutil_4.60.tar.gz 4012900 BLAKE2B d3d1b57d5b0d42b1b454944efe8d62855b665d3772817c636568ef49c79ae2c566ef08c4c6e1bd3c9829471561865b64b3beec8d3911d6766748337aa1b1fc3e SHA512 18ab701cbb60513d66e8b96ced28cfe65dc0f210435fb5ffbcbfab3541ec7ed051db726e52239796d9579d0928953f610064279a3ee1e5b5c06cec963493804c -DIST gsutil_4.68.tar.gz 4459899 BLAKE2B 9855d379ba0483f1a33e4e05546444ff492c72d241ff0e5ca4f6c798c91b0c8d729247bf5fbaa39c411eb7a7e3f1fa701363898b903ba11c1bdf41c7e969c44d SHA512 b4af124808f34b5c0aa1d31b6d1bdbdeb451d39a246d4f2876ef664b6b485cdc5dc63bc3992ca4b7b33c72a00fc5119b931625e2c3230970bf0baa6389715e39 diff --git a/net-misc/gsutil/files/dummy.boto b/net-misc/gsutil/files/dummy.boto deleted file mode 100644 index 93e9dd2f8c77..000000000000 --- a/net-misc/gsutil/files/dummy.boto +++ /dev/null @@ -1,6 +0,0 @@ -# dummy .boto file for testing - -[Credentials] -gs_oauth2_refresh_token = 1/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - -[GSUtil] diff --git a/net-misc/gsutil/files/gsutil-4.41-tests.patch b/net-misc/gsutil/files/gsutil-4.41-tests.patch deleted file mode 100644 index 9b4a0bf509ae..000000000000 --- a/net-misc/gsutil/files/gsutil-4.41-tests.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/gslib/third_party/storage_apitools/storage_v1_client.py b/gslib/third_party/storage_apitools/storage_v1_client.py -index b8162310..933082e9 100644 ---- a/gslib/third_party/storage_apitools/storage_v1_client.py -+++ b/gslib/third_party/storage_apitools/storage_v1_client.py -@@ -64,8 +64,7 @@ class StorageV1(base_api.BaseApiClient): - log_request=log_request, log_response=log_response, - credentials_args=credentials_args, - default_global_params=default_global_params, -- additional_http_headers=additional_http_headers, -- response_encoding=response_encoding) -+ additional_http_headers=additional_http_headers) - self._version = version - self.bucketAccessControls = self.BucketAccessControlsService(self) - self.buckets = self.BucketsService(self) diff --git a/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch b/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch deleted file mode 100644 index 5a9b601604da..000000000000 --- a/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- gsutil.orig/gslib/vendored/boto/tests/integration/s3/mock_storage_service.py 2020-04-10 13:26:12.000000000 -0700 -+++ gsutil/gslib/vendored/boto/tests/integration/s3/mock_storage_service.py 2020-05-07 11:11:14.971631528 -0700 -@@ -30,13 +30,11 @@ - import boto - import base64 - import re --import six - from hashlib import md5 - - from boto.utils import compute_md5 - from boto.utils import find_matching_headers - from boto.utils import merge_headers_by_name --from boto.utils import write_to_fd - from boto.s3.prefix import Prefix --from boto.compat import six -+import six - -@@ -90,14 +88,12 @@ - torrent=NOT_IMPL, - version_id=NOT_IMPL, - res_download_handler=NOT_IMPL): -- data = six.ensure_binary(self.data) -- write_to_fd(fp, data) -+ fp.write(six.ensure_str(self.data, errors='replace')) - - def get_file(self, fp, headers=NOT_IMPL, cb=NOT_IMPL, num_cb=NOT_IMPL, - torrent=NOT_IMPL, version_id=NOT_IMPL, - override_num_retries=NOT_IMPL): -- data = six.ensure_binary(self.data) -- write_to_fd(fp, data) -+ fp.write(self.data) - - def _handle_headers(self, headers): - if not headers: -@@ -284,9 +280,6 @@ - else: - return '<Subresource/>' - -- def get_tags(self): -- return [] -- - def new_key(self, key_name=None): - mock_key = MockKey(self, key_name) - self.keys[key_name] = mock_key diff --git a/net-misc/gsutil/files/gsutil-4.50-tests.patch b/net-misc/gsutil/files/gsutil-4.50-tests.patch deleted file mode 100644 index 757f1f4ed4d5..000000000000 --- a/net-misc/gsutil/files/gsutil-4.50-tests.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/gslib/boto_translation.py b/gslib/boto_translation.py -index 0af2e663..7d2f549f 100644 ---- a/gslib/boto_translation.py -+++ b/gslib/boto_translation.py -@@ -1457,7 +1457,8 @@ class BotoTranslation(CloudApi): - # TODO: Define tags-related methods on storage_uri objects. In the - # meantime, we invoke the underlying bucket's methods directly. - try: -- boto_tags = bucket_uri.get_bucket().get_tags() -+ bucket = bucket_uri.get_bucket() -+ boto_tags = bucket.get_tags() if hasattr(bucket, 'get_tags') else [] - cloud_api_bucket.labels = ( - LabelTranslation.BotoTagsToMessage(boto_tags)) - except boto.exception.StorageResponseError as e: -diff --git a/gslib/tests/test_naming.py b/gslib/tests/test_naming.py -index d91cda04..6b44719f 100644 ---- a/gslib/tests/test_naming.py -+++ b/gslib/tests/test_naming.py -@@ -36,6 +36,7 @@ from __future__ import unicode_literals - - import gzip - import os -+import unittest - - import six - -@@ -504,6 +505,7 @@ class GsutilNamingTests(testcase.GsUtilUnitTestCase): - self.assertEqual(1, len(actual)) - self.assertEqual('/obj', actual[0].root_object.name) - -+ @unittest.skip('test appears to be flakey') - def testCopyingCompressedFileToBucket(self): - """Tests copying one file with compression to a bucket.""" - src_file = self.CreateTempFile(contents=b'plaintext', file_name='f2.txt') -diff --git a/gslib/tests/testcase/unit_testcase.py b/gslib/tests/testcase/unit_testcase.py -index b25352b6..c958f670 100644 ---- a/gslib/tests/testcase/unit_testcase.py -+++ b/gslib/tests/testcase/unit_testcase.py -@@ -27,7 +27,6 @@ import tempfile - import six - - import boto --from boto.utils import get_utf8able_str - from gslib import project_id - from gslib import wildcard_iterator - from gslib.boto_translation import BotoTranslation -@@ -157,8 +156,8 @@ class GsUtilUnitTestCase(base.GsUtilTestCase): - stderr = sys.stderr.buffer.read() - [six.ensure_text(string) for string in self.accumulated_stderr] - [six.ensure_text(string) for string in self.accumulated_stdout] -- stdout = six.ensure_text(get_utf8able_str(stdout)) -- stderr = six.ensure_text(get_utf8able_str(stderr)) -+ stdout = six.ensure_text(six.ensure_str(stdout)) -+ stderr = six.ensure_text(six.ensure_str(stderr)) - stdout += ''.join(self.accumulated_stdout) - stderr += ''.join(self.accumulated_stderr) - _AttemptToCloseSysFd(sys.stdout) diff --git a/net-misc/gsutil/gsutil-4.60-r1.ebuild b/net-misc/gsutil/gsutil-4.60-r1.ebuild deleted file mode 100644 index 7cd73f33bffb..000000000000 --- a/net-misc/gsutil/gsutil-4.60-r1.ebuild +++ /dev/null @@ -1,98 +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 distutils-r1 - -DESCRIPTION="command line tool for interacting with cloud storage services" -HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil" -SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="${PYTHON_DEPS} - >=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}] - >=dev-python/boto-2.49.0[${PYTHON_USEDEP}] - >=dev-python/crcmod-1.7[${PYTHON_USEDEP}] - >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}] - >=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}] - >=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}] - >=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.18[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] - >=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}] - >=dev-python/six-1.12.0[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/gsutil-4.41-tests.patch" - "${FILESDIR}/gsutil-4.50-boto-tests.patch" - "${FILESDIR}/gsutil-4.50-tests.patch" -) - -S="${WORKDIR}/${PN}" - -DOCS=( README.md CHANGES.md ) - -# needs to talk to Google to run tests -RESTRICT+=" test" - -python_prepare_all() { - distutils-r1_python_prepare_all - - # NB: We don't delete all of boto/ because the tests are imported by the - # production code. The same reason we can't delete gslib/tests/. We can - # delete the main boto library and use the system version though. - rm -r gslib/vendored/boto/boto || die - - # failes to compile with py3 - rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die - - # monotonic is only used by bundled fasteners that we do not install - sed -i \ - -e 's/mock==/mock>=/' \ - -e '/monotonic/d' \ - setup.py || die - # Sanity check we didn't miss any updates. - grep '==' setup.py && die "Need to update version requirements" - - # For debugging purposes, temporarily uncomment this in order to - # show hidden tracebacks. - #sed -e 's/^ except OSError as e:$/&\n raise/' \ - # -e 's/def _HandleUnknownFailure(e):/&\n raise/' \ - # -i gslib/__main__.py || die - - # create_bucket raised ResponseNotReady - sed -i \ - -e 's/test_cp_unwritable_tracker_file/_&/' \ - -e 's/test_cp_unwritable_tracker_file_download/_&/' \ - gslib/tests/test_cp.py || die - - sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \ - gslib/commands/test.py || die - - # IOError: close() called during concurrent operation on the same file object. - sed -i -e 's/sys.stderr.close()/#&/' \ - gslib/tests/testcase/unit_testcase.py || die -} - -python_compile() { - 2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \ - gslib/vendored/boto/tests || die "2to3 on boto tests failed" - - distutils-r1_python_compile -} - -python_test() { - BOTO_CONFIG="${FILESDIR}/dummy.boto" \ - "${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}" -} diff --git a/net-misc/gsutil/gsutil-4.68.ebuild b/net-misc/gsutil/gsutil-4.68.ebuild deleted file mode 100644 index e907dba14782..000000000000 --- a/net-misc/gsutil/gsutil-4.68.ebuild +++ /dev/null @@ -1,97 +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 distutils-r1 - -DESCRIPTION="command line tool for interacting with cloud storage services" -HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil" -SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="${PYTHON_DEPS} - >=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}] - >=dev-python/boto-2.49.0[${PYTHON_USEDEP}] - >=dev-python/crcmod-1.7[${PYTHON_USEDEP}] - >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}] - >=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}] - >=dev-python/google-apitools-0.5.32[${PYTHON_USEDEP}] - >=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.18[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] - >=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}] - >=dev-python/six-1.12.0[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/gsutil-4.41-tests.patch" - "${FILESDIR}/gsutil-4.50-boto-tests.patch" - "${FILESDIR}/gsutil-4.50-tests.patch" -) - -S="${WORKDIR}/${PN}" - -DOCS=( README.md CHANGES.md ) - -# Needs to talk to Google to run tests. -RESTRICT+=" test" - -python_prepare_all() { - distutils-r1_python_prepare_all - - # NB: We don't delete all of boto/ because the tests are imported by the - # production code. The same reason we can't delete gslib/tests/. We can - # delete the main boto library and use the system version though. - rm -r gslib/vendored/boto/boto test || die - - # Fails to compile with py3. - rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die - - # monotonic is only used by bundled fasteners that we do not install. - sed -i \ - -e 's/mock==/mock>=/' \ - -e '/monotonic/d' \ - setup.py || die - # Sanity check we didn't miss any updates. - grep '==' setup.py && die "Need to update version requirements" - - # For debugging purposes, temporarily uncomment this in order to - # show hidden tracebacks. - #sed -e 's/^ except OSError as e:$/&\n raise/' \ - # -e 's/def _HandleUnknownFailure(e):/&\n raise/' \ - # -i gslib/__main__.py || die - - # create_bucket raised ResponseNotReady. - sed -i \ - -e 's/test_cp_unwritable_tracker_file/_&/' \ - -e 's/test_cp_unwritable_tracker_file_download/_&/' \ - gslib/tests/test_cp.py || die - - sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \ - gslib/commands/test.py || die - - # IOError: close() called during concurrent operation on the same file object. - sed -i -e 's/sys.stderr.close()/#&/' \ - gslib/tests/testcase/unit_testcase.py || die -} - -python_compile() { - 2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \ - gslib/vendored/boto/tests || die "2to3 on boto tests failed" - - distutils-r1_python_compile -} - -python_test() { - BOTO_CONFIG="${FILESDIR}/dummy.boto" \ - "${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}" -} diff --git a/net-misc/gsutil/metadata.xml b/net-misc/gsutil/metadata.xml deleted file mode 100644 index 7ce240e8eff8..000000000000 --- a/net-misc/gsutil/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>chutzpah@gentoo.org</email> - <name>Patrick McLean</name> - </maintainer> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - <name>Zac Medico</name> - </maintainer> - <upstream> - <remote-id type="google-code">gsutil</remote-id> - <remote-id type="github">GoogleCloudPlatform/gsutil</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest index 6f3024f9ef86..351b1bc20a53 100644 --- a/net-misc/gupnp-tools/Manifest +++ b/net-misc/gupnp-tools/Manifest @@ -1 +1 @@ -DIST gupnp-tools-0.10.1.tar.xz 178164 BLAKE2B 86554b223aec9064e1bb9277e8ff609258868247b82aada52d98259c8a0e6f748f61a41ab8bbea41f8f73b386252ff2922406572782e627c8a70a8cd7ce22842 SHA512 bb95ac0b18e23e89074adec0a5e4e87aa43f98d7b3d9e173f4045bc64e542d5a311dde54a069b3485ebd0f4cdf36c813b5c84f5b9734c5361c4221617bd59a25 +DIST gupnp-tools-0.12.1.tar.xz 183488 BLAKE2B e54d4468c2f3fb6cb98a4cd8c7c43d2816dc0fcaf9b3b0ce612ee431a5a3e337b5202c31ce9513cff5784513b6a605f7b923acf9ddca6283b65064f1f7ee91e8 SHA512 9b07e16c92c5d71fe268c4af4ea36ef950046b076ae345cd548c2619530a43b271548ffdb67503e736fa43fa0303de16fc4f07b13e8c7569625251e2d81d1365 diff --git a/net-misc/gupnp-tools/gupnp-tools-0.10.1.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.12.1.ebuild index 9a5f47d59ef6..5ac85ab5e5d2 100644 --- a/net-misc/gupnp-tools/gupnp-tools-0.10.1.ebuild +++ b/net-misc/gupnp-tools/gupnp-tools-0.12.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit gnome.org meson xdg DESCRIPTION="Collection of developer-oriented UPnP tools" @@ -12,12 +12,12 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" RDEPEND=" - >=net-libs/gssdp-1.2.0:= - >=net-libs/gupnp-1.2.0:= - >=net-libs/libsoup-2.42:2.4 + >=net-libs/gssdp-1.6.2:1.6= + >=net-libs/gupnp-1.6.0:1.6= + >=net-libs/libsoup-3.0:3.0 >=net-libs/gupnp-av-0.5.5:0= >=x11-libs/gtk+-3.10:3 - >=dev-libs/glib-2.24:2 + >=dev-libs/glib-2.68:2 >=dev-libs/libxml2-2.4:2 x11-libs/gtksourceview:4 " @@ -27,6 +27,13 @@ BDEPEND=" virtual/pkgconfig " +src_prepare() { + default + + # This makes sense for upstream but not for us downstream, bug #907384. + sed -i -e '/-Werror=deprecated-declarations/d' meson.build || die +} + src_configure() { local emesonargs=( -Dav-tools=true diff --git a/net-misc/gupnp-tools/metadata.xml b/net-misc/gupnp-tools/metadata.xml index 7b343b06be8a..28d3dca7e75b 100644 --- a/net-misc/gupnp-tools/metadata.xml +++ b/net-misc/gupnp-tools/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gupnp-tools</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/gvrpcd/metadata.xml b/net-misc/gvrpcd/metadata.xml index 0ff04871e75a..c10db277fd54 100644 --- a/net-misc/gvrpcd/metadata.xml +++ b/net-misc/gvrpcd/metadata.xml @@ -5,11 +5,7 @@ <email>azamat.hackimov@gmail.com</email> <name>Azamat H. Hackimov</name> </maintainer> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> -<maintainer type="project" proxied="proxy"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/net-misc/haeredes/Manifest b/net-misc/haeredes/Manifest index 249f6bb8f49d..9faf252a3817 100644 --- a/net-misc/haeredes/Manifest +++ b/net-misc/haeredes/Manifest @@ -1 +1,2 @@ -DIST haeredes-0.5.2.tar.gz 20443 BLAKE2B e64926917c98b6b2a5d8dae698dbebf1f38359e0b017b4a47e0ade053d52a826c6400ce76b16f505b6f4654889a74d107e9c312e2c5209ac49ddc7c13a52664b SHA512 81e4e53f8bd3284af5a51f0e1b89ab28aa79111f8e448d0bc35b4010974faa5e719783171fe8b66620dccdef1985fe9dde9f607b00d6535c7bb0650579617fd5 +DIST haeredes-0.5.3.tar.gz 20357 BLAKE2B 54be7f0a4bd09cd85c0cf7b2baed589258749bb2b05764ca61d4656e6c19832dfbd249d425e6a9ede30fc8f5711392491adca4c025014dc6e05c6009108c98dd SHA512 3bf0a14b45f9c3c929cc97559ca03a3df1c542196daf574917171dacd3c47117a908ed0c849b3527bd2dcf8f99a15228845d3a8ae97e051f707162d62cfccc13 +DIST haeredes-0.5.4.tar.gz 20360 BLAKE2B b3dae1cf300fc871d9a3b49431000e9e6100142d55d7a7ea06be069ef58353a59622b7b40dabf48e1bde2e9fcab20825b5e00d9d8c8856ab81a4c713c0f33475 SHA512 6ed9b4d69a42c661a771746a584d76602988626064b239e90405e8a7930dc7495075e20b51560556b4d10ddf2df422a0e7d56fab5e424242ec3792743701a5ce diff --git a/net-misc/haeredes/haeredes-0.5.2.ebuild b/net-misc/haeredes/haeredes-0.5.3.ebuild index dcc46bef668f..15a105ba5401 100644 --- a/net-misc/haeredes/haeredes-0.5.2.ebuild +++ b/net-misc/haeredes/haeredes-0.5.3.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CABAL_FEATURES="test-suite" inherit haskell-cabal DESCRIPTION="Confirm delegation of NS and MX records" -HOMEPAGE="http://michael.orlitzky.com/code/haeredes.xhtml" +HOMEPAGE="https://michael.orlitzky.com/code/haeredes.xhtml" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="" # The test suite requires network access. @@ -22,10 +22,10 @@ RDEPEND=">=dev-haskell/cmdargs-0.10:= >=dev-haskell/dns-1.4:= >=dev-haskell/iproute-1.2:= >=dev-haskell/parallel-io-0.3:= - >=dev-lang/ghc-7.6.2:= + >=dev-lang/ghc-9.0.0:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.16.0 + >=dev-haskell/cabal-3.0.0 test? ( >=dev-haskell/doctest-0.9 >=dev-haskell/filemanip-0.3.6 dev-util/shelltestrunner ) diff --git a/net-misc/haeredes/haeredes-0.5.4.ebuild b/net-misc/haeredes/haeredes-0.5.4.ebuild new file mode 100644 index 000000000000..e9ac2f7ab731 --- /dev/null +++ b/net-misc/haeredes/haeredes-0.5.4.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CABAL_FEATURES="test-suite" +inherit haskell-cabal + +DESCRIPTION="Confirm delegation of NS and MX records" +HOMEPAGE="https://michael.orlitzky.com/code/haeredes.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + +# The test suite requires network access. +RESTRICT="test" + +RDEPEND=">=dev-haskell/cmdargs-0.10:= + >=dev-haskell/dns-1.4:= + >=dev-haskell/iproute-1.2:= + >=dev-haskell/parallel-io-0.3:= + >=dev-lang/ghc-9.0.0:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-3.0.0 + test? ( >=dev-haskell/doctest-0.9 + >=dev-haskell/filemanip-0.3.6 + dev-util/shelltestrunner ) +" + +src_install() { + haskell-cabal_src_install + doman "${S}/doc/man1/${PN}.1" +} diff --git a/net-misc/hashcash/files/hashcash-1.22-clang16.patch b/net-misc/hashcash/files/hashcash-1.22-clang16.patch new file mode 100644 index 000000000000..1ec15b110555 --- /dev/null +++ b/net-misc/hashcash/files/hashcash-1.22-clang16.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/870466 +--- a/sha1.h ++++ b/sha1.h +@@ -59,4 +59,7 @@ + void SHA1_Init_With_IV( SHA1_ctx*, const byte[ SHA1_DIGEST_BYTES ] ); + ++void SHA1_Transform( word32 H[ SHA1_DIGEST_WORDS ], ++ const byte M[ SHA1_INPUT_BYTES ] ); ++ + #endif + diff --git a/net-misc/hashcash/hashcash-1.22-r2.ebuild b/net-misc/hashcash/hashcash-1.22-r2.ebuild index e29148642453..c52b23016a1b 100644 --- a/net-misc/hashcash/hashcash-1.22-r2.ebuild +++ b/net-misc/hashcash/hashcash-1.22-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -13,20 +13,30 @@ LICENSE="CPL-1.0" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch +) + src_prepare() { default + sed -i -e "/COPT_GENERIC = -O3/d" Makefile || die } src_compile() { - emake CC="$(tc-getCC)" generic + tc-export AR CC + + emake generic } src_install() { dobin hashcash doman hashcash.1 + dodoc CHANGELOG - insinto /usr/share/doc/${PF}/examples - doins contrib/hashcash-{request,sendmail{,.txt}} \ - contrib/hashfork.{c,py,txt} + + docinto examples + dodoc contrib/hashcash-{request,sendmail{,.txt}} contrib/hashfork.{c,py,txt} + + docompress -x /usr/share/doc/${PF}/examples } diff --git a/net-misc/hashcash/metadata.xml b/net-misc/hashcash/metadata.xml index 3ea1da8fe807..bef24d2c2337 100644 --- a/net-misc/hashcash/metadata.xml +++ b/net-misc/hashcash/metadata.xml @@ -1,12 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>ngg@ngg.hu</email> - <name>Gergely Nagy</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/hath/Manifest b/net-misc/hath/Manifest index c3ea3a427f3f..de4f86033bcc 100644 --- a/net-misc/hath/Manifest +++ b/net-misc/hath/Manifest @@ -1 +1,2 @@ -DIST hath-0.5.0.tar.gz 31258 BLAKE2B 496832d35cf88ccda3a8ce394a1b4b17f673d1873c44d6ee112881e1da0431a069feb3612a3d1c00b14005690f4a71898d3755635b4bc444f23fbe23fe6f95b5 SHA512 877b95f3b608315f2dd393097747918f20499ae9ffaf69d26f7113639458cb30425a63ecb358cb2cab7f543c658aa7297f3f54b0f500dffe3bda3c9e63647a99 +DIST hath-0.5.7.tar.gz 31087 BLAKE2B 2449872bae187dfd67ab94da7df55bec7a9735bcd85a9dbd96ef7ce1afdd3f83ed666eb02b6de54719ba32b96de75ff168136f07760023ea2db7bb55bf51f70e SHA512 daa1ae22e8a01f63db6849c7c9e90917051644c681848c66bbd5cb7178326a125868c9f52d506bb5561595fd1bb8b16ae922b91e1be44ccb86e346fc1730a6dd +DIST hath-0.5.8.tar.gz 31116 BLAKE2B 3d6f91b1e286bbb88feab5f30a9164f19ae0bb886d39dd8c945b4c2b61106b6d9a233511b704b96c15176e9152f63d891f72a3ad11b64c8043e03c20ff705365 SHA512 c5a50e8c976f92f5d8fa3750098850f50198a3a07342e6fa3a2fa2faeb5e850780aef17d648781379a419671011f24749a0f24ca5c9d98cd48c94b0e5c871017 diff --git a/net-misc/hath/hath-0.5.0.ebuild b/net-misc/hath/hath-0.5.7.ebuild index 3f2f323611b6..fca6453aa95e 100644 --- a/net-misc/hath/hath-0.5.0.ebuild +++ b/net-misc/hath/hath-0.5.7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # ebuild generated by hackport 0.6 @@ -9,12 +9,12 @@ CABAL_FEATURES="test-suite" inherit haskell-cabal DESCRIPTION="Hath manipulates network blocks in CIDR notation" -HOMEPAGE="http://michael.orlitzky.com/code/hath.xhtml" +HOMEPAGE="https://michael.orlitzky.com/code/hath.xhtml" SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="" RDEPEND=">=dev-haskell/cmdargs-0.10:= @@ -22,10 +22,10 @@ RDEPEND=">=dev-haskell/cmdargs-0.10:= >=dev-haskell/tasty-0.8:= >=dev-haskell/tasty-hunit-0.8:= >=dev-haskell/tasty-quickcheck-0.8.1:= - >=dev-lang/ghc-8.0.1:= + >=dev-lang/ghc-9.0.0:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.0.0 + >=dev-haskell/cabal-3.0.0.0 test? ( dev-util/shelltestrunner ) " diff --git a/net-misc/hath/hath-0.5.8.ebuild b/net-misc/hath/hath-0.5.8.ebuild new file mode 100644 index 000000000000..80c9fd8405e9 --- /dev/null +++ b/net-misc/hath/hath-0.5.8.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CABAL_FEATURES="test-suite" +inherit haskell-cabal + +DESCRIPTION="Manipulate network blocks in CIDR notation" +HOMEPAGE="https://michael.orlitzky.com/code/hath.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + +RDEPEND=">=dev-haskell/cmdargs-0.10:= + >=dev-haskell/split-0.2:= + >=dev-haskell/tasty-0.8:= + >=dev-haskell/tasty-hunit-0.8:= + >=dev-haskell/tasty-quickcheck-0.8.1:= + >=dev-lang/ghc-9.0.0:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-3.0.0.0 + test? ( + dev-util/shelltestrunner + sys-apps/grep[pcre] + ) +" + +src_install() { + cabal_src_install + doman "${S}/doc/man1/${PN}.1" +} diff --git a/net-misc/htail/Manifest b/net-misc/htail/Manifest new file mode 100644 index 000000000000..f2169670d023 --- /dev/null +++ b/net-misc/htail/Manifest @@ -0,0 +1 @@ +DIST htail-1.5.tar.gz 13133 BLAKE2B 7b97a8a9752d74a70b197368370773d33f06eb539424aba06c3b68787fb1d1e2cb347d902eae234b49b375f8fded4e516acc0c99db1c59a54bfc2b8957302d04 SHA512 8668a6ae9fef10b21e0963ac243552c9d9df3918a217be58f39b6c1bf13c19f7c81eef074b79d020bb81faebfd8eebfa04aa23f3eedd4a887288d7a0843654bd diff --git a/net-misc/htail/htail-1.5.ebuild b/net-misc/htail/htail-1.5.ebuild new file mode 100644 index 000000000000..cb7f47746b65 --- /dev/null +++ b/net-misc/htail/htail-1.5.ebuild @@ -0,0 +1,17 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 pypi + +DESCRIPTION="Tail over HTTP" +HOMEPAGE="https://github.com/vpelletier/htail" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +BDEPEND="${DISTUTILS_DEPS}" diff --git a/net-misc/drive/metadata.xml b/net-misc/htail/metadata.xml index 83bc837931b9..7fab2bed639a 100644 --- a/net-misc/drive/metadata.xml +++ b/net-misc/htail/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <upstream> + <remote-id type="github">vpelletier/htail</remote-id> + </upstream> <maintainer type="person"> <email>zmedico@gentoo.org</email> - <name>Zac Medico</name> </maintainer> - <upstream> - <remote-id type="github">odeke-em/drive</remote-id> - </upstream> </pkgmetadata> diff --git a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch index f45b5c073493..438ba7d83962 100644 --- a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch +++ b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch @@ -1,8 +1,8 @@ --- a/htb.init +++ b/htb.init @@ -240,6 +240,10 @@ - # Maximum packet size HTB creates rate maps for. The default should - # be sufficient for most cases, it certainly is for Ethernet. + # Maximum packet size HTB creates rate maps for. The default should + # be sufficient for most cases, it certainly is for Ethernet. # +# TOS=<number> optional, default "none" +# @@ -11,7 +11,7 @@ ### SFQ qdisc parameters # # The SFQ queueing discipline is a cheap way to fairly share class bandwidth -@@ -435,6 +435,7 @@ +@@ -435,6 +439,7 @@ HTB_CLASS="RATE\|CEIL\|BURST\|CBURST\|PRIO\|LEAF\|MTU" HTB_CLASS="$HTB_CLASS\|PRIO_RULE\|PRIO_MARK\|PRIO_REALM" HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB" @@ -19,7 +19,7 @@ ############################################################################# -@@ -646,7 +647,7 @@ +@@ -646,7 +651,7 @@ ### Set defaults & load class MTU=""; LEAF=none; PERTURB=10 RATE=""; BURST=""; CEIL=""; CBURST="" @@ -28,7 +28,7 @@ PRIO_RULE=$PRIO_RULE_DEFAULT PRIO_MARK=$PRIO_MARK_DEFAULT -@@ -868,12 +869,19 @@ +@@ -868,12 +873,19 @@ u32_d="${DPORT:+match ip dport $DPORT $DMASK}" u32_d="${DADDR:+match ip dst $DADDR} $u32_d" diff --git a/net-misc/htbinit/files/htb.init_find_fix.patch b/net-misc/htbinit/files/htb.init_find_fix.patch index 27fce89ef2da..200fcfbfb411 100644 --- a/net-misc/htbinit/files/htb.init_find_fix.patch +++ b/net-misc/htbinit/files/htb.init_find_fix.patch @@ -1,6 +1,6 @@ --- a/htb.init +++ b/htb.init -@@ -468,8 +468,8 @@ +@@ -473,8 +473,8 @@ ### List of classes in $HTB_PATH htb_class_list () { for dev in `htb_device_list`; do @@ -11,7 +11,7 @@ -printf "%f\n"| sort done } # htb_class_list -@@ -483,8 +483,8 @@ +@@ -488,8 +488,8 @@ ### Validate cache against config files htb_valid_cache () { for dev in `htb_device_list`; do @@ -22,7 +22,7 @@ wc -l` -gt 0 ] && VALID=0 [ $VALID -ne 1 ] && break done -@@ -493,7 +493,7 @@ +@@ -498,7 +498,7 @@ ### Find class config for device $1, which is newer than cache htb_cache_older () { diff --git a/net-misc/htbinit/files/htb_0.8.5_esfq.patch b/net-misc/htbinit/files/htb_0.8.5_esfq.patch index 506c505f8e47..fc7c92ddb4cb 100644 --- a/net-misc/htbinit/files/htb_0.8.5_esfq.patch +++ b/net-misc/htbinit/files/htb_0.8.5_esfq.patch @@ -9,7 +9,7 @@ # # Tells the script to attach specified leaf queueing discipline to HTB # class. By default, no leaf qdisc is used. -@@ -261,6 +261,15 @@ +@@ -265,6 +265,15 @@ # will never take place which is what you probably don't want. The # default value of 10 seconds is probably a good value. # @@ -25,7 +25,7 @@ ### PFIFO/BFIFO qdisc parameters # # Those are simple FIFO queueing disciplines. They only have one parameter -@@ -427,14 +445,14 @@ +@@ -440,14 +449,14 @@ ### Modules to probe for. Uncomment the last HTB_PROBE ### line if you have QoS support compiled into kernel @@ -42,7 +42,7 @@ HTB_CLASS="$HTB_CLASS\|TOS" -@@ -801,6 +819,8 @@ +@@ -815,6 +824,8 @@ LEAFPARM="${PERTURB:+perturb $PERTURB} ${QUANTUM:+quantum $QUANTUM}" elif [ "$LEAF" = "pfifo" -o "$LEAF" = "bfifo" ]; then LEAFPARM="${LIMIT:+limit $LIMIT}" diff --git a/net-misc/htbinit/files/htb_0.8.5_ipv6.patch b/net-misc/htbinit/files/htb_0.8.5_ipv6.patch index 6e99319f2c62..526e7fcb85c5 100644 --- a/net-misc/htbinit/files/htb_0.8.5_ipv6.patch +++ b/net-misc/htbinit/files/htb_0.8.5_ipv6.patch @@ -1,6 +1,6 @@ --- a/htb.init +++ b/htb.init -@@ -275,6 +284,7 @@ +@@ -279,6 +279,7 @@ ### Filtering parameters # # RULE=[[saddr[/prefix]][:port[/mask]],][daddr[/prefix]][:port[/mask]] @@ -8,7 +8,7 @@ # # These parameters make up "u32" filter rules that select traffic for # each of the classes. You can use multiple RULE fields per config. -@@ -300,9 +310,13 @@ +@@ -304,9 +305,13 @@ # RULE=10.5.5.5:80, # selects traffic going from port 80 of single host 10.5.5.5 # @@ -22,7 +22,7 @@ # # These parameters make up "route" filter rules that classify traffic # according to packet source/destination realms. For information about -@@ -327,6 +341,7 @@ +@@ -331,6 +336,7 @@ # # # MARK=<mark> @@ -30,7 +30,7 @@ # # These parameters make up "fw" filter rules that select traffic for # each of the classes accoring to firewall "mark". Mark is a decimal -@@ -414,6 +429,9 @@ +@@ -418,6 +424,9 @@ PRIO_RULE_DEFAULT=${PRIO_RULE:-100} PRIO_MARK_DEFAULT=${PRIO_MARK:-200} PRIO_REALM_DEFAULT=${PRIO_REALM:-300} @@ -40,7 +40,7 @@ ### Default HTB_PATH & HTB_CACHE settings HTB_PATH=${HTB_PATH:-/etc/sysconfig/htb} -@@ -818,6 +838,13 @@ +@@ -823,6 +832,13 @@ prio $PRIO_MARK handle $mark fw classid 1:$CLASS done ### mark @@ -54,7 +54,7 @@ ### Create route filter for REALM fields for realm in `htb_cfile_rules REALM`; do ### Split realm into source & destination realms -@@ -833,6 +860,21 @@ +@@ -838,6 +854,21 @@ ${DREALM:+to $DREALM} classid 1:$CLASS done ### realm @@ -76,8 +76,8 @@ ### Create u32 filter for RULE fields for rule in `htb_cfile_rules RULE`; do ### Split rule into source & destination -@@ -876,6 +918,49 @@ - prio $PRIO_RULE u32 $u32_s $u32_d classid 1:$CLASS +@@ -888,6 +919,49 @@ + prio $PRIO_RULE u32 $u32_s $u32_d $u32_tos classid 1:$CLASS done ### rule + ### Create u32 filter for RULEIPv6 fields diff --git a/net-misc/htbinit/files/prio_rule.patch b/net-misc/htbinit/files/prio_rule.patch index 429a1bed0ad1..9a73840e234d 100644 --- a/net-misc/htbinit/files/prio_rule.patch +++ b/net-misc/htbinit/files/prio_rule.patch @@ -1,6 +1,6 @@ --- a/htb.init +++ b/htb.init -@@ -453,7 +457,7 @@ +@@ -458,7 +458,7 @@ ### Load & filter file $HTB_PATH/$1 htb_filter_file () { sed -n "s/#.*//; s/[^a-zA-Z0-9.,;:=/*-_]\+//g; \ @@ -9,7 +9,7 @@ } # htb_filter_file -@@ -517,7 +521,7 @@ +@@ -522,7 +522,7 @@ htb_filter_file () { sed 's/#.*//; s/[^a-zA-Z0-9.,;:=/*-_]\+//g' $HTB_PATH/$1 \ diff --git a/net-misc/htbinit/files/timecheck_fix.patch b/net-misc/htbinit/files/timecheck_fix.patch index 4797ea6fd0ab..e39ea9333d1b 100644 --- a/net-misc/htbinit/files/timecheck_fix.patch +++ b/net-misc/htbinit/files/timecheck_fix.patch @@ -1,6 +1,6 @@ --- a/htb.init +++ b/htb.init -@@ -891,7 +895,6 @@ +@@ -903,7 +903,6 @@ TIME_TMP=`date +%w/%k:%M` TIME_DOW=${TIME_TMP%%/*} TIME_NOW=${TIME_TMP##*/} @@ -8,7 +8,7 @@ ### Check all classes (if configured) for classfile in `htb_class_list`; do -@@ -914,6 +917,7 @@ +@@ -926,6 +925,7 @@ ### Compute interval boundaries BEG_ABS=`htb_time2abs $BEG_TIME` END_ABS=`htb_time2abs $END_TIME` @@ -16,7 +16,7 @@ ### Midnight wrap fixup if [ $BEG_ABS -gt $END_ABS ]; then -@@ -926,6 +930,23 @@ +@@ -938,6 +938,23 @@ ### If time period matches, remember params and set MATCH flag if [ $TIME_ABS -ge $BEG_ABS -a $TIME_ABS -lt $END_ABS ]; then RATESPEC=${PARAMS%%,*}; CEILSPEC=${PARAMS##*,} diff --git a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild index 1ae14a2d6a5b..01719be53c47 100644 --- a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild +++ b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,11 +6,11 @@ EAPI=7 inherit linux-info DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2" -HOMEPAGE="https://www.sourceforge.net/projects/htbinit/" -SRC_URI="mirror://sourceforge/htbinit/htb.init-v${PV}" +HOMEPAGE="https://sourceforge.net/projects/htbinit/" +SRC_URI="https://downloads.sourceforge.net/htbinit/htb.init-v${PV}" S="${WORKDIR}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="esfq ipv6" diff --git a/net-misc/htbinit/htbinit-0.8.5-r8.ebuild b/net-misc/htbinit/htbinit-0.8.5-r8.ebuild new file mode 100644 index 000000000000..f76c703881dc --- /dev/null +++ b/net-misc/htbinit/htbinit-0.8.5-r8.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info + +DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2" +HOMEPAGE="https://sourceforge.net/projects/htbinit/" +SRC_URI="https://downloads.sourceforge.net/htbinit/htb.init-v${PV}" +S="${WORKDIR}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="esfq" + +DEPEND="sys-apps/iproute2" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/htb.init-v0.8.5_tos.patch + "${FILESDIR}"/prio_rule.patch + "${FILESDIR}"/timecheck_fix.patch + "${FILESDIR}"/htb.init_find_fix.patch + "${FILESDIR}"/htb_0.8.5_ipv6.patch +) + +pkg_setup() { + local i + for i in NET_SCH_HTB NET_SCH_SFQ NET_CLS_FW NET_CLS_U32 NET_CLS_ROUTE4 ; do + CONFIG_CHECK="${CONFIG_CHECK} ~${i}" + done + + use esfq && CONFIG_CHECK="${CONFIG_CHECK} ~NET_SCH_ESFQ" + linux-info_pkg_setup +} + +src_unpack() { + cp "${DISTDIR}"/htb.init-v${PV} "${S}"/htb.init || die +} + +src_prepare() { + default + + sed -i 's|/etc/sysconfig/htb|/etc/htb|g' "${S}"/htb.init || die + + use esfq && eapply "${FILESDIR}"/htb_0.8.5_esfq.patch + + # bug #474700 + sed -i -e 's:/sbin/ip:/bin/ip:g' "${S}"/htb.init || die +} + +src_compile() { + : +} + +src_install() { + dosbin htb.init + + newinitd "${FILESDIR}"/htbinit.rc htbinit + + keepdir /etc/htb +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + elog 'Run "rc-update add htbinit default" to run htb.init at startup.' + elog 'Please, read carefully the htb.init documentation.' + elog 'New directory to store configuration is /etc/htb.' + fi +} diff --git a/net-misc/htbinit/metadata.xml b/net-misc/htbinit/metadata.xml index ac1687d4c85a..b3d59669d239 100644 --- a/net-misc/htbinit/metadata.xml +++ b/net-misc/htbinit/metadata.xml @@ -3,13 +3,13 @@ <pkgmetadata> <!-- maintainer-needed --> <longdescription> -HTB.init is a shell script derived from CBQ.init that allows for easy setup of HTB-based traffic control on Linux. HTB (Hierachical Token Bucket) is a new queueing discipline which attempts to address the weaknesses of current CBQ implementation. -</longdescription> + HTB.init is a shell script derived from CBQ.init that allows for easy setup of HTB-based traffic control on Linux. HTB (Hierachical Token Bucket) is a new queueing discipline which attempts to address the weaknesses of current CBQ implementation. + </longdescription> <longdescription lang="ja"> -HTB.init は、Linux 上で HTB を基盤にしたトラフィック・コントロールのセットアップを簡単にする -CBQ.init に由来したシェル・スクリプトです。HTB (Hierachical Token Bucket) は現在の CBQ の実装の弱点に処置を講じる -キューの新しい規律です。 -</longdescription> + HTB.init は、Linux 上で HTB を基盤にしたトラフィック・コントロールのセットアップを簡単にする + CBQ.init に由来したシェル・スクリプトです。HTB (Hierachical Token Bucket) は現在の CBQ の実装の弱点に処置を講じる + キューの新しい規律です。 + </longdescription> <use> <flag name="esfq">Add support for Enhanced Stochastic Fairness queueing discipline.</flag> </use> diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest index 50340252857a..5c3fe55450d5 100644 --- a/net-misc/htpdate/Manifest +++ b/net-misc/htpdate/Manifest @@ -1,2 +1,2 @@ -DIST htpdate-1.2.2.tar.gz 13625 BLAKE2B 11813def81e3cce1194120a21cf99e8ad288b0f604aab201850f03b6ca786d19792b9586c9d805aa1945bbc651e6afc5099b5c7cb6ea354473a4b3bab01397e3 SHA512 00d52b291004ddb3d0282aef78c5fbe5d9397dbf171a6646803ee7ba4bd0514af6089f7e48a92397dd1b0fbae5ba314f5165c9902028438e16d3516b65724de0 -DIST htpdate-1.2.6.tar.gz 15083 BLAKE2B 913337f51fd26e811e33f195e463adc57e2512ba502f668f2429676d962623ea943bdb1d42ceddf6d35e7e8ba727b3f1300b34a8370ed661b3fa5b4b53ef1af7 SHA512 fe7442be5581eea0579060c02fb4ffe52151c6408d1b47afc9be049d2a8b1c8d0acd3b3481680a4b6a50f52622d47266afc0fe8dc67c5bb2a3aca2422e34f23f +DIST htpdate-1.3.4.tar.gz 16312 BLAKE2B 9ebff6df6de69fa310a6459099cff2bf5ec28ac2bb486a29121b87b93505f6bb31b4debc510dc82b7d7b7cce217d9002ec7606fcf4fa863d7b2cfc78dfc6e8d5 SHA512 634317966f1e5c5d78a889a398e77f89505a5918efa076e2cd1184341f25d963b7f1c135afee7d5489bd8a20b2421d9dfea312e09b5e6bdd389626bfd4d2d960 +DIST htpdate-1.3.6.tar.gz 16683 BLAKE2B ad6e689f64a2cff3e5a832d8ed6bfc85acc7ea99d16e6da5c1ff9052009b46b5ee5dfd113232908df17eb837470c47063be6b5cc91270d6301b78efab8f71ce5 SHA512 41b9ed50e962bb5c207122c4929d919ae4491a2d527f29aafb4a3ef175c3c12e608c77632037d48b5440e48ff051c89caf3e923987ad53329056b83838943439 diff --git a/net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch b/net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch deleted file mode 100644 index fea1d85b10bc..000000000000 --- a/net-misc/htpdate/files/htpdate-1.2.6-ldlibs.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ea14fbcd91e5575bf16bc64b7660a6d02a855d7a Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Wed, 31 Mar 2021 15:46:38 +0200 -Subject: [PATCH] Makefile: Libraries belong into LDLIBS variable - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 21668a6..a531f90 100644 ---- a/Makefile -+++ b/Makefile -@@ -8,7 +8,7 @@ PKG_CONFIG ?= pkg-config - - ifdef ENABLE_HTTPS - CFLAGS += -DENABLE_HTTPS --LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl) -+LDLIBS = $(shell $(PKG_CONFIG) --libs openssl) - endif - - INSTALL = install -c -@@ -16,7 +16,7 @@ INSTALL = install -c - all: htpdate - - htpdate: htpdate.c -- $(CC) $(CFLAGS) $(CPPFLAGS) -o htpdate htpdate.c $(LDFLAGS) -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o htpdate htpdate.c $(LDLIBS) - - install: all - mkdir -p $(bindir) --- -2.31.1 - diff --git a/net-misc/htpdate/htpdate-1.2.2.ebuild b/net-misc/htpdate/htpdate-1.2.2.ebuild deleted file mode 100644 index 4869d4ad827a..000000000000 --- a/net-misc/htpdate/htpdate-1.2.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit readme.gentoo-r1 toolchain-funcs - -DESCRIPTION="Synchronize local workstation with time offered by remote webservers" -HOMEPAGE="http://www.vervest.org/htp/" -SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux" - -DEPEND="" -RDEPEND="" - -DOC_CONTENTS="If you would like to run htpdate as a daemon, set -appropriate http servers in /etc/conf.d/htpdate!" - -src_prepare() { - default - - # Use more standard adjtimex() to fix uClibc builds. - sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die -} - -src_compile() { - emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" -} - -src_install() { - dosbin htpdate - doman htpdate.8 - dodoc README Changelog - - newconfd "${FILESDIR}"/htpdate.conf htpdate - newinitd "${FILESDIR}"/htpdate.init-r1 htpdate - - readme.gentoo_create_doc -} diff --git a/net-misc/htpdate/htpdate-1.2.6.ebuild b/net-misc/htpdate/htpdate-1.3.4.ebuild index 033790209271..6165672a6a41 100644 --- a/net-misc/htpdate/htpdate-1.2.6.ebuild +++ b/net-misc/htpdate/htpdate-1.3.4.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic readme.gentoo-r1 toolchain-funcs +inherit readme.gentoo-r1 toolchain-funcs DESCRIPTION="Synchronize local workstation with time offered by remote webservers" -HOMEPAGE="https://github.com/angeloc/htpdate" +HOMEPAGE="https://www.vervest.org/htp/" if [[ "${PV}" == *9999 ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/angeloc/htpdate.git" + EGIT_REPO_URI="https://github.com/twekkel/htpdate" else - SRC_URI="https://github.com/angeloc/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux" + SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux" fi IUSE="+ssl" LICENSE="GPL-2" @@ -20,12 +20,14 @@ SLOT="0" DEPEND="ssl? ( dev-libs/openssl:0= )" RDEPEND="${DEPEND}" -BDEPEND="ssl? ( virtual/pkgconfig )" + +# Test suite tries to connect to the Internet +RESTRICT="test" DOC_CONTENTS="If you would like to run htpdate as a daemon, set appropriate http servers in /etc/conf.d/htpdate!" -PATCHES=( "${FILESDIR}/${PN}-1.2.6-ldlibs.patch" ) +PATCHES=( ) src_prepare() { default @@ -37,17 +39,12 @@ src_prepare() { } src_compile() { - if use ssl ; then - append-cflags -DENABLE_HTTPS - export PKG_CONFIG="$(tc-getPKG_CONFIG)" - fi - - emake CFLAGS="-Wall ${CFLAGS}" CC="$(tc-getCC)" \ - $(usex ssl 'ENABLE_HTTPS=1' '') + emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \ + $(usex ssl "https" '') } src_install() { - emake DESTDIR="${D}" bindir='$(prefix)/sbin' install + emake DESTDIR="${D}" STRIP="/bin/true" bindir='$(prefix)/sbin' install dodoc README.md Changelog newconfd "${FILESDIR}"/htpdate.conf htpdate diff --git a/net-misc/htpdate/htpdate-1.3.6.ebuild b/net-misc/htpdate/htpdate-1.3.6.ebuild new file mode 100644 index 000000000000..b4d889e37643 --- /dev/null +++ b/net-misc/htpdate/htpdate-1.3.6.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="Synchronize local workstation with time offered by remote webservers" +HOMEPAGE="https://www.vervest.org/htp/" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/twekkel/htpdate" +else + SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+ssl" + +DEPEND="ssl? ( dev-libs/openssl:= )" +RDEPEND="${DEPEND}" + +# Test suite tries to connect to the Internet +RESTRICT="test" + +DOC_CONTENTS="If you would like to run htpdate as a daemon, set +appropriate http servers in /etc/conf.d/htpdate!" + +src_prepare() { + default + + # Use more standard adjtimex() to fix uClibc builds. + sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die + # Don't compress man pages by default + sed '/gzip/d' -i Makefile || die +} + +src_compile() { + emake \ + CFLAGS="-Wall ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" \ + CC="$(tc-getCC)" \ + $(usev ssl 'https') +} + +src_install() { + emake DESTDIR="${D}" STRIP="/bin/true" bindir='$(prefix)/sbin' install + dodoc README.md Changelog + + newconfd "${FILESDIR}"/htpdate.conf htpdate + newinitd "${FILESDIR}"/htpdate.init-r1 htpdate + + readme.gentoo_create_doc +} diff --git a/net-misc/htpdate/htpdate-9999.ebuild b/net-misc/htpdate/htpdate-9999.ebuild index 033790209271..409f146ff81c 100644 --- a/net-misc/htpdate/htpdate-9999.ebuild +++ b/net-misc/htpdate/htpdate-9999.ebuild @@ -1,32 +1,33 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic readme.gentoo-r1 toolchain-funcs +inherit readme.gentoo-r1 toolchain-funcs DESCRIPTION="Synchronize local workstation with time offered by remote webservers" -HOMEPAGE="https://github.com/angeloc/htpdate" -if [[ "${PV}" == *9999 ]] ; then +HOMEPAGE="https://www.vervest.org/htp/" +if [[ ${PV} == *9999 ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/angeloc/htpdate.git" + EGIT_REPO_URI="https://github.com/twekkel/htpdate" else - SRC_URI="https://github.com/angeloc/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux" fi -IUSE="+ssl" + LICENSE="GPL-2" SLOT="0" +IUSE="+ssl" -DEPEND="ssl? ( dev-libs/openssl:0= )" +DEPEND="ssl? ( dev-libs/openssl:= )" RDEPEND="${DEPEND}" -BDEPEND="ssl? ( virtual/pkgconfig )" + +# Test suite tries to connect to the Internet +RESTRICT="test" DOC_CONTENTS="If you would like to run htpdate as a daemon, set appropriate http servers in /etc/conf.d/htpdate!" -PATCHES=( "${FILESDIR}/${PN}-1.2.6-ldlibs.patch" ) - src_prepare() { default @@ -37,17 +38,14 @@ src_prepare() { } src_compile() { - if use ssl ; then - append-cflags -DENABLE_HTTPS - export PKG_CONFIG="$(tc-getPKG_CONFIG)" - fi - - emake CFLAGS="-Wall ${CFLAGS}" CC="$(tc-getCC)" \ - $(usex ssl 'ENABLE_HTTPS=1' '') + emake \ + CFLAGS="-Wall ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" \ + CC="$(tc-getCC)" \ + $(usev ssl 'https') } src_install() { - emake DESTDIR="${D}" bindir='$(prefix)/sbin' install + emake DESTDIR="${D}" STRIP="/bin/true" bindir='$(prefix)/sbin' install dodoc README.md Changelog newconfd "${FILESDIR}"/htpdate.conf htpdate diff --git a/net-misc/htpdate/metadata.xml b/net-misc/htpdate/metadata.xml index 838fdf83592c..107df4bdc625 100644 --- a/net-misc/htpdate/metadata.xml +++ b/net-misc/htpdate/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> + <!-- maintainer-needed --> <upstream> - <remote-id type="github">angeloc/htpdate</remote-id> + <remote-id type="github">twekkel/htpdate</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest index e11717c65345..9e0e985fa467 100644 --- a/net-misc/httpie/Manifest +++ b/net-misc/httpie/Manifest @@ -1,3 +1,2 @@ -DIST httpie-2.4.0.tar.gz 1772537 BLAKE2B 111451cc7dc353d5b586554f98ac715a3198f03e74d261944a5f021d2dcc948455500800222b323d182a2a067d0549bda7c318ab3a6c934b9a9beec64aff2db2 SHA512 44cc7ff4fe0f3d8c53a7dd750465f6b56c36f5bbac06d22b760579bd60949039e82313845699669a659ec91adc69dbeac22c06ddd63af64e6f2e0edecf3e732a -DIST httpie-2.5.0.tar.gz 1105177 BLAKE2B 6e16868c81522d4e6d2fc0a4e093c190f18ced720b35217930865ae3f8e168193cc33dfecc13c5d310f52647d6e79d17b247f56e56e8586d633a2d9502be66a7 SHA512 f14aa23fea7578181b9bd6ededea04de9ddf0b2f697b23f76d2d96e2c17b95617318c711750bad6af550400dbc03732ab17fdf84e59d577f33f073e600a55330 -DIST httpie-2.6.0.tar.gz 1133495 BLAKE2B 3ac61fc68ab59ac7523b030a8c7af85c4af05357aa19282b514b813351efabe783f47ab82d292117e0a9170ff793b71356941dc4eb159c585629cae3adec9b5a SHA512 acd7dc847b67e27909c49ccddec84321c4d73fa5b49f06ce3d94d790093a8f168a1c6627bc4921ca8c0e48b9904f38e17935b645495e2313d16ac2eecf659038 +DIST httpie-3.2.1.gh.tar.gz 1276550 BLAKE2B 627aa3db762e9e407f882be2c4267f5227301b189695537e7ac69ff140d6d39292251e131f9b9e7761e904a736d112bb4c1f5c6708c1468c6309474ee8c140b6 SHA512 ffcf6050138c49d5acb01f214d9b3fee6c78502c4c6dc45a295bafc88aafd1789f97a69c922f6e093fb48a402c1f83a7fff5307849130df81c4bcb2d595a03bf +DIST httpie-3.2.2.gh.tar.gz 1279161 BLAKE2B aa5df73acbbe635fbfd3db458a2289042091a27d7b1791e9739874c1882e436814f74eec2b695f8acd76f9b9dd210f43dd9f8b7c0feea0cf4782b30f0e53b91a SHA512 5e95eba5a5ca8017dfd76ace525c57d2931d8918d51e84e8744eb9393cda5ae8e6cd6a1455c4aa82e50fa35edc35468a8b3582169c8f94858e61b09548cfa13d diff --git a/net-misc/httpie/files/httpie-3.2.1-pytest-fixtures.patch b/net-misc/httpie/files/httpie-3.2.1-pytest-fixtures.patch new file mode 100644 index 000000000000..be3dc48d16b7 --- /dev/null +++ b/net-misc/httpie/files/httpie-3.2.1-pytest-fixtures.patch @@ -0,0 +1,599 @@ +https://github.com/httpie/cli/commit/3524ccf0baa9f2b3029368ab07ba5f64e62dcb1f +https://github.com/httpie/cli/commit/db16bbee961ceb93b7831fe1ec44a72d56a33e38 + +From 3524ccf0baa9f2b3029368ab07ba5f64e62dcb1f Mon Sep 17 00:00:00 2001 +From: Jakub Roztocil <jakub@roztocil.co> +Date: Mon, 4 Mar 2024 16:27:52 +0100 +Subject: [PATCH] Drop dependency on the abandoned python-lazy-fixture + +--- a/setup.py ++++ b/setup.py +@@ -11,7 +11,6 @@ + tests_require = [ + 'pytest', + 'pytest-httpbin>=0.0.6', +- 'pytest-lazy-fixture>=0.0.6', + 'responses', + 'pytest-mock', + 'werkzeug<2.1.0' +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -3,14 +3,14 @@ + import pytest + from pytest_httpbin import certs + +-from .utils import ( # noqa ++from .utils import ( # noqa + HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN, + HTTPBIN_WITH_CHUNKED_SUPPORT, + REMOTE_HTTPBIN_DOMAIN, + IS_PYOPENSSL, + mock_env + ) +-from .utils.plugins_cli import ( # noqa ++from .utils.plugins_cli import ( # noqa + broken_plugin, + dummy_plugin, + dummy_plugins, +@@ -18,7 +18,9 @@ + httpie_plugins_success, + interface, + ) +-from .utils.http_server import http_server, localhost_http_server # noqa ++from .utils.http_server import http_server, localhost_http_server # noqa ++# noinspection PyUnresolvedReferences ++from .fixtures import pytest_lazy_fixture + + + @pytest.fixture(scope='function', autouse=True) +--- /dev/null ++++ b/tests/fixtures/pytest_lazy_fixture.py +@@ -0,0 +1,99 @@ ++""" ++Replacement for the abandoned `pytest.lazy_fixture` <https://github.com/TvoroG/pytest-lazy-fixture> ++ ++Based on <https://github.com/TvoroG/pytest-lazy-fixture/issues/65#issuecomment-1914581161> ++ ++""" ++import dataclasses ++import typing ++ ++import pytest ++ ++ ++@dataclasses.dataclass ++class LazyFixture: ++ """Lazy fixture dataclass.""" ++ ++ name: str ++ ++ ++def lazy_fixture(name: str) -> LazyFixture: ++ """Mark a fixture as lazy.""" ++ return LazyFixture(name) ++ ++ ++# NOTE: Mimic the original API ++pytest.lazy_fixture = lazy_fixture ++ ++ ++def is_lazy_fixture(value: object) -> bool: ++ """Check whether a value is a lazy fixture.""" ++ return isinstance(value, LazyFixture) ++ ++ ++def pytest_make_parametrize_id( ++ config: pytest.Config, ++ val: object, ++ argname: str, ++) -> str | None: ++ """Inject lazy fixture parametrized id. ++ ++ Reference: ++ - https://bit.ly/48Off6r ++ ++ Args: ++ config (pytest.Config): pytest configuration. ++ value (object): fixture value. ++ argname (str): automatic parameter name. ++ ++ Returns: ++ str: new parameter id. ++ """ ++ if is_lazy_fixture(val): ++ return typing.cast(LazyFixture, val).name ++ return None ++ ++ ++@pytest.hookimpl(tryfirst=True) ++def pytest_fixture_setup( ++ fixturedef: pytest.FixtureDef, ++ request: pytest.FixtureRequest, ++) -> object | None: ++ """Lazy fixture setup hook. ++ ++ This hook will never take over a fixture setup but just simply will ++ try to resolve recursively any lazy fixture found in request.param. ++ ++ Reference: ++ - https://bit.ly/3SyvsXJ ++ ++ Args: ++ fixturedef (pytest.FixtureDef): fixture definition object. ++ request (pytest.FixtureRequest): fixture request object. ++ ++ Returns: ++ object | None: fixture value or None otherwise. ++ """ ++ if hasattr(request, "param") and request.param: ++ request.param = _resolve_lazy_fixture(request.param, request) ++ return None ++ ++ ++def _resolve_lazy_fixture(__val: object, request: pytest.FixtureRequest) -> object: ++ """Lazy fixture resolver. ++ ++ Args: ++ __val (object): fixture value object. ++ request (pytest.FixtureRequest): pytest fixture request object. ++ ++ Returns: ++ object: resolved fixture value. ++ """ ++ if isinstance(__val, list | tuple): ++ return tuple(_resolve_lazy_fixture(v, request) for v in __val) ++ if isinstance(__val, typing.Mapping): ++ return {k: _resolve_lazy_fixture(v, request) for k, v in __val.items()} ++ if not is_lazy_fixture(__val): ++ return __val ++ lazy_obj = typing.cast(LazyFixture, __val) ++ return request.getfixturevalue(lazy_obj.name) + +From db16bbee961ceb93b7831fe1ec44a72d56a33e38 Mon Sep 17 00:00:00 2001 +From: Jakub Roztocil <jakub@roztocil.co> +Date: Mon, 4 Mar 2024 18:05:26 +0100 +Subject: [PATCH] Drop dependency on the abandoned python-lazy-fixture II. + +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -2,6 +2,7 @@ + + import pytest + from pytest_httpbin import certs ++from pytest_httpbin.serve import Server as PyTestHttpBinServer + + from .utils import ( # noqa + HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN, +@@ -19,8 +20,10 @@ + interface, + ) + from .utils.http_server import http_server, localhost_http_server # noqa +-# noinspection PyUnresolvedReferences +-from .fixtures import pytest_lazy_fixture ++ ++ ++# Patch to support `url = str(server)` in addition to `url = server + '/foo'`. ++PyTestHttpBinServer.__str__ = lambda self: self.url + + + @pytest.fixture(scope='function', autouse=True) +@@ -72,8 +75,15 @@ def _remote_httpbin_available(): + + @pytest.fixture + def remote_httpbin(_remote_httpbin_available): ++ + if _remote_httpbin_available: +- return 'http://' + REMOTE_HTTPBIN_DOMAIN ++ class Server(str): ++ """Look like `pytest_httpbin.serve.Server` but only provide URL info.""" ++ @property ++ def url(self): ++ return self ++ ++ return Server('http://' + REMOTE_HTTPBIN_DOMAIN) + pytest.skip(f'{REMOTE_HTTPBIN_DOMAIN} not resolvable') + + +--- a/tests/fixtures/pytest_lazy_fixture.py ++++ /dev/null +@@ -1,99 +0,0 @@ +-""" +-Replacement for the abandoned `pytest.lazy_fixture` <https://github.com/TvoroG/pytest-lazy-fixture> +- +-Based on <https://github.com/TvoroG/pytest-lazy-fixture/issues/65#issuecomment-1914581161> +- +-""" +-import dataclasses +-import typing +- +-import pytest +- +- +-@dataclasses.dataclass +-class LazyFixture: +- """Lazy fixture dataclass.""" +- +- name: str +- +- +-def lazy_fixture(name: str) -> LazyFixture: +- """Mark a fixture as lazy.""" +- return LazyFixture(name) +- +- +-# NOTE: Mimic the original API +-pytest.lazy_fixture = lazy_fixture +- +- +-def is_lazy_fixture(value: object) -> bool: +- """Check whether a value is a lazy fixture.""" +- return isinstance(value, LazyFixture) +- +- +-def pytest_make_parametrize_id( +- config: pytest.Config, +- val: object, +- argname: str, +-) -> str | None: +- """Inject lazy fixture parametrized id. +- +- Reference: +- - https://bit.ly/48Off6r +- +- Args: +- config (pytest.Config): pytest configuration. +- value (object): fixture value. +- argname (str): automatic parameter name. +- +- Returns: +- str: new parameter id. +- """ +- if is_lazy_fixture(val): +- return typing.cast(LazyFixture, val).name +- return None +- +- +-@pytest.hookimpl(tryfirst=True) +-def pytest_fixture_setup( +- fixturedef: pytest.FixtureDef, +- request: pytest.FixtureRequest, +-) -> object | None: +- """Lazy fixture setup hook. +- +- This hook will never take over a fixture setup but just simply will +- try to resolve recursively any lazy fixture found in request.param. +- +- Reference: +- - https://bit.ly/3SyvsXJ +- +- Args: +- fixturedef (pytest.FixtureDef): fixture definition object. +- request (pytest.FixtureRequest): fixture request object. +- +- Returns: +- object | None: fixture value or None otherwise. +- """ +- if hasattr(request, "param") and request.param: +- request.param = _resolve_lazy_fixture(request.param, request) +- return None +- +- +-def _resolve_lazy_fixture(__val: object, request: pytest.FixtureRequest) -> object: +- """Lazy fixture resolver. +- +- Args: +- __val (object): fixture value object. +- request (pytest.FixtureRequest): pytest fixture request object. +- +- Returns: +- object: resolved fixture value. +- """ +- if isinstance(__val, list | tuple): +- return tuple(_resolve_lazy_fixture(v, request) for v in __val) +- if isinstance(__val, typing.Mapping): +- return {k: _resolve_lazy_fixture(v, request) for k, v in __val.items()} +- if not is_lazy_fixture(__val): +- return __val +- lazy_obj = typing.cast(LazyFixture, __val) +- return request.getfixturevalue(lazy_obj.name) +--- a/tests/test_cookie_on_redirects.py ++++ b/tests/test_cookie_on_redirects.py +@@ -2,54 +2,47 @@ + from .utils import http + + +-def _stringify(fixture): +- return fixture + '' +- +- +-@pytest.mark.parametrize('instance', [ +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++@pytest.mark.parametrize('target_httpbin', [ ++ 'httpbin', ++ 'remote_httpbin', + ]) +-def test_explicit_user_set_cookie(httpbin, instance): +- # User set cookies ARE NOT persisted within redirects +- # when there is no session, even on the same domain. +- ++def test_explicit_user_set_cookie(httpbin, target_httpbin, request): ++ """User set cookies ARE NOT persisted within redirects when there is no session, even on the same domain.""" ++ target_httpbin = request.getfixturevalue(target_httpbin) + r = http( + '--follow', + httpbin + '/redirect-to', +- f'url=={_stringify(instance)}/cookies', ++ f'url=={target_httpbin.url}/cookies', + 'Cookie:a=b' + ) + assert r.json == {'cookies': {}} + + +-@pytest.mark.parametrize('instance', [ +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++@pytest.mark.parametrize('target_httpbin', [ ++ 'httpbin', ++ 'remote_httpbin', + ]) +-def test_explicit_user_set_cookie_in_session(tmp_path, httpbin, instance): +- # User set cookies ARE persisted within redirects +- # when there is A session, even on the same domain. +- ++def test_explicit_user_set_cookie_in_session(tmp_path, httpbin, target_httpbin, request): ++ """User set cookies ARE persisted within redirects when there is A session, even on the same domain.""" ++ target_httpbin = request.getfixturevalue(target_httpbin) + r = http( + '--follow', + '--session', + str(tmp_path / 'session.json'), + httpbin + '/redirect-to', +- f'url=={_stringify(instance)}/cookies', ++ f'url=={target_httpbin}/cookies', + 'Cookie:a=b' + ) + assert r.json == {'cookies': {'a': 'b'}} + + +-@pytest.mark.parametrize('instance', [ +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++@pytest.mark.parametrize('target_httpbin', [ ++ 'httpbin', ++ 'remote_httpbin', + ]) +-def test_saved_user_set_cookie_in_session(tmp_path, httpbin, instance): +- # User set cookies ARE persisted within redirects +- # when there is A session, even on the same domain. +- ++def test_saved_user_set_cookie_in_session(tmp_path, httpbin, target_httpbin, request): ++ """User set cookies ARE persisted within redirects when there is A session, even on the same domain.""" ++ target_httpbin = request.getfixturevalue(target_httpbin) + http( + '--follow', + '--session', +@@ -62,32 +55,33 @@ def test_saved_user_set_cookie_in_session(tmp_path, httpbin, instance): + '--session', + str(tmp_path / 'session.json'), + httpbin + '/redirect-to', +- f'url=={_stringify(instance)}/cookies', ++ f'url=={target_httpbin}/cookies', + ) + assert r.json == {'cookies': {'a': 'b'}} + + +-@pytest.mark.parametrize('instance', [ +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++@pytest.mark.parametrize('target_httpbin', [ ++ 'httpbin', ++ 'remote_httpbin', + ]) + @pytest.mark.parametrize('session', [True, False]) +-def test_explicit_user_set_headers(httpbin, tmp_path, instance, session): +- # User set headers ARE persisted within redirects +- # even on different domains domain with or without +- # an active session. ++def test_explicit_user_set_headers(httpbin, tmp_path, target_httpbin, session, request): ++ """ ++ User set headers ARE persisted within redirects even on different domains domain with or without an active session. ++ ++ """ ++ target_httpbin = request.getfixturevalue(target_httpbin) + session_args = [] + if session: + session_args.extend([ + '--session', + str(tmp_path / 'session.json') + ]) +- + r = http( + '--follow', + *session_args, + httpbin + '/redirect-to', +- f'url=={_stringify(instance)}/get', ++ f'url=={target_httpbin}/get', + 'X-Custom-Header:value' + ) + assert 'X-Custom-Header' in r.json['headers'] +@@ -95,16 +89,13 @@ def test_explicit_user_set_headers(httpbin, tmp_path, instance, session): + + @pytest.mark.parametrize('session', [True, False]) + def test_server_set_cookie_on_redirect_same_domain(tmp_path, httpbin, session): +- # Server set cookies ARE persisted on the same domain +- # when they are forwarded. +- ++ """Server set cookies ARE persisted on the same domain when they are forwarded.""" + session_args = [] + if session: + session_args.extend([ + '--session', + str(tmp_path / 'session.json') + ]) +- + r = http( + '--follow', + *session_args, +@@ -136,8 +127,7 @@ def test_server_set_cookie_on_redirect_different_domain(tmp_path, http_server, h + + + def test_saved_session_cookies_on_same_domain(tmp_path, httpbin): +- # Saved session cookies ARE persisted when making a new +- # request to the same domain. ++ """Saved session cookies ARE persisted when making a new request to the same domain.""" + http( + '--session', + str(tmp_path / 'session.json'), +@@ -152,8 +142,7 @@ def test_saved_session_cookies_on_same_domain(tmp_path, httpbin): + + + def test_saved_session_cookies_on_different_domain(tmp_path, httpbin, remote_httpbin): +- # Saved session cookies ARE persisted when making a new +- # request to a different domain. ++ """Saved session cookies ARE persisted when making a new request to a different domain.""" + http( + '--session', + str(tmp_path / 'session.json'), +@@ -167,45 +156,49 @@ def test_saved_session_cookies_on_different_domain(tmp_path, httpbin, remote_htt + assert r.json == {'cookies': {}} + + +-@pytest.mark.parametrize('initial_domain, first_request_domain, second_request_domain, expect_cookies', [ ++@pytest.mark.parametrize(['initial_domain', 'first_request_domain', 'second_request_domain', 'expect_cookies'], [ + ( + # Cookies are set by Domain A + # Initial domain is Domain A + # Redirected domain is Domain A +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('httpbin'), ++ 'httpbin', ++ 'httpbin', ++ 'httpbin', + True, + ), + ( + # Cookies are set by Domain A + # Initial domain is Domain B + # Redirected domain is Domain B +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++ 'httpbin', ++ 'remote_httpbin', ++ 'remote_httpbin', + False, + ), + ( + # Cookies are set by Domain A + # Initial domain is Domain A + # Redirected domain is Domain B +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), ++ 'httpbin', ++ 'httpbin', ++ 'remote_httpbin', + False, + ), + ( + # Cookies are set by Domain A + # Initial domain is Domain B + # Redirected domain is Domain A +- pytest.lazy_fixture('httpbin'), +- pytest.lazy_fixture('remote_httpbin'), +- pytest.lazy_fixture('httpbin'), ++ 'httpbin', ++ 'remote_httpbin', ++ 'httpbin', + True, + ), + ]) +-def test_saved_session_cookies_on_redirect(tmp_path, initial_domain, first_request_domain, second_request_domain, expect_cookies): ++def test_saved_session_cookies_on_redirect( ++ tmp_path, initial_domain, first_request_domain, second_request_domain, expect_cookies, request): ++ initial_domain = request.getfixturevalue(initial_domain) ++ first_request_domain = request.getfixturevalue(first_request_domain) ++ second_request_domain = request.getfixturevalue(second_request_domain) + http( + '--session', + str(tmp_path / 'session.json'), +@@ -216,7 +209,7 @@ def test_saved_session_cookies_on_redirect(tmp_path, initial_domain, first_reque + str(tmp_path / 'session.json'), + '--follow', + first_request_domain + '/redirect-to', +- f'url=={_stringify(second_request_domain)}/cookies' ++ f'url=={second_request_domain}/cookies' + ) + if expect_cookies: + expected_data = {'cookies': {'a': 'b'}} +--- a/tests/test_sessions.py ++++ b/tests/test_sessions.py +@@ -821,16 +821,17 @@ def test_session_multiple_headers_with_same_name(basic_session, httpbin): + 'server, expected_cookies', + [ + ( +- pytest.lazy_fixture('localhost_http_server'), ++ 'localhost_http_server', + {'secure_cookie': 'foo', 'insecure_cookie': 'bar'} + ), + ( +- pytest.lazy_fixture('remote_httpbin'), ++ 'remote_httpbin', + {'insecure_cookie': 'bar'} + ) + ] + ) +-def test_secure_cookies_on_localhost(mock_env, tmp_path, server, expected_cookies): ++def test_secure_cookies_on_localhost(mock_env, tmp_path, server, expected_cookies, request): ++ server = request.getfixturevalue(server) + session_path = tmp_path / 'session.json' + http( + '--session', str(session_path), +--- a/tests/test_update_warnings.py ++++ b/tests/test_update_warnings.py +@@ -132,10 +132,10 @@ def test_check_updates_first_invocation( + + + @pytest.mark.parametrize( +- 'should_issue_warning, build_channel', ++ ['should_issue_warning', 'build_channel'], + [ +- (False, pytest.lazy_fixture('lower_build_channel')), +- (True, pytest.lazy_fixture('higher_build_channel')), ++ (False, 'lower_build_channel'), ++ (True, 'higher_build_channel'), + ], + ) + def test_check_updates_first_time_after_data_fetch( +@@ -145,7 +145,9 @@ def test_check_updates_first_time_after_data_fetch( + static_fetch_data, + should_issue_warning, + build_channel, ++ request, + ): ++ request.getfixturevalue(build_channel) + http('fetch_updates', '--daemon', env=with_warnings) + r = http(httpbin + '/get', env=with_warnings) + +@@ -176,14 +178,15 @@ def test_cli_check_updates( + + + @pytest.mark.parametrize( +- "build_channel", [ +- pytest.lazy_fixture("lower_build_channel"), +- pytest.lazy_fixture("unknown_build_channel") ++ 'build_channel', [ ++ 'lower_build_channel', ++ 'unknown_build_channel', + ] + ) + def test_cli_check_updates_not_shown( +- static_fetch_data, build_channel ++ static_fetch_data, build_channel, request + ): ++ request.getfixturevalue(build_channel) + r = httpie('cli', 'check-updates') + assert r.exit_status == ExitStatus.SUCCESS + assert not check_update_warnings(r) diff --git a/net-misc/httpie/files/httpie-urllib3-2-fixes.patch b/net-misc/httpie/files/httpie-urllib3-2-fixes.patch new file mode 100644 index 000000000000..2c6c5d348171 --- /dev/null +++ b/net-misc/httpie/files/httpie-urllib3-2-fixes.patch @@ -0,0 +1,57 @@ +From f8bb34ebf97bf6a103a7d021b16059522d76d52d Mon Sep 17 00:00:00 2001 +From: Brendon Smith <bws@bws.bio> +Date: Sat, 6 May 2023 16:24:26 -0400 +Subject: [PATCH] Fix `urllib3.util.ssl_.DEFAULT_CIPHERS` import + +--- + httpie/cli/definition.py | 4 ++-- + httpie/ssl_.py | 15 ++++++++++----- + 2 files changed, 12 insertions(+), 7 deletions(-) + +diff --git a/httpie/cli/definition.py b/httpie/cli/definition.py +index 0e5f91edf7..5e54d1c896 100644 +--- a/httpie/cli/definition.py ++++ b/httpie/cli/definition.py +@@ -831,8 +831,8 @@ def format_auth_help(auth_plugins_mapping, *, isolation_mode: bool = False): + short_help='A string in the OpenSSL cipher list format.', + help=f""" + +- A string in the OpenSSL cipher list format. By default, the following +- is used: ++ A string in the OpenSSL cipher list format. By default, the available ++ system ciphers will be used, which are: + + {DEFAULT_SSL_CIPHERS} + +diff --git a/httpie/ssl_.py b/httpie/ssl_.py +index b9438543eb..c8dba0ea8d 100644 +--- a/httpie/ssl_.py ++++ b/httpie/ssl_.py +@@ -3,13 +3,9 @@ + + from httpie.adapters import HTTPAdapter + # noinspection PyPackageRequirements +-from urllib3.util.ssl_ import ( +- DEFAULT_CIPHERS, create_urllib3_context, +- resolve_ssl_version, +-) ++from urllib3.util.ssl_ import create_urllib3_context, resolve_ssl_version + + +-DEFAULT_SSL_CIPHERS = DEFAULT_CIPHERS + SSL_VERSION_ARG_MAPPING = { + 'ssl2.3': 'PROTOCOL_SSLv23', + 'ssl3': 'PROTOCOL_SSLv3', +@@ -94,3 +90,12 @@ def _is_key_file_encrypted(key_file): + return True + + return False ++ ++ ++try: ++ from urllib3.util.ssl_ import DEFAULT_CIPHERS ++except ImportError: ++ _context = HTTPieHTTPSAdapter._create_ssl_context(verify=False) ++ DEFAULT_CIPHERS = ":".join([cipher["name"] for cipher in _context.get_ciphers()]) ++ ++DEFAULT_SSL_CIPHERS = DEFAULT_CIPHERS diff --git a/net-misc/httpie/httpie-2.4.0.ebuild b/net-misc/httpie/httpie-2.4.0.ebuild deleted file mode 100644 index 0b65a23fe517..000000000000 --- a/net-misc/httpie/httpie-2.4.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="ssl(+)" - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Modern command line HTTP client" -HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/" -SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] - >=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest-httpbin[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_test() { - local skipped_tests=() - - skipped_tests+=( - tests/test_uploads.py::test_chunked_json - tests/test_uploads.py::test_chunked_form - tests/test_uploads.py::test_chunked_stdin - tests/test_uploads.py::TestMultipartFormDataFileUpload::test_multipart_chunked - tests/test_uploads.py::TestRequestBodyFromFilePath::test_request_body_from_file_by_path_chunked - tests/test_tokens.py::test_verbose_chunked - ) - - pytest -v ${skipped_tests[@]/#/--deselect } || die "Tests failed with ${EPYTHON}" -} - -python_install_all() { - newbashcomp extras/httpie-completion.bash http - insinto /usr/share/fish/vendor_completions.d - newins extras/httpie-completion.fish http.fish - distutils-r1_python_install_all -} diff --git a/net-misc/httpie/httpie-2.6.0.ebuild b/net-misc/httpie/httpie-2.6.0.ebuild deleted file mode 100644 index a663fcd882b5..000000000000 --- a/net-misc/httpie/httpie-2.6.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{8,9,10} ) -PYTHON_REQ_USE="ssl(+)" - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Modern command line HTTP client" -HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/" -SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/charset_normalizer[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] - >=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest-httpbin[${PYTHON_USEDEP}] - dev-python/responses[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_install_all() { - newbashcomp extras/httpie-completion.bash http - insinto /usr/share/fish/vendor_completions.d - newins extras/httpie-completion.fish http.fish - distutils-r1_python_install_all -} diff --git a/net-misc/httpie/httpie-2.5.0.ebuild b/net-misc/httpie/httpie-3.2.1-r2.ebuild index 00420956f69e..217a2307a2d1 100644 --- a/net-misc/httpie/httpie-2.5.0.ebuild +++ b/net-misc/httpie/httpie-3.2.1-r2.ebuild @@ -1,25 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="ssl(+)" +DISTUTILS_USE_PEP517=setuptools inherit bash-completion-r1 distutils-r1 DESCRIPTION="Modern command line HTTP client" HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/" -SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/httpie/httpie/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" + dev-python/charset-normalizer[${PYTHON_USEDEP}] dev-python/defusedxml[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] + dev-python/multidict[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] >=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}] " @@ -32,6 +35,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}/${PN}-urllib3-2-fixes.patch" +) + distutils_enable_tests pytest python_install_all() { diff --git a/net-misc/httpie/httpie-3.2.2.ebuild b/net-misc/httpie/httpie-3.2.2.ebuild new file mode 100644 index 000000000000..da77417ac708 --- /dev/null +++ b/net-misc/httpie/httpie-3.2.2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="ssl(+)" +DISTUTILS_USE_PEP517=setuptools + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Modern command line HTTP client" +HOMEPAGE="https://httpie.io/ https://pypi.org/project/httpie/" +SRC_URI="https://github.com/httpie/cli/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}"/cli-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + dev-python/charset-normalizer[${PYTHON_USEDEP}] + dev-python/defusedxml[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/multidict[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] + >=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + ${RDEPEND} + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest-httpbin[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/responses[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-3.2.1-pytest-fixtures.patch" +) + +EPYTEST_DESELECT=( + # https://github.com/httpie/cli/issues/1530 + tests/test_compress.py::test_compress_form + tests/test_binary.py::TestBinaryResponseData + + # Needs network + 'tests/test_cookie_on_redirects.py::test_explicit_user_set_cookie_in_session[remote_httpbin]' + 'tests/test_cookie_on_redirects.py::test_explicit_user_set_cookie[remote_httpbin]' + 'tests/test_cookie_on_redirects.py::test_explicit_user_set_headers[False-remote_httpbin]' + 'tests/test_cookie_on_redirects.py::test_explicit_user_set_headers[True-remote_httpbin]' + tests/test_cookie_on_redirects.py::test_saved_session_cookie_pool + tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_different_domain + 'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-httpbin-remote_httpbin-False]' + 'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-remote_httpbin-httpbin-True]' + 'tests/test_cookie_on_redirects.py::test_saved_session_cookies_on_redirect[httpbin-remote_httpbin-remote_httpbin-False]' + 'tests/test_cookie_on_redirects.py::test_saved_user_set_cookie_in_session[remote_httpbin]' + 'tests/test_sessions.py::test_secure_cookies_on_localhost[remote_httpbin-expected_cookies1]' + tests/test_tokens.py::test_verbose_chunked + tests/test_uploads.py::test_chunked_form + tests/test_uploads.py::test_chunked_json + tests/test_uploads.py::test_chunked_raw + tests/test_uploads.py::test_chunked_stdin + tests/test_uploads.py::test_chunked_stdin_multiple_chunks + tests/test_uploads.py::TestMultipartFormDataFileUpload::test_multipart_chunked + tests/test_uploads.py::TestRequestBodyFromFilePath::test_request_body_from_file_by_path_chunked +) + +EPYTEST_IGNORE=( + # Assumes installation in a clean venv + tests/test_plugins_cli.py +) + +distutils_enable_tests pytest + +python_install_all() { + newbashcomp extras/httpie-completion.bash http + insinto /usr/share/fish/vendor_completions.d + newins extras/httpie-completion.fish http.fish + distutils-r1_python_install_all +} diff --git a/net-misc/httpie/metadata.xml b/net-misc/httpie/metadata.xml index 73d29e0ff649..cba10e14d2cc 100644 --- a/net-misc/httpie/metadata.xml +++ b/net-misc/httpie/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> HTTPie (pronounced aitch-tee-tee-pie) is a command line HTTP client. Its goal is to make CLI interaction with web services as diff --git a/net-misc/httpstat/Manifest b/net-misc/httpstat/Manifest index 7628631d9551..24e6d33804cc 100644 --- a/net-misc/httpstat/Manifest +++ b/net-misc/httpstat/Manifest @@ -1 +1 @@ -DIST httpstat-1.3.1.tar.gz 97691 BLAKE2B f7a5388c3891c1caac654c6c9be425864e2a037eba2e12229ec72c847864f7be23b64d5450ebb42f976335f5b6ca878f1ee555ee3b2178c1a10c5969f883604d SHA512 bca91afe14d50af37c741ca4baa7d3843b010bb6dc012c72bd28c43f59099c20628cadc4dd80652dffeb1d26fb07f5cf156a3f6bf9eba1f6e121d4b250020b46 +DIST httpstat-1.3.1.gh.tar.gz 97691 BLAKE2B f7a5388c3891c1caac654c6c9be425864e2a037eba2e12229ec72c847864f7be23b64d5450ebb42f976335f5b6ca878f1ee555ee3b2178c1a10c5969f883604d SHA512 bca91afe14d50af37c741ca4baa7d3843b010bb6dc012c72bd28c43f59099c20628cadc4dd80652dffeb1d26fb07f5cf156a3f6bf9eba1f6e121d4b250020b46 diff --git a/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch b/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch index 0fcb6523e6e1..37985a3241a0 100644 --- a/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch +++ b/net-misc/httpstat/files/httpstat-1.2.1-gentoo-tests.patch @@ -8,24 +8,24 @@ @@ -19,8 +19,7 @@ function title() { http_url="google.com" https_url="https://http2.akamai.com" - + -for pybin in python python3; do -#for pybin in python; do -+for pybin in python; do ++for pybin in ${EPYTHON}; do echo echo "# Test in $pybin" - + @@ -40,9 +39,9 @@ for pybin in python python3; do main_silent $https_url assert_exit 0 - + - title "comma decimal language (ru_RU)" - LC_ALL=ru_RU main_silent $http_url - assert_exit 0 + #title "comma decimal language (ru_RU)" + #LC_ALL=ru_RU main_silent $http_url + #assert_exit 0 - + title "HTTPSTAT_DEBUG" HTTPSTAT_DEBUG=true main $http_url | grep -q 'HTTPSTAT_DEBUG=true' - + diff --git a/net-misc/httpstat/httpstat-1.3.1.ebuild b/net-misc/httpstat/httpstat-1.3.1-r1.ebuild index 23b0e7a7cb78..7c8ead845af8 100644 --- a/net-misc/httpstat/httpstat-1.3.1.ebuild +++ b/net-misc/httpstat/httpstat-1.3.1-r1.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} pypy3 ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 DESCRIPTION="httpstat visualizes cURL statistics in a way of beauty and clarity" HOMEPAGE="https://github.com/reorx/httpstat" -SRC_URI="https://github.com/reorx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/reorx/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" RDEPEND="net-misc/curl:*" @@ -23,5 +24,5 @@ PROPERTIES="test_network" PATCHES=( "${FILESDIR}"/${PN}-1.2.1-gentoo-tests.patch ) python_test() { - ./httpstat_test.sh || die + ./httpstat_test.sh || die "Tests failed with ${EPYTHON}" } diff --git a/net-misc/httpstat/metadata.xml b/net-misc/httpstat/metadata.xml index 556bbae45e50..be402a6b8eb8 100644 --- a/net-misc/httpstat/metadata.xml +++ b/net-misc/httpstat/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> - </maintainer> + <!-- maintainer-needed --> <stabilize-allarches/> <upstream> <bugs-to>https://github.com/reorx/httpstat/issues</bugs-to> diff --git a/net-misc/httptype/httptype-1.3.9-r1.ebuild b/net-misc/httptype/httptype-1.3.9-r1.ebuild index fa20651575b5..01c030b8e90e 100644 --- a/net-misc/httptype/httptype-1.3.9-r1.ebuild +++ b/net-misc/httptype/httptype-1.3.9-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Returns the http host software of a website" HOMEPAGE="http://httptype.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-1" SLOT="0" diff --git a/net-misc/hurl/Manifest b/net-misc/hurl/Manifest new file mode 100644 index 000000000000..05bf449df2aa --- /dev/null +++ b/net-misc/hurl/Manifest @@ -0,0 +1,155 @@ +DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 +DIST ahash-0.8.3.crate 42416 BLAKE2B 84836a4e33451012ff32c1a1a90500d87eb7ce649b60dff4eecfb0d25b9782a186376c154673c3121b154ff4616016d1718dfd687b88f4772c2c89eeb2f119b6 SHA512 cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e +DIST aho-corasick-1.1.1.crate 182812 BLAKE2B df74c2cfa0ae392a8d466e370ba761c4cd37c65773affba9a3cdcf7f5797b34b4a25e1646be3de5081644b34db2dce273609edb4f18a1ce7fdbf31ac28a10b88 SHA512 a894e1cefbb63a3b7b78a3676874d0b7a507c27970f48cdfbda1e5deefbf6b20ed4271b660a12eea77b318cd2fa0f80850a0b1ddfe0d0731ffa326c0fc295692 +DIST alloc-no-stdlib-2.0.4.crate 10105 BLAKE2B afa0bfeb7df1d742edb412dca4c22957fc21c2a1be21c64c58503d4b943c06e3163d0f3c90525b25323b8dc38e6c64136ec4f9608758c5c6f3bd07c2c033ee74 SHA512 6518856fa524ee0fe8e04cf133c11028efcf2f6a28f3a70e401566a4eb343c954dba34aec2a02c0d0359757dfb5dcf48279610646215eea190d699708d838904 +DIST alloc-stdlib-0.2.2.crate 6693 BLAKE2B a22faf3482e416664f2e104f5f45c4e6d116a42b890216b80102e266f7a3a3accd2933aeca71650a4c4626e3d9da76b6488ffc9ea2ae4229cdfbf1ce9ca6c7cf SHA512 9c4169052ad460af2be6f2a128056661b2f26da0122877f13fcd4f4f3e2e9537783cb2b2bec47af43569629639aa8ad507ab010833982e5d942f5b26cfd46c14 +DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077 +DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191 +DIST anstream-0.5.0.crate 19646 BLAKE2B 770dc99092e1c48ad5c1658e83abff3b8c9e0915e360048bfe0fe04faf61991e01e88ca4adca23533bf11fe078066e351778661128d69381756688341022f29d SHA512 8e285cc8f92708cf9482e7b4dc84dd891e5ec0bd8c57894c6bb368eede1127b7b903adb4c40b37287e3644535cc60c92662951c2c8fb5b92e10f49ff5374d359 +DIST anstyle-1.0.3.crate 13986 BLAKE2B 9e9fa894da78a6c0933c423524827ead33aa4e384e04771ccccaa179f1e8a6459a5094db7f61714457b919d2e713d09df4429b83793d807821bfdb226ff115a5 SHA512 f1ac506814e1ce1df537ea8a88ed75f3f897aa9e559ba7eb5a8acfd043641dada12953669153d1f719da28f935a9651a07b5ae1e351139f0f03b58a67bc28477 +DIST anstyle-parse-0.2.1.crate 24802 BLAKE2B 6304a56c6a9fbaf1bb4d1d177b2315684345dc9d71c35836f9544145364f8d6eb56e25c03076690c594ab7db5914501acb569f6c136952e59c93179ced527fb2 SHA512 5c8fc7d88ffc3a6e78340ffe0f3c2d72e865512030ade4509de9c673eba955c536bb1873dac11f6ba11cc8367fb30c67451ed65d19f81507c9e917c702bfd176 +DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a +DIST anstyle-wincon-2.1.0.crate 11757 BLAKE2B b7c1071da1ab24accc33d7af70f09ace8edb2dcbb53936ed5ac13552c6082c0f16ce501f041d2c1792cee7dd9cc3877d29505e12a65022bec44285f13e1f422f SHA512 6c379c46f791b6b1367f3d6f3531dcd16589cc2e12f6f5ce52a3fa32d42e62b719d2277699d1bc8526099a6f791f2e7d5b1068e1295cbcd2997841f0eafc4eeb +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST base64-0.21.4.crate 77029 BLAKE2B 4380440305c8a293218bb1fdba5c257b2a088af2f74f2936937cd0f0b3462248b572bdbfe5e2a82af1f2cf04267267317b1c2b74972fa9976795e9c174d2352f SHA512 33fba19be1e7c3e74b57ae0487fda904258f31457c005467caf2e44eb55e271e0d2e3f2d4b80b667b05fc625878e0b136a07984dc88335a2099278672b3c4b0f +DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6 +DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8 +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bitflags-2.4.0.crate 36954 BLAKE2B 1d6cfeb0a17dc53a6249a83c8c7ad7c102985ffcfd7f7f76506889684235e78fe489d23b5a5f9018f0bd526a38d6b1449784c62322fb01f4bb507c0af8bd545c SHA512 0c3d6667abea48811a792749702136ee3db97518b33bc4c7d35737505bf56315e0e5810deeea28b7a1b540ec0e21bd319ba0b3c5c4aef0ba8ed5499ffdfd9b0c +DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb +DIST brotli-3.3.4.crate 1369026 BLAKE2B b46085e324a6fb90ef4f6198154e2f45d58b91302f07b0e7ec3394183e1981d8e25c2d617425bb656756988cac57fdee15d6de3510e6e0b3ea1fe450ff06b8df SHA512 e312842abd713b5dd750ae92dbac297136291bef22b95572b52141c7d991f9d8bc84dc605f30c062a9cdd42d610ba5eb2f8e1ce3a8489f4ba816fca5eca7e5d8 +DIST brotli-decompressor-2.3.4.crate 192085 BLAKE2B 8ae8a47410215cbae102bbf19aa87f05e8739d6fe31e8eaff25948b1b4138ffed36e699947be30faf0b48891a010c10aafa835065cbd9a31f0c2628564a02359 SHA512 2698f1d9fc33ae37efc4587a448255320c864d1bba498ead93c5e28167ef696bcb5ddec9d4292b5fde93c3acddb7e99b453d6507780d0034e325bd20e5222c62 +DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b +DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa +DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089 +DIST clap-4.4.4.crate 54812 BLAKE2B 62c4de57d222fa41305b0459ab152e85c1a0aa3b9f72c97a87b0e4d3ee30b762fee7dec2831c74ed192b7620bdeb28f8722fa0efc6edaeae51e0d7395c8ecd4e SHA512 92d70ecc3a3d3800edfcbfa6d7767d06027790c4bfa88d0205a62665366511961b5e45630abd1eb53abd121563196ef1171c20b9df18b6fc2e0c6a375b24b770 +DIST clap_builder-4.4.4.crate 162344 BLAKE2B 7c6f4ced18655caea97b52d43bdf28e6b65e952336dddaac83d26ce8166ed17b3c8b67f7612010858624bdc8913b8bae12eb69364f77392426973e8b17c3bda3 SHA512 a74b68fe67ca50177ef79539278f97d2adb872885b5e8babdb486c50fffdec87c42cab9fb4112ad1449d8c22e5fece765d0190654c0d36cf21ad866284bee204 +DIST clap_lex-0.5.1.crate 11793 BLAKE2B 8e3d2dc120401fdd0cf0bf069119c8b7eafa13e5f682c56499062fc09acc05f443caafa6fca791ea53e693a83de69e98fd0488726a4170db037c37118ce0edf1 SHA512 ea5e49e9a8536093f7de89be30add7c3d880b232b0ce393b0429fd4402db2518036998689817bdfd472b6400224fd3c42fec1b5f8538dc433c31dadeb6281e80 +DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 +DIST colored-2.0.4.crate 23654 BLAKE2B 41303ea33785c060415a955383ba2f22ac8e4afe9f1345b9f41dea9817348298f8715c4bfdc60cf4960315c3a7dfabf148f2fdf62e0e0a5ca77e34c57dfca307 SHA512 38e664d23546d77c81da6f5eca6ee8113d6ce20107bf7325255de2c59d532e662ee1f751420bba8ccbbe468b8cb13f743050e4145d0e1f1e37087a1f3a65ada0 +DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6 +DIST core2-0.4.0.crate 37075 BLAKE2B 89ad26bf5eb5ee48dff32d3b6b11e0a84b68e4f29c39fb9db79c64f3c445fde248b33b1ba9d1410673c3fe823ecca25dea637237c384b7cb419de9bceab8a570 SHA512 53c9d2599d87c37d8b6fc8b2293fc16928a97754240e35af770f7e969e4d91ffffe3afbb4e04312de828d1d43ca6c9b734e0725ac5ac9d74f252449ce296ab7b +DIST cpufeatures-0.2.9.crate 11895 BLAKE2B 1e369466bce2ddf7be6bbe219997628223a3a114914e5ed44b44f3fb6d6a084fbb47cc50ecb109287b074e159c675ae89356cb68cd843b41b502ebe824febca0 SHA512 88235b7d7152f4578a321ebc4f83f69070206b2acaf0e6331b52e1a6633e96edc787f9a409ac2e2799106a259166a302150fa4ddc88352b7739d50ac6ca9038f +DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 +DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f +DIST curl-0.4.44.crate 91415 BLAKE2B 0193d51d0ebca5a9ac87a3a2537d573a15d8f0c47e0dba5ad3c0401dfe4a96e63c43a1be054433eb782f90ec61dbc60a12ba035e4fdb033eefe53860d41c3494 SHA512 499c3496cb019856773da10c5dcdf539c3fb7542a5e5dde4923d36e0f9274515b43a68bd31fc18a9adbfa9061d752fa698dfc2fbb6a6b1c1347001b3d112b3e5 +DIST curl-sys-0.4.66+curl-8.3.0.crate 3205987 BLAKE2B 8e3ca4789d714d8cb05effa65541c8c69f516a6361449808e1d813c02455ef015de2f83452de024199395f23b60b0c41a57dc24478542add5d8f9a112e4f9d4e SHA512 2b13381ac0a88e46e0ec009bc5cc7e1ea71c94ea4156d002952e6ecb990e29ddcdb2947b2b7e21fb280823318cb93a8eceeb6e9de438917e65d91a0aa5d297ce +DIST dary_heap-0.3.6.crate 23683 BLAKE2B dad2fc57dc12fb6e8c7f15fe4b1c6ed292c1057274423d9985149a843e82040dedbbe6f76a74888735fd294de9af5af80969593213521b7ade19320f2f027be6 SHA512 76ab17e04f79f8d52f88db3bbb7cb6b6dab1191f1363ebdd6487407e68d716446d043a9e8f43dbc06ed91e1e9d3e0d077f3fb246bb2cc83e831a1553c09cff65 +DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c +DIST encoding-0.2.33.crate 88798 BLAKE2B 4163e26e6f38f7fc1d7424f1135fec1dddd2af3d6dd5f5bc6a5edc3eb3fd56af56858cc0fa5ed6a241b55882807f72f2e5d2940c9a7e5c4c6700ef905727044a SHA512 10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e +DIST encoding-index-japanese-1.20141219.5.crate 91495 BLAKE2B 4deb91b0b2dd1b33bc4b43ac2ec31df0552344b1177c9e504481d62a706b1c187eb3f4e8dd78c62871aa58c86ab6e309494b1b7937843de6056f3d1a0120160c SHA512 879fa0b9a294f3a73a4b224318ce5e44bc1ad0496763a518cb9ee251a4cadeb08885df97eb72f27a1e331f36d46a96824f98b7d128d879c0639405a10e08b8e2 +DIST encoding-index-korean-1.20141219.5.crate 103230 BLAKE2B f3acdd4375ddda1f6b3c070566f1a52dbbbe2384bc6be79150e4e55b88740858791d66f95040ad9f637bf13e381b9f316b14bb5617a8949bab4040b91d0d18bd SHA512 0e79eb9b01fe0354532dc7a8ca55e6332add19827905340560ef9b0e4725becda68ffedd5d18b9ac9d0c4a1b64fb337a9a31de5891b9e6469478fc974e5f9884 +DIST encoding-index-simpchinese-1.20141219.5.crate 130962 BLAKE2B 3c1e498c170edaf2a954439e50b3ccc31560806063a11610c4563975810a65c64e547168674ef778beb1d1d603cd508145f3153a03748d5e8c7e79690af6e3bd SHA512 caffc2a9b77545c2cc22bfcb38c886fba21e765ef49a3cfcfff88ebd76064432638bb432cd57a7ecd23bf2ea074c400c1f043a0589e5aa28024ed3ae0f59be75 +DIST encoding-index-singlebyte-1.20141219.5.crate 14950 BLAKE2B 89faf849452f0fe78b82616614f43bffaf658dd81063ae5d130ad6eb64d38e0ee8a26ab078f8c992f0c7f3e1db768e73920482f5e3bd56b0d7370c72fc93755f SHA512 648a5b9dcbdd40184b6026f6d0593df3b75c5eed554c19a199810c99aba857fccbab2acbf5b047ff42a75a6a3f6e8211a07e70e6fa4048f07144f9132af7d17a +DIST encoding-index-tradchinese-1.20141219.5.crate 120862 BLAKE2B 727a26b32f2bdec20dfeda482fad4235ca3ded489a002c27d0c26cbb9f37ea81f93f7e46ee4750dfcd7385dfc8bc55669a0a21b3acdba2a1fe91b855edd2decb SHA512 3b23213433947af7c56e9ea3e4eaf937b8083ce7e9e481b1351925a6da647be6a037b505116bab08ce73727bec75550bccb877ead6cb7fb0473bb3bd3d40833d +DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e68065ecd6ab602e8fbf8b0f68a5e2af3f34858d363e5f0602f58e4ad3169ddea83d02a0f19a6d635584521397bee63587c9fd9 SHA512 0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6 +DIST errno-0.3.3.crate 10543 BLAKE2B 958e9d12766533ae9e84a60b121794929b9b3b1a8111aca9a2e914beee5784b64c946e143cd8031335ac9cb51069e51dbc9a6b61073a2ccfd3ff60612a20b619 SHA512 9524db39d0c9be287e0d2aed3358a86e961b2868717037212a2e9dc408bc73198ab23196d7923a9ba7e0e9357276075148f582e0325ad36ae1b212a8c674173e +DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916 +DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc +DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8 +DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 +DIST form_urlencoded-1.2.0.crate 8923 BLAKE2B 2408d9bbca582be13febf041262f0e63a3d661dd8fd2a42e9203feb6ff02a94e3eade6b83179fab34448b9913c7924fdf53e0670ae97e550318229432978e33d SHA512 899ddd113a79bdeac12e499f581c5499d1a4b698c75cfc2d6aada5880cd802fc8537ff9ce68eca28374318d66fd70100962105c1e8962868a5732bb86326c104 +DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d +DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b +DIST glob-0.3.1.crate 18880 BLAKE2B dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09 SHA512 29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST hashbrown-0.13.2.crate 105265 BLAKE2B e9ff7e6e753166ab3051a834df6f2da81a19ac6997ba269ab13a65e0abb9ce00839311785aefb451553284ad5ef3a0cda925dc2bc188d2a138a78578e530969c SHA512 21dae7a283326d21e16bb32ae0dd1481c4936939a32a06478a3351c2dec97941be532437b808e99ac40e7900a75433fe0efbd852158659a682461245e19d0e70 +DIST hermit-abi-0.3.3.crate 14253 BLAKE2B 9ed8b40a1cc894addcba2a45562d74359ba55156e2c3a547afce139324b1345df2f158f58978ccd7d343fac5e5d2cda86e2e0a9dafc77af36d4cd8aa0a6d4c03 SHA512 eb162d085e8e0db72571aca925fdb6094d1e5d091766dd62d6a116957459bfadc8d51f1acc67f4da3cf6a8802c0ff445f3ad2516c1df8fcdca0b751632e150a1 +DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 +DIST hex-literal-0.4.1.crate 8559 BLAKE2B ca88420383532a2f2c09e188bc0950cedf74e8335c1e5b3f640dc80607d57bab0aa6967a536a458d149a074f8bc1025a3de99a9081787e7ac80dd8308fa0e5e6 SHA512 8894e48485be7e1d7a16d2e061086c524b039a1be24a4c20126d3f175e12aa87d6d65ae295da6dea88f19708f3f3a051c3c3e334196c094ace68a249ad57fbb6 +DIST hurl-4.1.0.tar.gz 5189715 BLAKE2B ab47cf262c28dff9bc81404ce5fa9dc929c7a5ca86a5420f37e344a6d14a664a4fe2eb2c8ac1080e9bb50788ee4bf85de18eb281004c197e7bcab0d3dafdbd20 SHA512 6d84b770435ee935851c57a51d2eb1bfe2ba390e8e3ff05a808b541ce068984f127c359abdc7769723bc5c2d530d4bc3d3cd9cc3853e62e4d4ffa8363838be1f +DIST iana-time-zone-0.1.57.crate 19785 BLAKE2B 2304a63e4d3a477125ed07fccd5a84832f775c4a0fbd60a995e6f1850aaf3f5047c6f70975c9f6334f96def12770d470677e1f536e9817f8ab1df8a312622cfe SHA512 79bc0fe559dce022cd3c15ffc3b6f870c14a40de6d5a61b4a5a6ad28fe7efce82a16ac5102073a3510f3ba683843475f7fb8a4029bbafbc1cc25e48b98ce2fe8 +DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 +DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST is-terminal-0.4.9.crate 8109 BLAKE2B 0fa495da123f6fe5e3ba5f643f1ee097fc4f8e8aa54d9525b6108855a6a2e58556534a5e8dbfe7b5f8e2f1932003ac63f6aa3384317de7b385cf724bee294468 SHA512 0803ea53945715333d9b5fb18feec7230a49cb1a5f7308e2ea8d06a650e376794dd372be111e85622fd21320228706dd589423510dd010cd6ea112f185c46966 +DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d +DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64 +DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 +DIST libc-0.2.148.crate 690988 BLAKE2B 41dd38cfff1431cd8184220745697d794a66f6badec750be3910ddc4a6ddcf964692b5b28a5a9714592c5579da26248092facb9407920330b55aaef38501420c SHA512 1dec9ec8f4c610c08f62bc2b45dd32f1e4528a045161d848b5c4f0382be1158a690f4d7760203d7d2347a80422671f43b07531871cf44990887eaaed35d924d4 +DIST libflate-2.0.0.crate 42505 BLAKE2B 2ded808b1aed0ce708ce85754359abe470a481eb8aac6572d1b5a525cd68d452da76c2e29d57f40f0568aafb451b9f3989ac16a805486f153a2564e995cbc192 SHA512 62f1222ec0f439ae6c51b89ae2eac7977ad0eb4fe125de21f5decce98cb2f05ee74b4da9b877005b783275ed7eee1e99de386eb927f86bd75d50369820b40441 +DIST libflate_lz77-2.0.0.crate 5893 BLAKE2B 5340b47195ad0af44011906224664d561e6c74145b921656a008f0227fc5d79814c6b189d68f1b5783b167b71b41d1a81fb2eda2035b066c2407435f7bc73498 SHA512 507d24d0e808ac6f3afb9615d325451fe1d02954a48d057c5a04d2cc2416f22b88d0290000379d250ce578ac752b04abaf8c191e97350f0c44b0a839d282cff9 +DIST libm-0.2.7.crate 115688 BLAKE2B e180347d10847c40a88e43d321e08561df053e6fea0cea2cac480c4162c2f31d8697b4572a384edae323d43781d3c6462b2d77220dd71b2fd0da3a2757487db1 SHA512 b7adbf657be812451fc50cd5e5f92b7a71d43b4e48761bd2738d65498c9abad851f8e86d3be06ae75cf39c7798c23cafe767bc5fd40f596774e858f69fcb46d9 +DIST libxml-0.3.3.crate 124388 BLAKE2B 3115c461f1418675ae40f60092be34c1e4f9f2ac1544cdcafc136c6f35b7fd689a7f307db3f46f16c2b69b8cf7d1c73bb6b62ee62df5752005fc43cee344a2ab SHA512 0b4fbb03342485be52812f6684ca3e9e0ee7de87ede15e2b8c363e1c918ebecec95bf63ca285e494e63c4bb41f2cbce96dec8c95df7162e410bfc7e8b027e10e +DIST libz-sys-1.1.12.crate 3030648 BLAKE2B ab8cb974481f86f7ef40eb27ee08ee5535cb914cb76608683b53b57e89d7c92ee4d0831d6d0977ec76476036fdb8c6374ebdf3daa639cfb627e0153d40ca752a SHA512 03daeb5f03193887b692cbe8d631c83ac632f3e92fca4f10e881058fea38d85e11c090de04be9d70d52a22dec669474a0044a3d45d4adeb3a0f39e3398cdac11 +DIST linux-raw-sys-0.4.7.crate 1350647 BLAKE2B 7489b530d59c2b1c32dfa77b260fa9892ec3ce9b15bbac90b0b7565806798d7580145321e0a2206d7a1f50b6cb7684dcd85f30a11dc330f071aa2f6042f941bc SHA512 df36f3f188767080f118aac32138233209a1f0cd11682425fc101cb054e138cf0582ad044d0f326a20ce517f425665ea1ad9ac5eda147712a994884101974d48 +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST md5-0.7.0.crate 6671 BLAKE2B a1c8132cb4d7497ab3f4550e6fffdea6b118ad99a31128c068ea3243b5f76c4b059042da376a0be32fb74e866571348a581c2ca727d6acf855d823ce15f593b5 SHA512 569c992eafe25986a1328666a428b2335ecc5cb7a5ba142c34d7abb1247f6768c0bb3dce790121686d4ebf1b4a1832d65315136552163dfba5f799f99551544a +DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc +DIST num-traits-0.2.16.crate 50130 BLAKE2B 1101d28cb4dce477657684a068792b94c7008a965e655edbabfeff51cbe6f008450dc6d7e4fc5dc4fe9c3ee8623ed77a7bde83ce2f68e75d618295fe6cebe0a8 SHA512 2ef65e2f6275b1000f611cc4d019b2f4846a8964b54d9b96462da10e3ac9edbf3d1de82e40094c76f7f5205740361b0eb0ced414bcddbaba5955144f728c6f94 +DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354 +DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c +DIST openssl-src-300.1.5+3.1.3.crate 8829668 BLAKE2B e8119164d82a1b54215f0b346fe9716dd9db45950c5b92c8a548012c5b98ed21c191254fb94aec8091e658e0b1f682d59952ab775bd499c4b7d6043f4098298d SHA512 addf52dd9af0e9a7fe66a64d1830ee820af2624fb8f9167b61176baa45f529371f47f4db03f54426b95e6f260193177fbd1bf8dcb0d7dd1cf63b986f5ff348e0 +DIST openssl-sys-0.9.93.crate 66922 BLAKE2B 570bfb78704657a89f2e363b96bef65d8cf617f1bb625c271f4728b4cf6011c11369ca1396e01470934fb596528b358a7240520ea706be64e9ce79d83a98b06a SHA512 173a8e28aeda81220a35d3a0b3c09586a235aafa4aceb65dddeccd3b94729e841ceab29b1defbfa1d959d82185c0fe13b0d998e115a098432fbd2a993ef582f0 +DIST percent-encoding-2.3.0.crate 10196 BLAKE2B 155bb1aaf0db4d22179bbe24b2d312f3d507876436e8ce76dfb59775282c1136a6c2bf5672f4b6bc274e4535acc9e50497c3e20b77aa2490512755c9cc9e6c41 SHA512 54ba129b0f3b43627707be994a281cdb69d5a7bdbc91dfeaa0226cf2834adeff7d2597dca5d11dd48b5731e831acf1284497b251abfebc0618761f98fe3c01cd +DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a +DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a +DIST proc-macro2-1.0.67.crate 43683 BLAKE2B a7f485d058ffb654c22ad01088756d8050780e559d86f96590e284c3babf1bb59ce347400c1681b296c6f58e2d42ed67d3e458483368399c22d7810685adcbc6 SHA512 3827f5f698aaecc168a03643e330e03aca7b0de98bd57dc97507c1bd53b6ec64752a1f4dee4c8a12ab02f410775a11f5ce7b0d36ec0e1fbbec197e3d7e199eab +DIST proptest-1.2.0.crate 194884 BLAKE2B dc217485d84af76365170252690d18b0abd472addcf1ebda60db79255d17d48a0f56897b93bbb01d84f20c9c1f53da854bbfd3091c8685229c4dfaa51c673e3f SHA512 b0786ba104849dc45bf1cb970cd7bd8fa645f0bfe1fbd37f1c2535d28d2f7773cc99af67838ebcb546d900f421bb6145c1a70639d5fa2ff0d25b45a2ab176e9e +DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9 +DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 +DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 +DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 +DIST rand_xorshift-0.3.0.crate 9121 BLAKE2B 56c29e159c0beb9c751429130e84e4666f9031b6f70e180544f9cc8f8e85d98676b861b588dbda46f2cdbd254fb908c02c6ba640d53422e6bfa1ae4e48ca5a33 SHA512 256e410e5bc08c56496c53c3d53936f3b1cfed41458b0ee8879d7aa8b95375055746ca49e29000ef847b37f01e9237f569cd000c4b281f6c78ddfc78ce439a49 +DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 +DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde +DIST redox_termios-0.1.2.crate 3268 BLAKE2B 5f3f4e2b7e7a8172f92e8161eb1dcd208b86320868ec351e2f7b47d8ed170b3f44ad8180e44ea7a554de0e53fc268365e683244ad59e4afabd11a09ae378d2b0 SHA512 d8624b2c78d02c5d3afcbecea9ad8d218bff508703cb50684d6ae05614a9f41bf2aa8c47440fbb7d964f01eb9085364222833fbf9c45984508e9d755dac563c1 +DIST regex-1.9.5.crate 253883 BLAKE2B aeb05371251aaa0fd11dce1f22ea095345b3b1e68d9d5e083b4b8b0b938d0d901b3bade66015bec830db3ee71d0d2ccac09b842ff9919e08b0e98112ea1897be SHA512 79b921edc977dc98bd07e89dc17873c8a1088473ddf941504973259bb8c46ad11bbe3818fb88a7ed07b86841206c322a9555033d0a5dfebb18fcae45e07ea53e +DIST regex-automata-0.3.8.crate 610113 BLAKE2B 1aebbca26e76e85b42b035fa9ba02f98425b75fdeeec0f12c1c08e8f4a320c64d36c129c692e622256d7f8772052041c47df1aff165d8337d55d61770963a777 SHA512 47ad01be2c51fd510576e14f399b7f30d379a2cce2dbef3af4ee3e609859451082885132ae703c810e2b19bb3716976356e057a1a592ed507146aff9e7138dac +DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e +DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd +DIST rle-decode-fast-1.0.3.crate 62086 BLAKE2B 402d56595936734f36597c18e816a798ade6a8636b27e79acdedd4069da38e22e6ded5f2358ef0f0d509ea752e828fa294a4a9ac6d99cf26472fe21a505302c9 SHA512 f647cfd9ae0bbaca4a189cd1f8d1f8531f6dc0ffa1fd296c75cfe405fc9060e25be74581558a9195364ea90e32c7ccd60e066d21704cae836d41606b5799301a +DIST rustix-0.38.14.crate 344026 BLAKE2B a0c023600d26163e9ecbcfcd200e01fead329b003879e6cd1459a5b55fe2a08fbd24f5b08e6b2082c502f89cddf9c65b16c95aa9768b79864771bb3dc289107c SHA512 d0f6dcf2cf7e6ad0937ee4c8978e3df16c3f9fe0f23292289eb35debca2ef532a0126dd71ca3382eaf2ed385a1a9f1454f2262bd3582eea014eba41ebf68dc3d +DIST rusty-fork-0.3.0.crate 19881 BLAKE2B 01bae755c66d7e4f72789b7140de35573d82961adadcc9febb841e332fc2730b405d4f1dc8aff1db6eba3ca03ee24d5dcd9a9c9a914fd2a94428c796dc9bfcd0 SHA512 8e41e12971c36ae1d4439943e55204e32fb4e62717355a2bf79152825eef7dac305c2fe22468957cb3b7af0b27004ceb18eee2d2fa0a6f8822b28b711f64ccd7 +DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b +DIST schannel-0.1.22.crate 41642 BLAKE2B ccb512f6c6765e5245dcee607b7886411710aa89d317cbaed2f511f74a927a0083042653e070c9d4b976ec83a74f3f37218f3ecb621781ee367b774596227f68 SHA512 6ec962cbd25f25dcee5e31b5012e61d38b97a7e8651a5439ab4cbc8ab33a0e2ce04fa22e06a82ef8750001c6659937ffd8dccb0cbd6971f68b0c354d0075aaa0 +DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2 +DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0 +DIST serde_json-1.0.107.crate 146458 BLAKE2B 753be6076826ee0ba41a067e81c031e6fd69b539086a2d649e6595136fd05d61b717c3d4cb6774af0a0c02102f7f4588e682bd21732450afa93877d093596880 SHA512 ecd4ef86538df402f2a397cb86c5b4b277a9a43d742e2af3d51ab5ac0ba31c677bfc72db06c10f8abbc970ee41d5f77d758f1f70ea18495d96bf78cb7d66c2bc +DIST sha2-0.10.7.crate 22541 BLAKE2B 918a8f4042c57e4f8931d645ba758f6e7da911d02482c78d6ef3a12e8068e7f3a08526580824ab548628fa7e75bc64f17bb12f1ceb167861a781ab9813eafbd4 SHA512 c33d6bdecaf49d0f60276531e845231425f62d2ec18c4d53c43e49f506a2dcb2548f5866c6642806b6b64f008a481c48920b7b4fc867df7443dc31b44f297fdc +DIST socket2-0.4.9.crate 45421 BLAKE2B 19c296b1b42839086793a29234f604a6c94ed1b9d30c4eb1ec695a76acfa266840f482e64b4ee2d5b4520f70849fbaf88984020ac25ec393918b89b2682d2541 SHA512 6cb2aabc409fc7d9942afc2073a36ad8730c06dcdab1866b9d3d72dc55afc643be6a2ca1f38c2e19fbfe782ae584512a1ab357c0f4974f98967a4f489e65331f +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST syn-2.0.37.crate 243250 BLAKE2B b81750ed52bf75bf944542c373a88f5a54421c230c86f23d0ed3e5680d85bb454251bf43e0ad7bd3e2464e6df579550cca1e17e8b044ba62a27a25f3940ff20b SHA512 5cc8f2a17f891477a9b2078580bcb4c5dec0b540fdc4d2c0b8dd51972c734ff4519e891166c1c5f6d35b73bfb564ac747836f7487481a2ea26fb7d8405835023 +DIST tempfile-3.8.0.crate 31720 BLAKE2B ac975555bb4957f91e7d5733ef737bf25c62a738096457afa05079ed038de5e7144cbfd0e28bacd3eeb832de611616fb39ec07866481205c1f5c1005b2869d31 SHA512 8bc8e954bc0c6af46cf6e77d70f93583baea39fce54b111f4bba51fe5d5e5c184753ae2a2ea68a882b6ba5a157a57aeffeecc3e3cae86d78d952f3aa025fdf7f +DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681 +DIST termion-2.0.1.crate 23405 BLAKE2B 457b7d939e8002cbccb8cf151bc33ad6189ac0a684f262909ba391cd6c54403edace919cc53dafb9514b108f0382b7c4e603b25f02e69d1d032d5597d09f9c82 SHA512 4e46fe6ad0e3e3047796253e5064f044f9feb34f9341d478a0548ef32e46a7a6c0fe86ec0ae2e8b700d5b3ac85d0ccb8aec63064ba40cadfcc8714a5a10225df +DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c +DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e +DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317 +DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508 +DIST unarray-0.1.4.crate 12895 BLAKE2B 20fab4ce218941bad9ae341d24e92469b01f46523adf9d6c80cf2418b79dc529011f357e3c96a66ad96bf822358581a150f75c4d3ca67043e01814c59f1a9bd1 SHA512 373d16e9688938762c61cc9056a50badfde417f64385de1949678333cf9465cc496a357707989da83ee5e4ab041a89688fcd3ab9dfb9c6ec66446c9f5b56b630 +DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c +DIST url-2.4.1.crate 78228 BLAKE2B 6e324237af50605e9285889d967e6a66e258982c5e78ec99b2df68cbcc555574c0b0d650724ecb015e1065c737c88e3c04205973c35b0afcd63f222e91dde3f9 SHA512 ff2aed100e405f4474e17dcc01d59b63460e7a8babeb7cdcf9df6c1c65216c425e24d557f76c7097702b2befc381656107bef755ce929089b52a3901c46aa185 +DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 +DIST uuid-1.4.1.crate 55291 BLAKE2B 36a1d7abe0a695f6fa3a8ad3a0c8a078bc61b17396a317b01226d9b35a3544a8a74305ade1166dfee7a9028e6d4a1e6b0956dc0975ea58a86ec6052fb869c577 SHA512 95914b62948941e9dcda7b66b932088b328a23286d163449a72961874f4a856db6db1d60a125e56cd1d7b1c00391485a45520852ea49bd8e5a7b8cae8ecf8b96 +DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST wasm-bindgen-0.2.87.crate 175052 BLAKE2B bf8cf4aa1786ac5c2ba76e80500b5c54313adf9690ef370e60b894401bd1b81416da7bb46b90c014412c96f30f995bd1e52cf7f3a6be1111aea40866e8178396 SHA512 0c3099155ef079d2b91d2d5b135243d687bf865cdd9ae9d97d8cc2eb4c9bf7439b66b28d5b1d7e95048e53be63ed4909b6b3f2427951348de25ca7abb7a03705 +DIST wasm-bindgen-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94 +DIST wasm-bindgen-macro-0.2.87.crate 13897 BLAKE2B 0926975b0328cdd5525820358795b7b68b4ab9dc460715ed84e5d276e76e936057140efb1ba875acf25f3d2862e680f9827bd05cc47560d54f7ec673f30244cb SHA512 af366d8d853b280014cdf5286f3b1f6d7fb0837ce6e359a81cb6f85161537c8e2cd06d7f893c957f5bf1548d34084d33a213670b471937782b56033a23cb15a6 +DIST wasm-bindgen-macro-support-0.2.87.crate 20006 BLAKE2B d32dfc7231e4fbc226586e66063538208f9e299fbf803c4e2d1e1e61b4a22f51cc7509bdd269a44f072f9843a083ee84d2326408fb3211009ce93542c3fdc6ce SHA512 9390aa2767fed1027be168612c424d4c7cd4423addd83b79afd8c67886f66303ca4846e6454302ecc78b47bc62e8ee46849a4c0d3edb98849ce8476901424e33 +DIST wasm-bindgen-shared-0.2.87.crate 7248 BLAKE2B 0393ce9452119fd5f92836a76b28d3a697f91fb09de39d1af0a2a83e81d48bd4a17f39b48f15ae97edca3e361d4f8fedae8de04173c4ba1711decc73f64000d5 SHA512 cb9ff537554f56fd07052ddc4adc904a57ee64e13298df1dfca58b361ce163c34640e7dd9ed301ec1375f335dfa424230e22638ea7569ceb34aeca4505f6c008 +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 +DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-0.48.0.crate 11864177 BLAKE2B 39c0e4f058f68a829ee08721818a0b04287af20dfe6e03a125b75566b4c8a58b56557d685600f1f9c215811154f9782f12368d42848445d54dcf9bfd6471349d SHA512 7c906f885fa0a730f1cb1ef4e62f5b602a49d44343febe1d38fcd4cbc28e0342766983796042585fe457aa229333558715b6270e378946faa8f398a7ecc2af8c +DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST winres-0.1.12.crate 19772 BLAKE2B 645fc16e49061cd98c77217b991cb774151f7f8bd6df44cee622bcba121d2645aaf775d56c3e85de6278b193ea6a36256821799c33ba081f931d87ffa0e038f1 SHA512 9f61edafb4a262b56d130e48ac6bba94f5a432bf0a8c20243e6c8fa98c3f9e0d2ab00a77b35a2e49dd63585a272af597e236e089641b5f488760ac42d22f5a67 +DIST xml-rs-0.8.18.crate 54004 BLAKE2B 5aab6a45279d063a47ef177f97ad3543ebea2ce2b80f49a504a81c04de3a2577898ede96a801c16f6cc690d977253f971ba453bdc06af2d8943bda3c45e89d17 SHA512 d6b84d9e5704a30f97a56bc5b917f4df46b6ff6bb18d93442bab3362e8c12b9bfa2bedc1fc77026ad66e686082ad4fa51fa63ba9ab8cda935f05e809cc7a359c +DIST xmltree-0.10.3.crate 9219 BLAKE2B 82f888788e7001caa39dc32f5233b41e52fc247e0dc59f9297fb4e104d45de9ffcc5859cf3f7d8ef81562b16e88275ec14d245abad95f6d2bdb019850eff9f21 SHA512 e5a1f349fddb13fdfb56c65ea7a77cf28108cddfca0164a858b314942949309a0cc95d824d4c535339f75f7a16a744fb7679739d4fa64fe6c2dc64e71604cdd7 diff --git a/net-misc/hurl/hurl-4.1.0.ebuild b/net-misc/hurl/hurl-4.1.0.ebuild new file mode 100644 index 000000000000..f180dcb7aa7a --- /dev/null +++ b/net-misc/hurl/hurl-4.1.0.ebuild @@ -0,0 +1,203 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Autogenerated by pycargoebuild 0.10 + +EAPI=8 + +CRATES=" + adler32@1.2.0 + ahash@0.8.3 + aho-corasick@1.1.1 + alloc-no-stdlib@2.0.4 + alloc-stdlib@0.2.2 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anstream@0.5.0 + anstyle-parse@0.2.1 + anstyle-query@1.0.0 + anstyle-wincon@2.1.0 + anstyle@1.0.3 + autocfg@1.1.0 + base64@0.21.4 + bit-set@0.5.3 + bit-vec@0.6.3 + bitflags@1.3.2 + bitflags@2.4.0 + block-buffer@0.10.4 + brotli-decompressor@2.3.4 + brotli@3.3.4 + bumpalo@3.14.0 + byteorder@1.4.3 + cc@1.0.83 + cfg-if@1.0.0 + chrono@0.4.31 + clap@4.4.4 + clap_builder@4.4.4 + clap_lex@0.5.1 + colorchoice@1.0.0 + colored@2.0.4 + core-foundation-sys@0.8.4 + core2@0.4.0 + cpufeatures@0.2.9 + crc32fast@1.3.2 + crypto-common@0.1.6 + curl-sys@0.4.66+curl-8.3.0 + curl@0.4.44 + dary_heap@0.3.6 + digest@0.10.7 + encoding-index-japanese@1.20141219.5 + encoding-index-korean@1.20141219.5 + encoding-index-simpchinese@1.20141219.5 + encoding-index-singlebyte@1.20141219.5 + encoding-index-tradchinese@1.20141219.5 + encoding@0.2.33 + encoding_index_tests@0.1.4 + errno-dragonfly@0.1.2 + errno@0.3.3 + fastrand@2.0.0 + float-cmp@0.9.0 + fnv@1.0.7 + form_urlencoded@1.2.0 + generic-array@0.14.7 + getrandom@0.2.10 + glob@0.3.1 + hashbrown@0.12.3 + hashbrown@0.13.2 + hermit-abi@0.3.3 + hex-literal@0.4.1 + hex@0.4.3 + iana-time-zone-haiku@0.1.2 + iana-time-zone@0.1.57 + idna@0.4.0 + indexmap@1.9.3 + is-terminal@0.4.9 + itoa@1.0.9 + js-sys@0.3.64 + lazy_static@1.4.0 + libc@0.2.148 + libflate@2.0.0 + libflate_lz77@2.0.0 + libm@0.2.7 + libxml@0.3.3 + libz-sys@1.1.12 + linux-raw-sys@0.4.7 + log@0.4.20 + md5@0.7.0 + memchr@2.6.3 + num-traits@0.2.16 + numtoa@0.1.0 + once_cell@1.18.0 + openssl-probe@0.1.5 + openssl-src@300.1.5+3.1.3 + openssl-sys@0.9.93 + percent-encoding@2.3.0 + pkg-config@0.3.27 + ppv-lite86@0.2.17 + proc-macro2@1.0.67 + proptest@1.2.0 + quick-error@1.2.3 + quote@1.0.33 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + rand_xorshift@0.3.0 + redox_syscall@0.2.16 + redox_syscall@0.3.5 + redox_termios@0.1.2 + regex-automata@0.3.8 + regex-syntax@0.6.29 + regex-syntax@0.7.5 + regex@1.9.5 + rle-decode-fast@1.0.3 + rustix@0.38.14 + rusty-fork@0.3.0 + ryu@1.0.15 + schannel@0.1.22 + serde@1.0.188 + serde_derive@1.0.188 + serde_json@1.0.107 + sha2@0.10.7 + socket2@0.4.9 + strsim@0.10.0 + syn@2.0.37 + tempfile@3.8.0 + terminal_size@0.3.0 + termion@2.0.1 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + toml@0.5.11 + typenum@1.17.0 + unarray@0.1.4 + unicode-bidi@0.3.13 + unicode-ident@1.0.12 + unicode-normalization@0.1.22 + url@2.4.1 + utf8parse@0.2.1 + uuid@1.4.1 + vcpkg@0.2.15 + version_check@0.9.4 + wait-timeout@0.2.0 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.87 + wasm-bindgen-macro-support@0.2.87 + wasm-bindgen-macro@0.2.87 + wasm-bindgen-shared@0.2.87 + wasm-bindgen@0.2.87 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows@0.48.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 + winres@0.1.12 + xml-rs@0.8.18 + xmltree@0.10.3 +" + +inherit cargo + +DESCRIPTION="Hurl, run and test HTTP requests" +HOMEPAGE="https://hurl.dev" +SRC_URI=" + https://github.com/Orange-OpenSource/${PN}/archive/refs/tags/${PV}.tar.gz -> ${PN}-${PV}.tar.gz + ${CARGO_CRATE_URIS} +" + +LICENSE="Apache-2.0" +# Dependent crate licenses +LICENSE+=" + BSD CC0-1.0 MIT MPL-2.0 Unicode-DFS-2016 ZLIB + || ( Apache-2.0 Boost-1.0 ) +" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + net-misc/curl + dev-libs/libxml2 +" +DEPEND="${RDEPEND}" + +# Rust. +QA_FLAGS_IGNORED=( + /usr/bin/hurl + /usr/bin/hurlfmt +) + +QA_PRESTRIPPED="${QA_FLAGS_IGNORED[*]}" + +src_install() { + local target_dir="$(usex debug debug release)" + dobin target/"${target_dir}"/hurl{,fmt} + doman docs/manual/hurl{,fmt}.1 + + dodoc CHANGELOG.md README.md LICENSE +} diff --git a/net-misc/cni-plugins/metadata.xml b/net-misc/hurl/metadata.xml index 8359d9316145..cb7dbfdc6787 100644 --- a/net-misc/cni-plugins/metadata.xml +++ b/net-misc/hurl/metadata.xml @@ -2,10 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> + <email>arsen@gentoo.org</email> + <description>Arsen Arsenović</description> </maintainer> <upstream> - <remote-id type="github">containernetworking/plugins</remote-id> + <remote-id type="github">Orange-OpenSource/hurl</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest index b133afba0840..879f2476cabe 100644 --- a/net-misc/hylafaxplus/Manifest +++ b/net-misc/hylafaxplus/Manifest @@ -1 +1,2 @@ -DIST hylafax-7.0.3.tar.gz 1405116 BLAKE2B dbf8f87380929eb79ca0f18042c3397460dd6774f16defde8e9427d1d14094e00f6be491552f3ff6cc4c3d1fad0ec67a0c1a5fa3b4cb1e07c2f0c956eaefe8ed SHA512 938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175d599c35f3b383cb0748518644587c203fb429966b5de3b615689d856281a +DIST hylafax-7.0.6.tar.gz 1418749 BLAKE2B 83fff43dbc5c51f542aa847f61ae1617514a4260695d5c79a036416578ac632a778d0b5263a80fa7ccea9e9923a783759295a39199bdd32a2cb0ecac47ac91b4 SHA512 d1f69e13017f5d013ff39cf050c3a7ac6cef19a9ee5910ebe774a7ae06d7d22fd21e31de9734847764caea995539f578c3c458ecec7b9523b5823a841337d9cb +DIST hylafaxplus-7.0.6-tiff-4.5.0.patch.xz 5880 BLAKE2B 866de4d8f6159dcf8e27061c49a94e7e9b91f7ae74fad59cb35b99fb2f15bc8f45b4961bd616036bb494b06039658e3f9ec286ebc5de41ab6b6338051bddbc48 SHA512 44fc3460a5bd239e039a13b931ef795afa3767c749d6eee09efa8264f0c5288739ffbe1f0011ee156f7d44db455e07c1d3fd72722fb9994bab51fbbbfd25ab82 diff --git a/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch b/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch deleted file mode 100644 index 8c4dbda35cc5..000000000000 --- a/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.gentoo.org/706154 -https://bugs.gentoo.org/810658 ---- a/configure -+++ b/configure -@@ -2583,7 +2583,7 @@ EOF - echo '#define TIFFSTRIPBYTECOUNTS uint32' - echo '#define TIFFVERSION TIFF_VERSION' - echo '#define TIFFHEADER TIFFHeader';; -- 4.[01]) tiff_runlen_t="uint32" -+ 4.[0123456789]) tiff_runlen_t="uint32" - tiff_offset_t="uint64" - echo '#define TIFFSTRIPBYTECOUNTS uint64' - echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' diff --git a/net-misc/hylafaxplus/files/hylafaxplus-7.0.6-allow-tiff-4.5.patch b/net-misc/hylafaxplus/files/hylafaxplus-7.0.6-allow-tiff-4.5.patch new file mode 100644 index 000000000000..dc48efa212bb --- /dev/null +++ b/net-misc/hylafaxplus/files/hylafaxplus-7.0.6-allow-tiff-4.5.patch @@ -0,0 +1,12 @@ +--- a/configure ++++ b/configure +@@ -2583,7 +2583,7 @@ EOF + echo '#define TIFFSTRIPBYTECOUNTS uint32_t' + echo '#define TIFFVERSION TIFF_VERSION' + echo '#define TIFFHEADER TIFFHeader';; +- 4.[01234]) tiff_runlen_t="uint32_t" ++ 4.[012345]) tiff_runlen_t="uint32_t" + tiff_offset_t="uint64_t" + echo '#define TIFFSTRIPBYTECOUNTS uint64_t' + echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' + diff --git a/net-misc/hylafaxplus/files/hylafaxplus-init b/net-misc/hylafaxplus/files/hylafaxplus-init deleted file mode 100644 index c15f26774a86..000000000000 --- a/net-misc/hylafaxplus/files/hylafaxplus-init +++ /dev/null @@ -1,176 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation -# Author Geaaru -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="zap" - -depend() { - use lo -} - -checkconfig() { - ebegin "Check hylafax server configuration..." - - if [ x$spooldir == x ] ; then - eerror "No spooldir directory defined" - return 1 - else - SPOOL=$spooldir - einfo "Use spool directory $SPOOL" - fi - - if [ x$mode == x ] ; then - eerror "No mode defined" - return 1 - fi - - if [ ! -f $SPOOL/etc/setup.cache ] ; then - eerror "No $SPOOL/etc/setup.cache file founded. Use faxsetup command" - return 1 - fi - - if [[ x$hfaxd == x || ! -f $hfaxd ]] ; then - eerror "No hfaxd daemon founded" - return 1 - fi - - if [[ x$faxq == x || ! -f $faxq ]] ; then - eerror "No faxq program founded" - return 1 - fi - - if [[ x$faxgetty == x || ! -f $faxgetty ]] ; then - eerror "No faxgetty program founded" - return 1 - fi - - if [ x$faxbind == x ] ; then - eerror "No binding address supply" - return 1 - fi - - if [ x$piddir == x ] ; then - PIDDIR=$SPOOL - else - PIDDIR=$piddir - fi - - - hfaxd_args="-l $faxbind -q $SPOOL" - - case $mode in - newproto) - if [[ x$faxport == x ]] ; then - eerror "No faxport defined" - return 1 - fi - hfaxd_args="$hfaxd_args -i $faxport" - ;; - oldproto) - if [[ x$oldprotoport == x ]] ; then - eerror "No oldprotoport defined" - return 1 - fi - hfaxd_args="$hfaxd_args -o $oldprotoport" - ;; - snpp) - if [[ x$snppport == x ]] ; then - eerror "No snppport defined" - return 1 - fi - hfaxd_args="$hfaxd_args -s $snppport" - ;; - any) - if [[ x$faxport == x || x$snppport == x || x$oldprotoport == x ]] ; then - eerror "No port data founded for old services" - return 1 - fi - hfaxd_args="$hfaxd_args -i $faxport -s $snppport -o $oldprotoport" - ;; - *) - eerror "Invalid mode" - return 1 - ;; - - esac - - faxq_args="-q $SPOOL" - - # workaround for manage save of pidfile with start-stop-daemon - hfaxd_args="$hfaxd_args -d" - faxq_args="$faxq_args -D" - - return 0 -} - -start() { - local result - - checkconfig || return 1 - - ebegin "Starting HylaFAX server daemons" - - start_faxq - result=$? - - if [ $result -ne 0 ] ; then - eerror "Error on start $faxq daemon" - return 1 - fi - - start_hfaxd - result=$? - - eend $result -} - -start_hfaxd() { - local arguments="--start \ - --make-pidfile --pidfile $PIDDIR/hfaxd.pid" - - einfo "Starting $hfaxd with args $hfaxd_args" - - start-stop-daemon -b ${arguments} --exec $hfaxd -- $hfaxd_args > /dev/null 2>&1 - - return $?; -} - -start_faxq() { - local arguments="--start \ - --make-pidfile --pidfile $PIDDIR/faxq.pid" - einfo "Starting $faxq ... " - - start-stop-daemon -b ${arguments} --exec $faxq -- $faxq_args > /dev/null 2>&1 - - return $? -} - -stop() { - checkconfig || return 1 - - ebegin "Stopping HylaFAX server daemons" - - start-stop-daemon --stop --quiet --pidfile $PIDDIR/hfaxd.pid - start-stop-daemon --stop --quiet --pidfile $PIDDIR/faxq.pid - eend $? -} - -zap() { - checkconfig || return 1 - - ebegin "Zap HylaFAX server daemon files" - - if [ -f $PIDFILE/hfaxd.pid ] ; then - rm -f $PIDFILE/hfaxd.pid - fi - - if [ -f $PIDFILE/faxq.pid ] ; then - rm -f $PIDFILE/faxq.pid - fi -} - -restart() { - stop - start -} diff --git a/net-misc/hylafaxplus/files/hylafaxplus-init-r1 b/net-misc/hylafaxplus/files/hylafaxplus-init-r1 new file mode 100644 index 000000000000..9a602b44aa70 --- /dev/null +++ b/net-misc/hylafaxplus/files/hylafaxplus-init-r1 @@ -0,0 +1,174 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="zap" + +depend() { + use lo +} + +checkconfig() { + ebegin "Check hylafax server configuration..." + + if [ x${spooldir} = x ] ; then + eerror "No spooldir directory defined" + return 1 + else + SPOOL=${spooldir} + einfo "Use spool directory ${SPOOL}" + fi + + if [ x${mode} = x ] ; then + eerror "No mode defined" + return 1 + fi + + if [ ! -f ${SPOOL}/etc/setup.cache ] ; then + eerror "No ${SPOOL}/etc/setup.cache file found. Use faxsetup command" + return 1 + fi + + if [ x${hfaxd} = x ] || [ ! -f ${hfaxd} ] ; then + eerror "No hfaxd daemon found" + return 1 + fi + + if [ x${faxq} = x ] || [ ! -f ${faxq} ] ; then + eerror "No faxq program found" + return 1 + fi + + if [ x${faxgetty} = x ] || [ ! -f ${faxgetty} ] ; then + eerror "No faxgetty program found" + return 1 + fi + + if [ x${faxbind} = x ] ; then + eerror "No binding address supplied" + return 1 + fi + + if [ x${PIDDIR} = x ] ; then + PIDDIR=${SPOOL} + else + PIDDIR=${piddir} + fi + + + hfaxd_args="-l ${faxbind} -q ${SPOOL}" + + case ${mode} in + newproto) + if [ x${faxport} = x ] ; then + eerror "No faxport defined" + return 1 + fi + hfaxd_args="${hfaxd_args} -i ${faxport}" + ;; + oldproto) + if [ x${oldprotoport} = x ] ; then + eerror "No oldprotoport defined" + return 1 + fi + hfaxd_args="${hfaxd_args} -o ${oldprotoport}" + ;; + snpp) + if [ x${snppport} = x ] ; then + eerror "No snppport defined" + return 1 + fi + hfaxd_args="${hfaxd_args} -s ${snppport}" + ;; + any) + if [ x${faxport} = x ] || [ x${snppport} = x ] || [ x${oldprotoport} = x ] ; then + eerror "No port data founded for old services" + return 1 + fi + hfaxd_args="${hfaxd_args} -i ${faxport} -s ${snppport} -o ${oldprotoport}" + ;; + *) + eerror "Invalid mode" + return 1 + ;; + + esac + + faxq_args="-q ${SPOOL}" + + # workaround for manage save of pidfile with start-stop-daemon + hfaxd_args="${hfaxd_args} -d" + faxq_args="${faxq_args} -D" + + return 0 +} + +start() { + local result + + checkconfig || return 1 + + ebegin "Starting HylaFAX server daemons" + + start_faxq + result=$? + + if [ ${result} -ne 0 ] ; then + eerror "Error on start ${faxq} daemon" + return 1 + fi + + start_hfaxd + result=$? + + eend ${result} +} + +start_hfaxd() { + local arguments="--start \ + --make-pidfile --pidfile ${PIDDIR}/hfaxd.pid" + einfo "Starting ${hfaxd} with args ${hfaxd_args}" + + start-stop-daemon -b ${arguments} --exec ${hfaxd} -- ${hfaxd_args} > /dev/null 2>&1 + + return $?; +} + +start_faxq() { + local arguments="--start \ + --make-pidfile --pidfile ${PIDDIR}/faxq.pid" + einfo "Starting ${faxq} ... " + + start-stop-daemon -b ${arguments} --exec ${faxq} -- ${faxq_args} > /dev/null 2>&1 + + return $? +} + +stop() { + checkconfig || return 1 + + ebegin "Stopping HylaFAX server daemons" + + start-stop-daemon --stop --quiet --pidfile ${PIDDIR}/hfaxd.pid + start-stop-daemon --stop --quiet --pidfile ${PIDDIR}/faxq.pid + eend $? +} + +zap() { + checkconfig || return 1 + + ebegin "Zap HylaFAX server daemon files" + + if [ -f ${PIDDIR}/hfaxd.pid ] ; then + rm -f ${PIDDIR}/hfaxd.pid + fi + + if [ -f ${PIDDIR}/faxq.pid ] ; then + rm -f ${PIDDIR}/faxq.pid + fi +} + +restart() { + stop + start +} diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r4.ebuild index a4859f2b0da8..e7c00f66c073 100644 --- a/net-misc/hylafaxplus/hylafaxplus-7.0.3.ebuild +++ b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r4.ebuild @@ -1,54 +1,61 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit pam toolchain-funcs +inherit edo pam toolchain-funcs MY_PN="${PN/plus/}" MY_P="${MY_PN}-${PV}" DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems" -HOMEPAGE="http://hylafax.sourceforge.net" -SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" +HOMEPAGE="https://hylafax.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/hylafax/${MY_P}.tar.gz" +# bug #886303 +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-tiff-4.5.0.patch.xz" +S="${WORKDIR}"/${MY_P} -SLOT="0" LICENSE="hylafaxplus" +SLOT="0" KEYWORDS="amd64 x86" IUSE="html jbig lcms ldap mgetty pam" +# <tiff-4.6: https://sourceforge.net/p/hylafax/mailman/message/38259441/ DEPEND=" app-text/ghostscript-gpl - media-libs/tiff:0[jbig?] - !net-dialup/mgetty[fax] + <media-libs/tiff-4.6:=[jbig?] + media-libs/libjpeg-turbo:= >=sys-libs/zlib-1.1.4 - virtual/awk - virtual/jpeg:0 + app-alternatives/awk + virtual/libcrypt:= virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam ) " -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} + !net-dialup/mgetty[fax] !net-dialup/sendpage - net-mail/metamail " CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax" CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog" +# See bug #706154, bug #810658 if need to patch for newer libtiff. PATCHES=( - "${FILESDIR}/ldconfig-patch" - "${FILESDIR}"/${PN}-7.0.2-tiff-4.2.patch + "${FILESDIR}"/ldconfig-patch + "${FILESDIR}"/${P}-allow-tiff-4.5.patch + "${WORKDIR}"/${P}-tiff-4.5.0.patch ) src_prepare() { default - # force it not to strip binaries + # Force it not to strip binaries + local dir for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \ hfaxd sendfax sendpage ; do sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \ @@ -57,7 +64,7 @@ src_prepare() { sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed" - # Respect LDFLAGS(at least partially) + # Respect LDFLAGS (at least partially) sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed" sed -i -e "s|-fpic|-fPIC|g" \ @@ -65,12 +72,6 @@ src_prepare() { } src_configure() { - do_configure() { - echo ./configure --nointeractive ${1} - # eval required for quoting in ${my_conf} to work properly, better way? - eval ./configure --nointeractive ${1} || die "./configure failed" - } - local my_conf=( --with-DIR_BIN=/usr/bin --with-DIR_SBIN=/usr/sbin @@ -87,8 +88,8 @@ src_configure() { --with-PATH_IMPRIP="" --with-SYSVINIT=no --with-REGEX=yes - --with-LIBTIFF=\"-ltiff -ljpeg -lz\" - --with-OPTIMIZER=\"${CFLAGS}\" + --with-LIBTIFF="-ltiff -ljpeg -lz" + --with-OPTIMIZER="${CFLAGS}" --with-DSO=auto --with-HTML=$(usex html) ) @@ -107,7 +108,7 @@ src_configure() { ) fi - #--enable-pam isn't valid + # --enable-pam isn't valid use pam || my_conf+=( $(use_enable pam) ) use lcms || my_conf+=( $(use_enable lcms) ) use ldap || my_conf+=( $(use_enable ldap) ) @@ -115,7 +116,7 @@ src_configure() { tc-export CC CXX AR RANLIB - do_configure "${my_conf[*]}" + edo ./configure --nointeractive "${my_conf[@]}" } src_compile() { @@ -128,8 +129,8 @@ src_install() { dodir /var/spool /var/spool/fax fowners uucp:uucp /var/spool/fax fperms 0600 /var/spool/fax - dodir "/usr/share/doc/${P}/samples" + dodir /usr/share/doc/${PF}/samples emake DESTDIR="${D}" \ BIN="${D}/usr/bin" \ SBIN="${D}/usr/sbin" \ @@ -153,8 +154,8 @@ src_install() { CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog" EOF - newconfd "${FILESDIR}/${PN}-conf" ${PN} - newinitd "${FILESDIR}/${PN}-init" ${PN} + newconfd "${FILESDIR}"/${PN}-conf ${PN} + newinitd "${FILESDIR}"/${PN}-init-r1 ${PN} use pam && pamd_mimic_system ${MY_PN} auth account session diff --git a/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild b/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild index d84be367eebf..3216b0c2b29c 100644 --- a/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild +++ b/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Software modem that uses an IAX channel instead of a traditional phone line" HOMEPAGE="https://sourceforge.net/projects/iaxmodem/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -60,7 +60,7 @@ src_compile() { emake cd "${S}" - emake OBJS="iaxmodem.o" CC=$(tc-getCC) \ + emake OBJS="iaxmodem.o" CC="$(tc-getCC)" \ LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/iaxmodem \ -Llib/spandsp/src/.libs -Llib/libiax2/src/.libs -lm -lutil -ltiff -lspandsp -liax" } diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest index cb682fdba518..e17a04187a42 100644 --- a/net-misc/icaclient/Manifest +++ b/net-misc/icaclient/Manifest @@ -1,4 +1,4 @@ -DIST linuxx64-21.8.0.40.tar.gz 150632410 BLAKE2B a63480e5c5a934a06a66e6754013e6a75a962d36b851c9a43d9dcef6e0dc99aeea1331a547386f72a1700bd1c3b31994506b8c0923656fa7bbf8bedf0bcaf032 SHA512 6673312555d1b391bfadcde72ca6d6439f477a53b1206fae403921f73aa7535e7df56eefc226372ddd7707601368e32c5393f91f8a7ffb68f7c66da88ded128a -DIST linuxx64-21.9.0.25.tar.gz 157545077 BLAKE2B c35d5da11809d68a8618d5d07df092f0ccc1af4f32485dbf5032aa7cfc0a78311d742e34bece6791c80d2798c277a9cc1a618bb2291d63b97926cda42fcd2fb4 SHA512 f111ba048464aad1ecdd543faf6cd7db2ea45b7934f9acf06864239ff653eb0d87abe8267a7717db45b6607b20764e1c26e0901e82e6907a4a3c09d6b331449e -DIST linuxx86-21.8.0.40.tar.gz 135966502 BLAKE2B a870cbe584958deeb5727a3994d6bfd93c62f2e6a100c029cd1d5514ee6a8d788ed43b51a6bd01b7ba47f12d40b0669807183717b7231b0cc9b919654279e4ac SHA512 86e82ee8d00604f75e7042989e298a87be48a81717865237e9e0ccdb6def91a4d7f52319773f0a04b31db0b6bcf90a4457355414e62cfb6595511a6679525a66 -DIST linuxx86-21.9.0.25.tar.gz 139524584 BLAKE2B e8854b2a363b7d15b490f97239d6a4af9e5bd32fa70e7884b5f23ccba9b072d74e7d4d11b39b1eb252e3d0d37ed8450f105e864f0b17f42f1ee1a47723b444e0 SHA512 326109d17142aa633a64afd1ed5972ae7fec3182e3d8bed74ce93a0fba9db3c86a6c73831d2b9c4a1424ad885f2462289786dd7a92ea23c429560c700be89416 +DIST linuxx64-23.5.0.58.tar.gz 449048746 BLAKE2B d0a70dbb29addc5da8f4ca32582eb210ef56cbbab21efa61ea19ae45ae12fcc59b080f0f30fdc5d1ed02169b5084a49ca265f7bfa9dde813809847f06b319046 SHA512 f695a4fed73b6bff30eb16f8c159799c7a7b4c17f088959f24c17fc4a51208c1354c19df1e22b9b975f8fcb13f6775ea1dca15dd149ea186d8aeee47f3830441 +DIST linuxx64-23.7.0.17.tar.gz 363012535 BLAKE2B 77e1fa1fb71d98840ebeebb444e86797a5514597dd1059cf19ed0a6240c05a68c13019350e26e6b52f96802a3eba4cb1a42ba20e85756aebed80e7e235a76089 SHA512 e25665ae8937c4a03382473df8f92b0227d6f07cad663ce71d4a90430014cc6630fb5593d688e6b59b7c65eaafeb3e258fc2f04f0d80573938dcb9d173a4ccab +DIST linuxx86-23.5.0.58.tar.gz 152642143 BLAKE2B 8ea722aecfb7e6588701646ed5dec1d1591a8c36986fda25c85ece50313cd1eddefb22ae58be8f1ea2edbfdf9fa725e73182f0745b0494df890008d65065ed08 SHA512 8cad203451b26920d66fb3b1bb794d74f8ab76dd24d76408f51d60278786b59fe2d83f0e6c4a2eb6741a4e1d534b9739513224e0f27ba903a9266f81e439a51f +DIST linuxx86-23.7.0.17.tar.gz 66184043 BLAKE2B 8e408ce26d75172cdd80d7bd9e1ef7aa8b855a7028673f00fd0aef6a42ca57ec8f11f894ecafb76a4e7b69c6cea922551ca9d4615aea436348ae2dbabc92e127 SHA512 e91a6205bb59e2d41075a5b5e0898cc0710a84ed7582ed2f053a3a83345daba1f437864c6e8111e80aabf19bc5b5d82b0fb6096948c166027a0f9fea183b883a diff --git a/net-misc/icaclient/icaclient-21.9.0.25.ebuild b/net-misc/icaclient/icaclient-23.5.0.58.ebuild index e408e2f73c82..03db22459332 100644 --- a/net-misc/icaclient/icaclient-21.9.0.25.ebuild +++ b/net-misc/icaclient/icaclient-23.5.0.58.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop wrapper xdg-utils @@ -13,31 +13,66 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz ) LICENSE="icaclient" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN" -RESTRICT="mirror strip userpriv fetch" +IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx usb" +RESTRICT="mirror strip fetch" ICAROOT="/opt/Citrix/ICAClient" QA_PREBUILT="${ICAROOT#/}/*" +# we have binaries for two conflicting kerberos implementations +# https://bugs.gentoo.org/792090 +# https://bugs.gentoo.org/775995 +REQUIRES_EXCLUDE=" + libgssapi.so.3 + libgssapi_krb5.so.2 libkrb5.so.3 +" +# when using media-plugins/hdx-realtime-media-engine we better not ignore that +REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE} + !hdx? ( libunwind.so.1 ) +" +# we have binaries which wouls still support gstreamer:0.10 +REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE} + libgstapp-0.10.so.0 + libgstbase-0.10.so.0 + libgstinterfaces-0.10.so.0 + libgstpbutils-0.10.so.0 + libgstreamer-0.10.so.0 +" + +# video background blurring, optional +REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE} + libopencv_core.so.407 + libopencv_imgcodecs.so.407 + libopencv_imgproc.so.407 +" + +BDEPEND=" + hdx? ( media-plugins/hdx-realtime-media-engine ) +" + RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret - dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi - media-fonts/font-misc-misc media-fonts/font-cursor-misc - media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic + media-fonts/font-misc-misc + media-fonts/font-xfree86-type1 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libogg + media-libs/libpng + media-libs/libpulse media-libs/libvorbis + media-libs/mesa media-libs/speex + media-libs/speexdsp net-libs/libsoup:2.4 net-libs/webkit-gtk:4 sys-apps/util-linux @@ -45,7 +80,6 @@ RDEPEND=" sys-libs/libcxxabi sys-libs/zlib virtual/krb5 - virtual/jpeg:0 virtual/libudev x11-libs/cairo x11-libs/gdk-pixbuf:2 @@ -62,8 +96,10 @@ RDEPEND=" x11-libs/libXrender x11-libs/libXt x11-libs/pango + ${BDEPEND} + !hdx? ( !media-plugins/hdx-realtime-media-engine ) + usb? ( virtual/libudev ) " -DEPEND="" pkg_nofetch() { elog "Download the client file ${A} from @@ -83,18 +119,31 @@ pkg_setup() { eerror "Given architecture is not supported by Citrix." ;; esac +} - S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" +src_unpack() { + default + mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die } src_prepare() { default rm lib/UIDialogLibWebKit.so || die - # We need to avoid module.ini file getting added to the package's - # content because media-plugins/hdx-realtime-media-engine modifies - # this file on installation. See pkg_postinst() - mv nls/en/module.ini "${T}" || die + cp nls/en/module.ini . || die + if use usb; then + # inspired by debian usb support package postinst + sed -i -e 's/^[ \t]*VirtualDriver[ \t]*=.*$/&, GenericUSB/' module.ini || die + sed -i -e '/\[ICA 3.0\]/a\GenericUSB=on' module.ini || true + echo "[GenericUSB]" >> module.ini || true + echo "DriverName=VDGUSB.DLL" >> module.ini + fi + + if use hdx; then + "${BROOT}${ICAROOT}"/rtme/RTMEconfig -install -ignoremm || die + mv new_module.ini module.ini || die + fi + mv module.ini config/ || die } src_install() { @@ -102,13 +151,21 @@ src_install() { dodir "${ICAROOT}" + keepdir /etc/icaclient + + insinto "${ICAROOT}" exeinto "${ICAROOT}" doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord + if use usb; then + doexe usb/ctxusb usb/ctxusbd usb/ctx_usb_isactive + doins usb/*.DLL + insinto /etc/icaclient + doins usb/usb.conf + dosym ../../../etc/icaclient/usb.conf "${ICAROOT}"/usb.conf + insinto "${ICAROOT}" + fi exeinto "${ICAROOT}"/lib - if use amd64 ; then - rm lib/ctxjpeg_fb_8.so || die - fi doexe lib/*.so for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do @@ -116,12 +173,10 @@ src_install() { doins nls/en.UTF-8/eula.txt done - insinto "${ICAROOT}" - doins -r usb - insinto "${ICAROOT}"/config - # nls/en/*.ini is being handled by pkg_postinst() - doins config/* config/.* + doins config/* + mv "${ED}/${ICAROOT}"/config/module.ini "${ED}"/etc/icaclient/ || die + dosym ../../../../etc/icaclient/module.ini "${ICAROOT}"/config/module.ini for tmpl in {appsrv,wfclient}.template ; do newins nls/en/${tmpl} ${tmpl/template/ini} done @@ -177,36 +232,12 @@ src_install() { insinto "${ICAROOT}"/keyboard doins keyboard/* - rm -r "${S}"/keystore/cacerts || die - dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts - - local util_files=( - configmgr - conncenter - ctx_app_bind - ctx_rehash - ctxlogd - ctxwebhelper - gst_play1.0 - gst_read1.0 - hdxcheck.sh - icalicense.sh - libgstflatstm1.0.so - lurdump - new_store - nslaunch - setlog - storebrowse - sunraymac.sh - webcontainer - what - xcapture - ) + cp -a util "${ED}/${ICAROOT}" || die + test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine - exeinto "${ICAROOT}"/util - for bin in ${util_files[@]} ; do - doexe util/${bin} - done + dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts + insinto "${ICAROOT}"/keystore/intcerts + doins keystore/intcerts/* local other_files=( icasessionmgr @@ -243,18 +274,37 @@ src_install() { # 651926 domenu "${FILESDIR}"/*.desktop + + insinto /usr/share/mime/packages + doins desktop/Citrix-mime_types.xml +} + +pkg_preinst() { + # previous versions of the ebuild created that and left it around + # we own it now and avoid conflict warnings with this + rm -f "${ROOT}${ICAROOT}/config/module.ini" } pkg_postinst() { xdg_desktop_database_update + xdg_mimeinfo_database_update + + if ! use hdx; then + if [ -x "${ROOT}${ICAROOT}"/rtme/RTMEconfig ]; then + ewarn "Starting from 22.12.0.12 you have to set USE=hdx if you want" + ewarn "to use media-plugins/hdx-realtime-media-engine. Which does" + ewarn "not need to be explicitly installed anymore." + fi + fi - local inidest="${BROOT}${ICAROOT}/config" - if [[ ! -e "${inidest}"/module.ini ]] ; then - mv "${T}"/module.ini "${inidest}/" \ - || ewarn 'Failed to install plugin.ini file' + if use usb; then + einfo + einfo "Add users of ${CATEGORY}/${PN} to group 'usb' for redirect to work" + einfo fi } pkg_postrm() { xdg_desktop_database_update + xdg_mimeinfo_database_update } diff --git a/net-misc/icaclient/icaclient-21.8.0.40.ebuild b/net-misc/icaclient/icaclient-23.7.0.17.ebuild index 770400a17a47..03db22459332 100644 --- a/net-misc/icaclient/icaclient-21.8.0.40.ebuild +++ b/net-misc/icaclient/icaclient-23.7.0.17.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop wrapper xdg-utils @@ -12,32 +12,67 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz ) LICENSE="icaclient" SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN" -RESTRICT="mirror strip userpriv fetch" +KEYWORDS="-* ~amd64 ~x86" +IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx usb" +RESTRICT="mirror strip fetch" ICAROOT="/opt/Citrix/ICAClient" QA_PREBUILT="${ICAROOT#/}/*" +# we have binaries for two conflicting kerberos implementations +# https://bugs.gentoo.org/792090 +# https://bugs.gentoo.org/775995 +REQUIRES_EXCLUDE=" + libgssapi.so.3 + libgssapi_krb5.so.2 libkrb5.so.3 +" +# when using media-plugins/hdx-realtime-media-engine we better not ignore that +REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE} + !hdx? ( libunwind.so.1 ) +" +# we have binaries which wouls still support gstreamer:0.10 +REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE} + libgstapp-0.10.so.0 + libgstbase-0.10.so.0 + libgstinterfaces-0.10.so.0 + libgstpbutils-0.10.so.0 + libgstreamer-0.10.so.0 +" + +# video background blurring, optional +REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE} + libopencv_core.so.407 + libopencv_imgcodecs.so.407 + libopencv_imgproc.so.407 +" + +BDEPEND=" + hdx? ( media-plugins/hdx-realtime-media-engine ) +" + RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret - dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi - media-fonts/font-misc-misc media-fonts/font-cursor-misc - media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic + media-fonts/font-misc-misc + media-fonts/font-xfree86-type1 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libogg + media-libs/libpng + media-libs/libpulse media-libs/libvorbis + media-libs/mesa media-libs/speex + media-libs/speexdsp net-libs/libsoup:2.4 net-libs/webkit-gtk:4 sys-apps/util-linux @@ -45,7 +80,6 @@ RDEPEND=" sys-libs/libcxxabi sys-libs/zlib virtual/krb5 - virtual/jpeg:0 virtual/libudev x11-libs/cairo x11-libs/gdk-pixbuf:2 @@ -62,8 +96,10 @@ RDEPEND=" x11-libs/libXrender x11-libs/libXt x11-libs/pango + ${BDEPEND} + !hdx? ( !media-plugins/hdx-realtime-media-engine ) + usb? ( virtual/libudev ) " -DEPEND="" pkg_nofetch() { elog "Download the client file ${A} from @@ -83,18 +119,31 @@ pkg_setup() { eerror "Given architecture is not supported by Citrix." ;; esac +} - S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" +src_unpack() { + default + mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die } src_prepare() { default rm lib/UIDialogLibWebKit.so || die - # We need to avoid module.ini file getting added to the package's - # content because media-plugins/hdx-realtime-media-engine modifies - # this file on installation. See pkg_postinst() - mv nls/en/module.ini "${T}" || die + cp nls/en/module.ini . || die + if use usb; then + # inspired by debian usb support package postinst + sed -i -e 's/^[ \t]*VirtualDriver[ \t]*=.*$/&, GenericUSB/' module.ini || die + sed -i -e '/\[ICA 3.0\]/a\GenericUSB=on' module.ini || true + echo "[GenericUSB]" >> module.ini || true + echo "DriverName=VDGUSB.DLL" >> module.ini + fi + + if use hdx; then + "${BROOT}${ICAROOT}"/rtme/RTMEconfig -install -ignoremm || die + mv new_module.ini module.ini || die + fi + mv module.ini config/ || die } src_install() { @@ -102,13 +151,21 @@ src_install() { dodir "${ICAROOT}" + keepdir /etc/icaclient + + insinto "${ICAROOT}" exeinto "${ICAROOT}" doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord + if use usb; then + doexe usb/ctxusb usb/ctxusbd usb/ctx_usb_isactive + doins usb/*.DLL + insinto /etc/icaclient + doins usb/usb.conf + dosym ../../../etc/icaclient/usb.conf "${ICAROOT}"/usb.conf + insinto "${ICAROOT}" + fi exeinto "${ICAROOT}"/lib - if use amd64 ; then - rm lib/ctxjpeg_fb_8.so || die - fi doexe lib/*.so for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do @@ -116,12 +173,10 @@ src_install() { doins nls/en.UTF-8/eula.txt done - insinto "${ICAROOT}" - doins -r usb - insinto "${ICAROOT}"/config - # nls/en/*.ini is being handled by pkg_postinst() - doins config/* config/.* + doins config/* + mv "${ED}/${ICAROOT}"/config/module.ini "${ED}"/etc/icaclient/ || die + dosym ../../../../etc/icaclient/module.ini "${ICAROOT}"/config/module.ini for tmpl in {appsrv,wfclient}.template ; do newins nls/en/${tmpl} ${tmpl/template/ini} done @@ -177,36 +232,12 @@ src_install() { insinto "${ICAROOT}"/keyboard doins keyboard/* - rm -r "${S}"/keystore/cacerts || die - dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts - - local util_files=( - configmgr - conncenter - ctx_app_bind - ctx_rehash - ctxlogd - ctxwebhelper - gst_play1.0 - gst_read1.0 - hdxcheck.sh - icalicense.sh - libgstflatstm1.0.so - lurdump - new_store - nslaunch - setlog - storebrowse - sunraymac.sh - webcontainer - what - xcapture - ) + cp -a util "${ED}/${ICAROOT}" || die + test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine - exeinto "${ICAROOT}"/util - for bin in ${util_files[@]} ; do - doexe util/${bin} - done + dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts + insinto "${ICAROOT}"/keystore/intcerts + doins keystore/intcerts/* local other_files=( icasessionmgr @@ -243,18 +274,37 @@ src_install() { # 651926 domenu "${FILESDIR}"/*.desktop + + insinto /usr/share/mime/packages + doins desktop/Citrix-mime_types.xml +} + +pkg_preinst() { + # previous versions of the ebuild created that and left it around + # we own it now and avoid conflict warnings with this + rm -f "${ROOT}${ICAROOT}/config/module.ini" } pkg_postinst() { xdg_desktop_database_update + xdg_mimeinfo_database_update + + if ! use hdx; then + if [ -x "${ROOT}${ICAROOT}"/rtme/RTMEconfig ]; then + ewarn "Starting from 22.12.0.12 you have to set USE=hdx if you want" + ewarn "to use media-plugins/hdx-realtime-media-engine. Which does" + ewarn "not need to be explicitly installed anymore." + fi + fi - local inidest="${BROOT}${ICAROOT}/config" - if [[ ! -e "${inidest}"/module.ini ]] ; then - mv "${T}"/module.ini "${inidest}/" \ - || ewarn 'Failed to install plugin.ini file' + if use usb; then + einfo + einfo "Add users of ${CATEGORY}/${PN} to group 'usb' for redirect to work" + einfo fi } pkg_postrm() { xdg_desktop_database_update + xdg_mimeinfo_database_update } diff --git a/net-misc/icaclient/metadata.xml b/net-misc/icaclient/metadata.xml index 99e2666c588b..2e136fc44c0a 100644 --- a/net-misc/icaclient/metadata.xml +++ b/net-misc/icaclient/metadata.xml @@ -2,7 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <email>amynka@gentoo.org</email> </maintainer> + <use> + <flag name="hdx">Install and enable hdx-realtime-media-engine plugin</flag> + <flag name="usb">Allow connecting USB devices to virtual desktops</flag> + </use> </pkgmetadata> diff --git a/net-misc/icecast/icecast-2.4.4-r1.ebuild b/net-misc/icecast/icecast-2.4.4-r1.ebuild index 3e9a5650a56b..46d51ac3475b 100644 --- a/net-misc/icecast/icecast-2.4.4-r1.ebuild +++ b/net-misc/icecast/icecast-2.4.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://downloads.xiph.org/releases/icecast/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="kate +speex +ssl +theora +yp" +IUSE="kate +speex selinux +ssl +theora +yp" #Although there is a --with-ogg and --with-orbis configure option, they're #only useful for specifying paths, not for disabling. @@ -31,7 +31,10 @@ DEPEND=" theora? ( media-libs/libtheora ) yp? ( net-misc/curl ) " -RDEPEND="${DEPEND}" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-icecast ) +" PATCHES=( # bug #368539 diff --git a/net-misc/icecast/metadata.xml b/net-misc/icecast/metadata.xml index 658dba18610e..b70d2da8b605 100644 --- a/net-misc/icecast/metadata.xml +++ b/net-misc/icecast/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="kate">Add karaoke and text encapsulation support for Ogg files</flag> <flag name="yp">Build support for yp public directory listings</flag> diff --git a/net-misc/ices/files/ices-2.0.2-gettimeofday.patch b/net-misc/ices/files/ices-2.0.2-gettimeofday.patch new file mode 100644 index 000000000000..ba5e7ca1c4a5 --- /dev/null +++ b/net-misc/ices/files/ices-2.0.2-gettimeofday.patch @@ -0,0 +1,15 @@ +Uses gettimeofday but won't include sys/time.h without HAVE_SYS_TIME_H +leading to failure with -Werror=implicit-function-declaration (clang16). + +sys/timeb.h is for deprecated ftime() and should not be used. + +https://bugs.gentoo.org/870973 +--- a/configure.in ++++ b/configure.in +@@ -51,5 +51,5 @@ + dnl Checks for header files. + AC_HEADER_STDC +-AC_CHECK_HEADERS([stropts.h sys/timeb.h sys/select.h]) ++AC_CHECK_HEADERS([stropts.h sys/time.h sys/select.h]) + + dnl ================================================================ diff --git a/net-misc/ices/files/ices-2.0.2-libogg-test.patch b/net-misc/ices/files/ices-2.0.2-libogg-test.patch new file mode 100644 index 000000000000..78a334b93096 --- /dev/null +++ b/net-misc/ices/files/ices-2.0.2-libogg-test.patch @@ -0,0 +1,17 @@ +clang/lld will try to use the given -L/usr/lib + 32bit files and potentially +fail the the test on 64bit, carries on but leads to ogg underlinking. + +Quickfix, ideally this should use pkg-config and hard-fail if not found. + +https://bugs.gentoo.org/740794 +--- a/m4/ogg.m4 ++++ b/m4/ogg.m4 +@@ -24,8 +24,4 @@ + fi + +-XIPH_GCC_WARNING([-I$ogg_prefix/include],, +- [ OGG_CFLAGS="-I$ogg_prefix/include" +- OGG_LDFLAGS="-L$ogg_prefix/lib" +- ]) + AC_CACHE_CHECK([for libogg], xt_cv_lib_ogg, + [dnl diff --git a/net-misc/ices/ices-2.0.2-r1.ebuild b/net-misc/ices/ices-2.0.2-r2.ebuild index 001620dd1b72..4f8c7a6de887 100644 --- a/net-misc/ices/ices-2.0.2-r1.ebuild +++ b/net-misc/ices/ices-2.0.2-r2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit autotools DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding" HOMEPAGE="https://icecast.org/ices/" @@ -15,25 +17,42 @@ RDEPEND=" acct-group/ices acct-user/ices dev-libs/libxml2 - >=media-libs/libshout-2 - >=media-libs/libvorbis-1 -" + media-libs/alsa-lib + media-libs/libogg + media-libs/libshout + media-libs/libvorbis" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${P}-libogg-test.patch + "${FILESDIR}"/${P}-gettimeofday.patch +) + +src_prepare() { + default + + eautoreconf #740794,870973 +} + src_configure() { - econf --sysconfdir=/etc/ices2 + econf --sysconfdir="${EPREFIX}"/etc/ices2 } src_install() { default + insinto /etc/ices2 doins conf/*.xml + docinto html dodoc doc/*.{html,css} + newinitd "${FILESDIR}"/ices.initd-r1 ices + keepdir /var/log/ices fperms 660 /var/log/ices fowners ices:ices /var/log/ices - rm -rf "${D}"/usr/share/ices + + rm -r "${ED}"/usr/share/ices || die } diff --git a/net-misc/icingadb/Manifest b/net-misc/icingadb/Manifest new file mode 100644 index 000000000000..dde44ce3907b --- /dev/null +++ b/net-misc/icingadb/Manifest @@ -0,0 +1,4 @@ +DIST icingadb-1.1.0-deps.tar.xz 9188036 BLAKE2B d816220d66d354f348c7eb9874d2edd65d67418d2c5ff0352c5fad524239e9bbcba53cec0cbae710a8d075fce2365c76f20a0cbca10afca62844f51df9e43092 SHA512 94534e7d8c1479d5579336ff353b142b62d19c36030e59667d0276caf6fa643f7024557c1c2ea6bfe7c70e2abd87b9ae25ac6213272627c25d927ebf06760270 +DIST icingadb-1.1.0.tar.gz 3865617 BLAKE2B e71b577f799ff6c069f86810b35731411eedbfb15c5e741aac987f9fdb852e342bbece3b3995af7fe1f957988314e71af8d92cbda118a6bf8d91639cfe8734e2 SHA512 a7659004802acabe9f3fdc2b843e37928b0b8835428d1f12a730fc3842bb7550f380e6abc8b253bd00fe5b5df6710573fef847f657a61b10f4cf617fb03b4ea0 +DIST icingadb-1.1.1-deps.tar.xz 9308260 BLAKE2B 95d9e87bc48661af9eeee5b14beea50fcee5ad5fdf846e207795e676b3a0f8a7b95f9410ef3ab97e490be275928f8d21e8b4c54d15fd9b4c0c4036504c4d885c SHA512 d43819ac8979e4396def929bc2cc0777683b5afb2d80d3c95c83a46b5ef2e9463b93e338c1ba1fafee780e4dc7ded53d0044d15258565a01acd178fde85c39ca +DIST icingadb-1.1.1.tar.gz 3868785 BLAKE2B 9f07cfca9acbe170189f28c42d71433c1d1faba55f6a25348b3a5cb76675f72df5e2c8c0f2c984830766a6239db4e1098da9e5daddb5dbd3c24b42c8058161b6 SHA512 25dab9cb93d786b6bccb3e305cf9f36d7910e8919a87148805fee61378c072107838741a2066eddcbadde9f1d345d79e9d12c46b87789ac79b272fb4d01d3ab4 diff --git a/net-misc/icingadb/files/icingadb.initd b/net-misc/icingadb/files/icingadb.initd new file mode 100644 index 000000000000..a98991bcf9df --- /dev/null +++ b/net-misc/icingadb/files/icingadb.initd @@ -0,0 +1,11 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/bin/icingadb" +command_background="true" +command_user="icinga" +pidfile="/run/${RC_SVCNAME}.pid" +required_files="/etc/${RC_SVCNAME}/config.yml" +output_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log" +error_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.err" diff --git a/net-misc/icingadb/icingadb-1.1.0.ebuild b/net-misc/icingadb/icingadb-1.1.0.ebuild new file mode 100644 index 000000000000..909f5c5f8426 --- /dev/null +++ b/net-misc/icingadb/icingadb-1.1.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Icinga configuration and state database supporting multiple environments" +HOMEPAGE="https://icinga.com/docs/icinga-db/" +SRC_URI="https://github.com/Icinga/icingadb/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/hydrapolic/gentoo-dist/raw/master/icinga/${P}-deps.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" + +RDEPEND=" + acct-user/icinga + acct-group/icinga +" + +DOCS=( config.example.yml doc README.md schema ) + +src_compile() { + cd cmd/icingadb || die + ego build +} + +src_install() { + dobin cmd/icingadb/icingadb + einstalldocs + + newinitd "${FILESDIR}/icingadb.initd" "${PN}" + + keepdir /etc/icingadb + keepdir /var/log/icingadb + + fperms 0750 /etc/icingadb /var/log/icingadb + fowners icinga:icinga /etc/icingadb /var/log/icingadb +} diff --git a/net-misc/icingadb/icingadb-1.1.1.ebuild b/net-misc/icingadb/icingadb-1.1.1.ebuild new file mode 100644 index 000000000000..1482f551186c --- /dev/null +++ b/net-misc/icingadb/icingadb-1.1.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Icinga configuration and state database supporting multiple environments" +HOMEPAGE="https://icinga.com/docs/icinga-db/" +SRC_URI="https://github.com/Icinga/icingadb/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~juippis/distfiles/${P}-deps.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" + +RDEPEND=" + acct-user/icinga + acct-group/icinga +" + +DOCS=( config.example.yml doc README.md schema ) + +src_compile() { + cd cmd/icingadb || die + ego build +} + +src_install() { + dobin cmd/icingadb/icingadb + einstalldocs + + newinitd "${FILESDIR}/icingadb.initd" "${PN}" + + keepdir /etc/icingadb + keepdir /var/log/icingadb + + fperms 0750 /etc/icingadb /var/log/icingadb + fowners icinga:icinga /etc/icingadb /var/log/icingadb +} diff --git a/net-misc/icingadb/metadata.xml b/net-misc/icingadb/metadata.xml new file mode 100644 index 000000000000..4a0d17a5f25c --- /dev/null +++ b/net-misc/icingadb/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>prometheanfire@gentoo.org</email> + <name>Matthew Thode</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>hydrapolic@gmail.com</email> + <name>Tomáš Mózes</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">Icinga/icingadb</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest index b95a32c6d533..aab75a3ba6de 100644 --- a/net-misc/igmpproxy/Manifest +++ b/net-misc/igmpproxy/Manifest @@ -1 +1 @@ -DIST igmpproxy-0.3.tar.gz 168403 BLAKE2B 4dd07936074fbd9b3c869851f5b592f1eec33109be78ee5a05b3658c26afb67c30379f7cc66dfa20af276aae0a1c21dbf5c9fd337c853d623b08126324b06561 SHA512 0b1deca544317e2f0b1ff550e5921e8d6f64565f7cd72b6210fc7d3d7c3a301875088687a31ca5a29d310b2931695bd7a77e41dc5685ab7175ea1d41fe9246af +DIST igmpproxy-0.4.tar.gz 170700 BLAKE2B 233af2fe35a0d661211d205fec89cce0a7dc91fe1530e940703e6d56eeb69f4490ca16d18787dbbaf7c0087dc2ebcb61d212778993af6fbb8acc7ba33429f7e0 SHA512 ad5d8f0794cf74e42f6f99a57815402904ef7f03b76a901885c16aa0d148e552ce001832e82e4cc4ac33e2d4fd6059c51352363f13f192bca48ea9bca12c640c diff --git a/net-misc/igmpproxy/igmpproxy-0.3.ebuild b/net-misc/igmpproxy/igmpproxy-0.4.ebuild index 243e6209d79a..cfbcbd34dfb9 100644 --- a/net-misc/igmpproxy/igmpproxy-0.3.ebuild +++ b/net-misc/igmpproxy/igmpproxy-0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools linux-info systemd diff --git a/net-misc/inetutils/Manifest b/net-misc/inetutils/Manifest new file mode 100644 index 000000000000..9294329b8da4 --- /dev/null +++ b/net-misc/inetutils/Manifest @@ -0,0 +1 @@ +DIST inetutils-2.5.tar.xz 1670424 BLAKE2B 80ab4f4287328ceb75c33b8794ec21209ea95206a205ea60fbd8f1d7e7fa01eec228ea50d61c8bb37a88cd3144b58ecfecd0af440ba85d43d5ea19565d88a6d4 SHA512 dc11ad6eeb5ea2c85edddbfc77630b5b09e4e1ac643629edf13b0ac0828c13cdb0885275153c072ae13a798427c96bc461037822ad646f7210369192c35bb04c diff --git a/net-misc/inetutils/inetutils-2.5.ebuild b/net-misc/inetutils/inetutils-2.5.ebuild new file mode 100644 index 000000000000..adc14e092684 --- /dev/null +++ b/net-misc/inetutils/inetutils-2.5.ebuild @@ -0,0 +1,86 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit pam + +DESCRIPTION="Collection of common network programs" +HOMEPAGE="https://www.gnu.org/software/inetutils/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +SERVERS="ftpd inetd rexecd rlogind rshd syslogd talkd telnetd tftpd uucpd" +CLIENTS="ftp dnsdomainname hostname ping ping6 rcp rexec rlogin rsh logger telnet tftp whois ifconfig traceroute" +PROGRAMS="${SERVERS} ${CLIENTS}" +IUSE="idn kerberos pam tcpd ${PROGRAMS}" + +DEPEND=" + sys-libs/readline:0= + ftpd? ( virtual/libcrypt:0= ) + idn? ( net-dns/libidn2:= ) + kerberos? ( virtual/krb5 ) + pam? ( sys-libs/pam ) + tcpd? ( sys-apps/tcp-wrappers ) + uucpd? ( virtual/libcrypt:0= ) +" +RDEPEND="${DEPEND} + ftpd? ( net-ftp/ftpbase[pam?] ) + ftp? ( !net-ftp/ftp ) + dnsdomainname? ( !sys-apps/net-tools ) + hostname? ( !sys-apps/coreutils[hostname(-)] !sys-apps/net-tools[hostname(+)] ) + ping? ( !net-misc/iputils ) + ping6? ( !net-misc/iputils[ipv6(+)] ) + rcp? ( !net-misc/netkit-rsh ) + rexec? ( !net-misc/netkit-rsh ) + rlogin? ( !net-misc/netkit-rsh ) + rsh? ( !net-misc/netkit-rsh ) + logger? ( !sys-apps/util-linux[logger(+)] ) + telnet? ( !net-misc/telnet-bsd !net-misc/netkit-telnetd ) + tftp? ( !net-ftp/tftp-hpa ) + whois? ( !net-misc/whois ) + ifconfig? ( !sys-apps/net-tools ) + traceroute? ( !net-analyzer/traceroute ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( MIN static_assert alignof unreachable ) + +src_configure() { + local myconf=( + --disable-clients + --disable-servers + $(use_with idn) + --without-krb4 + $(use_with kerberos krb5) + --without-shishi + $(use_with pam) + $(use_with tcpd wrap) + ) + + local prog + for prog in ${PROGRAMS}; do + myconf+=( $(use_enable "${prog}") ) + done + + econf "${myconf[@]}" +} + +iu_pamd() { + if use "$1"; then + pamd_mimic system-remote-login "$2" auth account password session + fi +} + +src_install() { + default + iu_pamd rexecd rexec + iu_pamd rlogind rlogin + iu_pamd rshd rsh + if use kerberos; then + iu_pamd rlogind krlogin + iu_pamd rshd krsh + fi +} diff --git a/net-misc/inetutils/metadata.xml b/net-misc/inetutils/metadata.xml new file mode 100644 index 000000000000..3f826440008a --- /dev/null +++ b/net-misc/inetutils/metadata.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>floppym@gentoo.org</email> + <name>Mike Gilbert</name> + </maintainer> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <use> + <flag name="ftpd">Enable ftpd</flag> + <flag name="inetd">Enable inetd</flag> + <flag name="rexecd">Enable rexecd</flag> + <flag name="rlogind">Enable rlogind</flag> + <flag name="rshd">Enable rshd</flag> + <flag name="syslogd">Enable syslogd</flag> + <flag name="talkd">Enable talkd</flag> + <flag name="telnetd">Enable telnetd</flag> + <flag name="tftpd">Enable tftpd</flag> + <flag name="uucpd">Enable uucpd</flag> + <flag name="ftp">Enable ftp</flag> + <flag name="dnsdomainname">Enable domainname</flag> + <flag name="hostname">Enable hostname</flag> + <flag name="ping">Enable ping</flag> + <flag name="ping6">Enable ping6</flag> + <flag name="rcp">Enable rcp</flag> + <flag name="rexec">Enable rexec</flag> + <flag name="rlogin">Enable rlogin</flag> + <flag name="rsh">Enable rsh</flag> + <flag name="logger">Enable logger</flag> + <flag name="telnet">Enable telnet</flag> + <flag name="tftp">Enable tftp</flag> + <flag name="whois">Enable whois</flag> + <flag name="ifconfig">Enable ifconfig</flag> + <flag name="traceroute">Enable traceroute</flag> + </use> +</pkgmetadata> diff --git a/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild b/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild index 44c2ea9d4979..1a50de532bad 100644 --- a/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild +++ b/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,10 +40,9 @@ pkg_config() { CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/ip-sentinel 2>/dev/null` if [ ! -d "${CHROOT:=/chroot/ip-sentinel}" ] ; then - ebegin "Setting up the chroot directory" - mkdir -m 0755 -p "${CHROOT}/etc" - cp -R /etc/ip-sentinel.cfg "${CHROOT}/etc" - eend + einfo "Setting up the chroot directory" + mkdir -m 0755 -p "${CHROOT}/etc" || die + cp -R /etc/ip-sentinel.cfg "${CHROOT}/etc" || die if [ "`grep '^#[[:blank:]]\?CHROOT' /etc/conf.d/ip-sentinel`" ] ; then sed -e '/^#[[:blank:]]\?CHROOT/s/^#[[:blank:]]\?//' \ diff --git a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild index 0ad1312186d1..acc7c7928e39 100644 --- a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild +++ b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="IP Calculator prints broadcast/network/etc for an IP address and netmask" -LICENSE="GPL-2+" HOMEPAGE="http://jodies.de/ipcalc" SRC_URI=" mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz " -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +S="${WORKDIR}"/${PN}-0.5 + +LICENSE="GPL-2+" SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=">=dev-lang/perl-5.6.0" -S=${WORKDIR}/${PN}-0.5 src_prepare() { eapply "${WORKDIR}"/debian/patches/*.patch diff --git a/net-misc/ipcalc/metadata.xml b/net-misc/ipcalc/metadata.xml index d5af4bcfaf13..d1dfb6813d0d 100644 --- a/net-misc/ipcalc/metadata.xml +++ b/net-misc/ipcalc/metadata.xml @@ -5,4 +5,7 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> + <upstream> + <remote-id type="github">kjokjo/ipcalc</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest index 532342d55b77..6bfe5652d14d 100644 --- a/net-misc/iperf/Manifest +++ b/net-misc/iperf/Manifest @@ -1,3 +1,3 @@ DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea -DIST iperf-3.10.1.tar.gz 636957 BLAKE2B 8390b4fb0d4c6590bf73e46d55fbe100f1c9832b4e7baba23b4bec2808b42582bf76cc4250c529a1eb4a58c7214120f0e3a393a7c2602b838b22d97eb53842b3 SHA512 d1139aed0c7a99e8cfc23c41d606854d48a57db24d45ea31412d81222b09faeee6edccdf4030a00eeb6acbfd540d4b985b4a89f81a4d5b84592339ad5e2e9e41 -DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc359eb402055dcaa90af63e2df2b6c67ba8a0a72a17648014240dc5b355084e69550afed4d59257a224de8 SHA512 3da0939bed576a7c14baa03c996e6f407f20bfe58c4b3a36a66e74f41bd5442c0b23ab18c8eb1f2f37fd47449af533b61b658d810c68707b2b06d28894ac2035 +DIST iperf-3.15.tar.gz 649330 BLAKE2B f086d506d1de8e8b333a7ad46a94279aa5b42800ded7cc6724c3400e479a6523b336c74b5956d07117a178b5f89934553535824a05daafcdb2eb8d31754680e1 SHA512 988bc558f40a16c3d94df3956705712829c1c529efd577db16213783846c84bc3edbad19a4d7890b7aba08fbc4e1c6807105df29931e9b45981066b609d87aa2 +DIST iperf-3.16.tar.gz 664751 BLAKE2B 4ca930b58c54d5ae5b0c8b14aca2556224ff2c7b943d32e65486dc2a7e1abd2d26b229e9f759358c326be8754e88a203e11a3ab0f029daa982375a880c3f1cbd SHA512 9ba97e03f17f3b939343b07ed3d508fbf57489e2b984b77a3dc3ada535f981350e56495154bdd108a83b3c507ccbed599b2b7b25de0d1778912d2c01b4ad4e7c diff --git a/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch b/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch new file mode 100644 index 000000000000..c5b1b49ec1a7 --- /dev/null +++ b/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch @@ -0,0 +1,109 @@ +From 85b225cdd00b9a483a603b8b124a829ffbf92b88 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 2 Oct 2022 03:07:40 +0100 +Subject: [PATCH] Unbundle cJSON + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -62,6 +62,8 @@ AC_ARG_ENABLE([profiling], + AS_HELP_STRING([--enable-profiling], [Enable iperf3 profiling binary])) + AM_CONDITIONAL([ENABLE_PROFILING], [test x$enable_profiling = xyes]) + ++PKG_CHECK_MODULES([libcjson], [libcjson >= 1.7.15]) ++ + # Check for the math library (needed by cjson on some platforms) + AC_SEARCH_LIBS(floor, [m], [], [ + echo "floor()" +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -10,8 +10,6 @@ include_HEADERS = iperf_api.h # Define + + # Specify the source files and flags for the iperf library + libiperf_la_SOURCES = \ +- cjson.c \ +- cjson.h \ + flowlabel.h \ + iperf.h \ + iperf_api.c \ +@@ -44,10 +42,13 @@ libiperf_la_SOURCES = \ + units.c \ + units.h \ + version.h ++libiperf_la_CPPFLAGS = $(CPPFLAGS) @libcjson_CFLAGS@ ++libiperf_la_LIBADD = @libcjson_LIBS@ + + # Specify the sources and various flags for the iperf binary + iperf3_SOURCES = main.c +-iperf3_LDADD = libiperf.la ++iperf3_CPPFLAGS = $(CPPFLAGS) @libcjson_CFLAGS@ ++iperf3_LDADD = libiperf.la @libcjson_LIBS@ + + if ENABLE_PROFILING + # If the iperf-profiled-binary is enabled +--- a/src/iperf.h ++++ b/src/iperf.h +@@ -65,7 +65,7 @@ + + #include "timer.h" + #include "queue.h" +-#include "cjson.h" ++#include <cjson/cJSON.h> + #include "iperf_time.h" + + #if defined(HAVE_SSL) +--- a/src/iperf_api.c ++++ b/src/iperf_api.c +@@ -81,7 +81,7 @@ + #endif /* HAVE_SCTP_H */ + #include "timer.h" + +-#include "cjson.h" ++#include <cjson/cJSON.h> + #include "units.h" + #include "iperf_util.h" + #include "iperf_locale.h" +--- a/src/iperf_tcp.c ++++ b/src/iperf_tcp.c +@@ -42,7 +42,7 @@ + #include "iperf_api.h" + #include "iperf_tcp.h" + #include "net.h" +-#include "cjson.h" ++#include <cjson/cJSON.h> + + #if defined(HAVE_FLOWLABEL) + #include "flowlabel.h" +--- a/src/iperf_udp.c ++++ b/src/iperf_udp.c +@@ -46,7 +46,7 @@ + #include "iperf_udp.h" + #include "timer.h" + #include "net.h" +-#include "cjson.h" ++#include <cjson/cJSON.h> + #include "portable_endian.h" + + #if defined(HAVE_INTTYPES_H) +--- a/src/iperf_util.c ++++ b/src/iperf_util.c +@@ -46,7 +46,7 @@ + #include <errno.h> + #include <fcntl.h> + +-#include "cjson.h" ++#include <cjson/cJSON.h> + #include "iperf.h" + #include "iperf_api.h" + +--- a/src/iperf_util.h ++++ b/src/iperf_util.h +@@ -28,7 +28,7 @@ + #define __IPERF_UTIL_H + + #include "iperf_config.h" +-#include "cjson.h" ++#include <cjson/cJSON.h> + #include <sys/select.h> + #include <stddef.h> + diff --git a/net-misc/iperf/iperf-2.0.14a.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild index 1f6705f71ebd..69dcef7955cf 100644 --- a/net-misc/iperf/iperf-2.0.14a.ebuild +++ b/net-misc/iperf/iperf-2.0.14a.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,12 +7,12 @@ inherit toolchain-funcs DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP" HOMEPAGE="https://sourceforge.net/projects/iperf2/" -SRC_URI="mirror://sourceforge/${PN}2/${PN}-2.0.13.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}2/${PN}-2.0.13.tar.gz" S="${WORKDIR}/${PN}-2.0.13" LICENSE="HPND" SLOT="2" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="ipv6 threads debug" DOCS=( INSTALL README ) diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.9999.ebuild index 6c9197a333b9..cd4130c2772c 100644 --- a/net-misc/iperf/iperf-2.99999.99999.ebuild +++ b/net-misc/iperf/iperf-2.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/net-misc/iperf/iperf-3.10.1.ebuild b/net-misc/iperf/iperf-3.15.ebuild index d16bea61f8d4..4aec461864c3 100644 --- a/net-misc/iperf/iperf-3.10.1.ebuild +++ b/net-misc/iperf/iperf-3.15.ebuild @@ -1,36 +1,46 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit systemd +inherit autotools systemd DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool" HOMEPAGE="https://github.com/esnet/iperf" -SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P/_/}" +SRC_URI="https://github.com/esnet/iperf/releases/download/${PV}/${P}.tar.gz" +S="${WORKDIR}"/${P/_/} LICENSE="BSD" SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="sctp" DEPEND=" - dev-libs/openssl:0= + >=dev-libs/cJSON-1.7.15 + dev-libs/openssl:= sctp? ( net-misc/lksctp-tools ) " RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( README.md RELNOTES.md ) PATCHES=( "${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch + "${FILESDIR}"/${PN}-3.12-Unbundle-cJSON.patch ) +src_prepare() { + default + + # Drop bundled cjson + rm src/cjson.{c,h} || die + + eautoreconf +} + src_configure() { - econf \ - --disable-static \ - $(use_with sctp) + econf $(use_with sctp) } src_install() { diff --git a/net-misc/iperf/iperf-3.16.ebuild b/net-misc/iperf/iperf-3.16.ebuild new file mode 100644 index 000000000000..4edfb6439687 --- /dev/null +++ b/net-misc/iperf/iperf-3.16.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool" +HOMEPAGE="https://github.com/esnet/iperf" +SRC_URI="https://github.com/esnet/iperf/releases/download/${PV}/${P}.tar.gz" +S="${WORKDIR}"/${P/_/} + +LICENSE="BSD" +SLOT="3" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="sctp" + +DEPEND=" + >=dev-libs/cJSON-1.7.15 + dev-libs/openssl:= + sctp? ( net-misc/lksctp-tools ) +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( README.md RELNOTES.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch + "${FILESDIR}"/${PN}-3.12-Unbundle-cJSON.patch +) + +src_prepare() { + default + + # Drop bundled cjson + rm src/cjson.{c,h} || die + + eautoreconf +} + +src_configure() { + econf $(use_with sctp) +} + +src_install() { + default + + newconfd "${FILESDIR}"/iperf.confd iperf3 + newinitd "${FILESDIR}"/iperf3.initd iperf3 + systemd_dounit contrib/iperf3.service + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-misc/iperf/iperf-3.9-r1.ebuild b/net-misc/iperf/iperf-3.9-r1.ebuild deleted file mode 100644 index 6e77ed4440e0..000000000000 --- a/net-misc/iperf/iperf-3.9-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool" -HOMEPAGE="https://github.com/esnet/iperf" -SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P/_/}" - -LICENSE="BSD" -SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="sctp static-libs" - -DEPEND=" - dev-libs/openssl:0= - sctp? ( net-misc/lksctp-tools ) -" -RDEPEND="${DEPEND}" - -DOCS=( README.md RELNOTES.md ) - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_with sctp) -} - -src_install() { - default - - newconfd "${FILESDIR}"/iperf.confd iperf3 - newinitd "${FILESDIR}"/iperf3.initd iperf3 - systemd_dounit contrib/iperf3.service - - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild deleted file mode 100644 index fcfe1f4f75f0..000000000000 --- a/net-misc/iperf/iperf-3.99999.99999.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit git-r3 - -DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool" -HOMEPAGE="https://github.com/esnet/iperf" -EGIT_REPO_URI="https://github.com/esnet/iperf" -S="${WORKDIR}/${P/_/}" - -LICENSE="BSD" -SLOT="3" -IUSE="sctp static-libs" - -DEPEND=" - dev-libs/openssl:0= - sctp? ( net-misc/lksctp-tools ) -" -RDEPEND="${DEPEND}" - -DOCS=( README.md RELNOTES.md ) - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_with sctp) -} - -src_install() { - default - - newconfd "${FILESDIR}"/iperf.confd iperf3 - newinitd "${FILESDIR}"/iperf3.initd iperf3 - - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest index bfb17f2a40df..ec25fd2773c2 100644 --- a/net-misc/ipmiview/Manifest +++ b/net-misc/ipmiview/Manifest @@ -1 +1 @@ -DIST IPMIView_2.19.0_build.210401_bundleJRE_Linux_x64.tar.gz 147779297 BLAKE2B e3a0846e2704c5acc91ec303d40882d3572165b608c875e02d171b78e8158ea388c38da4e22a78ec4008517bbe7a826f89566bd4a16380009ed94b773b476686 SHA512 6bbde5ff7e5ba73d35068e30a6ca34a2993bc96b3ee10a5bbbafbeb321eb98960a176ec6712183e94705c33462791c23e93732b2945c93b2df5304e8e7d95a10 +DIST IPMIView_2.21.1_build.230720_bundleJRE_Linux_x64.tar.gz 117666196 BLAKE2B 32284883846dc780cd1b613bc34f91d2fa6f4bad144ef7a26f76b78852a81e8adcbcf64a08aff06919f2029c8880b3ca6a8bae0674779139216b55659d3415f2 SHA512 103cc4c12f3ad6a503877db85abd89ad4e0dfdb48d99d30483ab3b97534e7f1729cc94b19ad0ff45c381986807a443d45338df24e7edc41839ed7e718804d46a diff --git a/net-misc/ipmiview/ipmiview-2.19.0.210401.ebuild b/net-misc/ipmiview/ipmiview-2.21.1.230720.ebuild index 04196e64d468..6417f07fea8f 100644 --- a/net-misc/ipmiview/ipmiview-2.19.0.210401.ebuild +++ b/net-misc/ipmiview/ipmiview-2.21.1.230720.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop java-pkg-2 prefix @@ -11,7 +11,7 @@ MY_PV="$(ver_cut 1-3)" DESCRIPTION="A GUI application that allows to manage multiple target systems through BMC" HOMEPAGE="https://www.supermicro.com/" -SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz" +SRC_URI="https://www.supermicro.com/Bios/sw_download/588/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz" LICENSE="supermicro" SLOT="0" @@ -20,7 +20,7 @@ KEYWORDS="-* ~amd64" RDEPEND=" net-misc/stunnel sys-libs/ncurses-compat:5 - >=virtual/jre-1.8:* + virtual/jre:1.8 " BDEPEND="app-arch/unzip" @@ -55,9 +55,9 @@ src_install() { local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash) java-pkg_dolauncher ipmiview --jar IPMIView20.jar -pre "${pre}" - java-pkg_dolauncher ipmiview-ikvm --jar iKVM.jar -pre "${pre}" - java-pkg_dolauncher ipmiview-ikvmmicroblade --jar iKVMMicroBlade.jar -pre "${pre}" - java-pkg_dolauncher ipmiview-jviewerx9 --jar JViewerX9.jar -pre "${pre}" + java-pkg_dolauncher ikvm --jar iKVM.jar -pre "${pre}" + java-pkg_dolauncher ikvmmicroblade --jar iKVMMicroBlade.jar -pre "${pre}" + java-pkg_dolauncher jviewerx9 --jar JViewerX9.jar -pre "${pre}" java-pkg_dolauncher trapreceiver --jar TrapView.jar -pre "${pre}" exeinto ${DIR}/jre/bin diff --git a/net-misc/iprange/metadata.xml b/net-misc/iprange/metadata.xml index 115e9d64a669..a18e8ff9af74 100644 --- a/net-misc/iprange/metadata.xml +++ b/net-misc/iprange/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <upstream> + <remote-id type="github">firehol/iprange</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/ipsvd/files/ipsvd-1.0.0-fix-musl-clang-16.patch b/net-misc/ipsvd/files/ipsvd-1.0.0-fix-musl-clang-16.patch new file mode 100644 index 000000000000..922369ca48c5 --- /dev/null +++ b/net-misc/ipsvd/files/ipsvd-1.0.0-fix-musl-clang-16.patch @@ -0,0 +1,139 @@ +Bug: https://bugs.gentoo.org/897946 +Don't use sig_unblock and other such functions, they are deprecated. +--- a/src/cdb_make.c ++++ b/src/cdb_make.c +@@ -15,7 +15,7 @@ int cdb_make_start(struct cdb_make *c,int fd) + c->numentries = 0; + c->fd = fd; + c->pos = sizeof c->final; +- buffer_init(&c->b,write,fd,c->bspace,sizeof c->bspace); ++ buffer_init(&c->b,(void *)write,fd,c->bspace,sizeof c->bspace); + return seek_set(fd,c->pos); + } + +--- a/src/pathexec_run.c ++++ b/src/pathexec_run.c +@@ -1,5 +1,6 @@ + /* Public domain. */ + ++#include <unistd.h> + #include "error.h" + #include "stralloc.h" + #include "str.h" +--- a/src/prot.c ++++ b/src/prot.c +@@ -1,5 +1,7 @@ + /* Public domain. */ + ++#include <grp.h> ++#include <unistd.h> + #include "hasshsgr.h" + #include "prot.h" + +--- a/src/seek_set.c ++++ b/src/seek_set.c +@@ -1,6 +1,7 @@ + /* Public domain. */ + + #include <sys/types.h> ++#include <unistd.h> + #include "seek.h" + + #define SET 0 /* sigh */ +--- a/src/sig_block.c ++++ b/src/sig_block.c +@@ -6,35 +6,23 @@ + + void sig_block(int sig) + { +-#ifdef HASSIGPROCMASK + sigset_t ss; + sigemptyset(&ss); + sigaddset(&ss,sig); + sigprocmask(SIG_BLOCK,&ss,(sigset_t *) 0); +-#else +- sigblock(1 << (sig - 1)); +-#endif + } + + void sig_unblock(int sig) + { +-#ifdef HASSIGPROCMASK + sigset_t ss; + sigemptyset(&ss); + sigaddset(&ss,sig); + sigprocmask(SIG_UNBLOCK,&ss,(sigset_t *) 0); +-#else +- sigsetmask(sigsetmask(~0) & ~(1 << (sig - 1))); +-#endif + } + + void sig_blocknone(void) + { +-#ifdef HASSIGPROCMASK + sigset_t ss; + sigemptyset(&ss); + sigprocmask(SIG_SETMASK,&ss,(sigset_t *) 0); +-#else +- sigsetmask(0); +-#endif + } +--- a/src/sig_pause.c ++++ b/src/sig_pause.c +@@ -6,11 +6,7 @@ + + void sig_pause(void) + { +-#ifdef HASSIGPROCMASK + sigset_t ss; + sigemptyset(&ss); + sigsuspend(&ss); +-#else +- sigpause(0); +-#endif + } +Binary files a/src/sig_pause.o and b/src/sig_pause.o differ +--- a/src/udpsvd.c ++++ b/src/udpsvd.c +@@ -268,7 +268,7 @@ int main(int argc, const char **argv, const char *const *envp) { + if (user) { + bufnum[fmt_ulong(bufnum, ugid.uid)] =0; + out(", uid "); out(bufnum); +- bufnum[fmt_ulong(bufnum, ugid.gid)] =0; ++ bufnum[fmt_ulong(bufnum, (unsigned long) ugid.gid)] =0; + out(", gid "); out(bufnum); + } + flush(", starting.\n"); +--- a/src/chkshsgr.c ++++ b/src/chkshsgr.c +@@ -1,5 +1,7 @@ + /* Public domain. */ + ++#define _GNU_SOURCE ++#include <grp.h> + #include <unistd.h> + + int main() +--- a/src/tcpsvd.c ++++ b/src/tcpsvd.c +@@ -1,6 +1,8 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> ++#define _GNU_SOURCE ++#include <grp.h> + #include <unistd.h> + #include "dns.h" + #include "socket.h" +--- a/src/udpsvd.c ++++ b/src/udpsvd.c +@@ -1,7 +1,9 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> ++#define _GNU_SOURCE + #include <unistd.h> ++#include <grp.h> + #include "dns.h" + #include "socket.h" + #include "ip4.h" diff --git a/net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild b/net-misc/ipsvd/ipsvd-1.0.0-r3.ebuild index 2b0e4522e88a..342c393df9da 100644 --- a/net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild +++ b/net-misc/ipsvd/ipsvd-1.0.0-r3.ebuild @@ -1,40 +1,34 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs flag-o-matic +inherit toolchain-funcs -DESCRIPTION="ipsvd is a set of internet protocol service daemons for Unix" +DESCRIPTION="Set of internet protocol service daemons for Unix" HOMEPAGE="http://smarden.org/ipsvd/" SRC_URI="http://smarden.org/ipsvd/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="static" - -DEPEND="" -RDEPEND="" S="${WORKDIR}/net/${P}" PATCHES=( "${FILESDIR}"/${P}-fix-parallel-make.diff + "${FILESDIR}"/${PN}-1.0.0-fix-musl-clang-16.patch ) src_configure() { cd "${S}"/src - if use static ; then - append-ldflags -static - fi echo "$(tc-getCC) ${CFLAGS}" > conf-cc echo "$(tc-getCC) ${LDFLAGS}" > conf-ld } src_compile() { - cd "${S}"/src + cd "${S}"/src || die emake } @@ -45,6 +39,6 @@ src_install() { doman man/ipsvd-instruct.5 man/ipsvd.7 man/udpsvd.8 \ man/tcpsvd.8 man/ipsvd-cdb.8 - insinto html - dohtml doc/*.html + local HTML_DOCS=( doc/ ) + einstalldocs } diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 76291183702d..2863ec7dbc8d 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,4 +1,4 @@ -DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d SHA512 af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526 -DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f56225c998ecc6c3d332fef046dd8032e5afaff1cdc916d048f9d84cc8a85736a26a3176e66e111e02c9dbfcb0f195 SHA512 8f85bf468f8ef1e2832e9bbf9009552df4a6d723dd130fa0d5b2aa3bae617c972f936143c2370c3b4ce2ba2499828c91a299ee42cf81fa81aabe10552db2b328 -DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1 -DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415 +DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9 +DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 SHA512 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f +DIST iputils-20240117.tar.xz 445684 BLAKE2B 635943e12010aef8c1291b407bfbe284e0179391fca76197b77037ae1ffc219fa1d8e36abcea5fb7fff10d55ab40eed7c081e5d92b29f0916a4b4dd806945491 SHA512 c45822c5641f194dc07cba919c13a4b7a79d050bb53957a894ebb6ccc1f71bac1f26489e13d18ef1ce235982f5fa1824e677f95037a0f5cce6bcb94be4c2e2de +DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee diff --git a/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch b/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch deleted file mode 100644 index 61f9f5c03fd6..000000000000 --- a/net-misc/iputils/files/iputils-20210722-fix-no-ipv6-ping.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://github.com/iputils/iputils/commit/79d713eab6181e219bf932b404706f6f59ff2539.patch -https://bugs.gentoo.org/818022 - -From: Byron Stanoszek <gandalf@winds.org> -Date: Thu, 16 Sep 2021 23:38:54 +0200 -Subject: [PATCH] ping: Remove 'unsupported IPv6' warning on disabled IPv6 - -Regression was introduced in d141cb6 as introduced condition - -if ((errno == EAFNOSUPPORT && socktype == AF_INET6) || options & F_VERBOSE || requisite) - -was wrong, it should have been: - -if ((errno == EAFNOSUPPORT && family == AF_INET6 && requisite) || options & F_VERBOSE) - -but bug was hidden as `family == AF_INET6' was always false until -otherwise correct fix 904cdb6 ("ping: AF_INET6 is address family not -socket type [lgtm scan]") propagated the error. - -Tested on kernel booted with ipv6.disable=1 (disabling via sysctl, i.e. -sysctl -w net.ipv6.conf.all.disable_ipv6=1; sysctl -w net.ipv6.conf.default.disable_ipv6=1 -does not trigger the issue as it exit with "socket: Address family not -supported by protocol" - errno EADDRNOTAVAIL). - -Fixes: d141cb6 ("ping: work with older kernels that don't support ping sockets") -Closes: https://github.com/iputils/iputils/issues/293 -Closes: https://github.com/iputils/iputils/pull/370 - -Reported-by: lekto <lekto@o2.pl> -Reviewed-by: Andrew Clayton <andrew@digital-domain.net> -Reviewed-by: Petr Vorel <pvorel@suse.cz> -Signed-off-by: Byron Stanoszek <gandalf@winds.org> -[ pvorel: create commit from Byron's patch on the issue, do analysis and wrote commit message ] -Signed-off-by: Petr Vorel <pvorel@suse.cz> ---- a/ping/ping.c -+++ b/ping/ping.c -@@ -150,8 +150,8 @@ static void create_socket(struct ping_rts *rts, socket_st *sock, int family, - /* Report error related to disabled IPv6 only when IPv6 also failed or in - * verbose mode. Report other errors always. - */ -- if ((errno == EAFNOSUPPORT && family == AF_INET6) || -- rts->opt_verbose || requisite) -+ if ((errno == EAFNOSUPPORT && family == AF_INET6 && requisite) || -+ rts->opt_verbose) - error(0, errno, "socket"); - if (requisite) - exit(2); diff --git a/net-misc/iputils/files/iputils-20210722-optional-tests.patch b/net-misc/iputils/files/iputils-20210722-optional-tests.patch deleted file mode 100644 index d6c4e98c0800..000000000000 --- a/net-misc/iputils/files/iputils-20210722-optional-tests.patch +++ /dev/null @@ -1,202 +0,0 @@ -https://github.com/iputils/iputils/commit/3163c49f9f4ad473a00d8a345ee334a028376011.patch -https://bugs.gentoo.org/807973 - -From: Heiko Becker <heirecka@exherbo.org> -Date: Fri, 23 Jul 2021 16:32:46 +0200 -Subject: [PATCH] meson: Make tests optional - -Now can be disabled with -DSKIP_TESTS=true. - -It allows to avoid meson error during build when ip isn't installed. - -Closes: #359 - -Reviewed-by: Petr Vorel <petr.vorel@gmail.com> -Signed-off-by: Heiko Becker <heirecka@exherbo.org> -[ pvorel: Rename variable TEST => SKIP_TESTS, default false, adjust -the description ] -Signed-off-by: Petr Vorel <petr.vorel@gmail.com> ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -72,3 +72,6 @@ option('INSTALL_SYSTEMD_UNITS', type: 'boolean', value: false, - - option('USE_GETTEXT', type: 'boolean', value: true, - description: 'Enable I18N') -+ -+option('SKIP_TESTS', type: 'boolean', value: false, -+ description: 'Skip tests during build') ---- a/ping/meson.build -+++ b/ping/meson.build -@@ -27,86 +27,6 @@ if (setcap_ping) - ) - endif - --##### TESTS ##### -- --# TODO: ::1 generates DEPRECATION: ":" is not allowed in test name "ping -c1 ::1", it has been replaced with "_" -- --# GitHub CI does not have working IPv6 --# https://github.com/actions/virtual-environments/issues/668 --ipv6_dst = [] --ipv6_switch = [] --r = run_command('ip', '-6', 'a') --if r.stdout().strip().contains('::1') -- message('IPv6 enabled') -- ipv6_dst = [ '::1' ] -- ipv6_switch = [ '-6' ] --else -- message('WARNING: IPv6 disabled') -+if not get_option('SKIP_TESTS') -+ subdir('test') - endif -- --run_as_root = false --r = run_command('id', '-u') --if r.stdout().strip().to_int() == 0 -- message('running as root') -- run_as_root = true --else -- message('running as normal user') --endif -- --foreach dst : [ 'localhost', '127.0.0.1' ] + ipv6_dst -- foreach switch : [ '', '-4' ] + ipv6_switch -- args = [ '-c1', dst ] -- should_fail = false -- -- if switch != '' -- args = [switch] + args -- if (switch == '-4' and dst == '::1') or (switch == '-6' and dst == '127.0.0.1') -- should_fail = true -- endif -- endif -- -- name = 'ping ' + ' '.join(args) -- test(name, ping, args : args, should_fail : should_fail) -- endforeach --endforeach -- --ping_tests_opt = [ -- [ '-c1' ], -- [ '-c5', '-i0.1' ], -- [ '-c1', '-I', 'lo' ], -- [ '-c1', '-w1' ], -- [ '-c1', '-W1' ], -- [ '-c1', '-W1.1' ], --] --foreach dst : [ '127.0.0.1' ] + ipv6_dst -- foreach args : ping_tests_opt -- args += [ dst ] -- name = 'ping ' + ' '.join(args) -- test(name, ping, args : args) -- endforeach --endforeach -- --ping_tests_opt_fail = [ -- [ '-c1.1' ], -- [ '-I', 'nonexisting' ], -- [ '-w0.1' ], -- [ '-w0,1' ], --] --foreach dst : [ '127.0.0.1' ] + ipv6_dst -- foreach args : ping_tests_opt_fail -- args += [ dst ] -- name = 'ping ' + ' '.join(args) -- test(name, ping, args : args, should_fail : true) -- endforeach --endforeach -- --ping_tests_user_fail = [ -- [ '-c1', '-i0.001' ], # -c1 required to quit ping when running as root --] --foreach dst : [ '127.0.0.1' ] + ipv6_dst -- foreach args : ping_tests_user_fail -- args += [ dst ] -- name = 'ping ' + ' '.join(args) -- test(name, ping, args : args, should_fail : not run_as_root) -- endforeach --endforeach ---- /dev/null -+++ b/ping/test/meson.build -@@ -0,0 +1,81 @@ -+# TODO: ::1 generates DEPRECATION: ":" is not allowed in test name "ping -c1 ::1", it has been replaced with "_" -+ -+# GitHub CI does not have working IPv6 -+# https://github.com/actions/virtual-environments/issues/668 -+ipv6_dst = [] -+ipv6_switch = [] -+r = run_command('ip', '-6', 'a') -+if r.stdout().strip().contains('::1') -+ message('IPv6 enabled') -+ ipv6_dst = [ '::1' ] -+ ipv6_switch = [ '-6' ] -+else -+ message('WARNING: IPv6 disabled') -+endif -+ -+run_as_root = false -+r = run_command('id', '-u') -+if r.stdout().strip().to_int() == 0 -+ message('running as root') -+ run_as_root = true -+else -+ message('running as normal user') -+endif -+ -+foreach dst : [ 'localhost', '127.0.0.1' ] + ipv6_dst -+ foreach switch : [ '', '-4' ] + ipv6_switch -+ args = [ '-c1', dst ] -+ should_fail = false -+ -+ if switch != '' -+ args = [switch] + args -+ if (switch == '-4' and dst == '::1') or (switch == '-6' and dst == '127.0.0.1') -+ should_fail = true -+ endif -+ endif -+ -+ name = 'ping ' + ' '.join(args) -+ test(name, ping, args : args, should_fail : should_fail) -+ endforeach -+endforeach -+ -+ping_tests_opt = [ -+ [ '-c1' ], -+ [ '-c5', '-i0.1' ], -+ [ '-c1', '-I', 'lo' ], -+ [ '-c1', '-w1' ], -+ [ '-c1', '-W1' ], -+ [ '-c1', '-W1.1' ], -+] -+foreach dst : [ '127.0.0.1' ] + ipv6_dst -+ foreach args : ping_tests_opt -+ args += [ dst ] -+ name = 'ping ' + ' '.join(args) -+ test(name, ping, args : args) -+ endforeach -+endforeach -+ -+ping_tests_opt_fail = [ -+ [ '-c1.1' ], -+ [ '-I', 'nonexisting' ], -+ [ '-w0.1' ], -+ [ '-w0,1' ], -+] -+foreach dst : [ '127.0.0.1' ] + ipv6_dst -+ foreach args : ping_tests_opt_fail -+ args += [ dst ] -+ name = 'ping ' + ' '.join(args) -+ test(name, ping, args : args, should_fail : true) -+ endforeach -+endforeach -+ -+ping_tests_user_fail = [ -+ [ '-c1', '-i0.001' ], # -c1 required to quit ping when running as root -+] -+foreach dst : [ '127.0.0.1' ] + ipv6_dst -+ foreach args : ping_tests_user_fail -+ args += [ dst ] -+ name = 'ping ' + ' '.join(args) -+ test(name, ping, args : args, should_fail : not run_as_root) -+ endforeach -+endforeach diff --git a/net-misc/iputils/iputils-20210202.ebuild b/net-misc/iputils/iputils-20210202.ebuild deleted file mode 100644 index 429e1a716287..000000000000 --- a/net-misc/iputils/iputils-20210202.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and reduces dependencies. -# To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag, all USE flags enabled and -# tar ${S}/doc folder. - -EAPI="7" - -PLOCALES="de fr ja pt_BR tr uk zh_CN" - -inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/iputils/iputils.git" - inherit git-r3 -else - SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Network monitoring tools including ping and ping6" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" - -LICENSE="BSD GPL-2+ rdisc" -SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6" - -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -LIB_DEPEND=" - caps? ( sys-libs/libcap[static-libs(+)] ) - idn? ( net-dns/libidn2:=[static-libs(+)] ) - nls? ( virtual/libintl[static-libs(+)] ) -" - -RDEPEND=" - traceroute6? ( !net-analyzer/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) -" - -DEPEND=" - ${RDEPEND} - virtual/os-headers - static? ( ${LIB_DEPEND} ) -" - -if [[ ${PV} == "99999999" ]] ; then - BDEPEND+=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-ns-stylesheets - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - " -fi - -src_prepare() { - default - - plocale_get_locales > po/LINGUAS || die -} - -src_configure() { - use static && append-ldflags -static - - local emesonargs=( - -DUSE_CAP="$(usex caps true false)" - -DUSE_IDN="$(usex idn true false)" - -DBUILD_ARPING="$(usex arping true false)" - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)" - -DBUILD_PING="true" - -DBUILD_RARPD="$(usex rarpd true false)" - -DBUILD_RDISC="$(usex rdisc true false)" - -DENABLE_RDISC_SERVER="$(usex rdisc true false)" - -DBUILD_TFTPD="$(usex tftpd true false)" - -DBUILD_TRACEPATH="$(usex tracepath true false)" - -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)" - -DBUILD_NINFOD="false" - -DNINFOD_MESSAGES="false" - -DNO_SETCAP_OR_SUID="true" - -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -DUSE_GETTEXT="$(usex nls true false)" - ) - - if [[ "${PV}" == 99999999 ]] ; then - emesonargs+=( - -DBUILD_HTML_MANS="$(usex doc true false)" - -DBUILD_MANS="true" - ) - else - emesonargs+=( - -DBUILD_HTML_MANS="false" - -DBUILD_MANS="false" - ) - fi - - meson_src_configure -} - -src_compile() { - tc-export CC - meson_src_compile -} - -src_install() { - meson_src_install - - dodir /bin - local my_bin - for my_bin in $(usex arping arping '') ping ; do - mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die - done - dosym ping /bin/ping4 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath4 - fi - - if use ipv6 ; then - dosym ping /bin/ping6 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath6 - dosym tracepath.8 /usr/share/man/man8/tracepath6.8 - fi - fi - - if [[ "${PV}" != 99999999 ]] ; then - local -a man_pages - local -a html_man_pages - - while IFS= read -r -u 3 -d $'\0' my_bin - do - my_bin=$(basename "${my_bin}") - [[ -z "${my_bin}" ]] && continue - - if [[ -f "${S}/doc/${my_bin}.8" ]] ; then - man_pages+=( ${my_bin}.8 ) - fi - - if [[ -f "${S}/doc/${my_bin}.html" ]] ; then - html_man_pages+=( ${my_bin}.html ) - fi - done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) - - pushd doc &>/dev/null || die - doman "${man_pages[@]}" - if use doc ; then - docinto html - dodoc "${html_man_pages[@]}" - fi - popd &>/dev/null || die - else - if use doc ; then - mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die - fi - fi -} - -pkg_postinst() { - fcaps cap_net_raw \ - bin/ping \ - $(usex arping 'bin/arping' '') \ - $(usex clockdiff 'usr/bin/clockdiff' '') -} diff --git a/net-misc/iputils/iputils-20210722-r1.ebuild b/net-misc/iputils/iputils-20210722-r1.ebuild deleted file mode 100644 index f572846d61e0..000000000000 --- a/net-misc/iputils/iputils-20210722-r1.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and reduces dependencies. -# To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag, all USE flags enabled and -# tar ${S}/doc folder. - -EAPI="7" - -PLOCALES="de fr ja pt_BR tr uk zh_CN" - -inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/iputils/iputils.git" - inherit git-r3 -else - SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Network monitoring tools including ping and ping6" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" - -LICENSE="BSD GPL-2+ rdisc" -SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6" -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig - test? ( sys-apps/iproute2 ) - nls? ( sys-devel/gettext ) -" - -LIB_DEPEND=" - caps? ( sys-libs/libcap[static-libs(+)] ) - idn? ( net-dns/libidn2:=[static-libs(+)] ) - nls? ( virtual/libintl[static-libs(+)] ) -" - -RDEPEND=" - traceroute6? ( !net-analyzer/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) -" - -DEPEND=" - ${RDEPEND} - virtual/os-headers - static? ( ${LIB_DEPEND} ) -" - -if [[ ${PV} == "99999999" ]] ; then - BDEPEND+=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-ns-stylesheets - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - " -fi - -PATCHES=( - # Upstream; drop on bump - "${FILESDIR}"/${P}-optional-tests.patch - # Upstream; drop on bump - "${FILESDIR}"/${P}-fix-no-ipv6-ping.patch -) - -src_prepare() { - default - - plocale_get_locales > po/LINGUAS || die -} - -src_configure() { - use static && append-ldflags -static - - local emesonargs=( - -DUSE_CAP="$(usex caps true false)" - -DUSE_IDN="$(usex idn true false)" - -DBUILD_ARPING="$(usex arping true false)" - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)" - -DBUILD_PING="true" - -DBUILD_RARPD="$(usex rarpd true false)" - -DBUILD_RDISC="$(usex rdisc true false)" - -DENABLE_RDISC_SERVER="$(usex rdisc true false)" - -DBUILD_TFTPD="$(usex tftpd true false)" - -DBUILD_TRACEPATH="$(usex tracepath true false)" - -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)" - -DBUILD_NINFOD="false" - -DNINFOD_MESSAGES="false" - -DNO_SETCAP_OR_SUID="true" - -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -DUSE_GETTEXT="$(usex nls true false)" - $(meson_use !test SKIP_TESTS) - ) - - if [[ "${PV}" == 99999999 ]] ; then - emesonargs+=( - -DBUILD_HTML_MANS="$(usex doc true false)" - -DBUILD_MANS="true" - ) - else - emesonargs+=( - -DBUILD_HTML_MANS="false" - -DBUILD_MANS="false" - ) - fi - - meson_src_configure -} - -src_compile() { - tc-export CC - meson_src_compile -} - -src_test() { - if [[ ${EUID} != 0 ]]; then - einfo "Tests require root privileges; Skipping ..." - return - fi - - meson_src_test -} - -src_install() { - meson_src_install - - dodir /bin - local my_bin - for my_bin in $(usex arping arping '') ping ; do - mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die - done - dosym ping /bin/ping4 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath4 - fi - - if use ipv6 ; then - dosym ping /bin/ping6 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath6 - dosym tracepath.8 /usr/share/man/man8/tracepath6.8 - fi - fi - - if [[ "${PV}" != 99999999 ]] ; then - local -a man_pages - local -a html_man_pages - - while IFS= read -r -u 3 -d $'\0' my_bin - do - my_bin=$(basename "${my_bin}") - [[ -z "${my_bin}" ]] && continue - - if [[ -f "${S}/doc/${my_bin}.8" ]] ; then - man_pages+=( ${my_bin}.8 ) - fi - - if [[ -f "${S}/doc/${my_bin}.html" ]] ; then - html_man_pages+=( ${my_bin}.html ) - fi - done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) - - pushd doc &>/dev/null || die - doman "${man_pages[@]}" - if use doc ; then - docinto html - dodoc "${html_man_pages[@]}" - fi - popd &>/dev/null || die - else - if use doc ; then - mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die - fi - fi -} - -pkg_postinst() { - fcaps cap_net_raw \ - bin/ping \ - $(usex arping 'bin/arping' '') \ - $(usex clockdiff 'usr/bin/clockdiff' '') -} diff --git a/net-misc/iputils/iputils-20210722.ebuild b/net-misc/iputils/iputils-20211215.ebuild index a4f130b6e606..9adbec78252c 100644 --- a/net-misc/iputils/iputils-20210722.ebuild +++ b/net-misc/iputils/iputils-20211215.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # For released versions, we precompile the man/html pages and store @@ -19,8 +19,9 @@ if [[ ${PV} == "99999999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" @@ -28,47 +29,36 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" LICENSE="BSD GPL-2+ rdisc" SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6" +IUSE="+arping caps clockdiff doc idn nls rarpd rdisc static test tracepath" RESTRICT="!test? ( test )" -BDEPEND=" - virtual/pkgconfig - test? ( sys-apps/iproute2 ) - nls? ( sys-devel/gettext ) -" - LIB_DEPEND=" caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn2:=[static-libs(+)] ) nls? ( virtual/libintl[static-libs(+)] ) " - -RDEPEND=" - traceroute6? ( !net-analyzer/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) -" - +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND=" ${RDEPEND} virtual/os-headers static? ( ${LIB_DEPEND} ) " +BDEPEND=" + virtual/pkgconfig + test? ( sys-apps/iproute2 ) + nls? ( sys-devel/gettext ) +" -if [[ ${PV} == "99999999" ]] ; then +if [[ ${PV} == 99999999 ]] ; then BDEPEND+=" app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-ns-stylesheets app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 + dev-libs/libxslt " fi -PATCHES=( - # Upstream; drop on bump - "${FILESDIR}"/${P}-optional-tests.patch -) - src_prepare() { default @@ -79,34 +69,32 @@ src_configure() { use static && append-ldflags -static local emesonargs=( - -DUSE_CAP="$(usex caps true false)" - -DUSE_IDN="$(usex idn true false)" - -DBUILD_ARPING="$(usex arping true false)" - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)" - -DBUILD_PING="true" - -DBUILD_RARPD="$(usex rarpd true false)" - -DBUILD_RDISC="$(usex rdisc true false)" - -DENABLE_RDISC_SERVER="$(usex rdisc true false)" - -DBUILD_TFTPD="$(usex tftpd true false)" - -DBUILD_TRACEPATH="$(usex tracepath true false)" - -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)" - -DBUILD_NINFOD="false" - -DNINFOD_MESSAGES="false" - -DNO_SETCAP_OR_SUID="true" - -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -DUSE_GETTEXT="$(usex nls true false)" + -DUSE_CAP=$(usex caps true false) + -DUSE_IDN=$(usex idn true false) + -DBUILD_ARPING=$(usex arping true false) + -DBUILD_CLOCKDIFF=$(usex clockdiff true false) + -DBUILD_PING=true + -DBUILD_RARPD=$(usex rarpd true false) + -DBUILD_RDISC=$(usex rdisc true false) + -DENABLE_RDISC_SERVER=$(usex rdisc true false) + -DBUILD_TRACEPATH=$(usex tracepath true false) + -DBUILD_NINFOD=false + -DNINFOD_MESSAGES=false + -DNO_SETCAP_OR_SUID=true + -Dsystemdunitdir=$(systemd_get_systemunitdir) + -DUSE_GETTEXT=$(usex nls true false) $(meson_use !test SKIP_TESTS) ) - if [[ "${PV}" == 99999999 ]] ; then + if [[ ${PV} == 99999999 ]] ; then emesonargs+=( - -DBUILD_HTML_MANS="$(usex doc true false)" - -DBUILD_MANS="true" + -DBUILD_HTML_MANS=$(usex doc true false) + -DBUILD_MANS=true ) else emesonargs+=( - -DBUILD_HTML_MANS="false" - -DBUILD_MANS="false" + -DBUILD_HTML_MANS=false + -DBUILD_MANS=false ) fi @@ -115,12 +103,13 @@ src_configure() { src_compile() { tc-export CC + meson_src_compile } src_test() { - if [[ ${EUID} != 0 ]]; then - einfo "Tests require root privileges; Skipping ..." + if [[ ${EUID} != 0 ]] ; then + einfo "Tests require root privileges. Skipping ..." return fi @@ -136,21 +125,15 @@ src_install() { mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die done dosym ping /bin/ping4 + dosym ping /bin/ping6 if use tracepath ; then dosym tracepath /usr/bin/tracepath4 + dosym tracepath /usr/bin/tracepath6 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi - if use ipv6 ; then - dosym ping /bin/ping6 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath6 - dosym tracepath.8 /usr/share/man/man8/tracepath6.8 - fi - fi - - if [[ "${PV}" != 99999999 ]] ; then + if [[ ${PV} != 99999999 ]] ; then local -a man_pages local -a html_man_pages @@ -182,7 +165,21 @@ src_install() { fi } +pkg_preinst() { + local version_with_tftpd="<${CATEGORY}/${PN}-20211215" + if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then + HAD_TFTPD_VERSION=1 + fi +} + pkg_postinst() { + if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then + ewarn "This upstream version (>= 20211215) drops two tools:" + ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)" + ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)" + ewarn "Please install one of the listed alternatives if needed!" + fi + fcaps cap_net_raw \ bin/ping \ $(usex arping 'bin/arping' '') \ diff --git a/net-misc/iputils/iputils-20221126-r1.ebuild b/net-misc/iputils/iputils-20221126-r1.ebuild new file mode 100644 index 000000000000..f307d79736a8 --- /dev/null +++ b/net-misc/iputils/iputils-20221126-r1.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="de fr ja pt_BR tr uk zh_CN" + +inherit fcaps meson plocale systemd toolchain-funcs + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/iputils/iputils.git" + inherit git-r3 +else + SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Network monitoring tools including ping and ping6" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" + +# We install ping unconditionally so BSD is listed by itself +# See LICENSE on each release, it summaries per-component +LICENSE=" + BSD + arping? ( GPL-2+ ) + clockdiff? ( BSD ) + tracepath? ( GPL-2+ ) +" +SLOT="0" +IUSE="+arping caps clockdiff doc idn nls test tracepath" +RESTRICT="!test? ( test )" + +RDEPEND=" + caps? ( sys-libs/libcap ) + idn? ( net-dns/libidn2:= ) + nls? ( virtual/libintl ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers +" +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-ns-stylesheets + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig + test? ( sys-apps/iproute2 ) + nls? ( sys-devel/gettext ) +" + +src_prepare() { + default + + plocale_get_locales > po/LINGUAS || die +} + +src_configure() { + local emesonargs=( + -DUSE_CAP=$(usex caps true false) + -DUSE_IDN=$(usex idn true false) + -DBUILD_ARPING=$(usex arping true false) + -DBUILD_CLOCKDIFF=$(usex clockdiff true false) + -DBUILD_PING=true + -DBUILD_TRACEPATH=$(usex tracepath true false) + -DNO_SETCAP_OR_SUID=true + -Dsystemdunitdir=$(systemd_get_systemunitdir) + -DUSE_GETTEXT=$(usex nls true false) + $(meson_use !test SKIP_TESTS) + -DBUILD_HTML_MANS=$(usex doc true false) + -DBUILD_MANS=true + ) + + meson_src_configure +} + +src_compile() { + tc-export CC + + meson_src_compile +} + +src_test() { + if [[ ${EUID} != 0 ]] ; then + einfo "Tests require root privileges. Skipping ..." + return + fi + + meson_src_test +} + +src_install() { + meson_src_install + + FILECAPS=( cap_net_raw usr/bin/ping ) + use arping && FILECAPS+=( usr/bin/arping ) + use clockdiff && FILECAPS+=( usr/bin/clockdiff ) + + dosym ping /usr/bin/ping4 + dosym ping /usr/bin/ping6 + + if use tracepath ; then + dosym tracepath /usr/bin/tracepath4 + dosym tracepath /usr/bin/tracepath6 + dosym tracepath.8 /usr/share/man/man8/tracepath4.8 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 + fi + + if use doc ; then + mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die + fi +} + +pkg_preinst() { + local version_with_tftpd="<${CATEGORY}/${PN}-20211215" + if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then + HAD_TFTPD_VERSION=1 + fi +} + +pkg_postinst() { + fcaps_pkg_postinst + + if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then + ewarn "This upstream version (>= 20211215) drops two tools:" + ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)" + ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)" + ewarn "Please install one of the listed alternatives if needed!" + fi +} diff --git a/net-misc/iputils/iputils-20240117.ebuild b/net-misc/iputils/iputils-20240117.ebuild new file mode 100644 index 000000000000..30d11a82c612 --- /dev/null +++ b/net-misc/iputils/iputils-20240117.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="de fr ja pt_BR tr uk zh_CN" + +inherit fcaps meson plocale systemd toolchain-funcs + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/iputils/iputils.git" + inherit git-r3 +else + SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Network monitoring tools including ping and ping6" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" + +# We install ping unconditionally so BSD is listed by itself +# See LICENSE on each release, it summaries per-component +LICENSE=" + BSD + arping? ( GPL-2+ ) + clockdiff? ( BSD ) + tracepath? ( GPL-2+ ) +" +SLOT="0" +IUSE="+arping caps clockdiff doc idn nls test tracepath" +RESTRICT="!test? ( test )" + +RDEPEND=" + caps? ( sys-libs/libcap ) + idn? ( net-dns/libidn2:= ) + nls? ( virtual/libintl ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers +" +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-ns-stylesheets + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig + test? ( sys-apps/iproute2 ) + nls? ( sys-devel/gettext ) +" + +src_prepare() { + default + + plocale_get_locales > po/LINGUAS || die +} + +src_configure() { + local emesonargs=( + -DUSE_CAP=$(usex caps true false) + -DUSE_IDN=$(usex idn true false) + -DBUILD_ARPING=$(usex arping true false) + -DBUILD_CLOCKDIFF=$(usex clockdiff true false) + -DBUILD_PING=true + -DBUILD_TRACEPATH=$(usex tracepath true false) + -DNO_SETCAP_OR_SUID=true + -Dsystemdunitdir=$(systemd_get_systemunitdir) + -DUSE_GETTEXT=$(usex nls true false) + $(meson_use !test SKIP_TESTS) + -DBUILD_HTML_MANS=$(usex doc true false) + -DBUILD_MANS=true + ) + + meson_src_configure +} + +src_compile() { + tc-export CC + + meson_src_compile +} + +src_test() { + if [[ ${EUID} != 0 ]] ; then + einfo "Tests require root privileges. Skipping ..." + return + fi + + meson_src_test +} + +src_install() { + meson_src_install + + FILECAPS=( cap_net_raw usr/bin/ping ) + use arping && FILECAPS+=( usr/bin/arping ) + use clockdiff && FILECAPS+=( usr/bin/clockdiff ) + + dosym ping /usr/bin/ping4 + dosym ping /usr/bin/ping6 + + if use tracepath ; then + dosym tracepath /usr/bin/tracepath4 + dosym tracepath /usr/bin/tracepath6 + dosym tracepath.8 /usr/share/man/man8/tracepath4.8 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 + fi + + if use doc ; then + mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die + fi +} + +pkg_preinst() { + local version_with_tftpd="<${CATEGORY}/${PN}-20211215" + if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then + HAD_TFTPD_VERSION=1 + fi +} + +pkg_postinst() { + fcaps_pkg_postinst + + if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then + ewarn "This upstream version (>= 20211215) drops two tools:" + ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)" + ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)" + ewarn "Please install one of the listed alternatives if needed!" + fi +} diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index fe97d131c7f4..9ea33b7d9ce9 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -1,68 +1,54 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and reduces dependencies. -# To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag, all USE flags enabled and -# tar ${S}/doc folder. - -EAPI="7" +EAPI=8 PLOCALES="de fr ja pt_BR tr uk zh_CN" -inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs +inherit fcaps meson plocale systemd toolchain-funcs -if [[ ${PV} == "99999999" ]] ; then +if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/iputils/iputils.git" inherit git-r3 else - SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" -LICENSE="BSD GPL-2+ rdisc" +# We install ping unconditionally so BSD is listed by itself +# See LICENSE on each release, it summaries per-component +LICENSE=" + BSD + arping? ( GPL-2+ ) + clockdiff? ( BSD ) + tracepath? ( GPL-2+ ) +" SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6" +IUSE="+arping caps clockdiff doc idn nls test tracepath" RESTRICT="!test? ( test )" -BDEPEND=" - virtual/pkgconfig - test? ( sys-apps/iproute2 ) - nls? ( sys-devel/gettext ) -" - -LIB_DEPEND=" - caps? ( sys-libs/libcap[static-libs(+)] ) - idn? ( net-dns/libidn2:=[static-libs(+)] ) - nls? ( virtual/libintl[static-libs(+)] ) -" - RDEPEND=" - traceroute6? ( !net-analyzer/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + caps? ( sys-libs/libcap ) + idn? ( net-dns/libidn2:= ) + nls? ( virtual/libintl ) " - DEPEND=" ${RDEPEND} virtual/os-headers - static? ( ${LIB_DEPEND} ) " - -if [[ ${PV} == "99999999" ]] ; then - BDEPEND+=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-ns-stylesheets - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - " -fi +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-ns-stylesheets + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig + test? ( sys-apps/iproute2 ) + nls? ( sys-devel/gettext ) +" src_prepare() { default @@ -71,51 +57,33 @@ src_prepare() { } src_configure() { - use static && append-ldflags -static - local emesonargs=( - -DUSE_CAP="$(usex caps true false)" - -DUSE_IDN="$(usex idn true false)" - -DBUILD_ARPING="$(usex arping true false)" - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)" - -DBUILD_PING="true" - -DBUILD_RARPD="$(usex rarpd true false)" - -DBUILD_RDISC="$(usex rdisc true false)" - -DENABLE_RDISC_SERVER="$(usex rdisc true false)" - -DBUILD_TFTPD="$(usex tftpd true false)" - -DBUILD_TRACEPATH="$(usex tracepath true false)" - -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)" - -DBUILD_NINFOD="false" - -DNINFOD_MESSAGES="false" - -DNO_SETCAP_OR_SUID="true" - -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -DUSE_GETTEXT="$(usex nls true false)" + -DUSE_CAP=$(usex caps true false) + -DUSE_IDN=$(usex idn true false) + -DBUILD_ARPING=$(usex arping true false) + -DBUILD_CLOCKDIFF=$(usex clockdiff true false) + -DBUILD_PING=true + -DBUILD_TRACEPATH=$(usex tracepath true false) + -DNO_SETCAP_OR_SUID=true + -Dsystemdunitdir=$(systemd_get_systemunitdir) + -DUSE_GETTEXT=$(usex nls true false) $(meson_use !test SKIP_TESTS) + -DBUILD_HTML_MANS=$(usex doc true false) + -DBUILD_MANS=true ) - if [[ "${PV}" == 99999999 ]] ; then - emesonargs+=( - -DBUILD_HTML_MANS="$(usex doc true false)" - -DBUILD_MANS="true" - ) - else - emesonargs+=( - -DBUILD_HTML_MANS="false" - -DBUILD_MANS="false" - ) - fi - meson_src_configure } src_compile() { tc-export CC + meson_src_compile } src_test() { - if [[ ${EUID} != 0 ]]; then - einfo "Tests require root privileges; Skipping ..." + if [[ ${EUID} != 0 ]] ; then + einfo "Tests require root privileges. Skipping ..." return fi @@ -125,61 +93,39 @@ src_test() { src_install() { meson_src_install - dodir /bin - local my_bin - for my_bin in $(usex arping arping '') ping ; do - mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die - done - dosym ping /bin/ping4 + FILECAPS=( cap_net_raw usr/bin/ping ) + use arping && FILECAPS+=( usr/bin/arping ) + use clockdiff && FILECAPS+=( usr/bin/clockdiff ) + + dosym ping /usr/bin/ping4 + dosym ping /usr/bin/ping6 if use tracepath ; then dosym tracepath /usr/bin/tracepath4 + dosym tracepath /usr/bin/tracepath6 + dosym tracepath.8 /usr/share/man/man8/tracepath4.8 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi - if use ipv6 ; then - dosym ping /bin/ping6 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath6 - dosym tracepath.8 /usr/share/man/man8/tracepath6.8 - fi + if use doc ; then + mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die fi +} - if [[ "${PV}" != 99999999 ]] ; then - local -a man_pages - local -a html_man_pages - - while IFS= read -r -u 3 -d $'\0' my_bin - do - my_bin=$(basename "${my_bin}") - [[ -z "${my_bin}" ]] && continue - - if [[ -f "${S}/doc/${my_bin}.8" ]] ; then - man_pages+=( ${my_bin}.8 ) - fi - - if [[ -f "${S}/doc/${my_bin}.html" ]] ; then - html_man_pages+=( ${my_bin}.html ) - fi - done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) - - pushd doc &>/dev/null || die - doman "${man_pages[@]}" - if use doc ; then - docinto html - dodoc "${html_man_pages[@]}" - fi - popd &>/dev/null || die - else - if use doc ; then - mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die - fi +pkg_preinst() { + local version_with_tftpd="<${CATEGORY}/${PN}-20211215" + if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then + HAD_TFTPD_VERSION=1 fi } pkg_postinst() { - fcaps cap_net_raw \ - bin/ping \ - $(usex arping 'bin/arping' '') \ - $(usex clockdiff 'usr/bin/clockdiff' '') + fcaps_pkg_postinst + + if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then + ewarn "This upstream version (>= 20211215) drops two tools:" + ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)" + ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)" + ewarn "Please install one of the listed alternatives if needed!" + fi } diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml index b6ebdf9c592a..ae5bf52a8768 100644 --- a/net-misc/iputils/metadata.xml +++ b/net-misc/iputils/metadata.xml @@ -1,23 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> - </maintainer> - <use> - <flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag> - <flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag> - <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for md5 support</flag> - <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for md5 support</flag> - <flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag> - <flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag> - <flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag> - <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag> - <flag name="traceroute6">Build and install deprecated traceroute6 tool. It's recommended to use <pkg>net-analyzer/traceroute</pkg> instead.</flag> - </use> - <upstream> - <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id> - <remote-id type="github">iputils/iputils</remote-id> - </upstream> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <use> + <flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag> + <flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag> + <flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag> + <flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag> + <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id> + <remote-id type="github">iputils/iputils</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest index 5ec106f6042f..062ea0d83d1b 100644 --- a/net-misc/ipv6calc/Manifest +++ b/net-misc/ipv6calc/Manifest @@ -2,3 +2,4 @@ DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2 DIST ipv6calc-3.1.1.tar.gz 1634300 BLAKE2B 941df0c0d649cf5879e1abfde1e4c0f41fcdbe4cb945552df42b9a39ec317dda7e25c85711f103e024bc3774e46f52d3754e6e0b004b098baeac3d863d3ec38e SHA512 0cf726fec47a592168bb0715dd96c16033fe85e1c462530ef6898236cf89199fede81a9ffc78b3210c9e007da03279c7d45aa00a7a9a7f00f5f9bc82b7cc1695 DIST ipv6calc-3.2.0.tar.gz 1645414 BLAKE2B b74406a867b03e22244c1890133ce9553c40b5a737bd1711783e94b7f3afc43cfcff26e12583552a4c0fcc9ecd51174fb20844bddac22732d08e995de9e0f5ef SHA512 f7cd3d8820acd06c016e6f439129516d61300ba1660fe3acfec319f4dbd73de77f0a339bef31fd42bb0a4ab2e68d0e4771b1526f3217d3504cb4605d7b9b0195 DIST ipv6calc-4.0.0.tar.gz 1682616 BLAKE2B 5a26f6c4c8a9a2ea49c8762690c18e523ebde370817e71ae56f1cda211324695f046e85bba56f0b19e17869d72adb0ee8739fdbd4e8c4503d4a286107212eda4 SHA512 939dfcbe68c6e110acfe23f6f221471bda03ad165f5785bbc9aabd03b3192ab3cdb99df458db79edfa3c3d2f3202f1f2f189b7a9fd9a5ae27a7084de2fbd907d +DIST ipv6calc-4.0.1.tar.gz 1705407 BLAKE2B 599573570df946f3362e213e481b8016b037de6263ed53aa61fd39b69810b2cf05a9c76408904bac4b076a4061091be8adbd6d5648a1f5bdc5d021ebd5123acb SHA512 6e60f4808b2622235ea9c43c99868798e7014fbee7dc51349cfe2ba28badcc767d45f9e30dc14d3b78c4a88ef2ff80083b4b0be64e93ed17b17817995364b3ce diff --git a/net-misc/ipv6calc/files/ipv6calc-4.0.1-underlinking.patch b/net-misc/ipv6calc/files/ipv6calc-4.0.1-underlinking.patch new file mode 100644 index 000000000000..787ef1a3180c --- /dev/null +++ b/net-misc/ipv6calc/files/ipv6calc-4.0.1-underlinking.patch @@ -0,0 +1,79 @@ +https://github.com/pbiering/ipv6calc/pull/35 + +From e73dfa578b2af3f75b86e7584cfffcad79d75764 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 15 Sep 2022 00:23:37 +0100 +Subject: [PATCH] Fix underlinking with -lm (LDFLAGS order) + +LDFLAGS must come _before_ any libraries, +as some take effect based on arguments afterwards. + +For example, -Wl,--as-needed (which some distributions +set by default, even) will discard (or not know about) +any objects listed before it. + +See also e.g. +https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Importance_of_linking_order. + +Bug: https://bugs.gentoo.org/661536 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/ipv6calc/Makefile.in ++++ b/ipv6calc/Makefile.in +@@ -49,10 +49,10 @@ libipv6calc_db_wrapper: + cd ../ && ${MAKE} lib-make + + ipv6calc: $(OBJS) libipv6calc libipv6calc_db_wrapper +- $(CC) -o ipv6calc $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA) ++ $(CC) -o ipv6calc $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA) $(LIBS) -lm + + static: ipv6calc +- $(CC) -o ipv6calc-static $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) -static ++ $(CC) -o ipv6calc-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) $(LIBS) -lm -static + + distclean: + ${MAKE} clean +--- a/ipv6loganon/Makefile.in ++++ b/ipv6loganon/Makefile.in +@@ -49,10 +49,10 @@ libipv6calc_db_wrapper: + cd ../ && ${MAKE} lib-make + + ipv6loganon: $(OBJS) libipv6calc libipv6calc_db_wrapper +- $(CC) -o ipv6loganon $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA) ++ $(CC) -o ipv6loganon $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA) $(LIBS) -lm + + static: ipv6loganon +- $(CC) -o ipv6loganon-static $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) -static ++ $(CC) -o ipv6loganon-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) $(LIBS) -lm -static + + distclean: + ${MAKE} clean +--- a/ipv6logconv/Makefile.in ++++ b/ipv6logconv/Makefile.in +@@ -49,10 +49,10 @@ libipv6calc_db_wrapper: + cd ../ && ${MAKE} lib-make + + ipv6logconv: $(OBJS) libipv6calc libipv6calc_db_wrapper +- $(CC) -o ipv6logconv $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA) ++ $(CC) -o ipv6logconv $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA) $(LIBS) -lm + + static: ipv6logconv +- $(CC) -o ipv6logconv-static $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) -static ++ $(CC) -o ipv6logconv-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) $(LIBS) -lm -static + + distclean: + ${MAKE} clean +--- a/ipv6logstats/Makefile.in ++++ b/ipv6logstats/Makefile.in +@@ -49,10 +49,10 @@ libipv6calc_db_wrapper.a: + $(OBJS): ipv6logstatsoptions.h ipv6logstatshelp.h ipv6logstats.h + + ipv6logstats: $(OBJS) libipv6calc.a libipv6calc_db_wrapper.a +- $(CC) -o ipv6logstats $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA) ++ $(CC) -o ipv6logstats $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA) $(LIBS) -lm + + static: ipv6logstats +- $(CC) -o ipv6logstats-static $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) -static ++ $(CC) -o ipv6logstats-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) $(LIBS) -lm -static + + distclean: + ${MAKE} clean diff --git a/net-misc/ipv6calc/ipv6calc-4.0.0-r1.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.0.ebuild index a5d7e8e70ae5..3aa11efa4dd8 100644 --- a/net-misc/ipv6calc/ipv6calc-4.0.0-r1.ebuild +++ b/net-misc/ipv6calc/ipv6calc-4.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" diff --git a/net-misc/ipv6calc/ipv6calc-4.0.1-r1.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.1-r1.ebuild new file mode 100644 index 000000000000..c7d33aec4c7a --- /dev/null +++ b/net-misc/ipv6calc/ipv6calc-4.0.1-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +DESCRIPTION="IPv6 address calculator" +HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html" +SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" +IUSE="cgi geoip test" +RESTRICT="!test? ( test )" + +RDEPEND=" + cgi? ( + dev-perl/URI + dev-perl/Digest-SHA1 + ) + dev-libs/openssl:= + geoip? ( >=dev-libs/geoip-1.4.7 ) +" +DEPEND="${RDEPEND} + test? ( dev-perl/Digest-SHA1 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.0.1-underlinking.patch +) + +src_configure() { + # These options are broken. You can't disable them. That's + # okay because we want then force enabled. + # --disable-db-as-registry + # --disable-db-cc-registry + local myeconfargs=( + --disable-compiler-warning-to-error + --disable-bundled-getopt + --disable-bundled-md5 + --enable-shared + --enable-dynamic-load + --enable-db-ieee + --enable-db-ipv4 + --enable-db-ipv6 + --disable-dbip + --disable-dbip2 + --disable-external + --disable-ip2location + --enable-openssl-evp-md5 + --enable-openssl-md5 + $(use_enable geoip) + $(use_enable cgi mod_ipv6calc ) + ) + + if use geoip; then + myeconfargs+=( "--with-geoip-db=${EPREFIX}/usr/share/GeoIP" ) + fi + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake distclean + # Disable default CFLAGS (-O2 and -g) + emake DEFAULT_CFLAGS="" +} + +src_test() { + if [[ ${EUID} -eq 0 ]]; then + # Disable tests that fail as root + echo true > ipv6logstats/test_ipv6logstats.sh + fi + default +} + +src_install() { + emake DESTDIR="${D}" install + dodoc ChangeLog CREDITS README TODO USAGE +} diff --git a/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild new file mode 100644 index 000000000000..084598853945 --- /dev/null +++ b/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +DESCRIPTION="IPv6 address calculator" +HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html" +SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="cgi geoip test" +RESTRICT="!test? ( test )" + +RDEPEND=" + cgi? ( + dev-perl/URI + dev-perl/Digest-SHA1 + ) + dev-libs/openssl:= + geoip? ( >=dev-libs/geoip-1.4.7 ) +" +DEPEND="${RDEPEND} + test? ( dev-perl/Digest-SHA1 ) +" + +src_configure() { + # These options are broken. You can't disable them. That's + # okay because we want then force enabled. + # --disable-db-as-registry + # --disable-db-cc-registry + local myeconfargs=( + --disable-compiler-warning-to-error + --disable-bundled-getopt + --disable-bundled-md5 + --enable-shared + --enable-dynamic-load + --enable-db-ieee + --enable-db-ipv4 + --enable-db-ipv6 + --disable-dbip + --disable-dbip2 + --disable-external + --disable-ip2location + --enable-openssl-evp-md5 + --enable-openssl-md5 + $(use_enable geoip) + $(use_enable cgi mod_ipv6calc ) + ) + + if use geoip; then + myeconfargs+=( "--with-geoip-db=${EPREFIX}/usr/share/GeoIP" ) + fi + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake distclean + # Disable default CFLAGS (-O2 and -g) + emake DEFAULT_CFLAGS="" +} + +src_test() { + if [[ ${EUID} -eq 0 ]]; then + # Disable tests that fail as root + echo true > ipv6logstats/test_ipv6logstats.sh + fi + default +} + +src_install() { + emake DESTDIR="${D}" install + dodoc ChangeLog CREDITS README TODO USAGE +} diff --git a/net-misc/ipv6calc/metadata.xml b/net-misc/ipv6calc/metadata.xml index c1fd69f4c1d3..cc8d5e5812fc 100644 --- a/net-misc/ipv6calc/metadata.xml +++ b/net-misc/ipv6calc/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">pbiering/ipv6calc</remote-id> </upstream> diff --git a/net-misc/jrdesktop/Manifest b/net-misc/jrdesktop/Manifest deleted file mode 100644 index d9ac0bfe0f88..000000000000 --- a/net-misc/jrdesktop/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jrdesktop-source-0.3.1.0.tar.gz 228134 BLAKE2B d40fc0e12908bc535aa2be32962f30c41b4b7244363bea23fac983db9f25cde942da7ede23895d3c5c7f283dabc00331659567e76ba8357b850a655462a593fe SHA512 dc18187349f2526c027bf45acffa638d4d32692fdcf60b016a540a9245269e4ef49e4893fd666b8ad084dff0c83eb05a0549bcdf112c038f29224ff5a451cca6 diff --git a/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild b/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild deleted file mode 100644 index 8c578e84e9f1..000000000000 --- a/net-misc/jrdesktop/jrdesktop-0.3.1.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="source doc" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java Remote Desktop (jrdesktop) for viewing and/or controlling a distance PC" -HOMEPAGE="http://jrdesktop.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=">=virtual/jdk-1.6" -RDEPEND=">=virtual/jre-1.6" - -S="${WORKDIR}/${PN}" - -EANT_EXTRA_ARGS="-Djnlp.enabled=false" - -src_install() { - java-pkg_dojar "dist/${PN}.jar" - - use source && java-pkg_dosrc src/* - use doc && java-pkg_dojavadoc dist/javadoc - - java-pkg_dolauncher -} diff --git a/net-misc/jrdesktop/metadata.xml b/net-misc/jrdesktop/metadata.xml deleted file mode 100644 index 81f53435aaea..000000000000 --- a/net-misc/jrdesktop/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <longdescription lang="en"> - Java Remote Desktop (jrdesktop) is an open source software for viewing and/or controlling a distance PC. - -Besides then screenshots, keyboard and mouse events transfer, jrdesktop includes many additional features (like: file transfer, data compression, color conversion, ...). - -jrdesktop uses RMI (Remote Method Invocation) with SSL/TLS to establish a secured connection between the viewer and the server. - </longdescription> - <upstream> - <remote-id type="sourceforge">jrdesktop</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/jwhois/files/jwhois-4.0-add-timeout_init-prototype.patch b/net-misc/jwhois/files/jwhois-4.0-add-timeout_init-prototype.patch new file mode 100644 index 000000000000..542c9fdd1fc2 --- /dev/null +++ b/net-misc/jwhois/files/jwhois-4.0-add-timeout_init-prototype.patch @@ -0,0 +1,37 @@ +From 96fdd331c21421a313b6b97cb62e0c775ddc061c Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Tue, 10 Jan 2023 12:36:30 +0100 +Subject: [PATCH 2/2] <utils.h>: Add timeout_init prototype + +So that it can be called from the main function. This avoids a +compilation error with future compilers. +--- + include/utils.h | 1 + + src/utils.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/utils.h b/include/utils.h +index 754ddff..cd98b29 100644 +--- a/include/utils.h ++++ b/include/utils.h +@@ -28,6 +28,7 @@ char *create_string(const char *fmt, ...); + int split_host_from_query(struct s_whois_query *wq); + int make_connect(const char *, int); + int add_text_to_buffer(char **, const char *); ++void timeout_init(void); + + + #endif +diff --git a/src/utils.c b/src/utils.c +index ab01c2c..f82bd1c 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -348,7 +348,7 @@ split_host_from_query(struct s_whois_query *wq) + * file. + */ + void +-timeout_init() ++timeout_init(void) + { + int iret; + char *ret = "75", *ret2; diff --git a/net-misc/jwhois/files/jwhois-4.0-avoid-implicit-declarations.patch b/net-misc/jwhois/files/jwhois-4.0-avoid-implicit-declarations.patch new file mode 100644 index 000000000000..fca5dd4cdd38 --- /dev/null +++ b/net-misc/jwhois/files/jwhois-4.0-avoid-implicit-declarations.patch @@ -0,0 +1,44 @@ +From c7c344302d81a36b20d3d26a3d13367c8ed2c80d Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Tue, 10 Jan 2023 12:31:03 +0100 +Subject: [PATCH 1/2] configure.in: C99 compatibility fix + +Avoid implicit declarations of inet_pton, exit. Include <arpa/inet.h> +for the glibc declaration. Return from main instead of calling exit. +This avoids compilation errors with future compilers. +--- + configure.in | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index f1cdd10..678fe7d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,7 +119,7 @@ AC_CHECK_LIB(inet6, main, + AC_CHECK_FUNCS(memcpy strtol) + AC_CHECK_FUNCS(strcasecmp strncasecmp getopt_long) + AC_HEADER_STDC([]) +-AC_CHECK_HEADERS(sys/types.h sys/socket.h netinet/in.h netdb.h sys/time.h sys/stat.h sys/fcntl.h malloc.h locale.h stdint.h inttypes.h idna.h) ++AC_CHECK_HEADERS(sys/types.h sys/socket.h netinet/in.h netdb.h sys/time.h sys/stat.h sys/fcntl.h malloc.h locale.h stdint.h inttypes.h idna.h arpa/inet.h) + AC_HEADER_TIME + + +@@ -139,13 +139,16 @@ AC_TRY_RUN( + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif ++#ifdef HAVE_ARPA_INET_H ++#include <arpa/inet.h> ++#endif + int main() + { + struct in6_addr addr6; + if (inet_pton(AF_INET6, "::1", &addr6) < 1) +- exit(1); ++ return 1; + else +- exit(0); ++ return 0; + } + ], [ + AC_MSG_RESULT(yes) diff --git a/net-misc/jwhois/jwhois-4.0-r2.ebuild b/net-misc/jwhois/jwhois-4.0-r2.ebuild new file mode 100644 index 000000000000..ecfef500523f --- /dev/null +++ b/net-misc/jwhois/jwhois-4.0-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Advanced Internet Whois client capable of recursive queries" +HOMEPAGE="https://github.com/jonasob/jwhois/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="idn nls" + +RDEPEND="idn? ( net-dns/libidn )" +DEPEND="${RDEPEND}" + +PATCHES=( + # bug 208875 + "${FILESDIR}"/${P}-connect-logic.patch + "${FILESDIR}"/${P}-avoid-implicit-declarations.patch + "${FILESDIR}"/${P}-add-timeout_init-prototype.patch +) + +src_configure() { + econf \ + --localstatedir="${EPREFIX}"/var/cache \ + --without-cache \ + $(use_enable nls) \ + $(use_with idn libidn) + eautoreconf +} + +src_compile(){ + emake AR="$(tc-getAR)" +} diff --git a/net-misc/jwhois/metadata.xml b/net-misc/jwhois/metadata.xml index 73dda144f9ac..e8a24cb81ff8 100644 --- a/net-misc/jwhois/metadata.xml +++ b/net-misc/jwhois/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <upstream> + <remote-id type="savannah">jwhois</remote-id> + <remote-id type="github">jonasob/jwhois</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest index dbdc04aef8f0..0e32629d5afc 100644 --- a/net-misc/kafka-bin/Manifest +++ b/net-misc/kafka-bin/Manifest @@ -1,2 +1,3 @@ -DIST kafka_2.13-2.8.1.tgz 71438574 BLAKE2B 51969ae472665f5716f0ee9df35d627221d1347ea0ddcbc0812774606c3c8251670a7f79eaf93eb3141494042f967e9eeca14ae078937afb6bc29c2ef57bd68c SHA512 91fcd1061247ad0ddb63fa2b5c0251ee0e58e60cc9e1a3ebe2e84e9a31872448a36622dd15868de2c6d3f7e26020a8c61477bc764e2fb6776a25e4344eb8892d -DIST kafka_2.13-3.0.0.tgz 86396520 BLAKE2B a58b3638dd17ead6677db367003c727ad52827ebed0a5dd7772a56821866b867decb8e8e344106b047d40c6c19ce925c468d3879f4a1ce14f965adecf5b5432f SHA512 86cdeb04af123399858d03431e9777948c1c40ec0d843966cf9bd90b8235b47ebbb5cb96d1f0660710b9286da86bbb5ee65e21e757606f5a1e67f970ae5cf57c +DIST kafka_2.13-3.5.2.tgz 110420856 BLAKE2B fd59e7fcb22a944f6fdee4ecda7d418f3818c42b23a0b8a02ef629781ed8a34c95e4ad75560f9e3fb9bbc32933f7960f086c39d2294c336b8ab520c887aa8a22 SHA512 229ccc5e3e6b3b9845f59f6e829d70711c5a5a2293f32b6bcabc37350666f874bc7d8f08130f712a1b32915205c10f2847f04908c20d5f7fdb4b62d058c9defe +DIST kafka_2.13-3.6.1.tgz 113466638 BLAKE2B 1142459c2810cf4df8785afc9fab57440357000a97b23cfec8b6c59d886706d4fd13120388e9473917106c1cb237f65671bb1258de1343ef7818b3b97617f0b4 SHA512 1f063cd67463dd3bb5a5e06e7a1c2278db84bfc836a634fac7c9a005de66a42ac00b32f5e9bbdd22086605f73659efd4ce5bd1185196b02a743be0898daac55d +DIST kafka_2.13-3.7.0.tgz 119028138 BLAKE2B 5d366f5d9456668f4914da30fa32f7104816ec721379f88c5e77946f01256e02a7a6465e6865cb957af5bdf6a77e3ae16cf9e715f3b13ce00e1debd0ce34d4f3 SHA512 b8679283a2d8dab86e7c636b2c688fe9d9e64ac437241f65ef7a1733f4d26a2bd415eefa04f09f1911373bcd2a5dbc3838c76347f68656425c09202cd290ce91 diff --git a/net-misc/kafka-bin/kafka-bin-2.8.1.ebuild b/net-misc/kafka-bin/kafka-bin-3.5.2.ebuild index fb42f54f96da..750555119b44 100644 --- a/net-misc/kafka-bin/kafka-bin-2.8.1.ebuild +++ b/net-misc/kafka-bin/kafka-bin-3.5.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="https://kafka.apache.org/" @@ -21,7 +21,7 @@ IUSE="internal-zookeeper connect" COMMON_DEPEND="acct-group/kafka acct-user/kafka - virtual/jre:1.8" + virtual/jre:=" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" diff --git a/net-misc/kafka-bin/kafka-bin-3.0.0.ebuild b/net-misc/kafka-bin/kafka-bin-3.6.1.ebuild index fb42f54f96da..62f5d3c5f537 100644 --- a/net-misc/kafka-bin/kafka-bin-3.0.0.ebuild +++ b/net-misc/kafka-bin/kafka-bin-3.6.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="A high-throughput distributed messaging system" HOMEPAGE="https://kafka.apache.org/" @@ -21,7 +21,7 @@ IUSE="internal-zookeeper connect" COMMON_DEPEND="acct-group/kafka acct-user/kafka - virtual/jre:1.8" + virtual/jre:=" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" diff --git a/net-misc/kafka-bin/kafka-bin-3.7.0.ebuild b/net-misc/kafka-bin/kafka-bin-3.7.0.ebuild new file mode 100644 index 000000000000..750555119b44 --- /dev/null +++ b/net-misc/kafka-bin/kafka-bin-3.7.0.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A high-throughput distributed messaging system" +HOMEPAGE="https://kafka.apache.org/" + +# pick recommended scala version +SCALA_VERSION=2.13 +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 connect" + +COMMON_DEPEND="acct-group/kafka + acct-user/kafka + virtual/jre:=" +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 + sed -i -e 's:/tmp/connect.offsets:/var/lib/kafka/connect.offsets:' "config/connect-standalone.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" + + 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 + fowners -R kafka:kafka /var/lib/kafka + + keepdir /var/log/kafka + fowners -R kafka:kafka /var/log/kafka + + newinitd "${FILESDIR}/${MY_PN}.init.d.5" "${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/kafkacat/Manifest b/net-misc/kafkacat/Manifest index c8b35d68d1f6..45fa8560a05c 100644 --- a/net-misc/kafkacat/Manifest +++ b/net-misc/kafkacat/Manifest @@ -1 +1 @@ -DIST kafkacat-1.5.0.tar.gz 124682 BLAKE2B 392689ded1cd07268bba572273b2b18dbac0d0f4c2daf87c0a4c5fbbff2568df7ec5ca7b64aed34caa851b5e9b8629e246f9d19087496a882b8b55b2e2138f78 SHA512 57f75b26ef32df244043fa9fc17dc2d6fd93daeea4bc389aa78356ea6e45dea780ff9c3462ed27d2a7798560a21eef04f098bf7766c7305bcee4573f557651ad +DIST kcat-1.7.1.tar.gz 142699 BLAKE2B 2736d284d9f1f940688a3605db3a966ddee0cb26cc271d0d288f5910a86b8d494e207757d5d35e445ea99bb4a0a218715401815167734eee3942d7de6573baaf SHA512 07aa442a840819ca8d1ab20d86fe9d07afee0e4fa546b033ceb0c1c526f3fb5d9fbd2c34c29460d3439c5046b836605150dc76e85072d9516d82b9a193a0a3cd diff --git a/net-misc/kafkacat/kafkacat-1.5.0.ebuild b/net-misc/kafkacat/kafkacat-1.5.0.ebuild deleted file mode 100644 index 0e3125abcb97..000000000000 --- a/net-misc/kafkacat/kafkacat-1.5.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Generic command line non-JVM Apache Kafka producer and consumer" -HOMEPAGE="https://github.com/edenhill/kafkacat" -SRC_URI="https://github.com/edenhill/kafkacat/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="+avro +json" - -DEPEND=">=dev-libs/librdkafka-0.9.4 - avro? ( - dev-libs/avro-c - dev-libs/libserdes - ) - json? ( dev-libs/yajl )" -RDEPEND="${DEPEND}" - -src_configure() { - econf $(use_enable avro) $(use_enable json) --cc=$(tc-getCC) -} - -src_install() { - default - doman ${PN}.1 -} diff --git a/net-misc/kafkacat/kafkacat-1.7.1.ebuild b/net-misc/kafkacat/kafkacat-1.7.1.ebuild new file mode 100644 index 000000000000..b0c95f3ca2f5 --- /dev/null +++ b/net-misc/kafkacat/kafkacat-1.7.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +MY_PN=kcat + +inherit toolchain-funcs + +DESCRIPTION="Generic command line non-JVM Apache Kafka producer and consumer" +HOMEPAGE="https://github.com/edenhill/kcat" +SRC_URI="https://github.com/edenhill/kcat/archive/${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="amd64" +IUSE="+avro +json" + +DEPEND=">=dev-libs/librdkafka-0.9.4 + avro? ( + dev-libs/avro-c + dev-libs/libserdes + ) + json? ( dev-libs/yajl )" +RDEPEND="${DEPEND}" + +# tests require a running kafka cluster +RESTRICT="test" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_configure() { + econf $(use_enable avro) $(use_enable json) --cc="$(tc-getCC)" +} + +src_install() { + default + dodoc CHANGELOG.md + doman ${MY_PN}.1 +} + +pkg_postinst() { + ewarn "Note that starting with version 1.7.1 the executable name" + ewarn "was changed from kafkacat to kcat" +} diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest index 88efc3d478ab..313b52da604e 100644 --- a/net-misc/kea/Manifest +++ b/net-misc/kea/Manifest @@ -1,2 +1,2 @@ -DIST kea-1.8.2.tar.gz 9005645 BLAKE2B fec1118ca34adc4bdafea13dd6c1c3abcd42df80043b621d1ed994e7ec6906a5d13e86a1bbb6dcbdfee32a4d70281c751b46c57d4866bd92557448ab7c602c30 SHA512 7bea9eb30ee819bd350ba3f64da7dc46d1176363e7243e934ff0f0498fcd47ef4eccb7fe8d8dd4f883ab9e376174aaba4fae06b20405181d46b6b12cfbdf7dd0 -DIST kea-1.9.11.tar.gz 9739770 BLAKE2B 0215ac48036506018dc869c313d59244e4bf03634be279039fd0dbf7de73a2d87654b11153ec9014b89c815068961633987d44a26b820e4692937c85d29d352c SHA512 5d7739d74b6fbed9733719af1aa068498fcc1eaa1ed423b93b9b4dd92de970e3cd036ad60377534a58e7d22e909404673358fa72307b6c32492f952684c180c0 +DIST kea-2.4.0.tar.gz 10462721 BLAKE2B 07a4424c01872142b85446ee881afbdc9d8b3a0bc7879226463dd0ba20eba6d3d6db3dfd5fff88cd54af05c4f58183032c7df90d24a969a7ae63200822b6f35f SHA512 b0bdb6b6af88e322145ffeb742a818d6e225846ff981ecc4925d311870db94e0c5a4eb0e1140f146624f64b636c9b24148b5efbc32e62a19b99bba0810b54654 +DIST kea-2.4.1.tar.gz 10487415 BLAKE2B 21037d28f812ebbc65ae34f5151a209e9c74f6aa005e96ed7cbbf6e4250e6c40eecf5d257b852bf01663a0982b5401008dd6a51a16d861b30a83549f827538b6 SHA512 b8a3b6f2cae213fd9826c37568c71d3458f52eed973dbe437a1d0974dafa026635a730d828c6ff03b32e030be57d75a7914a8ca313833e91d9996b6a05b2b224 diff --git a/net-misc/kea/files/ax_gtest.m4 b/net-misc/kea/files/ax_gtest.m4 new file mode 100644 index 000000000000..7f7d0bb7aa65 --- /dev/null +++ b/net-misc/kea/files/ax_gtest.m4 @@ -0,0 +1,19 @@ +AC_DEFUN([AX_ISC_GTEST], [ + +USE_LCOV="no" +AC_SUBST(USE_LCOV) + +DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest" +PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])]) +GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest` +GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest` +GTEST_VERSION=`${PKG_CONFIG} --modversion gtest` + +AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no") +AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes") +AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG) +AC_SUBST(GTEST_INCLUDES) +AC_SUBST([GTEST_LDADD], [$GTEST_LIBS]) +AC_SUBST(GTEST_SOURCE) + +])dnl AX_ISC_GTEST diff --git a/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch b/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch deleted file mode 100644 index fec0fcc30f4b..000000000000 --- a/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kea-1.8.2/src/lib/dhcpsrv/timer_mgr.cc -+++ kea-1.8.2/src/lib/dhcpsrv/timer_mgr.cc -@@ -9,6 +9,7 @@ - #include <asiolink/io_service.h> - #include <dhcpsrv/dhcpsrv_log.h> - #include <dhcpsrv/timer_mgr.h> -+#include <map> - #include <exceptions/exceptions.h> - - #include <functional> 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 deleted file mode 100644 index 867561f2e7e5..000000000000 --- a/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- 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/files/kea-1.8.2-gtest.patch b/net-misc/kea/files/kea-1.8.2-gtest.patch deleted file mode 100644 index 5fa4488b926c..000000000000 --- a/net-misc/kea/files/kea-1.8.2-gtest.patch +++ /dev/null @@ -1,149 +0,0 @@ ---- a/m4macros/ax_gtest.m4 -+++ b/m4macros/ax_gtest.m4 -@@ -1,24 +1,14 @@ - AC_DEFUN([AX_ISC_GTEST], [ - --enable_gtest="no" --GTEST_INCLUDES= -- --AC_ARG_WITH([gtest-source], -- [AS_HELP_STRING([--with-gtest-source=PATH], -- [location of the Googletest source])], -- [enable_gtest="yes" ; GTEST_SOURCE="$withval"]) -- --AC_ARG_WITH([gtest], -- [AS_HELP_STRING([--with-gtest=PATH], -- [specify a path to gtest header files (PATH/include) and library (PATH/lib)])], -- [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"]) -+AC_ARG_ENABLE([gtest], -+ [AS_HELP_STRING([--enable-gtest], -+ [Enable testing via Googletest [default=no]])]) - - AC_ARG_WITH([lcov], - [AS_HELP_STRING([--with-lcov=PROGRAM], - [enable gtest and coverage target using the specified lcov])], - [lcov="$withval"], - [lcov="no"]) -- - USE_LCOV="no" - if test "$lcov" != "no"; then - # force gtest if not set -@@ -55,110 +45,22 @@ - # - # Check availability of gtest, which will be used for unit tests. - # --GTEST_LDFLAGS= --GTEST_LDADD= - DISTCHECK_GTEST_CONFIGURE_FLAG= --GTEST_VERSION="unknown" -- --if test "x$enable_gtest" = "xyes" ; then -- -- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=$gtest_path" -- -- if test -n "$with_gtest_source" ; then - -- if test "x$GTEST_SOURCE" = "xyes" ; then -+AS_IF([test "x$enable_gtest" = "xyes"], [ -+ DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest" -+ PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])]) -+ GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest` -+ GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest` -+ GTEST_VERSION=`${PKG_CONFIG} --modversion gtest` -+]) - -- AC_MSG_CHECKING([for gtest source]) -- # If not specified, try some common paths. -- GTEST_SOURCE= -- for d in /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do -- if test -f $d/src/gtest-all.cc -a $d/src/gtest_main.cc; then -- GTEST_SOURCE=$d -- AC_MSG_RESULT([$GTEST_SOURCE]) -- break -- fi -- done -- if test -z $GTEST_SOURCE ; then -- AC_MSG_ERROR([no gtest source but it was selected]) -- fi -- else -- if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then -- GTEST_SOURCE=$GTEST_SOURCE/googletest -- fi -- if test -f $GTEST_SOURCE/src/gtest-all.cc -a $GTEST_SOURCE/src/gtest_main.cc; then -- have_gtest_source=yes -- else -- AC_MSG_ERROR([no gtest source at $GTEST_SOURCE]) -- fi -- fi -- have_gtest_source=yes -- -- GTEST_LDADD="\$(top_builddir)/ext/gtest/libgtest.a" -- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE" -- GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include" -- GTEST_VERSION="`basename $GTEST_SOURCE`" -- --# Versions starting from 1.8.0 are put in the googletest directory. If the basename --# returns googletest string, we need to cut it off and try baseline again. -- if test "$GTEST_VERSION" == "googletest"; then -- GTEST_VERSION=${GTEST_SOURCE%"/googletest"} -- GTEST_VERSION=`basename $GTEST_VERSION` -- fi -- GTEST_VERSION="${GTEST_VERSION#googletest-release-}" -- GTEST_VERSION="${GTEST_VERSION#gtest-}" -- fi -- -- if test "$gtest_path" != "no" ; then -- if test "$gtest_path" != "yes"; then -- GTEST_PATHS=$gtest_path -- if test -x "${gtest_path}/bin/gtest-config" ; then -- GTEST_CONFIG="${gtest_path}/bin/gtest-config" -- fi -- else -- AC_PATH_PROG([GTEST_CONFIG], [gtest-config]) -- fi -- if test -x "${GTEST_CONFIG}" ; then : -- # using cppflags instead of cxxflags -- GTEST_INCLUDES=`${GTEST_CONFIG} --cppflags` -- GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags` -- GTEST_LDADD=`${GTEST_CONFIG} --libs` -- GTEST_VERSION=`${GTEST_CONFIG} --version` -- GTEST_FOUND="true" -- else -- AC_MSG_WARN([Unable to locate Google Test gtest-config.]) -- if test -z "${GTEST_PATHS}" ; then -- GTEST_PATHS="/usr /usr/local" -- fi -- GTEST_FOUND="false" -- fi -- if test "${GTEST_FOUND}" != "true"; then -- GTEST_FOUND="false" -- for dir in $GTEST_PATHS; do -- if test -f "$dir/include/gtest/gtest.h"; then -- if ! test -f "$dir/lib/libgtest.a"; then -- AC_MSG_WARN([Found Google Test include but not the library in $dir.]) -- continue -- fi -- GTEST_INCLUDES="-I$dir/include" -- GTEST_LDFLAGS="-L$dir/lib" -- GTEST_LDADD="-lgtest" -- GTEST_FOUND="true" -- break -- fi -- done -- fi -- if test "${GTEST_FOUND}" != "true"; then -- AC_MSG_ERROR([Cannot find gtest in: $GTEST_PATHS]) -- fi -- -- fi --fi - AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no") - AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes") - AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG) - AC_SUBST(GTEST_INCLUDES) - AC_SUBST(GTEST_LDFLAGS) --AC_SUBST(GTEST_LDADD) -+AC_SUBST([GTEST_LDADD], [$GTEST_LIBS]) - AC_SUBST(GTEST_SOURCE) - - ])dnl AX_ISC_GTEST diff --git a/net-misc/kea/files/kea-1.9.10-gtest.patch b/net-misc/kea/files/kea-1.9.10-gtest.patch deleted file mode 100644 index f3e8cd7af4cc..000000000000 --- a/net-misc/kea/files/kea-1.9.10-gtest.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- a/m4macros/ax_gtest.m4 -+++ b/m4macros/ax_gtest.m4 -@@ -1,17 +1,8 @@ - AC_DEFUN([AX_ISC_GTEST], [ - --enable_gtest="no" --GTEST_INCLUDES= -- --AC_ARG_WITH([gtest-source], -- [AS_HELP_STRING([--with-gtest-source=PATH], -- [location of the Googletest source])], -- [enable_gtest="yes" ; GTEST_SOURCE="$withval"]) -- --AC_ARG_WITH([gtest], -- [AS_HELP_STRING([--with-gtest=PATH], -- [specify a path to gtest header files (PATH/include) and library (PATH/lib)])], -- [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"]) -+AC_ARG_ENABLE([gtest], -+ [AS_HELP_STRING([--enable-gtest], -+ [enable testing via Googletest [default=no]])]) - - AC_ARG_WITH([lcov], - [AS_HELP_STRING([--with-lcov=PROGRAM], -@@ -55,111 +46,22 @@ - # - # Check availability of gtest, which will be used for unit tests. - # --GTEST_LDFLAGS= --GTEST_LDADD= - DISTCHECK_GTEST_CONFIGURE_FLAG= --GTEST_VERSION="unknown" -- --if test "x$enable_gtest" = "xyes" ; then -- -- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=$gtest_path" -- -- if test -n "$with_gtest_source" ; then - -- if test "x$GTEST_SOURCE" = "xyes" ; then -+AS_IF([test "x$enable_gtest" = "xyes"], [ -+ DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest" -+ PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])]) -+ GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest` -+ GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest` -+ GTEST_VERSION=`${PKG_CONFIG} --modversion gtest` -+]) - -- AC_MSG_CHECKING([for gtest source]) -- # If not specified, try some common paths. -- GTEST_SOURCE= -- for d in /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do -- if test -f $d/src/gtest-all.cc -a $d/src/gtest_main.cc; then -- GTEST_SOURCE=$d -- AC_MSG_RESULT([$GTEST_SOURCE]) -- break -- fi -- done -- if test -z $GTEST_SOURCE ; then -- AC_MSG_ERROR([no gtest source but it was selected]) -- fi -- else -- if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then -- GTEST_SOURCE=$GTEST_SOURCE/googletest -- fi -- if test -f $GTEST_SOURCE/src/gtest-all.cc -a $GTEST_SOURCE/src/gtest_main.cc; then -- have_gtest_source=yes -- else -- AC_MSG_ERROR([no gtest source at $GTEST_SOURCE]) -- fi -- fi -- have_gtest_source=yes -- -- GTEST_LDADD="\$(top_builddir)/ext/gtest/libgtest.a" -- DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE" -- GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include" -- GTEST_VERSION="`basename $GTEST_SOURCE`" -- --# Versions starting from 1.8.0 are put in the googletest directory. If the basename --# returns googletest string, we need to cut it off and try baseline again. -- if test "$GTEST_VERSION" = "googletest"; then -- GTEST_VERSION=${GTEST_SOURCE%"/googletest"} -- GTEST_VERSION=`basename $GTEST_VERSION` -- fi -- GTEST_VERSION="${GTEST_VERSION#googletest-release-}" -- GTEST_VERSION="${GTEST_VERSION#gtest-}" -- fi -- -- if test "$gtest_path" != "no" ; then -- if test "$gtest_path" != "yes"; then -- GTEST_PATHS=$gtest_path -- if test -x "${gtest_path}/bin/gtest-config" ; then -- GTEST_CONFIG="${gtest_path}/bin/gtest-config" -- fi -- else -- AC_PATH_PROG([GTEST_CONFIG], [gtest-config]) -- fi -- if test -x "${GTEST_CONFIG}" ; then : -- # using cppflags instead of cxxflags -- GTEST_INCLUDES=`${GTEST_CONFIG} --cppflags` -- GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags` -- GTEST_LDADD=`${GTEST_CONFIG} --libs` -- GTEST_VERSION=`${GTEST_CONFIG} --version` -- GTEST_FOUND="true" -- else -- AC_MSG_WARN([Unable to locate Google Test gtest-config.]) -- if test -z "${GTEST_PATHS}" ; then -- GTEST_PATHS="/usr /usr/local" -- fi -- GTEST_FOUND="false" -- fi -- if test "${GTEST_FOUND}" != "true"; then -- GTEST_FOUND="false" -- for dir in $GTEST_PATHS; do -- if test -f "$dir/include/gtest/gtest.h"; then -- if test -f "$dir/lib/libgtest.a" || \ -- test -f "$dir/lib/libgtest.so"; then -- GTEST_INCLUDES="-I$dir/include" -- GTEST_LDFLAGS="-L$dir/lib" -- GTEST_LDADD="-lgtest" -- GTEST_FOUND="true" -- break -- else -- AC_MSG_WARN([Found Google Test include but not the library in $dir.]) -- fi -- fi -- done -- fi -- if test "${GTEST_FOUND}" != "true"; then -- AC_MSG_ERROR([Cannot find gtest in: $GTEST_PATHS]) -- fi -- -- fi --fi - AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no") - AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes") - AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG) - AC_SUBST(GTEST_INCLUDES) - AC_SUBST(GTEST_LDFLAGS) --AC_SUBST(GTEST_LDADD) -+AC_SUBST([GTEST_LDADD], [$GTEST_LIBS]) - AC_SUBST(GTEST_SOURCE) - - ])dnl AX_ISC_GTEST diff --git a/net-misc/kea/files/kea-2.2.0-openssl-version.patch b/net-misc/kea/files/kea-2.2.0-openssl-version.patch new file mode 100644 index 000000000000..5e323357d7c5 --- /dev/null +++ b/net-misc/kea/files/kea-2.2.0-openssl-version.patch @@ -0,0 +1,11 @@ +--- a/m4macros/ax_crypto.m4 ++++ b/m4macros/ax_crypto.m4 +@@ -258,7 +258,7 @@ then + else + CRYPTO_NAME="OpenSSL" + DISABLED_CRYPTO="Botan" +- CRYPTO_PACKAGE="openssl-1.1.0" ++ CRYPTO_PACKAGE="openssl" + DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl=${use_openssl}" + AC_DEFINE_UNQUOTED([WITH_OPENSSL], [], [Compile with OpenSSL crypto]) + AC_MSG_CHECKING(for OpenSSL library) diff --git a/net-misc/kea/kea-1.8.2.ebuild b/net-misc/kea/kea-1.8.2.ebuild deleted file mode 100644 index 0300cc956210..000000000000 --- a/net-misc/kea/kea-1.8.2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 - 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* ]] || \ - KEYWORDS="~amd64 ~arm64 ~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}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.2-fix-cxx11-detection.patch - "${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch -) - -src_prepare() { - default - 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-r1.ebuild b/net-misc/kea/kea-2.4.0-r1.ebuild index 7da321e5b818..72c97487d6f6 100644 --- a/net-misc/kea/kea-1.8.2-r1.ebuild +++ b/net-misc/kea/kea-2.4.0-r1.ebuild @@ -1,60 +1,85 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 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/" +HOMEPAGE="https://www.isc.org/kea/" -inherit autotools systemd tmpfiles +PYTHON_COMPAT=( python3_{8..12} ) + +inherit autotools fcaps flag-o-matic python-single-r1 systemd tmpfiles if [[ ${PV} = 9999* ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/isc-projects/kea.git" + EGIT_REPO_URI="https://gitlab.isc.org/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 ~arm64 ~x86" + # odd minor version = development release + if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then + if ! [[ "${PV}" == *_beta* || "${PV}" == *_rc* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" + fi + fi fi LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -IUSE="mysql +openssl postgres +samples test" +IUSE="debug doc mysql +openssl postgres +samples shell test" RESTRICT="!test? ( test )" COMMON_DEPEND=" dev-libs/boost:= dev-libs/log4cplus + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ') + ) mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* ) + shell? ( ${PYTHON_DEPS} ) " DEPEND="${COMMON_DEPEND} - test? ( dev-cpp/gtest )" + test? ( dev-cpp/gtest ) +" RDEPEND="${COMMON_DEPEND} acct-group/dhcp acct-user/dhcp" BDEPEND="virtual/pkgconfig" +REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )" + S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}"/${PN}-1.8.2-fix-cxx11-detection.patch - "${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch - "${FILESDIR}"/${PN}-1.8.2-gtest.patch + "${FILESDIR}"/${PN}-2.2.0-openssl-version.patch ) +pkg_setup() { + use shell && python-single-r1_pkg_setup +} + src_prepare() { default - # Brand the version with Gentoo + + if use test; then + cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' + fi + + # brand the version with Gentoo sed -i \ - -e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT(kea,${PVR}-gentoo, kea-dev@lists.isc.org)/g" \ + -e 's/KEA_SRCID="tarball"/KEA_SRCID="gentoo"/g' \ + -e 's/AC_MSG_RESULT("tarball")/AC_MSG_RESULT("gentoo")/g' \ + -e "s/EXTENDED_VERSION=\"\${EXTENDED_VERSION} (\$KEA_SRCID)\"/EXTENDED_VERSION=\"${PVR} (\$KEA_SRCID)\"/g" \ configure.ac || die sed -i \ @@ -65,23 +90,36 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/861617 + # + # I would truly love to submit an upstream bug but their self-hosted gitlab + # won't let me sign up. -- Eli + filter-lto + local myeconfargs=( --disable-install-configurations + --disable-rpath --disable-static + --enable-generate-messages --enable-perfdhcp --localstatedir="${EPREFIX}/var" --runstatedir="${EPREFIX}/run" --without-werror + --with-log4cplus + $(use_enable debug) + $(use_enable doc generate-docs) + $(use_enable shell) $(use_with mysql) $(use_with openssl) $(use_with postgres pgsql) - $(use_enable test gtest) ) econf "${myeconfargs[@]}" } src_install() { - default + emake -j1 install DESTDIR="${D}" + newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} @@ -109,4 +147,5 @@ src_install() { pkg_postinst() { tmpfiles_process ${PN}.conf + fcaps cap_net_bind_service,cap_net_raw=+ep /usr/sbin/kea-dhcp{4,6} } diff --git a/net-misc/kea/kea-1.9.11.ebuild b/net-misc/kea/kea-2.4.1.ebuild index 7a7f2838d8c3..72c97487d6f6 100644 --- a/net-misc/kea/kea-1.9.11.ebuild +++ b/net-misc/kea/kea-2.4.1.ebuild @@ -1,39 +1,53 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 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/" +HOMEPAGE="https://www.isc.org/kea/" -inherit autotools systemd tmpfiles +PYTHON_COMPAT=( python3_{8..12} ) + +inherit autotools fcaps flag-o-matic python-single-r1 systemd tmpfiles if [[ ${PV} = 9999* ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/isc-projects/kea.git" + EGIT_REPO_URI="https://gitlab.isc.org/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 ~arm64 ~x86" + # odd minor version = development release + if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then + if ! [[ "${PV}" == *_beta* || "${PV}" == *_rc* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" + fi + fi fi LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -IUSE="mysql +openssl postgres +samples test" +IUSE="debug doc mysql +openssl postgres +samples shell test" RESTRICT="!test? ( test )" COMMON_DEPEND=" dev-libs/boost:= dev-libs/log4cplus + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ') + ) mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) - postgres? ( dev-db/postgresql:* )" + postgres? ( dev-db/postgresql:* ) + shell? ( ${PYTHON_DEPS} ) +" DEPEND="${COMMON_DEPEND} test? ( dev-cpp/gtest ) " @@ -42,18 +56,30 @@ RDEPEND="${COMMON_DEPEND} acct-user/dhcp" BDEPEND="virtual/pkgconfig" +REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )" + S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch - "${FILESDIR}"/${PN}-1.9.10-gtest.patch + "${FILESDIR}"/${PN}-2.2.0-openssl-version.patch ) +pkg_setup() { + use shell && python-single-r1_pkg_setup +} + src_prepare() { default - # Brand the version with Gentoo + + if use test; then + cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' + fi + + # brand the version with Gentoo sed -i \ - -e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT(kea,${PVR}-gentoo, kea-dev@lists.isc.org)/g" \ + -e 's/KEA_SRCID="tarball"/KEA_SRCID="gentoo"/g' \ + -e 's/AC_MSG_RESULT("tarball")/AC_MSG_RESULT("gentoo")/g' \ + -e "s/EXTENDED_VERSION=\"\${EXTENDED_VERSION} (\$KEA_SRCID)\"/EXTENDED_VERSION=\"${PVR} (\$KEA_SRCID)\"/g" \ configure.ac || die sed -i \ @@ -64,23 +90,36 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/861617 + # + # I would truly love to submit an upstream bug but their self-hosted gitlab + # won't let me sign up. -- Eli + filter-lto + local myeconfargs=( --disable-install-configurations + --disable-rpath --disable-static + --enable-generate-messages --enable-perfdhcp --localstatedir="${EPREFIX}/var" --runstatedir="${EPREFIX}/run" --without-werror + --with-log4cplus + $(use_enable debug) + $(use_enable doc generate-docs) + $(use_enable shell) $(use_with mysql) $(use_with openssl) $(use_with postgres pgsql) - $(use_enable test gtest) ) econf "${myeconfargs[@]}" } src_install() { - default + emake -j1 install DESTDIR="${D}" + newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} @@ -108,4 +147,5 @@ src_install() { pkg_postinst() { tmpfiles_process ${PN}.conf + fcaps cap_net_bind_service,cap_net_raw=+ep /usr/sbin/kea-dhcp{4,6} } diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index 0d9eaa837ee0..72c97487d6f6 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -1,51 +1,85 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 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/" +HOMEPAGE="https://www.isc.org/kea/" -inherit autotools systemd tmpfiles +PYTHON_COMPAT=( python3_{8..12} ) + +inherit autotools fcaps flag-o-matic python-single-r1 systemd tmpfiles if [[ ${PV} = 9999* ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/isc-projects/kea.git" + EGIT_REPO_URI="https://gitlab.isc.org/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 ~arm64 ~x86" + # odd minor version = development release + if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then + if ! [[ "${PV}" == *_beta* || "${PV}" == *_rc* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" + fi + fi fi LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -IUSE="mysql +openssl postgres +samples" +IUSE="debug doc mysql +openssl postgres +samples shell test" +RESTRICT="!test? ( test )" -DEPEND=" +COMMON_DEPEND=" dev-libs/boost:= dev-libs/log4cplus + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ') + ) mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* ) + shell? ( ${PYTHON_DEPS} ) +" +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest ) " -RDEPEND="${DEPEND} +RDEPEND="${COMMON_DEPEND} acct-group/dhcp acct-user/dhcp" BDEPEND="virtual/pkgconfig" +REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )" + S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-2.2.0-openssl-version.patch +) + +pkg_setup() { + use shell && python-single-r1_pkg_setup +} + src_prepare() { default - # Brand the version with Gentoo + + if use test; then + cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' + fi + + # brand the version with Gentoo sed -i \ - -e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT(kea,${PVR}-gentoo, kea-dev@lists.isc.org)/g" \ + -e 's/KEA_SRCID="tarball"/KEA_SRCID="gentoo"/g' \ + -e 's/AC_MSG_RESULT("tarball")/AC_MSG_RESULT("gentoo")/g' \ + -e "s/EXTENDED_VERSION=\"\${EXTENDED_VERSION} (\$KEA_SRCID)\"/EXTENDED_VERSION=\"${PVR} (\$KEA_SRCID)\"/g" \ configure.ac || die sed -i \ @@ -56,13 +90,26 @@ src_prepare() { } src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/861617 + # + # I would truly love to submit an upstream bug but their self-hosted gitlab + # won't let me sign up. -- Eli + filter-lto + local myeconfargs=( --disable-install-configurations + --disable-rpath --disable-static + --enable-generate-messages --enable-perfdhcp --localstatedir="${EPREFIX}/var" --runstatedir="${EPREFIX}/run" --without-werror + --with-log4cplus + $(use_enable debug) + $(use_enable doc generate-docs) + $(use_enable shell) $(use_with mysql) $(use_with openssl) $(use_with postgres pgsql) @@ -71,7 +118,8 @@ src_configure() { } src_install() { - default + emake -j1 install DESTDIR="${D}" + newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} @@ -99,4 +147,5 @@ src_install() { pkg_postinst() { tmpfiles_process ${PN}.conf + fcaps cap_net_bind_service,cap_net_raw=+ep /usr/sbin/kea-dhcp{4,6} } diff --git a/net-misc/kea/metadata.xml b/net-misc/kea/metadata.xml index c1a041003281..4ca6f0a579ca 100644 --- a/net-misc/kea/metadata.xml +++ b/net-misc/kea/metadata.xml @@ -2,16 +2,13 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - <maintainer type="person"> <email>expeditioneer@gentoo.org</email> <name>Dennis Lamm</name> </maintainer> <use> <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> instead of <pkg>dev-libs/botan</pkg></flag> <flag name="samples">Install sample configuration files</flag> + <flag name="shell">Install kea-shell text management client for Control Agent</flag> </use> <upstream> <bugs-to>https://gitlab.isc.org/isc-projects/kea/-/issues</bugs-to> diff --git a/net-misc/keychain/files/keychain-2.8.5-empty-ssh-askpass.patch b/net-misc/keychain/files/keychain-2.8.5-empty-ssh-askpass.patch new file mode 100644 index 000000000000..00c93c8c07d9 --- /dev/null +++ b/net-misc/keychain/files/keychain-2.8.5-empty-ssh-askpass.patch @@ -0,0 +1,21 @@ +https://salsa.debian.org/debian/keychain/-/blob/debian/master/debian/patches/empty-ssh-askpass.patch + +Description: Handle an empty (or unset) SSH_ASKPASS variable +Bug-Debian: https://bugs.debian.org/325644 +Forwarded: no +Author: Peter Pentchev <roam@debian.org> +Author: Tim Connors <twc@aaocbn.aao.gov.au> +Last-Updated: 2023-01-06 + +--- a/keychain.sh ++++ b/keychain.sh +@@ -1420,6 +1420,9 @@ + IFS="$old_IFS" # restore IFS + set +f # re-enable globbing + ++ if [ -z "$SSH_ASKPASS" ]; then ++ SSH_ASKPASS="$(command -v ssh-askpass || true)" ++ fi + if $noguiopt || [ -z "$SSH_ASKPASS" -o -z "$DISPLAY" ]; then + unset DISPLAY # DISPLAY="" can cause problems + unset SSH_ASKPASS # make sure ssh-add doesn't try SSH_ASKPASS diff --git a/net-misc/keychain/files/keychain-2.8.5-malformed-ssh-key.patch b/net-misc/keychain/files/keychain-2.8.5-malformed-ssh-key.patch new file mode 100644 index 000000000000..ef1ab63898d1 --- /dev/null +++ b/net-misc/keychain/files/keychain-2.8.5-malformed-ssh-key.patch @@ -0,0 +1,28 @@ +https://salsa.debian.org/debian/keychain/-/blob/debian/master/debian/patches/malformed-ssh-key.patch + +Description: Display a more visible warning for a malformed SSH public key. +Bug-Debian: https://bugs.debian.org/673019 +Forwarded: https://github.com/funtoo/keychain/pull/111 +Author: Ryan Kavanagh <rak@debian.org> +Author: Peter Pentchev <roam@debian.org> +Last-Update: 2019-02-18 + +--- a/keychain.sh ++++ b/keychain.sh +@@ -853,7 +853,15 @@ + + for slm_k in "$@"; do + # Fingerprint current user-specified key +- slm_finger=$(ssh_f "$slm_k") || continue ++ if ! slm_finger=$(ssh_f "$slm_k"); then ++ warn "Unable to extract fingerprint from keyfile ${slm_k}.pub, skipping" ++ continue ++ fi ++ slm_wordcount="$(printf -- '%s\n' "$slm_finger" | wc -w)" ++ if [ "$slm_wordcount" -ne 1 ]; then ++ warn "Unable to extract exactly one key fingerprint from keyfile ${slm_k}.pub, got $slm_wordcount instead, skipping" ++ continue ++ fi + + # Check if it needs to be added + case " $sshavail " in diff --git a/net-misc/keychain/files/keychain-2.8.5-typos.patch b/net-misc/keychain/files/keychain-2.8.5-typos.patch new file mode 100644 index 000000000000..6356ae44df9a --- /dev/null +++ b/net-misc/keychain/files/keychain-2.8.5-typos.patch @@ -0,0 +1,88 @@ +https://salsa.debian.org/debian/keychain/-/blob/debian/master/debian/patches/typos.patch + +Description: Correct some typographical and grammatical errors. +Forwarded: https://github.com/funtoo/keychain/pull/112 +Author: Peter Pentchev <roam@ringlet.net> +Last-Update: 2020-05-07 + +--- a/keychain.pod ++++ b/keychain.pod +@@ -43,7 +43,7 @@ + + As an additional feature, if a private key has an extension ".ext", keychain + will look for privkey.ext.pub first, and if not found, will look for +-privkeyname.pub. ++privkey.pub. + + Keychain also supports gpg-agent in the same ways that ssh-agent is + supported. By default keychain attempts to start ssh-agent only. +@@ -227,7 +227,7 @@ + + =item others + +-Kill agent processes other than the one keychain is providing. Prior ++Kill agent processes other than the ones keychain is providing. Prior + to keychain-2.5.0, keychain would do this automatically. The new + behavior requires that you specify it explicitly if you want it. + +--- a/Makefile ++++ b/Makefile +@@ -27,7 +27,7 @@ + keychain.1.gz: keychain.1 + gzip -9 keychain.1 + +-GENKEYCHAINPL = open P, "keychain.txt" or die "cant open keychain.txt"; \ ++GENKEYCHAINPL = open P, "keychain.txt" or die "cannot open keychain.txt"; \ + while (<P>) { \ + $$printing = 0 if /^\w/; \ + $$printing = 1 if /^(SYNOPSIS|OPTIONS)/; \ +@@ -39,7 +39,7 @@ + s/(^|\s)(-+[-\w]+)/$$1\$${GREEN}$$2\$${OFF}/g; \ + $$pod .= $$_; \ + }; \ +- open B, "keychain.sh" or die "cant open keychain.sh"; \ ++ open B, "keychain.sh" or die "cannot open keychain.sh"; \ + $$/ = undef; \ + $$_ = <B>; \ + s/INSERT_POD_OUTPUT_HERE[\r\n]/$$pod/ || die; \ +--- a/README.md ++++ b/README.md +@@ -3,12 +3,12 @@ + + Please apply your patches to `keychain.sh`, *not* the generated `keychain` + script, which we are now including in the git repo to facilitate the +-distribution of release archives direct from GitHub. All development work will +-be done on the 'devel' branch and will only be merged with the master branch when ++distribution of release archives directly from GitHub. All development work will ++be done on the 'devel' branch and will only be merged into the master branch when + a new release is made. This should allow the generated files (keychain, man pages, +-spec file)to remain in sync on the master branch but no guarantees are made except ++spec file) to remain in sync on the master branch but no guarantees are made except + for the tagged release. They will be regenerated for official release archives +-only (those tagged with the release version.). Anyone using or contributing to the ++only (those tagged with the release version). Anyone using or contributing to the + 'devel' branch should assume the generated files are out of date and regenerate + locally if needed. + Thanks! +--- a/keychain ++++ b/keychain +@@ -354,7 +354,7 @@ + # This function originates from Parallels Inc.'s OpenVZ vpsreboot script + + # Description: This function attempts to acquire the lock. If it succeeds, +- # it returns 0. If it fails, it returns 1. This function retuns immediately ++ # it returns 0. If it fails, it returns 1. This function returns immediately + # and only tries to acquire the lock once. + + tmpfile="$lockf.$$" +--- a/keychain.sh ++++ b/keychain.sh +@@ -173,7 +173,7 @@ + # This function originates from Parallels Inc.'s OpenVZ vpsreboot script + + # Description: This function attempts to acquire the lock. If it succeeds, +- # it returns 0. If it fails, it returns 1. This function retuns immediately ++ # it returns 0. If it fails, it returns 1. This function returns immediately + # and only tries to acquire the lock once. + + tmpfile="$lockf.$$" diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5-r1.ebuild index 46c5f47290f6..c031017192a2 100644 --- a/net-misc/keychain/keychain-2.8.5.ebuild +++ b/net-misc/keychain/keychain-2.8.5-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG" HOMEPAGE="https://www.funtoo.org/Keychain" @@ -9,11 +9,9 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -DEPEND="dev-lang/perl" -RDEPEND="" +BDEPEND="dev-lang/perl" src_install() { dobin ${PN} diff --git a/net-misc/keychain/keychain-2.8.5-r2.ebuild b/net-misc/keychain/keychain-2.8.5-r2.ebuild new file mode 100644 index 000000000000..d3ab687678b2 --- /dev/null +++ b/net-misc/keychain/keychain-2.8.5-r2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG" +HOMEPAGE="https://www.funtoo.org/Keychain" +SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +BDEPEND="dev-lang/perl" + +PATCHES=( + # Patches from Debian + "${FILESDIR}/${P}-malformed-ssh-key.patch" + "${FILESDIR}/${P}-typos.patch" + "${FILESDIR}/${P}-empty-ssh-askpass.patch" +) + +src_install() { + dobin ${PN} + doman ${PN}.1 + dodoc ChangeLog README.md +} diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest new file mode 100644 index 000000000000..7735686f52f2 --- /dev/null +++ b/net-misc/kio-zeroconf/Manifest @@ -0,0 +1,2 @@ +DIST kio-zeroconf-23.08.5.tar.xz 44360 BLAKE2B bf441b10221ba8c731756cb5455664fff5a1c8904a952e558084dadb6fe5bcc3a3da072ff58fd31f6c2c35a40ea27241c85403a3db16fd46b52e1a87586b1b5c SHA512 33ed5cb23280ba85ccd4fee149f5983e64164ff0c5f7730e2d49c80784b445c569aa7b925e2d44221854cf7588310f211920d8e4492d87f20be531dbbc9198e6 +DIST kio-zeroconf-24.05.0.tar.xz 44412 BLAKE2B d0df95673575798dabb30a94c832485fdae80de4507ee8a4d8b7bf29de598bfa9c9c33d05a354cc4ed07ce8001f9aad04931d2da0a2744945b53ddaf0313462e SHA512 4278a7b6e893852cba46bc4543f37c347e0e45245335e850f0a1141e3034ca4a84b5884aaf4a40a26fac87f9bfa8badf67047161ab83f0224c7ce4ab129af570 diff --git a/net-misc/kio-zeroconf/kio-zeroconf-23.08.5.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5.ebuild new file mode 100644 index 000000000000..3300b2034c62 --- /dev/null +++ b/net-misc/kio-zeroconf/kio-zeroconf-23.08.5.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="amd64 arm64 ~ppc64 x86" +IUSE="kf6compat" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdnssd-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 +" +RDEPEND="${DEPEND} + kf6compat? ( net-misc/kio-zeroconf:6 ) +" + +src_install() { + ecm_src_install + + if use kf6compat; then + rm "${D}"/usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml \ + "${D}"/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml \ + "${D}"/usr/share/remoteview/zeroconf.desktop || die + rm -r "${D}"/usr/share/locale || die + fi +} diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.05.0.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.05.0.ebuild new file mode 100644 index 000000000000..d4d2fb728f5d --- /dev/null +++ b/net-misc/kio-zeroconf/kio-zeroconf-24.05.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kdnssd-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] +" diff --git a/net-misc/kio-zeroconf/metadata.xml b/net-misc/kio-zeroconf/metadata.xml new file mode 100644 index 000000000000..8697c2472ca5 --- /dev/null +++ b/net-misc/kio-zeroconf/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">network/kio-zeroconf</remote-id> + </upstream> + <use> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> + </use> +</pkgmetadata> diff --git a/net-misc/knock/Manifest b/net-misc/knock/Manifest index 87dc877813aa..853a1f8133f9 100644 --- a/net-misc/knock/Manifest +++ b/net-misc/knock/Manifest @@ -1,2 +1 @@ -DIST knock-0.7.tar.gz 110791 BLAKE2B 19e63854800f4ef77199fb4005dabd749f16681068d205a924fa0bc926d2cc31a69c1f62ffa8ec335209cfa987e7db92d9332b43e971f71528f69740ced06391 SHA512 eab5d855f7111d9411e84a56a15e8ea74f41c5bd9dee27ab49f0d8d509eeeb96a60c508928c92916dc0ec9b737c447ca8ca5ed4db6479b389549d60e76a85aa7 DIST knock-0.8.tar.gz 377107 BLAKE2B 1397ed04b1a202db08b0bd3a8a26745cd2e8390604c9dde7d18182e7ad4ddd19da074b1b54ea1ed59b1576f3110e21bac722c90a2cd3820910bdaa0026eec395 SHA512 6511e29f604cebc4a4048f5e49c1b73db0bbe0041a88f7c8559fa1a60ea894aadb72a608c423f867a5a4dddb06d00a0713863473981e42273662a77364c260ec diff --git a/net-misc/knock/knock-0.7-r1.ebuild b/net-misc/knock/knock-0.7-r1.ebuild deleted file mode 100644 index 5d3643d7508a..000000000000 --- a/net-misc/knock/knock-0.7-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Simple port-knocking daemon" -HOMEPAGE="https://www.zeroflux.org/projects/knock" -SRC_URI="https://www.zeroflux.org/proj/knock/files/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="+server" - -DEPEND="server? ( net-libs/libpcap )" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -e "/^AM_CFLAGS/s: -g : :" \ - -e "/dist_doc_DATA/s:COPYING::" \ - -i Makefile.in || die - - sed -e "s:/usr/sbin/iptables:/sbin/iptables:g" \ - -i knockd.conf || die -} - -src_configure() { - econf $(use_enable server knockd) -} - -src_install() { - emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install - - if use server ; then - newinitd "${FILESDIR}"/knockd.initd.2 knock - newconfd "${FILESDIR}"/knockd.confd.2 knock - fi -} - -pkg_postinst() { - if use server && ! has_version net-firewall/iptables ; then - elog "You're really encouraged to install net-firewall/iptables to" - elog "actually modify your firewall and use the example configuration." - fi -} diff --git a/net-misc/l7-filter-userspace/metadata.xml b/net-misc/l7-filter-userspace/metadata.xml index 767af8e63201..66ba86cf29ef 100644 --- a/net-misc/l7-filter-userspace/metadata.xml +++ b/net-misc/l7-filter-userspace/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">l7-filter</remote-id> </upstream> diff --git a/net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild b/net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild index 8fae2ce8e5f2..98eef1987757 100644 --- a/net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild +++ b/net-misc/l7-protocols/l7-protocols-2009.05.28-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ MY_P=${PN}-${PV//./-} DESCRIPTION="Protocol definitions of l7-filter kernel modules" HOMEPAGE="http://l7-filter.sourceforge.net/protocols https://l7-filter.clearos.com/docs/start" -SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/l7-filter/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" @@ -18,10 +18,10 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" src_prepare() { - sed -e "s|gcc.*\-o|$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o|" \ + sed -i -e "s|gcc.*\-o|$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o|" \ -e "s|g++.*\-o|$(tc-getCXX) ${CFLAGS} ${LDFLAGS} -o|" \ - -i testing/Makefile || die - sed -e "s|f in data|f in ${EPREFIX}/usr/share/l7-protocols/data|" \ + testing/Makefile || die + sed -i -e "s|f in data|f in ${EPREFIX}/usr/share/l7-protocols/data|" \ testing/timeit.sh || die ht_fix_file testing/*.sh eapply_user diff --git a/net-misc/l7-protocols/metadata.xml b/net-misc/l7-protocols/metadata.xml index e88c3dff8793..8b46d38acce1 100644 --- a/net-misc/l7-protocols/metadata.xml +++ b/net-misc/l7-protocols/metadata.xml @@ -1,16 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> These are patterns (protocol definitions) for the Linux layer 7 packet classifier (l7-filter). To use them, you need the l7-filter userspace version - available trough ebuild tree as net-misc/l7-filter and net-firewall/iptables + available trough ebuild tree as net-misc/l7-filter and <pkg>net-firewall/iptables</pkg> built with netlink USE flag. -</longdescription> + </longdescription> <upstream> <remote-id type="sourceforge">l7-filter</remote-id> </upstream> diff --git a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild index 41acc456a60d..7de2da4788c9 100644 --- a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild +++ b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -7,14 +7,14 @@ inherit autotools toolchain-funcs DESCRIPTION="networked mud that can be used for different types of collaborative software" HOMEPAGE="https://sourceforge.net/projects/lambdamoo/" -SRC_URI="mirror://sourceforge/lambdamoo/LambdaMOO-${PV}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/lambdamoo/LambdaMOO-${PV}.tar.gz" LICENSE="LambdaMOO GPL-2" SLOT="0" KEYWORDS="~sparc ~x86" IUSE="" -DEPEND="sys-devel/bison" +DEPEND="app-alternatives/yacc" RDEPEND="" S=${WORKDIR}/MOO-${PV} @@ -31,9 +31,8 @@ src_prepare() { src_compile() { emake \ - CC=$(tc-getCC) \ - CFLAGS="${CFLAGS} \ - -DHAVE_MKFIFO=1" + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS} -DHAVE_MKFIFO=1" } src_install() { diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest index 51a524d4b820..1eaa8b55b645 100644 --- a/net-misc/libteam/Manifest +++ b/net-misc/libteam/Manifest @@ -1 +1,3 @@ +DIST libteam-1.23.tar.gz 173445 BLAKE2B 143e43cb092ac9aab8b152101c4c91c995436a6b02cf85fb710fa095a0bbd46fe70666149cfa9d86135b5496dd0287296e55d68f511aa5965c1d4f22f61ded57 SHA512 f78ceca4606b93e75fafdd97aa3cc44153fc42d31209f216c3da9c71abf38a2e4a690c71b8631ae09e02d7285d6bbd8292983fdc69eb921b0537a75558bc89f5 DIST libteam-1.31.tar.gz 176331 BLAKE2B 77aae059b37a018e5503642138aa469f0769d305ec2043642fb1d84ff1d05f6eb90083946ca113cf3f9c21a09a17b3fbda327b714eb96743a10e99b89d5d5c83 SHA512 1382cc3b0a2d0211f33e506e8a6fd8a1847398fa5bba56abfc959da70bcc8417cf1dba9e26a777da5729eb237f51a66b3f9cfa33fb830ed684aa076f4c8cec9e +DIST libteam-1.32.tar.gz 177184 BLAKE2B dd3e988d52a373c3c006e749ffee35b12f7b26f0cd154479769b4426d97a23509a52d0b50430ef4220bce4ef6ee73c827b3eeb3fe28537f40f65c45fcacb18b6 SHA512 38a0926f22733000dedb5669e8ba29bd9bce61b00dbdc713220eee520e10ce6eb979b02408f785463cd7b61ff3e57a78b43ed6baffb305e63a0fab0883493507 diff --git a/net-misc/libteam/libteam-1.23.ebuild b/net-misc/libteam/libteam-1.23.ebuild new file mode 100644 index 000000000000..1b9b1ec0290c --- /dev/null +++ b/net-misc/libteam/libteam-1.23.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/pirko/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" +fi + +DESCRIPTION="Library and tools set for controlling team network device" +HOMEPAGE="http://libteam.org" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="dbus debug examples static-libs +syslog zmq" + +DEPEND=">=dev-libs/jansson-2.4:= + dev-libs/libdaemon + >=dev-libs/libnl-3.2.19[utils] + dbus? ( sys-apps/dbus ) + zmq? ( >=net-libs/zeromq-3.2.0 ) + " + +RDEPEND="${DEPEND} + syslog? ( virtual/logger )" + +CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE" +ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel! +Only >=3.3.0 kernel version support in team mode" + +DOCS=( README ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable syslog logging) \ + $(use_enable dbus) \ + $(use_enable zmq) +} + +src_install() { + default + + insinto /etc/dbus-1/system.d + doins teamd/dbus/teamd.conf + + if use examples; then + docinto examples + dodoc teamd/example_configs/* + fi +} diff --git a/net-misc/libteam/libteam-1.31-r1.ebuild b/net-misc/libteam/libteam-1.31-r1.ebuild index 11ec2522cd21..553f8a920da5 100644 --- a/net-misc/libteam/libteam-1.31-r1.ebuild +++ b/net-misc/libteam/libteam-1.31-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" fi DESCRIPTION="Library and tools set for controlling team network device" diff --git a/net-misc/libteam/libteam-1.32.ebuild b/net-misc/libteam/libteam-1.32.ebuild new file mode 100644 index 000000000000..23c3186d0a44 --- /dev/null +++ b/net-misc/libteam/libteam-1.32.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/jpirko/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Library and tools set for controlling team network device" +HOMEPAGE="https://libteam.org" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="dbus debug examples static-libs +syslog zmq" + +DEPEND=">=dev-libs/jansson-2.4:= + dev-libs/libdaemon + >=dev-libs/libnl-3.2.19[utils] + dbus? ( sys-apps/dbus ) + zmq? ( >=net-libs/zeromq-3.2.0 ) + " + +RDEPEND="${DEPEND} + syslog? ( virtual/logger )" + +CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE" +ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel! +Only >=3.3.0 kernel version support in team mode" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable syslog logging) \ + $(use_enable dbus) \ + $(use_enable zmq) +} + +src_install() { + default + + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die + + insinto /etc/dbus-1/system.d + doins teamd/dbus/teamd.conf + + if use examples; then + docinto examples + dodoc teamd/example_configs/* + fi +} diff --git a/net-misc/libteam/libteam-9999.ebuild b/net-misc/libteam/libteam-9999.ebuild index a5a895f1bca1..23c3186d0a44 100644 --- a/net-misc/libteam/libteam-9999.ebuild +++ b/net-misc/libteam/libteam-9999.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools linux-info if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pirko/${PN}.git" + EGIT_REPO_URI="https://github.com/jpirko/${PN}.git" inherit git-r3 else SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi DESCRIPTION="Library and tools set for controlling team network device" -HOMEPAGE="http://libteam.org" +HOMEPAGE="https://libteam.org" LICENSE="LGPL-2.1+" SLOT="0" @@ -34,8 +34,6 @@ CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~N ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel! Only >=3.3.0 kernel version support in team mode" -DOCS=( README ) - src_prepare() { default eautoreconf @@ -52,6 +50,8 @@ src_configure() { src_install() { default + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die + insinto /etc/dbus-1/system.d doins teamd/dbus/teamd.conf diff --git a/net-misc/linux-eoip/metadata.xml b/net-misc/linux-eoip/metadata.xml index 38f57e822801..3821852eb9bf 100644 --- a/net-misc/linux-eoip/metadata.xml +++ b/net-misc/linux-eoip/metadata.xml @@ -1,14 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> -</maintainer> -<upstream> - <maintainer> - <email>nuclearcat@nuclearcat.com</email> - <name>Denys Fedoryshchenko</name> - </maintainer> -</upstream> + <!-- maintainer-needed --> + <upstream> + <maintainer> + <email>nuclearcat@nuclearcat.com</email> + <name>Denys Fedoryshchenko</name> + </maintainer> + </upstream> </pkgmetadata> diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest index 1fca8bc9d88a..6875deba8c2e 100644 --- a/net-misc/linuxptp/Manifest +++ b/net-misc/linuxptp/Manifest @@ -1 +1,2 @@ -DIST linuxptp-2.0.tgz 184942 BLAKE2B 79ef9d3c379769a71e652a77f05ab661db444a76a339e72106055cf900de9cabfe303c48760f11701fefe5e641d07b73fc5a250078bedf7faa3ae995ace24da3 SHA512 c33487a803f8cc461f790d9a137d5cf8b35cb6d292bdd2cf7a16aa666359d8c5e24667473be843182bef1e9f8d5c6af8aab8918978f10bf08257dd408bba66d6 +DIST linuxptp-4.1.tgz 252373 BLAKE2B 9dc6bb69c98a8b452250554b5e06b39d445b81a3e0c7ce2beaa7bd1d2cb969928496827bd3d3e32136c9fe55f1103ab312441c2a4cdee035c7d6b7526f0c1327 SHA512 144c03677f2c61c58d05c5c5dbb771b7aac3860507d9ba814f67f6da024c3cb2019f9e8cf39b983d39a6feddd1b24a1f40a678b4ff7af8aa564ee813e322dfae +DIST linuxptp-4.2.tgz 253861 BLAKE2B 83489edb1cb48a7f245e3224705332980a32aed14e166c3fd0d8111f4008ae42a293397a588a546e421fae634057829dcbcd94794ce539ecb166e5cf69ff6554 SHA512 479e512efd0573602379a9e1d8ef5c0ec9e033944cee5aed11c68cea5e8a3f7d4b6f2d11f6d6d4718282010da52c2c8629d675d9b388cc0c3d574845a913cdbb diff --git a/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch b/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch deleted file mode 100644 index d3f8e5d92906..000000000000 --- a/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch +++ /dev/null @@ -1,52 +0,0 @@ -net_tstamp.h needs clockid_t to be defined, so must include -<sys/types.h> before including <linux/net_tstamp.h> - - ---- a/clock.c -+++ b/clock.c -@@ -17,6 +17,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - #include <errno.h> -+#include <sys/types.h> - #include <linux/net_tstamp.h> - #include <poll.h> - #include <stdlib.h> ---- a/hwstamp_ctl.c 2018-08-12 23:08:43.000000000 +0200 -+++ b/hwstamp_ctl.c 2020-02-07 13:49:53.256859722 +0100 -@@ -23,6 +23,7 @@ - #include <string.h> - #include <sys/ioctl.h> - #include <unistd.h> -+#include <sys/types.h> - - #include <arpa/inet.h> - #include <linux/net_tstamp.h> ---- a/sk.c 2018-08-12 23:08:43.000000000 +0200 -+++ b/sk.c 2020-02-07 13:50:12.334599236 +0100 -@@ -18,6 +18,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - #include <errno.h> -+#include <sys/types.h> - #include <linux/net_tstamp.h> - #include <linux/sockios.h> - #include <linux/ethtool.h> ---- a/timemaster.c 2018-08-12 23:08:43.000000000 +0200 -+++ b/timemaster.c 2020-02-07 13:50:19.848500949 +0100 -@@ -22,7 +22,6 @@ - #include <errno.h> - #include <libgen.h> - #include <limits.h> --#include <linux/net_tstamp.h> - #include <net/if.h> - #include <signal.h> - #include <spawn.h> -@@ -34,6 +33,7 @@ - #include <sys/types.h> - #include <sys/wait.h> - #include <unistd.h> -+#include <linux/net_tstamp.h> - - #include "print.h" - #include "rtnl.h" diff --git a/net-misc/linuxptp/files/linuxptp-3.1.1-string-include.patch b/net-misc/linuxptp/files/linuxptp-3.1.1-string-include.patch new file mode 100644 index 000000000000..622a87f67ec0 --- /dev/null +++ b/net-misc/linuxptp/files/linuxptp-3.1.1-string-include.patch @@ -0,0 +1,21 @@ +https://cgit.openembedded.org/meta-openembedded/commit/?h=master-next&id=aec96f23775b946cf99c39e7274bcc8fdd4711ca +https://sourceforge.net/p/linuxptp/mailman/message/37603438/ + +From d49b4fb8063ecd89617587e5ea566cc9da9393ef Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 19:09:18 -0700 +Subject: [PATCH] include string.h for strncpy() + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/interface.c ++++ b/interface.c +@@ -5,6 +5,7 @@ + * @note SPDX-License-Identifier: GPL-2.0+ + */ + #include <stdlib.h> ++#include <string.h> + #include "interface.h" + + struct interface { diff --git a/net-misc/linuxptp/files/linuxptp-3.1.1-user_cpp.patch b/net-misc/linuxptp/files/linuxptp-3.1.1-user_cpp.patch new file mode 100644 index 000000000000..d2b3728b6141 --- /dev/null +++ b/net-misc/linuxptp/files/linuxptp-3.1.1-user_cpp.patch @@ -0,0 +1,11 @@ +--- a/incdefs.sh ++++ b/incdefs.sh +@@ -27,7 +27,7 @@ + printf " -D_GNU_SOURCE" + + # Get list of directories searched for header files. +- dirs=$(echo "" | ${CROSS_COMPILE}cpp -Wp,-v 2>&1 >/dev/null | grep ^" /") ++ dirs=$(echo "" | ${CPP} -Wp,-v - 2>&1 >/dev/null | grep ^" /") + + # Look for clock_adjtime(). + for d in $dirs; do diff --git a/net-misc/linuxptp/files/linuxptp-4.2-user_cpp.patch b/net-misc/linuxptp/files/linuxptp-4.2-user_cpp.patch new file mode 100644 index 000000000000..f999ed0189b6 --- /dev/null +++ b/net-misc/linuxptp/files/linuxptp-4.2-user_cpp.patch @@ -0,0 +1,11 @@ +--- a/incdefs.sh ++++ b/incdefs.sh +@@ -27,7 +27,7 @@ + printf " -D_GNU_SOURCE" + + # Get list of directories searched for header files. +- dirs=$(${CC} -E -Wp,-v -xc /dev/null 2>&1 >/dev/null | grep ^" /") ++ dirs=$(echo "" | ${CPP} -Wp,-v - 2>&1 >/dev/null | grep ^" /") + + # Look for clock_adjtime(). + for d in $dirs; do diff --git a/net-misc/linuxptp/files/phc2sysAT.service b/net-misc/linuxptp/files/phc2sysAT.service new file mode 100644 index 000000000000..576c7691ba89 --- /dev/null +++ b/net-misc/linuxptp/files/phc2sysAT.service @@ -0,0 +1,13 @@ +[Unit] +Description=Synchronise two or more system clocks +Documentation=man:phc2sys +Requires=ptp4l.service +After=ptp4l.service +Before=time-sync.target + +[Service] +Type=simple +ExecStart=/usr/sbin/phc2sys -w -s %I + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/linuxptp/files/ptp4lAT.service b/net-misc/linuxptp/files/ptp4lAT.service new file mode 100644 index 000000000000..c3844605d2e3 --- /dev/null +++ b/net-misc/linuxptp/files/ptp4lAT.service @@ -0,0 +1,11 @@ +[Unit] +Description=Precision Time Protocol (PTP) service for %I +Documentation=man:ptp4l +After=sys-subsystem-net-devices-%i.device + +[Service] +Type=simple +ExecStart=/usr/sbin/ptp4l -f /etc/ptp4l.conf -i %I + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/linuxptp/linuxptp-4.1.ebuild b/net-misc/linuxptp/linuxptp-4.1.ebuild new file mode 100644 index 000000000000..51e65f46d2d1 --- /dev/null +++ b/net-misc/linuxptp/linuxptp-4.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info systemd toolchain-funcs + +DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation" +HOMEPAGE="https://linuxptp.nwtime.org/" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/v$(ver_cut 1-2)/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" + +DEPEND="elibc_musl? ( sys-libs/queue-standalone )" + +CONFIG_CHECK="~NETWORK_PHY_TIMESTAMPING ~PPS ~PTP_1588_CLOCK" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.1-user_cpp.patch + "${FILESDIR}"/${PN}-3.1.1-string-include.patch +) + +pkg_setup() { + linux-info_pkg_setup +} + +src_compile() { + # parse needed additional CFLAGS + export MY_FLAGS=$(CPP="$(tc-getCPP)" ./incdefs.sh) + export EXTRA_CFLAGS="${CFLAGS} ${MY_FLAGS}" + emake CC="$(tc-getCC)" prefix=/usr mandir=/usr/share/man +} + +src_install() { + emake \ + prefix="${D}"/usr \ + mandir="${D}"/usr/share/man \ + infodir="${D}"/usr/share/info \ + libdir="${D}"/usr/$(get_libdir) \ + install + + systemd_newunit "${FILESDIR}"/phc2sysAT.service phc2sys@.service + systemd_newunit "${FILESDIR}"/ptp4lAT.service ptp4l@.service + systemd_dounit "${FILESDIR}"/timemaster.service + + dodoc README.org + dodoc -r configs +} diff --git a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild b/net-misc/linuxptp/linuxptp-4.2.ebuild index 0739195533e5..8665d7add0d6 100644 --- a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild +++ b/net-misc/linuxptp/linuxptp-4.2.ebuild @@ -1,26 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit linux-info systemd toolchain-funcs DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation" -HOMEPAGE="http://linuxptp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz" +HOMEPAGE="https://linuxptp.nwtime.org/" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/v$(ver_cut 1-2)/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -IUSE="" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" -DEPEND="" -RDEPEND="${DEPEND}" +DEPEND="elibc_musl? ( sys-libs/queue-standalone )" -CONFIG_CHECK="~PPS ~NETWORK_PHY_TIMESTAMPING ~PTP_1588_CLOCK" +CONFIG_CHECK="~NETWORK_PHY_TIMESTAMPING ~PPS ~PTP_1588_CLOCK" PATCHES=( - "${FILESDIR}"/${PN}-2.0_nettstamp-systypes.patch + "${FILESDIR}"/${PN}-4.2-user_cpp.patch ) pkg_setup() { @@ -29,7 +27,7 @@ pkg_setup() { src_compile() { # parse needed additional CFLAGS - export MY_FLAGS=$(./incdefs.sh) + export MY_FLAGS=$(CPP="$(tc-getCPP)" ./incdefs.sh) export EXTRA_CFLAGS="${CFLAGS} ${MY_FLAGS}" emake CC="$(tc-getCC)" prefix=/usr mandir=/usr/share/man } @@ -42,7 +40,10 @@ src_install() { libdir="${D}"/usr/$(get_libdir) \ install + systemd_newunit "${FILESDIR}"/phc2sysAT.service phc2sys@.service + systemd_newunit "${FILESDIR}"/ptp4lAT.service ptp4l@.service systemd_dounit "${FILESDIR}"/timemaster.service dodoc README.org + dodoc -r configs } diff --git a/net-misc/linuxptp/metadata.xml b/net-misc/linuxptp/metadata.xml index bae898a622e5..569ac4f7b037 100644 --- a/net-misc/linuxptp/metadata.xml +++ b/net-misc/linuxptp/metadata.xml @@ -2,10 +2,15 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> + </maintainer> + <maintainer type="person"> <email>tomjbe@gentoo.org</email> <name>Thomas Beierlein</name> </maintainer> <upstream> <remote-id type="sourceforge">linuxptp</remote-id> + <remote-id type="cpe">cpe:/a:linuxptp_project:linuxptp</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/liveice/files/liveice-2000530-clang16.patch b/net-misc/liveice/files/liveice-2000530-clang16.patch new file mode 100644 index 000000000000..6d1964a9c097 --- /dev/null +++ b/net-misc/liveice/files/liveice-2000530-clang16.patch @@ -0,0 +1,37 @@ +Also issues with implicit basename(3), but that is handled from the ebuild. +https://bugs.gentoo.org/861644 +https://bugs.gentoo.org/870838 +--- a/mixer.c ++++ b/mixer.c +@@ -29,4 +29,5 @@ + #include "audio_proc.h" + #include "controls.h" ++#include "url.h" + + +@@ -40,4 +41,5 @@ + #include <time.h> + ++int parse_file_metadata(char *filename,char **title,char **artist,char **album,char **url); + + short audio_buffer[BUF_SIZE]; +--- a/mixer.h ++++ b/mixer.h +@@ -157,2 +157,3 @@ + void write_logfile(cptr ch); + void execute_update_script(cptr ch); ++void shout_streamer(void); +--- a/streams.c ++++ b/streams.c +@@ -32,4 +32,5 @@ + #include "serverlib.h" + #include "audio_proc.h" ++#include "mixer.h" + + #ifdef SOUNDCARD_SUPPORT +--- a/url.h ++++ b/url.h +@@ -11,2 +11,3 @@ + int string_contains(char *string,char *seek); + void strtoupper(char *string); ++char *url_encode(char *str, char **result_p); diff --git a/net-misc/liveice/liveice-2000530-r2.ebuild b/net-misc/liveice/liveice-2000530-r3.ebuild index cc73e827d6ac..d00733459f71 100644 --- a/net-misc/liveice/liveice-2000530-r2.ebuild +++ b/net-misc/liveice/liveice-2000530-r3.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Live Source Client For IceCast" -HOMEPAGE="http://star.arm.ac.uk/~spm/software/liveice.html" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="mirror://gentoo/${P}.tar.gz" +S="${WORKDIR}/${PN}" LICENSE="GPL-2+" SLOT="0" @@ -15,21 +16,28 @@ KEYWORDS="~amd64 x86" RDEPEND=" media-sound/lame - media-sound/mpg123" + media-sound/mpg123 + sys-libs/ncurses:=" DEPEND="${RDEPEND}" -S="${WORKDIR}/${PN}" -PATCHES=( "${FILESDIR}"/${P}-build.patch ) +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-clang16.patch +) src_prepare() { default + eautoreconf - tc-export CC } src_configure() { + tc-export CC append-flags -fcommon - default + + # seems to expect GNU's basename, but use simple builtin my_basename + # rather than assume by forcing either -D_GNU_SOURCE or <libgen.h> + econf ac_cv_func_basename=no #870838 } src_install() { diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.19.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.19-r1.ebuild index 4db94d678683..fc25414b64cf 100644 --- a/net-misc/lksctp-tools/lksctp-tools-1.0.19.ebuild +++ b/net-misc/lksctp-tools/lksctp-tools-1.0.19-r1.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -inherit flag-o-matic autotools linux-info multilib-minimal +inherit flag-o-matic autotools linux-info DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation" -HOMEPAGE="http://lksctp.sourceforge.net/" +HOMEPAGE="https://github.com/sctp/lksctp-tools/wiki" SRC_URI="https://github.com/sctp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( GPL-2+ LGPL-2.1 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="kernel_linux static-libs" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="static-libs" # This is only supposed to work with Linux to begin with. DEPEND=">=sys-kernel/linux-headers-2.6" @@ -29,11 +29,9 @@ src_prepare() { default eautoreconf - - multilib_copy_sources } -multilib_src_configure() { +src_configure() { append-flags -fno-strict-aliasing local myeconfargs=( @@ -44,7 +42,7 @@ multilib_src_configure() { econf "${myeconfargs[@]}" } -multilib_src_install_all() { +src_install() { default dodoc doc/*txt diff --git a/net-misc/lksctp-tools/metadata.xml b/net-misc/lksctp-tools/metadata.xml index cf5331b615e8..515bac217c36 100644 --- a/net-misc/lksctp-tools/metadata.xml +++ b/net-misc/lksctp-tools/metadata.xml @@ -14,5 +14,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">lksctp</remote-id> + <remote-id type="github">sctp/lksctp-tools</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest index 00c2b48e1ecc..cc668e569932 100644 --- a/net-misc/lldpd/Manifest +++ b/net-misc/lldpd/Manifest @@ -1,6 +1,3 @@ -DIST lldpd-1.0.10.tar.gz 1961631 BLAKE2B 06d3b7d659dae0df4b10f3568a6ffa96c8e848863eb5ecb11b046806b4c23afdae084ffcab8b07b93e6a111dea2c24bd2cfc81a7f1c2559a39b3b2ed8f80814f SHA512 6835bfe36cbaffb0e7f0dbc958d234b7a16787bd51d0c5423c7b775d71dc89635ab28c005e2df550c40f4ee76ab461c0c7cb2a09b011878cadaca18153485d8f -DIST lldpd-1.0.11.tar.gz 1962748 BLAKE2B 13b6efe44a7dd0f9ec681ec5ef96358ca01c500f0238460ce633b59a1506d9caf405baf3ac910be9baa5840f3751b9d9e0bda127c96083f012eb4af75ba7b9e9 SHA512 2433c81d892b8f8f43c4a897eedfde6fff41db8514fc212bd60b71d080b963b12346017f554657d5abe6d0f02256cf49c9f8b82c8e402763ad0a5c53d459ac32 -DIST lldpd-1.0.12.tar.gz 1965028 BLAKE2B 7725d650573d463e267670135fad20717b2fe2ee5f1c5b9f68a68890f6e74e7cac52bcb0aefad68b8bcade9eacd18f6aa783eec4a71e895adc173ddd2a554322 SHA512 893add53c814d904894dd768ea2e412f288bd7767090fb9b5f686ce3fed65a436ed1365039e5d7f8ef8f5ae9206800b087c71515caa16d1d375389dd7558050f -DIST lldpd-1.0.13.tar.gz 1973988 BLAKE2B ad22d6f19e566886fda1b879e2ac39c59a0cf061e17df404f0cc68504453517a438d1bb0ac2350b7ba3cafb53ae0996deace93918a6af1043aebff5bf3720fad SHA512 b78440622882a822c9114c3617323ac3c8ce759040bb5b8a9f7357ca20e2993ab0130ee9ad85f65d5f38996665d599d70bbb9dd202e2557035e98545a4304aef -DIST lldpd-1.0.7.tar.gz 1815150 BLAKE2B 53bd73ce4cadf9c49f93a7ec5459adba0076d40156ba25c9ea6985b10a2cfec74a741318e74fa59bf560ce129eed2faf2964c093019b27e922c3dd10ed7daa13 SHA512 32fc153d0376db797163e4654c75cc8d10c35b85d7bb611996920bf67dfd2f30e154328a6e81837d9f77e8b4b7dd9ba76c81c5dd5847faa083654b8405d0bd69 -DIST lldpd-1.0.9.tar.gz 1961522 BLAKE2B 83a853bb3bde7abd15b4aa167d213d97677db817aba773b152f032b0d0bf299d5cc891c56871182b2f11fc3bfb2d6c88153f32973fdec5844df5c6fc6bc97b8b SHA512 5f5d5abed7fc73efc59932a1f2ee07eedbdca6f82d002221886b4ddf704955aef432acb92084adc72a965fef3e660f3c95b2a1b8892cf05d9616921501e6aae0 +DIST lldpd-1.0.16.tar.gz 1967182 BLAKE2B 3a359ec6539087ab1ffa5e1f83b90cc375b047b6e404df21067621bac9c9e5bab4b04209e9111d72fc2486046fb1d4b6744c093342c908f9a6475cd0b5a33328 SHA512 4abd25d1d7325f0a963518d916139f39b9250c37dfd918819019cabaafcdbedbfa03c78da80d36a09a0f4b1d79d4ee5e8aee1d10596bcd5710cd0c1181ba27c1 +DIST lldpd-1.0.17.tar.gz 1983689 BLAKE2B e74a1cdd965b26e9bad509fefb66bddfd74028a7d5122e561aed51eeb1b42c26497ce07169218133e4b99f12f4e0951065280c4ea8e47d54ecb6a8e697104106 SHA512 8f6d6ea6a32cc0f238158a2d1f08224224bca250cf61f80e4d8b633c0471e4ff9a17a7a7d7f313f10d557a256c7419f54cbb3b78903b7bba3619f9c5b6c114c8 +DIST lldpd-1.0.18.tar.gz 1988691 BLAKE2B 37ee156013ab9ceaee06d10025fe0b76e26ebafef7a8254866347db8e6b316805a49d0f9f2ba330bb5f863336e95983214c9c9fb453e2290e9be0c47808504c7 SHA512 c8734221767cd879c98ea3ee6fa80e1dce2f8470a97b0f757cfe7ef8fe2adaf878fdedcda896cf65e1af980634f2ab312588658fb85f89c6d5b6cc9d2da52045 diff --git a/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch deleted file mode 100644 index 876a9ce31cd5..000000000000 --- a/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c -index 6d2736a..533f6fe 100644 ---- a/src/daemon/priv-seccomp.c -+++ b/src/daemon/priv-seccomp.c -@@ -180,6 +180,7 @@ priv_seccomp_init(int remote, int child) - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fstat), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(newfstatat), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(connect), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(futex), 0)) < 0 || - diff --git a/net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch deleted file mode 100644 index 68f3592ec9b6..000000000000 --- a/net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://bugs.gentoo.org/827736 -https://github.com/lldpd/lldpd/commit/e57bf5ea66a70ff87bba5c39c0e10c071b4af824 - -From: Benedikt Neuffer <benedikt.neuffer@kit.edu> -Date: Sat, 27 Nov 2021 17:07:50 +0100 -Subject: [PATCH] linux: add missing SECCOMP rules - -Signed-off-by: Benedikt Neuffer <benedikt.neuffer@kit.edu> ---- a/src/daemon/priv-seccomp.c -+++ b/src/daemon/priv-seccomp.c -@@ -176,6 +176,8 @@ priv_seccomp_init(int remote, int child) - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(clock_gettime), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(gettimeofday), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(newfstatat), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(pread64), 0)) < 0 || - /* The following are for resolving addresses */ - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 || diff --git a/net-misc/lldpd/files/lldpd-1.0.16-configure-clang16.patch b/net-misc/lldpd/files/lldpd-1.0.16-configure-clang16.patch new file mode 100644 index 000000000000..bd03399e1b36 --- /dev/null +++ b/net-misc/lldpd/files/lldpd-1.0.16-configure-clang16.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/900286 +https://github.com/lldpd/lldpd/commit/01aee0f3601c60e570aeb9040c036c83d053cc5a + +From 01aee0f3601c60e570aeb9040c036c83d053cc5a Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Thu, 8 Dec 2022 13:01:07 +0100 +Subject: [PATCH] m4/progname.m4: Include <stdio.h> for printf in + lldp_CHECK___PROGNAME + +Otherwise the checks always fails with a compiler that does not +support implict function declarations. +--- a/m4/progname.m4 ++++ b/m4/progname.m4 +@@ -4,7 +4,7 @@ + AC_DEFUN([lldp_CHECK___PROGNAME],[ + AC_CACHE_CHECK([whether libc defines __progname], lldp_cv_check___progname, [ + AC_LINK_IFELSE([AC_LANG_PROGRAM( +- [[]], ++ [[#include<stdio.h>]], + [[ extern char *__progname; printf("%s", __progname); ]])], + [ lldp_cv_check___progname="yes" ], + [ lldp_cv_check___progname="no" ]) + diff --git a/net-misc/lldpd/lldpd-1.0.11-r1.ebuild b/net-misc/lldpd/lldpd-1.0.11-r1.ebuild deleted file mode 100644 index 4f6497abc941..000000000000 --- a/net-misc/lldpd/lldpd-1.0.11-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd bash-completion-r1 autotools tmpfiles - -DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" -HOMEPAGE="https://lldpd.github.io/" -SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/4.9.0" -KEYWORDS="amd64 x86" -IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers - seccomp sonmp snmp static-libs test readline xml zsh-completion" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/lldpd - acct-user/lldpd - dev-libs/libbsd - >=dev-libs/libevent-2.1.11:= - sys-libs/readline:0= - seccomp? ( sys-libs/libseccomp:= ) - snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) - xml? ( dev-libs/libxml2:= ) - zsh-completion? ( app-shells/zsh ) -" -DEPEND="${RDEPEND} - test? ( dev-libs/check ) -" -BDEPEND="virtual/pkgconfig - doc? ( - graph? ( app-doc/doxygen[dot] ) - !graph? ( app-doc/doxygen ) - ) -" - -REQUIRED_USE="graph? ( doc )" - -PATCHES=( - "${FILESDIR}/lldpd-1.0.10-glibc-2.33.patch" -) - -src_prepare() { - default - - eautoreconf - elibtoolize -} - -src_configure() { - econf \ - --without-embedded-libevent \ - --with-privsep-user=${PN} \ - --with-privsep-group=${PN} \ - --with-privsep-chroot=/run/${PN} \ - --with-lldpd-ctl-socket=/run/${PN}.socket \ - --with-lldpd-pid-file=/run/${PN}.pid \ - $(use_enable cdp) \ - $(use_enable doc doxygen-man) \ - $(use_enable doc doxygen-pdf) \ - $(use_enable doc doxygen-html) \ - $(use_enable dot1) \ - $(use_enable dot3) \ - $(use_enable edp) \ - $(use_enable fdp) \ - $(use_enable graph doxygen-dot) \ - $(use_enable lldpmed) \ - $(use_enable old-kernel oldies) \ - $(use_enable sonmp) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - $(use_enable sanitizers) \ - $(use_with seccomp) \ - $(use_with snmp) \ - $(use_with xml) -} - -src_compile() { - emake - use doc && emake doxygen-doc -} - -src_install() { - emake DESTDIR="${D}" install - find "${D}" -name '*.la' -delete || die - - newinitd "${FILESDIR}"/${PN}-initd-5 ${PN} - newconfd "${FILESDIR}"/${PN}-confd-1 ${PN} - newbashcomp src/client/completion/lldpcli lldpcli - - use doc && dodoc -r doxygen/html - - insinto /etc - doins "${FILESDIR}/lldpd.conf" - keepdir /etc/${PN}.d - - systemd_dounit "${FILESDIR}"/${PN}.service - newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/net-misc/lldpd/lldpd-1.0.12-r1.ebuild b/net-misc/lldpd/lldpd-1.0.12-r1.ebuild deleted file mode 100644 index 7f942ca82105..000000000000 --- a/net-misc/lldpd/lldpd-1.0.12-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd bash-completion-r1 autotools tmpfiles - -DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" -HOMEPAGE="https://lldpd.github.io/" -SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/4.9.0" -KEYWORDS="amd64 ~x86" -IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers - seccomp sonmp snmp static-libs test readline xml zsh-completion" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/lldpd - acct-user/lldpd - dev-libs/libbsd - >=dev-libs/libevent-2.1.11:= - sys-libs/readline:0= - seccomp? ( sys-libs/libseccomp:= ) - snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) - xml? ( dev-libs/libxml2:= ) - zsh-completion? ( app-shells/zsh ) -" -DEPEND="${RDEPEND} - test? ( dev-libs/check ) -" -BDEPEND="virtual/pkgconfig - doc? ( - graph? ( app-doc/doxygen[dot] ) - !graph? ( app-doc/doxygen ) - ) -" - -REQUIRED_USE="graph? ( doc )" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.13-glibc-2.33.patch" -) - -src_prepare() { - default - - eautoreconf - elibtoolize -} - -src_configure() { - econf \ - --without-embedded-libevent \ - --with-privsep-user=${PN} \ - --with-privsep-group=${PN} \ - --with-privsep-chroot=/run/${PN} \ - --with-lldpd-ctl-socket=/run/${PN}.socket \ - --with-lldpd-pid-file=/run/${PN}.pid \ - $(use_enable cdp) \ - $(use_enable doc doxygen-man) \ - $(use_enable doc doxygen-pdf) \ - $(use_enable doc doxygen-html) \ - $(use_enable dot1) \ - $(use_enable dot3) \ - $(use_enable edp) \ - $(use_enable fdp) \ - $(use_enable graph doxygen-dot) \ - $(use_enable lldpmed) \ - $(use_enable old-kernel oldies) \ - $(use_enable sonmp) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - $(use_enable sanitizers) \ - $(use_with seccomp) \ - $(use_with snmp) \ - $(use_with xml) -} - -src_compile() { - emake - use doc && emake doxygen-doc -} - -src_install() { - emake DESTDIR="${D}" install - find "${D}" -name '*.la' -delete || die - - newinitd "${FILESDIR}"/${PN}-initd-5 ${PN} - newconfd "${FILESDIR}"/${PN}-confd-1 ${PN} - newbashcomp src/client/completion/lldpcli lldpcli - - use doc && dodoc -r doxygen/html - - insinto /etc - doins "${FILESDIR}/lldpd.conf" - keepdir /etc/${PN}.d - - systemd_dounit "${FILESDIR}"/${PN}.service - newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/net-misc/lldpd/lldpd-1.0.9-r1.ebuild b/net-misc/lldpd/lldpd-1.0.16-r2.ebuild index 11ab20df05de..996694fae22a 100644 --- a/net-misc/lldpd/lldpd-1.0.9-r1.ebuild +++ b/net-misc/lldpd/lldpd-1.0.16-r2.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd bash-completion-r1 autotools tmpfiles DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" HOMEPAGE="https://lldpd.github.io/" -SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/lldpd/lldpd/releases/download/${PV}/${P}.tar.gz" LICENSE="ISC" -SLOT="0/4.9.0" +SLOT="0/4.9.1" KEYWORDS="~amd64 ~x86" IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers - seccomp sonmp snmp static-libs test readline xml zsh-completion" + seccomp sonmp snmp static-libs test readline valgrind xml" RESTRICT="!test? ( test )" RDEPEND=" @@ -25,28 +25,39 @@ RDEPEND=" seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) - zsh-completion? ( app-shells/zsh ) " DEPEND="${RDEPEND} test? ( dev-libs/check ) + valgrind? ( dev-debug/valgrind ) " BDEPEND="virtual/pkgconfig doc? ( - graph? ( app-doc/doxygen[dot] ) - !graph? ( app-doc/doxygen ) + graph? ( app-text/doxygen[dot,doc] ) + !graph? ( app-text/doxygen ) ) " -REQUIRED_USE="graph? ( doc )" +REQUIRED_USE=" + graph? ( doc ) + test? ( snmp sanitizers ) +" + +# tests need root +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.16-configure-clang16.patch +) src_prepare() { default eautoreconf - elibtoolize } src_configure() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + econf \ --without-embedded-libevent \ --with-privsep-user=${PN} \ @@ -55,6 +66,7 @@ src_configure() { --with-lldpd-ctl-socket=/run/${PN}.socket \ --with-lldpd-pid-file=/run/${PN}.pid \ $(use_enable cdp) \ + $(use_enable doc doxygen-doc) \ $(use_enable doc doxygen-man) \ $(use_enable doc doxygen-pdf) \ $(use_enable doc doxygen-html) \ diff --git a/net-misc/lldpd/lldpd-1.0.10-r1.ebuild b/net-misc/lldpd/lldpd-1.0.17.ebuild index 2e1925b588b5..92848bf22b45 100644 --- a/net-misc/lldpd/lldpd-1.0.10-r1.ebuild +++ b/net-misc/lldpd/lldpd-1.0.17.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd bash-completion-r1 autotools tmpfiles DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" HOMEPAGE="https://lldpd.github.io/" -SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/lldpd/lldpd/releases/download/${PV}/${P}.tar.gz" LICENSE="ISC" -SLOT="0/4.9.0" +SLOT="0/4.9.1" KEYWORDS="~amd64 ~x86" IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers - seccomp sonmp snmp static-libs test readline xml zsh-completion" + seccomp sonmp snmp static-libs test readline valgrind xml" RESTRICT="!test? ( test )" RDEPEND=" @@ -25,33 +25,37 @@ RDEPEND=" seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) - zsh-completion? ( app-shells/zsh ) " DEPEND="${RDEPEND} test? ( dev-libs/check ) + valgrind? ( dev-debug/valgrind ) " BDEPEND="virtual/pkgconfig doc? ( - graph? ( app-doc/doxygen[dot] ) - !graph? ( app-doc/doxygen ) + graph? ( app-text/doxygen[dot,doc] ) + !graph? ( app-text/doxygen ) ) " -REQUIRED_USE="graph? ( doc )" +REQUIRED_USE=" + graph? ( doc ) + test? ( snmp sanitizers ) +" -PATCHES=( - "${FILESDIR}/lldpd-1.0.10-glibc-2.33.patch" -) +# tests need root +RESTRICT+=" test" src_prepare() { default eautoreconf - elibtoolize } src_configure() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + econf \ + --cache-file="${S}"/config.cache \ --without-embedded-libevent \ --with-privsep-user=${PN} \ --with-privsep-group=${PN} \ @@ -59,6 +63,7 @@ src_configure() { --with-lldpd-ctl-socket=/run/${PN}.socket \ --with-lldpd-pid-file=/run/${PN}.pid \ $(use_enable cdp) \ + $(use_enable doc doxygen-doc) \ $(use_enable doc doxygen-man) \ $(use_enable doc doxygen-pdf) \ $(use_enable doc doxygen-html) \ diff --git a/net-misc/lldpd/lldpd-1.0.13-r1.ebuild b/net-misc/lldpd/lldpd-1.0.18.ebuild index 146a3f5d5986..92848bf22b45 100644 --- a/net-misc/lldpd/lldpd-1.0.13-r1.ebuild +++ b/net-misc/lldpd/lldpd-1.0.18.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd bash-completion-r1 autotools tmpfiles DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" HOMEPAGE="https://lldpd.github.io/" -SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/lldpd/lldpd/releases/download/${PV}/${P}.tar.gz" LICENSE="ISC" -SLOT="0/4.9.0" +SLOT="0/4.9.1" KEYWORDS="~amd64 ~x86" IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers - seccomp sonmp snmp static-libs test readline xml zsh-completion" + seccomp sonmp snmp static-libs test readline valgrind xml" RESTRICT="!test? ( test )" RDEPEND=" @@ -25,24 +25,25 @@ RDEPEND=" seccomp? ( sys-libs/libseccomp:= ) snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) xml? ( dev-libs/libxml2:= ) - zsh-completion? ( app-shells/zsh ) " DEPEND="${RDEPEND} test? ( dev-libs/check ) + valgrind? ( dev-debug/valgrind ) " BDEPEND="virtual/pkgconfig doc? ( - graph? ( app-doc/doxygen[dot] ) - !graph? ( app-doc/doxygen ) + graph? ( app-text/doxygen[dot,doc] ) + !graph? ( app-text/doxygen ) ) " -REQUIRED_USE="graph? ( doc )" +REQUIRED_USE=" + graph? ( doc ) + test? ( snmp sanitizers ) +" -PATCHES=( - # Can drop this on next release; upstream. - "${FILESDIR}/${P}-glibc-2.33.patch" -) +# tests need root +RESTRICT+=" test" src_prepare() { default @@ -51,7 +52,10 @@ src_prepare() { } src_configure() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + econf \ + --cache-file="${S}"/config.cache \ --without-embedded-libevent \ --with-privsep-user=${PN} \ --with-privsep-group=${PN} \ @@ -59,6 +63,7 @@ src_configure() { --with-lldpd-ctl-socket=/run/${PN}.socket \ --with-lldpd-pid-file=/run/${PN}.pid \ $(use_enable cdp) \ + $(use_enable doc doxygen-doc) \ $(use_enable doc doxygen-man) \ $(use_enable doc doxygen-pdf) \ $(use_enable doc doxygen-html) \ diff --git a/net-misc/lldpd/lldpd-1.0.7-r1.ebuild b/net-misc/lldpd/lldpd-1.0.7-r1.ebuild deleted file mode 100644 index 276e1da109ae..000000000000 --- a/net-misc/lldpd/lldpd-1.0.7-r1.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 systemd bash-completion-r1 autotools tmpfiles - -DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)" -HOMEPAGE="https://lldpd.github.io/" -SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/4.9.0" -KEYWORDS="amd64 x86" -IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers - seccomp sonmp snmp static-libs test readline xml zsh-completion" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/lldpd - acct-user/lldpd - dev-libs/libbsd - >=dev-libs/libevent-2.1.11:= - sys-libs/readline:0= - seccomp? ( sys-libs/libseccomp:= ) - snmp? ( net-analyzer/net-snmp:=[extensible(+)] ) - xml? ( dev-libs/libxml2:= ) - zsh-completion? ( app-shells/zsh ) -" -DEPEND="${RDEPEND} - test? ( dev-libs/check ) -" -BDEPEND="virtual/pkgconfig - doc? ( - graph? ( app-doc/doxygen[dot] ) - !graph? ( app-doc/doxygen ) - ) -" - -REQUIRED_USE="graph? ( doc )" - -src_prepare() { - default - - eautoreconf - elibtoolize -} - -src_configure() { - econf \ - --without-embedded-libevent \ - --with-privsep-user=${PN} \ - --with-privsep-group=${PN} \ - --with-privsep-chroot=/run/${PN} \ - --with-lldpd-ctl-socket=/run/${PN}.socket \ - --with-lldpd-pid-file=/run/${PN}.pid \ - $(use_enable cdp) \ - $(use_enable doc doxygen-man) \ - $(use_enable doc doxygen-pdf) \ - $(use_enable doc doxygen-html) \ - $(use_enable dot1) \ - $(use_enable dot3) \ - $(use_enable edp) \ - $(use_enable fdp) \ - $(use_enable graph doxygen-dot) \ - $(use_enable lldpmed) \ - $(use_enable old-kernel oldies) \ - $(use_enable sonmp) \ - $(use_enable static-libs static) \ - $(use_with readline) \ - $(use_enable sanitizers) \ - $(use_with seccomp) \ - $(use_with snmp) \ - $(use_with xml) -} - -src_compile() { - emake - use doc && emake doxygen-doc -} - -src_install() { - emake DESTDIR="${D}" install - find "${D}" -name '*.la' -delete || die - - newinitd "${FILESDIR}"/${PN}-initd-5 ${PN} - newconfd "${FILESDIR}"/${PN}-confd-1 ${PN} - newbashcomp src/client/completion/lldpcli lldpcli - - use doc && dodoc -r doxygen/html - - insinto /etc - doins "${FILESDIR}/lldpd.conf" - keepdir /etc/${PN}.d - - systemd_dounit "${FILESDIR}"/${PN}.service - newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/net-misc/lldpd/metadata.xml b/net-misc/lldpd/metadata.xml index 1f19b52e0f6e..862a9a8e9b1f 100644 --- a/net-misc/lldpd/metadata.xml +++ b/net-misc/lldpd/metadata.xml @@ -31,4 +31,8 @@ lldpd also implements CDP (Cisco Discovery Protocol), FDP (Foundry Discovery Pro <flag name="sonmp">Enable SynOptics Network Management</flag> <flag name="snmp">Enable the use of SNMP</flag> </use> + <upstream> + <remote-id type="cpe">cpe:/a:lldpd_project:lldpd</remote-id> + <remote-id type="github">lldpd/lldpd</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild b/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild index e50cdd4ab9ec..e75202fdafa6 100644 --- a/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild +++ b/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 diff --git a/net-misc/lyricwikia/lyricwikia-0.1.11-r2.ebuild b/net-misc/lyricwikia/lyricwikia-0.1.11-r2.ebuild new file mode 100644 index 000000000000..e5c93282a1f9 --- /dev/null +++ b/net-misc/lyricwikia/lyricwikia-0.1.11-r2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +DESCRIPTION="Python API to get song lyrics from LyricWikia" +HOMEPAGE="https://github.com/enricobacis/lyricwikia" +SRC_URI="https://github.com/enricobacis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="test? ( dev-python/responses[${PYTHON_USEDEP}] )" + +RDEPEND=" + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] +" + +PATCHES="${FILESDIR}/${P}-skip-online-test.patch" + +distutils_enable_tests pytest + +python_prepare_all() { + # do not depend on deprecated dep + sed -i -e '/pytest-runner/d' setup.py || die + + distutils-r1_python_prepare_all +} + +python_install_all() { + distutils-r1_python_install_all + + # rename the executable to avoid file conflict with net-im/lyrics-in-terminal + find "${D}" -name 'lyrics' -execdir mv {} lyricwikia \; || die +} + +pkg_postinst() { + elog "Note that access to LyricWikia through this API (and products that use this API) should comply to the LyricWikia terms of use" + elog "" + elog "LyricWikia is now offline, this package is provided solely for the purpose of satisfying media-video/vidify's dependencies" +} diff --git a/net-misc/lyricwikia/metadata.xml b/net-misc/lyricwikia/metadata.xml index 270110553011..264f58e3938d 100644 --- a/net-misc/lyricwikia/metadata.xml +++ b/net-misc/lyricwikia/metadata.xml @@ -7,4 +7,7 @@ <name>Andrew Ammerlaan</name> </maintainer> <stabilize-allarches/> + <upstream> + <remote-id type="github">enricobacis/lyricwikia</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild b/net-misc/mcproxy/mcproxy-1.1.1-r2.ebuild index b264a8937f8f..aa97d1c68cee 100644 --- a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild +++ b/net-misc/mcproxy/mcproxy-1.1.1-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit linux-info qmake-utils systemd DESCRIPTION="A multicast proxy for IGMP/MLD" HOMEPAGE="https://mcproxy.realmv6.org/ https://github.com/mcproxy/mcproxy" SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}/${PN}" KEYWORDS="amd64 x86" LICENSE="GPL-2+" @@ -16,11 +17,9 @@ IUSE="doc" DEPEND=" dev-qt/qtcore:5 - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " -S="${WORKDIR}/${P}/${PN}" - PATCHES=( "${FILESDIR}/${P}-clang.patch" "${FILESDIR}/${P}-fix-checksum-calculation.patch" diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest index c669a373a633..6c8dca9544dc 100644 --- a/net-misc/megatools/Manifest +++ b/net-misc/megatools/Manifest @@ -1 +1,2 @@ -DIST megatools-1.10.3.tar.gz 196361 BLAKE2B 49d7658714074253ab93134bd9fbb6f73a9101e362f219c4394cfe599deeb3cb2ccf01afb89db75691299271fa9dbfdf004abd6dfe26d2a0fda783282561ff51 SHA512 cf431e151f3f7e1a77fcfe07092694f861eca43ab88bb4e0d4de72f01662e9140c51891f8f5cf3cf66d3a04b64a55d57fd766c3febf2fc5cee1720558ff2079b +DIST megatools-1.11.0.20220519.tar.gz 105567 BLAKE2B 2f878568bb21a554d15bf6d68dfe27b8ba3d10cd9a4645e6082473e911940a0500d7becd0e4e7a72404f60759aaaaa5cb2780c6b176f722fb4fd57269570f4e2 SHA512 5c379a5a8da150d6d95a84f6bcf0c9be5b725c2c0e799e8d1e3358ac6081579eacc853f6b3d369c06006d3bdb3917dc20cf39ca5c69f153dc38de9daab74cea1 +DIST megatools-1.11.1.20230212.tar.gz 105339 BLAKE2B b4bc57fa009d8f500e0360c60284198ed2ae30d4580f82826fa6ef6230c5f627d265a1300dbbca76837acc83bf10e8ba73ea404dcb64bf09e15730877714c639 SHA512 8d96533c6ae117f38e095b16f4c3241a9170397174befaff9caf81b598addbe60c89c05d29b20efead462a8f263f799107653cab1ad429ab2ba2fe0dc4fbbb39 diff --git a/net-misc/megatools/megatools-1.10.3.ebuild b/net-misc/megatools/megatools-1.11.0.ebuild index 6055ce2deca2..e9edcdae3798 100644 --- a/net-misc/megatools/megatools-1.10.3.ebuild +++ b/net-misc/megatools/megatools-1.11.0.ebuild @@ -1,13 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools +inherit meson + +MY_P="${P}.20220519" DESCRIPTION="Command line tools and C library for accessing Mega cloud storage" HOMEPAGE="https://megatools.megous.com" -SRC_URI="https://megatools.megous.com/builds/${P}.tar.gz" +SRC_URI="https://megatools.megous.com/builds/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" @@ -25,14 +28,8 @@ BDEPEND=" virtual/pkgconfig " -src_prepare() { - default - sed -i -e "/^AC_PROG_CC/ a AM_PROG_AR" configure.ac || die - eautoreconf -} +src_install() { + meson_src_install -src_configure() { - econf \ - --disable-maintainer-mode \ - --disable-warnings + rm -r "${ED}/usr/share/doc/${PN}" || die } diff --git a/net-misc/megatools/megatools-1.11.1.ebuild b/net-misc/megatools/megatools-1.11.1.ebuild new file mode 100644 index 000000000000..6313dae1c214 --- /dev/null +++ b/net-misc/megatools/megatools-1.11.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +MY_P="${P}.20230212" + +DESCRIPTION="Command line tools and C library for accessing Mega cloud storage" +HOMEPAGE="https://megatools.megous.com" +SRC_URI="https://megatools.megous.com/builds/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/openssl:0= + net-libs/glib-networking[ssl] + net-misc/curl +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/asciidoc + virtual/pkgconfig +" + +src_install() { + meson_src_install + + rm -r "${ED}/usr/share/doc/${PN}" || die +} diff --git a/net-misc/megatools/metadata.xml b/net-misc/megatools/metadata.xml index 9c32253388f8..4a33f270c218 100644 --- a/net-misc/megatools/metadata.xml +++ b/net-misc/megatools/metadata.xml @@ -2,15 +2,15 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>dlan@gentoo.org</email> - <name>Yixun Lan</name> + <email>ajak@gentoo.org</email> + <name>John Helmert III</name> </maintainer> <longdescription lang="en"> -Megatools is a collection of programs for accessing Mega service from +Megatools is a collection of programs for accessing Mega service from a command line of your desktop or server. Mega website can be found at http://mega.co.nz. -</longdescription> + </longdescription> <upstream> <remote-id type="github">megous/megatools</remote-id> </upstream> diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index f0f918bf2f03..d661d34ba878 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -1,2 +1,3 @@ -DIST memcached-1.6.10.tar.gz 609630 BLAKE2B 1b4d632cb57e1f49d6e667aea5a4d2a1c74bbac038db329d84f2b9229e6db8204c2c0b55075ef238a5c3fa3751de5a0fb843a2ee0e71a648a194aed832d6dd36 SHA512 46d41c87afd0fb3a15bd418d757a25f93bee7d052653a488b4bc29a795826b9c238590cd9ee602ca4e5f645ece74685c644a9bb12bb58ff79b098c4fcf5b3835 -DIST memcached-1.6.12.tar.gz 618614 BLAKE2B 45de1c9610781ed6ab27261642db62b65a846651df64d9db2658ce8bc1cd96a798add6099340281c9dadc470e81b86976b855f4bece29189cfcfdb9b4e3a8991 SHA512 6cf41f14679ffac096195c29cf79741f28069e92d8ceddd5039061f1b8d3d4018f2983a6e43a27306ff299f9198e56f9ebd8ee8b62aa4882b38a0aa712ab1779 +DIST memcached-1.6.25.tar.gz 1178044 BLAKE2B a00fb61cf6fbad07d18ecf878c08b250bcc2206f5bc1bbf91d2d1524ba14bba15743a3cc2d919fbdf0388d01ec26671dcfd0e4511b477747497ee564d796828f SHA512 70b11244fdedbea29cceda0f6db94fcd3723f70643f614db1163bae90d9b9792fe247233aa08b894869252f7b8340e85e41213cd04195b5f4ba288901ede80f7 +DIST memcached-1.6.26.tar.gz 1178446 BLAKE2B 95919a83bd46bcddc7d055467954da6d64d42d0b9d1ee8e373e6c2a79cf518b768e0bd5d10f25a0eb27e642dd5fbc825f24c968d12034aa6e885a945a018e761 SHA512 7bd0d0dc0d228cde2fc3841c8973a2dde86bd50a4819f9737a22e12435f61d7459655029da390b63b8e6c3ca555b92a9c4c125a7c0bef5e6b051216414f1d49e +DIST memcached-1.6.27.tar.gz 1189608 BLAKE2B 056f9555dda758ebb46f62c7eb65712107b1e50b4e4e9696ad4962abdd584df0e0d398590b0e6bfabad33ca18f2a7596d9410d8b35fe069bce6f812ecedd3c35 SHA512 d9de26887339d456e1cace60bf5b2cc2a78231a52ec6f6f36ed7d3ad373eaf231419601be46e80963a3a0254638d03198141647f81fa530b85dbdc4a6071c4cd diff --git a/net-misc/memcached/files/memcached-1.2.2-fbsd.patch b/net-misc/memcached/files/memcached-1.2.2-fbsd.patch deleted file mode 100644 index 76f237698cf7..000000000000 --- a/net-misc/memcached/files/memcached-1.2.2-fbsd.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: memcached-1.2.2/memcached.h -=================================================================== ---- memcached-1.2.2.orig/memcached.h -+++ memcached-1.2.2/memcached.h -@@ -4,6 +4,7 @@ - #include "config.h" - #include <sys/types.h> - #include <sys/time.h> -+#include <sys/socket.h> - #include <netinet/in.h> - #include <event.h> - diff --git a/net-misc/memcached/files/memcached-1.4.4-as-needed.patch b/net-misc/memcached/files/memcached-1.4.4-as-needed.patch deleted file mode 100644 index f6e5cde11057..000000000000 --- a/net-misc/memcached/files/memcached-1.4.4-as-needed.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nuar memcached-1.4.4.orig/configure.ac memcached-1.4.4/configure.ac ---- memcached-1.4.4.orig/configure.ac 2009-11-24 16:40:29.000000000 -0800 -+++ memcached-1.4.4/configure.ac 2009-11-27 15:20:38.000000000 -0800 -@@ -115,6 +115,14 @@ - AC_SUBST(ENABLE_SASL) - AC_SUBST(PROFILER_LDFLAGS) - -+dnl Check whether the user's system supports pthread before adding -pthread to CFLAGS -+dnl otherwise we won't get -l{threads} in LIBS -+dnl AFAIK -pthread should be added to LDFLAGS on BSD systems -+AC_SEARCH_LIBS(pthread_create, [pthread pthreads thread threads] ) -+if test "x$ac_cv_search_pthread_create" == "xno"; then -+ AC_MSG_ERROR([Can't enable threads without the POSIX thread library.]) -+fi -+ - AC_ARG_ENABLE(coverage, - [AS_HELP_STRING([--disable-coverage],[Disable code coverage])]) - -@@ -376,12 +384,6 @@ - - AC_C_HTONLL - --dnl Check whether the user's system supports pthread --AC_SEARCH_LIBS(pthread_create, pthread) --if test "x$ac_cv_search_pthread_create" = "xno"; then -- AC_MSG_ERROR([Can't enable threads without the POSIX thread library.]) --fi -- - AC_CHECK_FUNCS(mlockall) - AC_CHECK_FUNCS(getpagesizes) - AC_CHECK_FUNCS(memcntl) diff --git a/net-misc/memcached/memcached-1.6.12-r1.ebuild b/net-misc/memcached/memcached-1.6.25.ebuild index 691bb53ad5c0..bd837580012f 100644 --- a/net-misc/memcached/memcached-1.6.12-r1.ebuild +++ b/net-misc/memcached/memcached-1.6.25.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= @@ -33,16 +33,13 @@ S="${WORKDIR}/${MY_P}" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}/${PN}-1.2.2-fbsd.patch" "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - "${FILESDIR}/${PN}-1.4.4-as-needed.patch" "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" ) src_prepare() { default - sed -i -e 's,-Werror,,g' configure.ac || die sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die eautoreconf @@ -65,6 +62,7 @@ src_prepare() { src_configure() { econf \ --disable-docs \ + --disable-werror \ $(use_enable sasl) \ $(use_enable ssl tls) # The xml2rfc tool to build the additional docs requires TCL :-( diff --git a/net-misc/memcached/memcached-1.6.10.ebuild b/net-misc/memcached/memcached-1.6.26.ebuild index 4126566cc8e8..bd837580012f 100644 --- a/net-misc/memcached/memcached-1.6.10.ebuild +++ b/net-misc/memcached/memcached-1.6.26.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,33 +15,31 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) - selinux? ( sec-policy/selinux-memcached )" + selinux? ( sec-policy/selinux-memcached ) + ssl? ( >=dev-libs/openssl-1.1.0g:= )" DEPEND="${RDEPEND} acct-user/memcached - test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )" + test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )" S="${WORKDIR}/${MY_P}" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}/${PN}-1.2.2-fbsd.patch" "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - "${FILESDIR}/${PN}-1.4.4-as-needed.patch" "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" ) src_prepare() { default - sed -i -e 's,-Werror,,g' configure.ac || die sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die eautoreconf @@ -64,7 +62,9 @@ src_prepare() { src_configure() { econf \ --disable-docs \ - $(use_enable sasl) + --disable-werror \ + $(use_enable sasl) \ + $(use_enable ssl tls) # The xml2rfc tool to build the additional docs requires TCL :-( # `use_enable doc docs` } diff --git a/net-misc/memcached/memcached-1.6.12.ebuild b/net-misc/memcached/memcached-1.6.27.ebuild index 16eba892a140..9561a6bf3beb 100644 --- a/net-misc/memcached/memcached-1.6.12.ebuild +++ b/net-misc/memcached/memcached-1.6.27.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,33 +15,31 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) - selinux? ( sec-policy/selinux-memcached )" + selinux? ( sec-policy/selinux-memcached ) + ssl? ( >=dev-libs/openssl-1.1.0g:= )" DEPEND="${RDEPEND} acct-user/memcached - test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )" + test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )" S="${WORKDIR}/${MY_P}" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}/${PN}-1.2.2-fbsd.patch" "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - "${FILESDIR}/${PN}-1.4.4-as-needed.patch" "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" ) src_prepare() { default - sed -i -e 's,-Werror,,g' configure.ac || die sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die eautoreconf @@ -64,7 +62,9 @@ src_prepare() { src_configure() { econf \ --disable-docs \ - $(use_enable sasl) + --disable-werror \ + $(use_enable sasl) \ + $(use_enable ssl tls) # The xml2rfc tool to build the additional docs requires TCL :-( # `use_enable doc docs` } diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest index 86d2e815a726..dab5c4e16894 100644 --- a/net-misc/mico/Manifest +++ b/net-misc/mico/Manifest @@ -1,3 +1,2 @@ -DIST mico-2.3.13-gentoo-r13.patch 133254 BLAKE2B 71e22f8bd7491b6aa594a32d7d2a5677b3fc1376bb8ff11eae20e6749ec9c582b99704030c2178f81f1b1fd4ac8f4c2b14e3c80cdf9769ed49004c5a4bab761d SHA512 4e4c60c8e3f6e303b136d17cc83cd5bb92a2b23c0a843721ba74e62d6c69224719bf254a5d8c028df0166c36a07ef349e98f4244b4d208e689c3b6c382c1b906 DIST mico-2.3.13-gentoo-r14.patch 136291 BLAKE2B 3416fe0fc2e0b9243d22c9cf6a0dffbf14c99846d1b064b3df6496c2d1b9021de0268d0543f566d13425d4fef29626829359deb133ce678d299627f93b0461de SHA512 3ec284442ac00bf429f633dddcaae46a83b720045bc93a177a609255957956aaccb188b0e858ac88b3d8b0c9be081501dcffabd86965b1a4b30a07d45aab0850 DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895 diff --git a/net-misc/mico/mico-2.3.13-r13.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild deleted file mode 100644 index 324ead110f2b..000000000000 --- a/net-misc/mico/mico-2.3.13-r13.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic toolchain-funcs autotools - -DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard" -HOMEPAGE="http://www.mico.org/" -SRC_URI=" - http://www.mico.org/${P}.tar.gz - https://github.com/ssi-schaefer/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch -" -S="${WORKDIR}"/${PN} - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" -IUSE="gtk postgres ssl tcl threads X" -RESTRICT="test" #298101 - -# doesn't compile: -# bluetooth? ( net-wireless/bluez ) - -RDEPEND=" - gtk? ( x11-libs/gtk+:2 ) - postgres? ( dev-db/postgresql:* ) - ssl? ( dev-libs/openssl:0= ) - tcl? ( dev-lang/tcl:0 ) - X? ( x11-libs/libXt ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/flex-2.5.2 - >=sys-devel/bison-1.22 -" - -PATCHES=( - "${DISTDIR}"/${P}-gentoo-${PR}.patch -) - -src_prepare() { - default - - mv configure.in configure.ac || die #426262 - eautoreconf - - # cannot use big TOC (AIX only), gdb doesn't like it. - # This assumes that the compiler (or -wrapper) uses - # gcc flag '-mminimal-toc' for compilation. - sed -i -e 's/,-bbigtoc//' "${S}"/configure || die -} - -src_configure() { - tc-export CC CXX - append-cxxflags -fno-strict-aliasing - - # Don't know which version of JavaCUP would suffice, but there is no - # configure argument to disable checking for JavaCUP. - # So we override the configure check to not find 'javac'. - export ac_cv_path_JAVAC=no - - # '--without-ssl' just does not add another search path - the only way - # to disable openssl utilization seems to override the configure check. - use ssl || export ac_cv_lib_ssl_open=no - - local myconf= - myconf() { - myconf="${myconf} $*" - } - - myconf --disable-mini-stl - myconf $(use_enable threads) - - # '--without-*' or '--with-*=no' does not disable some features, - # the value needs to be empty instead. - # This applies to: pgsql, qt, tcl, bluetooth. - myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr) - myconf --with-tcl=$( use tcl && echo "${EPREFIX}"/usr) - # bluetooth and wireless both don't compile cleanly - myconf --with-bluetooth='' - myconf --disable-wireless - # But --without-x works. - myconf $(use_with X x "${EPREFIX}"/usr) - # Same for gtk after patch 013, searches for gtk release. - myconf $(use_with gtk gtk 2) - - # http://www.mico.org/pipermail/mico-devel/2009-April/010285.html - [[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED - - if [[ ${CHOST} == *-winnt* ]]; then - # disabling static libs, since ar on interix takes nearly - # one hour per library, thanks to mico's monster objects. - use threads && - ewarn "disabling USE='threads', does not work on ${CHOST}" - myconf --disable-threads --disable-static --enable-final - append-flags -D__STDC__ - fi - - econf ${myconf} -} - -src_install() { - emake INSTDIR="${ED}"/usr SHARED_INSTDIR="${ED}"/usr install LDCONFIG=: - if [[ $(get_libdir) != lib ]]; then #500744 - mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die - fi - - # avoid conflict with net-dns/nsd, bug#544488 - mv "${ED}"/usr/bin/{,mico-}nsd || die - mv "${ED}"/usr/man/man8/{,mico-}nsd.8 || die - - # avoid conflict with net-misc/eventd, bug#632170 - mv "${ED}"/usr/bin/{,mico-}eventd || die - - dodir /usr/share - mv "${ED}"/usr/man "${ED}"/usr/share || die - dodir /usr/share/doc/${PF} - mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die - - dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO - dodoc FAQ -} - -pkg_postinst() { - einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'" - einfo "due to a name conflict with net-dns/nsd. For details" - einfo "please refer to https://bugs.gentoo.org/544488." - einfo - einfo "The MICO Event daemon 'eventd' is named 'mico-eventd'" - einfo "due to a name conflict with net-misc/eventd. For details" - einfo "please refer to https://bugs.gentoo.org/632170." -} diff --git a/net-misc/mico/mico-2.3.13-r14.ebuild b/net-misc/mico/mico-2.3.13-r14.ebuild index 324ead110f2b..d1ce400fc92d 100644 --- a/net-misc/mico/mico-2.3.13-r14.ebuild +++ b/net-misc/mico/mico-2.3.13-r14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN} LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="gtk postgres ssl tcl threads X" RESTRICT="test" #298101 @@ -31,7 +31,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - >=sys-devel/flex-2.5.2 + app-alternatives/lex >=sys-devel/bison-1.22 " @@ -85,18 +85,6 @@ src_configure() { # Same for gtk after patch 013, searches for gtk release. myconf $(use_with gtk gtk 2) - # http://www.mico.org/pipermail/mico-devel/2009-April/010285.html - [[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED - - if [[ ${CHOST} == *-winnt* ]]; then - # disabling static libs, since ar on interix takes nearly - # one hour per library, thanks to mico's monster objects. - use threads && - ewarn "disabling USE='threads', does not work on ${CHOST}" - myconf --disable-threads --disable-static --enable-final - append-flags -D__STDC__ - fi - econf ${myconf} } diff --git a/net-misc/midentd/midentd-2.3.1-r2.ebuild b/net-misc/midentd/midentd-2.3.1-r3.ebuild index c48d07205eae..1abe32b1057f 100644 --- a/net-misc/midentd/midentd-2.3.1-r2.ebuild +++ b/net-misc/midentd/midentd-2.3.1-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="ident daemon with masquerading and fake replies support" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" @@ -10,9 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~sparc x86" -IUSE="" -DEPEND="" RDEPEND="dev-lang/perl" src_prepare() { diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest index e7fc8abd380a..021510194bfe 100644 --- a/net-misc/mikutter/Manifest +++ b/net-misc/mikutter/Manifest @@ -1,2 +1,4 @@ -DIST mikutter-4.1.7.tar.gz 2331574 BLAKE2B a60918f2bfe3a56087536c0b3313f454cdee61fd4c988008581f8a9e3373a76d78e8c93d051ff21b45874e9d4944522c2feafc4ec06fd669e7568b8f9864911c SHA512 bb7fa2ebb22484e6244c2ac6747b811d0ebc1eadca9997c9b272c6378149f63f01b9f1b5c30b36150b38997c973233b8f7b9c3f310c5e36e3ee23edec67eddc5 +DIST 1585-use-own-blowfish-impl.patch 41698 BLAKE2B c7e62ee5e9d362e7bc103468f4be9a9e49715de63905ca1b2022f01af1bc7f143b46f69f4f73b34bc4f6ba8589ccd138822876c35b7061f0458ee4206aaf6941 SHA512 cddab2449c16b64bc12d272b9302eba01d3e80dfa1d9ade9b125d46508bdc49eb1b4990b25f43c915f76d3e3d4b669a9d5a6b09fbfb6e845690b39d336f120a0 +DIST mikutter-5.0.4.tar.gz 2378972 BLAKE2B 58101e91a8d8aeaf71e2bc58a421d0543f864c66c5ea313734ca242bce8115c70a036f6db109670cdb76cbd698d6d0569872c16eeb9eed15d1fd951aabccb35a SHA512 30e8b24af56e38fabeb454d4ea3f6a20b11e7836527f68e61f26f164fed0c2028b29db20c21397b2203fe23fceaef2e92a481d734692da3869dfcedcae2a58e0 +DIST mikutter-5.0.5.tar.gz 2379037 BLAKE2B 455109764e76b19298a0408c51a109f0c3b3b5b2f1b1ffcb59cee6d3fc449c754d8420ea37df2a005d36f3ab4447bbf7f6a7affe934852d07594cbe430cbffed SHA512 8b7d178400b0d7cb674297f9109832e1a19563d35e985636a42028df2414973819ef49b39f80e1a51cf1964634062656dc2071ba8d934083ce327e0a9f3adf28 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4 diff --git a/net-misc/mikutter/metadata.xml b/net-misc/mikutter/metadata.xml index 6ce8dfcade1b..c0c769ac2c9f 100644 --- a/net-misc/mikutter/metadata.xml +++ b/net-misc/mikutter/metadata.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>naota@gentoo.org</email> -</maintainer> + <maintainer type="person"> + <email>naota@gentoo.org</email> + <name>Naohiro Aota</name> + </maintainer> </pkgmetadata> diff --git a/net-misc/mikutter/mikutter-4.1.7.ebuild b/net-misc/mikutter/mikutter-5.0.4.ebuild index e6080f7b5c7a..0d3a72a482ca 100644 --- a/net-misc/mikutter/mikutter-4.1.7.ebuild +++ b/net-misc/mikutter/mikutter-5.0.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby26 ruby27" +USE_RUBY="ruby31" inherit desktop ruby-ng @@ -18,7 +18,7 @@ if [ "${PV}" = "9999" ]; then else SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~riscv" fi DESCRIPTION="Simple, powerful and moeful twitter client" @@ -34,25 +34,26 @@ RDEPEND=" media-sound/alsa-utils" ruby_add_rdepend "=dev-ruby/addressable-2.8* - >=dev-ruby/delayer-1.1.2 + >=dev-ruby/delayer-1.2.1 !>=dev-ruby/delayer-2.0 >=dev-ruby/delayer-deferred-2.2.0 !>=dev-ruby/delayer-deferred-3.0 - >=dev-ruby/diva-1.0.2 - !>=dev-ruby/diva-2.0 + >=dev-ruby/diva-2.0.1 + !>=dev-ruby/diva-3.0 dev-ruby/httpclient dev-ruby/json:2 >=dev-ruby/memoist-0.16.2 !>=dev-ruby/memoist-0.17 dev-ruby/moneta dev-ruby/nokogiri - >=dev-ruby/oauth-0.5.4 - >=dev-ruby/pluggaloid-1.5.0 + >=dev-ruby/oauth-0.5.8 + >=dev-ruby/pluggaloid-1.7.0 !>=dev-ruby/pluggaloid-2.0 + =dev-ruby/prime-0.1.2* dev-ruby/rcairo - >=dev-ruby/ruby-gettext-3.3.5 - !>=dev-ruby/ruby-gettext-3.4 - =dev-ruby/ruby-gtk2-3.4* + >=dev-ruby/ruby-gettext-3.4 + !>=dev-ruby/ruby-gettext-3.5 + dev-ruby/ruby-gtk3 >=dev-ruby/typed-array-0.1.2 !>=dev-ruby/typed-array-0.2 dev-ruby/twitter-text @@ -67,12 +68,11 @@ all_ruby_unpack() { } all_ruby_install() { - local rubyversion - local r + local ruby - for r in $USE_RUBY; do - if use ruby_targets_${r}; then - rubyversion=${r} + for ruby in ${RUBY_TARGETS_PREFERENCE}; do + if use ruby_targets_${ruby}; then + break fi done @@ -80,7 +80,7 @@ all_ruby_install() { doexe mikutter.rb insinto /usr/share/mikutter doins -r core plugin - sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \ + sed -e "s/ruby19/${ruby}/" "${FILESDIR}"/mikutter \ | newbin - mikutter dodoc README make_desktop_entry mikutter Mikutter \ diff --git a/net-misc/mikutter/mikutter-5.0.5.ebuild b/net-misc/mikutter/mikutter-5.0.5.ebuild new file mode 100644 index 000000000000..65013295fed7 --- /dev/null +++ b/net-misc/mikutter/mikutter-5.0.5.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_RUBY="ruby31 ruby32" + +inherit desktop ruby-ng + +PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09" +BLOWFISH_PATCH_NAME="1585-use-own-blowfish-impl.patch" +BLOWFISH_PATCH_URI="https://dev.mikutter.hachune.net/attachments/download/813/${BLOWFISH_PATCH_NAME}" + +if [ "${PV}" = "9999" ]; then + EGIT_REPO_URI="git://mikutter.hachune.net/mikutter.git" + inherit git-r3 + SRC_URI=" ${BLOWFISH_PATCH_URI}" + EGIT_CHECKOUT_DIR="${WORKDIR}/all" +else + SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz + ${BLOWFISH_PATCH_URI}" + KEYWORDS="~amd64 ~riscv" +fi + +DESCRIPTION="Simple, powerful and moeful twitter client" +HOMEPAGE="https://mikutter.hachune.net/" + +# Apache license for the blowfish patch +# https://dev.mikutter.hachune.net/issues/1585 +LICENSE="Apache-2.0 MIT" +SLOT="0" +IUSE="+libnotify" + +PATCHES=( + "${DISTDIR}/${BLOWFISH_PATCH_NAME}" +) + +DEPEND="" +RDEPEND=" + libnotify? ( x11-libs/libnotify ) + media-sound/alsa-utils" + +ruby_add_rdepend "=dev-ruby/addressable-2.8* + >=dev-ruby/delayer-1.2.1 + !>=dev-ruby/delayer-2.0 + >=dev-ruby/delayer-deferred-2.2.0 + !>=dev-ruby/delayer-deferred-3.0 + >=dev-ruby/diva-2.0.1 + !>=dev-ruby/diva-3.0 + dev-ruby/httpclient + dev-ruby/json:2 + >=dev-ruby/memoist-0.16.2 + !>=dev-ruby/memoist-0.17 + dev-ruby/moneta + dev-ruby/nokogiri + >=dev-ruby/oauth-0.5.8 + >=dev-ruby/pluggaloid-1.7.0 + !>=dev-ruby/pluggaloid-2.0 + =dev-ruby/prime-0.1.2* + dev-ruby/rcairo + >=dev-ruby/ruby-gettext-3.4 + !>=dev-ruby/ruby-gettext-3.5 + dev-ruby/ruby-gtk3 + >=dev-ruby/typed-array-0.1.2 + !>=dev-ruby/typed-array-0.2 + virtual/ruby-ssl" + +all_ruby_unpack() { + if [ "${PV}" = "9999" ];then + git-3_src_unpack + else + default + fi +} + +all_ruby_install() { + local ruby + + for ruby in ${RUBY_TARGETS_PREFERENCE}; do + if use ruby_targets_${ruby}; then + break + fi + done + + exeinto /usr/share/mikutter + doexe mikutter.rb + insinto /usr/share/mikutter + doins -r core plugin + sed -e "s/ruby19/${ruby}/" "${FILESDIR}"/mikutter \ + | newbin - mikutter + dodoc README + make_desktop_entry mikutter Mikutter \ + /usr/share/mikutter/core/skin/data/icon.png +} diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild index e6080f7b5c7a..65013295fed7 100644 --- a/net-misc/mikutter/mikutter-9999.ebuild +++ b/net-misc/mikutter/mikutter-9999.ebuild @@ -1,61 +1,68 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby26 ruby27" +USE_RUBY="ruby31 ruby32" inherit desktop ruby-ng PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09" +BLOWFISH_PATCH_NAME="1585-use-own-blowfish-impl.patch" +BLOWFISH_PATCH_URI="https://dev.mikutter.hachune.net/attachments/download/813/${BLOWFISH_PATCH_NAME}" if [ "${PV}" = "9999" ]; then - EGIT_REPO_URI="git://mikutter.hachune.net/mikutter.git - https://github.com/toshia/twitter_api_keys.git" + EGIT_REPO_URI="git://mikutter.hachune.net/mikutter.git" inherit git-r3 - SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb" + SRC_URI=" ${BLOWFISH_PATCH_URI}" EGIT_CHECKOUT_DIR="${WORKDIR}/all" else SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz - https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb" - KEYWORDS="~amd64" + ${BLOWFISH_PATCH_URI}" + KEYWORDS="~amd64 ~riscv" fi DESCRIPTION="Simple, powerful and moeful twitter client" HOMEPAGE="https://mikutter.hachune.net/" -LICENSE="MIT" +# Apache license for the blowfish patch +# https://dev.mikutter.hachune.net/issues/1585 +LICENSE="Apache-2.0 MIT" SLOT="0" IUSE="+libnotify" +PATCHES=( + "${DISTDIR}/${BLOWFISH_PATCH_NAME}" +) + DEPEND="" RDEPEND=" libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils" ruby_add_rdepend "=dev-ruby/addressable-2.8* - >=dev-ruby/delayer-1.1.2 + >=dev-ruby/delayer-1.2.1 !>=dev-ruby/delayer-2.0 >=dev-ruby/delayer-deferred-2.2.0 !>=dev-ruby/delayer-deferred-3.0 - >=dev-ruby/diva-1.0.2 - !>=dev-ruby/diva-2.0 + >=dev-ruby/diva-2.0.1 + !>=dev-ruby/diva-3.0 dev-ruby/httpclient dev-ruby/json:2 >=dev-ruby/memoist-0.16.2 !>=dev-ruby/memoist-0.17 dev-ruby/moneta dev-ruby/nokogiri - >=dev-ruby/oauth-0.5.4 - >=dev-ruby/pluggaloid-1.5.0 + >=dev-ruby/oauth-0.5.8 + >=dev-ruby/pluggaloid-1.7.0 !>=dev-ruby/pluggaloid-2.0 + =dev-ruby/prime-0.1.2* dev-ruby/rcairo - >=dev-ruby/ruby-gettext-3.3.5 - !>=dev-ruby/ruby-gettext-3.4 - =dev-ruby/ruby-gtk2-3.4* + >=dev-ruby/ruby-gettext-3.4 + !>=dev-ruby/ruby-gettext-3.5 + dev-ruby/ruby-gtk3 >=dev-ruby/typed-array-0.1.2 !>=dev-ruby/typed-array-0.2 - dev-ruby/twitter-text virtual/ruby-ssl" all_ruby_unpack() { @@ -67,12 +74,11 @@ all_ruby_unpack() { } all_ruby_install() { - local rubyversion - local r + local ruby - for r in $USE_RUBY; do - if use ruby_targets_${r}; then - rubyversion=${r} + for ruby in ${RUBY_TARGETS_PREFERENCE}; do + if use ruby_targets_${ruby}; then + break fi done @@ -80,44 +86,9 @@ all_ruby_install() { doexe mikutter.rb insinto /usr/share/mikutter doins -r core plugin - sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \ + sed -e "s/ruby19/${ruby}/" "${FILESDIR}"/mikutter \ | newbin - mikutter dodoc README make_desktop_entry mikutter Mikutter \ /usr/share/mikutter/core/skin/data/icon.png - - insinto /usr/share/mikutter/plugin/twitter_api_keys - newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in -} - -pkg_postinst() { - echo - elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running" - elog " emerge --config =${PF}" -} - -pkg_config() { - local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin - local CK CS - - echo - einfon "Please input your Consumer Key for Twitter: " - read -r CK - - echo - einfon "Please input your Consumer Secret for Twitter: " - read -r CS - - if [ -z "${CK}" -o -z "${CS}" ]; then - eerror "Consumer Key or Consumer Secret is missing." - return - fi - - sed -e "/consumer_key = /s!''!'${CK}'!" \ - -e "/consumer_secret = /s!''!'${CS}'!" \ - ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \ - ${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb - - echo - einfo "Consuker Key/Consumer secret is set." } diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest index 444e64091e07..aaef89fe6b17 100644 --- a/net-misc/minidlna/Manifest +++ b/net-misc/minidlna/Manifest @@ -1,2 +1,2 @@ -DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6 +DIST minidlna-1.3.3.tar.gz 824527 BLAKE2B 489b7ecb54a20f6111a65388ad2c52d477164046131af490cbcef7cd3ff2b841644f549bcad708ea6d4548f4111d5b2b63bafc0f079edf160467b85c682cbc5b SHA512 3571af71b49d46aacc273a9b35e2c78aeccb966c1d6122f8186074c34f9a177ac60622ccf29f307d8d73f502c7a99f023f96f0c43bbd398c7ef82bb57d77cc1d DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e diff --git a/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch b/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch deleted file mode 100644 index eec2bcd020e7..000000000000 --- a/net-misc/minidlna/files/minidlna-1.3.0-fd-leak.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/upnpevents.c b/upnpevents.c -index 4de6ce8..1126fa7 100644 ---- a/upnpevents.c -+++ b/upnpevents.c -@@ -290,18 +290,17 @@ upnp_event_create_notify(struct subscriber *sub) - addr.sin_family = AF_INET; - inet_aton(obj->addrstr, &addr.sin_addr); - addr.sin_port = htons(port); -- DPRINTF(E_DEBUG, L_HTTP, "%s: '%s' %hu '%s'\n", "upnp_event_notify_connect", -+ DPRINTF(E_DEBUG, L_HTTP, "%s: '%s' %hu '%s'\n", "upnp_event_create_notify", - obj->addrstr, port, obj->path); - obj->state = EConnecting; -+ obj->ev = (struct event ){ .fd = s, .rdwr = EVENT_WRITE, -+ .process = upnp_event_process_notify, .data = obj }; -+ event_module.add(&obj->ev); - if(connect(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - if(errno != EINPROGRESS && errno != EWOULDBLOCK) { -- DPRINTF(E_ERROR, L_HTTP, "%s: connect(): %s\n", "upnp_event_notify_connect", strerror(errno)); -+ DPRINTF(E_ERROR, L_HTTP, "%s: connect(): %s\n", "upnp_event_create_notify", strerror(errno)); - obj->state = EError; - } -- } else { -- obj->ev = (struct event ){ .fd = s, .rdwr = EVENT_WRITE, -- .process = upnp_event_process_notify, .data = obj }; -- event_module.add(&obj->ev); - } - - return; diff --git a/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch b/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch deleted file mode 100644 index 50da196377f1..000000000000 --- a/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/tivo_utils.c -+++ b/tivo_utils.c -@@ -27,6 +27,7 @@ - #include <sqlite3.h> - #include "tivo_utils.h" - -+struct sqlite3PrngType sqlite3Prng; - /* This function based on byRequest */ - char * - decodeString(char *string, int inplace) ---- a/tivo_utils.h -+++ b/tivo_utils.h -@@ -30,7 +30,9 @@ struct sqlite3PrngType { - unsigned char isInit; /* True if initialized */ - unsigned char i, j; /* State variables */ - unsigned char s[256]; /* State variables */ --} sqlite3Prng; -+}; -+ -+extern struct sqlite3PrngType sqlite3Prng; - - char * - decodeString(char *string, int inplace); diff --git a/net-misc/minidlna/minidlna-1.3.0-r2.ebuild b/net-misc/minidlna/minidlna-1.3.3.ebuild index 113c81783d7f..e56727ba5429 100644 --- a/net-misc/minidlna/minidlna-1.3.0-r2.ebuild +++ b/net-misc/minidlna/minidlna-1.3.3.ebuild @@ -1,44 +1,47 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit systemd tmpfiles +inherit autotools systemd tmpfiles DESCRIPTION="DLNA/UPnP-AV compliant media server" HOMEPAGE="https://sourceforge.net/projects/minidlna/" SRC_URI=" https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz - mirror://gentoo/minidlna-gentoo-artwork.patch.xz" + mirror://gentoo/minidlna-gentoo-artwork.patch.xz +" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="elibc_musl netgear readynas zeroconf" +KEYWORDS="amd64 arm ~arm64 x86" +IUSE="netgear readynas zeroconf" -RDEPEND=" - acct-group/minidlna - acct-user/minidlna +DEPEND=" dev-db/sqlite:3 - media-libs/flac + media-libs/flac:= media-libs/libexif media-libs/libid3tag:= + media-libs/libjpeg-turbo:= media-libs/libogg media-libs/libvorbis - media-video/ffmpeg:0= - virtual/jpeg:0= + media-video/ffmpeg:= elibc_musl? ( sys-libs/queue-standalone ) - zeroconf? ( net-dns/avahi )" -DEPEND=${RDEPEND} + zeroconf? ( net-dns/avahi ) +" +RDEPEND=" + ${DEPEND} + acct-group/minidlna + acct-user/minidlna +" BDEPEND=" - virtual/pkgconfig" + virtual/pkgconfig +" CONFIG_CHECK="~INOTIFY_USER" PATCHES=( "${WORKDIR}"/minidlna-gentoo-artwork.patch - "${FILESDIR}"/${P}-fno-common.patch - "${FILESDIR}"/${P}-fd-leak.patch ) src_prepare() { @@ -47,6 +50,7 @@ src_prepare() { -i minidlna.conf || die default + eautoreconf } src_configure() { diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest index 7036eb53b7ba..dbd4123ccda1 100644 --- a/net-misc/minissdpd/Manifest +++ b/net-misc/minissdpd/Manifest @@ -1,5 +1,4 @@ -DIST minissdpd-1.5.20190824.tar.gz 37300 BLAKE2B 3a04f6af0af8ce5d26e4860ceafe2c52f1ee562f179094fbcba3485c85ae75b7374fd7fa8f89ec6d9ce2a10bb94120618de40e0191fc7ecdd1e813a2b9c5d6af SHA512 79a14482b69a88b778e484a3b3e98964c420ff7576ac818ba60fd5e07f5b31754cdef3ee00d9189ba0a33f0268f11acd1f7c4222d8d0958920d1f568ec7755e2 -DIST minissdpd-1.5.20200928.tar.gz 37860 BLAKE2B fc80660ed84198d08d5879e276a0b5ab49c66344c8841f223990f704b6ebf70c8411da1d84ec51a9f69285a6b5a804ebe6b197555f5684d55cd0bf3abe250704 SHA512 e44142dcec4d0d4029a9d93748a8b3edec5482e2313d290956d3829b04e3637f6ba81292f27effad8829b29bb59f7fc43666338a8423d683ca6daa5807ea6362 -DIST minissdpd-1.5.20200928.tar.gz.sig 543 BLAKE2B 5fdedfe4b042924667c329aa964e006cc9a5aad1e2d4f11d46c6689e7d88b4614c383bfb666ca9a7c90b37256a4e38dcc85e479687688578dd198893fcf5d3cf SHA512 15477061b009991a05323a66582bd7ba9c9aa3a1a7c84eca93b27adf1b11ede81063d9de4695fcf3567f3c367a730afe4cee0fa95cccdecd316d08021956cf6b DIST minissdpd-1.5.20211105.tar.gz 38870 BLAKE2B a2c7c2b377f426eaffd77a15dd48945bd923344ed606c5060c209b57d7cb1ed92eaf93d8ffda6154b16d293ef78a20bec45aaae287c3f17b6affe3ab0bbc32f8 SHA512 ef393a051352c4abcc11d9f3bf1c822585750c1f8284875345f5cdb947b601c0bcd896d519a826f580612abbd7eacaedbd42e3fa60d654c906a35936faa92886 DIST minissdpd-1.5.20211105.tar.gz.sig 543 BLAKE2B 09ac05a8e3836b10cdda4fbe00c09c0adccc0fcd119ac2711943c351eedc07b4a915c05a7026f853d26f41d687d5e8b1f69b229033291af302c4e56bc0f93333 SHA512 cfa41832f229609fc41f60a8b35d7dfbb9285933a17baecde2e2e0d855d841941d9e532d8c33a8f025f076cb052a3526d5daee2cdc5e0065f253258f4ee005f1 +DIST minissdpd-1.6.0.tar.gz 39077 BLAKE2B b1000ab8a07796706f5e9549b716654681c1f9241b0715f8f427cd73071b6b7cf62762c340038e1e077d7cb7883ff838a550a294bb146239493dfd938014e00f SHA512 1415f241e3c417eae32d37707c67594b16e56eec34ce6a8c511272d178f465553642362ba7240271df8f18fe39f6613c1d919344ee13bbd6a99f9a706be67d37 +DIST minissdpd-1.6.0.tar.gz.sig 543 BLAKE2B c493c610f483d45aefc20540a8bfe5e228485dcaa17a7ae9576ae061bbc82c5bfd2a2e598ae879ee6f4833121caea48d415233929937964ddcdb5061eef5f7d3 SHA512 1c27ced3b8e22fcd1f867df50abc8718ce621ede7aba9c93606531139f5348cc097f4c8b20ed71c09b82546972efda2aec730732ad60bf82cb5c195730df7045 diff --git a/net-misc/minissdpd/metadata.xml b/net-misc/minissdpd/metadata.xml index bd0ab6dd3d38..076793e3f54b 100644 --- a/net-misc/minissdpd/metadata.xml +++ b/net-misc/minissdpd/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> - <maintainer type="person"> <email>mgorny@gentoo.org</email> <name>Michał Górny</name> </maintainer> diff --git a/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild b/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild deleted file mode 100644 index c27c7d1ca517..000000000000 --- a/net-misc/minissdpd/minissdpd-1.5.20190824.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -inherit toolchain-funcs - -DESCRIPTION="MiniSSDP Daemon" -SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" -HOMEPAGE="http://miniupnp.free.fr/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="net-libs/libnfnetlink" - -RDEPEND="${DEPEND} - || ( net-misc/miniupnpd net-libs/miniupnpc )" - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake PREFIX="${ED}" install - # note: we overwrite upstream's init.d - newinitd "${FILESDIR}/${PN}.initd-r2" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - dodoc Changelog.txt README - doman minissdpd.1 -} diff --git a/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild b/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild deleted file mode 100644 index f6632eade218..000000000000 --- a/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -inherit toolchain-funcs verify-sig - -DESCRIPTION="MiniSSDP Daemon" -HOMEPAGE="http://miniupnp.free.fr/" -SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz - verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="net-libs/libnfnetlink" -RDEPEND="${DEPEND} - || ( net-misc/miniupnpd net-libs/miniupnpc )" -BDEPEND=" - verify-sig? ( app-crypt/openpgp-keys-miniupnp )" - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc - -src_configure() { - sed -i -e '/#define HAVE_IP_MREQN/{s:/[*]::;s:[*]/::;}' config.h || die -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake PREFIX="${ED}" install - # note: we overwrite upstream's init.d - newinitd "${FILESDIR}/${PN}.initd-r2" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - dodoc Changelog.txt README - doman minissdpd.1 -} diff --git a/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild b/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild index b07a95967646..5ff039094c33 100644 --- a/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild +++ b/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild @@ -1,25 +1,39 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 + inherit toolchain-funcs verify-sig DESCRIPTION="MiniSSDP Daemon" -HOMEPAGE="http://miniupnp.free.fr/" -SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz - verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )" +HOMEPAGE=" + http://miniupnp.free.fr/ + https://miniupnp.tuxfamily.org/ + https://github.com/miniupnp/miniupnp/ +" +SRC_URI=" + https://miniupnp.tuxfamily.org/files/${P}.tar.gz + verify-sig? ( + https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig + ) +" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="net-libs/libnfnetlink" -RDEPEND="${DEPEND} - || ( net-misc/miniupnpd net-libs/miniupnpc )" +DEPEND=" + net-libs/libnfnetlink +" +RDEPEND=" + ${DEPEND} + || ( net-misc/miniupnpd net-libs/miniupnpc ) +" BDEPEND=" - verify-sig? ( app-crypt/openpgp-keys-miniupnp )" + verify-sig? ( sec-keys/openpgp-keys-miniupnp ) +" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc src_configure() { sed -i -e '/#define HAVE_IP_MREQN/{s:/[*]::;s:[*]/::;}' config.h || die diff --git a/net-misc/minissdpd/minissdpd-1.6.0.ebuild b/net-misc/minissdpd/minissdpd-1.6.0.ebuild new file mode 100644 index 000000000000..36e245adb5c3 --- /dev/null +++ b/net-misc/minissdpd/minissdpd-1.6.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs verify-sig + +DESCRIPTION="MiniSSDP Daemon" +HOMEPAGE=" + http://miniupnp.free.fr/ + https://miniupnp.tuxfamily.org/ + https://github.com/miniupnp/miniupnp/ +" +SRC_URI=" + https://miniupnp.tuxfamily.org/files/${P}.tar.gz + verify-sig? ( + https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig + ) +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + net-libs/libnfnetlink +" +RDEPEND=" + ${DEPEND} + || ( net-misc/miniupnpd net-libs/miniupnpc ) +" +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-miniupnp ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake DESTDIR="${ED}" install + # note: we overwrite upstream's init.d + newinitd "${FILESDIR}/${PN}.initd-r2" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} + dodoc Changelog.txt README + doman minissdpd.1 +} diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest index b26631d98c54..1c264826a1b0 100644 --- a/net-misc/miniupnpd/Manifest +++ b/net-misc/miniupnpd/Manifest @@ -1,4 +1,4 @@ -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 -DIST miniupnpd-2.2.3.tar.gz 254752 BLAKE2B ebdb8d4ce7dc649ef0243d2d698b9f51cb2006055eb3abb70d9ccc839cb57c7113595ef1b9b5886f55bc458d8260edf95ae6e1964a5d5423f9b0b46e07e02775 SHA512 56b1e93e9576fa412202e1940fcd8b7af57584714c15017bbcec1aa4fa7bba7a6fa5d1136048100d7cce3222f31b38837de1eae344b533164314c858cdf08ef9 -DIST miniupnpd-2.2.3.tar.gz.sig 543 BLAKE2B 3ba2e69cfd7e0a27a746f45e5eb10e573e00c4fc20a7d62b94a2e0b7e4e9ad8779d53df72e31547b78dc6e34676204a4848652e81d1e479a68973e150f51f468 SHA512 9f766f3e94de1fbd458c7bda30cc87892198af7544aa9dc0fa4c6b6a1c9434e4bab6f8583eeccf3ae613da240ad599d750425c507e8138d483710459f31a0b21 +DIST miniupnpd-2.3.5.tar.gz 261952 BLAKE2B 022ddbc495a2dbb500ab54a3c0569a16acf3726927eac42dc316b7251dd21e705be62e3d0bb2e159ff7a5a72078bae2c04bd279d0a97fe2bf378dc8c039089d8 SHA512 bbb82f1b94a68c1bbf65a2e188b39305ec265cb89d9c0f3ab2d3c72eee43ee33c7d6280161344a8d51828cba2e62e2e5f9a54b0c0089503dbed5cd3a154ff0ff +DIST miniupnpd-2.3.5.tar.gz.sig 543 BLAKE2B 17394e1da7d95c89771dd7578e4f1e2ce407c04b142f44fe4f110beff908797991553a7275c3ba28df03b09877963d16092cb718d4c75d96211db07226bcb176 SHA512 ef21f493da56b9f3fe99003ee299c08b13ddcf433d7136222817ff2e1c775bf7c28cbb47ef3ab60c662380e585c2be0ca4c38e261697de410f5a751c1f4fe2da +DIST miniupnpd-2.3.6.tar.gz 263018 BLAKE2B 9e3d6bfdbe71a09a15bf11c1a718b1388db991de52a2ec742aaec70128e4ac5147f441ccfa50e7077f09682ac724040343c4e351b4cc8c3d9e8efe04773651ec SHA512 41ed8d0afcfdba70ab5ec44a33ad4643b226bea2da972fc432035fd3ff3a790227a71c32ca47574558e36eb491b0f6ab7710d3ef0af5ac6a359d899dcb36893c +DIST miniupnpd-2.3.6.tar.gz.sig 543 BLAKE2B 5c5c3566a9dfd16d95ca70fa006f7ce7097aebfe76940c03c22047064d5dae92aed73062f2455f08b61a99a747f9615e72c06e178628d948532b987b40fb262f SHA512 312a9db9cbd74912294a7cc2d4ccc69634806fc58702083fda56e11ad1fd978e92ad71f217cadf5f4482e8e655df07e6d7cc52ae494b8167140ae4db74cd352d diff --git a/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch b/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch deleted file mode 100644 index 73e4a87903e8..000000000000 --- a/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/miniupnpd/testgetifaddr.sh b/miniupnpd/testgetifaddr.sh -index 7ad56d9..2a26a24 100755 ---- a/testgetifaddr.sh -+++ b/testgetifaddr.sh -@@ -12,7 +12,8 @@ case $OS in - *) - IP="`which ip`" || exit 1 - EXTIF="`LC_ALL=C $IP -4 route | grep 'default' | sed -e 's/.*dev[[:space:]]*//' -e 's/[[:space:]].*//'`" || exit 1 -- EXTIP="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/inet/ { print $2 }' | cut -d "/" -f 1`" -+ EXTIF="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/[0-9]+:/ { print $2; exit 0 }' | cut -d ":" -f 1`" -+ EXTIP="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/inet/ { print $2; exit 0 }' | cut -d "/" -f 1`" - ;; - esac - diff --git a/net-misc/miniupnpd/metadata.xml b/net-misc/miniupnpd/metadata.xml index 37183016068f..e1c5b875f102 100644 --- a/net-misc/miniupnpd/metadata.xml +++ b/net-misc/miniupnpd/metadata.xml @@ -17,4 +17,7 @@ <flag name="portinuse">Check if a port is in use before allowing a NAT-PMP client to map it.</flag> <flag name="strict">Be more strict regarding compliance with UPnP specifications.</flag> </use> + <upstream> + <remote-id type="github">miniupnp/miniupnp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.5.ebuild index 1042f0c2cb80..ef90208e7b6d 100644 --- a/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild +++ b/net-misc/miniupnpd/miniupnpd-2.3.5.ebuild @@ -1,19 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 + 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} +HOMEPAGE=" + http://miniupnp.free.fr/ + https://miniupnp.tuxfamily.org/ + https://github.com/miniupnp/miniupnp/ +" +SRC_URI=" + https://miniupnp.tuxfamily.org/files/${P}.tar.gz + verify-sig? ( + https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig + ) +" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict" RDEPEND=" @@ -21,7 +28,7 @@ RDEPEND=" sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( - >=net-firewall/iptables-1.4.6:0=[ipv6?] + >=net-firewall/iptables-1.4.6:0=[ipv6(+)?] net-libs/libnfnetlink:= net-libs/libmnl:= ) @@ -29,19 +36,20 @@ RDEPEND=" net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= - )" -DEPEND="${RDEPEND}" + ) +" +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" BDEPEND=" sys-apps/lsb-release - verify-sig? ( app-crypt/openpgp-keys-miniupnp )" + verify-sig? ( sec-keys/openpgp-keys-miniupnp ) +" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc src_prepare() { - local PATCHES=( - "${FILESDIR}"/${P}-testgetifaddr.patch - ) - default # fails without a default route diff --git a/net-misc/miniupnpd/miniupnpd-2.2.2.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.6.ebuild index b2d4b1534d14..ef90208e7b6d 100644 --- a/net-misc/miniupnpd/miniupnpd-2.2.2.ebuild +++ b/net-misc/miniupnpd/miniupnpd-2.3.6.ebuild @@ -1,20 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 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} +HOMEPAGE=" + http://miniupnp.free.fr/ + https://miniupnp.tuxfamily.org/ + https://github.com/miniupnp/miniupnp/ +" +SRC_URI=" + https://miniupnp.tuxfamily.org/files/${P}.tar.gz + verify-sig? ( + https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig + ) +" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict" RDEPEND=" @@ -22,7 +28,7 @@ RDEPEND=" sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( - >=net-firewall/iptables-1.4.6:0=[ipv6?] + >=net-firewall/iptables-1.4.6:0=[ipv6(+)?] net-libs/libnfnetlink:= net-libs/libmnl:= ) @@ -30,13 +36,25 @@ RDEPEND=" net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= - )" -DEPEND="${RDEPEND}" + ) +" +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" BDEPEND=" sys-apps/lsb-release - verify-sig? ( app-crypt/openpgp-keys-miniupnp )" + verify-sig? ( sec-keys/openpgp-keys-miniupnp ) +" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc + +src_prepare() { + default + + # fails without a default route + sed -i -e 's:EXTIF=.*:EXTIF=lo:' testgetifaddr.sh || die +} src_configure() { local opts=( @@ -62,6 +80,10 @@ src_compile() { emake CC="$(tc-getCC)" STRIP=true miniupnpd } +src_test() { + emake CC="$(tc-getCC)" check +} + src_install() { emake PREFIX="${ED}" STRIP=true install diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest index def868f02107..f1b9afdba657 100644 --- a/net-misc/mobile-broadband-provider-info/Manifest +++ b/net-misc/mobile-broadband-provider-info/Manifest @@ -1,2 +1 @@ -DIST mobile-broadband-provider-info-20201225.tar.xz 83052 BLAKE2B 53f37e1d5796350a9ddd1ecf7de491a365baa854d5021c45e9359ff51cd0e545867858ef172eeccf81f0df072b207c6dce8024ca805921b69f0c50d3febfcc0b SHA512 26064451f43494e4895b65912e3dd06a62ca8afbe3334f09ca8428c1812318f7dac4accbd1c3aa9e83fcc1ee177fb187cb6fe77fab56608abd28c5f5ec3499cd -DIST mobile-broadband-provider-info-20210805.tar.xz 83756 BLAKE2B c7872a4bbb9c0ed2a36c374210e57cdd6a1346772c7f1c06a273e753606f70fe5d911eb6b11c6779382e2fc8a7bfa99ce216522807c6be60ed1719d05b7b452b SHA512 d3166484792aa0d97d7a094ecac309062fa1bf07c50c5b9bcc827e45c0a4d005a1131a589af1ec9920f373346d9ccb27bea6c019bad39c633998c00df92a5356 +DIST mobile-broadband-provider-info-20230416.tar.xz 85884 BLAKE2B 51416cbd7e208eca14a5ddf023cad4a76495773794fed7955cfb346950614b1b6d6f9df7d24525c769c2742381eb9d8780575fe9d0bc0de333b17be3d53400d1 SHA512 fd6be1387284b31fa300fe59244a5d2d65c9851037f78b540d8d907c9bedd1ec24a8d23bf66403a30995ddb4791b7cb746952d9438c08c846906f6825c44dd9b diff --git a/net-misc/mobile-broadband-provider-info/metadata.xml b/net-misc/mobile-broadband-provider-info/metadata.xml index 7b343b06be8a..0d72c89211e0 100644 --- a/net-misc/mobile-broadband-provider-info/metadata.xml +++ b/net-misc/mobile-broadband-provider-info/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="gnome-gitlab">GNOME/mobile-broadband-provider-info</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild deleted file mode 100644 index 0da3e23ad4bb..000000000000 --- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org - -DESCRIPTION="Database of mobile broadband service providers" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband" - -LICENSE="CC-PD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-libs/libxslt - test? ( dev-libs/libxml2 ) -" - -DOCS=( README ) diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20230416.ebuild index 0da3e23ad4bb..74bcb1676cd4 100644 --- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild +++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20230416.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit gnome.org @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband" LICENSE="CC-PD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest index 8fe2293a97a1..6ae0b2c209c0 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -1,3 +1,2 @@ -DIST ModemManager-1.16.6.tar.xz 2339528 BLAKE2B b76a8b6959d988a27d411384440b9bd1b7ac1a9d780b77319e735c4b42c55c51f51304ae936aa9b385634640bcb1a55696d4bd25ffdaf88eb73839bfefe5e091 SHA512 78a928007732baaa0eaed9d587913774d4fb79049d652474f39176190496012dc4c93fd0bd774ed6f86f845f3b9f345bcccf4c7b2438b83cf5846b2bcdcb39d5 -DIST ModemManager-1.16.8.tar.xz 2344748 BLAKE2B 70ed052a7cd5561518577948419b0363816805d8a1af7de2874fa3dae795e38611d34733f5ed5dcfb12270421430249ee0a49bf54e4dcb87abe4ab595bd0b4c2 SHA512 be32ef03210035a93bad5ac0e339863c247cd000276e1bfa1acf584df652a78eda74990226a00a20e957481ce92801ed365b153de8f927a983cec41d3bbe3082 -DIST ModemManager-1.18.0.tar.xz 2493576 BLAKE2B 36034a589fb38447c83a232b6d24ca2fceed15ebc89a41af969bdcebeb482d4baf2657d063b1011c0df252b4ba7f703284cbf111b90d565d66157006331d6e69 SHA512 6e99e5529a74e6fdf814b4fcb9c9f5cd6a0398cd75303feee62c3564f9d62f54bb5a435a9847ed085fe2031af5a8d821d43f9cabed7d3be019ae0f5c8b0e11d2 +DIST ModemManager-1.18.12.tar.xz 2589020 BLAKE2B e82db0a62d29753e22b9f9c09e60d8f5dca070cbac27b6df54ff8cd166cbb837dca3b162ac06afea0e75abdc8d407253a28cee58dacd739d4b485fa9f5485acb SHA512 7ee3b091ca2350a1d52f1ff0c0657c9f279594ffbff5ea57be59ca024331cafbac34901ca9ed4ef2b71e8c51b594526f921d3aeee6e8748cd0532a16218c5d6c +DIST ModemManager-1.20.6.tar.bz2 1467367 BLAKE2B 6fc6e678fac966ccd6697e469152e3b0fa93d868d16985828e01b4890ba35beacc8f1c5a47a74bf8586035088c6f61124d12214d022e30dbc3b9196b0dd6f28e SHA512 2c5c121d6a74a7dc0922231a88ba64e350e947a57dae25ce7e8c58b6041b60fd5c4ff395e641beef3447b0239e1e60c15c2752e47e77a648a1bea9ef5f3ac577 diff --git a/net-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml index 44a1c20ee048..136f0f9354a1 100644 --- a/net-misc/modemmanager/metadata.xml +++ b/net-misc/modemmanager/metadata.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="mbim">Enable MBIM modem protocol</flag> - <flag name="qmi">Enable support for the QMI modem protocol used by - devices with Qualcomm chipsets</flag> - </use> + <maintainer type="project"> + <email>freedesktop-bugs@gentoo.org</email> + </maintainer> + <use> + <flag name="mbim">Enable MBIM modem protocol</flag> + <flag name="qmi">Enable support for the QMI modem protocol used by devices with Qualcomm chipsets</flag> + <flag name="qrtr">Enable support for the QMI over IPC Router bus (QRTR) protocol</flag> + </use> + <upstream> + <remote-id type="freedesktop-gitlab">mobile-broadband/ModemManager</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/modemmanager/modemmanager-1.16.6.ebuild b/net-misc/modemmanager/modemmanager-1.16.6.ebuild deleted file mode 100644 index d71786684b84..000000000000 --- a/net-misc/modemmanager/modemmanager-1.16.6.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" -SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" - -IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" -REQUIRED_USE=" - ?? ( elogind systemd ) - vala? ( introspection ) -" - -DEPEND=" - >=dev-libs/glib-2.48.0:2 - udev? ( >=dev-libs/libgudev-230:= ) - introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) - mbim? ( >=net-libs/libmbim-1.24.0 ) - policykit? ( >=sys-auth/polkit-0.106[introspection?] ) - qmi? ( >=net-libs/libqmi-1.28.6:= ) - elogind? ( sys-auth/elogind ) - systemd? ( >=sys-apps/systemd-209 ) -" -RDEPEND="${DEPEND} - policykit? ( acct-group/plugdev ) -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - >=dev-util/gtk-doc-am-1 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS=" - If your USB modem shows up only as a storage device when you plug it in, - then you should install sys-apps/usb_modeswitch, which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - local myconf=( - --disable-Werror - --disable-static - --with-dist-version=${PVR} - --with-udev-base-dir="$(get_udevdir)" - $(use_with udev) - $(use_enable introspection) - $(use_with mbim) - $(use_with policykit polkit) - $(use_with systemd systemd-journal) - $(use_with qmi) - $(use_enable vala) - ) - if use systemd || use elogind; then - myconf+=(--with-systemd-suspend-resume) - else - myconf+=(--without-systemd-suspend-resume) - fi - gnome2_src_configure "${myconf[@]}" -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc - - newinitd "${FILESDIR}/modemmanager.initd" modemmanager -} - -pkg_postinst() { - gnome2_pkg_postinst - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - if ! use udev; then - ewarn "You have built ModemManager without udev support. You may have to teach it" - ewarn "about your modem port manually." - fi - - systemd_reenable ModemManager.service - - readme.gentoo_print_elog -} diff --git a/net-misc/modemmanager/modemmanager-1.16.8.ebuild b/net-misc/modemmanager/modemmanager-1.16.8.ebuild deleted file mode 100644 index dce966984ad2..000000000000 --- a/net-misc/modemmanager/modemmanager-1.16.8.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" -SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" - -IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" -REQUIRED_USE=" - ?? ( elogind systemd ) - vala? ( introspection ) -" - -DEPEND=" - >=dev-libs/glib-2.48.0:2 - udev? ( >=dev-libs/libgudev-230:= ) - introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) - mbim? ( >=net-libs/libmbim-1.24.0 ) - policykit? ( >=sys-auth/polkit-0.106[introspection?] ) - qmi? ( >=net-libs/libqmi-1.28.6:= ) - elogind? ( sys-auth/elogind ) - systemd? ( >=sys-apps/systemd-209 ) -" -RDEPEND="${DEPEND} - policykit? ( acct-group/plugdev ) -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - >=dev-util/gtk-doc-am-1 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS=" - If your USB modem shows up only as a storage device when you plug it in, - then you should install sys-apps/usb_modeswitch, which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - local myconf=( - --disable-Werror - --disable-static - --with-dist-version=${PVR} - --with-udev-base-dir="$(get_udevdir)" - $(use_with udev) - $(use_enable introspection) - $(use_with mbim) - $(use_with policykit polkit) - $(use_with systemd systemd-journal) - $(use_with qmi) - $(use_enable vala) - ) - if use systemd || use elogind; then - myconf+=(--with-systemd-suspend-resume) - else - myconf+=(--without-systemd-suspend-resume) - fi - gnome2_src_configure "${myconf[@]}" -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - readme.gentoo_create_doc - - newinitd "${FILESDIR}/modemmanager.initd" modemmanager -} - -pkg_postinst() { - gnome2_pkg_postinst - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # Automatically delete the old rules.d file if the user did not change it - elog - elog "Removing old ${old_rules} ..." - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" - ;; - * ) - elog "The ${old_rules}" - elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - if ! use udev; then - ewarn "You have built ModemManager without udev support. You may have to teach it" - ewarn "about your modem port manually." - fi - - systemd_reenable ModemManager.service - - readme.gentoo_print_elog -} diff --git a/net-misc/modemmanager/modemmanager-1.18.0.ebuild b/net-misc/modemmanager/modemmanager-1.18.12.ebuild index 5797f597414a..fd1fb8540485 100644 --- a/net-misc/modemmanager/modemmanager-1.18.0.ebuild +++ b/net-misc/modemmanager/modemmanager-1.18.12.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VALA_USE_DEPEND="vapigen" - -inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala +EAPI=8 +PYTHON_COMPAT=( python3_{10..11} ) +inherit gnome2 python-any-r1 readme.gentoo-r1 systemd udev vala DESCRIPTION="Modem and mobile broadband management libraries" HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" @@ -12,13 +11,15 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta LICENSE="GPL-2+" SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" +IUSE="elogind +introspection mbim policykit +qmi +qrtr selinux systemd test +udev vala" REQUIRED_USE=" ?? ( elogind systemd ) + qrtr? ( qmi ) vala? ( introspection ) " +RESTRICT="!test? ( test )" DEPEND=" >=dev-libs/glib-2.56.0:2 @@ -26,24 +27,42 @@ DEPEND=" introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.26.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection?] ) - qmi? ( >=net-libs/libqmi-1.30.2:= ) + qmi? ( >=net-libs/libqmi-1.30.8:=[qrtr?] ) + qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) " RDEPEND="${DEPEND} policykit? ( acct-group/plugdev ) + selinux? ( sec-policy/selinux-modemmanager ) " BDEPEND=" dev-util/gdbus-codegen dev-util/glib-utils - >=dev-util/gtk-doc-am-1 + >=dev-build/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) vala? ( $(vala_depend) ) " S="${WORKDIR}/ModemManager-${PV}" +python_check_deps() { + python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_prepare() { DOC_CONTENTS=" If your USB modem shows up only as a storage device when you plug it in, @@ -55,7 +74,7 @@ src_prepare() { add your user account to the 'plugdev' group." fi - use vala && vala_src_prepare + use vala && vala_setup gnome2_src_prepare } @@ -71,7 +90,7 @@ src_configure() { $(use_with policykit polkit) $(use_with systemd systemd-journal) $(use_with qmi) - --without-qrtr # libqrtr-glib not packaged + $(use_with qrtr) $(use_enable vala) ) if use systemd || use elogind; then @@ -123,7 +142,13 @@ pkg_postinst() { ewarn "about your modem port manually." fi + use udev && udev_reload + systemd_reenable ModemManager.service readme.gentoo_print_elog } + +pkg_postrm() { + use udev && udev_reload +} diff --git a/net-misc/modemmanager/modemmanager-1.20.6.ebuild b/net-misc/modemmanager/modemmanager-1.20.6.ebuild new file mode 100644 index 000000000000..7673a36cdfef --- /dev/null +++ b/net-misc/modemmanager/modemmanager-1.20.6.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..12} ) +inherit bash-completion-r1 meson python-any-r1 optfeature systemd udev vala xdg + +DESCRIPTION="Modem and mobile broadband management libraries" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/ https://gitlab.freedesktop.org/mobile-broadband/ModemManager" +SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/${PV}/ModemManager-${PV}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" + +IUSE="elogind gtk-doc +introspection +mbim policykit +qmi +qrtr selinux systemd test +udev vala" +REQUIRED_USE=" + ?? ( elogind systemd ) + qrtr? ( qmi ) + vala? ( introspection ) +" +RESTRICT="!test? ( test )" + +DEPEND=" + >=dev-libs/glib-2.56.0:2 + udev? ( >=dev-libs/libgudev-232:= ) + introspection? ( >=dev-libs/gobject-introspection-1.38:= ) + mbim? ( >=net-libs/libmbim-1.28.0 ) + policykit? ( >=sys-auth/polkit-0.106[introspection?] ) + qmi? ( >=net-libs/libqmi-1.32.0:=[qrtr?] ) + qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) + elogind? ( sys-auth/elogind ) + systemd? ( >=sys-apps/systemd-209 ) +" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-modemmanager ) +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) + vala? ( $(vala_depend) ) +" + +S="${WORKDIR}/ModemManager-${PV}" + +python_check_deps() { + python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + use vala && vala_setup + default +} + +src_configure() { + # Let's avoid BuildRequiring bash-completion, install it manually + local emesonargs=( + -Dbash_completion=false + $(meson_use gtk-doc gtk_doc) + $(meson_use introspection) + + $(meson_use udev) + -Dudevdir="${EPREFIX}$(get_udevdir)" + -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" + + $(meson_use systemd systemd_journal) + + -Dpolkit=$(usex policykit permissive no) + + $(meson_use mbim) + $(meson_use qmi) + $(meson_use qrtr) + + $(meson_use vala vapi) + ) + if use systemd || use elogind; then + emesonargs+=(-Dsystemd_suspend_resume=true) + else + emesonargs+=(-Dsystemd_suspend_resume=false) + fi + meson_src_configure +} + +src_install() { + meson_src_install + newinitd "${FILESDIR}/modemmanager.initd" modemmanager + newbashcomp cli/mmcli-completion mmcli +} + +pkg_postinst() { + xdg_pkg_postinst + + if ! use udev; then + ewarn "You have built ModemManager without udev support. You may have to teach it" + ewarn "about your modem port manually." + fi + + use udev && udev_reload + + systemd_reenable ModemManager.service + + optfeature "the case your modem shows up as a storage drive" sys-apps/usb_modeswitch +} + +pkg_postrm() { + xdg_pkg_postrm + use udev && udev_reload +} diff --git a/net-misc/monmotha/Manifest b/net-misc/monmotha/Manifest deleted file mode 100644 index 44c8b1906d66..000000000000 --- a/net-misc/monmotha/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rc.firewall-2.3.8 56204 BLAKE2B d699d5eb2c7efdfe258a2f38e2ffc1bb1e568c260c90a77a0fd1d27fbbe5b08ecefcc99d798fd210133ff8f7943fddacfc06a754044434e7525cd6449a92dc46 SHA512 ccdd3427a274204c697a64a8936d4311cb34fbb66738c6afc4c242baad01407d1a36adac7a73b24b432943cd7cec05c9c1d9b2d4845b8b132bd61378c0c2e098 diff --git a/net-misc/monmotha/files/monmotha.rc6 b/net-misc/monmotha/files/monmotha.rc6 deleted file mode 100644 index 9bd0eeb8e2b1..000000000000 --- a/net-misc/monmotha/files/monmotha.rc6 +++ /dev/null @@ -1,40 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - ebegin "Starting the MonMotha Firewall" - /etc/monmotha/monmotha > /var/log/monmotha.log - eend $? -} - -stop() { - ebegin "Stopping the MonMotha Firewall" - - # RESET ALL IPTABLES STUFF - - /sbin/iptables -P INPUT ACCEPT - /sbin/iptables -P FORWARD ACCEPT - /sbin/iptables -P OUTPUT ACCEPT - - /sbin/iptables -t nat -P PREROUTING ACCEPT - /sbin/iptables -t nat -P POSTROUTING ACCEPT - /sbin/iptables -t nat -P OUTPUT ACCEPT - - /sbin/iptables -t mangle -P PREROUTING ACCEPT - /sbin/iptables -t mangle -P OUTPUT ACCEPT - - /sbin/iptables -F - /sbin/iptables -t nat -F - /sbin/iptables -t mangle -F - - /sbin/iptables -X - /sbin/iptables -t nat -X - /sbin/iptables -t mangle -X - - eend $? -} diff --git a/net-misc/monmotha/metadata.xml b/net-misc/monmotha/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/net-misc/monmotha/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-misc/monmotha/monmotha-2.3.8-r1.ebuild b/net-misc/monmotha/monmotha-2.3.8-r1.ebuild deleted file mode 100644 index 00c63fadd917..000000000000 --- a/net-misc/monmotha/monmotha-2.3.8-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="MonMotha IPTables-based firewall script" -HOMEPAGE="http://monmotha.mplug.org/firewall/" -LICENSE="GPL-2" - -KEYWORDS="~amd64 x86" -IUSE="" -SLOT="0" -RDEPEND=">=net-firewall/iptables-1.2.5" - -MY_PVP=(${PV//[-\._]/ }) - -S=${WORKDIR} - -SRC_URI="http://monmotha.mplug.org/~monmotha/firewall/firewall/${MY_PVP[0]}.${MY_PVP[1]}/rc.firewall-${PV}" - -src_unpack() { - cp "${DISTDIR}"/${A} "${S}"/ -} - -src_install() { - newinitd "${FILESDIR}/monmotha.rc6" monmotha - exeinto /etc/monmotha - newexe "${S}/rc.firewall-${PV}" monmotha -} - -pkg_postinst() { - einfo "Don't forget to add the 'monmotha' startup script to your default" - einfo "runlevel by typing the following command:" - einfo "" - einfo " rc-update add monmotha default" - einfo "" - einfo "You need to edit /etc/monmotha/monmotha before using" - einfo "it. Enter the right vars in the file, start the script" - einfo "by typing: '/etc/init.d/monmotha start' and it should work." - einfo "" - einfo "Don't forget to change the path to iptables!!!" - einfo "" - einfo "Note: If You are stopping the firewall, all iptables rulesets" - einfo "will be flushed!!!" - einfo "" -} diff --git a/net-misc/moonlight/Manifest b/net-misc/moonlight/Manifest new file mode 100644 index 000000000000..0456414d887d --- /dev/null +++ b/net-misc/moonlight/Manifest @@ -0,0 +1 @@ +DIST MoonlightSrc-5.0.1.tar.gz 79820559 BLAKE2B ae67db6aab9e2104021e35b5bc4822a57a3b82a03f6b2bd1cc95e356833f163e9f6f30afc082dc8d1e4b120ef9ef7aeca2f30eec88502773020e0a6b48cbf0b1 SHA512 618d67afd4638e6c051850fc68b68fd313c9334300e35370b0b3741ec51e30da212633954b7ea47cc1f0644f5005cc06ecf861349418512919453d576f9acd60 diff --git a/net-misc/moonlight/metadata.xml b/net-misc/moonlight/metadata.xml new file mode 100644 index 000000000000..69364f1304dd --- /dev/null +++ b/net-misc/moonlight/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + <upstream> + <remote-id type="github">moonlight-stream/moonlight-qt</remote-id> + </upstream> + <use> + <flag name="cuda">Enable accelerated video rendering on NVIDIA hardware</flag> + <flag name="embedded">Optimize UI for fullscreen non-desktop usage</flag> + <flag name="glslow">Prefer direct KMS/DRM rendering over EGL/GLES rendering for better performance on some weaker GPUs</flag> + <flag name="libdrm">Enable video rendering via <pkg>x11-libs/libdrm</pkg></flag> + <flag name="soundio">Enable sound output via <pkg>media-libs/libsoundio</pkg> instead of <pkg>media-libs/libsdl2</pkg></flag> + </use> +</pkgmetadata> diff --git a/net-misc/moonlight/moonlight-5.0.1-r3.ebuild b/net-misc/moonlight/moonlight-5.0.1-r3.ebuild new file mode 100644 index 000000000000..33e79bb06086 --- /dev/null +++ b/net-misc/moonlight/moonlight-5.0.1-r3.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/moonlight-stream/moonlight-qt.git" + EGIT_SUBMODULES=( '*' -libs -soundio ) + inherit git-r3 +else + SRC_URI="https://github.com/moonlight-stream/moonlight-qt/releases/download/v${PV}/MoonlightSrc-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm64" + S="${WORKDIR}" +fi + +inherit qmake-utils xdg + +DESCRIPTION="NVIDIA GameStream (and Sunshine) client" +HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt" +LICENSE="GPL-3" +SLOT="0" +IUSE="cuda +libdrm embedded glslow soundio +vaapi vdpau wayland X" + +RDEPEND=" + dev-libs/openssl:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-libs/libglvnd + media-libs/libpulse + media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video] + media-libs/opus + media-libs/sdl2-ttf + media-video/ffmpeg:=[cuda?,libdrm?] + libdrm? ( x11-libs/libdrm ) + soundio? ( media-libs/libsoundio:= ) + vaapi? ( media-libs/libva:=[wayland?,X?] ) + vdpau? ( + x11-libs/libvdpau + media-libs/libsdl2[X] + ) + wayland? ( dev-libs/wayland ) + X? ( x11-libs/libX11 ) +" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND=" + dev-qt/qtcore + virtual/pkgconfig +" + +src_prepare() { + default + + # Force system libsoundio over bundled version. + rm -r soundio/ || die +} + +src_configure() { + eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \ + $(usex cuda "" disable-cuda) \ + $(usex libdrm "" disable-libdrm) \ + --disable-mmal \ + $(usex vaapi "" disable-libva) \ + $(usex vdpau "" disable-libvdpau) \ + $(usex wayland "" disable-wayland) \ + $(usex X "" disable-x11) \ + $(usev embedded) \ + $(usev glslow) \ + $(usev soundio) \ + " +} + +src_install() { + emake install INSTALL_ROOT="${D}" + einstalldocs +} diff --git a/net-misc/moonlight/moonlight-9999.ebuild b/net-misc/moonlight/moonlight-9999.ebuild new file mode 100644 index 000000000000..33e79bb06086 --- /dev/null +++ b/net-misc/moonlight/moonlight-9999.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/moonlight-stream/moonlight-qt.git" + EGIT_SUBMODULES=( '*' -libs -soundio ) + inherit git-r3 +else + SRC_URI="https://github.com/moonlight-stream/moonlight-qt/releases/download/v${PV}/MoonlightSrc-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm64" + S="${WORKDIR}" +fi + +inherit qmake-utils xdg + +DESCRIPTION="NVIDIA GameStream (and Sunshine) client" +HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt" +LICENSE="GPL-3" +SLOT="0" +IUSE="cuda +libdrm embedded glslow soundio +vaapi vdpau wayland X" + +RDEPEND=" + dev-libs/openssl:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-libs/libglvnd + media-libs/libpulse + media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video] + media-libs/opus + media-libs/sdl2-ttf + media-video/ffmpeg:=[cuda?,libdrm?] + libdrm? ( x11-libs/libdrm ) + soundio? ( media-libs/libsoundio:= ) + vaapi? ( media-libs/libva:=[wayland?,X?] ) + vdpau? ( + x11-libs/libvdpau + media-libs/libsdl2[X] + ) + wayland? ( dev-libs/wayland ) + X? ( x11-libs/libX11 ) +" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND=" + dev-qt/qtcore + virtual/pkgconfig +" + +src_prepare() { + default + + # Force system libsoundio over bundled version. + rm -r soundio/ || die +} + +src_configure() { + eqmake5 PREFIX="${EPREFIX}/usr" CONFIG+=" \ + $(usex cuda "" disable-cuda) \ + $(usex libdrm "" disable-libdrm) \ + --disable-mmal \ + $(usex vaapi "" disable-libva) \ + $(usex vdpau "" disable-libvdpau) \ + $(usex wayland "" disable-wayland) \ + $(usex X "" disable-x11) \ + $(usev embedded) \ + $(usev glslow) \ + $(usev soundio) \ + " +} + +src_install() { + emake install INSTALL_ROOT="${D}" + einstalldocs +} diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest index 528cca3c4325..7bf67a1c1125 100644 --- a/net-misc/mosh/Manifest +++ b/net-misc/mosh/Manifest @@ -1 +1,2 @@ DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769 +DIST mosh-1.4.0.tar.gz 393465 BLAKE2B 076b70742292dfd012aff70cc7d76eb6568ddd92600ce3f834dfdcb5064526dd3744e1672dd9fd5f172c70f501a6114b016aa8c8256a8168d2ae0a75dd8e7344 SHA512 38c11f52ff1e42965b50a22bf6de80b0fa8ebbff841d825e760abf69c788a2bf5f34e6f7fc047574d595118334eef9edf8da5520b52cdde3ac1a79d7ad70312e diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml index a4282e889985..e0225c57d770 100644 --- a/net-misc/mosh/metadata.xml +++ b/net-misc/mosh/metadata.xml @@ -9,8 +9,9 @@ <flag name="client">Build network client</flag> <flag name="examples">Include example scripts</flag> <flag name="mosh-hardening">Enable compiler and linker options to frustrate memory corruption exploits</flag> + <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for some cryptographic functions instead of <pkg>dev-libs/openssl</pkg>. With Nettle, some of mosh's own code is used for OCB.</flag> <flag name="server">Build network server</flag> - <flag name="ufw">Install net-firewall/ufw rule set</flag> + <flag name="ufw">Install <pkg>net-firewall/ufw</pkg> rule set</flag> <flag name="utempter">Include libutempter support</flag> </use> <longdescription> @@ -20,6 +21,7 @@ - intelligent local echo and line editing to reduce the effects of "network lag" on high-latency connections. </longdescription> <upstream> - <bugs-to>https://github.com/keithw/mosh/issues</bugs-to> + <bugs-to>https://github.com/mobile-shell/mosh/issues</bugs-to> + <remote-id type="github">mobile-shell/mosh</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/mosh/mosh-1.3.2-r2.ebuild b/net-misc/mosh/mosh-1.3.2-r3.ebuild index 710a8c1fe272..3cda6f2836f5 100644 --- a/net-misc/mosh/mosh-1.3.2-r2.ebuild +++ b/net-misc/mosh/mosh-1.3.2-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools bash-completion-r1 +inherit autotools bash-completion-r1 flag-o-matic DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" HOMEPAGE="https://mosh.org" @@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+client examples +mosh-hardening +server ufw +utempter" REQUIRED_USE=" @@ -19,14 +19,15 @@ REQUIRED_USE=" examples? ( client )" RDEPEND=" - dev-libs/protobuf:0= - sys-libs/ncurses:0= + dev-libs/protobuf:= + sys-libs/ncurses:= + sys-libs/zlib virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) - dev-libs/openssl:0= + dev-libs/openssl:= utempter? ( sys-libs/libutempter )" @@ -48,6 +49,9 @@ src_prepare() { } src_configure() { + # protobuf needs >=c++14 + append-cxxflags -std=gnu++14 + econf \ --disable-completion \ $(use_enable client) \ diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild deleted file mode 100644 index 81f05b43d28b..000000000000 --- a/net-misc/mosh/mosh-1.3.2.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 autotools bash-completion-r1 - -DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" -HOMEPAGE="https://mosh.org" -SRC_URI="https://mosh.org/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="+client examples +mosh-hardening +server ufw +utempter" - -REQUIRED_USE=" - || ( client server ) - examples? ( client )" - -RDEPEND=" - dev-libs/protobuf:0= - sys-libs/ncurses:0= - virtual/ssh - client? ( - dev-lang/perl - dev-perl/IO-Tty - ) - dev-libs/openssl:0= - utempter? ( - sys-libs/libutempter - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -# [0] - avoid sandbox-violation calling git describe in Makefile. -PATCHES=( - "${FILESDIR}"/${PN}-1.2.5-git-version.patch -) - -src_prepare() { - MAKEOPTS+=" V=1" - default - - eautoreconf -} - -src_configure() { - econf \ - --disable-completion \ - $(use_enable client) \ - $(use_enable server) \ - $(use_enable examples) \ - $(use_enable ufw) \ - $(use_enable mosh-hardening hardening) \ - $(use_with utempter) -} - -src_install() { - default - - for myprog in $(find src/examples -type f -perm /0111) ; do - newbin ${myprog} ${PN}-$(basename ${myprog}) - elog "${myprog} installed as ${PN}-$(basename ${myprog})" - done - - # bug 477384 - dobashcomp conf/bash-completion/completions/mosh -} diff --git a/net-misc/mosh/mosh-1.4.0.ebuild b/net-misc/mosh/mosh-1.4.0.ebuild new file mode 100644 index 000000000000..123086e09347 --- /dev/null +++ b/net-misc/mosh/mosh-1.4.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools bash-completion-r1 flag-o-matic + +MY_P=${PN}-${PV/_rc/rc} +DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" +HOMEPAGE="https://mosh.org" +#SRC_URI="https://mosh.org/${P}.tar.gz" +SRC_URI="https://github.com/mobile-shell/mosh/releases/download/${MY_P}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-3" +SLOT="0" +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +fi +IUSE="+client examples +hardened nettle +server syslog ufw +utempter" + +REQUIRED_USE=" + || ( client server ) + examples? ( client )" + +RDEPEND=" + dev-libs/protobuf:= + sys-libs/ncurses:= + sys-libs/zlib + virtual/ssh + client? ( + dev-lang/perl + dev-perl/IO-Tty + ) + !nettle? ( dev-libs/openssl:= ) + nettle? ( dev-libs/nettle:= ) + utempter? ( + sys-libs/libutempter + )" + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +QA_CONFIGURE_OPTIONS="--disable-static" + +# [0] - avoid sandbox-violation calling git describe in Makefile. +PATCHES=( + "${FILESDIR}"/${PN}-1.2.5-git-version.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + MAKEOPTS+=" V=1" + + # protobuf needs >=c++14 + append-cxxflags -std=gnu++14 + + local myeconfargs=( + # We install it ourselves in src_install + --disable-completion + + $(use_enable client) + $(use_enable server) + $(use_enable examples) + $(use_enable hardened hardening) + $(use_enable ufw) + $(use_enable syslog) + $(use_with utempter) + + # We default to OpenSSL as upstream do + --with-crypto-library=$(usex nettle nettle openssl-with-openssl-ocb) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + for myprog in $(find src/examples -type f -perm /0111) ; do + newbin ${myprog} ${PN}-$(basename ${myprog}) + elog "${myprog} installed as ${PN}-$(basename ${myprog})" + done + + # bug #477384 + dobashcomp conf/bash-completion/completions/mosh +} diff --git a/net-misc/mptcpd/Manifest b/net-misc/mptcpd/Manifest new file mode 100644 index 000000000000..9e3a3c34ad03 --- /dev/null +++ b/net-misc/mptcpd/Manifest @@ -0,0 +1 @@ +DIST mptcpd-0.12.tar.gz 690687 BLAKE2B 35c0b66268a04312f1d174348c40abc81d95f190860672740f4dd9ab472f1ecb4a6604b65a4ecf5084c9b98c1c1d50b3b0a7d5a714fa7e5568200a90909eb088 SHA512 313ce6f3905192fc614d419d498bfd814632730a50e3119039f076b4cec32360424f237a18cfec8c80a52ea6555a6e21949669ccb85e3178bd83748a2de66f73 diff --git a/net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch b/net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch new file mode 100644 index 000000000000..7e3357c8e361 --- /dev/null +++ b/net-misc/mptcpd/files/mptcpd-0.9-no-werror.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/832563 +--- a/configure.ac ++++ b/configure.ac +@@ -31,7 +31,7 @@ dnl Support "--enable-debug=..." configure script command line option. + AX_IS_RELEASE([git-directory]) + AX_CHECK_ENABLE_DEBUG([yes]) + +-AM_INIT_AUTOMAKE([1.15 -Wall -Werror -Wno-portability silent-rules std-options check-news]) ++AM_INIT_AUTOMAKE([1.15 -Wall -Wno-portability silent-rules std-options check-news]) + AM_SILENT_RULES([yes]) + LT_INIT([disable-static]) + +@@ -301,7 +301,7 @@ LIBS=$mptcpd_save_libs + # warning free. + # --------------------------------------------------------------- + AX_CFLAGS_WARN_ALL([CFLAGS]) +-AX_APPEND_COMPILE_FLAGS([-Wextra -Werror -pedantic]) ++AX_APPEND_COMPILE_FLAGS([-Wextra -pedantic]) + + # --------------------------------------------------------------- + # Enable compile-time defense diff --git a/net-misc/ssh-chain/metadata.xml b/net-misc/mptcpd/metadata.xml index 1a309aa03ee0..ed0b180f23fb 100644 --- a/net-misc/ssh-chain/metadata.xml +++ b/net-misc/mptcpd/metadata.xml @@ -2,10 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>junghans@gentoo.org</email> - <name>Christoph Junghans</name> + <email>candrews@gentoo.org</email> + <name>Craig Andrews</name> </maintainer> <upstream> - <remote-id type="github">ryancdotorg/ssh-chain</remote-id> + <remote-id type="github">intel/mptcpd</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/mptcpd/mptcpd-0.12.ebuild b/net-misc/mptcpd/mptcpd-0.12.ebuild new file mode 100644 index 000000000000..2e3281cc8262 --- /dev/null +++ b/net-misc/mptcpd/mptcpd-0.12.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info systemd + +DESCRIPTION="Daemon that performs multipath TCP path management related operations." +HOMEPAGE="https://github.com/intel/mptcpd/" + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="debug doc" + +RDEPEND=" + >=dev-libs/ell-0.45.0 + elibc_musl? ( sys-libs/argp-standalone ) + " +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-5.6 + " +BDEPEND=" + doc? ( + app-text/doxygen + virtual/pandoc + ) + virtual/pkgconfig + " + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/intel/mptcpd.git" +else + SRC_URI="https://github.com/intel/mptcpd/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~amd64" +fi + +CONFIG_CHECK="MPTCP" + +PATCHES=( + "${FILESDIR}"/${PN}-0.9-no-werror.patch +) + +src_prepare() { + default + + # For Werror patch + eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-kernel=upstream + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable debug) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake + use doc && emake doxygen-doc +} + +src_test() { + emake check +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-misc/mptcpd/mptcpd-9999.ebuild b/net-misc/mptcpd/mptcpd-9999.ebuild new file mode 100644 index 000000000000..2e3281cc8262 --- /dev/null +++ b/net-misc/mptcpd/mptcpd-9999.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info systemd + +DESCRIPTION="Daemon that performs multipath TCP path management related operations." +HOMEPAGE="https://github.com/intel/mptcpd/" + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="debug doc" + +RDEPEND=" + >=dev-libs/ell-0.45.0 + elibc_musl? ( sys-libs/argp-standalone ) + " +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-5.6 + " +BDEPEND=" + doc? ( + app-text/doxygen + virtual/pandoc + ) + virtual/pkgconfig + " + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/intel/mptcpd.git" +else + SRC_URI="https://github.com/intel/mptcpd/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="~amd64" +fi + +CONFIG_CHECK="MPTCP" + +PATCHES=( + "${FILESDIR}"/${PN}-0.9-no-werror.patch +) + +src_prepare() { + default + + # For Werror patch + eautoreconf +} + +src_configure() { + local myeconfargs=( + --with-kernel=upstream + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable debug) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake + use doc && emake doxygen-doc +} + +src_test() { + emake check +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest index abc51b81e77e..77778566e09f 100644 --- a/net-misc/mrouted/Manifest +++ b/net-misc/mrouted/Manifest @@ -1,3 +1,3 @@ DIST mrouted-4.2.tar.gz 292640 BLAKE2B 5d356c7c0132e2dc74e360c5a1761b6e39bcdfcb5306dcd7a8a35f5658139bdd74d92587b7fea248092bd4947b5119987bdf4066676c08c6baa849c1845f905b SHA512 88de66f24210bcf9d8e9ab0d38171c64c7dae2981fb2f81a54be2b08bbe26ff9b26ad5a7ec0fd4d67c2dad00a6df608aa7c1536c897bbc98f6bf223766924131 -DIST mrouted-4.3.tar.gz 327278 BLAKE2B 3f9182f90170868c0c770cb07ac8d6cfb5a8dce305a9b5e3bb9881e238cbdb246389225fb1524a0765a4c2725402546e07945a406edd78c5c6dd3272a16f263d SHA512 c471e95f5ce6ff017d269ab3005741ecbf1c41931da07f584bf9e28799c3cbbeeb57d8c517dd2fa342b63a460fb4df8f7f7db53312480059509a9d64b5e765b6 DIST mrouted-4.4.tar.gz 316949 BLAKE2B c768f78588ef5a321b33a6444627db0eae36dfd1798f58672392729e0ce45392fbcaad074e55eccef43dcda5d29cfee24f30aa85eded130ad8d1a6a006e62411 SHA512 cadd4cb15674c04bd976daad36ac38ec93eb9d6d0e2888cb7b4b73d2802f58beb11c122de34c1c5214a58f74dc832f35bff0820265370f4636036813ff283c09 +DIST mrouted-4.5.tar.gz 322493 BLAKE2B 1c4702d41f7bb9b6bd39cf718f28714555987b5837a858c6bb7697ad85f7a8b090bcee87d6997eecce728f3f645ac6ed41edd6bcd762b07ef92c52551ea11fba SHA512 145decbd1fba826196f719a7712bb9568080b2b5757eb80f79185537cd045ca1def36e34e93804ecaaa815607f43b58fc768b307098d90ac808ed5717a0c58d7 diff --git a/net-misc/mrouted/mrouted-4.2.ebuild b/net-misc/mrouted/mrouted-4.2.ebuild index 8db1215d3f2f..06524f6c9e2a 100644 --- a/net-misc/mrouted/mrouted-4.2.ebuild +++ b/net-misc/mrouted/mrouted-4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc x86" IUSE="rsrr" BDEPEND=" - || ( dev-util/yacc sys-devel/bison ) + || ( dev-util/yacc app-alternatives/yacc ) virtual/pkgconfig " diff --git a/net-misc/mrouted/mrouted-4.4.ebuild b/net-misc/mrouted/mrouted-4.4.ebuild index 97fd56dd2d0c..a791712320b0 100644 --- a/net-misc/mrouted/mrouted-4.4.ebuild +++ b/net-misc/mrouted/mrouted-4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,14 +11,14 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="Stanford GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="rsrr test" # Needs unshare RESTRICT="!test? ( test ) test" BDEPEND="virtual/pkgconfig - virtual/yacc" + app-alternatives/yacc" src_configure() { tc-export CC CXX diff --git a/net-misc/mrouted/mrouted-4.3.ebuild b/net-misc/mrouted/mrouted-4.5.ebuild index f46a82c1fafe..82e719972457 100644 --- a/net-misc/mrouted/mrouted-4.3.ebuild +++ b/net-misc/mrouted/mrouted-4.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs systemd @@ -11,16 +11,23 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="Stanford GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="rsrr" +KEYWORDS="amd64 ppc x86" +IUSE="rsrr test" -BDEPEND="virtual/pkgconfig - virtual/yacc" +# Needs unshare +RESTRICT="!test? ( test ) test" + +BDEPEND=" + app-alternatives/yacc + virtual/pkgconfig +" src_configure() { tc-export CC CXX - econf $(usex rsrr --enable-rsrr '') + econf \ + $(usev rsrr --enable-rsrr) \ + $(use_enable test) } src_compile() { diff --git a/net-misc/mstpd/mstpd-0.1.0.ebuild b/net-misc/mstpd/mstpd-0.1.0.ebuild index c8603cd165e9..48bf1c38f924 100644 --- a/net-misc/mstpd/mstpd-0.1.0.ebuild +++ b/net-misc/mstpd/mstpd-0.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mstpd/mstpd/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 arm arm64 x86" src_prepare() { default diff --git a/net-misc/mulk/mulk-0.7.0-r1.ebuild b/net-misc/mulk/mulk-0.7.0-r1.ebuild index 5c73349451a6..39a38b8fca99 100644 --- a/net-misc/mulk/mulk-0.7.0-r1.ebuild +++ b/net-misc/mulk/mulk-0.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="Download agent similar to wget/curl" HOMEPAGE="http://mulk.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" diff --git a/net-misc/nat-traverse/metadata.xml b/net-misc/nat-traverse/metadata.xml index 3ffeec365a2e..9e1732ec1584 100644 --- a/net-misc/nat-traverse/metadata.xml +++ b/net-misc/nat-traverse/metadata.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">linide</remote-id> + <remote-id type="gitlab">iblech/nat-traverse</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/ncman/metadata.xml b/net-misc/ncman/metadata.xml index da20bb112a7c..f38113d761f5 100644 --- a/net-misc/ncman/metadata.xml +++ b/net-misc/ncman/metadata.xml @@ -5,4 +5,7 @@ <email>bkohler@gentoo.org</email> <name>Ben Kohler</name> </maintainer> +<upstream> + <remote-id type="github">l4rzy/ncman</remote-id> +</upstream> </pkgmetadata> diff --git a/net-misc/ncp/metadata.xml b/net-misc/ncp/metadata.xml index 5412e44936d4..a02990a673ff 100644 --- a/net-misc/ncp/metadata.xml +++ b/net-misc/ncp/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>mmk@levelnine.at</email> - <name>Michael Mair-Keimberger</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> "ncp" is a utility for copying files in a LAN. It has absolutely no security or integrity checking, no throttling, no features, except one: you don't have to type the coordinates of your peer. </longdescription> diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest index ff3b2aa21626..2af7f0260b23 100644 --- a/net-misc/ndisc6/Manifest +++ b/net-misc/ndisc6/Manifest @@ -1 +1,2 @@ -DIST ndisc6-1.0.5.tar.bz2 263243 BLAKE2B 638e47e2bb1671a0bdd53edafd65acc774f068442dd6ade398e8bcae5630353f64b753b04237443aa6a6ea27de36206359e93e308fe5e610a4133ed730d71dd1 SHA512 d2742fee8202da988fd6d2b4b811125a4ab786b645b96b3a1fcfe248a3d9a39706055cf499c6cc742decfa5c3dbcbaac28ae01a50b9ad3ec10906dd468fec47e +DIST ndisc6-1.0.7.tar.bz2 262144 BLAKE2B 6eeb4d8b78e189f1c2db26312b67d8a9ed4343fad0c9db08bfc8e7d4514f50b1b11c6ee5f784cc0480979758a0fae840e87b61bbbdf4c372fe58117cb8dfdab4 SHA512 cd3da7efc050b9f71a0d41336367c21936b37a2a040b58f01ccd5657a4cbd791b974bcd32e0725b325d9322974b0e721af9a6d9ef4693506e437c29a15d81526 +DIST ndisc6-1.0.8.tar.bz2 262355 BLAKE2B f2be7c6027358698ed271670e319fd4c3e89af742c540ddf8b8a430857506fb500ec0d3bbb977e15470c4d7a4a9d5640a09a235d9f9fdf1d5f509490ed30687e SHA512 74a8b0058f9171f1098513891fc1ed890ec43f89195eb501af0e38a67f6e849e44ff7158acf8a6d2eb87c49a00daabf0c3a550e724c1c1afecc2437a35621cc0 diff --git a/net-misc/ndisc6/files/rdnssd.rc b/net-misc/ndisc6/files/rdnssd.rc deleted file mode 100644 index 3b8d64cd035d..000000000000 --- a/net-misc/ndisc6/files/rdnssd.rc +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - before net - use logger -} - -start() { - ebegin "Starting rdnssd" - start-stop-daemon --start --quiet --exec /usr/sbin/rdnssd -- ${RDNSSD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping rdnssd" - start-stop-daemon --stop --quiet --pidfile /var/run/rdnssd.pid - if [ -x /sbin/resolvconf ]; then - /sbin/resolvconf -f -d rdnssd || true - fi - eend $? -} diff --git a/net-misc/ndisc6/files/rdnssd.rc-1 b/net-misc/ndisc6/files/rdnssd.rc-1 deleted file mode 100644 index 83aef06a0416..000000000000 --- a/net-misc/ndisc6/files/rdnssd.rc-1 +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - before net - use logger -} - -start() { - ebegin "Starting rdnssd" - start-stop-daemon --start --quiet --exec /usr/sbin/rdnssd -- ${RDNSSD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping rdnssd" - start-stop-daemon --stop --quiet --pidfile /var/lib/run/rdnssd.pid - if [ -x /sbin/resolvconf ]; then - /sbin/resolvconf -f -d rdnssd || true - fi - eend $? -} diff --git a/net-misc/ndisc6/files/rdnssd.rc-2 b/net-misc/ndisc6/files/rdnssd.rc-2 new file mode 100644 index 000000000000..a3a2a45a2d1f --- /dev/null +++ b/net-misc/ndisc6/files/rdnssd.rc-2 @@ -0,0 +1,24 @@ +#!/sbin/openrc-run +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need localmount + before net + use logger +} + +command="rdnssd" +pidfile="/var/run/rdnssd.pid" +command_args="${RDNSSD_OPTS}" +command_args_foreground="-f" + +start_pre() { + checkpath -d -o nobody /var/run/rdnssd +} + +stop_post() { + if command -v resolvconf >/dev/null; then + resolvconf -f -d rdnssd + fi +} diff --git a/net-misc/ndisc6/files/resolvconf b/net-misc/ndisc6/files/resolvconf deleted file mode 100644 index 335c6c2707df..000000000000 --- a/net-misc/ndisc6/files/resolvconf +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -x /sbin/resolvconf ]; then - exec /sbin/resolvconf -a rdnssd </var/run/rdnssd/resolv.conf -else - exec "`dirname "$0"`"/merge-hook -fi diff --git a/net-misc/ndisc6/files/resolvconf-1 b/net-misc/ndisc6/files/resolvconf-1 deleted file mode 100644 index c08aa6a3df19..000000000000 --- a/net-misc/ndisc6/files/resolvconf-1 +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -x /sbin/resolvconf ]; then - exec /sbin/resolvconf -a rdnssd </var/lib/run/rdnssd/resolv.conf -else - exec "`dirname "$0"`"/merge-hook -fi diff --git a/net-misc/ndisc6/files/resolvconf-2 b/net-misc/ndisc6/files/resolvconf-2 new file mode 100644 index 000000000000..79d69c60e7ad --- /dev/null +++ b/net-misc/ndisc6/files/resolvconf-2 @@ -0,0 +1,7 @@ +#!/bin/sh + +if command -v resolvconf >/dev/null; then + exec resolvconf -a rdnssd </var/run/rdnssd/resolv.conf +else + exec "$(dirname "$0")"/merge-hook +fi diff --git a/net-misc/ndisc6/ndisc6-1.0.5.ebuild b/net-misc/ndisc6/ndisc6-1.0.7.ebuild index 19faf911e8ef..4f0384e87ae2 100644 --- a/net-misc/ndisc6/ndisc6-1.0.5.ebuild +++ b/net-misc/ndisc6/ndisc6-1.0.7.ebuild @@ -1,33 +1,36 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6" +DESCRIPTION="IPv6 diagnostic tools" HOMEPAGE="https://www.remlab.net/ndisc6/" SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm arm64 x86 ~x64-macos" +KEYWORDS="amd64 arm arm64 ~loong ~riscv x86 ~x64-macos" IUSE="debug" BDEPEND="dev-lang/perl sys-devel/gettext" src_configure() { - econf $(use_enable debug assert) + local args=( + --localstatedir="${EPREFIX}"/var + $(use_enable debug assert) + ) + econf "${args[@]}" } src_install() { emake DESTDIR="${D}" install + rm -r "${ED}/var" || die - newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd + newinitd "${FILESDIR}"/rdnssd.rc-2 rdnssd newconfd "${FILESDIR}"/rdnssd.conf rdnssd exeinto /etc/rdnssd - newexe "${FILESDIR}"/resolvconf-1 resolvconf + newexe "${FILESDIR}"/resolvconf-2 resolvconf dodoc AUTHORS ChangeLog NEWS README - - keepdir /var/lib/run/rdnssd } diff --git a/net-misc/ndisc6/ndisc6-1.0.8.ebuild b/net-misc/ndisc6/ndisc6-1.0.8.ebuild new file mode 100644 index 000000000000..4718530be728 --- /dev/null +++ b/net-misc/ndisc6/ndisc6-1.0.8.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="IPv6 diagnostic tools" +HOMEPAGE="https://www.remlab.net/ndisc6/" +SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~x64-macos" +IUSE="debug" + +BDEPEND=" + dev-lang/perl + sys-devel/gettext +" + +src_configure() { + local args=( + --localstatedir="${EPREFIX}"/var + $(use_enable debug assert) + ) + econf "${args[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + rm -r "${ED}/var" || die + + newinitd "${FILESDIR}"/rdnssd.rc-2 rdnssd + newconfd "${FILESDIR}"/rdnssd.conf rdnssd + + exeinto /etc/rdnssd + newexe "${FILESDIR}"/resolvconf-2 resolvconf + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/net-misc/ndppd/ndppd-0.2.5.ebuild b/net-misc/ndppd/ndppd-0.2.5-r1.ebuild index 3957e91d0229..a29806e1fa68 100644 --- a/net-misc/ndppd/ndppd-0.2.5.ebuild +++ b/net-misc/ndppd/ndppd-0.2.5-r1.ebuild @@ -1,22 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Proxies NDP messages between interfaces" HOMEPAGE="https://github.com/DanielAdolfsson/ndppd" SRC_URI="https://github.com/DanielAdolfsson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" src_install() { - emake PREFIX=/usr DESTDIR="${D}" install + dosbin ${PN} + doman ${PN}.{1,conf.5} insinto /etc newins ndppd.conf-dist ndppd.conf newinitd "${FILESDIR}"/ndppd.initd ndppd diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest index ed93deb0fd10..c078d92f5977 100644 --- a/net-misc/nemesis/Manifest +++ b/net-misc/nemesis/Manifest @@ -1 +1,2 @@ DIST nemesis-1.7.tar.gz 93423 BLAKE2B d46d19ae46852ea5a5f745b719779f3e4fbd77b918c8f53eaf743beb53d3ee345fa1663350d98095519481e819c5174fbe41b356da643b0aff9a2d5825494436 SHA512 6085cb91535c895325ca04e7583b29df9073731d8bee1d48ef46d09d25042d5220a73b2d02d77b4101de649877c0a2d0f4af5c06f125389fbd97c7350449134b +DIST nemesis-1.8.tar.gz 94428 BLAKE2B 6e0935aa23fcb11778d395a8d4318d9d9361afcbd0a2d9eea8ab4f78542e940eda51dd3a00d03c5d3c6c27158346e27a4b997e4bc4194cf82262c87655bd4fb4 SHA512 9f7876f1163c33ddfa0aa9531ef1b366e018d343eede6cf56260d8aa329486f98e9b6fceca5cc08f5293fd693a64dce8c9bfb29fc466abfbafb4dd7dffdb43c2 diff --git a/net-misc/nemesis/metadata.xml b/net-misc/nemesis/metadata.xml index 6c436d20234d..a2716185e579 100644 --- a/net-misc/nemesis/metadata.xml +++ b/net-misc/nemesis/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + </maintainer> <upstream> <remote-id type="sourceforge">nemesis</remote-id> + <remote-id type="github">libnet/nemesis</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/nemesis/nemesis-1.8.ebuild b/net-misc/nemesis/nemesis-1.8.ebuild new file mode 100644 index 000000000000..34fb4277a9dd --- /dev/null +++ b/net-misc/nemesis/nemesis-1.8.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux" +HOMEPAGE="https://github.com/libnet/nemesis" +SRC_URI="https://github.com/libnet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 sparc x86" + +RDEPEND=" + net-libs/libnet:1.1 +" +DEPEND="${RDEPEND}" + +DOCS=( ChangeLog.md docs/CONTRIBUTING.md docs/CREDITS README.md ) + +src_prepare() { + default + eautoreconf +} diff --git a/net-misc/netdate/netdate-1.2-r1.ebuild b/net-misc/netdate/netdate-1.2-r2.ebuild index 8af8c8914d72..acfba2862f1c 100644 --- a/net-misc/netdate/netdate-1.2-r1.ebuild +++ b/net-misc/netdate/netdate-1.2-r2.ebuild @@ -1,20 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -DESCRIPTION="utility to synchronize the time with ntp-servers" +inherit toolchain-funcs + +DESCRIPTION="Utility to set date and time by ARPA Internet RFC 868" HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/" SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2" +S="${WORKDIR}/${PN}" LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 arm ~mips ~s390 sparc x86" -S="${WORKDIR}/${PN}" - DOCS=( README ) +src_compile(){ + emake CC="$(tc-getCC)" +} + src_install() { dobin "${PN}" doman "${PN}.8" diff --git a/net-misc/netevent/Manifest b/net-misc/netevent/Manifest index c45c148cba3d..b0334a79634a 100644 --- a/net-misc/netevent/Manifest +++ b/net-misc/netevent/Manifest @@ -1 +1 @@ -DIST netevent-2.0_p20200217.tar.gz 39237 BLAKE2B 543456de89c6c57c7fe086d6697ca687ce0a04fce67efda7162e516eb1dca3f31b6ce31e1f5d7481fe538364f9f597103e3b77f3864c41456c6fe9080bfb424a SHA512 921982c8d9153e627c7931059e6163213ba2ac907f4ae98bcde62645e774cc41077ee728b698f3fad6a639fda19f99f9e43103006abe645f1a4ac4d68cf393c7 +DIST netevent-2.2.2.tar.gz 40889 BLAKE2B a52a6b352d8f842aeb85f7c4d82ed1c5008966893ec7bc3236d212b988470a051d0c5d6dca1f36029b3a83c4c908cd7d64e5cd0203b0677857dd66613a0f2c5a SHA512 bd993529d69b18a1774042f61fe891fedba96d2d630dbe066c9d9b88d18268eaad49062c76f688712a927e495f29e7b176da64676c6ef6109b2e92117ef00e1b diff --git a/net-misc/netevent/netevent-2.0_p20200217.ebuild b/net-misc/netevent/netevent-2.2.2.ebuild index 40a7e879dc5d..c882e035e5cd 100644 --- a/net-misc/netevent/netevent-2.0_p20200217.ebuild +++ b/net-misc/netevent/netevent-2.2.2.ebuild @@ -1,30 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs -COMMIT="c2066fa55db6f51090e00a240889d2f0cbd0ab4d" DESCRIPTION="Tool to share Linux event devices with other machines" HOMEPAGE="https://github.com/Blub/netevent" -SRC_URI="https://github.com/Blub/netevent/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/Blub/netevent/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm" +KEYWORDS="~amd64 ~arm ~arm64" IUSE="doc" BDEPEND=" doc? ( dev-python/docutils ) " -S="${WORKDIR}/${PN}-${COMMIT}" - src_configure() { tc-export CXX # Not Autoconf. - RST2MAN=rst2man.py \ + RST2MAN=$(type -P rst2man rst2man.py) \ ./configure \ --prefix="${EPREFIX}"/usr \ $(use_enable doc) \ diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest index 9ca3a9ffe611..a773790b0ce4 100644 --- a/net-misc/netifrc/Manifest +++ b/net-misc/netifrc/Manifest @@ -1,4 +1,2 @@ -DIST netifrc-0.7.1-patches-01.tar.xz 3356 BLAKE2B 35d34456af5fcb8ac35c80db13484b7b4712543e95441e6be4274934627216879ae6c8421ca2ef0b67a92ab39befb03a4b171a51a54e0e14c10bb6323cfaa4e9 SHA512 340cf6184196ee9648565cd2c652cd56eaab4f3f765baff889f736cca05a5ca12a63de5d864c0f9fedc9337f88fd25dac0224118dab39ce7542cd0977f40db6f -DIST netifrc-0.7.1.tar.gz 82393 BLAKE2B a1d147db2a4e4ff7d360bf5140ccf060283dbcbfde7100f1d193c783f1da540574e1342b4d7f3f9ee011628f9f113fc751416805f35678a1093e0cc0014f5eb9 SHA512 407071f8f58b7788703a62193677673ddd18114b69142894674337410473e620cf3895bb014cff133f719ac1a7191ac3bedfd969c9a11bf2f1c4b04d39683057 -DIST netifrc-0.7.2.tar.gz 84332 BLAKE2B ba379f34a7986f75f73f291ad69dff2b58036eb439ba8610f5fbddc3d1df9430e0560683477544f11bcd4fb2dd662ed09ab0797a9ce9f734f4b5dcf5db8006c8 SHA512 1d588b638331b3822e9c7ff7f6118a540f20366a662ebf4d05c4c1794536fcb5ee25b57e8cf7b631d90788883c3b405d5b9ac460443d5184216d805f956df07e -DIST netifrc-0.7.3.tar.gz 84770 BLAKE2B 075440bfd81e4dedd406d9555a18f530b07a47f9268130ebcca6d43d35e9cc5f01105a3eb0ddc084a16e17912aa10e378833b1eef1defd2fc6b22f817cd220bd SHA512 a82ac6835c15763becb5845a8c8d90dfd8d6c289ea5e00b0d7ae332d3e7ad6797f0fdcbf27bb9f44ff345c98884cdfa13210c76089585b8dd9970ded5f6236d8 +DIST netifrc-0.7.7.tar.bz2 75823 BLAKE2B e2d99ac347e9a449b39981b1aa1585ff83d05af1bafe09f7e2e25954360df1e76f53ce4a5c8e08777ba45baf697a307697576835df4c4b4ae010ab84dbe8bb2b SHA512 995f89beece9e7ff0b558b466c06a476f22d3161f31622a232c382d81e74399aeb0a39cb4a95080829120c527a1a93757425671e2ca3639d8637e5e905ad3e80 +DIST netifrc-0.7.8.tar.bz2 76239 BLAKE2B 501a2bcfaa2753187425cba31f01b2a644ae4d01da76e4bd3722b815b1fa743905728fd66ac9d56c915dba767723bd5df2c417706c8a0150628e61b6e0b86ffb SHA512 d483453058d3e8c3cb22e8eedea69e12ac5fe94449d35a2cd842d7e32603174a470a8a4e883ebf24a0f09374dbf1f4c0c0db5094ae2d2191bcc1c9c8356170ad diff --git a/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_args_tempfile.patch b/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_args_tempfile.patch deleted file mode 100644 index 6ad40c860f96..000000000000 --- a/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_args_tempfile.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 586579d5c9fad63eb8780c556f34b80d0302e6b9 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Fri, 22 May 2020 10:09:22 +0200 -Subject: [PATCH] net/dhcpcd.sh: Put user args into a temp file - -So we still use the correct PID even if the user has changed his -configuration between start and stop. - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - net/dhcpcd.sh | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh -index c0639e0..dcc6817 100644 ---- a/net/dhcpcd.sh -+++ b/net/dhcpcd.sh -@@ -16,11 +16,14 @@ _config_vars="$_config_vars dhcp dhcpcd" - - dhcpcd_start() - { -- # check for pidfile after we gathered the user's opts because they can -+ # check for pidfile after we gathered the user's args because they can - # alter the pidfile's name (#718114) -- local args= opt= pidfile= opts= new=true -+ # Save the args into a file so dhcpcd_stop can later re-use the very -+ # same args later. -+ local args= opt= pidfile= opts= new=true argsfile=/run/netifrc_dhcpcd_${IFACE}_args - eval args=\$dhcpcd_${IFVAR} - [ -z "${args}" ] && args=${dhcpcd} -+ echo "${args}" > ${argsfile} - pidfile="$(dhcpcd -P ${args} ${IFACE})" - - # Get our options -@@ -78,12 +81,16 @@ dhcpcd_start() - - dhcpcd_stop() - { -- local args= pidfile= opts= sig=SIGTERM -+ local args= pidfile= opts= sig=SIGTERM argsfile=/run/netifrc_dhcpcd_${IFACE}_args - -- # check for pidfile after we gathered the user's opts because they can -+ # check for pidfile after we gathered the user's args because they can - # alter the pidfile's name (#718114) -- eval args=\$dhcpcd_${IFVAR} -- [ -z "${args}" ] && args=${dhcpcd} -+ if [ -f "${argsfile}" ] ; then -+ args="$(cat ${argsfile})" -+ else -+ eval args=\$dhcpcd_${IFVAR} -+ [ -z "${args}" ] && args=${dhcpcd} -+ fi - pidfile="$(dhcpcd -P ${args} ${IFACE})" - [ ! -f "${pidfile}" ] && return 0 - -@@ -94,5 +101,6 @@ dhcpcd_stop() - *" release "*) dhcpcd -k "${IFACE}" ;; - *) dhcpcd -x "${IFACE}" ;; - esac -+ [ -f "${argsfile}" ] && rm -f "${argsfile}" - eend $? - } --- -2.27.0.rc0 - diff --git a/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_pidfile_location.patch b/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_pidfile_location.patch deleted file mode 100644 index 154e7a7696a0..000000000000 --- a/net-misc/netifrc/files/netifrc-0.7.1-dhcpcd_pidfile_location.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c29dffb14e321d927196a9b39b545004e632d3c4 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Thu, 21 May 2020 18:35:32 +0200 -Subject: [PATCH] net/dhcpcd.sh: fetch pidfile location from dhcpcd - -There's a -P switch for this but we also need to take into account the --4 and -6 switches as they both alter the pidfile's name. - -Bug: https://bugs.gentoo.org/718114 -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - net/dhcpcd.sh | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh -index 0a306b8..c0639e0 100644 ---- a/net/dhcpcd.sh -+++ b/net/dhcpcd.sh -@@ -16,9 +16,12 @@ _config_vars="$_config_vars dhcp dhcpcd" - - dhcpcd_start() - { -- local args= opt= opts= pidfile="/run/dhcpcd-${IFACE}.pid" new=true -+ # check for pidfile after we gathered the user's opts because they can -+ # alter the pidfile's name (#718114) -+ local args= opt= pidfile= opts= new=true - eval args=\$dhcpcd_${IFVAR} - [ -z "${args}" ] && args=${dhcpcd} -+ pidfile="$(dhcpcd -P ${args} ${IFACE})" - - # Get our options - eval opts=\$dhcp_${IFVAR} -@@ -75,7 +78,13 @@ dhcpcd_start() - - dhcpcd_stop() - { -- local pidfile="/run/dhcpcd-${IFACE}.pid" opts= sig=SIGTERM -+ local args= pidfile= opts= sig=SIGTERM -+ -+ # check for pidfile after we gathered the user's opts because they can -+ # alter the pidfile's name (#718114) -+ eval args=\$dhcpcd_${IFVAR} -+ [ -z "${args}" ] && args=${dhcpcd} -+ pidfile="$(dhcpcd -P ${args} ${IFACE})" - [ ! -f "${pidfile}" ] && return 0 - - ebegin "Stopping dhcpcd on ${IFACE}" --- -2.27.0.rc0 - diff --git a/net-misc/netifrc/metadata.xml b/net-misc/netifrc/metadata.xml index 19c1e2b9b47a..077b99cdc01d 100644 --- a/net-misc/netifrc/metadata.xml +++ b/net-misc/netifrc/metadata.xml @@ -8,4 +8,11 @@ This package contains the Gentoo network interface management scripts, which were separated from OpenRC. </longdescription> + <use> + <flag name="dhcp">Allow interfaces to configure via DHCP</flag> + </use> + <upstream> + <remote-id type="gentoo">proj/netifrc</remote-id> + <remote-id type="github">gentoo/netifrc</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild deleted file mode 100644 index 8e7932308d7c..000000000000 --- a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd udev - -DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git" - #EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="" - -DEPEND="!<sys-fs/udev-172" -RDEPEND="sys-apps/gentoo-functions - >=sys-apps/openrc-0.15 - !<sys-fs/udev-init-scripts-27" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" - -PATCHES=( - "${FILESDIR}/${PN}-0.7.1-dhcpcd_pidfile_location.patch" - "${FILESDIR}/${PN}-0.7.1-dhcpcd_args_tempfile.patch" -) - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - einfo "Producing ChangeLog from Git history" - GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog - fi - - default -} - -src_compile() { - MAKE_ARGS="${MAKE_ARGS} - UDEVDIR=${EPREFIX}$(get_udevdir) - LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}" - - use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}" - - emake ${MAKE_ARGS} all -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO - - # Install the service file - LIBEXECDIR="${EPREFIX}/lib/${PN}" - UNIT_DIR="$(systemd_get_systemunitdir)" - sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die - systemd_newunit "${T}/net_at.service" 'net@.service' - dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service" -} - -pkg_postinst() { - if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then - elog "The network configuration scripts will use dhcp by" - elog "default to set up your interfaces." - elog "If you need to set up something more complete, see" - elog "${EROOT}/usr/share/doc/${P}/README" - fi -} diff --git a/net-misc/netifrc/netifrc-0.7.1-r2.ebuild b/net-misc/netifrc/netifrc-0.7.1-r2.ebuild deleted file mode 100644 index a4939169d562..000000000000 --- a/net-misc/netifrc/netifrc-0.7.1-r2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd udev - -DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git" - #EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-patches-01.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="" - -DEPEND="!<sys-fs/udev-172" -RDEPEND="sys-apps/gentoo-functions - >=sys-apps/openrc-0.15 - !<sys-fs/udev-init-scripts-27" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - einfo "Producing ChangeLog from Git history" - GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog - fi - - eapply "${WORKDIR}"/patches - - default -} - -src_compile() { - MAKE_ARGS="${MAKE_ARGS} - UDEVDIR=${EPREFIX}$(get_udevdir) - LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}" - - use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}" - - emake ${MAKE_ARGS} all -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO - - # Install the service file - LIBEXECDIR="${EPREFIX}/lib/${PN}" - UNIT_DIR="$(systemd_get_systemunitdir)" - sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die - systemd_newunit "${T}/net_at.service" 'net@.service' - dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service" -} - -pkg_postinst() { - if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then - elog "The network configuration scripts will use dhcp by" - elog "default to set up your interfaces." - elog "If you need to set up something more complete, see" - elog "${EROOT}/usr/share/doc/${P}/README" - fi -} diff --git a/net-misc/netifrc/netifrc-0.7.3.ebuild b/net-misc/netifrc/netifrc-0.7.7.ebuild index 5aa4ea9667c5..0b8e92d0269e 100644 --- a/net-misc/netifrc/netifrc-0.7.3.ebuild +++ b/net-misc/netifrc/netifrc-0.7.7.ebuild @@ -1,34 +1,45 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd udev DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Netifrc" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git" - #EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/netifrc.git + https://github.com/gentoo/${PN} + " inherit git-r3 else - SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi -LICENSE="BSD-2" +LICENSE="BSD-2 GPL-2" SLOT="0" -IUSE="" +IUSE="+dhcp" -DEPEND="!<sys-fs/udev-172" -RDEPEND="sys-apps/gentoo-functions +RDEPEND=" + sys-apps/gentoo-functions >=sys-apps/openrc-0.15 - !<sys-fs/udev-init-scripts-27" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" + dhcp? ( + || ( + net-misc/dhcpcd + net-misc/dhcp[client] + sys-apps/busybox + ) + ) +" +BDEPEND=" + kernel_linux? ( virtual/pkgconfig ) +" src_prepare() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == 9999 ]] ; then local ver="git-${EGIT_VERSION:0:6}" sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die einfo "Producing ChangeLog from Git history" @@ -39,28 +50,34 @@ src_prepare() { } src_compile() { - MAKE_ARGS="${MAKE_ARGS} - UDEVDIR=${EPREFIX}$(get_udevdir) - LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}" + MAKE_ARGS=( + PREFIX="${EPREFIX}" + UPREFIX="${EPREFIX}/usr" + UDEVDIR="${EPREFIX}$(get_udevdir)" + LIBEXECDIR="${EPREFIX}/lib/${PN}" + PF="${PF}" + ) - use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}" - - emake ${MAKE_ARGS} all + emake "${MAKE_ARGS[@]}" all } src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install + emake "${MAKE_ARGS[@]}" DESTDIR="${D}" install dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO # Install the service file - LIBEXECDIR="${EPREFIX}/lib/${PN}" - UNIT_DIR="$(systemd_get_systemunitdir)" + local LIBEXECDIR="${EPREFIX}/lib/${PN}" sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die systemd_newunit "${T}/net_at.service" 'net@.service' - dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service" + + local UNIT_DIR="$(systemd_get_systemunitdir)" + UNIT_DIR="${UNIT_DIR#"${EPREFIX}"}" + dosym net@.service "${UNIT_DIR}/net@lo.service" } pkg_postinst() { + udev_reload + if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then elog "The network configuration scripts will use dhcp by" elog "default to set up your interfaces." @@ -68,3 +85,7 @@ pkg_postinst() { elog "${EROOT}/usr/share/doc/${P}/README" fi } + +pkg_postrm() { + udev_reload +} diff --git a/net-misc/netifrc/netifrc-0.7.2.ebuild b/net-misc/netifrc/netifrc-0.7.8.ebuild index 0e9cf97453c8..5357dd17292d 100644 --- a/net-misc/netifrc/netifrc-0.7.2.ebuild +++ b/net-misc/netifrc/netifrc-0.7.8.ebuild @@ -1,34 +1,45 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd udev DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Netifrc" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git" - #EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/netifrc.git + https://github.com/gentoo/${PN} + " inherit git-r3 else - SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" fi -LICENSE="BSD-2" +LICENSE="BSD-2 GPL-2" SLOT="0" -IUSE="" +IUSE="+dhcp" -DEPEND="!<sys-fs/udev-172" -RDEPEND="sys-apps/gentoo-functions +RDEPEND=" + sys-apps/gentoo-functions >=sys-apps/openrc-0.15 - !<sys-fs/udev-init-scripts-27" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" + dhcp? ( + || ( + net-misc/dhcpcd + net-misc/dhcp[client] + sys-apps/busybox + ) + ) +" +BDEPEND=" + kernel_linux? ( virtual/pkgconfig ) +" src_prepare() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == 9999 ]] ; then local ver="git-${EGIT_VERSION:0:6}" sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die einfo "Producing ChangeLog from Git history" @@ -39,28 +50,34 @@ src_prepare() { } src_compile() { - MAKE_ARGS="${MAKE_ARGS} - UDEVDIR=${EPREFIX}$(get_udevdir) - LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}" + MAKE_ARGS=( + PREFIX="${EPREFIX}" + UPREFIX="${EPREFIX}/usr" + UDEVDIR="${EPREFIX}$(get_udevdir)" + LIBEXECDIR="${EPREFIX}/lib/${PN}" + PF="${PF}" + ) - use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}" - - emake ${MAKE_ARGS} all + emake "${MAKE_ARGS[@]}" all } src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install + emake "${MAKE_ARGS[@]}" DESTDIR="${D}" install dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO # Install the service file - LIBEXECDIR="${EPREFIX}/lib/${PN}" - UNIT_DIR="$(systemd_get_systemunitdir)" + local LIBEXECDIR="${EPREFIX}/lib/${PN}" sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die systemd_newunit "${T}/net_at.service" 'net@.service' - dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service" + + local UNIT_DIR="$(systemd_get_systemunitdir)" + UNIT_DIR="${UNIT_DIR#"${EPREFIX}"}" + dosym net@.service "${UNIT_DIR}/net@lo.service" } pkg_postinst() { + udev_reload + if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then elog "The network configuration scripts will use dhcp by" elog "default to set up your interfaces." @@ -68,3 +85,7 @@ pkg_postinst() { elog "${EROOT}/usr/share/doc/${P}/README" fi } + +pkg_postrm() { + udev_reload +} diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild index 4503bec9c25e..54f749377303 100644 --- a/net-misc/netifrc/netifrc-9999.ebuild +++ b/net-misc/netifrc/netifrc-9999.ebuild @@ -1,34 +1,45 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd udev DESCRIPTION="Gentoo Network Interface Management Scripts" -HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Netifrc" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git" - #EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/netifrc.git + https://github.com/gentoo/${PN} + " inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -LICENSE="BSD-2" +LICENSE="BSD-2 GPL-2" SLOT="0" -IUSE="" +IUSE="+dhcp" -DEPEND="!<sys-fs/udev-172" -RDEPEND="sys-apps/gentoo-functions +RDEPEND=" + sys-apps/gentoo-functions >=sys-apps/openrc-0.15 - !<sys-fs/udev-init-scripts-27" -BDEPEND="kernel_linux? ( virtual/pkgconfig )" + dhcp? ( + || ( + net-misc/dhcpcd + net-misc/dhcp[client] + sys-apps/busybox + ) + ) +" +BDEPEND=" + kernel_linux? ( virtual/pkgconfig ) +" src_prepare() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == 9999 ]] ; then local ver="git-${EGIT_VERSION:0:6}" sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die einfo "Producing ChangeLog from Git history" @@ -39,28 +50,34 @@ src_prepare() { } src_compile() { - MAKE_ARGS="${MAKE_ARGS} - UDEVDIR=${EPREFIX}$(get_udevdir) - LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}" + MAKE_ARGS=( + PREFIX="${EPREFIX}" + UPREFIX="${EPREFIX}/usr" + UDEVDIR="${EPREFIX}$(get_udevdir)" + LIBEXECDIR="${EPREFIX}/lib/${PN}" + PF="${PF}" + ) - use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}" - - emake ${MAKE_ARGS} all + emake "${MAKE_ARGS[@]}" all } src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install + emake "${MAKE_ARGS[@]}" DESTDIR="${D}" install dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO # Install the service file - LIBEXECDIR="${EPREFIX}/lib/${PN}" - UNIT_DIR="$(systemd_get_systemunitdir)" + local LIBEXECDIR="${EPREFIX}/lib/${PN}" sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die systemd_newunit "${T}/net_at.service" 'net@.service' - dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service" + + local UNIT_DIR="$(systemd_get_systemunitdir)" + UNIT_DIR="${UNIT_DIR#"${EPREFIX}"}" + dosym net@.service "${UNIT_DIR}/net@lo.service" } pkg_postinst() { + udev_reload + if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then elog "The network configuration scripts will use dhcp by" elog "default to set up your interfaces." @@ -68,3 +85,7 @@ pkg_postinst() { elog "${EROOT}/usr/share/doc/${P}/README" fi } + +pkg_postrm() { + udev_reload +} diff --git a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r5.ebuild index 1211f35aa210..891003317d46 100644 --- a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild +++ b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r5.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs flag-o-matic -DESCRIPTION="Netkit - bootparamd" -HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" +DESCRIPTION="Netkit - bootparamd: Net-boot support daemon" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit" SRC_URI="mirror://debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz" LICENSE="BSD GPL-2" @@ -15,21 +15,20 @@ KEYWORDS="amd64 ~hppa ~mips ppc sparc x86" IUSE="+libtirpc" DEPEND=" - !<=net-misc/netkit-bootpd-0.17-r2 libtirpc? ( net-libs/rpcsvc-proto net-libs/libtirpc ) !libtirpc? ( sys-libs/glibc[rpc(-)] ) " RDEPEND=${DEPEND} -src_prepare() { - eapply "${FILESDIR}"/0.17-jumpstart.patch - eapply "${FILESDIR}"/0.17-libtirpc.patch +PATCHES=( + "${FILESDIR}"/0.17-jumpstart.patch + "${FILESDIR}"/0.17-libtirpc.patch +) +src_prepare() { # don't reset LDFLAGS (bug #335457), manpages into /usr/share/man sed -i -e '/^LDFLAGS=/d ; /MANDIR=/s:man:share/man:' configure || die - sed -i -e 's:install -s:install:' rpc.bootparamd/Makefile || die - default } diff --git a/net-misc/netkit-bootpd/Manifest b/net-misc/netkit-bootpd/Manifest index 18a4a2da445e..45ef41c9aa63 100644 --- a/net-misc/netkit-bootpd/Manifest +++ b/net-misc/netkit-bootpd/Manifest @@ -1 +1,2 @@ DIST bootpd-2.4.tar.gz 99765 BLAKE2B ce435b562433e6cf2cc1ef0fe51b17d7d4b62c347749c6cff98af82f4af8934e23f19fa8f278e34497aea31b75b437a7bc3d59608454ac8eb42f0fd4c76da042 SHA512 aaed30b724c660973e2efac8c18ead48caf1e8e5e35d4af6c6476080c32f8ce8c8722fd1c18d864e557301d37615cbb313e2ab0140da8963fbd23d5000e60379 +DIST netkit-bootpd-2.4-patches.tar.xz 9976 BLAKE2B e6f820284394b364697e498e006b3a5029ce921ea54d22b3b19011baf637a9d78ec7081dbbd365bbe70700c64f94e3d58e8e2c52cab3eee20997746e95718953 SHA512 72967f2df8e13c8884c8aa5e8a38c97c5e14f1ca8b596a155e99375dbf74d20bf4281651db892d57628a0f344b27461efedd1d59ce410c7740e616df4ac40503 diff --git a/net-misc/netkit-bootpd/files/netkit-bootpd-2.4.patch b/net-misc/netkit-bootpd/files/netkit-bootpd-2.4.patch deleted file mode 100644 index 1daf765a95e1..000000000000 --- a/net-misc/netkit-bootpd/files/netkit-bootpd-2.4.patch +++ /dev/null @@ -1,701 +0,0 @@ -diff -ur bootpd-2.4.orig/bootpd.c bootpd-2.4/bootpd.c ---- bootpd-2.4.orig/bootpd.c 1995-02-19 17:53:02.000000000 +0200 -+++ bootpd-2.4/bootpd.c 2010-07-07 14:55:03.000000000 +0300 -@@ -117,14 +117,14 @@ - extern void dumptab P((char *)); - - PRIVATE void catcher P((int)); --PRIVATE int chk_access P((char *, int32 *)); -+PRIVATE int chk_access P((char *, int32_t *)); - #ifdef VEND_CMU - PRIVATE void dovend_cmu P((struct bootp *, struct host *)); - #endif --PRIVATE void dovend_rfc1048 P((struct bootp *, struct host *, int32)); -+PRIVATE void dovend_rfc1048 P((struct bootp *, struct host *, int32_t)); - PRIVATE void handle_reply P((void)); - PRIVATE void handle_request P((void)); --PRIVATE void sendreply P((int forward, int32 dest_override)); -+PRIVATE void sendreply P((int forward, int32_t dest_override)); - PRIVATE void usage P((void)); - - #undef P -@@ -185,7 +185,7 @@ - * main server loop is started. - */ - --void -+int - main(argc, argv) - int argc; - char **argv; -@@ -339,7 +339,7 @@ - "%s: invalid timeout specification\n", progname); - break; - } -- actualtimeout.tv_sec = (int32) (60 * n); -+ actualtimeout.tv_sec = (int32_t) (60 * n); - /* - * If the actual timeout is zero, pass a NULL pointer - * to select so it blocks indefinitely, otherwise, -@@ -559,9 +559,9 @@ - break; - } - } -+ return(0); - } - -- - - - /* -@@ -616,9 +616,9 @@ - struct bootp *bp = (struct bootp *) pktbuf; - struct host *hp = NULL; - struct host dummyhost; -- int32 bootsize = 0; -+ int32_t bootsize = 0; - unsigned hlen, hashcode; -- int32 dest; -+ int32_t dest; - char realpath[1024] = {""}; - char *clntpath; - char *homedir, *bootfile; -@@ -726,7 +726,7 @@ - * with a timestamp lower than the threshold. - */ - if (hp->flags.min_wait) { -- u_int32 t = (u_int32) ntohs(bp->bp_secs); -+ uint32_t t = (uint32_t) ntohs(bp->bp_secs); - if (t < hp->min_wait) { - if (debug > 1) - report(LOG_INFO, -@@ -997,7 +997,7 @@ - PRIVATE void - sendreply(forward, dst_override) - int forward; -- int32 dst_override; -+ int32_t dst_override; - { - struct bootp *bp = (struct bootp *) pktbuf; - struct in_addr dst; -@@ -1110,12 +1110,12 @@ - PRIVATE int - chk_access(path, filesize) - char *path; -- int32 *filesize; -+ int32_t *filesize; - { - struct stat st; - - if ((stat(path, &st) == 0) && (st.st_mode & (S_IREAD >> 6))) { -- *filesize = (int32) st.st_size; -+ *filesize = (int32_t) st.st_size; - return 0; - } else { - return -1; -@@ -1211,7 +1211,7 @@ - dovend_rfc1048(bp, hp, bootsize) - struct bootp *bp; - struct host *hp; -- int32 bootsize; -+ int32_t bootsize; - { - int bytesleft, len; - byte *vp; -diff -ur bootpd-2.4.orig/bootpd.c-org bootpd-2.4/bootpd.c-org ---- bootpd-2.4.orig/bootpd.c-org 1994-11-27 15:36:21.000000000 +0200 -+++ bootpd-2.4/bootpd.c-org 2010-07-07 14:55:03.000000000 +0300 -@@ -117,14 +117,14 @@ - extern void dumptab P((char *)); - - PRIVATE void catcher P((int)); --PRIVATE int chk_access P((char *, int32 *)); -+PRIVATE int chk_access P((char *, int32_t *)); - #ifdef VEND_CMU - PRIVATE void dovend_cmu P((struct bootp *, struct host *)); - #endif --PRIVATE void dovend_rfc1048 P((struct bootp *, struct host *, int32)); -+PRIVATE void dovend_rfc1048 P((struct bootp *, struct host *, int32_t)); - PRIVATE void handle_reply P((void)); - PRIVATE void handle_request P((void)); --PRIVATE void sendreply P((int forward, int32 dest_override)); -+PRIVATE void sendreply P((int forward, int32_t dest_override)); - PRIVATE void usage P((void)); - - #undef P -@@ -339,7 +339,7 @@ - "%s: invalid timeout specification\n", progname); - break; - } -- actualtimeout.tv_sec = (int32) (60 * n); -+ actualtimeout.tv_sec = (int32_t) (60 * n); - /* - * If the actual timeout is zero, pass a NULL pointer - * to select so it blocks indefinitely, otherwise, -@@ -606,9 +606,9 @@ - struct bootp *bp = (struct bootp *) pktbuf; - struct host *hp = NULL; - struct host dummyhost; -- int32 bootsize = 0; -+ int32_t bootsize = 0; - unsigned hlen, hashcode; -- int32 dest; -+ int32_t dest; - char realpath[1024]; - char *clntpath; - char *homedir, *bootfile; -@@ -716,7 +716,7 @@ - * with a timestamp lower than the threshold. - */ - if (hp->flags.min_wait) { -- u_int32 t = (u_int32) ntohs(bp->bp_secs); -+ uint32_t t = (uint32_t) ntohs(bp->bp_secs); - if (t < hp->min_wait) { - if (debug > 1) - report(LOG_INFO, -@@ -987,7 +987,7 @@ - PRIVATE void - sendreply(forward, dst_override) - int forward; -- int32 dst_override; -+ int32_t dst_override; - { - struct bootp *bp = (struct bootp *) pktbuf; - struct in_addr dst; -@@ -1100,12 +1100,12 @@ - PRIVATE int - chk_access(path, filesize) - char *path; -- int32 *filesize; -+ int32_t *filesize; - { - struct stat st; - - if ((stat(path, &st) == 0) && (st.st_mode & (S_IREAD >> 6))) { -- *filesize = (int32) st.st_size; -+ *filesize = (int32_t) st.st_size; - return 0; - } else { - return -1; -@@ -1201,7 +1201,7 @@ - dovend_rfc1048(bp, hp, bootsize) - struct bootp *bp; - struct host *hp; -- int32 bootsize; -+ int32_t bootsize; - { - int bytesleft, len; - byte *vp; -diff -ur bootpd-2.4.orig/bootpd.h bootpd-2.4/bootpd.h ---- bootpd-2.4.orig/bootpd.h 1994-11-27 15:36:13.000000000 +0200 -+++ bootpd-2.4/bootpd.h 2010-07-07 14:55:03.000000000 +0300 -@@ -180,8 +180,8 @@ - htype, /* RFC826 says this should be 16-bits but - RFC951 only allocates 1 byte. . . */ - haddr[MAXHADDRLEN]; -- int32 time_offset; -- unsigned int32 bootsize, -+ int32_t time_offset; -+ uint32_t bootsize, - msg_size, - min_wait; - struct in_addr bootserver, -diff -ur bootpd-2.4.orig/Bootpd-linux.diffs bootpd-2.4/Bootpd-linux.diffs ---- bootpd-2.4.orig/Bootpd-linux.diffs 1995-02-28 02:14:29.000000000 +0200 -+++ bootpd-2.4/Bootpd-linux.diffs 2010-07-07 14:55:03.000000000 +0300 -@@ -21,17 +21,17 @@ - --- 494,499 ---- - *************** - *** 619,625 **** -- int32 bootsize = 0; -+ int32_t bootsize = 0; - unsigned hlen, hashcode; -- int32 dest; -+ int32_t dest; - ! char realpath[1024] = {""}; - char *clntpath; - char *homedir, *bootfile; - int n; - --- 609,615 ---- -- int32 bootsize = 0; -+ int32_t bootsize = 0; - unsigned hlen, hashcode; -- int32 dest; -+ int32_t dest; - ! char realpath[1024]; - char *clntpath; - char *homedir, *bootfile; -diff -ur bootpd-2.4.orig/bootpef.c bootpd-2.4/bootpef.c ---- bootpd-2.4.orig/bootpef.c 1994-11-27 15:36:13.000000000 +0200 -+++ bootpd-2.4/bootpef.c 2010-07-07 14:55:03.000000000 +0300 -@@ -97,7 +97,7 @@ - #define P(args) () - #endif - --static void dovend_rfc1048 P((struct bootp *, struct host *, int32)); -+static void dovend_rfc1048 P((struct bootp *, struct host *, int32_t)); - static void mktagfile P((struct host *)); - static void usage P((void)); - -@@ -139,7 +139,7 @@ - * Initialization such as command-line processing is done and then the - * main server loop is started. - */ --void -+int - main(argc, argv) - int argc; - char **argv; -@@ -275,6 +275,7 @@ - mktagfile(hp); - hp = (struct host *) hash_NextEntry(nmhashtable); - } -+ return(0); - } - - -diff -ur bootpd-2.4.orig/bootpgw.c bootpd-2.4/bootpgw.c ---- bootpd-2.4.orig/bootpgw.c 1994-11-27 15:36:21.000000000 +0200 -+++ bootpd-2.4/bootpgw.c 2010-07-07 14:55:03.000000000 +0300 -@@ -139,7 +139,7 @@ - int pktlen; - char *progname; - char *servername; --int32 server_ipa; /* Real server IP address, network order. */ -+int32_t server_ipa; /* Real server IP address, network order. */ - - char myhostname[64]; - struct in_addr my_ip_addr; -@@ -152,7 +152,7 @@ - * main server loop is started. - */ - --void -+int - main(argc, argv) - int argc; - char **argv; -@@ -298,7 +298,7 @@ - "%s: invalid timeout specification\n", progname); - break; - } -- actualtimeout.tv_sec = (int32) (60 * n); -+ actualtimeout.tv_sec = (int32_t) (60 * n); - /* - * If the actual timeout is zero, pass a NULL pointer - * to select so it blocks indefinitely, otherwise, -@@ -481,6 +481,7 @@ - break; - } - } -+ return(0); - } - - -diff -ur bootpd-2.4.orig/bootp.h bootpd-2.4/bootp.h ---- bootpd-2.4.orig/bootp.h 1994-11-27 15:36:13.000000000 +0200 -+++ bootpd-2.4/bootp.h 2010-07-07 14:55:03.000000000 +0300 -@@ -31,7 +31,7 @@ - * - */ - --#include "bptypes.h" /* for int32, u_int32 */ -+#include "bptypes.h" /* for int32_t, uint32_t */ - - #define BP_CHADDR_LEN 16 - #define BP_SNAME_LEN 64 -@@ -44,7 +44,7 @@ - unsigned char bp_htype; /* hardware addr type */ - unsigned char bp_hlen; /* hardware addr length */ - unsigned char bp_hops; /* gateway hops */ -- unsigned int32 bp_xid; /* transaction ID */ -+ uint32_t bp_xid; /* transaction ID */ - unsigned short bp_secs; /* seconds since boot began */ - unsigned short bp_flags; /* RFC1532 broadcast, etc. */ - struct in_addr bp_ciaddr; /* client IP address */ -@@ -133,13 +133,13 @@ - - struct cmu_vend { - char v_magic[4]; /* magic number */ -- unsigned int32 v_flags; /* flags/opcodes, etc. */ -+ uint32_t v_flags; /* flags/opcodes, etc. */ - struct in_addr v_smask; /* Subnet mask */ - struct in_addr v_dgate; /* Default gateway */ - struct in_addr v_dns1, v_dns2; /* Domain name servers */ - struct in_addr v_ins1, v_ins2; /* IEN-116 name servers */ - struct in_addr v_ts1, v_ts2; /* Time servers */ -- int32 v_unused[6]; /* currently unused */ -+ int32_t v_unused[6]; /* currently unused */ - }; - - -diff -ur bootpd-2.4.orig/bootptest.c bootpd-2.4/bootptest.c ---- bootpd-2.4.orig/bootptest.c 1994-11-27 15:36:19.000000000 +0200 -+++ bootpd-2.4/bootptest.c 2010-07-07 14:55:03.000000000 +0300 -@@ -125,12 +125,12 @@ - char *servername = NULL; - char *vendor_file = NULL; - char *bp_file = NULL; -- int32 server_addr; /* inet addr, network order */ -+ int32_t server_addr; /* inet addr, network order */ - int s; /* Socket file descriptor */ - int n, tolen, fromlen, recvcnt; - int use_hwa = 0; -- int32 vend_magic; -- int32 xid; -+ int32_t vend_magic; -+ int32_t xid; - - progname = strrchr(argv[0], '/'); - if (progname) -@@ -286,8 +286,8 @@ - bp = (struct bootp *) sndbuf; - bzero(bp, sizeof(*bp)); - bp->bp_op = BOOTREQUEST; -- xid = (int32) getpid(); -- bp->bp_xid = (u_int32) htonl(xid); -+ xid = (int32_t) getpid(); -+ bp->bp_xid = (uint32_t) htonl(xid); - if (bp_file) - strncpy(bp->bp_file, bp_file, BP_FILE_LEN); - -diff -ur bootpd-2.4.orig/bptypes.h bootpd-2.4/bptypes.h ---- bootpd-2.4.orig/bptypes.h 1994-11-27 15:36:14.000000000 +0200 -+++ bootpd-2.4/bptypes.h 2010-07-07 14:55:03.000000000 +0300 -@@ -1,18 +1,10 @@ - /* bptypes.h */ -+#include <sys/types.h> - - #ifndef BPTYPES_H - #define BPTYPES_H - - /* -- * 32 bit integers are different types on various architectures -- */ -- --#ifndef int32 --#define int32 long --#endif --typedef unsigned int32 u_int32; -- --/* - * Nice typedefs. . . - */ - -diff -ur bootpd-2.4.orig/dovend.c bootpd-2.4/dovend.c ---- bootpd-2.4.orig/dovend.c 1994-11-27 15:36:19.000000000 +0200 -+++ bootpd-2.4/dovend.c 2010-07-07 14:55:03.000000000 +0300 -@@ -385,7 +385,7 @@ - - void - insert_u_long(value, dest) -- u_int32 value; -+ uint32_t value; - byte **dest; - { - byte *temp; -diff -ur bootpd-2.4.orig/dovend.h bootpd-2.4/dovend.h ---- bootpd-2.4.orig/dovend.h 1994-11-27 15:36:14.000000000 +0200 -+++ bootpd-2.4/dovend.h 2010-07-07 14:55:03.000000000 +0300 -@@ -8,6 +8,6 @@ - - extern int dovend_rfc1497 P((struct host *hp, u_char *buf, int len)); - extern int insert_ip P((int, struct in_addr_list *, u_char **, int *)); --extern void insert_u_long P((u_int32, u_char **)); -+extern void insert_u_long P((uint32_t, u_char **)); - - #undef P -diff -ur bootpd-2.4.orig/getether.c bootpd-2.4/getether.c ---- bootpd-2.4.orig/getether.c 1994-11-27 15:36:20.000000000 +0200 -+++ bootpd-2.4/getether.c 2010-07-07 14:58:09.000000000 +0300 -@@ -14,6 +14,8 @@ - #include <ctype.h> - #include <syslog.h> - -+#include <string.h> /* bzero and strcpy */ -+ - #include "report.h" - #define EALEN 6 - -@@ -340,7 +342,7 @@ - if (ioctl(fd, SIOCGIFHWADDR, &phys) < 0) { - report(LOG_ERR, "getether: ioctl SIOCGIFHWADDR failed"); - } else { -- bcopy(phys.ifr_hwaddr, eap, EALEN); -+ bcopy(&phys.ifr_hwaddr, eap, EALEN); - rc = 0; - } - close(fd); -diff -ur bootpd-2.4.orig/lookup.c bootpd-2.4/lookup.c ---- bootpd-2.4.orig/lookup.c 1994-11-27 15:36:15.000000000 +0200 -+++ bootpd-2.4/lookup.c 2010-07-07 14:55:03.000000000 +0300 -@@ -69,7 +69,7 @@ - int - lookup_ipa(hostname, result) - char *hostname; -- u_int32 *result; -+ uint32_t *result; - { - struct hostent *hp; - hp = gethostbyname(hostname); -@@ -90,10 +90,10 @@ - */ - int - lookup_netmask(addr, result) -- u_int32 addr; /* both in network order */ -- u_int32 *result; -+ uint32_t addr; /* both in network order */ -+ uint32_t *result; - { -- int32 m, a; -+ int32_t m, a; - - a = ntohl(addr); - m = 0; -diff -ur bootpd-2.4.orig/lookup.h bootpd-2.4/lookup.h ---- bootpd-2.4.orig/lookup.h 1994-11-27 15:36:15.000000000 +0200 -+++ bootpd-2.4/lookup.h 2010-07-07 14:55:03.000000000 +0300 -@@ -1,6 +1,6 @@ - /* lookup.h */ - --#include "bptypes.h" /* for int32, u_int32 */ -+#include "bptypes.h" /* for int32_t, uint32_t */ - - #ifdef __STDC__ - #define P(args) args -@@ -9,7 +9,7 @@ - #endif - - extern u_char *lookup_hwa P((char *hostname, int htype)); --extern int lookup_ipa P((char *hostname, u_int32 *addr)); --extern int lookup_netmask P((u_int32 addr, u_int32 *mask)); -+extern int lookup_ipa P((char *hostname, uint32_t *addr)); -+extern int lookup_netmask P((uint32_t addr, uint32_t *mask)); - - #undef P -diff -ur bootpd-2.4.orig/Makefile bootpd-2.4/Makefile ---- bootpd-2.4.orig/Makefile 1995-02-28 12:59:19.000000000 +0200 -+++ bootpd-2.4/Makefile 2010-07-07 14:57:07.000000000 +0300 -@@ -40,7 +40,7 @@ - BINDIR=/usr/etc - MANDIR=/usr/local/man - --CFLAGS= $(OPTDEFS) $(SYSDEFS) $(FILEDEFS) $(MOREDEFS) -+CFLAGS+= $(OPTDEFS) $(SYSDEFS) $(FILEDEFS) $(MOREDEFS) - PROGS= bootpd bootpef bootpgw bootptest - TESTS= trylook trygetif trygetea - -@@ -86,7 +86,7 @@ - - # DEC/OSF1 on the Alpha - alpha: -- $(MAKE) SYSDEFS="-DETC_ETHERS -Dint32=int -D_SOCKADDR_LEN" \ -+ $(MAKE) SYSDEFS="-DETC_ETHERS -Dint32_t=int -D_SOCKADDR_LEN" \ - STRERROR=strerror.o - - # Control Data EP/IX 1.4.3 system, BSD 4.3 mode -@@ -124,7 +124,7 @@ - # Linux - ### - linux: -- $(MAKE) CC="gcc -O2" \ -+ $(MAKE) CC="${CC}" \ - SYSDEFS="-Dlinux" \ - SYSLIBS="" \ - LOG_FACILITY="-DLOG_BOOTP=LOG_LOCAL2" \ -@@ -143,36 +143,36 @@ - OBJ_D= bootpd.o dovend.o readfile.o hash.o dumptab.o \ - lookup.o getif.o hwaddr.o tzone.o report.o $(STRERROR) - bootpd: $(OBJ_D) -- $(CC) -o $@ $(OBJ_D) $(SYSLIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJ_D) $(SYSLIBS) - - OBJ_EF= bootpef.o dovend.o readfile.o hash.o dumptab.o \ - lookup.o hwaddr.o tzone.o report.o $(STRERROR) - bootpef: $(OBJ_EF) -- $(CC) -o $@ $(OBJ_EF) $(SYSLIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJ_EF) $(SYSLIBS) - - OBJ_GW= bootpgw.o getif.o hwaddr.o report.o $(STRERROR) - bootpgw: $(OBJ_GW) -- $(CC) -o $@ $(OBJ_GW) $(SYSLIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJ_GW) $(SYSLIBS) - - OBJ_TEST= bootptest.o print-bootp.o getif.o getether.o \ - report.o $(STRERROR) - bootptest: $(OBJ_TEST) -- $(CC) -o $@ $(OBJ_TEST) $(SYSLIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJ_TEST) $(SYSLIBS) - - # This is just for testing the lookup functions. - TRYLOOK= trylook.o lookup.o report.o $(STRERROR) - trylook : $(TRYLOOK) -- $(CC) -o $@ $(TRYLOOK) $(SYSLIBS) -+ $(CC) $(LDFLAGS) -o $@ $(TRYLOOK) $(SYSLIBS) - - # This is just for testing getif. - TRYGETIF= trygetif.o getif.o report.o $(STRERROR) - trygetif : $(TRYGETIF) -- $(CC) -o $@ $(TRYGETIF) $(SYSLIBS) -+ $(CC) $(LDFLAGS) -o $@ $(TRYGETIF) $(SYSLIBS) - - # This is just for testing getether. - TRYGETEA= trygetea.o getether.o report.o $(STRERROR) - trygetea : $(TRYGETEA) -- $(CC) -o $@ $(TRYGETEA) $(SYSLIBS) -+ $(CC) $(LDFLAGS) -o $@ $(TRYGETEA) $(SYSLIBS) - - # This rule just keeps the LOG_BOOTP define localized. - report.o : report.c -diff -ur bootpd-2.4.orig/print-bootp.c bootpd-2.4/print-bootp.c ---- bootpd-2.4.orig/print-bootp.c 1994-11-27 15:36:21.000000000 +0200 -+++ bootpd-2.4/print-bootp.c 2010-07-07 14:55:03.000000000 +0300 -@@ -170,9 +170,9 @@ - - TCHECK(bp->bp_vend[0], vdlen); - printf(" vend"); -- if (!bcmp(bp->bp_vend, vm_rfc1048, sizeof(u_int32))) -+ if (!bcmp(bp->bp_vend, vm_rfc1048, sizeof(uint32_t))) - rfc1048_print(bp->bp_vend, vdlen); -- else if (!bcmp(bp->bp_vend, vm_cmu, sizeof(u_int32))) -+ else if (!bcmp(bp->bp_vend, vm_cmu, sizeof(uint32_t))) - cmu_print(bp->bp_vend, vdlen); - else - other_print(bp->bp_vend, vdlen); -@@ -192,7 +192,7 @@ - * a: ASCII - * b: byte (8-bit) - * i: inet address -- * l: int32 -+ * l: int32_t - * s: short (16-bit) - */ - char * -@@ -281,7 +281,7 @@ - u_char tag; - u_char *ep; - register int len, j; -- u_int32 ul; -+ uint32_t ul; - u_short us; - struct in_addr ia; - char *optstr; -@@ -289,7 +289,7 @@ - printf("-rfc1395"); - - /* Step over magic cookie */ -- bp += sizeof(int32); -+ bp += sizeof(int32_t); - /* Setup end pointer */ - ep = bp + length; - while (bp < ep) { -diff -ur bootpd-2.4.orig/readfile.c bootpd-2.4/readfile.c ---- bootpd-2.4.orig/readfile.c 1994-11-27 15:36:22.000000000 +0200 -+++ bootpd-2.4/readfile.c 2010-07-07 14:55:03.000000000 +0300 -@@ -149,7 +149,7 @@ - - PRIVATE int nhosts; /* Number of hosts (/w hw or IP address) */ - PRIVATE int nentries; /* Total number of entries */ --PRIVATE int32 modtime = 0; /* Last modification time of bootptab */ -+PRIVATE int32_t modtime = 0; /* Last modification time of bootptab */ - PRIVATE char *current_hostname; /* Name of the current entry. */ - PRIVATE char current_tagname[8]; - -@@ -260,7 +260,7 @@ - get_shared_string P((char **)); - PRIVATE char * - get_string P((char **, char *, u_int *)); --PRIVATE u_int32 -+PRIVATE uint32_t - get_u_long P((char **)); - PRIVATE boolean - goodname P((char *)); -@@ -279,7 +279,7 @@ - PRIVATE byte * - prs_haddr P((char **, u_int)); - PRIVATE int -- prs_inetaddr P((char **, u_int32 *)); -+ prs_inetaddr P((char **, uint32_t *)); - PRIVATE void - read_entry P((FILE *, char *, u_int *)); - PRIVATE char * -@@ -415,7 +415,7 @@ - */ - if (goodname(hp->hostname->string)) { - char *hn = hp->hostname->string; -- u_int32 value; -+ uint32_t value; - if (hp->flags.iaddr == 0) { - if (lookup_ipa(hn, &value)) { - report(LOG_ERR, "can not get IP addr for %s", hn); -@@ -798,8 +798,8 @@ - byte *tmphaddr; - struct shared_string *ss; - struct symbolmap *symbolptr; -- u_int32 value; -- int32 timeoff; -+ uint32_t value; -+ int32_t timeoff; - int i, numsymbols; - unsigned len; - int optype; /* Indicates boolean, addition, or deletion */ -@@ -1674,11 +1674,11 @@ - PRIVATE int - prs_inetaddr(src, result) - char **src; -- u_int32 *result; -+ uint32_t *result; - { - char tmpstr[MAXSTRINGLEN]; -- register u_int32 value; -- u_int32 parts[4], *pp; -+ register uint32_t value; -+ uint32_t parts[4], *pp; - int n; - char *s, *t; - -@@ -1862,11 +1862,11 @@ - * point to the first illegal character. - */ - --PRIVATE u_int32 -+PRIVATE uint32_t - get_u_long(src) - char **src; - { -- register u_int32 value, base; -+ register uint32_t value, base; - char c; - - /* -diff -ur bootpd-2.4.orig/report.c bootpd-2.4/report.c ---- bootpd-2.4.orig/report.c 1994-11-27 15:36:16.000000000 +0200 -+++ bootpd-2.4/report.c 2010-07-07 14:55:03.000000000 +0300 -@@ -10,6 +10,7 @@ - - #include <stdio.h> - #include <syslog.h> -+#include <errno.h> - - #include "report.h" - -diff -ur bootpd-2.4.orig/tzone.c bootpd-2.4/tzone.c ---- bootpd-2.4.orig/tzone.c 1994-11-27 15:36:17.000000000 +0200 -+++ bootpd-2.4/tzone.c 2010-07-07 14:55:03.000000000 +0300 -@@ -19,7 +19,7 @@ - #include "tzone.h" - - /* This is what other modules use. */ --int32 secondswest; -+int32_t secondswest; - - /* - * Get our timezone offset so we can give it to clients if the -diff -ur bootpd-2.4.orig/tzone.h bootpd-2.4/tzone.h ---- bootpd-2.4.orig/tzone.h 1994-11-27 15:36:17.000000000 +0200 -+++ bootpd-2.4/tzone.h 2010-07-07 14:55:03.000000000 +0300 -@@ -1,3 +1,3 @@ - /* tzone.h */ --extern int32 secondswest; -+extern int32_t secondswest; - extern void tzone_init(); diff --git a/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-2.4-r2.ebuild index cb70f0e56efd..29008fd3257f 100644 --- a/net-misc/netkit-bootpd/netkit-bootpd-2.4-r1.ebuild +++ b/net-misc/netkit-bootpd/netkit-bootpd-2.4-r2.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs -MY_P=${P/netkit-} +MY_P="${P/netkit-}" DESCRIPTION="Netkit - bootp" -HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netboot/" -SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netboot/${MY_P}.tar.gz" +HOMEPAGE="http://ftp.linux.org.uk/pub/linux/Networking/netboot/" +SRC_URI=" + http://ftp.linux.org.uk/pub/linux/Networking/netboot/${MY_P}.tar.gz + https://dev.gentoo.org/~soap/distfiles/${P}-patches.tar.xz" +S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86" -IUSE="" +KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86" -S=${WORKDIR}/${MY_P} - -PATCHES=( "${FILESDIR}"/${P}.patch ) +PATCHES=( "${WORKDIR}"/gentoo-patches/ ) src_configure() { tc-export CC diff --git a/net-misc/netkit-fingerd/Manifest b/net-misc/netkit-fingerd/Manifest index 90178ef5c732..004df62c823e 100644 --- a/net-misc/netkit-fingerd/Manifest +++ b/net-misc/netkit-fingerd/Manifest @@ -1 +1 @@ -DIST bsd-finger_0.17.orig.tar.gz 25521 BLAKE2B 4b8eb07d057d2ef2bfea5987820ad6aed7c73e2365fc78c7dcf76be0f74a3056ccf5115c3b58f3235384caaacda76dc38e4ce51713fa1c28c10160232213f348 SHA512 07570a9a5797579273938ef728f222f483c733e78eb6acb00e2bce9ff9df29aa85ed715872032701c8f67fcbc7cf5501f12dc2b8234c30df7d25f50cc38359b0 +DIST bsd-finger-0.17.tar.gz 25521 BLAKE2B 4b8eb07d057d2ef2bfea5987820ad6aed7c73e2365fc78c7dcf76be0f74a3056ccf5115c3b58f3235384caaacda76dc38e4ce51713fa1c28c10160232213f348 SHA512 07570a9a5797579273938ef728f222f483c733e78eb6acb00e2bce9ff9df29aa85ed715872032701c8f67fcbc7cf5501f12dc2b8234c30df7d25f50cc38359b0 diff --git a/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-r2-gentoo.diff b/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-includes.patch index e7c2d776147d..4318db053ac2 100644 --- a/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-r2-gentoo.diff +++ b/net-misc/netkit-fingerd/files/netkit-fingerd-0.17-includes.patch @@ -1,6 +1,18 @@ ---- bsd-finger-0.17/finger/lprint.c~ Tue Sep 14 12:51:11 1999 -+++ bsd-finger-0.17/finger/lprint.c Sun Apr 29 21:49:04 2001 -@@ -48,7 +48,7 @@ +https://bugs.gentoo.org/897822 + +Add missing fcntl.h. +Change sys/time.h to time.h. + +--- a/finger/lprint.c ++++ b/finger/lprint.c +@@ -42,13 +42,14 @@ + + #include <stdio.h> + #include <ctype.h> ++#include <fcntl.h> + #include <paths.h> + #include <string.h> + #include <unistd.h> #include <sys/types.h> #include <sys/file.h> #include <sys/stat.h> @@ -9,8 +21,8 @@ #include "finger.h" static void lprint(PERSON *pn); ---- bsd-finger-0.17/finger/sprint.c~ Sun Dec 12 19:59:33 1999 -+++ bsd-finger-0.17/finger/sprint.c Sun Apr 29 21:49:22 2001 +--- a/finger/sprint.c ++++ b/finger/sprint.c @@ -40,7 +40,7 @@ #endif /* not lint */ diff --git a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild index 4b7aca59d55b..32182eb67888 100644 --- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild +++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit toolchain-funcs -MY_PN="${PN/netkit/bsd}" -MY_PN="${MY_PN/rd/r}" DESCRIPTION="Netkit - fingerd and finger client" -HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" -SRC_URI="mirror://debian/pool/main/b/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit" +SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/finger/bsd-finger-${PV}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="" +IUSE="selinux" -S=${WORKDIR}/${MY_PN}-${PV} +RDEPEND="selinux? ( sec-policy/selinux-finger )" + +S=${WORKDIR}/bsd-finger-${PV} PATCHES=( - "${FILESDIR}"/${P}-r2-gentoo.diff + "${FILESDIR}"/netkit-fingerd-0.17-includes.patch "${FILESDIR}"/${P}-name-check.patch #80286 ) diff --git a/net-misc/netkit-routed/Manifest b/net-misc/netkit-routed/Manifest deleted file mode 100644 index a777baf19277..000000000000 --- a/net-misc/netkit-routed/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST netkit-routed_0.17.orig.tar.gz 36435 BLAKE2B cfa0ab9fcbca1369e812e02dc76524e8668b340dc70c345b038f659fd9b48979fe1c27249748d5455d636ad2cef204fd646f2967761971de0b01aed88af80778 SHA512 9dea1048af22d5bbcec0aa9722a518e81d4415c7cc3219ae13d38450b0960fb30e0b082648717336c5870fa65f921a3830aadca23d0595ca719f89f4615afbc9 diff --git a/net-misc/netkit-routed/files/netkit-routed-0.17-printf.patch b/net-misc/netkit-routed/files/netkit-routed-0.17-printf.patch deleted file mode 100644 index 16607a22b9b1..000000000000 --- a/net-misc/netkit-routed/files/netkit-routed-0.17-printf.patch +++ /dev/null @@ -1,20 +0,0 @@ -echo -n isn't supported by all shells, use printf instead, which is portable. - -Patch by Andrew Miller. - -https://bugs.gentoo.org/529992 - ---- a/configure -+++ b/configure -@@ -235,10 +235,7 @@ - - echo 'Generating MCONFIG...' - ( -- echo -n '# Generated by configure (confgen version 2) on ' -- date -- echo '#' -- echo -+ printf "#\n# Generated by configure (confgen version 2) on $(date)\n#\n\n" - - echo "SBINDIR=$SBINDIR" - echo "MANDIR=$MANDIR" diff --git a/net-misc/netkit-routed/files/netkit-routed-0.17-time.patch b/net-misc/netkit-routed/files/netkit-routed-0.17-time.patch deleted file mode 100644 index 9aa866d48367..000000000000 --- a/net-misc/netkit-routed/files/netkit-routed-0.17-time.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/routed/main.c 2000-01-06 00:16:12.000000000 +0100 -+++ b/routed/main.c 2010-08-26 23:04:56.000000000 +0200 -@@ -57,6 +57,7 @@ - #include <syslog.h> - #include <assert.h> - #include <sys/utsname.h> -+#include <time.h> - - #define BUFSPACE (127*1024) /* max. input buffer size to request */ - ---- a/routed/trace.c 2000-07-23 01:25:11.000000000 +0200 -+++ b/routed/trace.c 2010-08-26 23:05:17.000000000 +0200 -@@ -50,6 +50,7 @@ - #include <syslog.h> - #include <errno.h> - #include "pathnames.h" -+#include <time.h> - - #define NRECORDS 50 /* size of circular trace buffer */ - diff --git a/net-misc/netkit-routed/files/routed.confd b/net-misc/netkit-routed/files/routed.confd deleted file mode 100644 index 1b27653ec59d..000000000000 --- a/net-misc/netkit-routed/files/routed.confd +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/conf.d/routed - -# Normally routed is simply run as "/usr/sbin/routed". Set this -# option to run routed with additional parameters, for example: -# -# -d Enable additional debugging information -# -s Force routed to supply routing information -# -q Opposite of the -s option -# -# Additional options are listed in the routed(8) manual page. -# -# Our default configuration is to run quietly, i.e. don't publish -# routes. This is to keep from catching users unaware since routed -# will publish routes if there's more than one interface configured on -# the machine. -ROUTED_OPTS="-q" diff --git a/net-misc/netkit-routed/files/routed.initd b/net-misc/netkit-routed/files/routed.initd deleted file mode 100644 index 3b022fb54586..000000000000 --- a/net-misc/netkit-routed/files/routed.initd +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - ebegin "Starting routed" - /sbin/start-stop-daemon --start --quiet \ - --exec /usr/sbin/routed -- ${ROUTED_OPTS} - eend $? -} - -stop() { - ebegin "Stopping routed" - /sbin/start-stop-daemon --stop --quiet --exec /usr/sbin/routed - eend $? -} diff --git a/net-misc/netkit-routed/metadata.xml b/net-misc/netkit-routed/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/net-misc/netkit-routed/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild b/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild deleted file mode 100644 index 0670c06e7c2e..000000000000 --- a/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit epatch toolchain-funcs - -DESCRIPTION="Netkit - routed" -HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" -SRC_URI="mirror://debian/pool/main/n/netkit-routed/${PN}_${PV}.orig.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~mips ppc sparc x86" -IUSE="" - -src_prepare() { - sed -i configure -e '/^LDFLAGS=/d' || die - epatch "${FILESDIR}"/${P}-time.patch - epatch "${FILESDIR}"/${P}-printf.patch #529992 -} - -src_configure() { - # Not an autotools generated configure script - ./configure --with-c-compiler=$(tc-getCC) || die -} - -src_install() { - # ripquery - dosbin ripquery/ripquery - doman ripquery/ripquery.8 - - # routed - dosbin routed/routed - dosym routed /usr/sbin/in.routed - doman routed/routed.8 - dosym routed.8 /usr/share/man/man8/in.routed.8 - - # docs - dodoc README ChangeLog - newdoc routed/README README.routed - - # init scripts - newconfd "${FILESDIR}"/routed.confd routed - newinitd "${FILESDIR}"/routed.initd routed -} diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild index 8b409884248c..b418b6da1309 100644 --- a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild +++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,13 +6,13 @@ EAPI=7 inherit pam toolchain-funcs fcaps DESCRIPTION="Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}" -HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" -SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz +HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit" +SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${P}.tar.gz mirror://gentoo/rexec-1.5.tar.gz" LICENSE="BSD" SLOT="0" -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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="pam" RDEPEND=" diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild index 585a64aabeab..c3975ba83c0f 100644 --- a/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild +++ b/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,8 +9,8 @@ MY_P=netkit-ntalk-${PV} S="${WORKDIR}"/netkit-ntalk-${PV} DESCRIPTION="Netkit - talkd" -HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" -SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit" +SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" @@ -34,7 +34,7 @@ src_prepare() { src_configure() { # not autotools based? - ./configure --with-c-compiler=$(tc-getCC) || die + ./configure --with-c-compiler="$(tc-getCC)" || die } src_compile() { diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild new file mode 100644 index 000000000000..17f40824b2df --- /dev/null +++ b/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_P=netkit-ntalk-${PV} + +DESCRIPTION="Netkit - talkd: Daemon to help set up talk sessions" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit" +SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${MY_P}.tar.gz" +S="${WORKDIR}"/netkit-ntalk-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +DEPEND=">=sys-libs/ncurses-5.2:=" +BDEPEND="virtual/pkgconfig" +RDEPEND=" + ${DEPEND} + virtual/inetd +" + +PATCHES=( + "${FILESDIR}"/${P}-time.patch + "${FILESDIR}"/${P}-ipv6.patch +) + +src_prepare() { + default + sed -i configure -e '/^LDFLAGS=/d' || die +} + +src_configure() { + # not autotools based? + ./configure --with-c-compiler="$(tc-getCC)" || die +} + +src_compile() { + emake LIBCURSES="$( $(tc-getPKG_CONFIG) --libs ncurses )" +} + +src_install() { + insinto /etc/xinetd.d + newins "${FILESDIR}"/talk.xinetd talk + dobin talk/talk + doman talk/talk.1 + dosbin talkd/talkd + dosym talkd /usr/sbin/in.talkd + doman talkd/talkd.8 + dosym talkd.8 /usr/share/man/man8/in.talkd.8 + dodoc README ChangeLog BUGS +} diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest index 87eda0ebbdb9..a3751905f6d4 100644 --- a/net-misc/netkit-telnetd/Manifest +++ b/net-misc/netkit-telnetd/Manifest @@ -1,2 +1,2 @@ DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3 -DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c +DIST netkit-telnet_0.17-42.debian.tar.xz 36068 BLAKE2B 393460c0e7a688c2c200e039ef1f462ecef0eba842982c64563325966148ee659ad1a86a8beea16046d5c1513c426d295787dc75b67f11201cdb091ec523a62a SHA512 0fa374bb4d9feff3a4cc84f7a2a9dcdacfdd22e5da9bcf253199d2e886d01da2cf5034820915ffbf50362814c3ce65ab1b6518e35e01b07c43839810fa3f8459 diff --git a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch deleted file mode 100644 index 31be21deac14..000000000000 --- a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/telnetd/Makefile 2004-09-29 22:16:50.175839840 -0500 -+++ b/telnetd/Makefile 2004-09-29 22:09:30.439689896 -0500 -@@ -10,7 +10,7 @@ - - CFLAGS += '-DISSUE_FILE="/etc/issue.net"' -DPARANOID_TTYS \ - -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS \ -- -DLOGIN_WRAPPER=\"/usr/lib/telnetlogin\" -+ -DLOGIN_WRAPPER=\"/usr/sbin/telnetlogin\" -D_GNU_SOURCE - # LIBS += $(LIBTERMCAP) - - OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \ ---- a/telnet/Makefile 2004-11-01 15:23:29 -0500 -+++ b/telnet/Makefile 2004-11-01 16:05:05 -0500 -@@ -6,7 +6,7 @@ - #CXXFLAGS:=$(patsubst -O2, -g, $(CXXFLAGS)) - - # -DAUTHENTICATE --CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE -+CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE -D_GNU_SOURCE - LIBS = $(LIBTERMCAP) - - SRCS = commands.cc main.cc network.cc ring.cc sys_bsd.cc telnet.cc \ - diff --git a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-r13-gentooification.patch b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-r13-gentooification.patch new file mode 100644 index 000000000000..3ca6b15a788a --- /dev/null +++ b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-r13-gentooification.patch @@ -0,0 +1,43 @@ +diff -Naur a/telnetd/CMakeLists.txt b/telnetd/CMakeLists.txt +--- a/telnetd/CMakeLists.txt 2022-02-07 17:37:04.831149960 +0100 ++++ b/telnetd/CMakeLists.txt 2022-02-07 17:42:48.482998276 +0100 +@@ -6,11 +6,11 @@ + -DNO_REVOKE \ + -DKLUDGELINEMODE \ + -DDIAGNOSTICS \ +- -DLOGIN_WRAPPER='\"/usr/lib/telnetlogin\"' \ ++ -DLOGIN_WRAPPER='\"/usr/sbin/telnetlogin\"' \ + ") + + add_executable( +- in.telnetd ++ telnetd + global.c + setproctitle.c + slc.c +@@ -21,19 +21,22 @@ + utility.c + ) + target_link_libraries( +- in.telnetd ++ telnetd + ncurses + util + ) + install( +- TARGETS in.telnetd ++ TARGETS telnetd + DESTINATION ${SBIN_DIR} + ) + + install( + FILES telnetd.8 + DESTINATION ${MAN_DIR}/man8/ +- RENAME in.telnetd.8 ++) ++install( ++ FILES issue.net.5 ++ DESTINATION ${MAN_DIR}/man5/ + ) + install( + CODE "execute_process( \ diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild deleted file mode 100644 index e88e6c213936..000000000000 --- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs - -PATCHLEVEL=41 -DESCRIPTION="Standard Linux telnet client and server" -#old HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" -# This might be the best HOMEPAGE now? -HOMEPAGE="https://launchpad.net/netkit-telnet" -# http://packages.debian.org/stablesource/netkit-telnet -# http://packages.debian.org/testing/source/netkit-telnet -# No upstream mirror exists anymore? -# old ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz -SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz - mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.debian.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="" - -DEPEND=">=sys-libs/ncurses-5.2:= - !net-misc/telnet-bsd" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/netkit-telnet-${PV} - -src_prepare() { - # Patch: [0] - # Gentoo used to lack a maintainer for this package. - # A security problem arose. While reviewing our options for how - # should we proceed with the security bug we decided it would be - # better to just stay in sync with debian's own netkit-telnet - # package. Lots of bug fixes by them over time which were not in - # our telnetd. - EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" eapply "${WORKDIR}/debian/patches" - - # Patch: [1] - # after the deb patch we need to add a small patch that defines - # gnu source. This is needed for gcc-3.4.x (needs to be pushed - # back to the deb folk?) - eapply "${FILESDIR}/netkit-telnetd-0.17-cflags-gnu_source.patch" - - # Fix portability issues. - sed -i \ - -e 's@echo -n@printf %s@' \ - configure || die - default -} - -src_configure() { - tc-export CC CXX - - # Not a real autoconf script. - ./configure --prefix=/usr || die - - sed -i \ - -e "s@-pipe -O2@${CFLAGS}@" \ - -e "s@^\(LDFLAGS=\).*@\1${LDFLAGS}@" \ - -e "s@-Wpointer-arith@@" \ - MCONFIG || die -} - -src_compile() { - emake - emake -C telnetlogin -} - -src_install() { - dobin telnet/telnet - - dosbin telnetd/telnetd - dosym telnetd /usr/sbin/in.telnetd - dosbin telnetlogin/telnetlogin - doman telnet/telnet.1 - doman telnetd/*.8 - doman telnetd/issue.net.5 - dosym telnetd.8 /usr/share/man/man8/in.telnetd.8 - doman telnetlogin/telnetlogin.8 - dodoc BUGS ChangeLog README - dodoc "${FILESDIR}/net.issue.sample" - newdoc telnet/README README.telnet - newdoc telnet/TODO TODO.telnet - insinto /etc/xinetd.d - newins "${FILESDIR}/telnetd.xinetd" telnetd -} diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild new file mode 100644 index 000000000000..1cdb22da14b8 --- /dev/null +++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit cmake + +PATCHLEVEL=42 +DESCRIPTION="Standard Linux telnet client and server" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit" +# http://packages.debian.org/stablesource/netkit-telnet +# http://packages.debian.org/testing/source/netkit-telnet +SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz + mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.debian.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +IUSE="selinux" + +DEPEND=" + >=sys-libs/ncurses-5.2:= + !net-misc/telnet-bsd +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-telnet ) +" + +S=${WORKDIR}/netkit-telnet-${PV} + +src_prepare() { + # Patch: [0] + # Gentoo used to lack a maintainer for this package. + # A security problem arose. While reviewing our options for how + # should we proceed with the security bug we decided it would be + # better to just stay in sync with debian's own netkit-telnet + # package. Lots of bug fixes by them over time which were not in + # our telnetd. + rm "${WORKDIR}/debian/patches/use-cmake-as-buildsystem-debian-extras.patch" || die + eapply "${WORKDIR}/debian/patches" + eapply "${FILESDIR}/netkit-telnetd-0.17-r13-gentooification.patch" + + cmake_src_prepare +} + +src_install() { + cmake_src_install + + dosym telnetd /usr/sbin/in.telnetd + dodoc "${FILESDIR}/net.issue.sample" + newdoc telnet/README README.telnet + newdoc telnet/TODO TODO.telnet + insinto /etc/xinetd.d + newins "${FILESDIR}/telnetd.xinetd" telnetd +} diff --git a/net-misc/netkit-timed/netkit-timed-0.17-r10.ebuild b/net-misc/netkit-timed/netkit-timed-0.17-r11.ebuild index bde888f10c2d..97fea191319b 100644 --- a/net-misc/netkit-timed/netkit-timed-0.17-r10.ebuild +++ b/net-misc/netkit-timed/netkit-timed-0.17-r11.ebuild @@ -1,34 +1,31 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 inherit flag-o-matic toolchain-funcs -IUSE="" -DESCRIPTION="Netkit - timed" -SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz" -HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" +DESCRIPTION="Netkit - timed: Time daemon" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit" +SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${P}.tar.gz" + KEYWORDS="amd64 ~mips ppc ppc64 sparc x86" LICENSE="BSD GPL-2" SLOT="0" -DEPEND="" -RDEPEND="" - src_prepare() { eapply "${FILESDIR}"/0.17-CFLAG-DEF-fix.patch eapply "${FILESDIR}"/0.17-timed-opt-parsing.patch - sed -i configure \ - -e '/^LDFLAGS=/d' \ - || die "sed configure" + sed -i -e '/^LDFLAGS=/d' configure || die "sed configure" + sed -i -e "s|ar -cruv|\${AR} -cruv|g" timed/lib/Makefile || die default } src_configure() { + tc-export AR # Note this is not an autoconf configure script. econf fails append-flags -DCLK_TCK=CLOCKS_PER_SEC - ./configure --prefix=/usr --with-c-compiler=$(tc-getCC) || die "bad configure" + ./configure --prefix=/usr --with-c-compiler="$(tc-getCC)" || die "bad configure" } src_install() { @@ -36,7 +33,7 @@ src_install() { doman timed/timed/timed.8 dosbin timed/timedc/timedc doman timed/timedc/timedc.8 - dodoc README ChangeLog BUGS + einstalldocs newinitd "${FILESDIR}"/timed.rc6 timed } diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest index 0ec04065a386..1fd47dc6c824 100644 --- a/net-misc/netopeer2/Manifest +++ b/net-misc/netopeer2/Manifest @@ -1,2 +1 @@ -DIST netopeer2-2.0.30.tar.gz 382529 BLAKE2B e17bc4eceb07b91347aac4e5167d7a92bfd7bfde77a79f27b6531f4ad0c77fc42e9281ed156b017969171dbb9f25e2570e9b2db1a85af9da896d5f39bd902555 SHA512 f0ec1b1e469b5a39ec4ae9533bc0cea6391068502defba3e3f25b154a573d37c030283b4483e27a11e8e372f580110af7df7279c6e1be3a2fec249a6b79c3d95 -DIST netopeer2-2.0.35.tar.gz 381321 BLAKE2B c776561b59bf05d093496e242fdb37766bf6292175186f92b85b86162d5fd6bba7118c41cef0ccfc835b09f34da1978f4e3aefb9961893b3d15b57117c3dbdb6 SHA512 f6b956c4b9d0f799f622eba62c2b20beb5f7db4899c6284bbb53303ff15f8787644687eeb99f1c68b455784166f2e858959ee16a345c0aabc444952bde70427d +DIST netopeer2-2.1.59.tar.gz 390371 BLAKE2B 777ff3a5db93bbeabb0f19dfb9a23b67f1945a834cfff716b3144fe24c62f848f048e35fac8ae6d10a7040bdbb29e1ff8ff3559f68a46ccf23fe958152adc3da SHA512 4eb889cb018f22308578712edcaf2f2e20dc4fddf45dded66f644c5288e3ef16cdcf00e61f3d03a2b8e97c4f31441d46651fea12bc3af229aae9b720de59789f diff --git a/net-misc/netopeer2/netopeer2-2.0.35.ebuild b/net-misc/netopeer2/netopeer2-2.0.35.ebuild deleted file mode 100644 index 04f0cbece36f..000000000000 --- a/net-misc/netopeer2/netopeer2-2.0.35.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Server for implementing NETCONF configuration management" -HOMEPAGE="https://github.com/CESNET/netopeer2" -SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-libs/openssl:= - net-misc/curl:= - >=net-misc/sysrepo-2.0.53:= - >=net-libs/libnetconf2-2.0.24:= - net-libs/libssh:= - >=net-libs/libyang-2.0.112:=" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_configure() { - local mycmakeargs=( - -DGENERATE_HOSTKEY=OFF - -DINSTALL_MODULES=OFF - -DMERGE_LISTEN_CONFIG=OFF - -DENABLE_TESTS=OFF - -DENABLE_VALGRIND_TESTS=OFF - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /etc/netopeer2 - doins -r scripts/. -} - -pkg_postinst() { - elog "In order to do initial server setup please" - elog "run setup scripts located in /etc/netopeer2" -} diff --git a/net-misc/netopeer2/netopeer2-2.0.30.ebuild b/net-misc/netopeer2/netopeer2-2.1.59-r1.ebuild index e47eeecc25b5..7ccaa1384f4a 100644 --- a/net-misc/netopeer2/netopeer2-2.0.30.ebuild +++ b/net-misc/netopeer2/netopeer2-2.1.59-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,15 +11,16 @@ SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~x86" RDEPEND=" + app-misc/c_rehash dev-libs/openssl:= net-misc/curl:= - >=net-misc/sysrepo-2.0.47:= - >=net-libs/libnetconf2-2.0.19:= + >=net-misc/sysrepo-2.2.60 + >=net-libs/libnetconf2-2.1.31 net-libs/libssh:= - >=net-libs/libyang-2.0.97:=" + >=net-libs/libyang-2.1.55" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" diff --git a/net-misc/netsed/netsed-1.3.ebuild b/net-misc/netsed/netsed-1.3-r1.ebuild index ff0fe3ff7439..417929a0f491 100644 --- a/net-misc/netsed/netsed-1.3.ebuild +++ b/net-misc/netsed/netsed-1.3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Small tool for altering forwarded network data in real time" HOMEPAGE="http://silicone.homelinux.org/projects/netsed/" @@ -10,6 +10,10 @@ SRC_URI="http://silicone.homelinux.org/release/netsed/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-lang/ruby )" src_compile() { emake CFLAGS="${CFLAGS}" diff --git a/net-misc/netstat-nat/files/netstat-nat-1.4.10-docdir.patch b/net-misc/netstat-nat/files/netstat-nat-1.4.10-docdir.patch new file mode 100644 index 000000000000..9edd402621a1 --- /dev/null +++ b/net-misc/netstat-nat/files/netstat-nat-1.4.10-docdir.patch @@ -0,0 +1,9 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,5 @@ + bin_PROGRAMS = netstat-nat + netstat_nat_SOURCES = netstat-nat.c netstat-nat.h +-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) + doc_DATA = NEWS README ChangeLog AUTHORS + dist_man_MANS = netstat-nat.1 + EXTRA_DIST = netstat-nat.spec diff --git a/net-misc/netstat-nat/files/netstat-nat-1.4.10-modern-c.patch b/net-misc/netstat-nat/files/netstat-nat-1.4.10-modern-c.patch new file mode 100644 index 000000000000..c800e73b1474 --- /dev/null +++ b/net-misc/netstat-nat/files/netstat-nat-1.4.10-modern-c.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/875149 +--- a/netstat-nat.h ++++ b/netstat-nat.h +@@ -64,6 +64,9 @@ void ip_addresses_add(struct _ip_addresses **list, const char *dev, const char * + int ip_addresses_search(struct _ip_addresses *list, const char *ip); + void ip_addresses_free(struct _ip_addresses **list); + ++int string_search(char *string, char *search); ++int search_first_hit(char *search, char *line, char *ret); ++int search_sec_hit(char *search, char *line, char *ret); + + #define strcopy(dst, dst_size, src) \ + strncpy(dst, src, (dst_size - 1)); diff --git a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.10-r1.ebuild index 2d94fe2f5dfc..3650b7cef189 100644 --- a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild +++ b/net-misc/netstat-nat/netstat-nat-1.4.10-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -15,6 +15,8 @@ KEYWORDS="amd64 ~arm ppc sparc x86" PATCHES=( "${FILESDIR}"/${P}-install.patch + "${FILESDIR}"/${P}-modern-c.patch + "${FILESDIR}"/${P}-docdir.patch ) src_prepare() { diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 7d6ceebeb8c7..a3c0112c9bd5 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1,4 +1 @@ -DIST NetworkManager-1.32.10.tar.xz 5353296 BLAKE2B af176abd4dd8f725741cc8fde10245606d1b00cb6b11cde11b2e3bce74a33980fdf76fab5c6c769a4275c5168098cb2531a0a03909db8eef5fa502d464d59bd1 SHA512 c4eb9114869efba197c3ec1e99d7d5bc54222d9c7118cf699fe61130952a20376a760b86909290d6312a4a23016d51f9ff90ba8eadbbcda84ce811e441293d8d -DIST NetworkManager-1.32.12.tar.xz 5373452 BLAKE2B 29ca1f1c2aea60e4ddc7e3d5464604b329c8b740a2a143266c0bc05ec6a16079cfdf67770fc75afe523664e2e4234189031a8ffa2f51c0f02d4760f3ab20e04a SHA512 b8dfa409302781fdab19790afeb7f4396875e282d6983e2c5775294c8c13d3c1036dee69a37bf6e4fb2a2e80504c8e792780b6a9c1262616e57860da5ebc0e61 -DIST NetworkManager-1.32.4.tar.xz 5250412 BLAKE2B 6c0931d50a8666f88865d4ca5281e1570dd230156e30bb27822c9ea3d93b3b3b24f336e154787794e7edd7c00296f9f7c5761136cac0c0eacf142a0371cbfe81 SHA512 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684 -DIST NetworkManager-1.32.8.tar.xz 5255076 BLAKE2B 5f1bc55e3b9e6864c05421c8506ac202162deaf5081450e5d50f52699abc2d9bfb6e89b6f48c9874cccdc11fe754a5063a63e830702e211cf178ce7df0d628fb SHA512 328733f3dce9e52e680e464b60112995439f94dfeaea3b6c2082b323e85418483db6c6dc9e43f52176ff7c1291b226db77fe5acab9935dad7735c4397f5e9b83 +DIST NetworkManager-1.46.0.tar.xz 7033296 BLAKE2B db190876105d83c8d2ef7e827fa653ab14f9687ab18392600e04d20020d1dc797d3857c9fb05111fcafd18fe477b93947566100ea7113758703842cded71ed40 SHA512 27f234ad5b715ad0ae9d6adcdc91a4499b76fe78d3a5644aced8976588f0e82f2d03daec47589f1313b9802207c784ade67e921d4d2fa3c813cbf727558ad407 diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml index b13ea61c9d14..b052b568a851 100644 --- a/net-misc/networkmanager/metadata.xml +++ b/net-misc/networkmanager/metadata.xml @@ -1,61 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="concheck">Enable connectivity checking support</flag> - <flag name="connection-sharing"> - Support connection sharing (uses <pkg>net-dns/dnsmasq</pkg>) - </flag> - <flag name="dhclient"> - Use dhclient from <pkg>net-misc/dhcp</pkg> for getting an IP via DHCP - </flag> - <flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting an IP</flag> - <flag name="elogind"> - Use <pkg>sys-auth/elogind</pkg> for session tracking - </flag> - <flag name="iptables"> - Use <pkg>net-firewall/iptables</pkg> for connection sharing - </flag> - <flag name="iwd"> - Use <pkg>net-wireless/iwd</pkg> instead of - <pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default - </flag> - <flag name="psl"> - Use public suffix list via <pkg>net-libs/libpsl</pkg> - </flag> - <flag name="lto">Build using Link Time Optimizations (LTO)</flag> - <flag name="modemmanager"> - Enable support for mobile broadband devices using - <pkg>net-misc/modemmanager</pkg> - </flag> - <flag name="nftables"> - Use <pkg>net-firewall/nftables</pkg> for connection sharing - </flag> - <flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag> - <flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag> - <flag name="ovs">Enable OpenVSwitch support</flag> - <flag name="ppp"> - Enable support for mobile broadband and PPPoE connections using - <pkg>net-dialup/ppp</pkg> - </flag> - <flag name="resolvconf"> - Use <pkg>net-dns/openresolv</pkg> for managing DNS information in - /etc/resolv.conf. Generally, a symlink to /run/NetworkManager/resolv.conf - is simpler. On systems running systemd-resolved, disable this flag and - create a symlink to /run/systemd/resolve/stub-resolv.conf. - </flag> - <flag name="teamd">Enable Teamd control support</flag> - <flag name="tools"> - Build cli tools such as nmcli, nmtui and nm_cloud_setup - </flag> - <flag name="wifi">Enable support for wifi and 802.1x security</flag> - <flag name="wext"> - Enable support for the deprecated Wext (Wireless Extensions) API; needed - for some older drivers (e.g. ipw2200, ndiswrapper) - </flag> - </use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="concheck">Enable connectivity checking support</flag> + <flag name="connection-sharing">Support connection sharing (uses <pkg>net-dns/dnsmasq</pkg>)</flag> + <flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for getting an IP via DHCP</flag> + <flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting an IP</flag> + <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag> + <flag name="iptables">Use <pkg>net-firewall/iptables</pkg> for connection sharing</flag> + <flag name="iwd">Use <pkg>net-wireless/iwd</pkg> instead of <pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default</flag> + <flag name="psl">Use public suffix list via <pkg>net-libs/libpsl</pkg></flag> + <flag name="modemmanager">Enable support for mobile broadband devices using <pkg>net-misc/modemmanager</pkg></flag> + <flag name="nftables">Use <pkg>net-firewall/nftables</pkg> for connection sharing</flag> + <flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag> + <flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag> + <flag name="ovs">Enable OpenVSwitch support</flag> + <flag name="ppp">Enable support for mobile broadband and PPPoE connections using <pkg>net-dialup/ppp</pkg></flag> + <flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing DNS information in /etc/resolv.conf. Generally, a symlink to /run/NetworkManager/resolv.conf is simpler. On systems running systemd-resolved, disable this flag and create a symlink to /run/systemd/resolve/stub-resolv.conf.</flag> + <flag name="teamd">Enable Teamd control support</flag> + <flag name="tools">Build cli tools such as nmcli, nmtui and nm_cloud_setup</flag> + <flag name="wifi">Enable support for wifi and 802.1x security</flag> + <flag name="wext">Enable support for the deprecated Wext (Wireless Extensions) API; needed for some older drivers (e.g. ipw2200, ndiswrapper)</flag> + </use> + <upstream> + <remote-id type="freedesktop-gitlab">NetworkManager/NetworkManager</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild deleted file mode 100644 index bb8fdd3a3208..000000000000 --- a/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild +++ /dev/null @@ -1,382 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME_ORG_MODULE="NetworkManager" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7..10} ) - -inherit gnome.org linux-info meson-multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" - -IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - bluetooth? ( modemmanager ) - connection-sharing? ( || ( iptables nftables ) ) - iwd? ( wifi ) - vala? ( introspection ) - wext? ( wifi ) - ^^ ( gnutls nss ) - ?? ( elogind systemd ) - ?? ( dhclient dhcpcd ) - ?? ( syslog systemd ) -" - -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86" - -COMMON_DEPEND=" - sys-apps/util-linux[${MULTILIB_USEDEP}] - elogind? ( >=sys-auth/elogind-219 ) - >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - sys-apps/dbus - net-libs/libndp - systemd? ( >=sys-apps/systemd-209:0= ) - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - selinux? ( sys-libs/libselinux ) - audit? ( sys-process/audit ) - teamd? ( - >=dev-libs/jansson-2.7:= - >=net-misc/libteam-1.9 - ) - policykit? ( >=sys-auth/polkit-0.106 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - gnutls? ( - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] - ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - modemmanager? ( - net-misc/mobile-broadband-provider-info - >=net-misc/modemmanager-0.7.991:0= - ) - bluetooth? ( >=net-wireless/bluez-5 ) - ofono? ( net-misc/ofono ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) - ovs? ( >=dev-libs/jansson-2.7:= ) - resolvconf? ( net-dns/openresolv ) - connection-sharing? ( - net-dns/dnsmasq[dbus,dhcp] - iptables? ( net-firewall/iptables ) - nftables? ( net-firewall/nftables ) - ) - psl? ( net-libs/libpsl ) - concheck? ( net-misc/curl ) - tools? ( - sys-libs/readline:0= - >=dev-libs/newt-0.52.15 - ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/plugdev - || ( - net-misc/iputils[arping(+)] - net-analyzer/arping - ) - wifi? ( - !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) - iwd? ( net-wireless/iwd ) - ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.18 - net-libs/libndp[${MULTILIB_USEDEP}] -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc - app-text/docbook-xml-dtd:4.1.2 - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - introspection? ( - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - dev-lang/perl - dev-libs/libxslt - ) - vala? ( $(vala_depend) ) - test? ( - >=dev-libs/jansson-2.7 - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - if use introspection; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return - fi - if use test; then - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - fi -} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi - fi -} - -pkg_setup() { - if use connection-sharing; then - if kernel_is lt 5 1; then - CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" - else - CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" - fi - linux-info_pkg_setup - fi - if use introspection || use test; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - default - use vala && vala_src_prepare - - sed -i \ - -e 's#/usr/bin/sed#/bin/sed#' \ - data/84-nm-drivers.rules \ - || die -} - -multilib_src_configure() { - local emesonargs=( - --localstatedir="${EPREFIX}/var" - - -Dsystemdsystemunitdir=$(systemd_get_systemunitdir) - -Dsystem_ca_path=/etc/ssl/certs - -Dudev_dir=$(get_udevdir) - -Ddbus_conf_dir=/usr/share/dbus-1/system.d - -Dkernel_firmware_dir=/lib/firmware - -Diptables=/sbin/iptables - -Dnft=/sbin/nft - -Ddnsmasq=/usr/sbin/dnsmasq - #-Ddnssec_trigger= - - -Ddist_version=${PVR} - $(meson_native_use_bool policykit polkit) - $(meson_native_use_bool policykit config_auth_polkit_default) - -Dmodify_system=true - -Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1 - $(meson_native_use_bool selinux) - $(meson_native_use_bool systemd systemd_journal) - -Dhostname_persist=gentoo - -Dlibaudit=$(multilib_native_usex audit) - - $(meson_native_use_bool wext) - $(meson_native_use_bool wifi) - $(meson_native_use_bool iwd) - $(meson_native_use_bool ppp) - -Dpppd=/usr/sbin/pppd - $(meson_native_use_bool modemmanager modem_manager) - $(meson_native_use_bool ofono) - $(meson_native_use_bool concheck) - $(meson_native_use_bool teamd teamdctl) - $(meson_native_use_bool ovs) - $(meson_native_use_bool tools nmcli) - $(meson_native_use_bool tools nmtui) - $(meson_native_use_bool tools nm_cloud_setup) - $(meson_native_use_bool bluetooth bluez5_dun) - -Debpf=true - - -Dconfig_plugins_default=keyfile - -Difcfg_rh=false - -Difupdown=false - - $(meson_native_use_feature resolvconf) - -Dnetconfig=disable - -Dconfig_dns_rc_manager_default=symlink - - $(meson_feature dhclient) - -Ddhcpcanon=disable - $(meson_feature dhcpcd) - - $(meson_native_use_bool introspection) - $(meson_native_use_bool vala vapi) - $(meson_native_true docs) - -Dtests=$(multilib_native_usex test) - $(meson_native_true firewalld_zone) - -Dmore_asserts=0 - $(meson_use debug more_logging) - -Dvalgrind=no - -Dvalgrind_suppressions= - -Dld_gc=false - $(meson_native_use_bool psl libpsl) - -Dqt=false - - $(meson_use lto b_lto) - ) - - if multilib_is_native_abi && use systemd; then - emesonargs+=( -Dsession_tracking_consolekit=false ) - emesonargs+=( -Dsession_tracking=systemd ) - emesonargs+=( -Dsuspend_resume=systemd ) - elif multilib_is_native_abi && use elogind; then - emesonargs+=( -Dsession_tracking_consolekit=false ) - emesonargs+=( -Dsession_tracking=elogind ) - emesonargs+=( -Dsuspend_resume=elogind ) - else - emesonargs+=( -Dsession_tracking_consolekit=false ) - emesonargs+=( -Dsession_tracking=no ) - emesonargs+=( -Dsuspend_resume=auto ) - fi - - if multilib_is_native_abi && use syslog; then - emesonargs+=( -Dconfig_logging_backend_default=syslog ) - elif multilib_is_native_abi && use systemd; then - emesonargs+=( -Dconfig_logging_backend_default=journal ) - else - emesonargs+=( -Dconfig_logging_backend_default=default ) - fi - - if multilib_is_native_abi && use dhclient; then - emesonargs+=( -Dconfig_dhcp_default=dhclient ) - elif multilib_is_native_abi && use dhcpcd; then - emesonargs+=( -Dconfig_dhcp_default=dhcpcd ) - else - emesonargs+=( -Dconfig_dhcp_default=internal ) - fi - - if use nss; then - emesonargs+=( -Dcrypto=nss ) - else - emesonargs+=( -Dcrypto=gnutls ) - fi - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - meson_src_configure -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx meson_src_test - fi -} - -multilib_src_install() { - meson_src_install - if ! multilib_is_native_abi; then - rm -rf "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} - fi -} - -multilib_src_install_all() { - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - insinto /usr/lib/NetworkManager/conf.d #702476 - doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf - - if use iwd; then - # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir - cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf - [device] - wifi.backend=iwd - EOF - fi - - mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die - rmdir "${ED}"/usr/share/doc/NetworkManager || die - - # Empty - rmdir "${ED}"/var{/lib{/NetworkManager,},} || die -} - -pkg_postinst() { - systemd_reenable NetworkManager.service - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi - - if use dhclient || use dhcpcd; then - ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" - ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" - ewarn "works for you, and you're happy with, the alternative USE flags can be" - ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" - ewarn "the main.dhcp configuration option to use one of them instead of internal." - fi -} diff --git a/net-misc/networkmanager/networkmanager-1.32.12.ebuild b/net-misc/networkmanager/networkmanager-1.32.12.ebuild deleted file mode 100644 index e158bf041108..000000000000 --- a/net-misc/networkmanager/networkmanager-1.32.12.ebuild +++ /dev/null @@ -1,392 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME_ORG_MODULE="NetworkManager" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7..10} ) - -inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" - -IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - bluetooth? ( modemmanager ) - connection-sharing? ( || ( iptables nftables ) ) - gtk-doc? ( introspection ) - iwd? ( wifi ) - vala? ( introspection ) - wext? ( wifi ) - ^^ ( gnutls nss ) - ?? ( elogind systemd ) - ?? ( dhclient dhcpcd ) - ?? ( syslog systemd ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -COMMON_DEPEND=" - sys-apps/util-linux[${MULTILIB_USEDEP}] - elogind? ( >=sys-auth/elogind-219 ) - >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - sys-apps/dbus - net-libs/libndp - systemd? ( >=sys-apps/systemd-209:0= ) - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - selinux? ( sys-libs/libselinux ) - audit? ( sys-process/audit ) - teamd? ( - >=dev-libs/jansson-2.7:= - >=net-misc/libteam-1.9 - ) - policykit? ( >=sys-auth/polkit-0.106 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - gnutls? ( - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] - ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - modemmanager? ( - net-misc/mobile-broadband-provider-info - >=net-misc/modemmanager-0.7.991:0= - ) - bluetooth? ( >=net-wireless/bluez-5 ) - ofono? ( net-misc/ofono ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) - ovs? ( >=dev-libs/jansson-2.7:= ) - resolvconf? ( net-dns/openresolv ) - connection-sharing? ( - net-dns/dnsmasq[dbus,dhcp] - iptables? ( net-firewall/iptables ) - nftables? ( net-firewall/nftables ) - ) - psl? ( net-libs/libpsl ) - concheck? ( net-misc/curl ) - tools? ( - sys-libs/readline:0= - >=dev-libs/newt-0.52.15 - ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/plugdev - || ( - net-misc/iputils[arping(+)] - net-analyzer/arping - ) - wifi? ( - !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) - iwd? ( net-wireless/iwd ) - ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.18 - net-libs/libndp[${MULTILIB_USEDEP}] -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - gtk-doc? ( - dev-util/gtk-doc - app-text/docbook-xml-dtd:4.1.2 - ) - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - introspection? ( - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - dev-lang/perl - dev-libs/libxslt - ) - vala? ( $(vala_depend) ) - test? ( - >=dev-libs/jansson-2.7 - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - if use introspection; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return - fi - if use test; then - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - fi -} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi - fi -} - -pkg_setup() { - if use connection-sharing; then - if kernel_is lt 5 1; then - CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" - else - CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" - fi - linux-info_pkg_setup - fi - - if use introspection || use test; then - python-any-r1_pkg_setup - fi - - # bug 809695 - if tc-is-clang && use lto; then - eerror "Clang does not support -flto-partition" - die "Please use gcc or turn off USE=lto flag when building with clang" - fi -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - default - use vala && vala_src_prepare - - sed -i \ - -e 's#/usr/bin/sed#/bin/sed#' \ - data/84-nm-drivers.rules \ - || die -} - -multilib_src_configure() { - local emesonargs=( - --localstatedir="${EPREFIX}/var" - - -Dsystemdsystemunitdir=$(systemd_get_systemunitdir) - -Dsystem_ca_path=/etc/ssl/certs - -Dudev_dir=$(get_udevdir) - -Ddbus_conf_dir=/usr/share/dbus-1/system.d - -Dkernel_firmware_dir=/lib/firmware - -Diptables=/sbin/iptables - -Dnft=/sbin/nft - -Ddnsmasq=/usr/sbin/dnsmasq - #-Ddnssec_trigger= - - -Ddist_version=${PVR} - $(meson_native_use_bool policykit polkit) - $(meson_native_use_bool policykit config_auth_polkit_default) - -Dmodify_system=true - -Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1 - $(meson_native_use_bool selinux) - $(meson_native_use_bool systemd systemd_journal) - -Dhostname_persist=gentoo - -Dlibaudit=$(multilib_native_usex audit) - - $(meson_native_use_bool wext) - $(meson_native_use_bool wifi) - $(meson_native_use_bool iwd) - $(meson_native_use_bool ppp) - -Dpppd=/usr/sbin/pppd - $(meson_native_use_bool modemmanager modem_manager) - $(meson_native_use_bool ofono) - $(meson_native_use_bool concheck) - $(meson_native_use_bool teamd teamdctl) - $(meson_native_use_bool ovs) - $(meson_native_use_bool tools nmcli) - $(meson_native_use_bool tools nmtui) - $(meson_native_use_bool tools nm_cloud_setup) - $(meson_native_use_bool bluetooth bluez5_dun) - -Debpf=true - - -Dconfig_plugins_default=keyfile - -Difcfg_rh=false - -Difupdown=false - - $(meson_native_use_feature resolvconf) - -Dnetconfig=disable - -Dconfig_dns_rc_manager_default=symlink - - $(meson_feature dhclient) - -Ddhcpcanon=disable - $(meson_feature dhcpcd) - - $(meson_native_use_bool introspection) - $(meson_native_use_bool vala vapi) - $(meson_native_use_bool gtk-doc docs) - -Dtests=$(multilib_native_usex test) - $(meson_native_true firewalld_zone) - -Dmore_asserts=0 - $(meson_use debug more_logging) - -Dvalgrind=no - -Dvalgrind_suppressions= - -Dld_gc=false - $(meson_native_use_bool psl libpsl) - -Dqt=false - - $(meson_use lto b_lto) - ) - - if multilib_is_native_abi && use systemd; then - emesonargs+=( -Dsession_tracking_consolekit=false ) - emesonargs+=( -Dsession_tracking=systemd ) - emesonargs+=( -Dsuspend_resume=systemd ) - elif multilib_is_native_abi && use elogind; then - emesonargs+=( -Dsession_tracking_consolekit=false ) - emesonargs+=( -Dsession_tracking=elogind ) - emesonargs+=( -Dsuspend_resume=elogind ) - else - emesonargs+=( -Dsession_tracking_consolekit=false ) - emesonargs+=( -Dsession_tracking=no ) - emesonargs+=( -Dsuspend_resume=auto ) - fi - - if multilib_is_native_abi && use syslog; then - emesonargs+=( -Dconfig_logging_backend_default=syslog ) - elif multilib_is_native_abi && use systemd; then - emesonargs+=( -Dconfig_logging_backend_default=journal ) - else - emesonargs+=( -Dconfig_logging_backend_default=default ) - fi - - if multilib_is_native_abi && use dhclient; then - emesonargs+=( -Dconfig_dhcp_default=dhclient ) - elif multilib_is_native_abi && use dhcpcd; then - emesonargs+=( -Dconfig_dhcp_default=dhcpcd ) - else - emesonargs+=( -Dconfig_dhcp_default=internal ) - fi - - if use nss; then - emesonargs+=( -Dcrypto=nss ) - else - emesonargs+=( -Dcrypto=gnutls ) - fi - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - meson_src_configure -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx meson_src_test - fi -} - -multilib_src_install() { - meson_src_install - if ! multilib_is_native_abi; then - rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die - fi -} - -multilib_src_install_all() { - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules - - insinto /usr/lib/NetworkManager/conf.d #702476 - doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf - - if use iwd; then - # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir - cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die - [device] - wifi.backend=iwd - EOF - fi - - mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die - rmdir "${ED}"/usr/share/doc/NetworkManager || die - - # Empty - rmdir "${ED}"/var{/lib{/NetworkManager,},} || die -} - -pkg_postinst() { - systemd_reenable NetworkManager.service - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi - - if use dhclient || use dhcpcd; then - ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" - ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" - ewarn "works for you, and you're happy with, the alternative USE flags can be" - ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" - ewarn "the main.dhcp configuration option to use one of them instead of internal." - fi -} diff --git a/net-misc/networkmanager/networkmanager-1.32.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.4-r1.ebuild deleted file mode 100644 index b023b5c78bca..000000000000 --- a/net-misc/networkmanager/networkmanager-1.32.4-r1.ebuild +++ /dev/null @@ -1,349 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME_ORG_MODULE="NetworkManager" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7..10} ) - -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" - -IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - bluetooth? ( modemmanager ) - connection-sharing? ( || ( iptables nftables ) ) - iwd? ( wifi ) - vala? ( introspection ) - wext? ( wifi ) - || ( nss gnutls ) - ?? ( elogind systemd ) -" - -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86" - -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -COMMON_DEPEND=" - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - policykit? ( >=sys-auth/polkit-0.106 ) - net-libs/libndp[${MULTILIB_USEDEP}] - >=net-misc/curl-7.24 - net-misc/iputils - sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - audit? ( sys-process/audit ) - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dbus,dhcp] - iptables? ( net-firewall/iptables ) - nftables? ( net-firewall/nftables ) - ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - modemmanager? ( >=net-misc/modemmanager-0.7.991:0= - net-misc/mobile-broadband-provider-info ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - !nss? ( gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) - ofono? ( net-misc/ofono ) - ovs? ( dev-libs/jansson:= ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - resolvconf? ( net-dns/openresolv ) - selinux? ( sys-libs/libselinux ) - systemd? ( >=sys-apps/systemd-209:0= ) - teamd? ( - dev-libs/jansson:= - >=net-misc/libteam-1.9 - ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/plugdev - || ( - net-misc/iputils[arping(+)] - net-analyzer/arping - ) - wifi? ( - !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) - iwd? ( net-wireless/iwd ) - ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.18 - " -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - introspection? ( - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - dev-lang/perl - dev-libs/libxslt - ) - vala? ( $(vala_depend) ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - if use introspection; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return - fi - if use test; then - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - fi -} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -pkg_setup() { - if use connection-sharing; then - if kernel_is lt 5 1; then - CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" - else - CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" - fi - linux-info_pkg_setup - fi - if use introspection || use test; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - use vala && vala_src_prepare - gnome2_src_prepare - - sed -i \ - -e 's#/usr/bin/sed#/bin/sed#' \ - data/84-nm-drivers.rules \ - || die -} - -multilib_src_configure() { - local myconf=( - --disable-more-warnings - --disable-static - --localstatedir=/var - --with-runstatedir=/run - --disable-lto - --disable-qt - --without-netconfig - --with-dbus-sys-dir=/etc/dbus-1/system.d - $(multilib_native_with nmcli) - --with-udev-dir="$(get_udevdir)" - --with-config-plugins-default=keyfile - --with-iptables=/sbin/iptables - --with-nft=/sbin/nft - --with-ebpf=yes - $(multilib_native_enable concheck) - --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) - --with-crypto=$(usex nss nss gnutls) - # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option - # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. - # (There is no off switch, and we do not support upower.) - # bug #747358 - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - $(multilib_native_use_with audit libaudit) - $(multilib_native_use_enable bluetooth bluez5-dun) - --without-dhcpcanon - $(use_with dhclient) - $(use_with dhcpcd) - --with-config-dhcp-default=internal - $(multilib_native_use_enable introspection) - $(multilib_native_use_enable ppp) - --without-libpsl - $(multilib_native_use_with modemmanager modem-manager-1) - $(multilib_native_use_with ncurses nmtui) - $(multilib_native_use_with ofono) - $(multilib_native_use_enable ovs) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_with resolvconf) - $(multilib_native_use_with selinux) - $(multilib_native_use_with systemd systemd-journal) - $(multilib_native_use_enable teamd teamdctl) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable vala) - --without-valgrind - $(multilib_native_use_with wifi iwd) - $(multilib_native_use_with wext) - $(multilib_native_use_enable wifi) - ) - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - ln -s "${S}/docs" docs || die - ln -s "${S}/man" man || die - fi - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - local targets=( - src/libnm-client-impl/libnm.la - ) - emake "${targets[@]}" - fi -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx emake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - insinto /usr/lib/NetworkManager/conf.d #702476 - doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf - else - local targets=( - install-libLTLIBRARIES - install-libnmincludeHEADERS - install-nodist_libnmincludeHEADERS - install-pkgconfigDATA - ) - emake DESTDIR="${D}" "${targets[@]}" - fi -} - -multilib_src_install_all() { - einstalldocs - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - if use iwd; then - # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir - cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf - [device] - wifi.backend=iwd - EOF - fi - - # Empty - rmdir "${ED}"/var{/lib{/NetworkManager,},} || die -} - -pkg_postinst() { - gnome2_pkg_postinst - systemd_reenable NetworkManager.service - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi - - if use dhclient || use dhcpcd; then - ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" - ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" - ewarn "works for you, and you're happy with, the alternative USE flags can be" - ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" - ewarn "the main.dhcp configuration option to use one of them instead of internal." - fi -} diff --git a/net-misc/networkmanager/networkmanager-1.32.8-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.8-r1.ebuild deleted file mode 100644 index fbad986ec7e9..000000000000 --- a/net-misc/networkmanager/networkmanager-1.32.8-r1.ebuild +++ /dev/null @@ -1,349 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME_ORG_MODULE="NetworkManager" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7..10} ) - -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" - -IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - bluetooth? ( modemmanager ) - connection-sharing? ( || ( iptables nftables ) ) - iwd? ( wifi ) - vala? ( introspection ) - wext? ( wifi ) - || ( nss gnutls ) - ?? ( elogind systemd ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -COMMON_DEPEND=" - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - policykit? ( >=sys-auth/polkit-0.106 ) - net-libs/libndp[${MULTILIB_USEDEP}] - >=net-misc/curl-7.24 - net-misc/iputils - sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - audit? ( sys-process/audit ) - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dbus,dhcp] - iptables? ( net-firewall/iptables ) - nftables? ( net-firewall/nftables ) - ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - modemmanager? ( >=net-misc/modemmanager-0.7.991:0= - net-misc/mobile-broadband-provider-info ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - !nss? ( gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) - ofono? ( net-misc/ofono ) - ovs? ( dev-libs/jansson:= ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - resolvconf? ( net-dns/openresolv ) - selinux? ( sys-libs/libselinux ) - systemd? ( >=sys-apps/systemd-209:0= ) - teamd? ( - dev-libs/jansson:= - >=net-misc/libteam-1.9 - ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/plugdev - || ( - net-misc/iputils[arping(+)] - net-analyzer/arping - ) - wifi? ( - !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) - iwd? ( net-wireless/iwd ) - ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.18 - " -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - introspection? ( - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - dev-lang/perl - dev-libs/libxslt - ) - vala? ( $(vala_depend) ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - if use introspection; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return - fi - if use test; then - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - fi -} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -pkg_setup() { - if use connection-sharing; then - if kernel_is lt 5 1; then - CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" - else - CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" - fi - linux-info_pkg_setup - fi - if use introspection || use test; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - use vala && vala_src_prepare - gnome2_src_prepare - - sed -i \ - -e 's#/usr/bin/sed#/bin/sed#' \ - data/84-nm-drivers.rules \ - || die -} - -multilib_src_configure() { - local myconf=( - --disable-more-warnings - --disable-static - --localstatedir=/var - --with-runstatedir=/run - --disable-lto - --disable-qt - --without-netconfig - --with-dbus-sys-dir=/etc/dbus-1/system.d - $(multilib_native_with nmcli) - --with-udev-dir="$(get_udevdir)" - --with-config-plugins-default=keyfile - --with-iptables=/sbin/iptables - --with-nft=/sbin/nft - --with-ebpf=yes - $(multilib_native_enable concheck) - --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) - --with-crypto=$(usex nss nss gnutls) - # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option - # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. - # (There is no off switch, and we do not support upower.) - # bug #747358 - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - $(multilib_native_use_with audit libaudit) - $(multilib_native_use_enable bluetooth bluez5-dun) - --without-dhcpcanon - $(use_with dhclient) - $(use_with dhcpcd) - --with-config-dhcp-default=internal - $(multilib_native_use_enable introspection) - $(multilib_native_use_enable ppp) - --without-libpsl - $(multilib_native_use_with modemmanager modem-manager-1) - $(multilib_native_use_with ncurses nmtui) - $(multilib_native_use_with ofono) - $(multilib_native_use_enable ovs) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_with resolvconf) - $(multilib_native_use_with selinux) - $(multilib_native_use_with systemd systemd-journal) - $(multilib_native_use_enable teamd teamdctl) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable vala) - --without-valgrind - $(multilib_native_use_with wifi iwd) - $(multilib_native_use_with wext) - $(multilib_native_use_enable wifi) - ) - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - ln -s "${S}/docs" docs || die - ln -s "${S}/man" man || die - fi - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - local targets=( - src/libnm-client-impl/libnm.la - ) - emake "${targets[@]}" - fi -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx emake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - insinto /usr/lib/NetworkManager/conf.d #702476 - doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf - else - local targets=( - install-libLTLIBRARIES - install-libnmincludeHEADERS - install-nodist_libnmincludeHEADERS - install-pkgconfigDATA - ) - emake DESTDIR="${D}" "${targets[@]}" - fi -} - -multilib_src_install_all() { - einstalldocs - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - if use iwd; then - # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir - cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf - [device] - wifi.backend=iwd - EOF - fi - - # Empty - rmdir "${ED}"/var{/lib{/NetworkManager,},} || die -} - -pkg_postinst() { - gnome2_pkg_postinst - systemd_reenable NetworkManager.service - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi - - if use dhclient || use dhcpcd; then - ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" - ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" - ewarn "works for you, and you're happy with, the alternative USE flags can be" - ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" - ewarn "the main.dhcp configuration option to use one of them instead of internal." - fi -} diff --git a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild b/net-misc/networkmanager/networkmanager-1.46.0-r1.ebuild index 7cd23f0708ce..32c5c1fee3e8 100644 --- a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-1.46.0-r1.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 GNOME_ORG_MODULE="NetworkManager" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx +inherit gnome.org linux-info meson-multilib flag-o-matic python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" @@ -14,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" +IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -22,6 +21,7 @@ REQUIRED_USE=" connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) + test? ( tools ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) @@ -30,40 +30,45 @@ REQUIRED_USE=" ?? ( syslog systemd ) " -# Unkeyworded given somewhat experimental changes for bug #816210 -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" COMMON_DEPEND=" sys-apps/util-linux[${MULTILIB_USEDEP}] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - sys-apps/dbus + sys-apps/dbus[${MULTILIB_USEDEP}] net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.42:2[${MULTILIB_USEDEP}] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - selinux? ( sys-libs/libselinux ) + selinux? ( + sec-policy/selinux-networkmanager + sys-libs/libselinux + ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) + nss? ( + dev-libs/nspr[${MULTILIB_USEDEP}] + >=dev-libs/nss-3.11[${MULTILIB_USEDEP}] + ) gnutls? ( >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) - bluetooth? ( >=net-wireless/bluez-5 ) + bluetooth? ( >=net-wireless/bluez-5:= ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) - resolvconf? ( net-dns/openresolv ) + resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) @@ -72,8 +77,9 @@ COMMON_DEPEND=" psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( - sys-libs/readline:0= >=dev-libs/newt-0.52.15 + libedit? ( dev-libs/libedit ) + !libedit? ( sys-libs/readline:= ) ) " RDEPEND="${COMMON_DEPEND} @@ -90,6 +96,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-3.18 net-libs/libndp[${MULTILIB_USEDEP}] + ppp? ( elibc_musl? ( net-libs/ppp-defs ) ) " BDEPEND=" dev-util/gdbus-codegen @@ -98,7 +105,6 @@ BDEPEND=" dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) - >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( @@ -117,36 +123,11 @@ BDEPEND=" python_check_deps() { if use introspection; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return + python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return fi if use test; then - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - fi -} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi + python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" fi } @@ -163,12 +144,6 @@ pkg_setup() { if use introspection || use test; then python-any-r1_pkg_setup fi - - # bug 809695 - if tc-is-clang && use lto; then - eerror "Clang does not support -flto-partition" - die "Please use gcc or turn off USE=lto flag when building with clang" - fi } src_prepare() { @@ -176,7 +151,7 @@ src_prepare() { root password, add your user account to the 'plugdev' group." default - use vala && vala_src_prepare + use vala && vala_setup sed -i \ -e 's#/usr/bin/sed#/bin/sed#' \ @@ -193,6 +168,11 @@ meson_nm_native_program() { } multilib_src_configure() { + # Workaround for LLD 17 (bug #915819) + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + # Build system requires -flto-partition=none support for LTO + tc-is-clang && filter-lto + local emesonargs=( --localstatedir="${EPREFIX}/var" @@ -204,7 +184,6 @@ multilib_src_configure() { -Diptables=/sbin/iptables -Dnft=/sbin/nft -Ddnsmasq=/usr/sbin/dnsmasq - #-Ddnssec_trigger= -Ddist_version=${PVR} $(meson_native_use_bool policykit polkit) @@ -230,11 +209,14 @@ multilib_src_configure() { $(meson_native_use_bool tools nmtui) $(meson_native_use_bool tools nm_cloud_setup) $(meson_native_use_bool bluetooth bluez5_dun) - -Debpf=true + # ebpf is problematic in at least v1.46.0, bug #926943 + -Debpf=false + -Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default) -Dconfig_plugins_default=keyfile -Difcfg_rh=false -Difupdown=false + -Dconfig_migrate_ifcfg_rh_default=false $(meson_nm_native_program resolvconf "" /sbin/resolvconf) -Dnetconfig=no @@ -256,8 +238,6 @@ multilib_src_configure() { -Dld_gc=false $(meson_native_use_bool psl libpsl) -Dqt=false - - $(meson_use lto b_lto) ) if multilib_is_native_abi && use systemd; then @@ -296,6 +276,12 @@ multilib_src_configure() { emesonargs+=( -Dcrypto=gnutls ) fi + if use tools ; then + emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) ) + else + emesonargs+=( -Dreadline=none ) + fi + # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 if use ppp; then local PPPD_VER=`best_version net-dialup/ppp` @@ -362,6 +348,8 @@ multilib_src_install_all() { } pkg_postinst() { + udev_reload + systemd_reenable NetworkManager.service ! use systemd && readme.gentoo_print_elog @@ -399,3 +387,7 @@ pkg_postinst() { ewarn "the main.dhcp configuration option to use one of them instead of internal." fi } + +pkg_postrm() { + udev_reload +} diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index 1c1852f589b3..e3de7d74c3ed 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,5 +1,6 @@ -DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99 -DIST nextcloud-client-3.2.3.tar.gz 15381488 BLAKE2B 14ee239321d7c530dada9d4727fa7cc9801637827fc8dd065ea9b68c54f3559cdb56b0d0e0e37fc7aa5c668be51e3839bc33b20ea9ab73e4a1df4ba260b0ab9e SHA512 bbb247ce4945503a5b1af55ee200edaef000bb21220a9408657e057c98bd3f7bd646dedbedc57048e9f593f3a1d408ac37b4b01c390ecf85dca82868792e922d -DIST nextcloud-client-3.3.4.tar.gz 14032214 BLAKE2B 2d5a4cb8ed2aff6166e13c5e7ea5450d9b9ba1f385eb3cb99588584d1ccaf114ecdd4ed2fa0bdfcba6e5582df8e4bcdee371ef0de8c023fde131f23828d30fbf SHA512 c4fe2d032161fea556610396c5b51d6745f41de76d17e21fdd93ed0163f2079d1abba997a3184842403041cc25a303c5844fbd2213717b27d11ff9612f364151 -DIST nextcloud-client-3.3.5.tar.gz 14060100 BLAKE2B c5e712dbd8055590963f7be3286a33492c512b440ca7636cf69ea246212b4882c5bb1e66290e35b3cf6efc96a91eea6542495036160923251a475931de57ceee SHA512 42502f12366b99e457b0f22ed28b587105eaef0d16404062e04544629f4074747925f168ecce4c035d75bf28ac2bae03464e5c127a826571b82648ec8f0834b2 -DIST nextcloud-client-3.3.6.tar.gz 14106065 BLAKE2B b4f1179787a835f7fa203dfeaa2091eb1368f15ea6252dbf2ddd2d1a46786752f3a896574283c9ebc3faeaa024272c20fa67e4ee08b8ebca319d224ad4eb19f5 SHA512 d6c16ebd8af0d97f412102cfa9f7b7d4ca502ff5d025618f3a98a33a068dce9d0b71ee71e7b3c3a02219929584559a1237d57b1a7aa27ad8234653b56530c9f0 +DIST nextcloud-client-3.11.1.tar.gz 13598448 BLAKE2B b1e9070c55972facd72c65b571128f55c041f2fa1d38f7d22ed0f3ebca2b4ad9faef56d5699a48a70f062d13385c39123185b50ebba3d035d4e5af1320ce1844 SHA512 fc8700f36e3a2e8f07d219f9e7065a97e46d162d8c4f9a576e322dc45470e8b95321a1e176c4739a4fa212a69ff2782049096b32dcfe656a9e9cbedb8c7ed50e +DIST nextcloud-client-3.12.1.tar.gz 13640266 BLAKE2B 25ce7db16496e5e51bba40cf578fb21b21b9d606f73342032bb0ebafcd48cbb77e16fbd7f2efbd79501b8ca6a3976bc6e39984001b18abd7af5019103987fc5f SHA512 0ec00322d546abfc62645cb0674044e5f6dd12e0cab5e9cac0053f9bc42d42659fbb52f996d41cf166d45ed1750006cdd86669c6daee73b657e4b6807e4bae9a +DIST nextcloud-client-3.12.2.tar.gz 13645095 BLAKE2B af79e3ea7686255be0424dba8a1a90416bc8a5c53d302c9ee7fe1d7ed29ded7e558be1838405195c7eef6f008724e6b8827edc0e0e7bdaa21ca330a695f225b1 SHA512 fc8956b435d91f9caefc1e334739c99bf0745e8feef5badd825d8e9a141b0f4e202a0b522d0ce01a19e137763342f9b3841fefaf233179116d759aceab86b8f3 +DIST nextcloud-client-3.12.3.tar.gz 13642292 BLAKE2B 9cf2dcb507e2eca71a57b308dfa7d104393dc3bd8d8f6293ad07d1172446e641e7618d3744ac13f9b19a8725440ae9211600b21d03979e64ac26075a886f8763 SHA512 e333354b70102fd596c4fe18f69860c5c9313348359579cd552297a7e67dbb8a6ba7a9f09e9676e96298649f75fb649f2a9aa10d524ebedcf4b6aa244877fd62 +DIST nextcloud-client-3.13.0.tar.gz 13779791 BLAKE2B a0817a13af27e7fb57bb8a5644654cf3f8a461b7cb4afc71762b7bde5a7611ec57168939c07670d159e54ab11a49e991eda609a855e756d39ecca839a8f79586 SHA512 bf41a63a92e7e970e0b85d6df6e53e6ed8cd2c70fdfdfc86b144b01f82759a05f4bb016fd3009516bb405a589f26f84a8c6cf54191dc906a37d3dddf20dbcfbb +DIST nextcloud-client-3.9.4.tar.gz 15768508 BLAKE2B 7c06434538e9e95bed284ba07692d0d4d594639a145c2f3b67b8e81586fb98e1592eca54b9ee3cc638f8226ebb83e89e60a79238c76696fe9ca033209646eb13 SHA512 9f99278deb024ce105bae14d8dadc626b835486858e94f5483e9da3d06340a29e0941648cccfc30714c15ce25a6b77c4aa05a17fc213d7aa84803ffc13dca5a4 diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch deleted file mode 100644 index 8b02ab2a8086..000000000000 --- a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt ---- desktop-3.2.3.orig/src/gui/CMakeLists.txt 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/gui/CMakeLists.txt 2021-07-06 19:20:34.225000546 +0200 -@@ -241,75 +241,6 @@ - set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME}) - endif() - --# Generate png icons from svg --find_program(INKSCAPE -- NAMES inkscape inkscape.exe -- REQUIRED -- HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR) --# REQUIRED keyword is only supported on CMake 3.18 and above --if (NOT INKSCAPE) -- message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.") --endif() -- --function(generate_sized_png_from_svg icon_path size) -- get_filename_component(icon_name_dir ${icon_path} DIRECTORY) -- get_filename_component(icon_name_wle ${icon_path} NAME_WLE) -- -- if (EXISTS "${icon_name_dir}/${size}-${icon_name_wle}.png") -- return() -- endif() -- -- set(icon_output_name "${size}-${icon_name_wle}.png") -- message(STATUS "Generate ${icon_output_name}") -- execute_process(COMMAND -- "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}" -- WORKING_DIRECTORY "${icon_name_dir}" -- RESULT_VARIABLE -- INKSCAPE_SIDEBAR_ERROR -- OUTPUT_QUIET -- ERROR_QUIET) -- -- if (INKSCAPE_SIDEBAR_ERROR) -- message(FATAL_ERROR -- "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}") -- else() -- endif() --endfunction() -- --if ((APPLICATION_ICON_SET MATCHES "PNG") -- AND -- (NOT EXISTS "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")) -- # We may have no svg application icon in when customers use PNG -- # icons in brander, but theme.qrc expects a svg icon. -- file(TOUCH "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg") --endif() -- --if(APPLE) -- set(MACOS_SIDEBAR_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-sidebar.svg") -- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 16) -- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 32) -- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 64) -- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 128) -- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 256) --endif() -- --if(WIN32) -- set(STARTMENU_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-w10startmenu.svg") -- generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 70) -- generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 150) --endif() -- --set(APP_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg") --generate_sized_png_from_svg(${APP_ICON_SVG} 16) --generate_sized_png_from_svg(${APP_ICON_SVG} 24) --generate_sized_png_from_svg(${APP_ICON_SVG} 32) --generate_sized_png_from_svg(${APP_ICON_SVG} 48) --generate_sized_png_from_svg(${APP_ICON_SVG} 64) --generate_sized_png_from_svg(${APP_ICON_SVG} 128) --generate_sized_png_from_svg(${APP_ICON_SVG} 256) --generate_sized_png_from_svg(${APP_ICON_SVG} 512) --generate_sized_png_from_svg(${APP_ICON_SVG} 1024) -- - file(GLOB_RECURSE OWNCLOUD_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-icon*") - if(APPLE) - file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-sidebar*") diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch deleted file mode 100644 index 8152528f30cb..000000000000 --- a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch +++ /dev/null @@ -1,419 +0,0 @@ -diff -Naur desktop-3.2.3.orig/src/CMakeLists.txt desktop-3.2.3/src/CMakeLists.txt ---- desktop-3.2.3.orig/src/CMakeLists.txt 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/CMakeLists.txt 2021-07-07 20:26:40.620839467 +0200 -@@ -4,7 +4,13 @@ - - set(synclib_NAME ${APPLICATION_EXECUTABLE}sync) - --find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED) -+find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent REQUIRED) -+find_package(Qt5 5.12 COMPONENTS WebEngineWidgets WebEngine) -+ -+if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND) -+ add_compile_definitions(WITH_WEBENGINE=1) -+endif() -+ - get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION) - message(STATUS "Using Qt ${Qt5Core_VERSION} (${QT_QMAKE_EXECUTABLE})") - -diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt ---- desktop-3.2.3.orig/src/gui/CMakeLists.txt 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/gui/CMakeLists.txt 2021-07-07 20:26:40.620839467 +0200 -@@ -128,12 +128,17 @@ - wizard/owncloudwizardcommon.cpp - wizard/owncloudwizard.cpp - wizard/owncloudwizardresultpage.cpp -- wizard/webviewpage.cpp -- wizard/webview.cpp - wizard/slideshow.cpp - wizard/welcomepage.cpp - wizard/linklabel.cpp --) -+ ) -+ -+if (Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND) -+ list(APPEND client_SRCS -+ wizard/webviewpage.cpp -+ wizard/webview.cpp -+ ) -+endif() - - IF(BUILD_UPDATER) - set(updater_SRCS -@@ -339,9 +344,12 @@ - Qt5::Qml - Qt5::Quick - Qt5::QuickControls2 -- Qt5::WebEngineWidgets - ${synclib_NAME} --) -+ ) -+ -+if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND) -+ target_link_libraries(nextcloudCore PUBLIC Qt5::WebEngineWidgets) -+endif() - - set_target_properties(nextcloudCore - PROPERTIES -diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentials.cpp desktop-3.2.3/src/gui/creds/webflowcredentials.cpp ---- desktop-3.2.3.orig/src/gui/creds/webflowcredentials.cpp 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/gui/creds/webflowcredentials.cpp 2021-07-07 20:26:40.618839464 +0200 -@@ -16,7 +16,9 @@ - #include "account.h" - #include "configfile.h" - #include "theme.h" -+#ifdef WITH_WEBENGINE - #include "wizard/webview.h" -+#endif // WITH_WEBENGINE - #include "webflowcredentialsdialog.h" - - using namespace QKeychain; -@@ -144,8 +146,12 @@ - // Do a DetermineAuthTypeJob to make sure that the server is still using Flow2 - auto job = new DetermineAuthTypeJob(_account->sharedFromThis(), this); - connect(job, &DetermineAuthTypeJob::authType, [this](DetermineAuthTypeJob::AuthType type) { -- // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic -+ // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic -+#ifdef WITH_WEBENGINE - bool useFlow2 = (type != DetermineAuthTypeJob::WebViewFlow); -+#else // WITH_WEBENGINE -+ bool useFlow2 = true; -+#endif // WITH_WEBENGINE - - _askDialog = new WebFlowCredentialsDialog(_account, useFlow2); - -diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.cpp desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.cpp ---- desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.cpp 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.cpp 2021-07-07 20:26:40.618839464 +0200 -@@ -8,16 +8,20 @@ - #include "owncloudgui.h" - #include "headerbanner.h" - #include "wizard/owncloudwizardcommon.h" -+#ifdef WITH_WEBENGINE - #include "wizard/webview.h" -+#endif // WITH_WEBENGINE - #include "wizard/flow2authwidget.h" - - namespace OCC { - - WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlow2, QWidget *parent) -- : QDialog(parent), -- _useFlow2(useFlow2), -- _flow2AuthWidget(nullptr), -- _webView(nullptr) -+ : QDialog(parent) -+ , _useFlow2(useFlow2) -+ , _flow2AuthWidget(nullptr) -+#ifdef WITH_WEBENGINE -+ , _webView(nullptr) -+#endif // WITH_WEBENGINE - { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - -@@ -49,10 +53,12 @@ - - _flow2AuthWidget->startAuth(account); - } else { -+#ifdef WITH_WEBENGINE - _webView = new WebView(); - _containerLayout->addWidget(_webView); - - connect(_webView, &WebView::urlCatched, this, &WebFlowCredentialsDialog::urlCatched); -+#endif // WITH_WEBENGINE - } - - auto app = static_cast<Application *>(qApp); -@@ -73,12 +79,14 @@ - void WebFlowCredentialsDialog::closeEvent(QCloseEvent* e) { - Q_UNUSED(e) - -+#ifdef WITH_WEBENGINE - if (_webView) { - // Force calling WebView::~WebView() earlier so that _profile and _page are - // deleted in the correct order. - _webView->deleteLater(); - _webView = nullptr; - } -+#endif // WITH_WEBENGINE - - if (_flow2AuthWidget) { - _flow2AuthWidget->resetAuth(); -@@ -89,9 +97,14 @@ - emit onClose(); - } - --void WebFlowCredentialsDialog::setUrl(const QUrl &url) { -+void WebFlowCredentialsDialog::setUrl(const QUrl &url) -+{ -+#ifdef WITH_WEBENGINE - if (_webView) - _webView->setUrl(url); -+#else // WITH_WEBENGINE -+ Q_UNUSED(url); -+#endif // WITH_WEBENGINE - } - - void WebFlowCredentialsDialog::setInfo(const QString &msg) { -diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.h desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.h ---- desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.h 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.h 2021-07-07 20:26:40.618839464 +0200 -@@ -13,7 +13,9 @@ - namespace OCC { - - class HeaderBanner; -+#ifdef WITH_WEBENGINE - class WebView; -+#endif // WITH_WEBENGINE - class Flow2AuthWidget; - - class WebFlowCredentialsDialog : public QDialog -@@ -50,7 +52,9 @@ - bool _useFlow2; - - Flow2AuthWidget *_flow2AuthWidget; -+#ifdef WITH_WEBENGINE - WebView *_webView; -+#endif // WITH_WEBENGINE - - QLabel *_errorLabel; - QLabel *_infoLabel; -diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.cpp desktop-3.2.3/src/gui/wizard/owncloudsetuppage.cpp ---- desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.cpp 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/gui/wizard/owncloudsetuppage.cpp 2021-07-07 20:26:40.619839465 +0200 -@@ -119,21 +119,6 @@ - _ui.leUrl->setPalette(leUrlPalette); - } - --#ifdef WITH_PROVIDERS --void OwncloudSetupPage::slotLogin() --{ -- _ocWizard->setRegistration(false); --} --void OwncloudSetupPage::slotGotoProviderList() --{ -- _ocWizard->setRegistration(true); -- _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow); -- _authTypeKnown = true; -- _checking = false; -- emit completeChanged(); --} --#endif -- - // slot hit from textChanged of the url entry field. - void OwncloudSetupPage::slotUrlChanged(const QString &url) - { -@@ -228,8 +213,10 @@ - return WizardCommon::Page_OAuthCreds; - case DetermineAuthTypeJob::LoginFlowV2: - return WizardCommon::Page_Flow2AuthCreds; -+#ifdef WITH_WEBENGINE - case DetermineAuthTypeJob::WebViewFlow: - return WizardCommon::Page_WebView; -+#endif // WITH_WEBENGINE - } - return WizardCommon::Page_HttpCreds; - } -diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.h desktop-3.2.3/src/gui/wizard/owncloudsetuppage.h ---- desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.h 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/gui/wizard/owncloudsetuppage.h 2021-07-07 20:26:40.617839462 +0200 -@@ -67,10 +67,6 @@ - protected slots: - void slotUrlChanged(const QString &); - void slotUrlEditFinished(); --#ifdef WITH_PROVIDERS -- void slotLogin(); -- void slotGotoProviderList(); --#endif - - void setupCustomization(); - -diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizardcommon.h desktop-3.2.3/src/gui/wizard/owncloudwizardcommon.h ---- desktop-3.2.3.orig/src/gui/wizard/owncloudwizardcommon.h 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/gui/wizard/owncloudwizardcommon.h 2021-07-07 20:26:40.619839465 +0200 -@@ -46,7 +46,9 @@ - Page_HttpCreds, - Page_OAuthCreds, - Page_Flow2AuthCreds, -+#ifdef WITH_WEBENGINE - Page_WebView, -+#endif // WITH_WEBENGINE - Page_AdvancedSetup, - Page_Result - }; -diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.cpp desktop-3.2.3/src/gui/wizard/owncloudwizard.cpp ---- desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.cpp 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/gui/wizard/owncloudwizard.cpp 2021-07-07 20:26:40.619839465 +0200 -@@ -54,7 +54,11 @@ - , _flow2CredsPage(new Flow2AuthCredsPage) - , _advancedSetupPage(new OwncloudAdvancedSetupPage(this)) - , _resultPage(new OwncloudWizardResultPage) -+#ifdef WITH_WEBENGINE - , _webViewPage(new WebViewPage(this)) -+#else // WITH_WEBENGINE -+ , _webViewPage(nullptr) -+#endif // WITH_WEBENGINE - { - setObjectName("owncloudWizard"); - -@@ -66,7 +70,9 @@ - setPage(WizardCommon::Page_Flow2AuthCreds, _flow2CredsPage); - setPage(WizardCommon::Page_AdvancedSetup, _advancedSetupPage); - setPage(WizardCommon::Page_Result, _resultPage); -+#ifdef WITH_WEBENGINE - setPage(WizardCommon::Page_WebView, _webViewPage); -+#endif // WITH_WEBENGINE - - connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished); - -@@ -78,7 +84,9 @@ - connect(_httpCredsPage, &OwncloudHttpCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); - connect(_browserCredsPage, &OwncloudOAuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); - connect(_flow2CredsPage, &Flow2AuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); -+#ifdef WITH_WEBENGINE - connect(_webViewPage, &WebViewPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl); -+#endif // WITH_WEBENGINE - connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders, - this, &OwncloudWizard::createLocalAndRemoteFolders); - connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration); -@@ -230,9 +238,11 @@ - _flow2CredsPage->setConnected(); - break; - -+#ifdef WITH_WEBENGINE - case WizardCommon::Page_WebView: - _webViewPage->setConnected(); - break; -+#endif // WITH_WEBENGINE - - case WizardCommon::Page_AdvancedSetup: - _advancedSetupPage->directoriesCreated(); -@@ -256,8 +266,10 @@ - _credentialsPage = _browserCredsPage; - } else if (type == DetermineAuthTypeJob::LoginFlowV2) { - _credentialsPage = _flow2CredsPage; -+#ifdef WITH_WEBENGINE - } else if (type == DetermineAuthTypeJob::WebViewFlow) { - _credentialsPage = _webViewPage; -+#endif // WITH_WEBENGINE - } else { // try Basic auth even for "Unknown" - _credentialsPage = _httpCredsPage; - } -@@ -281,7 +293,11 @@ - button(QWizard::NextButton)->setHidden(true); - // Need to set it from here, otherwise it has no effect - _welcomePage->setLoginButtonDefault(); -- } else if (id == WizardCommon::Page_WebView || id == WizardCommon::Page_Flow2AuthCreds) { -+ } else if ( -+#ifdef WITH_WEBENGINE -+ id == WizardCommon::Page_WebView || -+#endif // WITH_WEBENGINE -+ id == WizardCommon::Page_Flow2AuthCreds) { - setButtonLayout({ QWizard::Stretch, QWizard::BackButton }); - } else if (id == WizardCommon::Page_AdvancedSetup) { - setButtonLayout({ QWizard::Stretch, QWizard::CustomButton1, QWizard::BackButton, QWizard::NextButton }); -diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.h desktop-3.2.3/src/gui/wizard/owncloudwizard.h ---- desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.h 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/gui/wizard/owncloudwizard.h 2021-07-07 20:26:40.619839465 +0200 -@@ -128,7 +128,7 @@ - OwncloudAdvancedSetupPage *_advancedSetupPage; - OwncloudWizardResultPage *_resultPage; - AbstractCredentialsWizardPage *_credentialsPage = nullptr; -- WebViewPage *_webViewPage; -+ WebViewPage *_webViewPage = nullptr; - - QStringList _setupLog; - -diff -Naur desktop-3.2.3.orig/src/gui/wizard/welcomepage.cpp desktop-3.2.3/src/gui/wizard/welcomepage.cpp ---- desktop-3.2.3.orig/src/gui/wizard/welcomepage.cpp 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/gui/wizard/welcomepage.cpp 2021-07-07 20:26:40.620839467 +0200 -@@ -13,6 +13,7 @@ - */ - - #include "welcomepage.h" -+#include "guiutility.h" - #include "theme.h" - #include "wizard/owncloudwizard.h" - #include "wizard/slideshow.h" -@@ -94,11 +95,18 @@ - - void WelcomePage::setupCreateAccountButton() - { -+#ifdef WITH_WEBENGINE - connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) { - _ocWizard->setRegistration(true); - _nextPage = WizardCommon::Page_WebView; - _ocWizard->next(); - }); -+#else // WITH_WEBENGINE -+ connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) { -+ _ocWizard->setRegistration(true); -+ Utility::openBrowser(QStringLiteral("https://nextcloud.com/register")); -+ }); -+#endif // WITH_WEBENGINE - } - - void WelcomePage::setupHostYourOwnServerLabel() -diff -Naur desktop-3.2.3.orig/src/libsync/networkjobs.cpp desktop-3.2.3/src/libsync/networkjobs.cpp ---- desktop-3.2.3.orig/src/libsync/networkjobs.cpp 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/libsync/networkjobs.cpp 2021-07-07 20:26:40.619839465 +0200 -@@ -30,6 +30,7 @@ - #include <QCoreApplication> - #include <QJsonDocument> - #include <QJsonObject> -+#include <qloggingcategory.h> - #ifndef TOKEN_AUTH_ONLY - #include <QPainter> - #include <QPainterPath> -@@ -958,7 +959,11 @@ - auto flow = gs.toObject().value("desktoplogin"); - if (flow != QJsonValue::Undefined) { - if (flow.toInt() == 1) { -+#ifdef WITH_WEBENGINE - _resultOldFlow = WebViewFlow; -+#else // WITH_WEBENGINE -+ qCWarning(lcDetermineAuthTypeJob) << "Server does only support flow1, but this client was compiled without support for flow1"; -+#endif // WITH_WEBENGINE - } - } - } -@@ -985,20 +990,24 @@ - - auto result = _resultPropfind; - -+#ifdef WITH_WEBENGINE - // WebViewFlow > OAuth > Basic - if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) { - result = WebViewFlow; - } -+#endif // WITH_WEBENGINE - - // LoginFlowV2 > WebViewFlow > OAuth > Basic - if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) { - result = LoginFlowV2; - } - -+#ifdef WITH_WEBENGINE - // If we determined that we need the webview flow (GS for example) then we switch to that - if (_resultOldFlow == WebViewFlow) { - result = WebViewFlow; - } -+#endif // WITH_WEBENGINE - - // If we determined that a simple get gave us an authentication required error - // then the server enforces basic auth and we got no choice but to use this -diff -Naur desktop-3.2.3.orig/src/libsync/networkjobs.h desktop-3.2.3/src/libsync/networkjobs.h ---- desktop-3.2.3.orig/src/libsync/networkjobs.h 2021-06-24 12:04:33.000000000 +0200 -+++ desktop-3.2.3/src/libsync/networkjobs.h 2021-07-07 20:26:40.619839465 +0200 -@@ -444,9 +444,11 @@ - public: - enum AuthType { - NoAuthType, // used only before we got a chance to probe the server -+#ifdef WITH_WEBENGINE -+ WebViewFlow, -+#endif // WITH_WEBENGINE - Basic, // also the catch-all fallback for backwards compatibility reasons - OAuth, -- WebViewFlow, - LoginFlowV2 - }; - Q_ENUM(AuthType) diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch deleted file mode 100644 index 8e5510db04d5..000000000000 --- a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 727de34879b8ef800945e11951cc1a7bee811f03 Mon Sep 17 00:00:00 2001 -From: Heinz Wiesinger <pprkut@liwjatan.org> -Date: Thu, 26 Aug 2021 16:07:25 +0200 -Subject: [PATCH] Allow using rsvg-convert to generate pngs instead of inkscape - -Signed-off-by: Heinz Wiesinger <pprkut@liwjatan.org> ---- - src/gui/CMakeLists.txt | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index 970d2fc165..efe1b1c349 100644 ---- a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -236,13 +236,13 @@ if (NOT DEFINED APPLICATION_ICON_NAME) - endif() - - # Generate png icons from svg --find_program(INKSCAPE -- NAMES inkscape inkscape.exe -+find_program(SVG_CONVERTER -+ NAMES inkscape inkscape.exe rsvg-convert - REQUIRED -- HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR) -+ HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV SVG_CONVERTER_DIR) - # REQUIRED keyword is only supported on CMake 3.18 and above --if (NOT INKSCAPE) -- message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.") -+if (NOT SVG_CONVERTER) -+ message(FATAL_ERROR "Could not find a suitable svg converter. Set SVG_CONVERTER_DIR to the path of either the inkscape or rsvg-convert executable.") - endif() - - function(generate_sized_png_from_svg icon_path size) -@@ -256,16 +256,16 @@ function(generate_sized_png_from_svg icon_path size) - set(icon_output_name "${size}-${icon_name_wle}.png") - message(STATUS "Generate ${icon_output_name}") - execute_process(COMMAND -- "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}" -+ "${SVG_CONVERTER}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}" - WORKING_DIRECTORY "${icon_name_dir}" - RESULT_VARIABLE -- INKSCAPE_SIDEBAR_ERROR -+ SVG_CONVERTER_SIDEBAR_ERROR - OUTPUT_QUIET - ERROR_QUIET) - -- if (INKSCAPE_SIDEBAR_ERROR) -+ if (SVG_CONVERTER_SIDEBAR_ERROR) - message(FATAL_ERROR -- "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}") -+ "${SVG_CONVERTER} could not generate icon: ${SVG_CONVERTER_SIDEBAR_ERROR}") - else() - endif() - endfunction() diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch new file mode 100644 index 000000000000..2c3d23c1ff35 --- /dev/null +++ b/net-misc/nextcloud-client/files/nextcloud-client-3.6.6-no-redefine-fortify-source.patch @@ -0,0 +1,31 @@ +Gentoo's toolchain always sets F_S (level 2 at minimum) by default. + +https://bugs.gentoo.org/890072 +--- a/cmake/modules/DefineCompilerFlags.cmake ++++ b/cmake/modules/DefineCompilerFlags.cmake +@@ -47,12 +47,6 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)") + + if (CMAKE_BUILD_TYPE) + string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) +- if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)" AND (NOT ${CMAKE_C_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]")) +- check_c_compiler_flag("-Wp,-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) +- if (WITH_FORTIFY_SOURCE) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-D_FORTIFY_SOURCE=2") +- endif (WITH_FORTIFY_SOURCE) +- endif() + endif() + endif (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)") + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,10 +31,6 @@ if(NOT MSVC) + endif() + + string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) +- if(CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)" AND ((NOT ${CMAKE_C_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]") AND (NOT ${CMAKE_CXX_FLAGS} MATCHES "FORTIFY_SOURCE=[3-9]"))) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") +- endif() + + if (CMAKE_CXX_COMPILER MATCHES "Clang") + # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml index 48b762c1d592..be33f72f7b7c 100644 --- a/net-misc/nextcloud-client/metadata.xml +++ b/net-misc/nextcloud-client/metadata.xml @@ -5,6 +5,10 @@ <email>voyageur@gentoo.org</email> <name>Bernard Cafarelli</name> </maintainer> + <maintainer type="person"> + <name>Florian Schmaus</name> + <email>flow@gentoo.org</email> + </maintainer> <use> <flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag> <flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag> diff --git a/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild deleted file mode 100644 index 80095a1fb503..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Desktop Syncing Client for Nextcloud" -HOMEPAGE="https://github.com/nextcloud/desktop" -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC-BY-3.0 GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="doc dolphin nautilus test" - -COMMON_DEPEND=">=dev-db/sqlite-3.34:3 - dev-libs/qtkeychain[gnome-keyring,qt5(+)] - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtquickcontrols2:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwebsockets:5 - dev-qt/qtwidgets:5 - sys-libs/zlib - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - >=dev-libs/openssl-1.1.0:0= - nautilus? ( dev-python/nautilus-python )" - -RDEPEND="${COMMON_DEPEND}" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - dev-qt/qtconcurrent:5 - dev-qt/qtxml:5 - doc? ( - dev-python/sphinx - dev-tex/latexmk - dev-texlive/texlive-latexextra - virtual/latex-base - ) - dolphin? ( kde-frameworks/extra-cmake-modules ) - test? ( - dev-util/cmocka - dev-qt/qttest:5 - )" - -RESTRICT="!test? ( test )" - -S=${WORKDIR}/desktop-${PV/_/-} - -src_prepare() { - # Keep tests in ${T} - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die - - if ! use nautilus; then - pushd shell_integration > /dev/null || die - cmake_comment_add_subdirectory nautilus - popd > /dev/null || die - fi - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc) - -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin) - -DNO_SHIBBOLETH=yes - -DUNIT_TESTING=$(usex test) - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" - fi -} diff --git a/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.11.1.ebuild index 35dda8ac61e3..756e6e5d023f 100644 --- a/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild +++ b/net-misc/nextcloud-client/nextcloud-client-3.11.1.ebuild @@ -1,62 +1,73 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake xdg +inherit cmake virtualx xdg DESCRIPTION="Desktop Syncing Client for Nextcloud" HOMEPAGE="https://github.com/nextcloud/desktop" -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz +" +S="${WORKDIR}/desktop-${PV/_/-}" LICENSE="CC-BY-3.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" IUSE="doc dolphin nautilus test webengine" RESTRICT="!test? ( test )" -COMMON_DEPEND=">=dev-db/sqlite-3.34:3 +# slot op for qtqui as this package uses private API parts of qtqui +# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h> +RDEPEND=" + >=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= - dev-libs/qtkeychain[qt5(+)] + dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 + dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 + dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 + net-libs/libcloudproviders + kde-frameworks/karchive:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) - webengine? ( dev-qt/qtwebengine:5[widgets] )" - -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 + webengine? ( dev-qt/qtwebengine:5[widgets] ) +" +DEPEND=" + ${RDEPEND} dev-qt/qtconcurrent:5 dev-qt/qtxml:5 - gnome-base/librsvg + || ( gnome-base/librsvg media-gfx/inkscape ) doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) - dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( - dev-util/cmocka dev-qt/qttest:5 - )" - -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-3.3.4-inkscape_to_rsvg.patch ) + dev-util/cmocka + ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + dolphin? ( kde-frameworks/extra-cmake-modules ) +" -S="${WORKDIR}/desktop-${PV/_/-}" +PATCHES=( + "${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch +) src_prepare() { # Keep tests in ${T} @@ -67,27 +78,39 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} -DBUILD_UPDATER=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Libcloudproviders=ON $(cmake_use_find_package doc Sphinx) $(cmake_use_find_package doc PdfLatex) $(cmake_use_find_package webengine Qt5WebEngine) $(cmake_use_find_package webengine Qt5WebEngineWidgets) -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus) - -DUNIT_TESTING=$(usex test) + -DBUILD_TESTING=$(usex test) ) cmake_src_configure } +src_test() { + virtx cmake_src_test +} + +src_compile() { + local compile_targets=(all) + if use doc; then + compile_targets+=(doc doc-man) + fi + cmake_src_compile ${compile_targets[@]} +} + pkg_postinst() { xdg_pkg_postinst - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" + if ! has_version -r "dev-libs/qtkeychain[keyring]"; then + elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag." + elog "Please consider enabling the 'keyring' USE flag. Otherwise you may" + elog "have to authenticate manually every time you start the nextlcoud client." + elog "See https://bugs.gentoo.org/912844 for more information." fi } diff --git a/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.12.1.ebuild index 79fbb809fed5..0812c7b1c004 100644 --- a/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild +++ b/net-misc/nextcloud-client/nextcloud-client-3.12.1.ebuild @@ -1,62 +1,73 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake xdg +inherit cmake virtualx xdg DESCRIPTION="Desktop Syncing Client for Nextcloud" HOMEPAGE="https://github.com/nextcloud/desktop" -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz +" +S="${WORKDIR}/desktop-${PV/_/-}" LICENSE="CC-BY-3.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="doc dolphin nautilus test webengine" RESTRICT="!test? ( test )" -COMMON_DEPEND=">=dev-db/sqlite-3.34:3 +# slot op for qtqui as this package uses private API parts of qtqui +# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h> +RDEPEND=" + >=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= - dev-libs/qtkeychain[qt5(+)] + dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 + dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 + dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 + net-libs/libcloudproviders + kde-frameworks/karchive:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) - webengine? ( dev-qt/qtwebengine:5[widgets] )" - -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 + webengine? ( dev-qt/qtwebengine:5[widgets] ) +" +DEPEND=" + ${RDEPEND} dev-qt/qtconcurrent:5 dev-qt/qtxml:5 - gnome-base/librsvg + || ( gnome-base/librsvg media-gfx/inkscape ) doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) - dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( - dev-util/cmocka dev-qt/qttest:5 - )" - -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-inkscape_to_rsvg.patch ) + dev-util/cmocka + ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + dolphin? ( kde-frameworks/extra-cmake-modules ) +" -S="${WORKDIR}/desktop-${PV/_/-}" +PATCHES=( + "${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch +) src_prepare() { # Keep tests in ${T} @@ -67,27 +78,39 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} -DBUILD_UPDATER=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Libcloudproviders=ON $(cmake_use_find_package doc Sphinx) $(cmake_use_find_package doc PdfLatex) $(cmake_use_find_package webengine Qt5WebEngine) $(cmake_use_find_package webengine Qt5WebEngineWidgets) -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus) - -DUNIT_TESTING=$(usex test) + -DBUILD_TESTING=$(usex test) ) cmake_src_configure } +src_test() { + TEST_VERBOSE=1 virtx cmake_src_test +} + +src_compile() { + local compile_targets=(all) + if use doc; then + compile_targets+=(doc doc-man) + fi + cmake_src_compile ${compile_targets[@]} +} + pkg_postinst() { xdg_pkg_postinst - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" + if ! has_version -r "dev-libs/qtkeychain[keyring]"; then + elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag." + elog "Please consider enabling the 'keyring' USE flag. Otherwise you may" + elog "have to authenticate manually every time you start the nextlcoud client." + elog "See https://bugs.gentoo.org/912844 for more information." fi } diff --git a/net-misc/nextcloud-client/nextcloud-client-3.3.5.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.12.2.ebuild index 35dda8ac61e3..0812c7b1c004 100644 --- a/net-misc/nextcloud-client/nextcloud-client-3.3.5.ebuild +++ b/net-misc/nextcloud-client/nextcloud-client-3.12.2.ebuild @@ -1,62 +1,73 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake xdg +inherit cmake virtualx xdg DESCRIPTION="Desktop Syncing Client for Nextcloud" HOMEPAGE="https://github.com/nextcloud/desktop" -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz +" +S="${WORKDIR}/desktop-${PV/_/-}" LICENSE="CC-BY-3.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="doc dolphin nautilus test webengine" RESTRICT="!test? ( test )" -COMMON_DEPEND=">=dev-db/sqlite-3.34:3 +# slot op for qtqui as this package uses private API parts of qtqui +# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h> +RDEPEND=" + >=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= - dev-libs/qtkeychain[qt5(+)] + dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 + dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 + dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 + net-libs/libcloudproviders + kde-frameworks/karchive:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) - webengine? ( dev-qt/qtwebengine:5[widgets] )" - -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 + webengine? ( dev-qt/qtwebengine:5[widgets] ) +" +DEPEND=" + ${RDEPEND} dev-qt/qtconcurrent:5 dev-qt/qtxml:5 - gnome-base/librsvg + || ( gnome-base/librsvg media-gfx/inkscape ) doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) - dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( - dev-util/cmocka dev-qt/qttest:5 - )" - -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-3.3.4-inkscape_to_rsvg.patch ) + dev-util/cmocka + ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + dolphin? ( kde-frameworks/extra-cmake-modules ) +" -S="${WORKDIR}/desktop-${PV/_/-}" +PATCHES=( + "${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch +) src_prepare() { # Keep tests in ${T} @@ -67,27 +78,39 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} -DBUILD_UPDATER=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Libcloudproviders=ON $(cmake_use_find_package doc Sphinx) $(cmake_use_find_package doc PdfLatex) $(cmake_use_find_package webengine Qt5WebEngine) $(cmake_use_find_package webengine Qt5WebEngineWidgets) -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus) - -DUNIT_TESTING=$(usex test) + -DBUILD_TESTING=$(usex test) ) cmake_src_configure } +src_test() { + TEST_VERBOSE=1 virtx cmake_src_test +} + +src_compile() { + local compile_targets=(all) + if use doc; then + compile_targets+=(doc doc-man) + fi + cmake_src_compile ${compile_targets[@]} +} + pkg_postinst() { xdg_pkg_postinst - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" + if ! has_version -r "dev-libs/qtkeychain[keyring]"; then + elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag." + elog "Please consider enabling the 'keyring' USE flag. Otherwise you may" + elog "have to authenticate manually every time you start the nextlcoud client." + elog "See https://bugs.gentoo.org/912844 for more information." fi } diff --git a/net-misc/nextcloud-client/nextcloud-client-3.12.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.12.3.ebuild new file mode 100644 index 000000000000..0812c7b1c004 --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-3.12.3.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake virtualx xdg + +DESCRIPTION="Desktop Syncing Client for Nextcloud" +HOMEPAGE="https://github.com/nextcloud/desktop" +SRC_URI=" + https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz +" +S="${WORKDIR}/desktop-${PV/_/-}" + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="doc dolphin nautilus test webengine" +RESTRICT="!test? ( test )" + +# slot op for qtqui as this package uses private API parts of qtqui +# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h> +RDEPEND=" + >=dev-db/sqlite-3.34:3 + >=dev-libs/openssl-1.1.0:0= + dev-libs/qtkeychain:=[qt5(+)] + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5= + dev-qt/qtnetwork:5[ssl] + dev-qt/qtquickcontrols2:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwebsockets:5 + dev-qt/qtwidgets:5 + net-libs/libcloudproviders + kde-frameworks/karchive:5 + sys-libs/zlib + dolphin? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/kio:5 + ) + nautilus? ( dev-python/nautilus-python ) + webengine? ( dev-qt/qtwebengine:5[widgets] ) +" +DEPEND=" + ${RDEPEND} + dev-qt/qtconcurrent:5 + dev-qt/qtxml:5 + || ( gnome-base/librsvg media-gfx/inkscape ) + doc? ( + dev-python/sphinx + dev-tex/latexmk + dev-texlive/texlive-latexextra + virtual/latex-base + ) + test? ( + dev-qt/qttest:5 + dev-util/cmocka + ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + dolphin? ( kde-frameworks/extra-cmake-modules ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch +) + +src_prepare() { + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DBUILD_UPDATER=OFF + $(cmake_use_find_package doc Sphinx) + $(cmake_use_find_package doc PdfLatex) + $(cmake_use_find_package webengine Qt5WebEngine) + $(cmake_use_find_package webengine Qt5WebEngineWidgets) + -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) + -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus) + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} + +src_test() { + TEST_VERBOSE=1 virtx cmake_src_test +} + +src_compile() { + local compile_targets=(all) + if use doc; then + compile_targets+=(doc doc-man) + fi + cmake_src_compile ${compile_targets[@]} +} + +pkg_postinst() { + xdg_pkg_postinst + + if ! has_version -r "dev-libs/qtkeychain[keyring]"; then + elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag." + elog "Please consider enabling the 'keyring' USE flag. Otherwise you may" + elog "have to authenticate manually every time you start the nextlcoud client." + elog "See https://bugs.gentoo.org/912844 for more information." + fi +} diff --git a/net-misc/nextcloud-client/nextcloud-client-3.13.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.0.ebuild new file mode 100644 index 000000000000..0812c7b1c004 --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-3.13.0.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake virtualx xdg + +DESCRIPTION="Desktop Syncing Client for Nextcloud" +HOMEPAGE="https://github.com/nextcloud/desktop" +SRC_URI=" + https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz +" +S="${WORKDIR}/desktop-${PV/_/-}" + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="doc dolphin nautilus test webengine" +RESTRICT="!test? ( test )" + +# slot op for qtqui as this package uses private API parts of qtqui +# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h> +RDEPEND=" + >=dev-db/sqlite-3.34:3 + >=dev-libs/openssl-1.1.0:0= + dev-libs/qtkeychain:=[qt5(+)] + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5= + dev-qt/qtnetwork:5[ssl] + dev-qt/qtquickcontrols2:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwebsockets:5 + dev-qt/qtwidgets:5 + net-libs/libcloudproviders + kde-frameworks/karchive:5 + sys-libs/zlib + dolphin? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/kio:5 + ) + nautilus? ( dev-python/nautilus-python ) + webengine? ( dev-qt/qtwebengine:5[widgets] ) +" +DEPEND=" + ${RDEPEND} + dev-qt/qtconcurrent:5 + dev-qt/qtxml:5 + || ( gnome-base/librsvg media-gfx/inkscape ) + doc? ( + dev-python/sphinx + dev-tex/latexmk + dev-texlive/texlive-latexextra + virtual/latex-base + ) + test? ( + dev-qt/qttest:5 + dev-util/cmocka + ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + dolphin? ( kde-frameworks/extra-cmake-modules ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch +) + +src_prepare() { + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DBUILD_UPDATER=OFF + $(cmake_use_find_package doc Sphinx) + $(cmake_use_find_package doc PdfLatex) + $(cmake_use_find_package webengine Qt5WebEngine) + $(cmake_use_find_package webengine Qt5WebEngineWidgets) + -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) + -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus) + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} + +src_test() { + TEST_VERBOSE=1 virtx cmake_src_test +} + +src_compile() { + local compile_targets=(all) + if use doc; then + compile_targets+=(doc doc-man) + fi + cmake_src_compile ${compile_targets[@]} +} + +pkg_postinst() { + xdg_pkg_postinst + + if ! has_version -r "dev-libs/qtkeychain[keyring]"; then + elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag." + elog "Please consider enabling the 'keyring' USE flag. Otherwise you may" + elog "have to authenticate manually every time you start the nextlcoud client." + elog "See https://bugs.gentoo.org/912844 for more information." + fi +} diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.3-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.9.4.ebuild index f5a364e114c6..23b5a83aabf2 100644 --- a/net-misc/nextcloud-client/nextcloud-client-3.2.3-r1.ebuild +++ b/net-misc/nextcloud-client/nextcloud-client-3.9.4.ebuild @@ -1,63 +1,72 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake xdg +inherit cmake virtualx xdg DESCRIPTION="Desktop Syncing Client for Nextcloud" HOMEPAGE="https://github.com/nextcloud/desktop" -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz +" +S="${WORKDIR}/desktop-${PV/_/-}" LICENSE="CC-BY-3.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 ~x86" IUSE="doc dolphin nautilus test webengine" RESTRICT="!test? ( test )" -COMMON_DEPEND=">=dev-db/sqlite-3.34:3 +# slot op for qtqui as this package uses private API parts of qtqui +# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h> +RDEPEND=" + >=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= - dev-libs/qtkeychain[qt5(+)] + dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 + dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 + net-libs/libcloudproviders + kde-frameworks/karchive:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) - webengine? ( dev-qt/qtwebengine:5[widgets] )" - -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 + webengine? ( dev-qt/qtwebengine:5[widgets] ) +" +DEPEND=" + ${RDEPEND} dev-qt/qtconcurrent:5 dev-qt/qtxml:5 + || ( gnome-base/librsvg media-gfx/inkscape ) doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) - dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( - dev-util/cmocka dev-qt/qttest:5 - )" - -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-inkscape.patch - "${FILESDIR}"/${P}-webengine.patch + dev-util/cmocka ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + dolphin? ( kde-frameworks/extra-cmake-modules ) +" -S="${WORKDIR}/desktop-${PV/_/-}" +PATCHES=( + "${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch +) src_prepare() { # Keep tests in ${T} @@ -68,27 +77,39 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} -DBUILD_UPDATER=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Libcloudproviders=ON $(cmake_use_find_package doc Sphinx) $(cmake_use_find_package doc PdfLatex) $(cmake_use_find_package webengine Qt5WebEngine) $(cmake_use_find_package webengine Qt5WebEngineWidgets) -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus) - -DUNIT_TESTING=$(usex test) + -DBUILD_TESTING=$(usex test) ) cmake_src_configure } +src_test() { + virtx cmake_src_test +} + +src_compile() { + local compile_targets=(all) + if use doc; then + compile_targets+=(doc doc-man) + fi + cmake_src_compile ${compile_targets[@]} +} + pkg_postinst() { xdg_pkg_postinst - if ! use doc ; then - elog "Documentation and man pages not installed" - elog "Enable doc USE-flag to generate them" + if ! has_version -r "dev-libs/qtkeychain[keyring]"; then + elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag." + elog "Please consider enabling the 'keyring' USE flag. Otherwise you may" + elog "have to authenticate manually every time you start the nextlcoud client." + elog "See https://bugs.gentoo.org/912844 for more information." fi } diff --git a/net-misc/nicstat/nicstat-1.95.ebuild b/net-misc/nicstat/nicstat-1.95.ebuild index 1936dbeeb9d5..18f9993c3b4f 100644 --- a/net-misc/nicstat/nicstat-1.95.ebuild +++ b/net-misc/nicstat/nicstat-1.95.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -9,15 +9,11 @@ DESCRIPTION="Network traffic statics utility for Solaris and Linux" HOMEPAGE="https://sourceforge.net/projects/nicstat/ https://github.com/scotte/nicstat/" EGIT_COMMIT="a716ee81cbf1e177267e20a880b5a0d9fa5b689e" SRC_URI="https://github.com/scotte/nicstat/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" LICENSE="Artistic-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" -S=${WORKDIR}/${PN}-${EGIT_COMMIT} src_compile() { $(tc-getCC) ${CFLAGS} ${PN}.c -o ${PN} ${LDFLAGS} || die diff --git a/net-misc/npapi-sdk/Manifest b/net-misc/npapi-sdk/Manifest deleted file mode 100644 index 376cdefa1899..000000000000 --- a/net-misc/npapi-sdk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST npapi-sdk-0.27.2.tar.bz2 65811 BLAKE2B 7f746f077bb87ef8de31499cc3ba0f0c15197ebd9da7891096ecb368d66ca2a7a54fc2b27e7ecc78e942c74e1623b09ca1d39df8f4fbb0843a5cc0ab98b9caa9 SHA512 827d52fbc8eb601ac0e486aed267b1ca6cb8732c92f1224f4b38e039288b77d07d47c5d4cf384a3114403b85e7f086f345912f1b20b41d27785c9bb367514842 diff --git a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild b/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild deleted file mode 100644 index a2433eefbda2..000000000000 --- a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="NPAPI headers bundle" -HOMEPAGE="https://github.com/mgorny/npapi-sdk/" -SRC_URI="https://github.com/mgorny/npapi-sdk/releases/download/${P}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" - -BDEPEND="virtual/pkgconfig" diff --git a/net-misc/npapi-sdk/npapi-sdk-9999.ebuild b/net-misc/npapi-sdk/npapi-sdk-9999.ebuild deleted file mode 100644 index c7c9e7a3f097..000000000000 --- a/net-misc/npapi-sdk/npapi-sdk-9999.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools git-r3 - -DESCRIPTION="NPAPI headers bundle" -HOMEPAGE="https://github.com/mgorny/npapi-sdk/" -EGIT_REPO_URI="https://github.com/mgorny/${PN}.git" - -LICENSE="BSD" -SLOT="0" - -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index c61825354c75..8fb940e466de 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -1,2 +1,3 @@ DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794 +DIST ntp-4.2.8p17.tar.gz 7120469 BLAKE2B 5c0e90a234cdeab76e7443b42dfd5a0c3c78693a11bdb0fa21c8def91adbdf9b9871498df9d211509632812a9107501da3470104122e9621577541ffd6cd1ab6 SHA512 e003bfe6f46065890663bc6791b02277f64318b692e49d8d678b76c23b245f357834eb483b0a44f1f47783166e5504686b36494af77f6eebe6f844cd3f2b6a8c diff --git a/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch deleted file mode 100644 index 1b532c6d8931..000000000000 --- a/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix building with libressl or without SSL. - -Origin: http://bugs.ntp.org/attachment.cgi?id=1481 - -LibreSSL fix from Joe Kappus (https://bugs.gentoo.org/show_bug.cgi?id=600668#c2) - ---- a/include/libssl_compat.h -+++ b/include/libssl_compat.h -@@ -37,7 +37,7 @@ - #endif - - /* ----------------------------------------------------------------- */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - /* ----------------------------------------------------------------- */ - - # include <openssl/objects.h> ---- a/libntp/libssl_compat.c -+++ b/libntp/libssl_compat.c -@@ -26,7 +26,7 @@ - /* ----------------------------------------------------------------- */ - - /* ----------------------------------------------------------------- */ --#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - /* ----------------------------------------------------------------- */ - - #include "libssl_compat.h" ---- a/libntp/ssl_init.c -+++ b/libntp/ssl_init.c -@@ -21,7 +21,7 @@ - - int ssl_init_done; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - static void - atexit_ssl_cleanup(void) diff --git a/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch b/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch new file mode 100644 index 000000000000..4b52248bde8f --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch @@ -0,0 +1,610 @@ +Sync with OpenLDAP. Uses Arsen's patch from https://bugs.gentoo.org/871288. + +https://bugs.gentoo.org/871372 +--- a/sntp/m4/openldap-thread-check.m4 ++++ b/sntp/m4/openldap-thread-check.m4 +@@ -262,10 +262,8 @@ pthread_rwlock_t rwlock; + dnl save the flags + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include <pthread.h> +-#ifndef NULL +-#define NULL (void*)0 +-#endif +-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) ++pthread_t thread; ++]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) + ]) + + if test $ol_cv_func_pthread_detach = no ; then +--- a/sntp/m4/openldap.m4 ++++ b/sntp/m4/openldap.m4 +@@ -1,16 +1,16 @@ + dnl OpenLDAP Autoconf Macros +-dnl $OpenLDAP: pkg/ldap/build/openldap.m4,v 1.157.2.10 2010/04/13 20:22:21 kurt Exp $ ++dnl $OpenLDAP$ + dnl This work is part of OpenLDAP Software <http://www.openldap.org/>. + dnl +-dnl Copyright 1998-2010 The OpenLDAP Foundation. ++dnl Copyright 1998-2022 The OpenLDAP Foundation. + dnl All rights reserved. + dnl + dnl Redistribution and use in source and binary forms, with or without + dnl modification, are permitted only as authorized by the OpenLDAP + dnl Public License. + dnl +-dnl A copy of this license is available in the file LICENSE-OPENLDAP in +-dnl this directory of the distribution or, alternatively, at ++dnl A copy of this license is available in the file LICENSE in the ++dnl top-level directory of the distribution or, alternatively, at + dnl <http://www.OpenLDAP.org/license.html>. + dnl + dnl -------------------------------------------------------------------- +@@ -154,6 +154,7 @@ fi + if test $ol_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <ctype.h> ++#include <stdlib.h> + #ifndef HAVE_EBCDIC + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +@@ -170,7 +171,7 @@ exit (0); } + ]])],[],[ol_cv_header_stdc=no],[:]) + fi]) + if test $ol_cv_header_stdc = yes; then +- AC_DEFINE([STDC_HEADERS], [1], [is standard C provided?]) ++ AC_DEFINE(STDC_HEADERS) + fi + ac_cv_header_stdc=disable + ]) +@@ -242,313 +243,40 @@ AC_DEFUN([OL_RESOLVER_LINK], + OL_RESOLVER_TRY(ol_cv_resolver_none) + OL_RESOLVER_TRY(ol_cv_resolver_resolv,[-lresolv]) + OL_RESOLVER_TRY(ol_cv_resolver_bind,[-lbind]) +-]) +-dnl +-dnl ==================================================================== +-dnl International Components for Unicode (ICU) +-AC_DEFUN([OL_ICU], +-[ol_icu=no +-AC_CHECK_HEADERS( unicode/utypes.h ) +-if test $ac_cv_header_unicode_utypes_h = yes ; then +- dnl OL_ICULIBS="-licui18n -licuuc -licudata" +- OL_ICULIBS="-licuuc -licudata" +- +- AC_CACHE_CHECK([for ICU libraries], [ol_cv_lib_icu], [ +- ol_LIBS="$LIBS" +- LIBS="$OL_ICULIBS $LIBS" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +-#include <unicode/utypes.h> +-]], [[ +-(void) u_errorName(0); +-]])],[ol_cv_lib_icu=yes],[ol_cv_lib_icu=no]) +- LIBS="$ol_LIBS" +-]) +- +- if test $ol_cv_lib_icu != no ; then +- ol_icu="$OL_ICULIBS" +- AC_DEFINE([HAVE_ICU], [1], [define if you actually have ICU]) +- fi +-fi +-]) +-dnl +-dnl ==================================================================== +-dnl Berkeley DB macros +-dnl +-dnl -------------------------------------------------------------------- +-dnl Try to link +-AC_DEFUN([OL_BERKELEY_DB_TRY], +-[if test $ol_cv_lib_db = no ; then +- AC_CACHE_CHECK([for Berkeley DB link (]ifelse($2,,default,$2)[)],[$1], +-[ +- ol_DB_LIB=ifelse($2,,,$2) +- ol_LIBS=$LIBS +- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" +- +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +-#ifdef HAVE_DB_185_H +-# include <db_185.h> +-#else +-# include <db.h> +-#endif +- +-#ifndef DB_VERSION_MAJOR +-# define DB_VERSION_MAJOR 1 +-#endif +- +-#ifndef NULL +-#define NULL ((void*)0) +-#endif +-]], [[ +-#if DB_VERSION_MAJOR > 2 +- db_env_create( NULL, 0 ); +-#elif DB_VERSION_MAJOR > 1 +- db_appexit( NULL ); +-#else +- (void) dbopen( NULL, 0, 0, 0, NULL); +-#endif +-]])],[$1=yes],[$1=no]) +- +- LIBS="$ol_LIBS" +-]) +- +- if test $$1 = yes ; then +- ol_cv_lib_db=ifelse($2,,yes,$2) +- fi +-fi +-]) +-dnl +-dnl -------------------------------------------------------------------- +-dnl Get major and minor version from <db.h> +-AC_DEFUN([OL_BDB_HEADER_VERSION], +-[AC_CACHE_CHECK([for Berkeley DB major version in db.h], [ol_cv_bdb_major],[ +- AC_LANG_CONFTEST([ +-#include <db.h> +-#ifndef DB_VERSION_MAJOR +-# define DB_VERSION_MAJOR 1 +-#endif +-__db_version DB_VERSION_MAJOR +-]) +- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none +- ol_cv_bdb_major=${3} +-]) +-case $ol_cv_bdb_major in [[1-9]]*) : ;; *) +- AC_MSG_ERROR([Unknown Berkeley DB major version in db.h]) ;; +-esac +- +-dnl Determine minor version +-AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[ +- AC_LANG_CONFTEST([ +-#include <db.h> +-#ifndef DB_VERSION_MINOR +-# define DB_VERSION_MINOR 0 +-#endif +-__db_version DB_VERSION_MINOR +-]) +- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none +- ol_cv_bdb_minor=${3} +-]) +-case $ol_cv_bdb_minor in [[0-9]]*) : ;; *) +- AC_MSG_ERROR([Unknown Berkeley DB minor version in db.h]) ;; +-esac +-]) +-dnl +-dnl -------------------------------------------------------------------- +-dnl Try to locate appropriate library +-AC_DEFUN([OL_BERKELEY_DB_LINK], +-[ol_cv_lib_db=no +- +-if test $ol_cv_bdb_major = 4 ; then +- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_m,[-ldb-4.$ol_cv_bdb_minor]) +- OL_BERKELEY_DB_TRY(ol_cv_db_db4m,[-ldb4$ol_cv_bdb_minor]) +- OL_BERKELEY_DB_TRY(ol_cv_db_db_4m,[-ldb-4$ol_cv_bdb_minor]) +- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_m,[-ldb-4-$ol_cv_bdb_minor]) +- OL_BERKELEY_DB_TRY(ol_cv_db_db_4,[-ldb-4]) +- OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4]) +- OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb]) +-fi +-OL_BERKELEY_DB_TRY(ol_cv_db_none) +-]) +-dnl +-dnl -------------------------------------------------------------------- +-dnl Check if Berkeley DB version +-AC_DEFUN([OL_BERKELEY_DB_VERSION], +-[AC_CACHE_CHECK([for Berkeley DB library and header version match], [ol_cv_berkeley_db_version], [ +- ol_LIBS="$LIBS" +- LIBS="$LTHREAD_LIBS $LIBS" +- if test $ol_cv_lib_db != yes ; then +- LIBS="$ol_cv_lib_db $LIBS" +- fi +- +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ +-#ifdef HAVE_DB_185_H +- choke me; +-#else +-#include <db.h> +-#endif +-#ifndef DB_VERSION_MAJOR +-# define DB_VERSION_MAJOR 1 +-#endif +-#ifndef NULL +-#define NULL ((void *)0) +-#endif +-main() +-{ +-#if DB_VERSION_MAJOR > 1 +- char *version; +- int major, minor, patch; +- +- version = db_version( &major, &minor, &patch ); +- +- if( major != DB_VERSION_MAJOR || +- minor != DB_VERSION_MINOR || +- patch != DB_VERSION_PATCH ) +- { +- printf("Berkeley DB version mismatch\n" +- "\theader: %s\n\tlibrary: %s\n", +- DB_VERSION_STRING, version); +- return 1; +- } +-#endif +- +- return 0; +-}]])],[ol_cv_berkeley_db_version=yes],[ol_cv_berkeley_db_version=no],[ol_cv_berkeley_db_version=cross]) +- +- LIBS="$ol_LIBS" + ]) + +- if test $ol_cv_berkeley_db_version = no ; then +- AC_MSG_ERROR([Berkeley DB version mismatch]) +- fi +-])dnl +-dnl + dnl -------------------------------------------------------------------- +-dnl Check if Berkeley DB supports DB_THREAD +-AC_DEFUN([OL_BERKELEY_DB_THREAD], +-[AC_CACHE_CHECK([for Berkeley DB thread support], [ol_cv_berkeley_db_thread], [ +- ol_LIBS="$LIBS" +- LIBS="$LTHREAD_LIBS $LIBS" +- if test $ol_cv_lib_db != yes ; then +- LIBS="$ol_cv_lib_db $LIBS" +- fi +- +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ +-#ifdef HAVE_DB_185_H +- choke me; +-#else +-#include <db.h> +-#endif +-#ifndef NULL +-#define NULL ((void *)0) +-#endif +-main() +-{ +- int rc; +- u_int32_t flags = DB_CREATE | +-#ifdef DB_PRIVATE +- DB_PRIVATE | +-#endif +- DB_THREAD; +- +-#if DB_VERSION_MAJOR > 2 +- DB_ENV *env = NULL; +- +- rc = db_env_create( &env, 0 ); ++dnl Check for version compatility with back-mdb ++AC_DEFUN([OL_MDB_COMPAT], ++[AC_CACHE_CHECK([if LMDB version supported by MDB backends], [ol_cv_mdb_compat],[ ++ AC_EGREP_CPP(__mdb_version_compat,[ ++#include <lmdb.h> + +- flags |= DB_INIT_MPOOL; +-#ifdef DB_MPOOL_PRIVATE +- flags |= DB_MPOOL_PRIVATE; ++/* require 0.9.18 or later */ ++#if MDB_VERSION_FULL >= 0x000000090012 ++ __mdb_version_compat + #endif +- +- if( rc ) { +- printf("BerkeleyDB: %s\n", db_strerror(rc) ); +- return rc; +- } +- +-#if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1) +- rc = (env->open)( env, NULL, flags, 0 ); +-#else +- rc = (env->open)( env, NULL, NULL, flags, 0 ); +-#endif +- +- if ( rc == 0 ) { +- rc = env->close( env, 0 ); +- } +- +- if( rc ) { +- printf("BerkeleyDB: %s\n", db_strerror(rc) ); +- return rc; +- } +- +-#else +- DB_ENV env; +- memset( &env, '\0', sizeof(env) ); +- +- rc = db_appinit( NULL, NULL, &env, flags ); +- +- if( rc == 0 ) { +- db_appexit( &env ); +- } +- +- unlink("__db_mpool.share"); +- unlink("__db_lock.share"); +-#endif +- +- return rc; +-}]])],[ol_cv_berkeley_db_thread=yes],[ol_cv_berkeley_db_thread=no],[ol_cv_berkeley_db_thread=cross]) +- +- LIBS="$ol_LIBS" ++ ], [ol_cv_mdb_compat=yes], [ol_cv_mdb_compat=no])]) + ]) + +- if test $ol_cv_berkeley_db_thread != no ; then +- AC_DEFINE([HAVE_BERKELEY_DB_THREAD], [1], +- [define if Berkeley DB has DB_THREAD support]) +- fi +-])dnl + dnl + dnl -------------------------------------------------------------------- +-dnl Find any DB +-AC_DEFUN([OL_BERKELEY_DB], +-[ol_cv_berkeley_db=no +-AC_CHECK_HEADERS(db.h) +-if test $ac_cv_header_db_h = yes; then +- OL_BDB_HEADER_VERSION +- OL_BDB_COMPAT +- +- if test $ol_cv_bdb_compat != yes ; then +- AC_MSG_ERROR([BerkeleyDB version incompatible with BDB/HDB backends]) ++dnl Find any MDB ++AC_DEFUN([OL_MDB], ++[ol_cv_mdb=no ++AC_CHECK_HEADERS(lmdb.h) ++if test $ac_cv_header_lmdb_h = yes; then ++ OL_MDB_COMPAT ++ ++ if test $ol_cv_mdb_compat != yes ; then ++ AC_MSG_ERROR([LMDB version incompatible with MDB backends]) + fi + +- OL_BERKELEY_DB_LINK +- if test "$ol_cv_lib_db" != no ; then +- ol_cv_berkeley_db=yes +- OL_BERKELEY_DB_VERSION +- OL_BERKELEY_DB_THREAD +- fi ++ ol_cv_lib_mdb=-llmdb ++ ol_cv_mdb=yes + fi + ]) +-dnl -------------------------------------------------------------------- +-dnl Check for version compatility with back-bdb +-AC_DEFUN([OL_BDB_COMPAT], +-[AC_CACHE_CHECK([if Berkeley DB version supported by BDB/HDB backends], [ol_cv_bdb_compat],[ +- AC_EGREP_CPP(__db_version_compat,[ +-#include <db.h> +- +- /* this check could be improved */ +-#ifndef DB_VERSION_MAJOR +-# define DB_VERSION_MAJOR 1 +-#endif +-#ifndef DB_VERSION_MINOR +-# define DB_VERSION_MINOR 0 +-#endif +- +-#define DB_VERSION_MM ((DB_VERSION_MAJOR<<8)|DB_VERSION_MINOR) + +-/* require 4.4 or later */ +-#if DB_VERSION_MM >= 0x0404 +- __db_version_compat +-#endif +- ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])]) +-]) + + dnl + dnl ==================================================================== +@@ -664,12 +392,10 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ + return 0; + ]]) + +-AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], [ +-AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES ++AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], ++[AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES + +-int main(argc, argv) +- int argc; +- char **argv; ++int main(int argc, char **argv) + { + OL_PTHREAD_TEST_FUNCTION + } +@@ -706,7 +432,7 @@ dnl Check GNU Pth pthread Header + dnl + dnl defines ol_cv_header linux_threads to 'yes' or 'no' + dnl 'no' implies pthreads.h is not LinuxThreads or pthreads.h +-dnl doesn't exists. Existance of pthread.h should separately ++dnl doesn't exist. Existence of pthread.h should separately + dnl checked. + dnl + AC_DEFUN([OL_HEADER_GNU_PTH_PTHREAD_H], [ +@@ -728,7 +454,7 @@ AC_DEFUN([OL_NT_THREADS], [ + AC_CHECK_FUNC(_beginthread) + + if test $ac_cv_func__beginthread = yes ; then +- AC_DEFINE([HAVE_NT_THREADS], [1], [if you have NT Threads]) ++ AC_DEFINE(HAVE_NT_THREADS,1,[if you have NT Threads]) + ol_cv_nt_threads=yes + fi + ]) +@@ -737,7 +463,7 @@ dnl Check LinuxThreads Header + dnl + dnl defines ol_cv_header linux_threads to 'yes' or 'no' + dnl 'no' implies pthreads.h is not LinuxThreads or pthreads.h +-dnl doesn't exists. Existance of pthread.h should separately ++dnl doesn't exist. Existence of pthread.h should separately + dnl checked. + dnl + AC_DEFUN([OL_HEADER_LINUX_THREADS], [ +@@ -749,7 +475,7 @@ AC_DEFUN([OL_HEADER_LINUX_THREADS], [ + [ol_cv_header_linux_threads=no]) + ]) + if test $ol_cv_header_linux_threads = yes; then +- AC_DEFINE([HAVE_LINUX_THREADS], [1], [if you have LinuxThreads]) ++ AC_DEFINE(HAVE_LINUX_THREADS,1,[if you have LinuxThreads]) + fi + ])dnl + dnl -------------------------------------------------------------------- +@@ -791,7 +517,7 @@ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[ + #include <sys/types.h> + #include <regex.h> + static char *pattern, *string; +-main() ++int main(void) + { + int rc; + regex_t re; +@@ -818,7 +544,8 @@ AC_DEFUN([OL_C_UPPER_LOWER], + [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <ctype.h> +-main() ++#include <stdlib.h> ++int main(void) + { + if ('C' == toupper('C')) + exit(0); +@@ -826,7 +553,7 @@ main() + exit(1); + }]])],[ol_cv_c_upper_lower=no],[ol_cv_c_upper_lower=yes],[ol_cv_c_upper_lower=safe])]) + if test $ol_cv_c_upper_lower != no ; then +- AC_DEFINE([C_UPPER_LOWER], [1], [define if toupper() requires islower()]) ++ AC_DEFINE(C_UPPER_LOWER,1, [define if toupper() requires islower()]) + fi + ]) + dnl +@@ -837,29 +564,32 @@ dnl Check for declaration of sys_errlist in one of stdio.h and errno.h. + dnl Declaration of sys_errlist on BSD4.4 interferes with our declaration. + dnl Reported by Keith Bostic. + AC_DEFUN([OL_SYS_ERRLIST], +-[AC_CACHE_CHECK([declaration of sys_errlist],ol_cv_dcl_sys_errlist,[ +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++[AC_CACHE_CHECK([existence of sys_errlist],ol_cv_have_sys_errlist,[ ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <errno.h>]], [[char *c = (char *) *sys_errlist]])],[ol_cv_have_sys_errlist=yes],[ol_cv_have_sys_errlist=no])]) ++if test $ol_cv_have_sys_errlist = yes ; then ++ AC_DEFINE(HAVE_SYS_ERRLIST,1, ++ [define if you actually have sys_errlist in your libs]) ++ AC_CACHE_CHECK([declaration of sys_errlist],ol_cv_dcl_sys_errlist,[ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <stdio.h> + #include <sys/types.h> + #include <errno.h> + #ifdef _WIN32 + #include <stdlib.h> +-#endif ]], [[char *c = (char *) *sys_errlist]])],[ol_cv_dcl_sys_errlist=yes +- ol_cv_have_sys_errlist=yes],[ol_cv_dcl_sys_errlist=no])]) ++#endif ]], [[char *c = (char *) *sys_errlist]])],[ol_cv_dcl_sys_errlist=yes], ++ [ol_cv_dcl_sys_errlist=no])]) + # +-# It's possible (for near-UNIX clones) that sys_errlist doesn't exist +-if test $ol_cv_dcl_sys_errlist = no ; then +- AC_DEFINE([DECL_SYS_ERRLIST], [1], +- [define if sys_errlist is not declared in stdio.h or errno.h]) +- +- AC_CACHE_CHECK([existence of sys_errlist],ol_cv_have_sys_errlist,[ +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <errno.h>]], [[char *c = (char *) *sys_errlist]])],[ol_cv_have_sys_errlist=yes],[ol_cv_have_sys_errlist=no])]) +-fi +-if test $ol_cv_have_sys_errlist = yes ; then +- AC_DEFINE([HAVE_SYS_ERRLIST], [1], +- [define if you actually have sys_errlist in your libs]) ++ # It's possible (for near-UNIX clones) that sys_errlist doesn't exist ++ if test $ol_cv_dcl_sys_errlist = no ; then ++ AC_DEFINE(DECL_SYS_ERRLIST,1, ++ [define if sys_errlist is not declared in stdio.h or errno.h]) ++ fi + fi + ])dnl ++dnl ++dnl ==================================================================== ++dnl glibc supplies a non-standard strerror_r if _GNU_SOURCE is defined. ++dnl It's actually preferable to the POSIX version, if available. + AC_DEFUN([OL_NONPOSIX_STRERROR_R], + [AC_CACHE_CHECK([non-posix strerror_r],ol_cv_nonposix_strerror_r,[ + AC_EGREP_CPP(strerror_r,[#include <string.h>], +@@ -873,24 +603,23 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R], + ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no]) + else + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +- main() { ++ int main(void) { + char buf[100]; + buf[0] = 0; + strerror_r( 1, buf, sizeof buf ); + exit( buf[0] == 0 ); + } +- ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror=no],[ol_cv_nonposix_strerror=no]) ++ ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no],[ol_cv_nonposix_strerror_r=no]) + fi + ]) + if test $ol_cv_nonposix_strerror_r = yes ; then +- AC_DEFINE([HAVE_NONPOSIX_STRERROR_R], [1], ++ AC_DEFINE(HAVE_NONPOSIX_STRERROR_R,1, + [define if strerror_r returns char* instead of int]) + fi + ])dnl + dnl + AC_DEFUN([OL_STRERROR], +-[OL_SYS_ERRLIST dnl TEMPORARY +-AC_CHECK_FUNCS(strerror strerror_r) ++[AC_CHECK_FUNCS(strerror strerror_r) + ol_cv_func_strerror_r=no + if test "${ac_cv_func_strerror_r}" = yes ; then + OL_NONPOSIX_STRERROR_R +@@ -910,7 +639,7 @@ AC_DEFUN([OL_C_VOLATILE], + if test $ol_cv_c_volatile = yes; then + : + else +- AC_DEFINE([volatile], [], [define as empty if volatile is not supported]) ++ AC_DEFINE(volatile,,[define as empty if volatile is not supported]) + fi + ])dnl + dnl +@@ -918,7 +647,7 @@ dnl ==================================================================== + dnl Look for fetch(3) + AC_DEFUN([OL_LIB_FETCH], + [ol_LIBS=$LIBS +-LIBS="-lfetch -lcom_err $LIBS" ++LIBS="-lfetch $LIBS" + AC_CACHE_CHECK([fetch(3) library],ol_cv_lib_fetch,[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #ifdef HAVE_SYS_PARAM_H +@@ -928,8 +657,8 @@ AC_CACHE_CHECK([fetch(3) library],ol_cv_lib_fetch,[ + #include <fetch.h>]], [[struct url *u = fetchParseURL("file:///"); ]])],[ol_cv_lib_fetch=yes],[ol_cv_lib_fetch=no])]) + LIBS=$ol_LIBS + if test $ol_cv_lib_fetch != no ; then +- ol_link_fetch="-lfetch -lcom_err" +- AC_DEFINE([HAVE_FETCH], [1], ++ ol_link_fetch="-lfetch" ++ AC_DEFINE(HAVE_FETCH,1, + [define if you actually have FreeBSD fetch(3)]) + fi + ])dnl +@@ -1094,7 +823,7 @@ AC_DEFUN([OL_FUNC_GETHOSTBYADDR_R_NARGS], + ])dnl + dnl + dnl -------------------------------------------------------------------- +-dnl Check for Cyrus SASL version compatility ++dnl Check for Cyrus SASL version compatibility + AC_DEFUN([OL_SASL_COMPAT], + [AC_CACHE_CHECK([Cyrus SASL library version], [ol_cv_sasl_compat],[ + AC_EGREP_CPP(__sasl_compat,[ +@@ -1113,19 +842,3 @@ AC_DEFUN([OL_SASL_COMPAT], + #endif + ], [ol_cv_sasl_compat=yes], [ol_cv_sasl_compat=no])]) + ]) +-dnl ==================================================================== +-dnl check for SSL compatibility +-AC_DEFUN([OL_SSL_COMPAT], +-[AC_CACHE_CHECK([OpenSSL library version (CRL checking capability)], +- [ol_cv_ssl_crl_compat],[ +- AC_EGREP_CPP(__ssl_compat,[ +-#ifdef HAVE_OPENSSL_SSL_H +-#include <openssl/ssl.h> +-#endif +- +-/* Require 0.9.7d+ */ +-#if OPENSSL_VERSION_NUMBER >= 0x0090704fL +- char *__ssl_compat = "0.9.7d"; +-#endif +- ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])]) +-]) +-- +2.38.1 + diff --git a/net-misc/ntp/files/ntp.tmpfiles b/net-misc/ntp/files/ntp.tmpfiles new file mode 100644 index 000000000000..49b0b066e30f --- /dev/null +++ b/net-misc/ntp/files/ntp.tmpfiles @@ -0,0 +1 @@ +d /var/lib/ntp 0755 ntp ntp diff --git a/net-misc/ntp/files/ntpd.rc-r1 b/net-misc/ntp/files/ntpd.rc-r2 index 7573411c9986..e2a1b5491365 100644 --- a/net-misc/ntp/files/ntpd.rc-r1 +++ b/net-misc/ntp/files/ntpd.rc-r2 @@ -1,12 +1,13 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="ntpd - the network time protocol daemon" pidfile="/var/run/ntpd.pid" command="/usr/sbin/ntpd" -command_args="-p ${pidfile} ${NTPD_OPTS}" -start_stop_daemon_args="--pidfile ${pidfile}" +command_args="${NTPD_OPTS}" +command_args_background="-p ${pidfile}" +command_args_foreground="-n" depend() { use net dns logger diff --git a/net-misc/ntp/metadata.xml b/net-misc/ntp/metadata.xml index c3e7aab10d67..921f0c46b577 100644 --- a/net-misc/ntp/metadata.xml +++ b/net-misc/ntp/metadata.xml @@ -6,12 +6,12 @@ <name>Gentoo Base System</name> </maintainer> <longdescription> -NTP is a protocol designed to synchronize the clocks of computers over a network. NTP -version 3 is an internet draft standard, formalized in RFC 1305. NTP version 4 is a -significant revision of the NTP standard, and is the current development version, but -has not been formalized in an RFC. Simple NTP (SNTP) version 4 is described in RFC -2030. -</longdescription> + NTP is a protocol designed to synchronize the clocks of computers over a network. NTP + version 3 is an internet draft standard, formalized in RFC 1305. NTP version 4 is a + significant revision of the NTP standard, and is the current development version, but + has not been formalized in an RFC. Simple NTP (SNTP) version 4 is described in RFC + 2030. + </longdescription> <use> <flag name="openntpd">Allow ntp to be installed alongside openntpd</flag> <flag name="parse-clocks">Add support for PARSE clocks</flag> diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild index 7e9d8bc04c23..28b0d7869127 100644 --- a/net-misc/ntp/ntp-4.2.8_p15.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p15-r6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic systemd +inherit autotools flag-o-matic systemd tmpfiles MY_P=${P/_p/p} DESCRIPTION="Network Time Protocol suite/programs" @@ -13,11 +13,11 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar LICENSE="HPND BSD ISC" SLOT="0" -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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= ) - >=dev-libs/libevent-2.0.9:=[threads?] + >=dev-libs/libevent-2.0.9:=[threads(+)?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) @@ -44,10 +44,10 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 - "${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530 "${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409 "${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch + "${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch ) src_prepare() { @@ -67,6 +67,9 @@ src_configure() { # blah, no real configure options #176333 export ac_cv_header_dns_sd_h=$(usex zeroconf) export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} + # Unity builds, we don't really need support for it, bug #804109 + export PATH_RUBY=/bin/false + local myeconfargs=( --with-lineeditlibs=readline,edit,editline --with-yielding-select @@ -98,7 +101,7 @@ src_install() { insinto /etc doins "${FILESDIR}"/ntp.conf use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726 - newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd + newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd newconfd "${FILESDIR}"/ntpd.confd ntpd newinitd "${FILESDIR}"/ntp-client.rc ntp-client newconfd "${FILESDIR}"/ntp-client.confd ntp-client @@ -109,16 +112,13 @@ src_install() { fi sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die - keepdir /var/lib/ntp - use prefix || fowners ntp:ntp /var/lib/ntp - if use openntpd ; then cd "${ED}" || die rm usr/sbin/ntpd || die - rm -r var/lib || die rm etc/{conf,init}.d/ntpd || die rm usr/share/man/*/ntpd.8 || die else + newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service if use caps ; then sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ @@ -135,6 +135,9 @@ src_install() { } pkg_postinst() { + if ! use openntpd; then + tmpfiles_process ntp.conf + fi if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then eerror "The notrust option was found in your /etc/ntp.conf!" ewarn "If your ntpd starts sending out weird responses," diff --git a/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild new file mode 100644 index 000000000000..2fcce5d7239a --- /dev/null +++ b/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic systemd tmpfiles + +MY_P=${P/_p/p} +DESCRIPTION="Network Time Protocol suite/programs" +HOMEPAGE="https://www.ntp.org/" +SRC_URI="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="HPND BSD ISC" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" + +DEPEND=" + >=dev-libs/libevent-2.0.9:=[threads(+)?] + readline? ( >=sys-libs/readline-4.1:= ) + kernel_linux? ( caps? ( sys-libs/libcap ) ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) + snmp? ( net-analyzer/net-snmp ) + ssl? ( dev-libs/openssl:= ) + parse-clocks? ( net-misc/pps-tools ) +" +RDEPEND=" + ${DEPEND} + acct-group/ntp + acct-user/ntp + selinux? ( sec-policy/selinux-ntp ) + vim-syntax? ( app-vim/ntp-syntax ) + !net-misc/ntpsec + !openntpd? ( !net-misc/openntpd ) +" +BDEPEND=" + acct-group/ntp + acct-user/ntp + virtual/pkgconfig +" +PDEPEND="openntpd? ( net-misc/openntpd )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch # bug #533966 + "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch # bug #563922 + "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch # bug #711530 + "${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch +) + +src_prepare() { + default + + # Make sure every build uses the same install layout, bug #539092 + find sntp/loc/ -type f '!' -name legacy -delete || die + + # bug #622754 + eautoreconf + + # Disable pointless checks. + touch .checkChangeLog .gcc-warning FRC.html html/.datecheck || die +} + +src_configure() { + # bug #264109 + append-cppflags -D_GNU_SOURCE + + # https://bugs.gentoo.org/922508 + append-lfs-flags + + # avoid libmd5/libelf + export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no + export ac_cv_lib_elf_nlist=no + # blah, no real configure options #176333 + export ac_cv_header_dns_sd_h=$(usex zeroconf) + export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} + # Unity builds, we don't really need support for it, bug #804109 + export PATH_RUBY=/bin/false + + local myeconfargs=( + --cache-file="${S}"/config.cache + + --with-lineeditlibs=readline,edit,editline + --with-yielding-select + --disable-local-libevent + + # Increase the default memlimit from 32MiB to 128MiB, bug #533232 + --with-memlock=256 + + # Avoid overriding the user's toolchain settings, bug #895802 + --with-hardenfile=/dev/null + + $(use_enable caps linuxcaps) + $(use_enable parse-clocks) + $(use_enable ipv6) + $(use_enable debug debugging) + $(use_with readline lineeditlibs readline) + $(use_enable samba ntp-signd) + $(use_with snmp ntpsnmpd) + $(use_with ssl crypto) + $(use_enable threads thread-support) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # Move ntpd/ntpdate to sbin, bug #66671 + dodir /usr/sbin + mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" + + dodoc INSTALL WHERE-TO-START + + insinto /etc + doins "${FILESDIR}"/ntp.conf + + #bug #524726 + use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf + + newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd + newconfd "${FILESDIR}"/ntpd.confd ntpd + newinitd "${FILESDIR}"/ntp-client.rc ntp-client + newconfd "${FILESDIR}"/ntp-client.confd ntp-client + newinitd "${FILESDIR}"/sntp.rc sntp + newconfd "${FILESDIR}"/sntp.confd sntp + if ! use caps ; then + sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die + fi + sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die + + if use openntpd ; then + cd "${ED}" || die + rm usr/sbin/ntpd || die + rm etc/{conf,init}.d/ntpd || die + rm usr/share/man/man1/ntpd.1 || die + else + newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf + systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service + if use caps ; then + sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ + "${D}$(systemd_get_systemunitdir)"/ntpd.service \ + || die + fi + systemd_enable_ntpunit 60-ntpd ntpd.service + fi + + systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service + systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf + systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service + systemd_install_serviced "${FILESDIR}"/sntp.service.conf +} + +pkg_postinst() { + if ! use openntpd; then + tmpfiles_process ntp.conf + fi + + if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then + eerror "The notrust option was found in your /etc/ntp.conf!" + ewarn "If your ntpd starts sending out weird responses," + ewarn "then make sure you have keys properly setup and see" + ewarn "https://bugs.gentoo.org/41827" + fi +} diff --git a/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild new file mode 100644 index 000000000000..3303e33398f6 --- /dev/null +++ b/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic systemd tmpfiles + +MY_P=${P/_p/p} +DESCRIPTION="Network Time Protocol suite/programs" +HOMEPAGE="https://www.ntp.org/" +SRC_URI="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="HPND BSD ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="caps debug openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" + +DEPEND=" + >=dev-libs/libevent-2.0.9:=[threads(+)?] + readline? ( >=sys-libs/readline-4.1:= ) + kernel_linux? ( caps? ( sys-libs/libcap ) ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) + snmp? ( net-analyzer/net-snmp ) + ssl? ( dev-libs/openssl:= ) + parse-clocks? ( net-misc/pps-tools ) +" +RDEPEND=" + ${DEPEND} + acct-group/ntp + acct-user/ntp + selinux? ( sec-policy/selinux-ntp ) + vim-syntax? ( app-vim/ntp-syntax ) + !net-misc/ntpsec + !openntpd? ( !net-misc/openntpd ) +" +BDEPEND=" + acct-group/ntp + acct-user/ntp + virtual/pkgconfig +" +PDEPEND="openntpd? ( net-misc/openntpd )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch # bug #533966 + "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch # bug #563922 + "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch # bug #711530 + "${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch +) + +src_prepare() { + default + + # Make sure every build uses the same install layout, bug #539092 + find sntp/loc/ -type f '!' -name legacy -delete || die + + # bug #622754 + eautoreconf + + # Disable pointless checks. + touch .checkChangeLog .gcc-warning FRC.html html/.datecheck || die +} + +src_configure() { + # bug #264109 + append-cppflags -D_GNU_SOURCE + + # https://bugs.gentoo.org/922508 + append-lfs-flags + + # avoid libmd5/libelf + export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no + export ac_cv_lib_elf_nlist=no + # blah, no real configure options #176333 + export ac_cv_header_dns_sd_h=$(usex zeroconf) + export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} + # Unity builds, we don't really need support for it, bug #804109 + export PATH_RUBY=/bin/false + + local myeconfargs=( + --cache-file="${S}"/config.cache + + --with-lineeditlibs=readline,edit,editline + --with-yielding-select + --disable-local-libevent + + # Increase the default memlimit from 32MiB to 128MiB, bug #533232 + --with-memlock=256 + + # Avoid overriding the user's toolchain settings, bug #895802 + --with-hardenfile=/dev/null + + $(use_enable caps linuxcaps) + $(use_enable parse-clocks) + $(use_enable debug debugging) + $(use_with readline lineeditlibs readline) + $(use_enable samba ntp-signd) + $(use_with snmp ntpsnmpd) + $(use_with ssl crypto) + $(use_enable threads thread-support) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # Move ntpd/ntpdate to sbin, bug #66671 + dodir /usr/sbin + mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" + + dodoc INSTALL WHERE-TO-START + + insinto /etc + doins "${FILESDIR}"/ntp.conf + + newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd + newconfd "${FILESDIR}"/ntpd.confd ntpd + newinitd "${FILESDIR}"/ntp-client.rc ntp-client + newconfd "${FILESDIR}"/ntp-client.confd ntp-client + newinitd "${FILESDIR}"/sntp.rc sntp + newconfd "${FILESDIR}"/sntp.confd sntp + if ! use caps ; then + sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die + fi + sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die + + if use openntpd ; then + cd "${ED}" || die + rm usr/sbin/ntpd || die + rm etc/{conf,init}.d/ntpd || die + rm usr/share/man/man1/ntpd.1 || die + else + newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf + systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service + if use caps ; then + sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ + "${D}$(systemd_get_systemunitdir)"/ntpd.service \ + || die + fi + systemd_enable_ntpunit 60-ntpd ntpd.service + fi + + systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service + systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf + systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service + systemd_install_serviced "${FILESDIR}"/sntp.service.conf +} + +pkg_postinst() { + if ! use openntpd; then + tmpfiles_process ntp.conf + fi + + if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then + eerror "The notrust option was found in your /etc/ntp.conf!" + ewarn "If your ntpd starts sending out weird responses," + ewarn "then make sure you have keys properly setup and see" + ewarn "https://bugs.gentoo.org/41827" + fi +} diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest index 01c84429c974..39399cdf6cee 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -1,2 +1,4 @@ -DIST ntpsec-1.2.0.tar.gz 2625968 BLAKE2B 23ceae5a1f241fcf5a17801fec2f15f9b9d9d64a108bebe29bdc75196303091eaf0efee7df67ce10acefb7c8dba90ce1144a0c0c5432797d7659714d162f26bb SHA512 9e18b3ca2f786a1ea323ba2384b51cff3d862115cea1ae576fc98172c476ac5e7d0d0fc873e47be0b19b050204ea9ed49669d94e66eb94525068dd1b08a8ae71 -DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277 +DIST ntpsec-1.2.2a.tar.gz 2710790 BLAKE2B b069433598697ab1e8110dbd005316a295d14c1e180fe0af2d19494bdff941d01234f0b4e9f38a150e27e450e1bd1f4dcf4535f9ff51c253670d11c5cb67382d SHA512 7a2cc04bde49800a745c74933e565a4764a22be484faffc5ea933231b74507af737a691cd0bb3aa024e81c083be0718c8d7b30dd152b0b0d386ae72fda426db9 +DIST ntpsec-1.2.2a.tar.gz.asc 833 BLAKE2B ce21b020d2a8590b731fdd4c171041fadbd699d60b9e10b2dc548675eed2efc04b9d5ae75fa8f77cc9c8e55db0f609d1eee5c5f2f7c7d804e1b087eb9ea95e1d SHA512 c1b0c1c6b534b11ef172d5ab68ada47bbd9e3f0298400c684e8745447221db16e4f4de436f06b0f6ab374e437b0506853a3a3da2bbe17c148cdf7de62c769f28 +DIST ntpsec-1.2.3.tar.gz 2725081 BLAKE2B d39a4d08790949afb28b843739a410624a8d862bfc25afd4e6c7dc55be43e41f3c89823406c60fb911496e7a3db51d6fa83c8bcda9b9686708c36154c2fe9686 SHA512 6baecf32f499fc12c2ef0b44360072b61ab9e8b52ec7ead64ff43a27b5a57431db939d4ce1fad92d38def981f6256a1d8ede0c0cdc5abb50d861be729255eee2 +DIST ntpsec-1.2.3.tar.gz.asc 833 BLAKE2B f0d6a0b163a7f9214da6d6eb1982f87387a7087efb740ec146f55362381aa101a5a8e40c27f121ca6607c0a5c429b1e06ecaf9a9ab5392d836535430cf6575fa SHA512 17280e3092e7e9de0ddae0723637a261d3a740d916ce0f016c44c6010672cfe2fc39b45f86257cfa5bd29f1f11895f8bd583c76765c6484489027cbc82dbe6b2 diff --git a/net-misc/ntpsec/files/ntpd.rc-r2 b/net-misc/ntpsec/files/ntpd.rc-r3 index 82a950ef5dac..f19fb17ad323 100644 --- a/net-misc/ntpsec/files/ntpd.rc-r2 +++ b/net-misc/ntpsec/files/ntpd.rc-r3 @@ -1,12 +1,13 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="ntpd - the network time protocol daemon" pidfile="/run/ntpd.pid" command="/usr/sbin/ntpd" -command_args="-p ${pidfile} ${NTPD_OPTS}" -start_stop_daemon_args="--pidfile ${pidfile}" +command_args="${NTPD_OPTS}" +command_args_background="-p ${pidfile}" +command_args_foreground="-n" depend() { use net dns logger @@ -15,7 +16,7 @@ depend() { start_pre() { if [ ! -f /etc/ntp.conf ] ; then - eerror "Please create /etc/ntp.conf" + eerror "Please create /etc/ntp.conf" return 1 fi return 0 diff --git a/net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch b/net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch deleted file mode 100644 index ee75d103d2e6..000000000000 --- a/net-misc/ntpsec/files/ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c -index 4e5ceaa36c1a7b452445023e201ddb6211625c52..78ac7aea263ed3d3394b2d32e79a6836f0387434 100644 ---- a/ntpd/ntp_sandbox.c -+++ b/ntpd/ntp_sandbox.c -@@ -428,6 +428,11 @@ int scmp_sc[] = { - /* gentoo 64-bit and 32-bit, Intel and Arm use mmap */ - SCMP_SYS(mmap), - #endif -+#if defined(__aarch64__) -+ SCMP_SYS(faccessat), -+ SCMP_SYS(newfstatat), -+ SCMP_SYS(renameat), -+#endif - #if defined(__i386__) || defined(__arm__) || defined(__powerpc__) - SCMP_SYS(_newselect), - SCMP_SYS(_llseek), diff --git a/net-misc/ntpsec/files/ntpsec-1.2.0-move-newfstatat.patch b/net-misc/ntpsec/files/ntpsec-1.2.0-move-newfstatat.patch deleted file mode 100644 index 75453c6cb5f6..000000000000 --- a/net-misc/ntpsec/files/ntpsec-1.2.0-move-newfstatat.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c -index e66faaa8c..b2af654e5 100644 ---- a/ntpd/ntp_sandbox.c -+++ b/ntpd/ntp_sandbox.c -@@ -349,6 +349,7 @@ int scmp_sc[] = { - SCMP_SYS(lseek), - SCMP_SYS(membarrier), /* Needed on Alpine 3.11.3 */ - SCMP_SYS(munmap), -+ SCMP_SYS(newfstatat), - SCMP_SYS(open), - #ifdef __NR_openat - SCMP_SYS(openat), /* SUSE */ -@@ -451,7 +452,6 @@ int scmp_sc[] = { - #endif - #if defined(__aarch64__) - SCMP_SYS(faccessat), -- SCMP_SYS(newfstatat), - SCMP_SYS(renameat), - SCMP_SYS(linkat), - SCMP_SYS(unlinkat), diff --git a/net-misc/ntpsec/files/ntpsec-1.2.0-seccomp.patch b/net-misc/ntpsec/files/ntpsec-1.2.0-seccomp.patch deleted file mode 100644 index 6e61a06e12d1..000000000000 --- a/net-misc/ntpsec/files/ntpsec-1.2.0-seccomp.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/705128 -https://bugs.gentoo.org/786228 ---- a/ntpd/ntp_sandbox.c -+++ b/ntpd/ntp_sandbox.c -@@ -463,6 +463,15 @@ int scmp_sc[] = { - SCMP_SYS(send), - SCMP_SYS(stat64), - #endif -+#if defined(__arm__) -+ SCMP_SYS(statx), -+#endif -+#if defined(__riscv32__) -+ SCMP_SYS(faccessat), -+#endif -+#if defined(__aarch64__) -+ SCMP_SYS(syscall), -+#endif - }; - { - for (unsigned int i = 0; i < COUNTOF(scmp_sc); i++) { ---- a/ntpd/ntp_sandbox.c -+++ b/ntpd/ntp_sandbox.c -@@ -355,6 +355,7 @@ int scmp_sc[] = { - SCMP_SYS(openat), /* SUSE */ - #endif - SCMP_SYS(poll), -+ SCMP_SYS(pread64), - SCMP_SYS(pselect6), - SCMP_SYS(read), - SCMP_SYS(recvfrom), /* Comment this out for testing. diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-glibc-2-3-4.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-glibc-2-3-4.patch deleted file mode 100644 index 5936adaf9a49..000000000000 --- a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-glibc-2-3-4.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugs.gentoo.org/823692 -https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1247 -https://gitlab.com/NTPsec/ntpsec/-/issues/713 - -From 170d60b7e269154fb108bb4b010ee5ee0110bf2d Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sun, 14 Nov 2021 08:44:28 +0000 -Subject: [PATCH] ntpd/ntp_sandbox.c: allow clone3 in seccomp filter for - glibc-2.34 - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/ntpd/ntp_sandbox.c -+++ b/ntpd/ntp_sandbox.c -@@ -403,6 +403,7 @@ int scmp_sc[] = { - * rather than generate a trap. - */ - SCMP_SYS(clone), /* threads */ -+ SCMP_SYS(clone3), - SCMP_SYS(kill), /* generate signal */ - SCMP_SYS(madvise), - SCMP_SYS(mprotect), diff --git a/net-misc/ntpsec/files/ntpsec-1.2.2-logrotate.patch b/net-misc/ntpsec/files/ntpsec-1.2.2-logrotate.patch new file mode 100644 index 000000000000..60152bc846c4 --- /dev/null +++ b/net-misc/ntpsec/files/ntpsec-1.2.2-logrotate.patch @@ -0,0 +1,26 @@ +From 4ba53b95a6a45f08f5d3436a4a3ba4f9a97146e2 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Mon, 17 Apr 2023 00:24:32 +0200 +Subject: [PATCH] Give ntpd a chance at re-opening the logfile as ntp:ntp after + rotation + +https://bugs.gentoo.org/873514 +--- + etc/logrotate-config.ntpd | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/etc/logrotate-config.ntpd b/etc/logrotate-config.ntpd +index b64998e..9144e57 100644 +--- a/etc/logrotate-config.ntpd ++++ b/etc/logrotate-config.ntpd +@@ -5,6 +5,7 @@ + + /var/log/ntpd.log { + monthly ++ create 640 ntp root + missingok + postrotate + /usr/bin/killall -HUP ntpd +-- +2.40.0 + diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml index 9d4b63729b27..864309f6a22b 100644 --- a/net-misc/ntpsec/metadata.xml +++ b/net-misc/ntpsec/metadata.xml @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> -NTPsec project - a secure, hardened, and improved implementation of Network Time Protocol derived from NTP Classic, Dave Mills’s original. + NTPsec project - a secure, hardened, and improved implementation of Network Time Protocol derived from NTP Classic, Dave Mills’s original. </longdescription> <use> <flag name="early">Drop root privileges early</flag> @@ -28,10 +25,8 @@ NTPsec project - a secure, hardened, and improved implementation of Network Time <flag name="rclock_zyfer">Zyfer driver</flag> <flag name="rclock_arbiter">Arbiter 1088A/B GPS driver</flag> <flag name="rclock_nmea">NMEA GPS driver</flag> - <flag name="rclock_neoclock">NeoClock4X DCF77/TDF driver</flag> <flag name="rclock_modem">NIST/USNO/PTB Modem Time Services</flag> <flag name="rclock_local">Support for undisciplined local clock (not recommended)</flag> <flag name="smear">Specify the interval over which a leap second is applied (experimental)</flag> - <flag name="tests">Enable tests</flag> </use> </pkgmetadata> diff --git a/net-misc/ntpsec/ntpsec-1.2.0-r3.ebuild b/net-misc/ntpsec/ntpsec-1.2.2a.ebuild index 9d2d01df34ea..52c1058a3b2e 100644 --- a/net-misc/ntpsec/ntpsec-1.2.0-r3.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.2a.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_EXT=1 +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE='threads(+)' DISTUTILS_USE_SETUPTOOLS=no @@ -13,55 +14,65 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" else - SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" - RESTRICT="mirror" - KEYWORDS="amd64 arm arm64 ~x86" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ntpsec.asc + inherit verify-sig + SRC_URI=" + https://ftp.ntpsec.org/pub/releases/${P}.tar.gz + verify-sig? ( https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc ) + " + KEYWORDS="amd64 arm arm64 ~riscv ~x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )" fi DESCRIPTION="The NTP reference implementation, refactored" HOMEPAGE="https://www.ntpsec.org/" +LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" +SLOT="0" + NTPSEC_REFCLOCK=( oncore trimble truetime gpsd jjy generic spectracom - shm pps hpgps zyfer arbiter nmea neoclock modem - local) + shm pps hpgps zyfer arbiter nmea modem local +) IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} -LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" -SLOT="0" -IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice +IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" # net-misc/pps-tools oncore,pps -CDEPEND="${PYTHON_DEPS} - sys-libs/libcap +DEPEND=" + ${PYTHON_DEPS} + dev-libs/openssl:= dev-python/psutil[${PYTHON_USEDEP}] + sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) - dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) + rclock_oncore? ( net-misc/pps-tools ) + rclock_pps? ( net-misc/pps-tools ) " -RDEPEND="${CDEPEND} - ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) +RDEPEND=" + ${DEPEND} !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp + ntpviz? ( + media-fonts/liberation-fonts + sci-visualization/gnuplot + ) " -DEPEND="${CDEPEND} +BDEPEND+=" >=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets - sys-devel/bison - rclock_oncore? ( net-misc/pps-tools ) - rclock_pps? ( net-misc/pps-tools ) + app-alternatives/yacc " PATCHES=( - "${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch" "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" - "${FILESDIR}/${PN}-1.2.0-move-newfstatat.patch" - "${FILESDIR}/${PN}-1.2.0-seccomp.patch" + "${FILESDIR}/${PN}-1.2.2-logrotate.patch" ) WAF_BINARY="${S}/waf" @@ -81,7 +92,7 @@ src_prepare() { } src_configure() { - is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin + filter-lto local string_127="" local rclocks=""; @@ -94,49 +105,45 @@ src_configure() { done CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" - local myconf=( + myconf=( + --notests --nopyc --nopyo --enable-pylib ext --refclock="${CLOCKSTRING}" - --build-epoch="$(date +%s)" + #--build-epoch="$(date +%s)" $(use doc || echo "--disable-doc") $(use early && echo "--enable-early-droproot") $(use gdb && echo "--enable-debug-gdb") $(use samba && echo "--enable-mssntp") $(use seccomp && echo "--enable-seccomp") $(use smear && echo "--enable-leap-smear") - $(use tests && echo "--alltests") $(use debug && echo "--enable-debug") ) - python_configure() { - waf-utils_src_configure "${myconf[@]}" - } - python_foreach_impl run_in_build_dir python_configure + distutils-r1_src_configure +} + +python_configure() { + waf-utils_src_configure "${myconf[@]}" } -src_compile() { - unset MAKEOPTS - python_compile() { - waf-utils_src_compile - } - python_foreach_impl run_in_build_dir python_compile +python_compile() { + waf-utils_src_compile --notests +} + +python_test() { + waf-utils_src_compile check } src_install() { - python_install() { - waf-utils_src_install - python_fix_shebang "${ED}" - } - python_foreach_impl run_in_build_dir python_install - python_foreach_impl python_optimize + distutils-r1_src_install # Install heat generating scripts use heat && dosbin "${S}"/contrib/ntpheat{,usb} # Install the openrc files - newinitd "${FILESDIR}"/ntpd.rc-r2 ntp + newinitd "${FILESDIR}"/ntpd.rc-r3 ntp newconfd "${FILESDIR}"/ntpd.confd ntp # Install the systemd unit file @@ -148,7 +155,7 @@ src_install() { chmod 770 "${ED}"/var/lib/ntp keepdir /var/lib/ntp - # Install a log rotate script + # Install a logrotate script mkdir -pv "${ED}"/etc/logrotate.d cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd @@ -160,6 +167,12 @@ src_install() { use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html } +python_install() { + waf-utils_src_install --notests + python_fix_shebang "${ED}" + python_optimize +} + pkg_postinst() { einfo "If you want to serve time on your local network, then" einfo "you should disable all the ref_clocks unless you have" diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.3.ebuild index c206360674b5..29d8829e72d7 100644 --- a/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.3.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_EXT=1 +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE='threads(+)' DISTUTILS_USE_SETUPTOOLS=no @@ -13,56 +14,65 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" else - SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" - RESTRICT="mirror" - KEYWORDS="amd64 arm arm64 ~x86" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ntpsec.asc + inherit verify-sig + SRC_URI=" + https://ftp.ntpsec.org/pub/releases/${P}.tar.gz + verify-sig? ( https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc ) + " + KEYWORDS="amd64 arm arm64 ~riscv ~x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )" fi DESCRIPTION="The NTP reference implementation, refactored" HOMEPAGE="https://www.ntpsec.org/" +LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" +SLOT="0" + NTPSEC_REFCLOCK=( oncore trimble truetime gpsd jjy generic spectracom - shm pps hpgps zyfer arbiter nmea neoclock modem - local) + shm pps hpgps zyfer arbiter nmea modem local +) IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} -LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" -SLOT="0" -IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice +IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early heat libbsd nist ntpviz samba seccomp smear" #ionice REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" # net-misc/pps-tools oncore,pps -CDEPEND="${PYTHON_DEPS} - sys-libs/libcap +DEPEND=" + ${PYTHON_DEPS} + dev-libs/openssl:= dev-python/psutil[${PYTHON_USEDEP}] + sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) - dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) + rclock_oncore? ( net-misc/pps-tools ) + rclock_pps? ( net-misc/pps-tools ) " -RDEPEND="${CDEPEND} - ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) +RDEPEND=" + ${DEPEND} !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp + ntpviz? ( + media-fonts/liberation-fonts + sci-visualization/gnuplot + ) " -DEPEND="${CDEPEND} +BDEPEND+=" >=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets - sys-devel/bison - rclock_oncore? ( net-misc/pps-tools ) - rclock_pps? ( net-misc/pps-tools ) + app-alternatives/yacc " PATCHES=( - "${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch" "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" - "${FILESDIR}/${PN}-1.2.0-move-newfstatat.patch" - "${FILESDIR}/${PN}-1.2.0-seccomp.patch" - "${FILESDIR}/${PN}-1.2.1-seccomp-glibc-2-3-4.patch" + "${FILESDIR}/${PN}-1.2.2-logrotate.patch" ) WAF_BINARY="${S}/waf" @@ -82,7 +92,7 @@ src_prepare() { } src_configure() { - is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin + filter-lto local string_127="" local rclocks=""; @@ -95,7 +105,8 @@ src_configure() { done CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" - local myconf=( + myconf=( + --notests --nopyc --nopyo --enable-pylib ext @@ -103,41 +114,35 @@ src_configure() { #--build-epoch="$(date +%s)" $(use doc || echo "--disable-doc") $(use early && echo "--enable-early-droproot") - $(use gdb && echo "--enable-debug-gdb") $(use samba && echo "--enable-mssntp") $(use seccomp && echo "--enable-seccomp") $(use smear && echo "--enable-leap-smear") - $(use tests && echo "--alltests") $(use debug && echo "--enable-debug") ) - python_configure() { - waf-utils_src_configure "${myconf[@]}" - } - python_foreach_impl run_in_build_dir python_configure + distutils-r1_src_configure +} + +python_configure() { + waf-utils_src_configure "${myconf[@]}" } -src_compile() { - unset MAKEOPTS - python_compile() { - waf-utils_src_compile - } - python_foreach_impl run_in_build_dir python_compile +python_compile() { + waf-utils_src_compile --notests +} + +python_test() { + waf-utils_src_compile check } src_install() { - python_install() { - waf-utils_src_install - python_fix_shebang "${ED}" - } - python_foreach_impl run_in_build_dir python_install - python_foreach_impl python_optimize + distutils-r1_src_install # Install heat generating scripts use heat && dosbin "${S}"/contrib/ntpheat{,usb} # Install the openrc files - newinitd "${FILESDIR}"/ntpd.rc-r2 ntp + newinitd "${FILESDIR}"/ntpd.rc-r3 ntp newconfd "${FILESDIR}"/ntpd.confd ntp # Install the systemd unit file @@ -149,7 +154,7 @@ src_install() { chmod 770 "${ED}"/var/lib/ntp keepdir /var/lib/ntp - # Install a log rotate script + # Install a logrotate script mkdir -pv "${ED}"/etc/logrotate.d cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd @@ -161,6 +166,12 @@ src_install() { use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html } +python_install() { + waf-utils_src_install --notests + python_fix_shebang "${ED}" + python_optimize +} + pkg_postinst() { einfo "If you want to serve time on your local network, then" einfo "you should disable all the ref_clocks unless you have" diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index 4d520e72c5a9..ca1b744563fb 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -1,75 +1,98 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_EXT=1 +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE='threads(+)' +DISTUTILS_USE_SETUPTOOLS=no -inherit flag-o-matic python-r1 waf-utils systemd +inherit distutils-r1 flag-o-matic waf-utils systemd if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" else - SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" - RESTRICT="mirror" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ntpsec.asc + inherit verify-sig + SRC_URI=" + https://ftp.ntpsec.org/pub/releases/${P}.tar.gz + verify-sig? ( https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc ) + " + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )" fi DESCRIPTION="The NTP reference implementation, refactored" HOMEPAGE="https://www.ntpsec.org/" +LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" +SLOT="0" + NTPSEC_REFCLOCK=( oncore trimble truetime gpsd jjy generic spectracom - shm pps hpgps zyfer arbiter nmea neoclock modem - local) + shm pps hpgps zyfer arbiter nmea modem local +) IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_} -LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0" -SLOT="0" -IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice +IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early heat libbsd nist ntpviz samba seccomp smear" #ionice REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )" # net-misc/pps-tools oncore,pps -CDEPEND="${PYTHON_DEPS} - sys-libs/libcap +DEPEND=" + ${PYTHON_DEPS} + dev-libs/openssl:= dev-python/psutil[${PYTHON_USEDEP}] + sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) - dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) + rclock_oncore? ( net-misc/pps-tools ) + rclock_pps? ( net-misc/pps-tools ) " -RDEPEND="${CDEPEND} - ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) +RDEPEND=" + ${DEPEND} !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp + ntpviz? ( + media-fonts/liberation-fonts + sci-visualization/gnuplot + ) " -DEPEND="${CDEPEND} - app-text/asciidoc +BDEPEND+=" + >=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets - sys-devel/bison - rclock_oncore? ( net-misc/pps-tools ) - rclock_pps? ( net-misc/pps-tools ) + app-alternatives/yacc " +PATCHES=( + "${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch" + "${FILESDIR}/${PN}-1.2.2-logrotate.patch" +) + WAF_BINARY="${S}/waf" src_prepare() { default + # Remove autostripping of binaries sed -i -e '/Strip binaries/d' wscript || die if ! use libbsd ; then eapply "${FILESDIR}/${PN}-no-bsd.patch" fi + # remove extra default pool servers + sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die + python_copy_sources } src_configure() { - is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin + filter-lto local string_127="" local rclocks=""; @@ -82,47 +105,44 @@ src_configure() { done CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`" - local myconf=( + myconf=( + --notests --nopyc --nopyo + --enable-pylib ext --refclock="${CLOCKSTRING}" - --build-epoch="$(date +%s)" - $(use doc && echo "--enable-doc") + #--build-epoch="$(date +%s)" + $(use doc || echo "--disable-doc") $(use early && echo "--enable-early-droproot") - $(use gdb && echo "--enable-debug-gdb") $(use samba && echo "--enable-mssntp") $(use seccomp && echo "--enable-seccomp") $(use smear && echo "--enable-leap-smear") - $(use tests && echo "--alltests") $(use debug && echo "--enable-debug") ) - python_configure() { - waf-utils_src_configure "${myconf[@]}" - } - python_foreach_impl run_in_build_dir python_configure + distutils-r1_src_configure +} + +python_configure() { + waf-utils_src_configure "${myconf[@]}" +} + +python_compile() { + waf-utils_src_compile --notests } -src_compile() { - unset MAKEOPTS - python_compile() { - waf-utils_src_compile - } - python_foreach_impl run_in_build_dir python_compile +python_test() { + waf-utils_src_compile check } src_install() { - python_install() { - waf-utils_src_install - } - python_foreach_impl run_in_build_dir python_install - python_foreach_impl python_optimize + distutils-r1_src_install # Install heat generating scripts use heat && dosbin "${S}"/contrib/ntpheat{,usb} # Install the openrc files - newinitd "${FILESDIR}"/ntpd.rc-r2 ntp + newinitd "${FILESDIR}"/ntpd.rc-r3 ntp newconfd "${FILESDIR}"/ntpd.confd ntp # Install the systemd unit file @@ -134,7 +154,7 @@ src_install() { chmod 770 "${ED}"/var/lib/ntp keepdir /var/lib/ntp - # Install a log rotate script + # Install a logrotate script mkdir -pv "${ED}"/etc/logrotate.d cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd @@ -146,6 +166,12 @@ src_install() { use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html } +python_install() { + waf-utils_src_install --notests + python_fix_shebang "${ED}" + python_optimize +} + pkg_postinst() { einfo "If you want to serve time on your local network, then" einfo "you should disable all the ref_clocks unless you have" diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest index 2ed611fcd37c..9c2a681ac06b 100644 --- a/net-misc/nx/Manifest +++ b/net-misc/nx/Manifest @@ -1,2 +1,2 @@ -DIST nx-libs-3.5.99.25.tar.gz 11065489 BLAKE2B 9210441fd2dc38fec14c90018ead4e3ddacd5ac266a26b1d985f874af0abdef3fdc2255614e45ec23816f1194ebe6ffe2beb776901eb1ed206658e8175b1ff57 SHA512 142378ae9a81542ed1bc969e9fcb2d421f1d63f7d46185c80e1e07493298e62379697ca2a367301c0f3df631acb19510113f3852922454fdc964767c36a81004 DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211 +DIST nx-libs-3.5.99.27.tar.gz 11076330 BLAKE2B 713f6052a8405bd61916bc2c31cff1b3b14f63f78138a2d8a3c8d85170fede3d126071ef0e03fa267ef1533432f324992ed67edc86f922e3dda4f0cb40811045 SHA512 bfba1eea6f4debe90fa020276079027c3716daaff91bded72297ecab2a8c9f56d07630ca8bc9084c319d2c674304ad80131190ec1272c161c05221d6f19089d0 diff --git a/net-misc/nx/files/nx-3.5.99.26-musl.patch b/net-misc/nx/files/nx-3.5.99.26-musl.patch new file mode 100644 index 000000000000..738b7a2469aa --- /dev/null +++ b/net-misc/nx/files/nx-3.5.99.26-musl.patch @@ -0,0 +1,55 @@ +diff -uNr a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h +--- a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h 2021-02-04 07:34:56.000000000 -0600 ++++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/glheader.h 2023-03-16 13:55:33.983114692 -0600 +@@ -62,9 +62,6 @@ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +-#if defined(__linux__) && defined(__i386__) +-#include <fpu_control.h> +-#endif + #endif + #include <float.h> + #include <stdarg.h> +diff -uNr a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c +--- a/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c 2021-02-04 07:34:56.000000000 -0600 ++++ b/nx-X11/extras/Mesa_6.4.2/src/mesa/main/imports.c 2023-03-16 13:56:25.569122176 -0600 +@@ -1169,20 +1169,6 @@ + static GLboolean initialized = GL_FALSE; + if (!initialized) { + init_sqrt_table(); +- +-#if defined(_FPU_GETCW) && defined(_FPU_SETCW) +- { +- const char *debug = _mesa_getenv("MESA_DEBUG"); +- if (debug && _mesa_strcmp(debug, "FP")==0) { +- /* die on FP exceptions */ +- fpu_control_t mask; +- _FPU_GETCW(mask); +- mask &= ~(_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM +- | _FPU_MASK_OM | _FPU_MASK_UM); +- _FPU_SETCW(mask); +- } +- } +-#endif + initialized = GL_TRUE; + } + +diff -uNr a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c +--- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c 2021-02-04 07:34:56.000000000 -0600 ++++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c 2023-03-16 13:57:30.694956647 -0600 +@@ -40,14 +40,7 @@ + + #include <sys/types.h> + #ifdef HAS_SHM +-#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2) +-/* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */ +-/* Linux libc4 and libc5 only (because glibc doesn't include kernel headers): +- Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define +- PAGE_SIZE. It is defined in <asm/page.h>. */ +-#include <asm/page.h> + #include <limits.h> +-#endif + #ifdef SVR4 + #include <sys/sysmacros.h> + #endif diff --git a/net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch b/net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch new file mode 100644 index 000000000000..79ef8b9b5f18 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch @@ -0,0 +1,64 @@ +From 460562852eb4b1e14d2eeb81d2b96ea5de6ef683 Mon Sep 17 00:00:00 2001 +From: Alexandre Ghiti <alexandre.ghiti@canonical.com> +Date: Fri, 10 Sep 2021 08:51:53 +0200 +Subject: [PATCH] nx-X11: Add support for riscv64 architecture + +Signed-off-by: Xin Yang <yangmame@icloud.com> +--- + nx-X11/config/cf/Imake.cf | 5 +++++ + nx-X11/config/cf/Imake.tmpl | 2 ++ + nx-X11/config/cf/linux.cf | 9 +++++++++ + 3 files changed, 16 insertions(+) + +diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf +index 9d683b85..612bc4e3 100644 +--- a/nx-X11/config/cf/Imake.cf ++++ b/nx-X11/config/cf/Imake.cf +@@ -878,6 +878,11 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 + # undef __powerpc64__ + # undef tmp_set_big_endian + # endif ++# ifdef __riscv ++# if __riscv_xlen == 64 ++# define Riscv64Architecture ++# endif ++# endif + # ifdef sparc + # define SparcArchitecture + # undef sparc +diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl +index de1fca93..266be8c5 100644 +--- a/nx-X11/config/cf/Imake.tmpl ++++ b/nx-X11/config/cf/Imake.tmpl +@@ -509,6 +509,8 @@ XCOMM the platform-specific parameters - edit site.def to change + #define ByteOrder X_BIG_ENDIAN + #elif defined(Ppc64LeArchitecture) + #define ByteOrder X_LITTLE_ENDIAN ++#elif defined(Riscv64Architecture) ++#define ByteOrder X_LITTLE_ENDIAN + #elif defined(HPArchitecture) + #define ByteOrder X_BIG_ENDIAN + #elif defined(SuperHArchitecture) +diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf +index c3e9eaaf..6851be55 100644 +--- a/nx-X11/config/cf/linux.cf ++++ b/nx-X11/config/cf/linux.cf +@@ -783,6 +783,15 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) + # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines + #endif /* PpcArchitecture */ + ++#ifdef Riscv64Architecture ++# ifndef OptimizedCDebugFlags ++# define OptimizedCDebugFlags -O3 ++# endif ++# define LinuxMachineDefines -D__riscv64__ ++# define ServerOSDefines XFree86ServerOSDefines ++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 ++#endif /* Riscv64Achitecture */ ++ + #ifdef s390Architecture + # ifndef OptimizedCDebugFlags + # define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs +-- +2.38.1 + diff --git a/net-misc/nx/files/nx-3.5.99.26-which.patch b/net-misc/nx/files/nx-3.5.99.26-which.patch new file mode 100644 index 000000000000..abc1f9e1a8d3 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.99.26-which.patch @@ -0,0 +1,33 @@ +--- a/nx-X11/Makefile ++++ b/nx-X11/Makefile +@@ -70,7 +70,7 @@ + else \ + exit 0; \ + fi +- which $(IMAKE) 1>/dev/null && $(IMAKE_CMD) $(MFLAGS) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) ++ command -v $(IMAKE) 1>/dev/null && $(IMAKE_CMD) $(MFLAGS) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) + + # don't allow any default rules in this Makefile + .SUFFIXES: +--- a/nx-X11/extras/Mesa_6.4.2/bin/mklib ++++ b/nx-X11/extras/Mesa_6.4.2/bin/mklib +@@ -285,7 +285,7 @@ + # -linker was not specified, choose default linker now + if [ $CPLUSPLUS = 1 ] ; then + # determine linker and options for C++ code +- if [ `which c++` ] ; then ++ if [ `command -v c++` ] ; then + # use Sun c++ + LINK="c++" + elif [ `type g++` ] ; then +--- a/nx-X11/x-indent.sh ++++ b/nx-X11/x-indent.sh +@@ -2,7 +2,7 @@ + + # We want GNU indent, so first search for gindent to avoid /usr/bin/indent + # on the BSDs, which won't work for us +-INDENT=$(which gnuindent || which gindent || which indent) ++INDENT=$(command -v gnuindent || command -v gindent || command -v indent) + + if [ -z "${INDENT}" ] ; then + echo "Could not find indent, sorry..." >&2 diff --git a/net-misc/nx/files/nx-3.5.99.27-which.patch b/net-misc/nx/files/nx-3.5.99.27-which.patch new file mode 100644 index 000000000000..4d452dad0157 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.99.27-which.patch @@ -0,0 +1,22 @@ +--- a/nx-X11/Makefile ++++ b/nx-X11/Makefile +@@ -70,7 +70,7 @@ + else \ + exit 0; \ + fi +- which $(IMAKE) 1>/dev/null && $(IMAKE_CMD) $(MFLAGS) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) ++ command -v $(IMAKE) 1>/dev/null && $(IMAKE_CMD) $(MFLAGS) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) + + # don't allow any default rules in this Makefile + .SUFFIXES: +--- a/nx-X11/extras/Mesa_6.4.2/bin/mklib ++++ b/nx-X11/extras/Mesa_6.4.2/bin/mklib +@@ -285,7 +285,7 @@ + # -linker was not specified, choose default linker now + if [ $CPLUSPLUS = 1 ] ; then + # determine linker and options for C++ code +- if [ `which c++` ] ; then ++ if [ `command -v c++` ] ; then + # use Sun c++ + LINK="c++" + elif [ `type g++` ] ; then diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild index 6ddb12f1652c..3a112d2be6bb 100644 --- a/net-misc/nx/nx-3.5.99.26.ebuild +++ b/net-misc/nx/nx-3.5.99.26.ebuild @@ -1,23 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="NX compression technology core libraries" HOMEPAGE="https://github.com/ArcticaProject/nx-libs" - SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-libs-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc x86" -IUSE="elibc_glibc" +KEYWORDS="amd64 ~arm64 ~ppc ~riscv x86" +IUSE="selinux" RDEPEND="dev-libs/libxml2 + media-libs/libjpeg-turbo:* >=media-libs/libpng-1.2.8:0= >=sys-libs/zlib-1.2.3 - virtual/jpeg:* x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage @@ -34,18 +33,23 @@ RDEPEND="dev-libs/libxml2 DEPEND="${RDEPEND} x11-base/xorg-proto - x11-libs/libfontenc + x11-libs/libfontenc" + +BDEPEND="virtual/pkgconfig x11-misc/gccmakedep x11-misc/imake" -BDEPEND=" - virtual/pkgconfig" +RDEPEND+=" selinux? ( sec-policy/selinux-nx )" S="${WORKDIR}/nx-libs-${PV}" PATCHES=( # https://github.com/ArcticaProject/nx-libs/pull/1012 "${FILESDIR}/${PN}-3.5.99.26-binutils-2.36.patch" + # https://github.com/ArcticaProject/nx-libs/pull/1023 + "${FILESDIR}/${PN}-3.5.99.26-riscv64-support.patch" + "${FILESDIR}/${PN}-3.5.99.26-musl.patch" + "${FILESDIR}/${PN}-3.5.99.26-which.patch" ) src_prepare() { @@ -68,6 +72,13 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861680 + # + # inherited from libX11 vendored code. libX11 passes this flag already. + append-flags -fno-strict-aliasing + filter-lto + # From xorg-x11-6.9.0-r3.ebuild pushd nx-X11 || die HOSTCONF="config/cf/host.def" diff --git a/net-misc/nx/nx-3.5.99.25.ebuild b/net-misc/nx/nx-3.5.99.27.ebuild index d3b7370a9078..60a90c7c8d28 100644 --- a/net-misc/nx/nx-3.5.99.25.ebuild +++ b/net-misc/nx/nx-3.5.99.27.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools toolchain-funcs +EAPI=8 +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="NX compression technology core libraries" HOMEPAGE="https://github.com/ArcticaProject/nx-libs" @@ -11,13 +11,12 @@ SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-li LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="elibc_glibc" +KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86" RDEPEND="dev-libs/libxml2 + media-libs/libjpeg-turbo:* >=media-libs/libpng-1.2.8:0= >=sys-libs/zlib-1.2.3 - virtual/jpeg:* x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage @@ -34,15 +33,19 @@ RDEPEND="dev-libs/libxml2 DEPEND="${RDEPEND} x11-base/xorg-proto - x11-libs/libfontenc + x11-libs/libfontenc" + +BDEPEND="virtual/pkgconfig x11-misc/gccmakedep x11-misc/imake" -BDEPEND=" - virtual/pkgconfig" - S="${WORKDIR}/nx-libs-${PV}" +PATCHES=( + "${FILESDIR}/${PN}-3.5.99.26-musl.patch" + "${FILESDIR}/${PN}-3.5.99.27-which.patch" +) + src_prepare() { default @@ -63,6 +66,13 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861680 + # + # inherited from libX11 vendored code. libX11 passes this flag already. + append-flags -fno-strict-aliasing + filter-lto + # From xorg-x11-6.9.0-r3.ebuild pushd nx-X11 || die HOSTCONF="config/cf/host.def" @@ -79,7 +89,7 @@ src_configure() { local subdir for subdir in nxcomp nxdialog nxcompshad nxproxy ; do pushd ${subdir} || die - econf + econf --enable-static popd || die done diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest index f19b8efd9604..5bcb8298b40a 100644 --- a/net-misc/nxplayer/Manifest +++ b/net-misc/nxplayer/Manifest @@ -1,4 +1,2 @@ -DIST nomachine-enterprise-client_5.1.24_1_i686.tar.gz 28378074 BLAKE2B a377dca915d6955d10d517754675a85a674e12088c1205adc6b99cc86685ec3551221cdd897f51f7f9da519388f9bd214c9828e530555202e1dd7506f1a02f42 SHA512 9ac3ee63a2c9dd7d6a110924a92718c7a9738e5bfbc7a3a30b2060a64c5eaeab3597e0d0532890e0e463869e47781528b6c7006d96634bf819cdd2415e35015c -DIST nomachine-enterprise-client_5.1.24_1_x86_64.tar.gz 29381273 BLAKE2B 491224421978a687a65a440ac069dfdef23cb8802872d51b1d2ae2e729696d85f082cfb6faf04e5dabf1bacb05849423003424738c755c1e043292d7b678d2f6 SHA512 18bbba7d729fd1ade04ad2d4812bd4b1bbe806036b44cbb8f9648e8bfa32008d72bc85d380fe1fc352ce92de50104fc43da030d56349502ac46a7ed6fa6afc42 DIST nomachine-enterprise-client_7.6.2_4_i686.tar.gz 146288 BLAKE2B d42d67c8d774fa532dfbb29b537804958fe0aa4f71af964ce1828cd5359b9a67c846448aa2bf7d580a7b4bcc765f0d443e2d4c5a41a8cce968cc0a4fc77694c6 SHA512 8faa599b3f942038262eb60845a28886566e6b8c2b39dcf92de5cd9a0cde6a539fc5d04c8b8fab39c6a6970028f1707988228809a402a8274555ce88715369a1 DIST nomachine-enterprise-client_7.6.2_4_x86_64.tar.gz 36964725 BLAKE2B 6c1320cf2bc153597800b0b191fff8152fd7205a0646451102101602dac8c8868cf89fcd32f678d8424df3f10af3c26a0b08aa70e7e2f117474f5e7779ca24c5 SHA512 467f816f67dc6cec352abbf29af8c1a6991ce9b105d3b944682afdeb4b74121a57cb2059cd8a1dca107fec38b53aaf65fe7be01ffbf020ae2c813e0b0df5ecdf diff --git a/net-misc/nxplayer/nxplayer-5.1.24.1-r1.ebuild b/net-misc/nxplayer/nxplayer-5.1.24.1-r1.ebuild deleted file mode 100644 index f367d114833e..000000000000 --- a/net-misc/nxplayer/nxplayer-5.1.24.1-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator wrapper - -MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)" - -DESCRIPTION="Client for NoMachine remote servers" -HOMEPAGE="https://www.nomachine.com" -SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz ) - x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )" -S="${WORKDIR}"/NX/etc/NX/player/packages - -LICENSE="nomachine" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -RESTRICT="strip" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/openssl:0 - || ( - sys-libs/libxcrypt[compat] - sys-libs/glibc[crypt(+)] - ) -" - -QA_PREBUILT="*" - -src_install() { - local NXROOT=/opt/NX - - #dodir /etc/NX/localhost - #echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg - - dodir /opt - tar xozf nxclient.tar.gz -C "${ED}"/opt - tar xozf nxplayer.tar.gz -C "${ED}"/opt - - make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin -} diff --git a/net-misc/nxplayer/nxplayer-7.6.2.4.ebuild b/net-misc/nxplayer/nxplayer-7.6.2.4-r1.ebuild index 6c7c06277ceb..9ce1d6a5a12b 100644 --- a/net-misc/nxplayer/nxplayer-7.6.2.4.ebuild +++ b/net-misc/nxplayer/nxplayer-7.6.2.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ KEYWORDS="-* ~amd64 ~x86" RDEPEND=" || ( sys-libs/libxcrypt[compat] - sys-libs/glibc[crypt(+)] + sys-libs/glibc[crypt(-)] ) dev-libs/glib:2 dev-libs/openssl:0 diff --git a/net-misc/nyx/metadata.xml b/net-misc/nyx/metadata.xml index 1fb7f8926f87..4a716be36946 100644 --- a/net-misc/nyx/metadata.xml +++ b/net-misc/nyx/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="pypi">nyx</remote-id> </upstream> diff --git a/net-misc/nyx/nyx-2.1.0-r2.ebuild b/net-misc/nyx/nyx-2.1.0-r6.ebuild index 7c6aeee19674..11c917f7f5e2 100644 --- a/net-misc/nyx/nyx-2.1.0-r2.ebuild +++ b/net-misc/nyx/nyx-2.1.0-r6.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=(python3_{8,9} pypy3) +PYTHON_COMPAT=( python3_{9..12} pypy3 ) PYTHON_REQ_USE='ncurses,sqlite(-)' +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -14,15 +15,24 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.torproject.org/nyx.git" inherit git-r3 else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" + inherit pypi fi LICENSE="GPL-3" SLOT="0" +# net-libs/stem-1.8.0_p20211118 was an incompatible git-snapshot +# simply depend on net-libs/stem in the future RDEPEND=" net-libs/stem[${PYTHON_USEDEP}] net-vpn/tor" distutils_enable_tests unittest + +python_install_all() { + distutils-r1_python_install_all + + # bug #645336 + doman nyx.1 +} diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest index 6c678670a5d0..18448a795f89 100644 --- a/net-misc/ofono/Manifest +++ b/net-misc/ofono/Manifest @@ -1,2 +1,2 @@ -DIST ofono-1.31.tar.xz 1049252 BLAKE2B f7b40d3aa7854369a7886a4b64bb66044e8f016682665935f7727bf219c084d266d8fd7f80c97e58234d845f7db3dc52133298697274745d115cf14c62769d82 SHA512 377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20 -DIST ofono-1.33.tar.xz 1060408 BLAKE2B 646a96c0926ea032fef0357aabe6a4be6da88f4ccbdff59bb86b5de73a9b469362151b212a05234619f5d616b534343137c66e923782c7d50dfe13d2bf66558c SHA512 8d88226aa2b43eca840c6330045ee7a96c91f6003b06fca5ea55b74fc229f0e0ba0c8d98f7945f8c23ec5a8e7057bffef6335c61842e245686e0ed7c5feda589 +DIST ofono-2.1.tar.xz 1097624 BLAKE2B 574293a73061470eec322df7fa62d581e8e8d2c5b81e896bff52173a986733f448686186bc0400ccf256fb931e26a1fef6a664dafa8f64935f936c9347e4a054 SHA512 7227939c488c2a62f640d5a8279e0698935aa1df5a2a349e195df9a8d9d9123c73a7f1177aae022b4c805d266c24a9770784193100adffa45f6c36a3ed847bb1 +DIST ofono-2.3.tar.xz 1216872 BLAKE2B e32ea09dbc8f0aa2ca3f322ffc34d9f9d06d862792b05a0f96ddba4ebe4038199ab40a4065582d68a35d2a5725646626bc36c8f9e83d89a42be8d76271144751 SHA512 0c53c2c441d28f89140192fe808769b3b27ef1ebf75e9ee9f9bfa53d0d102a47d11fcb364077ca88cdc598e8368924f477024b44a2adf795efe40b52ffe92dce diff --git a/net-misc/ofono/ofono-1.33.ebuild b/net-misc/ofono/ofono-2.1.ebuild index 7b3600dc6b80..d4c3415dffc6 100644 --- a/net-misc/ofono/ofono-1.33.ebuild +++ b/net-misc/ofono/ofono-2.1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon" -HOMEPAGE="https://01.org/ofono" -SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" +HOMEPAGE="https://git.kernel.org/pub/scm/network/ofono/ofono.git" +SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86" IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower" REQUIRED_USE="dundee? ( bluetooth )" diff --git a/net-misc/ofono/ofono-1.31.ebuild b/net-misc/ofono/ofono-2.3.ebuild index 7ae12935361e..544ccf185011 100644 --- a/net-misc/ofono/ofono-1.31.ebuild +++ b/net-misc/ofono/ofono-2.3.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon" -HOMEPAGE="https://01.org/ofono" -SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" +HOMEPAGE="https://git.kernel.org/pub/scm/network/ofono/ofono.git" +SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86" -IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+atmodem bluetooth +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower" REQUIRED_USE="dundee? ( bluetooth )" -RDEPEND=">=sys-apps/dbus-1.4 - >=dev-libs/glib-2.32 +RDEPEND=">=sys-apps/dbus-1.6 + >=dev-libs/glib-2.68 net-misc/mobile-broadband-provider-info bluetooth? ( >=net-wireless/bluez-4.99 ) udev? ( virtual/udev ) @@ -33,7 +33,6 @@ src_configure() { $(use_enable udev) \ $(use_enable isimodem) \ $(use_enable atmodem) \ - $(use_enable cdmamodem) \ $(use_enable datafiles) \ $(use_enable dundee) \ $(use_enable bluetooth) \ @@ -55,7 +54,6 @@ src_install() { if use tools ; then dobin tools/auto-enable \ tools/huawei-audio \ - tools/lookup-provider-name \ tools/lookup-apn \ tools/get-location \ tools/tty-redirector diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest index 8cfb6a24c90e..969d1714e0e4 100644 --- a/net-misc/oidc-agent/Manifest +++ b/net-misc/oidc-agent/Manifest @@ -1,2 +1,3 @@ -DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95 SHA512 e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1 -DIST oidc-agent-4.2.2.tar.gz 823169 BLAKE2B 5ce071c1ac6e65ab7de869e9963884e60142dc1c93e8eb3eb00c144527754199867238eb45ca2cba814dedf7e55b2aedf66f45e613697ebc3262598fca0312e5 SHA512 852eb5c6c071aafa58366e5e867f95908cac2fa0c3b6924e021cc81825b0bba0549e74742eff0ef5a9bbb16173e21c94ba7b618150a42b585968b4cd4663409e +DIST oidc-agent-4.5.2.tar.gz 1766905 BLAKE2B 0558778a5162fbbbe29be9a476838d745abf4825e7274487637f368d521e03f6f165ec82129f37f135a6cf3d3d43bb9349574b88763a508bb683cdc8882230d2 SHA512 04c9ddb258c132781eaa875412f0a8d48d2127e5b78ba262eb0240dac05025db62f5d357e4b5c35a9009960b30d63ce96156c8dcf3b5eac4257c02d37578e676 +DIST oidc-agent-5.0.1.tar.gz 1802435 BLAKE2B 75bc66bb2c6cc89293c7ad155d35b7a7adb73ad7f8a5aadeb029b43a095e2a80f0fc4505737a0c53c60e6f601acbcab990ad4b572b659050fe36e5dd2e7c4092 SHA512 caffa9d7733690917472d2d48ca58092ab722c5f049750de37169dc0a76ccbe374ae3fb5e56b8c578465e84a2f40795eaa26018281b4f851f7a7c94571d2a124 +DIST oidc-agent-5.1.0.tar.gz 1803314 BLAKE2B 8ce1de7ec6dffa3155200664a93433db4f4a116325d8ce60ffff885d534b3d2367e40577b6b22987e817d92f0020fea97e2224947b27ba10847bb0c347dcdf3a SHA512 f3ecda4445478ea02e833b0b9ed75a517c1ff91f5b0c2cb258cc3a7eacb62cb75b56697e15fa755d9cf45e7a0293c8bd2f6ab8d998dd8680726c4143b1e011bc diff --git a/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch b/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch deleted file mode 100644 index 1e8765aef9d0..000000000000 --- a/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -58,7 +58,7 @@ - - # USE_CJSON_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i libcjson >/dev/null && echo 1 || echo 0) - USE_CJSON_SO ?= 0 --USE_LIST_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i liblist >/dev/null && echo 1 || echo 0) -+USE_LIST_SO ?= 0 - - ifeq ($(USE_CJSON_SO),1) - DEFINE_USE_CJSON_SO = -DUSE_CJSON_SO diff --git a/net-misc/oidc-agent/files/oidc-agent-4.1.0_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.1.0_install-perms.patch deleted file mode 100644 index e0ee26cfa6f2..000000000000 --- a/net-misc/oidc-agent/files/oidc-agent-4.1.0_install-perms.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -426,19 +426,19 @@ - - ## Man pages - $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1 -- @install $< $@ -+ @install -m 644 $< $@ - $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1 -- @install $< $@ -+ @install -m 644 $< $@ - $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1 -- @install $< $@ -+ @install -m 644 $< $@ - $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1 -- @install $< $@ -+ @install -m 644 $< $@ - $(MAN_PATH)/man1/$(AGENT_SERVICE).1: $(MANDIR)/$(AGENT_SERVICE).1 $(MAN_PATH)/man1 -- @install $< $@ -+ @install -m 644 $< $@ - $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1 -- @install $< $@ -+ @install -m 644 $< $@ - $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1 -- @install $< $@ -+ @install -m 644 $< $@ - - - ## Lib -@@ -452,24 +452,24 @@ - @ln -sf $(SHARED_LIB_NAME_SO) $@ - - $(INCLUDE_PATH)/oidc-agent/api.h: $(SRCDIR)/$(CLIENT)/api.h $(INCLUDE_PATH)/oidc-agent -- @install $< $@ -+ @install -m 644 $< $@ - - $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent -- @install $< $@ -+ @install -m 644 $< $@ - - $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent -- @install $< $@ -+ @install -m 644 $< $@ - - $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH) -- @install $< $@ -+ @install -m 644 $< $@ - - $(INCLUDE_PATH)/oidc-agent/export_symbols.h: $(SRCDIR)/$(CLIENT)/export_symbols.h $(INCLUDE_PATH)/oidc-agent -- @install $< $@ -+ @install -m 644 $< $@ - - - ## scheme handler - $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop -- @install -D $< $@ -+ @install -m 644 -D $< $@ - @echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@ - - ## Xsession diff --git a/net-misc/oidc-agent/files/oidc-agent-4.1.0_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.1.0_makefile-toolchain-vars.patch deleted file mode 100644 index 2f42a21afbd6..000000000000 --- a/net-misc/oidc-agent/files/oidc-agent-4.1.0_makefile-toolchain-vars.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -89,9 +89,9 @@ - endif - - # Compiler options --CC = gcc -+CC := $(CC) - # compiling flags here --CFLAGS = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common -+CFLAGS := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common - ifndef MAC_OS - ifndef NODPKG - CFLAGS +=$(shell dpkg-buildflags --get CPPFLAGS) -@@ -102,11 +102,11 @@ - TEST_CFLAGS = $(CFLAGS) -I. - - # Linker options --LINKER = gcc -+LINKER := $(CC) - ifdef MAC_OS - LFLAGS = $(LSODIUM) $(LARGP) - else --LFLAGS = $(LSODIUM) $(LSECCOMP) -fno-common -+LFLAGS := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common - ifndef NODPKG - LFLAGS +=$(shell dpkg-buildflags --get LDFLAGS) - endif -@@ -117,7 +117,7 @@ - ifeq ($(USE_LIST_SO),1) - LFLAGS += $(LLIST) - endif --AGENT_LFLAGS = $(LCURL) $(LMICROHTTPD) $(LFLAGS) -+AGENT_LFLAGS := $(LDFLAGS) $(LCURL) $(LMICROHTTPD) $(LFLAGS) - ifndef MAC_OS - AGENT_LFLAGS += $(LSECRET) $(LGLIB) - endif -@@ -126,12 +126,12 @@ - ifdef MAC_OS - CLIENT_LFLAGS = -L$(APILIB) $(LARGP) $(LAGENT) $(LSODIUM) - else --CLIENT_LFLAGS = -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP) -+CLIENT_LFLAGS := $(LDFLAGS) -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP) - ifndef NODPKG - CLIENT_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS) - endif - endif --LIB_LFLAGS = -lc $(LSODIUM) -+LIB_LFLAGS := $(LDFLAGS) -lc $(LSODIUM) - ifndef MAC_OS - ifndef NODPKG - LIB_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS) diff --git a/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch deleted file mode 100644 index 2df3afce8e68..000000000000 --- a/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -92,9 +92,9 @@ - endif - - # Compiler options --CC = gcc -+CC := $(CC) - # compiling flags here --CFLAGS = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common -+CFLAGS := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common - ifndef MAC_OS - ifndef NODPKG - CFLAGS +=$(shell dpkg-buildflags --get CPPFLAGS) -@@ -106,11 +106,11 @@ - TEST_CFLAGS = $(CFLAGS) -I. - - # Linker options --LINKER = gcc -+LINKER := $(CC) - ifdef MAC_OS - LFLAGS = $(LSODIUM) $(LARGP) - else --LFLAGS = $(LSODIUM) $(LSECCOMP) -fno-common -+LFLAGS := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common - ifndef NODPKG - LFLAGS +=$(shell dpkg-buildflags --get LDFLAGS) - endif -@@ -130,12 +130,12 @@ - ifdef MAC_OS - CLIENT_LFLAGS = -L$(APILIB) $(LARGP) $(LAGENT) $(LSODIUM) - else --CLIENT_LFLAGS = -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP) -+CLIENT_LFLAGS := $(LDFLAGS) -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP) - ifndef NODPKG - CLIENT_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS) - endif - endif --LIB_LFLAGS = -lc $(LSODIUM) -+LIB_LFLAGS := $(LDFLAGS) -lc $(LSODIUM) - ifndef MAC_OS - ifndef NODPKG - LIB_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS) diff --git a/net-misc/oidc-agent/files/oidc-agent-4.5.0_webkit41.patch b/net-misc/oidc-agent/files/oidc-agent-4.5.0_webkit41.patch new file mode 100644 index 000000000000..d445fafcb3c7 --- /dev/null +++ b/net-misc/oidc-agent/files/oidc-agent-4.5.0_webkit41.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -179,7 +179,7 @@ + CPPFLAGS += -fPIC + ifndef MAC_OS + ifndef ANY_MSYS +-CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 webkit2gtk-4.0) -lstdc++ ++CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 webkit2gtk-4.1) -lstdc++ + endif + endif + ifndef MAC_OS diff --git a/net-misc/oidc-agent/files/oidc-agent-4.5.2_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.5.2_install-perms.patch new file mode 100644 index 000000000000..b83c934e75d9 --- /dev/null +++ b/net-misc/oidc-agent/files/oidc-agent-4.5.2_install-perms.patch @@ -0,0 +1,32 @@ +--- a/Makefile ++++ b/Makefile +@@ -698,16 +698,16 @@ + @ln -sf $(SHARED_LIB_NAME_SO) $@ + + $(INCLUDE_PATH)/oidc-agent/%.h: $(SRCDIR)/api/%.h $(INCLUDE_PATH)/oidc-agent +- @install -p $< $@ ++ @install -p -m 644 $< $@ + + $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent +- @install -p $< $@ ++ @install -p -m 644 $< $@ + + $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent +- @install -p $< $@ ++ @install -p -m 644 $< $@ + + $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH) +- @install -p $< $@ ++ @install -p -m 644 $< $@ + + endif + +@@ -715,7 +715,7 @@ + + ## scheme handler + $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop +- @install -p -D $< $@ ++ @install -p -m 644 -D $< $@ + @echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@ + + ## Xsession diff --git a/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch new file mode 100644 index 000000000000..6b19950e420e --- /dev/null +++ b/net-misc/oidc-agent/files/oidc-agent-5.0.1_install-perms.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -739,7 +739,7 @@ + @install -p -m 644 $< $@ + + $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH) +- @install -p $< $@ ++ @install -p -m 644 $< $@ + + endif + diff --git a/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch b/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch new file mode 100644 index 000000000000..d950fc879fb8 --- /dev/null +++ b/net-misc/oidc-agent/files/oidc-agent-5.0.1_webkit41.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -185,7 +185,7 @@ + CPPFLAGS += -fPIC + ifndef MAC_OS + ifndef ANY_MSYS +-WEBKITGTK ?= webkit2gtk-4.0 ++WEBKITGTK ?= webkit2gtk-4.1 + CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 $(WEBKITGTK)) -lstdc++ + endif + endif diff --git a/net-misc/oidc-agent/oidc-agent-4.2.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild index 53f713528866..10d657339258 100644 --- a/net-misc/oidc-agent/oidc-agent-4.2.2.ebuild +++ b/net-misc/oidc-agent/oidc-agent-4.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,32 +11,51 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~arm64 ~riscv" IUSE="test" DEPEND="app-crypt/libsecret + dev-libs/cJSON:= dev-libs/libsodium:= media-gfx/qrencode net-libs/libmicrohttpd:= - sys-libs/libseccomp" + net-libs/webkit-gtk:4.1= + net-misc/curl + elibc_musl? ( sys-libs/argp-standalone )" RDEPEND="${DEPEND}" BDEPEND="test? ( dev-libs/check )" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch - "${FILESDIR}"/${PN}-4.1.0_install-perms.patch - "${FILESDIR}"/${PN}-4.2.2_makefile-toolchain-vars.patch + "${FILESDIR}"/${PN}-4.5.0_webkit41.patch + "${FILESDIR}"/${PN}-4.5.2_install-perms.patch ) src_prepare() { + xdg_environment_reset default sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" } +oidc_emake() { + local mymakeargs=( + USE_CJSON_SO=1 + USE_LIST_SO=0 + USE_MUSTACHE_SO=0 + USE_ARGP_SO=$(usex elibc_musl 1 0) + ) + + emake "${mymakeargs[@]}" $@ +} + +src_compile() { + oidc_emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157 + oidc_emake +} + src_install() { - emake \ + oidc_emake \ PREFIX="${ED}" \ BIN_AFTER_INST_PATH="/usr" \ INCLUDE_PATH="${ED}"/usr/include \ diff --git a/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild index a4b1287eadfa..1df884f36c47 100644 --- a/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild +++ b/net-misc/oidc-agent/oidc-agent-5.0.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit xdg-utils +inherit tmpfiles xdg-utils DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line" HOMEPAGE="https://github.com/indigo-dc/oidc-agent" @@ -11,31 +11,51 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~riscv" +KEYWORDS="amd64 ~arm64 ~riscv" IUSE="test" DEPEND="app-crypt/libsecret + dev-libs/cJSON:= dev-libs/libsodium:= + media-gfx/qrencode net-libs/libmicrohttpd:= - sys-libs/libseccomp" + net-libs/webkit-gtk:4.1= + net-misc/curl + elibc_musl? ( sys-libs/argp-standalone )" RDEPEND="${DEPEND}" BDEPEND="test? ( dev-libs/check )" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch - "${FILESDIR}"/${PN}-4.1.0_install-perms.patch - "${FILESDIR}"/${PN}-4.1.0_makefile-toolchain-vars.patch + "${FILESDIR}"/${PN}-5.0.1_install-perms.patch + "${FILESDIR}"/${PN}-5.0.1_webkit41.patch ) src_prepare() { + xdg_environment_reset default sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" } +oidc_emake() { + local mymakeargs=( + USE_CJSON_SO=1 + USE_LIST_SO=0 + USE_MUSTACHE_SO=0 + USE_ARGP_SO=$(usex elibc_musl 1 0) + ) + + emake "${mymakeargs[@]}" $@ +} + +src_compile() { + oidc_emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157 + oidc_emake +} + src_install() { - emake \ + oidc_emake \ PREFIX="${ED}" \ BIN_AFTER_INST_PATH="/usr" \ INCLUDE_PATH="${ED}"/usr/include \ @@ -48,6 +68,8 @@ src_install() { } pkg_postinst() { + tmpfiles_process ${PN}.conf + xdg_desktop_database_update if [[ -z "${REPLACING_VERSIONS}" ]]; then @@ -58,12 +80,15 @@ pkg_postinst() { elog " https://indigo-dc.gitbooks.io/oidc-agent/" elog else - local new_major_ver old_ver - new_major_ver=$(ver_cut 1) + local old_ver for old_ver in ${REPLACING_VERSIONS}; do - if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then + if [[ $(ver_cut 1 ${old_ver}) != 5 ]]; then + ewarn "${PN} 5 is a major release with quite some usability improvements but unfortunately also some breaking changes." + ewarn "Please consult" + ewarn " https://indigo-dc.gitbook.io/oidc-agent/oidc-agent5" + ewarn "for instructions on how to upgrade your configuration to this version" ewarn - ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}" + ewarn "Furthermore, please restart any running instances of ${PN}" ewarn "to make sure they are compatible with the updated clients." ewarn break diff --git a/net-misc/oidc-agent/oidc-agent-5.1.0.ebuild b/net-misc/oidc-agent/oidc-agent-5.1.0.ebuild new file mode 100644 index 000000000000..6517defe32b2 --- /dev/null +++ b/net-misc/oidc-agent/oidc-agent-5.1.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit tmpfiles xdg-utils + +DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line" +HOMEPAGE="https://github.com/indigo-dc/oidc-agent" +SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv" +IUSE="test" + +DEPEND="app-crypt/libsecret + dev-libs/cJSON:= + dev-libs/libsodium:= + media-gfx/qrencode + net-libs/libmicrohttpd:= + net-libs/webkit-gtk:4.1= + net-misc/curl + elibc_musl? ( sys-libs/argp-standalone )" +RDEPEND="${DEPEND}" +BDEPEND="test? ( dev-libs/check )" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-5.0.1_install-perms.patch + "${FILESDIR}"/${PN}-5.0.1_webkit41.patch +) + +src_prepare() { + xdg_environment_reset + default + sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" +} + +oidc_emake() { + local mymakeargs=( + USE_CJSON_SO=1 + USE_LIST_SO=0 + USE_MUSTACHE_SO=0 + USE_ARGP_SO=$(usex elibc_musl 1 0) + ) + + emake "${mymakeargs[@]}" $@ +} + +src_compile() { + oidc_emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157 + oidc_emake +} + +src_install() { + oidc_emake \ + PREFIX="${ED}" \ + BIN_AFTER_INST_PATH="/usr" \ + INCLUDE_PATH="${ED}"/usr/include \ + LIB_PATH="${ED}"/usr/$(get_libdir) \ + install + + # This file is not compatible with Gentoo and in any case, we generally + # let the users load such agents themselves. + rm -f "${ED}"/etc/X11/Xsession.d/91${PN} +} + +pkg_postinst() { + tmpfiles_process ${PN}.conf + + xdg_desktop_database_update + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog + elog "You should use oidc-gen to initially generate your account configuration" + elog "before it can be loaded into oidc-agent using oidc-add. For details, please" + elog "consult the man page of oidc-gen, or full documentation at" + elog " https://indigo-dc.gitbooks.io/oidc-agent/" + elog + else + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if [[ $(ver_cut 1 ${old_ver}) != 5 ]]; then + ewarn "${PN} 5 is a major release with quite some usability improvements but unfortunately also some breaking changes." + ewarn "Please consult" + ewarn " https://indigo-dc.gitbook.io/oidc-agent/oidc-agent5" + ewarn "for instructions on how to upgrade your configuration to this version" + ewarn + ewarn "Furthermore, please restart any running instances of ${PN}" + ewarn "to make sure they are compatible with the updated clients." + ewarn + break + fi + done + fi +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest index 284f42d8f29a..5c40fbb4aceb 100644 --- a/net-misc/oidentd/Manifest +++ b/net-misc/oidentd/Manifest @@ -1,2 +1,2 @@ -DIST oidentd-2.5.0.tar.xz 195536 BLAKE2B ea6327fc415811b7050503daa393639f5740e9c1681794cfadf447e4968024aed7e0367ba804209d236c295777f856297b62c1d7e307c268c3d9fad9b240b7f5 SHA512 31ff2cad2afaa9f07a0aa35ad904047de78f168f9e6d6a3fcf7397eb89e6b930c30741eb1de44e3c2c24f48ca7d860cafd2771f464b336d400ab6d98384e9320 DIST oidentd-3.0.0.tar.xz 187088 BLAKE2B ca824119cbb54aee52658c9a167ace88b2ed7f118565d7be043e19534a323772d18a043d803cd553c7408a525e3c717ffb990fb8794b4af4e8ac6c1efe4571c0 SHA512 92e733272979c08bba012f33aa6e0eadc15e18e03c24258b0333f74c201df87cc619012e2d8da69aac10c15684691464f59551c9b9d83e690b3902e47f649c68 +DIST oidentd-3.1.0.tar.xz 183596 BLAKE2B ed648b525153437659b9437612eb8023465d6e45a401ba64bda86e82948c588a2da4da877b371a6bb2b6f0e6f29f1a5ec844009bb2bfcf4eb0d830254da03bcd SHA512 03ce6c64a4351cecdc9177e5a035860d433689de4c86d344eab5af9810b03caedface983c4c4fb2e7ae31b7d868bfcbdd15a094a3f79f43c400258c4902a5972 diff --git a/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch b/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch deleted file mode 100644 index 156b136f7755..000000000000 --- a/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index b458d11..b163128 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -32,6 +32,7 @@ AC_PROG_LEX - AC_PROG_RANLIB - AC_PROG_INSTALL - AC_PATH_PROG(sedpath, sed) -+AM_PROG_AR - - AC_HEADER_STDC - AC_HEADER_SYS_WAIT diff --git a/net-misc/oidentd/oidentd-3.0.0-r1.ebuild b/net-misc/oidentd/oidentd-3.0.0-r1.ebuild index 3c1eea07ecf3..1bd506c756b1 100644 --- a/net-misc/oidentd/oidentd-3.0.0-r1.ebuild +++ b/net-misc/oidentd/oidentd-3.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz" LICENSE="BSD-2 GPL-2 LGPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" IUSE="debug ipv6 masquerade selinux" DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )" @@ -24,8 +24,8 @@ RDEPEND=" " BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex " PATCHES=( "${FILESDIR}/${P}-ipv6-masquerade.patch" ) diff --git a/net-misc/oidentd/oidentd-2.5.0.ebuild b/net-misc/oidentd/oidentd-3.1.0.ebuild index fd799d2a1495..20e846e17003 100644 --- a/net-misc/oidentd/oidentd-2.5.0.ebuild +++ b/net-misc/oidentd/oidentd-3.1.0.ebuild @@ -1,43 +1,45 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools systemd +inherit systemd DESCRIPTION="Another (RFC1413 compliant) ident daemon" HOMEPAGE="https://oidentd.janikrabe.com/" SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz" -LICENSE="BSD-2 GPL-2 LGPL-2+ MIT" +LICENSE="BSD-2 GPL-2 LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" -IUSE="debug ipv6 masquerade selinux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="debug masquerade selinux" DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )" RDEPEND=" + ${DEPEND} acct-user/oidentd acct-group/oidentd selinux? ( sec-policy/selinux-oident ) - ${DEPEND}" +" -PATCHES=( "${FILESDIR}/${P}-respect-ar.patch" ) +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex +" src_prepare() { sed -i '/ExecStart/ s|$| -u oidentd -g oidentd|' contrib/systemd/*.service || die default - - eautoreconf } src_configure() { local myconf=( $(use_enable debug) - $(use_enable ipv6) $(use_enable masquerade libnfct) $(use_enable masquerade nat) + --enable-ipv6 --enable-xdgbdir ) econf "${myconf[@]}" diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest index 4c66dece256a..66a3d939e4f6 100644 --- a/net-misc/olsrd/Manifest +++ b/net-misc/olsrd/Manifest @@ -1,3 +1 @@ -DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B 180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a -DIST olsrd-0.9.8.tar.gz 14416300 BLAKE2B 67477d9359686cb163221f5f354f330b38811e9e77bd71379e359bbfba2b55e917009ac537b845420a5bb73284ac83e0b91495e011c810f8169e4edb6bea940f SHA512 cf3066310c4ea644ba1f482e847aa073ad006000308bfa993cecda4ccf4e9919a9005680b3c1d98e34f0c13818213f208e8dc93c8b060eeaaac160fc3df4ce8c DIST olsrd-0.9.8_p20210612.tar.gz 14446761 BLAKE2B ef841fcf81ae25acb3c47d70f15e34c614b17c28688e0f718aa45ebabea68844f825a4187bbf5468daa4763c8a2b8c87f5f5a502ce0c5fde1b940f9aa3c6ca5e SHA512 466b762ea1f9ecc4ded3298700d1786b893d87fbcc2e457c75f5adfaaf543e6cea5ab2e63d34814a7c2f65cab895fb19c4cb5a7ec5347b13d0e18703a641126e diff --git a/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch b/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch deleted file mode 100644 index a70115f1675c..000000000000 --- a/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/lib/pud/src/gpsdclient.c -+++ b/lib/pud/src/gpsdclient.c -@@ -343,7 +343,6 @@ - | POLICY_SET // - #ifdef GPSD_JESSIE - | TIMEDRIFT_SET // -- | EOF_SET // - #endif - #ifdef GPSD_NEW - | TOFF_SET // ---- a/lib/pud/Makefile -+++ b/lib/pud/Makefile -@@ -108,7 +108,7 @@ - - default_target: nmealib library $(PLUGIN_FULLNAME) - --$(PLUGIN_FULLNAME): $(OBJS) version-script.txt -+$(PLUGIN_FULLNAME): nmealib library $(OBJS) version-script.txt - ifeq ($(PUD_NMEALIB_STATICALLY_LINKED),) - ifeq ($(VERBOSE),0) - endif diff --git a/net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch b/net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch new file mode 100644 index 000000000000..0194b17362ba --- /dev/null +++ b/net-misc/olsrd/files/olsrd-0.9.8-clang16-buildfix.patch @@ -0,0 +1,53 @@ +https://github.com/OLSR/olsrd/pull/124 +--- a/lib/filtergw/src/olsrd_filtergw.c ++++ b/lib/filtergw/src/olsrd_filtergw.c +@@ -54,6 +54,7 @@ + #include "log.h" + #include "routing_table.h" + #include "olsr_cfg.h" ++#include "parser.h" + + #include <stdio.h> + #include <string.h> +@@ -75,11 +76,19 @@ struct originator_list { + + struct filter_group { + struct originator_list * originator_list; +- struct hna_group * next; ++ struct filter_group * next; + }; + + static struct filter_group * filter_groups = NULL; + ++/* ++ * Delcaring function prototype here, fixes build error with clang-16. ++ * Clang 16 enables -Wimplicit-function-declaration by default, hence the ++ * error. ++ * Refer: https://bugs.gentoo.org/898090 ++ */ ++int should_filter(union olsr_ip_addr * originator); ++ + /* ------------------------------------------------------------------------- + * Function : add_to_originator_list + * Description: Add a new ip to originator list +@@ -304,4 +313,4 @@ int should_filter(union olsr_ip_addr * originator) + } + } + return is_allowlist ? !found : found; +-} +\ No newline at end of file ++} +--- a/src/linux/kernel_routes_nl.c ++++ b/src/linux/kernel_routes_nl.c +@@ -161,7 +161,11 @@ static void rtnetlink_read(int sock, void *data __attribute__ ((unused)), unsign + sizeof(nladdr), + &iov, + 1, ++#ifndef __GLIBC__ ++ 0, ++#else + NULL, ++#endif + 0, + 0 + }; diff --git a/net-misc/olsrd/metadata.xml b/net-misc/olsrd/metadata.xml index 6a2f7727d58f..421eb74f58cb 100644 --- a/net-misc/olsrd/metadata.xml +++ b/net-misc/olsrd/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<use> -<flag name="pud">Install the Node Position Update plugin</flag> -</use> + <!-- maintainer-needed --> + <use> + <flag name="pud">Install the Node Position Update plugin</flag> + </use> + <upstream> + <remote-id type="github">OLSR/olsrd</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/olsrd/olsrd-0.9.6.1.ebuild b/net-misc/olsrd/olsrd-0.9.6.1.ebuild deleted file mode 100644 index 8e8f409db132..000000000000 --- a/net-misc/olsrd/olsrd-0.9.6.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs versionator - -DESCRIPTION="An implementation of the Optimized Link State Routing protocol" -HOMEPAGE="http://www.olsr.org/" -SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.tar.bz2" - -LICENSE="BSD LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gtk pud" - -DEPEND=" - virtual/pkgconfig - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - pud? ( sci-geosciences/gpsd ) -" -RDEPEND=" - ${DEPEND} -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch - "${FILESDIR}"/${PN}-0.9.6-gpsd.patch -) - -src_prepare() { - default - - # fix parallel make - # respect AR - # verbose build - # fix default prefix, bug #453440 - sed -i \ - -e '/@echo "\[/d' \ - -e 's|$(MAKECMD)|$(MAKE)|g' \ - -e 's|@$(CC)|$(CC)|g' \ - -e 's|@ar |$(AR) |g' \ - -e '/^prefix/s:/usr/local:/usr:' \ - $( find . -name 'Makefile*' ) || die - - # respect LDFLAGS - sed -i \ - -e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \ - lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die -} - -src_configure() { - if ! use pud; then - sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die - fi -} - -src_compile() { - tc-export PKG_CONFIG - emake \ - CC="$(tc-getCC)" \ - VERBOSE=1 \ - LIBDIR="/usr/$(get_libdir)/${PN}" \ - OLSRD_LDFLAGS="${LDFLAGS}" \ - OS=linux \ - build_all - - if use gtk; then - emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)" - fi -} - -src_install() { - emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ - DESTDIR="${D}" STRIP=true install_all - - if use gtk; then - emake -C gui/linux-gtk \ - LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install - fi - - doinitd "${FILESDIR}/${PN}" - - dodoc CHANGELOG \ - valgrind-howto.txt files/olsrd.conf.default.rfc \ - files/olsrd.conf.default.lq \ - lib/arprefresh/README_ARPREFRESH \ - lib/bmf/README_BMF \ - lib/dot_draw/README_DOT_DRAW \ - lib/dyn_gw/README_DYN_GW \ - lib/dyn_gw_plain/README_DYN_GW_PLAIN \ - lib/httpinfo/README_HTTPINFO \ - lib/mini/README_MINI \ - lib/nameservice/README_NAMESERVICE \ - lib/pgraph/README_PGRAPH \ - lib/quagga/README_QUAGGA \ - lib/secure/README_SECURE \ - lib/txtinfo/README_TXTINFO \ - lib/watchdog/README_WATCHDOG -} diff --git a/net-misc/olsrd/olsrd-0.9.8.ebuild b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild index bede675037e3..78216e9c4d92 100644 --- a/net-misc/olsrd/olsrd-0.9.8.ebuild +++ b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild @@ -1,35 +1,39 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit toolchain-funcs +# Snapshot to fix build failure with >= bison 3.7 +# bug #735572 +MY_COMMIT="4973feb538b5b98b9d8ac2f8f474202f6d73de78" DESCRIPTION="An implementation of the Optimized Link State Routing protocol" HOMEPAGE="http://www.olsr.org/" -SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/OLSR/olsrd/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +#SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_COMMIT}" LICENSE="BSD LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="gtk pud" -DEPEND=" - gtk? ( +RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) - pud? ( sci-geosciences/gpsd ) -" -RDEPEND=" - ${DEPEND} -" -BDEPEND="virtual/pkgconfig" + pud? ( sci-geosciences/gpsd )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch - "${FILESDIR}"/${PN}-0.9.6-gpsd.patch + "${FILESDIR}"/${PN}-0.9.8-clang16-buildfix.patch ) src_prepare() { @@ -76,12 +80,14 @@ src_compile() { } src_install() { + # See bug #715392 re LDCONFIG emake \ DESTDIR="${D}" \ DOCDIR_OLSRD="${D}/usr/share/doc/${PF}" \ LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ OS=linux \ STRIP=true \ + LDCONFIG=true \ install_all if use gtk; then diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild index 3feebde88006..f24860958dc8 100644 --- a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild +++ b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}" LICENSE="BSD LGPL-2.1" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~x86" IUSE="gtk pud" DEPEND=" @@ -80,12 +80,14 @@ src_compile() { } src_install() { + # See bug #715392 re LDCONFIG emake \ DESTDIR="${D}" \ DOCDIR_OLSRD="${D}/usr/share/doc/${PF}" \ LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ OS=linux \ STRIP=true \ + LDCONFIG=true \ install_all if use gtk; then diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest index 875a1e7dc30f..d87e33743a47 100644 --- a/net-misc/omniORB/Manifest +++ b/net-misc/omniORB/Manifest @@ -1 +1 @@ -DIST omniORB-4.2.4.tar.bz2 2713397 BLAKE2B 5759b2563dca421b9a994bb13c30ce6dd98324a2357c4908130a42ce5baec357b881c22b4dff27809607ebde27e7cd65305a91aa5cbdb6d68a19df1f36524e72 SHA512 0b142b127175f16f844823e5adf5593b290528646e13a4c30f6cbd92d159d3998a81b952717039c3f0e386f79404ddd18a3de35fc45fa88383d1d9e51064d988 +DIST omniORB-4.3.0.tar.bz2 2762061 BLAKE2B f9103080011a7e683b7e63f6553e8a60947820a331d7c4e3559c961a7f36b17e235c5808e7b282d0227343e6e794106b9f2b93bf138b1a919716d1338e1c9cc2 SHA512 b081c1acbea3c7bee619a288fec209a0705b7d436f8e5fd4743675046356ef271a8c75882334fcbde4ff77d15f54d2da55f6cfcd117b01e42919d04fd29bfe2f diff --git a/net-misc/omniORB/metadata.xml b/net-misc/omniORB/metadata.xml index fb1b00f74288..2178b72656c8 100644 --- a/net-misc/omniORB/metadata.xml +++ b/net-misc/omniORB/metadata.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!--maintainer-needed--> - <upstream> - <remote-id type="sourceforge">omniorb</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <email>aliens.satin0y@icloud.com</email> + <name>Thomas Juerges</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">omniorb</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/omniORB/omniORB-4.2.4.ebuild b/net-misc/omniORB/omniORB-4.3.0.ebuild index f5e6a5961446..49ee886822a3 100644 --- a/net-misc/omniORB/omniORB-4.2.4.ebuild +++ b/net-misc/omniORB/omniORB-4.3.0.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit python-single-r1 MY_P="${P/_p/-}" DESCRIPTION="A robust, high-performance CORBA 2 ORB" HOMEPAGE="http://omniorb.sourceforge.net/" -SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/omniorb/${MY_P}.tar.bz2" LICENSE="LGPL-2 GPL-2" SLOT="0" @@ -19,8 +19,9 @@ IUSE="doc ipv6 ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - ssl? ( dev-libs/openssl:0= )" + ssl? ( dev-libs/openssl:= )" DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default @@ -30,7 +31,7 @@ src_prepare() { sed \ -e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \ -e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \ - -i mk/beforeauto.mk.in mk/platforms/i586_linux_2.0*.mk || \ + -i mk/beforeauto.mk.in mk/unix.mk || \ die "failed to switch CFLAGS variables in the makefile includes" # The out-of-source build is suggested by upstream. diff --git a/net-misc/omnisync/metadata.xml b/net-misc/omnisync/metadata.xml index f5282bc8aecd..85e4ed814fa2 100644 --- a/net-misc/omnisync/metadata.xml +++ b/net-misc/omnisync/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>grknight@gentoo.org</email> - <name>Brian Evans</name> -</maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/omnisync/omnisync-1.0_p20200130.ebuild b/net-misc/omnisync/omnisync-1.0_p20200130-r1.ebuild index c0a9f2f3dae6..149c6e96da64 100644 --- a/net-misc/omnisync/omnisync-1.0_p20200130.ebuild +++ b/net-misc/omnisync/omnisync-1.0_p20200130-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake vcs-snapshot +inherit cmake flag-o-matic vcs-snapshot SNAPSHOT="c55215330b1e8a61af6d34d57d3d8236c8cc7d5b" @@ -20,6 +20,15 @@ RDEPEND="net-libs/gnutls:= net-analyzer/net-snmp:=" DEPEND="${RDEPEND}" DOCS=( readme.txt Changes ) +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861683 + # appears to be terminally dead + filter-lto + + cmake_src_configure +} + src_install() { cmake_src_install newinitd "${FILESDIR}/${PN}.initd" ${PN} diff --git a/net-misc/openntpd/files/0001-fix-incompatible-check-for-libc-compat.patch b/net-misc/openntpd/files/0001-fix-incompatible-check-for-libc-compat.patch new file mode 100644 index 000000000000..ee676d6f9935 --- /dev/null +++ b/net-misc/openntpd/files/0001-fix-incompatible-check-for-libc-compat.patch @@ -0,0 +1,30 @@ +From 8e4fdc1c2794e861cd026864607fa6b04c5237cb Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Tue, 21 May 2024 16:10:45 -0400 +Subject: [PATCH] fix incompatible check for libc compat + +It relied on implicit function declarations, which are banned starting +in c99. Result: the check always failed. + +See: https://wiki.gentoo.org/wiki/Modern_C_porting#How_do_I_reproduce_these_bugs.3F +Bug: https://bugs.gentoo.org/900296 +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + m4/check-libc-compat.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/check-libc-compat.m4 b/m4/check-libc-compat.m4 +index a806cbe..3bb859a 100644 +--- a/m4/check-libc-compat.m4 ++++ b/m4/check-libc-compat.m4 +@@ -1,6 +1,6 @@ + AC_DEFUN([CHECK_PROGNAME], [ + AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [ +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], + [[ extern char *__progname; printf("%s", __progname); ]])], + [ ac_cv_libc_defines___progname="yes" ], + [ ac_cv_libc_defines___progname="no" +-- +2.44.1 + diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml index 75ed1f5d2f63..4ce09235179f 100644 --- a/net-misc/openntpd/metadata.xml +++ b/net-misc/openntpd/metadata.xml @@ -18,4 +18,7 @@ <use> <flag name="constraints">Enable HTTPS TLS time constraint support</flag> </use> + <upstream> + <remote-id type="github">openntpd-portable/openntpd-portable</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild index 510a2f7cbc09..a4562387dfad 100644 --- a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild +++ b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,12 +8,12 @@ inherit systemd MY_P="${P/_p/p}" DESCRIPTION="Lightweight NTP server ported from OpenBSD" -HOMEPAGE="http://www.openntpd.org/" +HOMEPAGE="https://www.openntpd.org/" SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="selinux" DEPEND=" diff --git a/net-misc/openntpd/openntpd-6.8_p1.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r3.ebuild index ee0f69ce5392..77e63f5456df 100644 --- a/net-misc/openntpd/openntpd-6.8_p1.ebuild +++ b/net-misc/openntpd/openntpd-6.2_p3-r3.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit systemd +inherit autotools systemd MY_P="${P/_p/p}" DESCRIPTION="Lightweight NTP server ported from OpenBSD" -HOMEPAGE="http://www.openntpd.org/" +HOMEPAGE="https://www.openntpd.org/" SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="selinux" DEPEND=" !net-misc/ntp[-openntpd]" + RDEPEND=" ${DEPEND} acct-group/openntpd @@ -26,8 +27,15 @@ RDEPEND=" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/openntpd-6.2p3-fno-common.patch" + # https://github.com/openntpd-portable/openntpd-portable/pull/75 + "${FILESDIR}"/0001-fix-incompatible-check-for-libc-compat.patch +) + src_prepare() { default + eautoreconf # fix /run path sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die @@ -38,7 +46,7 @@ src_prepare() { sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die # fix default config to use gentoo pool - sed -i 's:^server:#server:g' ntpd.conf || die + sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die sed -ie 's/^constraints/#constraints/g' ntpd.conf || die @@ -47,6 +55,7 @@ src_prepare() { src_configure() { econf \ --with-privsep-user=openntpd \ + --with-privsep-path=/var/lib/openntpd/chroot \ --disable-https-constraint } diff --git a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild b/net-misc/openntpd/openntpd-6.8_p1-r2.ebuild index 29e7e2e180b3..1b00a44a6fdf 100644 --- a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild +++ b/net-misc/openntpd/openntpd-6.8_p1-r2.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit systemd +inherit autotools systemd MY_P="${P/_p/p}" DESCRIPTION="Lightweight NTP server ported from OpenBSD" -HOMEPAGE="http://www.openntpd.org/" +HOMEPAGE="https://www.openntpd.org/" SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="constraints selinux" DEPEND=" @@ -28,8 +28,14 @@ RDEPEND=" S="${WORKDIR}/${MY_P}" +PATCHES=( + # https://github.com/openntpd-portable/openntpd-portable/pull/75 + "${FILESDIR}"/0001-fix-incompatible-check-for-libc-compat.patch +) + src_prepare() { default + eautoreconf # fix /run path sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die diff --git a/net-misc/openr2/Manifest b/net-misc/openr2/Manifest deleted file mode 100644 index 0836806e9a62..000000000000 --- a/net-misc/openr2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST openr2-1.3.0.tar.gz 650048 BLAKE2B bff444c839d5f62fc889c1720cb9c17c38c5bd4b0dc3b3884c8fd00226aa6354281cf37c7a748fca4e16e633a94ac055c8f7b5e4bf69d97732846fdbc618ca47 SHA512 2cee4534eeebb91a2cf0f74c9fcd2a16db3966db01a4bae7e3406416546fdc1c5e20bb9172375f55e5dcc30cfcc2c8f7182ef7476253b4fcce9421f74b8d125e diff --git a/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch b/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch deleted file mode 100644 index 59918934d563..000000000000 --- a/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -25,11 +25,6 @@ - AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE - --# let's default to compile with debugging information --# most users will not even care about it --CFLAGS='-ggdb3 -O0' --CXXFLAGS='-ggdb3 -O0' -- - AC_PROG_CC - AC_PROG_LIBTOOL - AC_LANG([C]) -diff -ur ORIG/src/Makefile.am MOD/src/Makefile.am ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,10 +1,10 @@ --AM_CFLAGS = -std=c99 -pedantic -Wall -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes -+AM_CFLAGS = -std=c99 -pedantic -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes - if WANT_OR2_TRACE_STACKS - AM_CFLAGS += -DOR2_TRACE_STACKS - endif - - if HAVE_SVNVERSION --AM_CFLAGS += -DREVISION=\"$(shell svnversion -n .)\" -+AM_CFLAGS += -DREVISION=\"0\" - endif - - lib_LTLIBRARIES = libopenr2.la diff --git a/net-misc/openr2/metadata.xml b/net-misc/openr2/metadata.xml deleted file mode 100644 index b61afa2b03b1..000000000000 --- a/net-misc/openr2/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="google-code">openr2</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/openr2/openr2-1.3.0.ebuild b/net-misc/openr2/openr2-1.3.0.ebuild deleted file mode 100644 index 2f15c2e0e766..000000000000 --- a/net-misc/openr2/openr2-1.3.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="An open implementation of the MFC/R2 telephony signaling protocol" -HOMEPAGE="https://libopenr2.org/" -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="net-misc/dahdi" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch ) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/net-misc/openrdap/Manifest b/net-misc/openrdap/Manifest new file mode 100644 index 000000000000..5bed77a18c44 --- /dev/null +++ b/net-misc/openrdap/Manifest @@ -0,0 +1,2 @@ +DIST openrdap-0.9.0_p20191017-deps.tar.gz 21223841 BLAKE2B 8bc7f6d7926835a0fd1f723cf9a63a57b15c11d6bdaeeeead5da307a6053c931eba55e3a27a6c9e7c069f3421005be97e6070da657328a63e60f083566333af3 SHA512 c536daa1c3b2f3ac904d3f2e33b38351bbf50e0abc5e071958efdf364d9d59910b1108cb355e5e3c9e8a1517b5b222c8ab39a899f9dd6d7e80dda617b5ed0290 +DIST openrdap-0.9.0_p20191017.tar.gz 78085 BLAKE2B c3366aff7f12bdc8df4646c426e803834b382d02c0295eda0c97fef1ecc6ed54b6435e49bd1f67fe9884e4b8de466bb52db1494a4a531957c5c7c607eca4e5bc SHA512 494ceab714a4dc7c37c1a11a16a4d475627be59f9c56058a99ca203dece8a4963b06b0fca4091c1d3e194208427095335f9bb12043b02f27efb9b884ed43f7ef diff --git a/net-misc/openrdap/metadata.xml b/net-misc/openrdap/metadata.xml new file mode 100644 index 000000000000..cebadf7d92a7 --- /dev/null +++ b/net-misc/openrdap/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> + OpenRDAP is a command line client for the Registration Data Access Protocol. + RDAP is a replacement for WHOIS, which provides domain name and + IP address registration information in JSON format over HTTP(S). + </longdescription> + <upstream> + <remote-id type="github">openrdap/rdap</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/openrdap/openrdap-0.9.0_p20191017-r1.ebuild b/net-misc/openrdap/openrdap-0.9.0_p20191017-r1.ebuild new file mode 100644 index 000000000000..d7e9899224db --- /dev/null +++ b/net-misc/openrdap/openrdap-0.9.0_p20191017-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +EGIT_COMMIT="af93e7ef17b78dee3e346814731377d5ef7b89f3" +go-module_set_globals + +DESCRIPTION="RDAP command line client" +HOMEPAGE=" + https://www.openrdap.org/ + https://github.com/openrdap/rdap +" +SRC_URI=" + https://github.com/openrdap/rdap/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~conikost/distfiles/${P}-deps.tar.gz +" +S="${WORKDIR}/${PN/open/}-${EGIT_COMMIT}" + +LICENSE="BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_compile() { + go build ./cmd/rdap || die +} + +src_install() { + dobin rdap + einstalldocs +} diff --git a/net-misc/openrsync/Manifest b/net-misc/openrsync/Manifest new file mode 100644 index 000000000000..bd57e5fd9ecd --- /dev/null +++ b/net-misc/openrsync/Manifest @@ -0,0 +1 @@ +DIST openrsync-0.5.0_p20220508.tar.gz 139218 BLAKE2B 2ff7614a10095d01ac46f92281d8e22dd8bd03c943324d4f5eff0f3cd981a5e97a8ce8ee361f8dbd144229c39d29ad33035a704c7e0e753d66eb72ec65c92bed SHA512 f2fec287d57502e3b478652a7c91c38e295221f936eb089f8ecd9efd69e51e0b9896e6f9d5457195db8d4661faf461c34d2d1547373ba5ddae22a5f7135677e9 diff --git a/net-misc/openrsync/files/openrsync-0.5.0_p20220508-extern-stdint-include.patch b/net-misc/openrsync/files/openrsync-0.5.0_p20220508-extern-stdint-include.patch new file mode 100644 index 000000000000..ea2af659fad2 --- /dev/null +++ b/net-misc/openrsync/files/openrsync-0.5.0_p20220508-extern-stdint-include.patch @@ -0,0 +1,11 @@ +--- a/extern.h ++++ b/extern.h +@@ -17,6 +17,8 @@ + #ifndef EXTERN_H + #define EXTERN_H + ++#include <stdint.h> ++ + #if !HAVE_PLEDGE + # define pledge(x, y) (1) + #endif diff --git a/net-misc/openrsync/files/openrsync-0.5.0_p20220508-musl-include.patch b/net-misc/openrsync/files/openrsync-0.5.0_p20220508-musl-include.patch new file mode 100644 index 000000000000..d79af6450d4a --- /dev/null +++ b/net-misc/openrsync/files/openrsync-0.5.0_p20220508-musl-include.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/866932 +--- a/socket.c ++++ b/socket.c +@@ -29,6 +29,7 @@ + #include <poll.h> + #include <resolv.h> + #include <stdlib.h> ++#include <stdio.h> + #include <string.h> + #include <unistd.h> + #if HAVE_ERR diff --git a/net-misc/spread/metadata.xml b/net-misc/openrsync/metadata.xml index f460837e12d5..93a67ab8e286 100644 --- a/net-misc/spread/metadata.xml +++ b/net-misc/openrsync/metadata.xml @@ -2,7 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>kumba@gentoo.org</email> - <name>Joshua Kinard</name> + <email>sam@gentoo.org</email> + <name>Sam James</name> </maintainer> + <upstream> + <remote-id type="github">kristapsdz/openrsync</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/openrsync/openrsync-0.5.0_p20220508.ebuild b/net-misc/openrsync/openrsync-0.5.0_p20220508.ebuild new file mode 100644 index 000000000000..14825644d70f --- /dev/null +++ b/net-misc/openrsync/openrsync-0.5.0_p20220508.ebuild @@ -0,0 +1,41 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +DESCRIPTION="BSD-licensed implementation of rsync" +HOMEPAGE="https://www.openrsync.org/" + +if [[ ${PV} == *_p* ]] ; then + MY_COMMIT="f50d0f8204ea18306a0c29c6ae850292ea826995" + SRC_URI="https://github.com/kristapsdz/openrsync/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/${PN}-${MY_COMMIT} +else + SRC_URI="https://github.com/kristapsdz/openrsync/archive/refs/tags/VERSION_$(ver_rs 3 _).tar.gz -> ${P}.tar.gz" +fi + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64" + +PATCHES=( + "${FILESDIR}"/${PN}-0.5.0_p20220508-extern-stdint-include.patch + "${FILESDIR}"/${PN}-0.5.0_p20220508-musl-include.patch +) + +src_configure() { + tc-export CC + + local confargs=( + PREFIX="${EPREFIX}"/usr + MANDIR="${EPREFIX}"/usr/share/man + ) + + edo ./configure "${confargs[@]}" +} + +src_compile() { + emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} diff --git a/net-misc/openssh-contrib/Manifest b/net-misc/openssh-contrib/Manifest new file mode 100644 index 000000000000..42cd209f7e0e --- /dev/null +++ b/net-misc/openssh-contrib/Manifest @@ -0,0 +1,13 @@ +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 +DIST openssh-9.6_p1-X509-glue-14.4.2.patch.xz 1516 BLAKE2B 49f1d100e1b84f051aee599547562bab17b313d097b9b16b7c3ad94fb76e31b04fc101b1824f011507033e9c5744ee0207cb751865576f92501bc442076afe8b SHA512 a09bd2ed9b9d0edfa691c2f99699261c17c9441e188ba870c1f2ceff28817af979a29a7b5c1bbfe9fbeb343241cc00b232099791cc30d665700fcbebdae07139 +DIST openssh-9.6_p1-hpn-15.2-X509-14.4.2-glue.patch.xz 5472 BLAKE2B a92ca0746cd48b1580e0a73dcae5d6e141988d3239d09a2f07de376833d14ca2434185b5fdb444fb6821da9ff75ce0c63c86404299e977d3c86050d3a116fc47 SHA512 2690f158bf1f5d1512f80c9c8d86006339a461a0bf229e41c62b75d28a9b45cb5392680fbb633415c27c3abfaa1906c170cd1d18679a2be81a1367361fd98afa +DIST openssh-9.6_p1-hpn-15.2-glue.patch.xz 5028 BLAKE2B 74970dc9f244eea2e35270c9abe67bdf0f05a3ddb33ffe6ce54056ade3fbec2abe9cb60e92ea889b01be7429dfd754f2986b175cdb014aab721421e1a4952c87 SHA512 1edafed18b1fd5d64844a3d121aacbf38dcde2b90adc9b4533f3192f1335365736e9cfd82f7c847980c9b1c1b72ee39470b38d6758b3a8f5ed59796d5005492b +DIST openssh-9.6p1+x509-14.4.2.diff.gz 1243845 BLAKE2B 19ed0e174d06f4722b0f244e2c41098422fec88372d77e7c64bed2c00f4d4842b8f517d3f49958febd7a640f0582497fcaf64774fd0a04fbdc8c06b7f0ce5311 SHA512 247a088bbe7fe2bced0ec6e7f3d1fc34c3b81ce43ade9312a769c4495c7adf60d8a9ad2afb25e52fdea2f60888330de05375fbe24cd5b86a2f173e160ddb7bb8 +DIST openssh-9.6p1.tar.gz 1857862 BLAKE2B dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd SHA512 0ebf81e39914c3a90d7777a001ec7376a94b37e6024baf3e972c58f0982b7ddef942315f5e01d56c00ff95603b4a20ee561ab918ecc55511df007ac138160509 +DIST openssh-9.6p1.tar.gz.asc 833 BLAKE2B 9363d02f85457aa90069020827306a2f49d8406e32f5ee1d231844648dd2ffa02fa9b7325b8677a11e46a0ba0d9ffc86d9c989435d691a02f5354a956c49f9f9 SHA512 aec5a5bd6ce480a8e5b5879dc55f8186aec90fe61f085aa92ad7d07f324574aa781be09c83b7443a32848d091fd44fb12c1842d49cee77afc351e550ffcc096d +DIST openssh-9.7_p1-X509-glue-15.0.patch.xz 1532 BLAKE2B ff2c5ca97607da84345342bec31435304780503d4f066bf181407c85981d8e73b622ca1107b303d0cf7bc61a262f6e8f38d5372a60d8389b8caf671cfa55b94b SHA512 48ec8e54e6e670ee2d2783fb38befd4101869cc7fc1a4e7b72058034a716170da62cae7e94a48acb575a1cec2604d5c02da629fbe482b7dbc5e28cf4d7ef7c01 +DIST openssh-9.7_p1-hpn-15.2-X509-15.0-glue.patch.xz 5472 BLAKE2B 6ebbc663aaaa54d3af3c204f0c2f11d8b3d4e5c842b38b82263d21659cebcceaaa6502c04bb5e06c4200b9aef9d267b61e33f94001efe30f8e57760d43df5292 SHA512 e90ceda65ccfc80c4dec580b6e64f3bd889443d6e7d627dc4fca4900776621d33f3da0856998a63560f195b1ed98e47c4401e40d6840518ee1ccb8ea150f21fe +DIST openssh-9.7p1+x509-15.0.diff.gz 1239003 BLAKE2B 98f6a6d531a9afb70d6f34dcd6609115e017d4b1738a0683dbabf66aba02382cf727db4fb07fd2a62534aa87318982e9d1c41991fdbf7cc3e6593d376ad08208 SHA512 c141bddd73fb78a8f0c92bbed6900bab6617768fc124c10ec4ea70491e1b545bbd962fa35ee5efd134a9851a1b807a5b8bae8e46585cf87a60e0311b49de3226 +DIST openssh-9.7p1.tar.gz 1848766 BLAKE2B 520859fcbdf678808fc8515b64585ab9a90a8055fa869df6fbba3083cb7f73ddb81ed9ea981e131520736a8aed838f85ae68ca63406a410df61039913c5cb48b SHA512 0cafc17d22851605a4a5495a1d82c2b3fbbe6643760aad226dbf2a25b5f49d4375c3172833706ea3cb6c05d5d02a40feb9a7e790eae5c4570dd344a43e94ca55 +DIST openssh-9.7p1.tar.gz.asc 833 BLAKE2B a95e952be48bd55a07d0a95a49dc06c326816c67b8b5d40bd3f64c28aa43122253817b8a088e7a3b8a190375ea39f9fc3400b22d035561f9643c1d32b5caef27 SHA512 e028978e4266de9ad513626b13d70249e4166923fc15f38751178e2b3522ff6ebb9a7ca7dc32d1bb42d42fb92adf9903dba1b734bec083010ed7323aadad8baf diff --git a/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch b/net-misc/openssh-contrib/files/openssh-6.7_p1-openssl-ignore-status.patch index fa33af39b6f8..fa33af39b6f8 100644 --- a/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch +++ b/net-misc/openssh-contrib/files/openssh-6.7_p1-openssl-ignore-status.patch diff --git a/net-misc/openssh/files/openssh-7.5_p1-disable-conch-interop-tests.patch b/net-misc/openssh-contrib/files/openssh-7.5_p1-disable-conch-interop-tests.patch index a5647ce9d8d3..a5647ce9d8d3 100644 --- a/net-misc/openssh/files/openssh-7.5_p1-disable-conch-interop-tests.patch +++ b/net-misc/openssh-contrib/files/openssh-7.5_p1-disable-conch-interop-tests.patch diff --git a/net-misc/openssh/files/openssh-7.9_p1-include-stdlib.patch b/net-misc/openssh-contrib/files/openssh-7.9_p1-include-stdlib.patch index c5697c2b8bd1..c5697c2b8bd1 100644 --- a/net-misc/openssh/files/openssh-7.9_p1-include-stdlib.patch +++ b/net-misc/openssh-contrib/files/openssh-7.9_p1-include-stdlib.patch diff --git a/net-misc/openssh/files/openssh-8.0_p1-fix-putty-tests.patch b/net-misc/openssh-contrib/files/openssh-8.0_p1-fix-putty-tests.patch index 4310aa123fc8..4310aa123fc8 100644 --- a/net-misc/openssh/files/openssh-8.0_p1-fix-putty-tests.patch +++ b/net-misc/openssh-contrib/files/openssh-8.0_p1-fix-putty-tests.patch diff --git a/net-misc/openssh/files/openssh-8.7_p1-GSSAPI-dns.patch b/net-misc/openssh-contrib/files/openssh-8.7_p1-GSSAPI-dns.patch index ffc40b70ae3d..ffc40b70ae3d 100644 --- a/net-misc/openssh/files/openssh-8.7_p1-GSSAPI-dns.patch +++ b/net-misc/openssh-contrib/files/openssh-8.7_p1-GSSAPI-dns.patch diff --git a/net-misc/openssh-contrib/files/openssh-8.9_p1-allow-ppoll_time64.patch b/net-misc/openssh-contrib/files/openssh-8.9_p1-allow-ppoll_time64.patch new file mode 100644 index 000000000000..8c46625aa29c --- /dev/null +++ b/net-misc/openssh-contrib/files/openssh-8.9_p1-allow-ppoll_time64.patch @@ -0,0 +1,14 @@ +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 2e065ba3..4ce80cb2 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { + #ifdef __NR_ppoll + SC_ALLOW(__NR_ppoll), + #endif ++#ifdef __NR_ppoll_time64 ++ SC_ALLOW(__NR_ppoll_time64), ++#endif + #ifdef __NR_poll + SC_ALLOW(__NR_poll), + #endif diff --git a/net-misc/openssh-contrib/files/openssh-9.0_p1-X509-uninitialized-delay.patch b/net-misc/openssh-contrib/files/openssh-9.0_p1-X509-uninitialized-delay.patch new file mode 100644 index 000000000000..2a83ed37d138 --- /dev/null +++ b/net-misc/openssh-contrib/files/openssh-9.0_p1-X509-uninitialized-delay.patch @@ -0,0 +1,12 @@ +diff -ur a/auth2.c b/auth2.c +--- a/auth2.c 2022-05-19 15:59:32.875160028 -0700 ++++ b/auth2.c 2022-05-19 16:03:44.291594908 -0700 +@@ -226,7 +226,7 @@ + int digest_alg; + size_t len; + u_char *hash; +- double delay; ++ double delay = 0; + + digest_alg = ssh_digest_maxbytes(); + if (len = ssh_digest_bytes(digest_alg) > 0) { diff --git a/net-misc/openssh-contrib/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch b/net-misc/openssh-contrib/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch new file mode 100644 index 000000000000..4d098b2231c7 --- /dev/null +++ b/net-misc/openssh-contrib/files/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch @@ -0,0 +1,20 @@ +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 23b40b643..d93a357c6 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -257,6 +257,15 @@ static const struct sock_filter preauth_insns[] = { + #ifdef __NR_statx + SC_DENY(__NR_statx, EACCES), + #endif ++#ifdef __NR_shmget ++ SC_DENY(__NR_shmget, EACCES), ++#endif ++#ifdef __NR_shmat ++ SC_DENY(__NR_shmat, EACCES), ++#endif ++#ifdef __NR_shmdt ++ SC_DENY(__NR_shmdt, EACCES), ++#endif + + /* Syscalls to permit */ + #ifdef __NR_brk diff --git a/net-misc/openssh-contrib/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch b/net-misc/openssh-contrib/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch new file mode 100644 index 000000000000..379a3981d7ea --- /dev/null +++ b/net-misc/openssh-contrib/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch @@ -0,0 +1,44 @@ +From 45b491ce13fcf7dbc0b3bd6df986c9cf59190721 Mon Sep 17 00:00:00 2001 +From: Jordan R Abrahams-Whitehead <ajordanr@google.com> +Date: Tue, 12 Dec 2023 22:54:02 +0000 +Subject: [PATCH] Allow MAP_NORESERVE in sandbox seccomp filter maps + +While debugging Scudo on ChromeOS, we found that the no reserve mode +immediately crashed `sshd`. We tracked it down to the +sandbox-seccomp-filter. + +Being able to mmap with MAP_NORESERVE is useful (if not necessary) for +some overcommitting allocators. + +During mmap calls, the flag MAP_NORESERVE is used by some allocators +such as LLVM's Scudo for layout optimisation. This causes the sandbox +seccomp filter for the client subprocess to die with some Scudo +configurations. + +Upstream patch submission: +https://lists.mindrot.org/pipermail/openssh-unix-dev/2023-December/041095.html +--- + sandbox-seccomp-filter.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 23b40b643..a49c5ca99 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -190,9 +190,11 @@ + + #if defined(__NR_mmap) || defined(__NR_mmap2) + # ifdef MAP_FIXED_NOREPLACE +-# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_FIXED_NOREPLACE ++# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED \ ++ |MAP_NORESERVE|MAP_FIXED_NOREPLACE + # else +-# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED ++# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED \ ++ |MAP_NORESERVE + # endif /* MAP_FIXED_NOREPLACE */ + /* Use this for both __NR_mmap and __NR_mmap2 variants */ + # define SC_MMAP(_nr) \ +-- +2.43.0.472.g3155946c3a-goog + diff --git a/net-misc/openssh/files/openssh-8.6_p1-hpn-version.patch b/net-misc/openssh-contrib/files/openssh-9.6_p1-hpn-version.patch index 6dc290d6737b..95a69815b822 100644 --- a/net-misc/openssh/files/openssh-8.6_p1-hpn-version.patch +++ b/net-misc/openssh-contrib/files/openssh-9.6_p1-hpn-version.patch @@ -5,7 +5,7 @@ index 34808b5c..88d7ccac 100644 @@ -1205,7 +1205,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, if (version_addendum != NULL && *version_addendum == '\0') version_addendum = NULL; - if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n", + if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%s%s%s\r\n", - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, version_addendum == NULL ? "" : " ", diff --git a/net-misc/openssh-contrib/files/sshd-r1.confd b/net-misc/openssh-contrib/files/sshd-r1.confd new file mode 100644 index 000000000000..cf430371bf0f --- /dev/null +++ b/net-misc/openssh-contrib/files/sshd-r1.confd @@ -0,0 +1,33 @@ +# /etc/conf.d/sshd: config file for /etc/init.d/sshd + +# Where is your sshd_config file stored? + +SSHD_CONFDIR="${RC_PREFIX%/}/etc/ssh" + + +# Any random options you want to pass to sshd. +# See the sshd(8) manpage for more info. + +SSHD_OPTS="" + + +# Wait one second (length chosen arbitrarily) to see if sshd actually +# creates a PID file, or if it crashes for some reason like not being +# able to bind to the address in ListenAddress. + +#SSHD_SSD_OPTS="--wait 1000" + + +# Pid file to use (needs to be absolute path). + +#SSHD_PIDFILE="${RC_PREFIX%/}/run/sshd.pid" + + +# Path to the sshd binary (needs to be absolute path). + +#SSHD_BINARY="${RC_PREFIX%/}/usr/sbin/sshd" + + +# Path to the ssh-keygen binary (needs to be absolute path). + +#SSHD_KEYGEN_BINARY="${RC_PREFIX%/}/usr/bin/ssh-keygen" diff --git a/net-misc/openssh/files/sshd-r2.initd b/net-misc/openssh-contrib/files/sshd-r1.initd index 3381fb965dd8..e91cd0116cd4 100644 --- a/net-misc/openssh/files/sshd-r2.initd +++ b/net-misc/openssh-contrib/files/sshd-r1.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 extra_commands="checkconfig" @@ -72,23 +72,10 @@ start_pre() { } stop_pre() { + # If this is a restart, check to make sure the user's config + # isn't busted before we stop the running daemon. if [ "${RC_CMD}" = "restart" ] ; then - # If this is a restart, check to make sure the user's config - # isn't busted before we stop the running daemon. checkconfig || return $? - elif yesno "${RC_GOINGDOWN}" && [ -s "${pidfile}" ] && hash pgrep 2>/dev/null ; then - # Disconnect any clients before killing the master process - local pid=$(cat "${pidfile}" 2>/dev/null) - if [ -n "${pid}" ] ; then - local ssh_session_pattern='sshd: \S.*@pts/[0-9]+' - - IFS="${IFS}@" - local daemon pid pty user - pgrep -a -P ${pid} -f "$ssh_session_pattern" | while read pid daemon user pty ; do - ewarn "Found ${daemon%:} session ${pid} on ${pty}; sending SIGTERM ..." - kill "${pid}" || true - done - fi fi } diff --git a/net-misc/openssh-contrib/files/sshd.pam_include.2 b/net-misc/openssh-contrib/files/sshd.pam_include.2 new file mode 100644 index 000000000000..b801aaafa0f9 --- /dev/null +++ b/net-misc/openssh-contrib/files/sshd.pam_include.2 @@ -0,0 +1,4 @@ +auth include system-remote-login +account include system-remote-login +password include system-remote-login +session include system-remote-login diff --git a/net-misc/openssh/files/sshd.service b/net-misc/openssh-contrib/files/sshd.service.1 index 6b4da9132fad..a541164cd7f2 100644 --- a/net-misc/openssh/files/sshd.service +++ b/net-misc/openssh-contrib/files/sshd.service.1 @@ -1,12 +1,15 @@ [Unit] Description=OpenSSH server daemon -After=syslog.target network.target auditd.service +After=network.target auditd.service [Service] ExecStartPre=/usr/bin/ssh-keygen -A ExecStart=/usr/sbin/sshd -D -e ExecReload=/bin/kill -HUP $MAINPID KillMode=process +OOMPolicy=continue +Restart=on-failure +RestartSec=42s [Install] WantedBy=multi-user.target diff --git a/net-misc/openssh-contrib/files/sshd.socket b/net-misc/openssh-contrib/files/sshd.socket new file mode 100644 index 000000000000..94b9533180da --- /dev/null +++ b/net-misc/openssh-contrib/files/sshd.socket @@ -0,0 +1,10 @@ +[Unit] +Description=OpenSSH Server Socket +Conflicts=sshd.service + +[Socket] +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/net-misc/openssh/files/sshd_at.service b/net-misc/openssh-contrib/files/sshd_at.service.1 index ec2907b3b1ac..e43a457994f4 100644 --- a/net-misc/openssh/files/sshd_at.service +++ b/net-misc/openssh-contrib/files/sshd_at.service.1 @@ -1,6 +1,6 @@ [Unit] Description=OpenSSH per-connection server daemon -After=syslog.target auditd.service +After=auditd.service [Service] ExecStart=-/usr/sbin/sshd -i -e diff --git a/net-misc/openssh-contrib/metadata.xml b/net-misc/openssh-contrib/metadata.xml new file mode 100644 index 000000000000..2982a0304511 --- /dev/null +++ b/net-misc/openssh-contrib/metadata.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>chutzpah@gentoo.org</email> + <name>Patrick McLean</name> + </maintainer> + <maintainer type="person"> + <email>robbat2@gentoo.org</email> + <name>Robin H. Johnson</name> + </maintainer> + <longdescription> + OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that + increasing numbers of people on the Internet are coming to rely on. Many users of telnet, + rlogin, ftp, and other such programs might not realize that their password is transmitted + across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) + to effectively eliminate eavesdropping, connection hijacking, and other network-level attacks. + Additionally, OpenSSH provides a myriad of secure tunneling capabilities, as well as a variety + of authentication methods. + + The OpenSSH suite includes the ssh program which replaces rlogin and telnet, scp which + replaces rcp, and sftp which replaces ftp. Also included is sshd which is the server side of + the package, and the other basic utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan, + ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and 2.0. + + This package represents an effort to extend upstream OpenSSH with three big patchsets. + + WARNING: These patches are of lower quality than vanilla upstream OpenSSH and often have + correctness issues. + + The patches are: + + * HPN (High performance SSH/SCP) adds custom ciphers that allow for more aggressive + buffering and/or multithreading, leading to better network throughput. Many of these + optimizations are not relevant anymore due to AEAD ciphers changing MAC nesting or + because more CPU performant ciphers are being used in this day and age (ChaCha20). + + WARNING: HPN's multi-threaded AES CTR cipher is known to be broken and should not be relied upon. + + * SCTP patches by Patrick McLean. These enable SSH over SCTP. + + * X509 patches by Roumen Petrov. OpenSSH upstream will never support standard PKIs for + authenticating users. This patch series adds support for X509 certificates. + </longdescription> + <use> + <flag name="hpn">Enable high performance ssh</flag> + <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag> + <flag name="livecd">Enable root password logins for live-cd environment.</flag> + <flag name="security-key">Include builtin U2F/FIDO support</flag> + <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag> + <flag name="X509">Adds support for X.509 certificate authentication</flag> + <flag name="xmss">Enable XMSS post-quantum authentication algorithm</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:openbsd:openssh</remote-id> + <remote-id type="github">openssh/openssh-portable</remote-id> + <remote-id type="sourceforge">hpnssh</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/openssh/openssh-8.7_p1-r2.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.6_p1.ebuild index c44fb1a6f829..6aca37ef3cb8 100644 --- a/net-misc/openssh/openssh-8.7_p1-r2.ebuild +++ b/net-misc/openssh-contrib/openssh-contrib-9.6_p1.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit user-info flag-o-matic autotools pam systemd toolchain-funcs +inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig # Make it more portable between straight releases # and _p? releases. -PARCH=${P/_} +MY_P=${P/-contrib/} +PARCH=${MY_P/_} # PV to USE for HPN patches #HPN_PV="${PV^^}" @@ -15,28 +16,41 @@ HPN_PV="8.5_P1" HPN_VER="15.2" HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff + openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff + openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff ) +HPN_GLUE_PATCH="openssh-9.6_p1-hpn-${HPN_VER}-glue.patch" +HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}" -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="13.2.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" +X509_VER="14.4.2" +X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" +X509_PATCH="${X509_PATCH/p2/p1}" +X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch" +#X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch" +X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER%.1}-glue.patch" -DESCRIPTION="Port of OpenBSD's free SSH release" +DESCRIPTION="Port of OpenBSD's free SSH release with HPN/X509 patches" HOMEPAGE="https://www.openssh.com/" SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )} - ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} + ${HPN_VER:+hpn? ( + $(printf "https://downloads.sourceforge.net/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" "${HPN_PATCHES[@]}") + https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz + )} + ${X509_VER:+X509? ( + https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} + https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_GLUE_PATCH}.xz + ${HPN_VER:+hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_HPN_GLUE_PATCH}.xz )} + )} + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) " +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc S="${WORKDIR}/${PARCH}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64" # Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" +IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test X X509 xmss" RESTRICT="!test? ( test )" @@ -45,7 +59,7 @@ REQUIRED_USE=" ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) - X509? ( !sctp ssl !xmss ) + X509? ( ssl !xmss ) xmss? ( ssl ) test? ( ssl ) " @@ -57,27 +71,17 @@ LIB_DEPEND=" audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) + net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - || ( - ( - >=dev-libs/openssl-1.0.1:0[bindist(-)=] - <dev-libs/openssl-1.1.0:0[bindist(-)=] - ) - >=dev-libs/openssl-1.1.0g:0[bindist(-)=] - ) - dev-libs/openssl:0=[static-libs(+)] - ) + ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] " RDEPEND=" + !net-misc/openssh acct-group/sshd acct-user/sshd !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) @@ -91,27 +95,41 @@ DEPEND="${RDEPEND} " RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( !prefix? ( sys-apps/shadow ) ) + !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth ) " +# Weird dep construct for newer gcc-config for bug #872416 BDEPEND=" + dev-build/autoconf virtual/pkgconfig - sys-devel/autoconf + || ( + >=sys-devel/gcc-config-2.6 + >=sys-devel/clang-toolchain-symlinks-16-r1:* + >=sys-devel/clang-toolchain-symlinks-15-r1:15 + ) + verify-sig? ( sec-keys/openpgp-keys-openssh ) " +PATCHES=( + "${FILESDIR}/openssh-7.9_p1-include-stdlib.patch" + "${FILESDIR}/openssh-8.7_p1-GSSAPI-dns.patch" #165444 integrated into gsskex + "${FILESDIR}/openssh-6.7_p1-openssl-ignore-status.patch" + "${FILESDIR}/openssh-7.5_p1-disable-conch-interop-tests.patch" + "${FILESDIR}/openssh-8.0_p1-fix-putty-tests.patch" + "${FILESDIR}/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" + "${FILESDIR}/openssh-8.9_p1-allow-ppoll_time64.patch" #834019 +) + pkg_pretend() { # this sucks, but i'd rather have people unable to `emerge -u openssh` # than not be able to log in to their server any more - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use hpn && maybe_fail hpn HPN_VER) - $(use sctp && maybe_fail sctp SCTP_PATCH) - $(use X509 && maybe_fail X509 X509_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then + local missing=() + check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); } + check_feature hpn HPN_VER + check_feature X509 X509_PATCH + if [[ ${#missing[@]} -ne 0 ]] ; then eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" + eerror "that you requested: ${missing[*]}" eerror "Please mask ${PF} for now and check back later:" eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" die "Missing requested third party patch." @@ -124,6 +142,13 @@ pkg_pretend() { fi } +src_unpack() { + default + + # We don't have signatures for HPN, X509, so we have to write this ourselves + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc} +} + src_prepare() { sed -i \ -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ @@ -132,12 +157,7 @@ src_prepare() { # don't break .ssh/authorized_keys2 for fun sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch - eapply "${FILESDIR}"/${PN}-8.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex - eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch + eapply -- "${PATCHES[@]}" [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches @@ -145,10 +165,11 @@ src_prepare() { if use X509 ; then pushd "${WORKDIR}" &>/dev/null || die - eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch" + eapply "${WORKDIR}/${X509_GLUE_PATCH}" popd &>/dev/null || die eapply "${WORKDIR}"/${X509_PATCH%.*} + eapply "${FILESDIR}/openssh-9.0_p1-X509-uninitialized-delay.patch" # We need to patch package version or any X.509 sshd will reject our ssh client # with "userauth_pubkey: could not parse key: string is too large [preauth]" @@ -165,34 +186,18 @@ src_prepare() { PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) fi - if use sctp ; then - eapply "${WORKDIR}"/${SCTP_PATCH%.*} - - einfo "Patching version.h to expose SCTP patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in SCTP patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) - - einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..." - sed -i \ - -e "/\t\tcfgparse \\\/d" \ - "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" - fi - if use hpn ; then - local hpn_patchdir="${T}/${P}-hpn${HPN_VER}" + local hpn_patchdir="${T}/openssh-${PV}-hpn${HPN_VER}" mkdir "${hpn_patchdir}" || die cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die pushd "${hpn_patchdir}" &>/dev/null || die - eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch - use X509 && eapply "${FILESDIR}"/${PN}-8.7_p1-hpn-${HPN_VER}-X509-glue.patch - use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch + eapply "${WORKDIR}/${HPN_GLUE_PATCH}" + use X509 && eapply "${WORKDIR}/${X509_HPN_GLUE_PATCH}" popd &>/dev/null || die eapply "${hpn_patchdir}" - use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch" + use X509 || eapply "${FILESDIR}/openssh-9.6_p1-hpn-version.patch" einfo "Patching Makefile.in for HPN patch set ..." sed -i \ @@ -206,6 +211,8 @@ src_prepare() { PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + # Before re-enabling, check https://bugs.gentoo.org/354113#c6 + # and be sure to have tested it. einfo "Disabling known non-working MT AES cipher per default ..." cat > "${T}"/disable_mtaes.conf <<- EOF @@ -224,7 +231,7 @@ src_prepare() { fi fi - if use X509 || use sctp || use hpn ; then + if use X509 || use hpn ; then einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." sed -i \ -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ @@ -241,10 +248,6 @@ src_prepare() { "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" fi - sed -i \ - -e "/#UseLogin no/d" \ - "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" - eapply_user #473004 # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox @@ -254,17 +257,10 @@ src_prepare() { tc-export PKG_CONFIG local sed_args=( -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" - # Disable PATH reset, trust what portage gives us #254615 - -e 's:^PATH=/:#PATH=/:' # Disable fortify flags ... our gcc does this for us -e 's:-D_FORTIFY_SOURCE=2::' ) - # The -ftrapv flag ICEs on hppa #505182 - use hppa && sed_args+=( - -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' - -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' - ) # _XOPEN_SOURCE causes header conflicts on Solaris [[ ${CHOST} == *-solaris* ]] && sed_args+=( -e 's/-D_XOPEN_SOURCE//' @@ -300,69 +296,46 @@ src_configure() { --datadir="${EPREFIX}"/usr/share/openssh --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd + --with-hardening $(use_with audit audit linux) $(use_with kerberos kerberos5 "${EPREFIX}"/usr) - # We apply the sctp patch conditionally, so can't pass --without-sctp - # unconditionally else we get unknown flag warnings. - $(use sctp && use_with sctp) - $(use_with ldns ldns "${EPREFIX}"/usr) + $(use_with ldns) $(use_with libedit) $(use_with pam) $(use_with pie) $(use_with selinux) $(usex X509 '' "$(use_with security-key security-key-builtin)") $(use_with ssl openssl) - $(use_with ssl md5-passwords) $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 ) if use elibc_musl; then - # stackprotect is broken on musl x86 and ppc - if use x86 || use ppc; then - myconf+=( --without-stackprotect ) - fi - # musl defines bogus values for UTMP_FILE and WTMP_FILE # https://bugs.gentoo.org/753230 myconf+=( --disable-utmp --disable-wtmp ) fi - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + # Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all + # bug #869839 (https://github.com/llvm/llvm-project/issues/57692) + tc-is-clang && myconf+=( --without-hardening ) econf "${myconf[@]}" } src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - + local tests=( compat-tests ) local shell=$(egetshell "${UID}") if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) + ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + ewarn "user, so we will run a subset only." + tests+=( interop-tests ) else tests+=( tests ) fi - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \ - SUDO="" SSH_SK_PROVIDER="" \ - TEST_SSH_UNSAFE_PERMISSIONS=1 \ - emake -k -j1 ${t} </dev/null \ - && passed+=( "${t}" ) \ - || failed+=( "${t}" ) - done - - einfo "Passed tests: ${passed[*]}" - [[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}" - [[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}" + local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 + mkdir -p "${HOME}"/.ssh || die + emake -j1 "${tests[@]}" </dev/null } # Gentoo tweaks to default config files. @@ -377,39 +350,55 @@ tweak_ssh_configs() { LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE ) - # First the server config. - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config + dodir /etc/ssh/ssh_config.d /etc/ssh/sshd_config.d + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config || die + Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf" + EOF + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config || die + Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf" + EOF - # Allow client to pass locale environment variables. #367017 - AcceptEnv ${locale_vars[*]} + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + # Send locale environment variables (bug #367017) + SendEnv ${locale_vars[*]} - # Allow client to pass COLORTERM to match TERM. #658540 - AcceptEnv COLORTERM + # Send COLORTERM to match TERM (bug #658540) + SendEnv COLORTERM EOF - # Then the client config. - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts" + EOF - # Send locale environment variables. #367017 - SendEnv ${locale_vars[*]} + cat <<-EOF >> "${ED}"/etc/ssh/ssh_revoked_hosts || die + # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/ + ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + EOF - # Send COLORTERM to match TERM. #658540 - SendEnv COLORTERM + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + # Allow client to pass locale environment variables (bug #367017) + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM (bug #658540) + AcceptEnv COLORTERM EOF if use pam ; then - sed -i \ - -e "/^#UsePAM /s:.*:UsePAM yes:" \ - -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ - -e "/^#PrintMotd /s:.*:PrintMotd no:" \ - -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ - "${ED}"/etc/ssh/sshd_config || die + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + UsePAM yes + # This interferes with PAM. + PasswordAuthentication no + # PAM can do its own handling of MOTD. + PrintMotd no + PrintLastLog no + EOF fi if use livecd ; then - sed -i \ - -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ - "${ED}"/etc/ssh/sshd_config || die + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + # Allow root login with password on livecds. + PermitRootLogin Yes + EOF fi } @@ -433,17 +422,11 @@ src_install() { diropts -m 0700 dodir /etc/skel/.ssh - - # https://bugs.gentoo.org/733802 - if ! use scp; then - rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \ - || die "failed to remove scp" - fi - rmdir "${ED}"/var/empty || die - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' + systemd_dounit "${FILESDIR}"/sshd.socket + systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service + systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service' } pkg_preinst() { @@ -491,6 +474,14 @@ pkg_postinst() { ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" ewarn "connection is generally safe." fi + if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then + ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to" + ewarn "'Restart=on-failure', which causes the service to automatically restart if it" + ewarn "terminates with an unclean exit code or signal. This feature is useful for most users," + ewarn "but it can increase the vulnerability of the system in the event of a future exploit." + ewarn "If you have a web-facing setup or are concerned about security, it is recommended to" + ewarn "set 'Restart=no' in your sshd unit file." + fi done if [[ -n ${show_ssl_warning} ]]; then diff --git a/net-misc/openssh/openssh-8.8_p1-r2.ebuild b/net-misc/openssh-contrib/openssh-contrib-9.7_p1-r1.ebuild index b41b2579d815..f9f2c349c740 100644 --- a/net-misc/openssh/openssh-8.8_p1-r2.ebuild +++ b/net-misc/openssh-contrib/openssh-contrib-9.7_p1-r1.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit user-info flag-o-matic autotools pam systemd toolchain-funcs +inherit user-info optfeature flag-o-matic autotools pam systemd toolchain-funcs verify-sig # Make it more portable between straight releases # and _p? releases. -PARCH=${P/_} +MY_P=${P/-contrib/} +PARCH=${MY_P/_} # PV to USE for HPN patches #HPN_PV="${PV^^}" @@ -15,28 +16,41 @@ HPN_PV="8.5_P1" HPN_VER="15.2" HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff + openssh-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff + openssh-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff ) +HPN_GLUE_PATCH="openssh-9.6_p1-hpn-${HPN_VER}-glue.patch" +HPN_PATCH_DIR="HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}" -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="13.2.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" +X509_VER="15.0" +X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" +X509_PATCH="${X509_PATCH/p2/p1}" +X509_GLUE_PATCH="openssh-${PV}-X509-glue-${X509_VER}.patch" +#X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch" +X509_HPN_GLUE_PATCH="${MY_P}-hpn-${HPN_VER}-X509-${X509_VER%.1}-glue.patch" -DESCRIPTION="Port of OpenBSD's free SSH release" +DESCRIPTION="Port of OpenBSD's free SSH release with HPN/X509 patches" HOMEPAGE="https://www.openssh.com/" SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )} - ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} + ${HPN_VER:+hpn? ( + $(printf "https://downloads.sourceforge.net/project/hpnssh/Patches/${HPN_PATCH_DIR}/%s\n" "${HPN_PATCHES[@]}") + https://dev.gentoo.org/~chutzpah/dist/openssh/${HPN_GLUE_PATCH}.xz + )} + ${X509_VER:+X509? ( + https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} + https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_GLUE_PATCH}.xz + ${HPN_VER:+hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${X509_HPN_GLUE_PATCH}.xz )} + )} + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) " +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc S="${WORKDIR}/${PARCH}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64" # Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" +IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test X X509 xmss" RESTRICT="!test? ( test )" @@ -45,7 +59,7 @@ REQUIRED_USE=" ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) - X509? ( !sctp ssl !xmss ) + X509? ( ssl !xmss !security-key ) xmss? ( ssl ) test? ( ssl ) " @@ -57,23 +71,11 @@ LIB_DEPEND=" audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) + net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - || ( - ( - >=dev-libs/openssl-1.0.1:0[bindist(-)=] - <dev-libs/openssl-1.1.0:0[bindist(-)=] - ) - >=dev-libs/openssl-1.1.0g:0[bindist(-)=] - ) - dev-libs/openssl:0=[static-libs(+)] - ) + ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] " @@ -84,34 +86,39 @@ RDEPEND=" pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( ${LIB_DEPEND} ) " -RDEPEND="${RDEPEND} +RDEPEND=" + ${RDEPEND} + !net-misc/openssh pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( !prefix? ( sys-apps/shadow ) ) - X? ( x11-apps/xauth ) + !prefix? ( sys-apps/shadow ) " BDEPEND=" + dev-build/autoconf virtual/pkgconfig - sys-devel/autoconf + verify-sig? ( sec-keys/openpgp-keys-openssh ) " +PATCHES=( + "${FILESDIR}/openssh-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" + "${FILESDIR}/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" +) + pkg_pretend() { # this sucks, but i'd rather have people unable to `emerge -u openssh` # than not be able to log in to their server any more - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use hpn && maybe_fail hpn HPN_VER) - $(use sctp && maybe_fail sctp SCTP_PATCH) - $(use X509 && maybe_fail X509 X509_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then + local missing=() + check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); } + check_feature hpn HPN_VER + check_feature X509 X509_PATCH + if [[ ${#missing[@]} -ne 0 ]] ; then eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" + eerror "that you requested: ${missing[*]}" eerror "Please mask ${PF} for now and check back later:" eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" die "Missing requested third party patch." @@ -124,6 +131,13 @@ pkg_pretend() { fi } +src_unpack() { + default + + # We don't have signatures for HPN, X509, so we have to write this ourselves + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc} +} + src_prepare() { sed -i \ -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ @@ -132,23 +146,19 @@ src_prepare() { # don't break .ssh/authorized_keys2 for fun sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch - eapply "${FILESDIR}"/${PN}-8.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex - eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches + eapply -- "${PATCHES[@]}" local PATCHSET_VERSION_MACROS=() if use X509 ; then pushd "${WORKDIR}" &>/dev/null || die - eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch" + eapply "${WORKDIR}/${X509_GLUE_PATCH}" popd &>/dev/null || die eapply "${WORKDIR}"/${X509_PATCH%.*} + eapply "${FILESDIR}/openssh-9.0_p1-X509-uninitialized-delay.patch" # We need to patch package version or any X.509 sshd will reject our ssh client # with "userauth_pubkey: could not parse key: string is too large [preauth]" @@ -165,34 +175,18 @@ src_prepare() { PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) fi - if use sctp ; then - eapply "${WORKDIR}"/${SCTP_PATCH%.*} - - einfo "Patching version.h to expose SCTP patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in SCTP patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) - - einfo "Disabling known failing test (cfgparse) caused by SCTP patch ..." - sed -i \ - -e "/\t\tcfgparse \\\/d" \ - "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" - fi - if use hpn ; then - local hpn_patchdir="${T}/${P}-hpn${HPN_VER}" + local hpn_patchdir="${T}/openssh-${PV}-hpn${HPN_VER}" mkdir "${hpn_patchdir}" || die cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die pushd "${hpn_patchdir}" &>/dev/null || die - eapply "${FILESDIR}"/${PN}-8.7_p1-hpn-${HPN_VER}-glue.patch - use X509 && eapply "${FILESDIR}"/${PN}-8.7_p1-hpn-${HPN_VER}-X509-glue.patch - use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch + eapply "${WORKDIR}/${HPN_GLUE_PATCH}" + use X509 && eapply "${WORKDIR}/${X509_HPN_GLUE_PATCH}" popd &>/dev/null || die eapply "${hpn_patchdir}" - use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch" + use X509 || eapply "${FILESDIR}/openssh-9.6_p1-hpn-version.patch" einfo "Patching Makefile.in for HPN patch set ..." sed -i \ @@ -206,6 +200,8 @@ src_prepare() { PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then + # Before re-enabling, check https://bugs.gentoo.org/354113#c6 + # and be sure to have tested it. einfo "Disabling known non-working MT AES cipher per default ..." cat > "${T}"/disable_mtaes.conf <<- EOF @@ -224,7 +220,7 @@ src_prepare() { fi fi - if use X509 || use sctp || use hpn ; then + if use X509 || use hpn ; then einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." sed -i \ -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ @@ -241,10 +237,6 @@ src_prepare() { "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" fi - sed -i \ - -e "/#UseLogin no/d" \ - "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" - eapply_user #473004 # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox @@ -254,17 +246,10 @@ src_prepare() { tc-export PKG_CONFIG local sed_args=( -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" - # Disable PATH reset, trust what portage gives us #254615 - -e 's:^PATH=/:#PATH=/:' # Disable fortify flags ... our gcc does this for us -e 's:-D_FORTIFY_SOURCE=2::' ) - # The -ftrapv flag ICEs on hppa #505182 - use hppa && sed_args+=( - -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' - -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' - ) # _XOPEN_SOURCE causes header conflicts on Solaris [[ ${CHOST} == *-solaris* ]] && sed_args+=( -e 's/-D_XOPEN_SOURCE//' @@ -300,73 +285,63 @@ src_configure() { --datadir="${EPREFIX}"/usr/share/openssh --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd + # optional at runtime; guarantee a known path + --with-xauth="${EPREFIX}"/usr/bin/xauth + + # --with-hardening adds the following in addition to flags we + # already set in our toolchain: + # * -ftrapv (which is broken with GCC anyway), + # * -ftrivial-auto-var-init=zero (which is nice, but not the end of + # the world to not have) + # * -fzero-call-used-regs=used (history of miscompilations with + # Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086, + # gcc PR104820, gcc PR104817, gcc PR110934)). + # + # Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK, + # so we cannot just disable -fzero-call-used-regs=used. + # + # Therefore, just pass --without-hardening, given it doesn't negate + # our already hardened toolchain defaults, and avoids adding flags + # which are known-broken in both Clang and GCC and haven't been + # proven reliable. + --without-hardening + $(use_with audit audit linux) $(use_with kerberos kerberos5 "${EPREFIX}"/usr) - # We apply the sctp patch conditionally, so can't pass --without-sctp - # unconditionally else we get unknown flag warnings. - $(use sctp && use_with sctp) - $(use_with ldns ldns "${EPREFIX}"/usr) + $(use_with ldns) $(use_with libedit) $(use_with pam) $(use_with pie) $(use_with selinux) $(usex X509 '' "$(use_with security-key security-key-builtin)") $(use_with ssl openssl) - $(use_with ssl md5-passwords) $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 ) if use elibc_musl; then - # stackprotect is broken on musl x86 and ppc - if use x86 || use ppc; then - myconf+=( --without-stackprotect ) - fi - # musl defines bogus values for UTMP_FILE and WTMP_FILE - # https://bugs.gentoo.org/753230 myconf+=( --disable-utmp --disable-wtmp ) fi - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + # Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all + # bug #869839 (https://github.com/llvm/llvm-project/issues/57692) + tc-is-clang && myconf+=( --without-hardening ) econf "${myconf[@]}" } -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi +tweak_ssh_configs() { + cat <<-EOF >> ssh_config.out || die - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \ - SUDO="" SSH_SK_PROVIDER="" \ - TEST_SSH_UNSAFE_PERMISSIONS=1 \ - emake -k -j1 ${t} </dev/null \ - && passed+=( "${t}" ) \ - || failed+=( "${t}" ) - done + Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf" + EOF + cat <<-EOF >> sshd_config.out || die - einfo "Passed tests: ${passed[*]}" - [[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}" - [[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}" + Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf" + EOF } -# Gentoo tweaks to default config files. -tweak_ssh_configs() { +create_config_dropins() { local locale_vars=( # These are language variables that POSIX defines. # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 @@ -377,42 +352,74 @@ tweak_ssh_configs() { LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE ) - # First the server config. - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config + mkdir -p "${WORKDIR}"/etc/ssh/ssh{,d}_config.d || die - # Allow client to pass locale environment variables. #367017 - AcceptEnv ${locale_vars[*]} + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + # Send locale environment variables (bug #367017) + SendEnv ${locale_vars[*]} - # Allow client to pass COLORTERM to match TERM. #658540 - AcceptEnv COLORTERM + # Send COLORTERM to match TERM (bug #658540) + SendEnv COLORTERM EOF - # Then the client config. - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts" + EOF - # Send locale environment variables. #367017 - SendEnv ${locale_vars[*]} + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_revoked_hosts || die + # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/ + ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + EOF - # Send COLORTERM to match TERM. #658540 - SendEnv COLORTERM + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + # Allow client to pass locale environment variables (bug #367017) + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM (bug #658540) + AcceptEnv COLORTERM EOF if use pam ; then - sed -i \ - -e "/^#UsePAM /s:.*:UsePAM yes:" \ - -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ - -e "/^#PrintMotd /s:.*:PrintMotd no:" \ - -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ - "${ED}"/etc/ssh/sshd_config || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + UsePAM yes + # This interferes with PAM. + PasswordAuthentication no + # PAM can do its own handling of MOTD. + PrintMotd no + PrintLastLog no + EOF fi if use livecd ; then - sed -i \ - -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ - "${ED}"/etc/ssh/sshd_config || die + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + # Allow root login with password on livecds. + PermitRootLogin Yes + EOF fi } +src_compile() { + default + tweak_ssh_configs + create_config_dropins +} + +src_test() { + local tests=( compat-tests ) + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + ewarn "user, so we will run a subset only." + tests+=( interop-tests ) + else + tests+=( tests ) + fi + + local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 REGRESS_INTEROP_PUTTY=1 + mkdir -p "${HOME}"/.ssh || die + emake -j1 "${tests[@]}" </dev/null +} + src_install() { emake install-nokeys DESTDIR="${D}" fperms 600 /etc/ssh/sshd_config @@ -424,26 +431,25 @@ src_install() { newpamd "${FILESDIR}"/sshd.pam_include.2 sshd fi - tweak_ssh_configs - doman contrib/ssh-copy-id.1 dodoc CREDITS OVERVIEW README* TODO sshd_config use hpn && dodoc HPN-README use X509 || dodoc ChangeLog - diropts -m 0700 - dodir /etc/skel/.ssh - - # https://bugs.gentoo.org/733802 - if ! use scp; then - rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \ - || die "failed to remove scp" - fi - rmdir "${ED}"/var/empty || die - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' + systemd_dounit "${FILESDIR}"/sshd.socket + systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service + systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service' + + # Install dropins with explicit mode, bug 906638, 915840 + diropts -m0755 + insopts -m0644 + insinto /etc/ssh + doins -r "${WORKDIR}"/etc/ssh/ssh_config.d + diropts -m0700 + insopts -m0600 + doins -r "${WORKDIR}"/etc/ssh/sshd_config.d } pkg_preinst() { @@ -453,6 +459,9 @@ pkg_preinst() { } pkg_postinst() { + # bug #139235 + optfeature "x11 forwarding" x11-apps/xauth + local old_ver for old_ver in ${REPLACING_VERSIONS}; do if ver_test "${old_ver}" -lt "5.8_p1"; then @@ -491,6 +500,14 @@ pkg_postinst() { ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" ewarn "connection is generally safe." fi + if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then + ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to" + ewarn "'Restart=on-failure', which causes the service to automatically restart if it" + ewarn "terminates with an unclean exit code or signal. This feature is useful for most users," + ewarn "but it can increase the vulnerability of the system in the event of a future exploit." + ewarn "If you have a web-facing setup or are concerned about security, it is recommended to" + ewarn "set 'Restart=no' in your sshd unit file." + fi done if [[ -n ${show_ssl_warning} ]]; then diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index e3a9ef1d4eb6..363bef164ad2 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -1,15 +1,4 @@ -DIST openssh-8.5p1+x509-13.0.1.diff.gz 997005 BLAKE2B b6cdc9ba12dc642c7073463fb8b153a32019e8bc4c1778c2371d89cdc8d9b43e86523d0c03ebeeafa7004a16ad46dfbc18b338bf95f46101d8865709d45aa6b0 SHA512 b0247885d3a0718eb4df123c552f9e95ad9ffd55f96189aca35006c23d76ec76b28420cac4d7b2167c07f2e0a0652edfa20c2ce60aea3f7607a1e747f836ff91 -DIST openssh-8.5p1-sctp-1.2.patch.xz 7692 BLAKE2B 298bf5e2004fd864bdbb6d6f354d1fbcb7052a9caaf8e39863b840a7af8e31f87790f6aa10ae84df177d450bb34a43c4a3aa87d7472e2505d727757c016ce92b SHA512 84990f95e22c90dbc4d04d47ea88b761ff1d0101018661ff2376ac2a726b5fca43f1b5f5d926ccbe1c8d0143ac36b104616bd1a6b5dcdba4addf48a5dd196e2b -DIST openssh-8.5p1.tar.gz 1779733 BLAKE2B f4e4bd39e2dd275d4811e06ca994f2239ad27c804b003c74cc26f9dffae28f1b4006fc618580f0dc9c45f0b7361c24728c23688b45f41cb8a15cf6206c3f15c3 SHA512 af9c34d89170a30fc92a63973e32c766ed4a6d254bb210e317c000d46913e78d0c60c7befe62d993d659be000b828b9d4d3832fc40df1c3d33850aaa6293846f -DIST openssh-8.6p1+x509-13.1.diff.gz 1011666 BLAKE2B 0ac0cf2ff962b8ef677c49de0bb586f375f14d8964e077c10f6a88ec15734807940ab6c0277e44ebdfde0e50c2c80103cff614a6cde4d66e9986152032eeaa90 SHA512 ae4986dd079678c7b0cfd805136ff7ac940d1049fdddeb5a7c4ea2141bfcca70463b951485fb2b113bc930f519b1b41562900ced0269f5673dbdad867f464251 -DIST openssh-8.6p1-sctp-1.2.patch.xz 7696 BLAKE2B 37f9e943a1881af05d9cf2234433711dc45ca30c60af4c0ea38a1d361df02abb491fa114f3698285f582b40b838414c1a048c4f09aa4f7ae9499adb09201d2ac SHA512 ba8c4d38a3d90854e79dc18918fffde246d7609a3f1c3a35e06c0fbe33d3688ed29b0ec33556ae37d1654e1dc2133d892613ad8d1ecbdce9aaa5b9eb10dcbb7a -DIST openssh-8.6p1.tar.gz 1786328 BLAKE2B 261a0f1a6235275894d487cce37537755c86835e3a34871462fe29bfe72b49cd9a6b6a547aea4bd554f0957e110c84458cc75a5f2560717fb04804d62228562a SHA512 9854eda0b773c64c9f1f74844ce466b2b42ee8845f58ad062b73141d617af944fa4ebafdf72069f400106d2c2bd0a69c92fe805ec1fc26d4f0faadf06c3fbbe6 -DIST openssh-8.7p1+x509-13.2.1.diff.gz 1073420 BLAKE2B f9de9f797f1ec83cd56a983f5b9694b0297a60e586898a8c94b4aaa60e5f561bb3b7730590fc8f898c3de2340780d6a77d31bfcc50df0a55a0480051f37806fd SHA512 dd7afd351ddf33e8e74bceba56e5593a0546360efb34f3b954e1816751b5678da5d1bc3a9f2eaa4a745d86d96ae9b643bd549d39b59b22c8cf1a219b076c1db5 -DIST openssh-8.7p1-sctp-1.2.patch.xz 6740 BLAKE2B 468a455018ffddf4fa64d63acb732ad3e1fb722ae8b24d06cf3a683167a4580626b477bbc286f296c83d39dd36c101ac58597a21daa63de83ad55af00aa3a6be SHA512 aa9067c9025b6e4edfad5e45ec92da43db14edb11aae02cbbc296e66b48377cbbf62cdafcdd5edfd1fd4bf69420ee017223ab52e50a42b1976002d767984777c -DIST openssh-8.7p1.tar.gz 1814595 BLAKE2B 9fdb8898485053d08c9eca419c15d0d03b7a60152cf6a9d7f1beed3a21c9e6ac3bd9f854580e6e474fb0c871f3d4be9ef4b49bee8c355d9e5769a5505f4e6ea9 SHA512 08c81024d9e1248abfda6cc874886ff5ae916669b93cd6aff640e0614ee8cbcbc3fe87a9ce47136b6443ddbb1168b114367c74e117551905994e1a7e3fa2c0c2 -DIST openssh-8.8p1+x509-13.2.3.diff.gz 1071138 BLAKE2B dfbe53ccfdfe0a3da9bac927c5bb0ccfeb20f1ba69cef2ffb52999e6f6b0a3282e28a888aab40096fe9eed819f4c9b27592a8771d786580b8fa4f507f6b02557 SHA512 e55e9cdcde1b02b2799600083db8c3b85d207b251b99b4efabe8614bedf1daae28e5ed10cbe1f6a2e5ba766fe1eaf41be9e90fefdaae1352808c504fc0f4e7e6 -DIST openssh-8.8p1-sctp-1.2.patch.xz 6744 BLAKE2B 9f99e0abfbfbda2cc1c7c2a465d044c900da862e5a38f01260f388ac089b2e66c5ea7664d71d18b924552ae177e5893cdcbfbccc20eeb3aaeae00b3d552379e3 SHA512 5290c5ef08a418dcc9260812d8e75ce266e22e2258514f11da6fb178e0ae2ef16046523f72a50f74ae7b98e7eb52d16143befc8ce2919041382d314aa05adda0 -DIST openssh-8.8p1.tar.gz 1815060 BLAKE2B 3a054ce19781aceca5ab1a0839d7435d88aff4481e8c74b91ffd2046dc8b6f03d6bf584ecda066c0496acf43cea9ab4085f26a29e34e20736e752f204b8c76c3 SHA512 d44cd04445f9c8963513b0d5a7e8348985114ff2471e119a6e344498719ef40f09c61c354888a3be9dabcb5870e5cbe5d3aafbb861dfa1d82a4952f3d233a8df -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 +DIST openssh-9.6p1.tar.gz 1857862 BLAKE2B dd7f6747fe89f7b386be4faaf7fc43398a9bf439e45608ae61c2126cf8743c64ef7b5af45c75e9007b0bda525f8809261ca0f2fc47ce60177ba769a5324719dd SHA512 0ebf81e39914c3a90d7777a001ec7376a94b37e6024baf3e972c58f0982b7ddef942315f5e01d56c00ff95603b4a20ee561ab918ecc55511df007ac138160509 +DIST openssh-9.6p1.tar.gz.asc 833 BLAKE2B 9363d02f85457aa90069020827306a2f49d8406e32f5ee1d231844648dd2ffa02fa9b7325b8677a11e46a0ba0d9ffc86d9c989435d691a02f5354a956c49f9f9 SHA512 aec5a5bd6ce480a8e5b5879dc55f8186aec90fe61f085aa92ad7d07f324574aa781be09c83b7443a32848d091fd44fb12c1842d49cee77afc351e550ffcc096d +DIST openssh-9.7p1.tar.gz 1848766 BLAKE2B 520859fcbdf678808fc8515b64585ab9a90a8055fa869df6fbba3083cb7f73ddb81ed9ea981e131520736a8aed838f85ae68ca63406a410df61039913c5cb48b SHA512 0cafc17d22851605a4a5495a1d82c2b3fbbe6643760aad226dbf2a25b5f49d4375c3172833706ea3cb6c05d5d02a40feb9a7e790eae5c4570dd344a43e94ca55 +DIST openssh-9.7p1.tar.gz.asc 833 BLAKE2B a95e952be48bd55a07d0a95a49dc06c326816c67b8b5d40bd3f64c28aa43122253817b8a088e7a3b8a190375ea39f9fc3400b22d035561f9643c1d32b5caef27 SHA512 e028978e4266de9ad513626b13d70249e4166923fc15f38751178e2b3522ff6ebb9a7ca7dc32d1bb42d42fb92adf9903dba1b734bec083010ed7323aadad8baf diff --git a/net-misc/openssh/files/openssh-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch b/net-misc/openssh/files/openssh-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch deleted file mode 100644 index fe3be2409e2a..000000000000 --- a/net-misc/openssh/files/openssh-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3ef92a657444f172b61f92d5da66d94fa8265602 Mon Sep 17 00:00:00 2001 -From: Lonnie Abelbeck <lonnie@abelbeck.com> -Date: Tue, 1 Oct 2019 09:05:09 -0500 -Subject: [PATCH] Deny (non-fatal) shmget/shmat/shmdt in preauth privsep child. - -New wait_random_seeded() function on OpenSSL 1.1.1d uses shmget, shmat, and shmdt -in the preauth codepath, deny (non-fatal) in seccomp_filter sandbox. ---- - sandbox-seccomp-filter.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c -index 840c5232b..39dc289e3 100644 ---- a/sandbox-seccomp-filter.c -+++ b/sandbox-seccomp-filter.c -@@ -168,6 +168,15 @@ static const struct sock_filter preauth_insns[] = { - #ifdef __NR_stat64 - SC_DENY(__NR_stat64, EACCES), - #endif -+#ifdef __NR_shmget -+ SC_DENY(__NR_shmget, EACCES), -+#endif -+#ifdef __NR_shmat -+ SC_DENY(__NR_shmat, EACCES), -+#endif -+#ifdef __NR_shmdt -+ SC_DENY(__NR_shmdt, EACCES), -+#endif - - /* Syscalls to permit */ - #ifdef __NR_brk diff --git a/net-misc/openssh/files/openssh-8.0_p1-hpn-version.patch b/net-misc/openssh/files/openssh-8.0_p1-hpn-version.patch deleted file mode 100644 index 37905ce6afca..000000000000 --- a/net-misc/openssh/files/openssh-8.0_p1-hpn-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kex.c b/kex.c -index 34808b5c..88d7ccac 100644 ---- a/kex.c -+++ b/kex.c -@@ -1126,7 +1126,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, - if (version_addendum != NULL && *version_addendum == '\0') - version_addendum = NULL; - if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n", -- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, -+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, - version_addendum == NULL ? "" : " ", - version_addendum == NULL ? "" : version_addendum)) != 0) { - error("%s: sshbuf_putf: %s", __func__, ssh_err(r)); diff --git a/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch b/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch deleted file mode 100644 index 6bd716619701..000000000000 --- a/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index c9e4294d..2dbfac24 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -44,7 +44,7 @@ CC=@CC@ - LD=@LD@ - CFLAGS=@CFLAGS@ - CFLAGS_NOPIE=@CFLAGS_NOPIE@ --CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ -+CPPFLAGS=-I. -I$(srcdir) -I$(srcdir)/openbsd-compat @CPPFLAGS@ $(PATHS) @DEFS@ - PICFLAG=@PICFLAG@ - LIBS=@LIBS@ - K5LIBS=@K5LIBS@ diff --git a/net-misc/openssh/files/openssh-8.5_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-8.5_p1-GSSAPI-dns.patch deleted file mode 100644 index eec66ade4b4e..000000000000 --- a/net-misc/openssh/files/openssh-8.5_p1-GSSAPI-dns.patch +++ /dev/null @@ -1,354 +0,0 @@ ---- a/auth.c 2021-03-02 04:31:47.000000000 -0600 -+++ b/auth.c 2021-03-04 11:22:44.590041696 -0600 -@@ -727,119 +727,6 @@ fakepw(void) - return (&fake); - } - --/* -- * Returns the remote DNS hostname as a string. The returned string must not -- * be freed. NB. this will usually trigger a DNS query the first time it is -- * called. -- * This function does additional checks on the hostname to mitigate some -- * attacks on legacy rhosts-style authentication. -- * XXX is RhostsRSAAuthentication vulnerable to these? -- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?) -- */ -- --static char * --remote_hostname(struct ssh *ssh) --{ -- struct sockaddr_storage from; -- socklen_t fromlen; -- struct addrinfo hints, *ai, *aitop; -- char name[NI_MAXHOST], ntop2[NI_MAXHOST]; -- const char *ntop = ssh_remote_ipaddr(ssh); -- -- /* Get IP address of client. */ -- fromlen = sizeof(from); -- memset(&from, 0, sizeof(from)); -- if (getpeername(ssh_packet_get_connection_in(ssh), -- (struct sockaddr *)&from, &fromlen) == -1) { -- debug("getpeername failed: %.100s", strerror(errno)); -- return xstrdup(ntop); -- } -- -- ipv64_normalise_mapped(&from, &fromlen); -- if (from.ss_family == AF_INET6) -- fromlen = sizeof(struct sockaddr_in6); -- -- debug3("Trying to reverse map address %.100s.", ntop); -- /* Map the IP address to a host name. */ -- if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), -- NULL, 0, NI_NAMEREQD) != 0) { -- /* Host name not found. Use ip address. */ -- return xstrdup(ntop); -- } -- -- /* -- * if reverse lookup result looks like a numeric hostname, -- * someone is trying to trick us by PTR record like following: -- * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 -- */ -- memset(&hints, 0, sizeof(hints)); -- hints.ai_socktype = SOCK_DGRAM; /*dummy*/ -- hints.ai_flags = AI_NUMERICHOST; -- if (getaddrinfo(name, NULL, &hints, &ai) == 0) { -- logit("Nasty PTR record \"%s\" is set up for %s, ignoring", -- name, ntop); -- freeaddrinfo(ai); -- return xstrdup(ntop); -- } -- -- /* Names are stored in lowercase. */ -- lowercase(name); -- -- /* -- * Map it back to an IP address and check that the given -- * address actually is an address of this host. This is -- * necessary because anyone with access to a name server can -- * define arbitrary names for an IP address. Mapping from -- * name to IP address can be trusted better (but can still be -- * fooled if the intruder has access to the name server of -- * the domain). -- */ -- memset(&hints, 0, sizeof(hints)); -- hints.ai_family = from.ss_family; -- hints.ai_socktype = SOCK_STREAM; -- if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { -- logit("reverse mapping checking getaddrinfo for %.700s " -- "[%s] failed.", name, ntop); -- return xstrdup(ntop); -- } -- /* Look for the address from the list of addresses. */ -- for (ai = aitop; ai; ai = ai->ai_next) { -- if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, -- sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && -- (strcmp(ntop, ntop2) == 0)) -- break; -- } -- freeaddrinfo(aitop); -- /* If we reached the end of the list, the address was not there. */ -- if (ai == NULL) { -- /* Address not found for the host name. */ -- logit("Address %.100s maps to %.600s, but this does not " -- "map back to the address.", ntop, name); -- return xstrdup(ntop); -- } -- return xstrdup(name); --} -- --/* -- * Return the canonical name of the host in the other side of the current -- * connection. The host name is cached, so it is efficient to call this -- * several times. -- */ -- --const char * --auth_get_canonical_hostname(struct ssh *ssh, int use_dns) --{ -- static char *dnsname; -- -- if (!use_dns) -- return ssh_remote_ipaddr(ssh); -- else if (dnsname != NULL) -- return dnsname; -- else { -- dnsname = remote_hostname(ssh); -- return dnsname; -- } --} - - /* These functions link key/cert options to the auth framework */ - ---- a/canohost.c 2021-03-02 04:31:47.000000000 -0600 -+++ b/canohost.c 2021-03-04 11:22:54.854211183 -0600 -@@ -202,3 +202,117 @@ get_local_port(int sock) - { - return get_sock_port(sock, 1); - } -+ -+/* -+ * Returns the remote DNS hostname as a string. The returned string must not -+ * be freed. NB. this will usually trigger a DNS query the first time it is -+ * called. -+ * This function does additional checks on the hostname to mitigate some -+ * attacks on legacy rhosts-style authentication. -+ * XXX is RhostsRSAAuthentication vulnerable to these? -+ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?) -+ */ -+ -+static char * -+remote_hostname(struct ssh *ssh) -+{ -+ struct sockaddr_storage from; -+ socklen_t fromlen; -+ struct addrinfo hints, *ai, *aitop; -+ char name[NI_MAXHOST], ntop2[NI_MAXHOST]; -+ const char *ntop = ssh_remote_ipaddr(ssh); -+ -+ /* Get IP address of client. */ -+ fromlen = sizeof(from); -+ memset(&from, 0, sizeof(from)); -+ if (getpeername(ssh_packet_get_connection_in(ssh), -+ (struct sockaddr *)&from, &fromlen) == -1) { -+ debug("getpeername failed: %.100s", strerror(errno)); -+ return xstrdup(ntop); -+ } -+ -+ ipv64_normalise_mapped(&from, &fromlen); -+ if (from.ss_family == AF_INET6) -+ fromlen = sizeof(struct sockaddr_in6); -+ -+ debug3("Trying to reverse map address %.100s.", ntop); -+ /* Map the IP address to a host name. */ -+ if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), -+ NULL, 0, NI_NAMEREQD) != 0) { -+ /* Host name not found. Use ip address. */ -+ return xstrdup(ntop); -+ } -+ -+ /* -+ * if reverse lookup result looks like a numeric hostname, -+ * someone is trying to trick us by PTR record like following: -+ * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5 -+ */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_socktype = SOCK_DGRAM; /*dummy*/ -+ hints.ai_flags = AI_NUMERICHOST; -+ if (getaddrinfo(name, NULL, &hints, &ai) == 0) { -+ logit("Nasty PTR record \"%s\" is set up for %s, ignoring", -+ name, ntop); -+ freeaddrinfo(ai); -+ return xstrdup(ntop); -+ } -+ -+ /* Names are stored in lowercase. */ -+ lowercase(name); -+ -+ /* -+ * Map it back to an IP address and check that the given -+ * address actually is an address of this host. This is -+ * necessary because anyone with access to a name server can -+ * define arbitrary names for an IP address. Mapping from -+ * name to IP address can be trusted better (but can still be -+ * fooled if the intruder has access to the name server of -+ * the domain). -+ */ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_family = from.ss_family; -+ hints.ai_socktype = SOCK_STREAM; -+ if (getaddrinfo(name, NULL, &hints, &aitop) != 0) { -+ logit("reverse mapping checking getaddrinfo for %.700s " -+ "[%s] failed.", name, ntop); -+ return xstrdup(ntop); -+ } -+ /* Look for the address from the list of addresses. */ -+ for (ai = aitop; ai; ai = ai->ai_next) { -+ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2, -+ sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 && -+ (strcmp(ntop, ntop2) == 0)) -+ break; -+ } -+ freeaddrinfo(aitop); -+ /* If we reached the end of the list, the address was not there. */ -+ if (ai == NULL) { -+ /* Address not found for the host name. */ -+ logit("Address %.100s maps to %.600s, but this does not " -+ "map back to the address.", ntop, name); -+ return xstrdup(ntop); -+ } -+ return xstrdup(name); -+} -+ -+/* -+ * Return the canonical name of the host in the other side of the current -+ * connection. The host name is cached, so it is efficient to call this -+ * several times. -+ */ -+ -+const char * -+auth_get_canonical_hostname(struct ssh *ssh, int use_dns) -+{ -+ static char *dnsname; -+ -+ if (!use_dns) -+ return ssh_remote_ipaddr(ssh); -+ else if (dnsname != NULL) -+ return dnsname; -+ else { -+ dnsname = remote_hostname(ssh); -+ return dnsname; -+ } -+} -diff --git a/readconf.c b/readconf.c -index 724974b7..97a1ffd8 100644 ---- a/readconf.c -+++ b/readconf.c -@@ -161,6 +161,7 @@ typedef enum { - oClearAllForwardings, oNoHostAuthenticationForLocalhost, - oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, - oAddressFamily, oGssAuthentication, oGssDelegateCreds, -+ oGssTrustDns, - oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, - oSendEnv, oSetEnv, oControlPath, oControlMaster, oControlPersist, - oHashKnownHosts, -@@ -206,9 +207,11 @@ static struct { - #if defined(GSSAPI) - { "gssapiauthentication", oGssAuthentication }, - { "gssapidelegatecredentials", oGssDelegateCreds }, -+ { "gssapitrustdns", oGssTrustDns }, - # else - { "gssapiauthentication", oUnsupported }, - { "gssapidelegatecredentials", oUnsupported }, -+ { "gssapitrustdns", oUnsupported }, - #endif - #ifdef ENABLE_PKCS11 - { "pkcs11provider", oPKCS11Provider }, -@@ -1083,6 +1086,10 @@ parse_time: - intptr = &options->gss_deleg_creds; - goto parse_flag; - -+ case oGssTrustDns: -+ intptr = &options->gss_trust_dns; -+ goto parse_flag; -+ - case oBatchMode: - intptr = &options->batch_mode; - goto parse_flag; -@@ -2183,6 +2190,7 @@ initialize_options(Options * options) - options->challenge_response_authentication = -1; - options->gss_authentication = -1; - options->gss_deleg_creds = -1; -+ options->gss_trust_dns = -1; - options->password_authentication = -1; - options->kbd_interactive_authentication = -1; - options->kbd_interactive_devices = NULL; -@@ -2340,6 +2348,8 @@ fill_default_options(Options * options) - options->gss_authentication = 0; - if (options->gss_deleg_creds == -1) - options->gss_deleg_creds = 0; -+ if (options->gss_trust_dns == -1) -+ options->gss_trust_dns = 0; - if (options->password_authentication == -1) - options->password_authentication = 1; - if (options->kbd_interactive_authentication == -1) -diff --git a/readconf.h b/readconf.h -index 2fba866e..da3ce87a 100644 ---- a/readconf.h -+++ b/readconf.h -@@ -42,6 +42,7 @@ typedef struct { - /* Try S/Key or TIS, authentication. */ - int gss_authentication; /* Try GSS authentication */ - int gss_deleg_creds; /* Delegate GSS credentials */ -+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */ - int password_authentication; /* Try password - * authentication. */ - int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ -diff --git a/ssh_config.5 b/ssh_config.5 -index f8119189..e0fd0d76 100644 ---- a/ssh_config.5 -+++ b/ssh_config.5 -@@ -783,6 +783,16 @@ The default is - Forward (delegate) credentials to the server. - The default is - .Cm no . -+Note that this option applies to protocol version 2 connections using GSSAPI. -+.It Cm GSSAPITrustDns -+Set to -+.Dq yes to indicate that the DNS is trusted to securely canonicalize -+the name of the host being connected to. If -+.Dq no, the hostname entered on the -+command line will be passed untouched to the GSSAPI library. -+The default is -+.Dq no . -+This option only applies to protocol version 2 connections using GSSAPI. - .It Cm HashKnownHosts - Indicates that - .Xr ssh 1 -diff --git a/sshconnect2.c b/sshconnect2.c -index 059c9480..ab6f6832 100644 ---- a/sshconnect2.c -+++ b/sshconnect2.c -@@ -770,6 +770,13 @@ userauth_gssapi(struct ssh *ssh) - OM_uint32 min; - int r, ok = 0; - gss_OID mech = NULL; -+ const char *gss_host; -+ -+ if (options.gss_trust_dns) { -+ extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns); -+ gss_host = auth_get_canonical_hostname(ssh, 1); -+ } else -+ gss_host = authctxt->host; - - /* Try one GSSAPI method at a time, rather than sending them all at - * once. */ -@@ -784,7 +791,7 @@ userauth_gssapi(struct ssh *ssh) - elements[authctxt->mech_tried]; - /* My DER encoding requires length<128 */ - if (mech->length < 128 && ssh_gssapi_check_mechanism(&gssctxt, -- mech, authctxt->host)) { -+ mech, gss_host)) { - ok = 1; /* Mechanism works */ - } else { - authctxt->mech_tried++; diff --git a/net-misc/openssh/files/openssh-8.5_p1-X509-glue-13.0.1.patch b/net-misc/openssh/files/openssh-8.5_p1-X509-glue-13.0.1.patch deleted file mode 100644 index c7812c622c26..000000000000 --- a/net-misc/openssh/files/openssh-8.5_p1-X509-glue-13.0.1.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/openssh-8.5p1+x509-13.0.1.diff 2021-03-15 14:05:14.876485231 -0700 -+++ b/openssh-8.5p1+x509-13.0.1.diff 2021-03-15 14:06:05.389154451 -0700 -@@ -46675,12 +46675,11 @@ - - install-files: - $(MKDIR_P) $(DESTDIR)$(bindir) --@@ -380,6 +364,8 @@ -+@@ -380,6 +364,7 @@ - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - $(MKDIR_P) $(DESTDIR)$(libexecdir) - + $(MKDIR_P) $(DESTDIR)$(sshcadir) --+ $(MKDIR_P) $(DESTDIR)$(piddir) - $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) -@@ -63967,7 +63966,7 @@ - - echo "putty interop tests not enabled" - - exit 0 - -fi --+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } -++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } - - for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do - verbose "$tid: cipher $c" -@@ -63982,7 +63981,7 @@ - - echo "putty interop tests not enabled" - - exit 0 - -fi --+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } -++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } - - for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ecdh ; do - verbose "$tid: kex $k" -@@ -63997,7 +63996,7 @@ - - echo "putty interop tests not enabled" - - exit 0 - -fi --+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } -++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } - - if [ "`${SSH} -Q compression`" = "none" ]; then - comp="0" -@@ -64129,9 +64128,9 @@ - - +# cross-project configuration - +if test "$sshd_type" = "pkix" ; then --+ unset_arg='' -++ unset_arg= - +else --+ unset_arg=none -++ unset_arg= - +fi - + - cat > $OBJ/sshd_config.i << _EOF -@@ -122247,16 +122246,6 @@ - +int asnmprintf(char **, size_t, int *, const char *, ...) - __attribute__((format(printf, 4, 5))); - void msetlocale(void); --diff -ruN openssh-8.5p1/version.h openssh-8.5p1+x509-13.0.1/version.h ----- openssh-8.5p1/version.h 2021-03-02 12:31:47.000000000 +0200 --+++ openssh-8.5p1+x509-13.0.1/version.h 2021-03-15 20:07:00.000000000 +0200 --@@ -2,5 +2,4 @@ -- -- #define SSH_VERSION "OpenSSH_8.5" -- ---#define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-8.5p1/version.m4 openssh-8.5p1+x509-13.0.1/version.m4 - --- openssh-8.5p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-8.5p1+x509-13.0.1/version.m4 2021-03-15 20:07:00.000000000 +0200 diff --git a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-X509-13.0.1-glue.patch b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-X509-13.0.1-glue.patch deleted file mode 100644 index 413cc8b9c3dc..000000000000 --- a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-X509-13.0.1-glue.patch +++ /dev/null @@ -1,328 +0,0 @@ -diff -u a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff ---- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-03-15 17:45:28.550606801 -0700 -+++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-03-15 17:56:36.240309581 -0700 -@@ -3,9 +3,9 @@ - --- a/Makefile.in - +++ b/Makefile.in - @@ -46,7 +46,7 @@ CFLAGS=@CFLAGS@ -- CFLAGS_NOPIE=@CFLAGS_NOPIE@ -- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ -- PICFLAG=@PICFLAG@ -+ LD=@LD@ -+ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA) -+ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ - -LIBS=@LIBS@ - +LIBS=@LIBS@ -lpthread - K5LIBS=@K5LIBS@ -@@ -803,8 +803,8 @@ - ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out) - { - struct session_state *state; --- const struct sshcipher *none = cipher_by_name("none"); --+ struct sshcipher *none = cipher_by_name("none"); -+- const struct sshcipher *none = cipher_none(); -++ struct sshcipher *none = cipher_none(); - int r; - - if (none == NULL) { -@@ -898,20 +898,20 @@ - options->fingerprint_hash = -1; - options->update_hostkeys = -1; - + options->disable_multithreaded = -1; -- options->hostbased_accepted_algos = NULL; -- options->pubkey_accepted_algos = NULL; -- options->known_hosts_command = NULL; -+ } -+ -+ /* - @@ -2467,6 +2474,10 @@ fill_default_options(Options * options) -+ options->update_hostkeys = 0; - if (options->sk_provider == NULL) - options->sk_provider = xstrdup("$SSH_SK_PROVIDER"); -- #endif - + if (options->update_hostkeys == -1) - + options->update_hostkeys = 0; - + if (options->disable_multithreaded == -1) - + options->disable_multithreaded = 0; - -- /* Expand KEX name lists */ -- all_cipher = cipher_alg_list(',', 0); -+ /* expand KEX and etc. name lists */ -+ { char *all; - diff --git a/readconf.h b/readconf.h - index 2fba866e..7f8f0227 100644 - --- a/readconf.h -@@ -950,9 +950,9 @@ - /* Portable-specific options */ - sUsePAM, - + sDisableMTAES, -- /* Standard Options */ -- sPort, sHostKeyFile, sLoginGraceTime, -- sPermitRootLogin, sLogFacility, sLogLevel, sLogVerbose, -+ /* X.509 Standard Options */ -+ sHostbasedAlgorithms, -+ sPubkeyAlgorithms, - @@ -662,6 +666,7 @@ static struct { - { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL }, - { "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL }, -diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff ---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-03-16 10:29:42.953733894 -0700 -+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-03-16 10:47:54.198893025 -0700 -@@ -157,6 +157,36 @@ - + Allan Jude provided the code for the NoneMac and buffer normalization. - + This work was financed, in part, by Cisco System, Inc., the National - + Library of Medicine, and the National Science Foundation. -+diff --git a/auth2.c b/auth2.c -+--- a/auth2.c 2021-03-15 19:30:45.404060786 -0700 -++++ b/auth2.c 2021-03-15 19:37:22.078476597 -0700 -+@@ -229,16 +229,17 @@ -+ double delay; -+ -+ digest_alg = ssh_digest_maxbytes(); -+- len = ssh_digest_bytes(digest_alg); -+- hash = xmalloc(len); -++ if (len = ssh_digest_bytes(digest_alg) > 0) { -++ hash = xmalloc(len); -+ -+- (void)snprintf(b, sizeof b, "%llu%s", -+- (unsigned long long)options.timing_secret, user); -+- if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0) -+- fatal_f("ssh_digest_memory"); -+- /* 0-4.2 ms of delay */ -+- delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000; -+- freezero(hash, len); -++ (void)snprintf(b, sizeof b, "%llu%s", -++ (unsigned long long)options.timing_secret, user); -++ if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0) -++ fatal_f("ssh_digest_memory"); -++ /* 0-4.2 ms of delay */ -++ delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000; -++ freezero(hash, len); -++ } -+ debug3_f("user specific delay %0.3lfms", delay/1000); -+ return MIN_FAIL_DELAY_SECONDS + delay; -+ } - diff --git a/channels.c b/channels.c - index b60d56c4..0e363c15 100644 - --- a/channels.c -@@ -209,14 +239,14 @@ - static void - channel_pre_open(struct ssh *ssh, Channel *c, - fd_set *readset, fd_set *writeset) --@@ -2120,22 +2147,32 @@ channel_check_window(struct ssh *ssh, Channel *c) -+@@ -2164,21 +2164,31 @@ channel_check_window(struct ssh *ssh, Channel *c) - - if (c->type == SSH_CHANNEL_OPEN && - !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) && - - ((c->local_window_max - c->local_window > - - c->local_maxpacket*3) || --+ ((ssh_packet_is_interactive(ssh) && --+ c->local_window_max - c->local_window > c->local_maxpacket*3) || -++ ((ssh_packet_is_interactive(ssh) && -++ c->local_window_max - c->local_window > c->local_maxpacket*3) || - c->local_window < c->local_window_max/2) && - c->local_consumed > 0) { - + u_int addition = 0; -@@ -235,9 +265,8 @@ - (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 || - - (r = sshpkt_put_u32(ssh, c->local_consumed)) != 0 || - + (r = sshpkt_put_u32(ssh, c->local_consumed + addition)) != 0 || -- (r = sshpkt_send(ssh)) != 0) { -- fatal_fr(r, "channel %i", c->self); -- } -+ (r = sshpkt_send(ssh)) != 0) -+ fatal_fr(r, "channel %d", c->self); - - debug2("channel %d: window %d sent adjust %d", c->self, - - c->local_window, c->local_consumed); - - c->local_window += c->local_consumed; -@@ -386,21 +415,45 @@ - index 69befa96..90b5f338 100644 - --- a/compat.c - +++ b/compat.c --@@ -149,6 +149,14 @@ compat_banner(struct ssh *ssh, const char *version) -- debug_f("match: %s pat %s compat 0x%08x", -+@@ -43,7 +43,7 @@ compat_datafellows(const char *version) -+ static u_int -+ compat_datafellows(const char *version) -+ { -+- int i; -++ int i, bugs = 0; -+ static struct { -+ char *pat; -+ int bugs; -+@@ -147,11 +147,26 @@ -+ if (match_pattern_list(version, check[i].pat, 0) == 1) { -+ debug("match: %s pat %s compat 0x%08x", - version, check[i].pat, check[i].bugs); -- ssh->compat = check[i].bugs; - + /* Check to see if the remote side is OpenSSH and not HPN */ --+ /* TODO: need to use new method to test for this */ - + if (strstr(version, "OpenSSH") != NULL) { - + if (strstr(version, "hpn") == NULL) { --+ ssh->compat |= SSH_BUG_LARGEWINDOW; -++ bugs |= SSH_BUG_LARGEWINDOW; - + debug("Remote is NON-HPN aware"); - + } - + } -- return; -+- return check[i].bugs; -++ bugs |= check[i].bugs; - } - } -+- debug("no match: %s", version); -+- return 0; -++ /* Check to see if the remote side is OpenSSH and not HPN */ -++ if (strstr(version, "OpenSSH") != NULL) { -++ if (strstr(version, "hpn") == NULL) { -++ bugs |= SSH_BUG_LARGEWINDOW; -++ debug("Remote is NON-HPN aware"); -++ } -++ } -++ if (bugs == 0) -++ debug("no match: %s", version); -++ return bugs; -+ } -+ -+ char * - diff --git a/compat.h b/compat.h - index c197fafc..ea2e17a7 100644 - --- a/compat.h -@@ -459,7 +512,7 @@ - @@ -890,6 +890,10 @@ kex_choose_conf(struct ssh *ssh) - int nenc, nmac, ncomp; - u_int mode, ctos, need, dh_need, authlen; -- int r, first_kex_follows; -+ int r, first_kex_follows = 0; - + int auth_flag = 0; - + - + auth_flag = packet_authentication_state(ssh); -@@ -1035,19 +1088,6 @@ - - /* File to read commands from */ - FILE* infile; --diff --git a/ssh-keygen.c b/ssh-keygen.c --index cfb5f115..36a6e519 100644 ----- a/ssh-keygen.c --+++ b/ssh-keygen.c --@@ -2971,7 +2971,7 @@ do_download_sk(const char *skprovider, const char *device) -- freezero(pin, strlen(pin)); -- error_r(r, "Unable to load resident keys"); -- return -1; --- } --+ } -- if (nkeys == 0) -- logit("No keys to download"); -- if (pin != NULL) - diff --git a/ssh.c b/ssh.c - index 53330da5..27b9770e 100644 - --- a/ssh.c -@@ -1093,7 +1133,7 @@ - + else - + options.hpn_buffer_size = 2 * 1024 * 1024; - + --+ if (ssh->compat & SSH_BUG_LARGEWINDOW) { -++ if (ssh_compat_fellows(ssh, SSH_BUG_LARGEWINDOW)) { - + debug("HPN to Non-HPN Connection"); - + } else { - + int sock, socksize; -@@ -1335,6 +1375,28 @@ - /* Bind the socket to the desired port. */ - if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) { - error("Bind to port %s on %s failed: %.200s.", -+@@ -1625,13 +1625,14 @@ -+ if (ssh_digest_update(ctx, sshbuf_ptr(server_cfg), -+ sshbuf_len(server_cfg)) != 0) -+ fatal_f("ssh_digest_update"); -+- len = ssh_digest_bytes(digest_alg); -+- hash = xmalloc(len); -+- if (ssh_digest_final(ctx, hash, len) != 0) -+- fatal_f("ssh_digest_final"); -+- options.timing_secret = PEEK_U64(hash); -+- freezero(hash, len); -+- ssh_digest_free(ctx); -++ if ((len = ssh_digest_bytes(digest_alg)) > 0) { -++ hash = xmalloc(len); -++ if (ssh_digest_final(ctx, hash, len) != 0) -++ fatal_f("ssh_digest_final"); -++ options.timing_secret = PEEK_U64(hash); -++ freezero(hash, len); -++ ssh_digest_free(ctx); -++ } -+ ctx = NULL; -+ return; -+ } - @@ -1727,6 +1734,19 @@ main(int ac, char **av) - /* Fill in default values for those options not explicitly set. */ - fill_default_server_options(&options); -@@ -1405,14 +1467,3 @@ - # Example of overriding settings on a per-user basis - #Match User anoncvs - # X11Forwarding no --diff --git a/version.h b/version.h --index 6b4fa372..332fb486 100644 ----- a/version.h --+++ b/version.h --@@ -3,4 +3,5 @@ -- #define SSH_VERSION "OpenSSH_8.5" -- -- #define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_HPN "-hpn15v2" --+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN -diff -u a/openssh-8_5_P1-hpn-PeakTput-15.2.diff b/openssh-8_5_P1-hpn-PeakTput-15.2.diff ---- a/openssh-8_5_P1-hpn-PeakTput-15.2.diff 2021-03-15 17:45:28.550606801 -0700 -+++ b/openssh-8_5_P1-hpn-PeakTput-15.2.diff 2021-03-15 18:39:10.262087944 -0700 -@@ -12,9 +12,9 @@ - static long stalled; /* how long we have been stalled */ - static int bytes_per_second; /* current speed in bytes per second */ - @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update) -+ off_t bytes_left; - int cur_speed; -- int hours, minutes, seconds; -- int file_len; -+ int len; - + off_t delta_pos; - - if ((!force_update && !alarm_fired && !win_resized) || !can_output()) -@@ -30,15 +30,17 @@ - if (bytes_left > 0) - elapsed = now - last_update; - else { --@@ -166,7 +173,7 @@ refresh_progress_meter(int force_update) -- -+@@ -166,8 +173,8 @@ refresh_progress_meter(int force_update) -+ buf[1] = '\0'; -+ - /* filename */ -- buf[0] = '\0'; --- file_len = win_size - 36; --+ file_len = win_size - 45; -- if (file_len > 0) { -- buf[0] = '\r'; -- snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s", -+- if (win_size > 36) { -++ if (win_size > 45) { -+- int file_len = win_size - 36; -++ int file_len = win_size - 45; -+ snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ", -+ file_len, file); -+ } - @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update) - (off_t)bytes_per_second); - strlcat(buf, "/s ", win_size); -@@ -63,15 +65,3 @@ - } - - /*ARGSUSED*/ --diff --git a/ssh-keygen.c b/ssh-keygen.c --index cfb5f115..986ff59b 100644 ----- a/ssh-keygen.c --+++ b/ssh-keygen.c --@@ -2959,7 +2959,6 @@ do_download_sk(const char *skprovider, const char *device) -- -- if (skprovider == NULL) -- fatal("Cannot download keys without provider"); --- -- pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN); -- if (!quiet) { -- printf("You may need to touch your authenticator " diff --git a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-glue.patch b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-glue.patch deleted file mode 100644 index 8827fe88d7aa..000000000000 --- a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-glue.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff ---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-03-15 15:10:45.680967455 -0700 -+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-03-16 10:25:14.710431930 -0700 -@@ -536,18 +536,10 @@ - if (state->rekey_limit) - *max_blocks = MINIMUM(*max_blocks, - state->rekey_limit / enc->block_size); --@@ -954,6 +963,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode) -+@@ -954,6 +963,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode) - return 0; - } - --+/* this supports the forced rekeying required for the NONE cipher */ --+int rekey_requested = 0; --+void --+packet_request_rekeying(void) --+{ --+ rekey_requested = 1; --+} --+ - +/* used to determine if pre or post auth when rekeying for aes-ctr - + * and none cipher switch */ - +int -@@ -561,20 +553,6 @@ - #define MAX_PACKETS (1U<<31) - static int - ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) --@@ -980,6 +1007,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) -- if (state->p_send.packets == 0 && state->p_read.packets == 0) -- return 0; -- --+ /* used to force rekeying when called for by the none --+ * cipher switch methods -cjr */ --+ if (rekey_requested == 1) { --+ rekey_requested = 0; --+ return 1; --+ } --+ -- /* Time-based rekeying */ -- if (state->rekey_interval != 0 && -- (int64_t)state->rekey_time + state->rekey_interval <= monotime()) - @@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) - struct session_state *state = ssh->state; - int len, r, ms_remain; -@@ -598,12 +576,11 @@ - }; - - typedef int (ssh_packet_hook_fn)(struct ssh *, struct sshbuf *, --@@ -155,6 +158,10 @@ int ssh_packet_inc_alive_timeouts(struct ssh *); -+@@ -155,6 +158,9 @@ int ssh_packet_inc_alive_timeouts(struct ssh *); - int ssh_packet_set_maxsize(struct ssh *, u_int); - u_int ssh_packet_get_maxsize(struct ssh *); - - +/* for forced packet rekeying post auth */ --+void packet_request_rekeying(void); - +int packet_authentication_state(const struct ssh *); - + - int ssh_packet_get_state(struct ssh *, struct sshbuf *); -@@ -627,9 +604,9 @@ - oLocalCommand, oPermitLocalCommand, oRemoteCommand, - + oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize, - + oNoneEnabled, oNoneMacEnabled, oNoneSwitch, -+ oDisableMTAES, - oVisualHostKey, - oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, -- oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, - @@ -297,6 +300,9 @@ static struct { - { "kexalgorithms", oKexAlgorithms }, - { "ipqos", oIPQoS }, -@@ -778,9 +755,9 @@ - int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ - SyslogFacility log_facility; /* Facility for system logging. */ - @@ -120,7 +124,11 @@ typedef struct { -- - int enable_ssh_keysign; - int64_t rekey_limit; -+ int disable_multithreaded; /*disable multithreaded aes-ctr*/ - + int none_switch; /* Use none cipher */ - + int none_enabled; /* Allow none cipher to be used */ - + int nonemac_enabled; /* Allow none MAC to be used */ -@@ -842,9 +819,9 @@ - /* Portable-specific options */ - if (options->use_pam == -1) - @@ -424,6 +434,49 @@ fill_default_server_options(ServerOptions *options) -- } -- if (options->permit_tun == -1) - options->permit_tun = SSH_TUNMODE_NO; -+ if (options->disable_multithreaded == -1) -+ options->disable_multithreaded = 0; - + if (options->none_enabled == -1) - + options->none_enabled = 0; - + if (options->nonemac_enabled == -1) -@@ -1330,9 +1307,9 @@ - + } - + } - + -- debug("Authentication succeeded (%s).", authctxt.method->name); -- } - -+ #ifdef WITH_OPENSSL -+ if (options.disable_multithreaded == 0) { - diff --git a/sshd.c b/sshd.c - index 6277e6d6..d66fa41a 100644 - --- a/sshd.c diff --git a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch b/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch deleted file mode 100644 index 7199227589c6..000000000000 --- a/net-misc/openssh/files/openssh-8.5_p1-hpn-15.2-sctp-glue.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -u a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff ---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-03-16 10:06:45.020527770 -0700 -+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-03-16 10:07:01.294423665 -0700 -@@ -1414,14 +1414,3 @@ - # Example of overriding settings on a per-user basis - #Match User anoncvs - # X11Forwarding no --diff --git a/version.h b/version.h --index 6b4fa372..332fb486 100644 ----- a/version.h --+++ b/version.h --@@ -3,4 +3,5 @@ -- #define SSH_VERSION "OpenSSH_8.5" -- -- #define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_HPN "-hpn15v2" --+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN diff --git a/net-misc/openssh/files/openssh-8.6_p1-X509-glue-13.1.patch b/net-misc/openssh/files/openssh-8.6_p1-X509-glue-13.1.patch deleted file mode 100644 index e23063b5db2e..000000000000 --- a/net-misc/openssh/files/openssh-8.6_p1-X509-glue-13.1.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/openssh-8.6p1+x509-13.1.diff 2021-04-23 14:46:58.184683047 -0700 -+++ b/openssh-8.6p1+x509-13.1.diff 2021-04-23 15:00:08.455087549 -0700 -@@ -47728,12 +47728,11 @@ - - install-files: - $(MKDIR_P) $(DESTDIR)$(bindir) --@@ -389,6 +366,8 @@ -+@@ -389,6 +366,7 @@ - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - $(MKDIR_P) $(DESTDIR)$(libexecdir) - + $(MKDIR_P) $(DESTDIR)$(sshcadir) --+ $(MKDIR_P) $(DESTDIR)$(piddir) - $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) -@@ -65001,7 +65000,7 @@ - - echo "putty interop tests not enabled" - - exit 0 - -fi --+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } -++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } - - for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do - verbose "$tid: cipher $c" -@@ -65016,7 +65015,7 @@ - - echo "putty interop tests not enabled" - - exit 0 - -fi --+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } -++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } - - for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ecdh ; do - verbose "$tid: kex $k" -@@ -65031,7 +65030,7 @@ - - echo "putty interop tests not enabled" - - exit 0 - -fi --+$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 1; } -++$REGRESS_INTEROP_PUTTY || { echo "putty interop tests are not enabled" >&1; exit 0; } - - if [ "`${SSH} -Q compression`" = "none" ]; then - comp="0" -@@ -65163,9 +65162,9 @@ - - +# cross-project configuration - +if test "$sshd_type" = "pkix" ; then --+ unset_arg='' -++ unset_arg= - +else --+ unset_arg=none -++ unset_arg= - +fi - + - cat > $OBJ/sshd_config.i << _EOF -@@ -124084,16 +124083,6 @@ - +int asnmprintf(char **, size_t, int *, const char *, ...) - __attribute__((format(printf, 4, 5))); - void msetlocale(void); --diff -ruN openssh-8.6p1/version.h openssh-8.6p1+x509-13.1/version.h ----- openssh-8.6p1/version.h 2021-04-16 06:55:25.000000000 +0300 --+++ openssh-8.6p1+x509-13.1/version.h 2021-04-21 21:07:00.000000000 +0300 --@@ -2,5 +2,4 @@ -- -- #define SSH_VERSION "OpenSSH_8.6" -- ---#define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-8.6p1/version.m4 openssh-8.6p1+x509-13.1/version.m4 - --- openssh-8.6p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-8.6p1+x509-13.1/version.m4 2021-04-21 21:07:00.000000000 +0300 diff --git a/net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-X509-glue.patch b/net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-X509-glue.patch deleted file mode 100644 index 714dffc41712..000000000000 --- a/net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-X509-glue.patch +++ /dev/null @@ -1,357 +0,0 @@ -diff -ur a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff ---- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-04-23 15:31:47.247434467 -0700 -+++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-04-23 15:32:29.807508606 -0700 -@@ -3,9 +3,9 @@ - --- a/Makefile.in - +++ b/Makefile.in - @@ -46,7 +46,7 @@ CFLAGS=@CFLAGS@ -- CFLAGS_NOPIE=@CFLAGS_NOPIE@ -- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ -- PICFLAG=@PICFLAG@ -+ LD=@LD@ -+ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA) -+ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ - -LIBS=@LIBS@ - +LIBS=@LIBS@ -lpthread - K5LIBS=@K5LIBS@ -@@ -803,8 +803,8 @@ - ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out) - { - struct session_state *state; --- const struct sshcipher *none = cipher_by_name("none"); --+ struct sshcipher *none = cipher_by_name("none"); -+- const struct sshcipher *none = cipher_none(); -++ struct sshcipher *none = cipher_none(); - int r; - - if (none == NULL) { -@@ -898,20 +898,20 @@ - options->fingerprint_hash = -1; - options->update_hostkeys = -1; - + options->disable_multithreaded = -1; -- options->hostbased_accepted_algos = NULL; -- options->pubkey_accepted_algos = NULL; -- options->known_hosts_command = NULL; -+ } -+ -+ /* - @@ -2467,6 +2474,10 @@ fill_default_options(Options * options) -+ options->update_hostkeys = 0; - if (options->sk_provider == NULL) - options->sk_provider = xstrdup("$SSH_SK_PROVIDER"); -- #endif - + if (options->update_hostkeys == -1) - + options->update_hostkeys = 0; - + if (options->disable_multithreaded == -1) - + options->disable_multithreaded = 0; - -- /* Expand KEX name lists */ -- all_cipher = cipher_alg_list(',', 0); -+ /* expand KEX and etc. name lists */ -+ { char *all; - diff --git a/readconf.h b/readconf.h - index 2fba866e..7f8f0227 100644 - --- a/readconf.h -@@ -950,9 +950,9 @@ - /* Portable-specific options */ - sUsePAM, - + sDisableMTAES, -- /* Standard Options */ -- sPort, sHostKeyFile, sLoginGraceTime, -- sPermitRootLogin, sLogFacility, sLogLevel, sLogVerbose, -+ /* X.509 Standard Options */ -+ sHostbasedAlgorithms, -+ sPubkeyAlgorithms, - @@ -662,6 +666,7 @@ static struct { - { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL }, - { "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL }, -diff -ur a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff ---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-04-23 15:31:47.247434467 -0700 -+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-04-23 15:46:32.296026606 -0700 -@@ -157,6 +157,36 @@ - + Allan Jude provided the code for the NoneMac and buffer normalization. - + This work was financed, in part, by Cisco System, Inc., the National - + Library of Medicine, and the National Science Foundation. -+diff --git a/auth2.c b/auth2.c -+--- a/auth2.c 2021-03-15 19:30:45.404060786 -0700 -++++ b/auth2.c 2021-03-15 19:37:22.078476597 -0700 -+@@ -229,16 +229,17 @@ -+ double delay; -+ -+ digest_alg = ssh_digest_maxbytes(); -+- len = ssh_digest_bytes(digest_alg); -+- hash = xmalloc(len); -++ if (len = ssh_digest_bytes(digest_alg) > 0) { -++ hash = xmalloc(len); -+ -+- (void)snprintf(b, sizeof b, "%llu%s", -+- (unsigned long long)options.timing_secret, user); -+- if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0) -+- fatal_f("ssh_digest_memory"); -+- /* 0-4.2 ms of delay */ -+- delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000; -+- freezero(hash, len); -++ (void)snprintf(b, sizeof b, "%llu%s", -++ (unsigned long long)options.timing_secret, user); -++ if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0) -++ fatal_f("ssh_digest_memory"); -++ /* 0-4.2 ms of delay */ -++ delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000; -++ freezero(hash, len); -++ } -+ debug3_f("user specific delay %0.3lfms", delay/1000); -+ return MIN_FAIL_DELAY_SECONDS + delay; -+ } - diff --git a/channels.c b/channels.c - index b60d56c4..0e363c15 100644 - --- a/channels.c -@@ -209,14 +239,14 @@ - static void - channel_pre_open(struct ssh *ssh, Channel *c, - fd_set *readset, fd_set *writeset) --@@ -2120,22 +2147,32 @@ channel_check_window(struct ssh *ssh, Channel *c) -+@@ -2164,21 +2191,31 @@ channel_check_window(struct ssh *ssh, Channel *c) - - if (c->type == SSH_CHANNEL_OPEN && - !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) && - - ((c->local_window_max - c->local_window > - - c->local_maxpacket*3) || --+ ((ssh_packet_is_interactive(ssh) && --+ c->local_window_max - c->local_window > c->local_maxpacket*3) || -++ ((ssh_packet_is_interactive(ssh) && -++ c->local_window_max - c->local_window > c->local_maxpacket*3) || - c->local_window < c->local_window_max/2) && - c->local_consumed > 0) { - + u_int addition = 0; -@@ -235,9 +265,8 @@ - (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 || - - (r = sshpkt_put_u32(ssh, c->local_consumed)) != 0 || - + (r = sshpkt_put_u32(ssh, c->local_consumed + addition)) != 0 || -- (r = sshpkt_send(ssh)) != 0) { -- fatal_fr(r, "channel %i", c->self); -- } -+ (r = sshpkt_send(ssh)) != 0) -+ fatal_fr(r, "channel %d", c->self); - - debug2("channel %d: window %d sent adjust %d", c->self, - - c->local_window, c->local_consumed); - - c->local_window += c->local_consumed; -@@ -386,21 +415,45 @@ - index 69befa96..90b5f338 100644 - --- a/compat.c - +++ b/compat.c --@@ -149,6 +149,14 @@ compat_banner(struct ssh *ssh, const char *version) -- debug_f("match: %s pat %s compat 0x%08x", -+@@ -43,7 +43,7 @@ compat_datafellows(const char *version) -+ static u_int -+ compat_datafellows(const char *version) -+ { -+- int i; -++ int i, bugs = 0; -+ static struct { -+ char *pat; -+ int bugs; -+@@ -147,11 +147,26 @@ -+ if (match_pattern_list(version, check[i].pat, 0) == 1) { -+ debug("match: %s pat %s compat 0x%08x", - version, check[i].pat, check[i].bugs); -- ssh->compat = check[i].bugs; - + /* Check to see if the remote side is OpenSSH and not HPN */ --+ /* TODO: need to use new method to test for this */ - + if (strstr(version, "OpenSSH") != NULL) { - + if (strstr(version, "hpn") == NULL) { --+ ssh->compat |= SSH_BUG_LARGEWINDOW; -++ bugs |= SSH_BUG_LARGEWINDOW; - + debug("Remote is NON-HPN aware"); - + } - + } -- return; -+- return check[i].bugs; -++ bugs |= check[i].bugs; - } - } -+- debug("no match: %s", version); -+- return 0; -++ /* Check to see if the remote side is OpenSSH and not HPN */ -++ if (strstr(version, "OpenSSH") != NULL) { -++ if (strstr(version, "hpn") == NULL) { -++ bugs |= SSH_BUG_LARGEWINDOW; -++ debug("Remote is NON-HPN aware"); -++ } -++ } -++ if (bugs == 0) -++ debug("no match: %s", version); -++ return bugs; -+ } -+ -+ char * - diff --git a/compat.h b/compat.h - index c197fafc..ea2e17a7 100644 - --- a/compat.h -@@ -459,7 +512,7 @@ - @@ -890,6 +890,10 @@ kex_choose_conf(struct ssh *ssh) - int nenc, nmac, ncomp; - u_int mode, ctos, need, dh_need, authlen; -- int r, first_kex_follows; -+ int r, first_kex_follows = 0; - + int auth_flag = 0; - + - + auth_flag = packet_authentication_state(ssh); -@@ -553,7 +606,7 @@ - #define MAX_PACKETS (1U<<31) - static int - ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) --@@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) -+@@ -1317,7 +1336,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) - struct session_state *state = ssh->state; - int len, r, ms_remain; - fd_set *setp; -@@ -1035,19 +1088,6 @@ - - /* Minimum amount of data to read at a time */ - #define MIN_READ_SIZE 512 --diff --git a/ssh-keygen.c b/ssh-keygen.c --index cfb5f115..36a6e519 100644 ----- a/ssh-keygen.c --+++ b/ssh-keygen.c --@@ -2971,7 +2971,7 @@ do_download_sk(const char *skprovider, const char *device) -- freezero(pin, strlen(pin)); -- error_r(r, "Unable to load resident keys"); -- return -1; --- } --+ } -- if (nkeys == 0) -- logit("No keys to download"); -- if (pin != NULL) - diff --git a/ssh.c b/ssh.c - index 53330da5..27b9770e 100644 - --- a/ssh.c -@@ -1093,7 +1133,7 @@ - + else - + options.hpn_buffer_size = 2 * 1024 * 1024; - + --+ if (ssh->compat & SSH_BUG_LARGEWINDOW) { -++ if (ssh_compat_fellows(ssh, SSH_BUG_LARGEWINDOW)) { - + debug("HPN to Non-HPN Connection"); - + } else { - + int sock, socksize; -@@ -1335,7 +1375,29 @@ - /* Bind the socket to the desired port. */ - if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) { - error("Bind to port %s on %s failed: %.200s.", --@@ -1727,6 +1734,19 @@ main(int ac, char **av) -+@@ -1625,13 +1632,14 @@ -+ if (ssh_digest_update(ctx, sshbuf_ptr(server_cfg), -+ sshbuf_len(server_cfg)) != 0) -+ fatal_f("ssh_digest_update"); -+- len = ssh_digest_bytes(digest_alg); -+- hash = xmalloc(len); -+- if (ssh_digest_final(ctx, hash, len) != 0) -+- fatal_f("ssh_digest_final"); -+- options.timing_secret = PEEK_U64(hash); -+- freezero(hash, len); -+- ssh_digest_free(ctx); -++ if ((len = ssh_digest_bytes(digest_alg)) > 0) { -++ hash = xmalloc(len); -++ if (ssh_digest_final(ctx, hash, len) != 0) -++ fatal_f("ssh_digest_final"); -++ options.timing_secret = PEEK_U64(hash); -++ freezero(hash, len); -++ ssh_digest_free(ctx); -++ } -+ ctx = NULL; -+ return; -+ } -+@@ -1727,6 +1735,19 @@ main(int ac, char **av) - /* Fill in default values for those options not explicitly set. */ - fill_default_server_options(&options); - -@@ -1355,7 +1417,7 @@ - /* challenge-response is implemented via keyboard interactive */ - if (options.challenge_response_authentication) - options.kbd_interactive_authentication = 1; --@@ -2166,6 +2186,9 @@ main(int ac, char **av) -+@@ -2166,6 +2187,9 @@ main(int ac, char **av) - rdomain == NULL ? "" : "\""); - free(laddr); - -@@ -1365,7 +1427,7 @@ - /* - * We don't want to listen forever unless the other side - * successfully authenticates itself. So we set up an alarm which is --@@ -2343,6 +2366,12 @@ do_ssh2_kex(struct ssh *ssh) -+@@ -2343,6 +2367,12 @@ do_ssh2_kex(struct ssh *ssh) - struct kex *kex; - int r; - -@@ -1405,14 +1467,3 @@ - # Example of overriding settings on a per-user basis - #Match User anoncvs - # X11Forwarding no --diff --git a/version.h b/version.h --index 6b4fa372..332fb486 100644 ----- a/version.h --+++ b/version.h --@@ -3,4 +3,5 @@ -- #define SSH_VERSION "OpenSSH_8.5" -- -- #define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_HPN "-hpn15v2" --+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN -diff -ur a/openssh-8_5_P1-hpn-PeakTput-15.2.diff b/openssh-8_5_P1-hpn-PeakTput-15.2.diff ---- a/openssh-8_5_P1-hpn-PeakTput-15.2.diff 2021-04-23 15:31:47.247434467 -0700 -+++ b/openssh-8_5_P1-hpn-PeakTput-15.2.diff 2021-04-23 15:32:29.808508608 -0700 -@@ -12,9 +12,9 @@ - static long stalled; /* how long we have been stalled */ - static int bytes_per_second; /* current speed in bytes per second */ - @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update) -+ off_t bytes_left; - int cur_speed; -- int hours, minutes, seconds; -- int file_len; -+ int len; - + off_t delta_pos; - - if ((!force_update && !alarm_fired && !win_resized) || !can_output()) -@@ -30,15 +30,17 @@ - if (bytes_left > 0) - elapsed = now - last_update; - else { --@@ -166,7 +173,7 @@ refresh_progress_meter(int force_update) -- -+@@ -166,8 +173,8 @@ refresh_progress_meter(int force_update) -+ buf[1] = '\0'; -+ - /* filename */ -- buf[0] = '\0'; --- file_len = win_size - 36; --+ file_len = win_size - 45; -- if (file_len > 0) { -- buf[0] = '\r'; -- snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s", -+- if (win_size > 36) { -++ if (win_size > 45) { -+- int file_len = win_size - 36; -++ int file_len = win_size - 45; -+ snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ", -+ file_len, file); -+ } - @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update) - (off_t)bytes_per_second); - strlcat(buf, "/s ", win_size); -@@ -63,15 +65,3 @@ - } - - /*ARGSUSED*/ --diff --git a/ssh-keygen.c b/ssh-keygen.c --index cfb5f115..986ff59b 100644 ----- a/ssh-keygen.c --+++ b/ssh-keygen.c --@@ -2959,7 +2959,6 @@ do_download_sk(const char *skprovider, const char *device) -- -- if (skprovider == NULL) -- fatal("Cannot download keys without provider"); --- -- pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN); -- if (!quiet) { -- printf("You may need to touch your authenticator " diff --git a/net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-glue.patch b/net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-glue.patch deleted file mode 100644 index 30c0252ccb55..000000000000 --- a/net-misc/openssh/files/openssh-8.6_p1-hpn-15.2-glue.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --exclude '*.un~' -ubr a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff ---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-04-19 13:36:51.659996653 -0700 -+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-04-19 13:42:23.302377465 -0700 -@@ -536,18 +536,10 @@ - if (state->rekey_limit) - *max_blocks = MINIMUM(*max_blocks, - state->rekey_limit / enc->block_size); --@@ -954,6 +963,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode) -+@@ -954,6 +963,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode) - return 0; - } - --+/* this supports the forced rekeying required for the NONE cipher */ --+int rekey_requested = 0; --+void --+packet_request_rekeying(void) --+{ --+ rekey_requested = 1; --+} --+ - +/* used to determine if pre or post auth when rekeying for aes-ctr - + * and none cipher switch */ - +int -@@ -561,20 +553,6 @@ - #define MAX_PACKETS (1U<<31) - static int - ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) --@@ -980,6 +1007,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) -- if (state->p_send.packets == 0 && state->p_read.packets == 0) -- return 0; -- --+ /* used to force rekeying when called for by the none --+ * cipher switch methods -cjr */ --+ if (rekey_requested == 1) { --+ rekey_requested = 0; --+ return 1; --+ } --+ -- /* Time-based rekeying */ -- if (state->rekey_interval != 0 && -- (int64_t)state->rekey_time + state->rekey_interval <= monotime()) - @@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) - struct session_state *state = ssh->state; - int len, r, ms_remain; -@@ -598,12 +576,11 @@ - }; - - typedef int (ssh_packet_hook_fn)(struct ssh *, struct sshbuf *, --@@ -155,6 +158,10 @@ int ssh_packet_inc_alive_timeouts(struct ssh *); -+@@ -155,6 +158,9 @@ int ssh_packet_inc_alive_timeouts(struct ssh *); - int ssh_packet_set_maxsize(struct ssh *, u_int); - u_int ssh_packet_get_maxsize(struct ssh *); - - +/* for forced packet rekeying post auth */ --+void packet_request_rekeying(void); - +int packet_authentication_state(const struct ssh *); - + - int ssh_packet_get_state(struct ssh *, struct sshbuf *); -@@ -627,9 +604,9 @@ - oLocalCommand, oPermitLocalCommand, oRemoteCommand, - + oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize, - + oNoneEnabled, oNoneMacEnabled, oNoneSwitch, -+ oDisableMTAES, - oVisualHostKey, - oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, -- oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, - @@ -297,6 +300,9 @@ static struct { - { "kexalgorithms", oKexAlgorithms }, - { "ipqos", oIPQoS }, -@@ -778,9 +755,9 @@ - int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ - SyslogFacility log_facility; /* Facility for system logging. */ - @@ -120,7 +124,11 @@ typedef struct { -- - int enable_ssh_keysign; - int64_t rekey_limit; -+ int disable_multithreaded; /*disable multithreaded aes-ctr*/ - + int none_switch; /* Use none cipher */ - + int none_enabled; /* Allow none cipher to be used */ - + int nonemac_enabled; /* Allow none MAC to be used */ -@@ -842,9 +819,9 @@ - /* Portable-specific options */ - if (options->use_pam == -1) - @@ -424,6 +434,49 @@ fill_default_server_options(ServerOptions *options) -- } -- if (options->permit_tun == -1) - options->permit_tun = SSH_TUNMODE_NO; -+ if (options->disable_multithreaded == -1) -+ options->disable_multithreaded = 0; - + if (options->none_enabled == -1) - + options->none_enabled = 0; - + if (options->nonemac_enabled == -1) -@@ -1047,17 +1024,17 @@ - Note that - diff --git a/sftp.c b/sftp.c - index fb3c08d1..89bebbb2 100644 ----- a/sftp.c --+++ b/sftp.c --@@ -71,7 +71,7 @@ typedef void EditLine; -- #include "sftp-client.h" -- -- #define DEFAULT_COPY_BUFLEN 32768 /* Size of buffer for up/download */ ---#define DEFAULT_NUM_REQUESTS 64 /* # concurrent outstanding requests */ --+#define DEFAULT_NUM_REQUESTS 256 /* # concurrent outstanding requests */ -+--- a/sftp-client.c -++++ b/sftp-client.c -+@@ -65,7 +65,7 @@ typedef void EditLine; -+ #define DEFAULT_COPY_BUFLEN 32768 -+ -+ /* Default number of concurrent outstanding requests */ -+-#define DEFAULT_NUM_REQUESTS 64 -++#define DEFAULT_NUM_REQUESTS 256 - -- /* File to read commands from */ -- FILE* infile; -+ /* Minimum amount of data to read at a time */ -+ #define MIN_READ_SIZE 512 - diff --git a/ssh-keygen.c b/ssh-keygen.c - index cfb5f115..36a6e519 100644 - --- a/ssh-keygen.c -@@ -1330,9 +1307,9 @@ - + } - + } - + -- debug("Authentication succeeded (%s).", authctxt.method->name); -- } - -+ #ifdef WITH_OPENSSL -+ if (options.disable_multithreaded == 0) { - diff --git a/sshd.c b/sshd.c - index 6277e6d6..d66fa41a 100644 - --- a/sshd.c diff --git a/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.1.patch b/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.1.patch deleted file mode 100644 index be88d11ba803..000000000000 --- a/net-misc/openssh/files/openssh-8.7_p1-X509-glue-13.2.1.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/openssh-8.7p1+x509-13.2.1.diff 2021-09-08 14:20:40.750542472 -0700 -+++ b/openssh-8.7p1+x509-13.2.1.diff 2021-09-08 14:21:23.354736098 -0700 -@@ -51194,12 +51194,11 @@ - - install-files: - $(MKDIR_P) $(DESTDIR)$(bindir) --@@ -391,6 +368,8 @@ -+@@ -391,6 +368,7 @@ - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - $(MKDIR_P) $(DESTDIR)$(libexecdir) - + $(MKDIR_P) $(DESTDIR)$(sshcadir) --+ $(MKDIR_P) $(DESTDIR)$(piddir) - $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) -@@ -70464,9 +70463,9 @@ - - +# cross-project configuration - +if test "$sshd_type" = "pkix" ; then --+ unset_arg='' -++ unset_arg= - +else --+ unset_arg=none -++ unset_arg= - +fi - + - cat > $OBJ/sshd_config.i << _EOF -@@ -132131,16 +132130,6 @@ - +int asnmprintf(char **, size_t, int *, const char *, ...) - __attribute__((format(printf, 4, 5))); - void msetlocale(void); --diff -ruN openssh-8.7p1/version.h openssh-8.7p1+x509-13.2.1/version.h ----- openssh-8.7p1/version.h 2021-08-20 07:03:49.000000000 +0300 --+++ openssh-8.7p1+x509-13.2.1/version.h 2021-09-08 21:07:00.000000000 +0300 --@@ -2,5 +2,4 @@ -- -- #define SSH_VERSION "OpenSSH_8.7" -- ---#define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-8.7p1/version.m4 openssh-8.7p1+x509-13.2.1/version.m4 - --- openssh-8.7p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-8.7p1+x509-13.2.1/version.m4 2021-09-08 21:07:00.000000000 +0300 diff --git a/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-X509-glue.patch b/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-X509-glue.patch deleted file mode 100644 index 49c05917779a..000000000000 --- a/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-X509-glue.patch +++ /dev/null @@ -1,447 +0,0 @@ -diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff ---- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-08-31 11:12:46.412119817 -0700 -+++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-08-31 11:26:11.116026151 -0700 -@@ -3,9 +3,9 @@ - --- a/Makefile.in - +++ b/Makefile.in - @@ -46,7 +46,7 @@ CFLAGS=@CFLAGS@ -- CFLAGS_NOPIE=@CFLAGS_NOPIE@ -- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ -- PICFLAG=@PICFLAG@ -+ LD=@LD@ -+ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA) -+ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ - -LIBS=@LIBS@ - +LIBS=@LIBS@ -lpthread - K5LIBS=@K5LIBS@ -@@ -803,8 +803,8 @@ - ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out) - { - struct session_state *state; --- const struct sshcipher *none = cipher_by_name("none"); --+ struct sshcipher *none = cipher_by_name("none"); -+- const struct sshcipher *none = cipher_none(); -++ struct sshcipher *none = cipher_none(); - int r; - - if (none == NULL) { -@@ -894,24 +894,24 @@ - intptr = &options->compression; - multistate_ptr = multistate_compression; - @@ -2272,6 +2278,7 @@ initialize_options(Options * options) -- options->revoked_host_keys = NULL; - options->fingerprint_hash = -1; - options->update_hostkeys = -1; -+ options->known_hosts_command = NULL; - + options->disable_multithreaded = -1; -- options->hostbased_accepted_algos = NULL; -- options->pubkey_accepted_algos = NULL; -- options->known_hosts_command = NULL; -+ } -+ -+ /* - @@ -2467,6 +2474,10 @@ fill_default_options(Options * options) -+ options->update_hostkeys = 0; - if (options->sk_provider == NULL) - options->sk_provider = xstrdup("$SSH_SK_PROVIDER"); -- #endif - + if (options->update_hostkeys == -1) - + options->update_hostkeys = 0; - + if (options->disable_multithreaded == -1) - + options->disable_multithreaded = 0; - -- /* Expand KEX name lists */ -- all_cipher = cipher_alg_list(',', 0); -+ /* expand KEX and etc. name lists */ -+ { char *all; - diff --git a/readconf.h b/readconf.h - index 2fba866e..7f8f0227 100644 - --- a/readconf.h -@@ -950,9 +950,9 @@ - /* Portable-specific options */ - sUsePAM, - + sDisableMTAES, -- /* Standard Options */ -- sPort, sHostKeyFile, sLoginGraceTime, -- sPermitRootLogin, sLogFacility, sLogLevel, sLogVerbose, -+ /* X.509 Standard Options */ -+ sHostbasedAlgorithms, -+ sPubkeyAlgorithms, - @@ -662,6 +666,7 @@ static struct { - { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL }, - { "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL }, -diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff ---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-08-31 11:12:46.412119817 -0700 -+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-08-31 14:17:59.366248683 -0700 -@@ -157,6 +157,36 @@ - + Allan Jude provided the code for the NoneMac and buffer normalization. - + This work was financed, in part, by Cisco System, Inc., the National - + Library of Medicine, and the National Science Foundation. -+diff --git a/auth2.c b/auth2.c -+--- a/auth2.c 2021-03-15 19:30:45.404060786 -0700 -++++ b/auth2.c 2021-03-15 19:37:22.078476597 -0700 -+@@ -229,16 +229,17 @@ -+ double delay; -+ -+ digest_alg = ssh_digest_maxbytes(); -+- len = ssh_digest_bytes(digest_alg); -+- hash = xmalloc(len); -++ if (len = ssh_digest_bytes(digest_alg) > 0) { -++ hash = xmalloc(len); -+ -+- (void)snprintf(b, sizeof b, "%llu%s", -+- (unsigned long long)options.timing_secret, user); -+- if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0) -+- fatal_f("ssh_digest_memory"); -+- /* 0-4.2 ms of delay */ -+- delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000; -+- freezero(hash, len); -++ (void)snprintf(b, sizeof b, "%llu%s", -++ (unsigned long long)options.timing_secret, user); -++ if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0) -++ fatal_f("ssh_digest_memory"); -++ /* 0-4.2 ms of delay */ -++ delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000; -++ freezero(hash, len); -++ } -+ debug3_f("user specific delay %0.3lfms", delay/1000); -+ return MIN_FAIL_DELAY_SECONDS + delay; -+ } - diff --git a/channels.c b/channels.c - index b60d56c4..0e363c15 100644 - --- a/channels.c -@@ -209,14 +239,14 @@ - static void - channel_pre_open(struct ssh *ssh, Channel *c, - fd_set *readset, fd_set *writeset) --@@ -2120,22 +2147,32 @@ channel_check_window(struct ssh *ssh, Channel *c) -+@@ -2164,21 +2191,31 @@ channel_check_window(struct ssh *ssh, Channel *c) - - if (c->type == SSH_CHANNEL_OPEN && - !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) && - - ((c->local_window_max - c->local_window > - - c->local_maxpacket*3) || --+ ((ssh_packet_is_interactive(ssh) && --+ c->local_window_max - c->local_window > c->local_maxpacket*3) || -++ ((ssh_packet_is_interactive(ssh) && -++ c->local_window_max - c->local_window > c->local_maxpacket*3) || - c->local_window < c->local_window_max/2) && - c->local_consumed > 0) { - + u_int addition = 0; -@@ -235,9 +265,8 @@ - (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 || - - (r = sshpkt_put_u32(ssh, c->local_consumed)) != 0 || - + (r = sshpkt_put_u32(ssh, c->local_consumed + addition)) != 0 || -- (r = sshpkt_send(ssh)) != 0) { -- fatal_fr(r, "channel %i", c->self); -- } -+ (r = sshpkt_send(ssh)) != 0) -+ fatal_fr(r, "channel %d", c->self); - - debug2("channel %d: window %d sent adjust %d", c->self, - - c->local_window, c->local_consumed); - - c->local_window += c->local_consumed; -@@ -337,70 +366,92 @@ - index 70f492f8..5503af1d 100644 - --- a/clientloop.c - +++ b/clientloop.c --@@ -1578,9 +1578,11 @@ client_request_x11(struct ssh *ssh, const char *request_type, int rchan) -+@@ -1578,10 +1578,11 @@ client_request_x11(struct ssh *ssh, const char *request_type, int rchan) - sock = x11_connect_display(ssh); - if (sock < 0) - return NULL; - - c = channel_new(ssh, "x11", - - SSH_CHANNEL_X11_OPEN, sock, sock, -1, --- CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); --+ c = channel_new(ssh, "x11", --+ SSH_CHANNEL_X11_OPEN, sock, sock, -1, --+ /* again is this really necessary for X11? */ --+ options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size, --+ CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); -+- CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", -+- CHANNEL_NONBLOCK_SET); -++ c = channel_new(ssh, "x11", -++ SSH_CHANNEL_X11_OPEN, sock, sock, -1, -++ /* again is this really necessary for X11? */ -++ options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size, -++ CHAN_X11_PACKET_DEFAULT, 0, "x11", CHANNEL_NONBLOCK_SET); - c->force_drain = 1; - return c; - } --@@ -1608,9 +1610,10 @@ client_request_agent(struct ssh *ssh, const char *request_type, int rchan) -+@@ -1608,9 +1609,10 @@ client_request_agent(struct ssh *ssh, const char *request_type, int rchan) - return NULL; - } - c = channel_new(ssh, "authentication agent connection", - - SSH_CHANNEL_OPEN, sock, sock, -1, - - CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, --- "authentication agent connection", 1); --+ SSH_CHANNEL_OPEN, sock, sock, -1, --+ options.hpn_disabled ? CHAN_X11_WINDOW_DEFAULT : options.hpn_buffer_size, --+ CHAN_TCP_PACKET_DEFAULT, 0, --+ "authentication agent connection", 1); -+- "authentication agent connection", CHANNEL_NONBLOCK_SET); -++ SSH_CHANNEL_OPEN, sock, sock, -1, -++ options.hpn_disabled ? CHAN_X11_WINDOW_DEFAULT : options.hpn_buffer_size, -++ CHAN_TCP_PACKET_DEFAULT, 0, -++ "authentication agent connection", CHANNEL_NONBLOCK_SET); - c->force_drain = 1; - return c; - } --@@ -1635,10 +1638,13 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode, -+@@ -1635,9 +1637,9 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode, - } - debug("Tunnel forwarding using interface %s", ifname); - - - c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1, --- CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); --+ c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1, -+- CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", -+- CHANNEL_NONBLOCK_SET); -++ c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1, - + options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size, --+ CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); -++ CHAN_TCP_PACKET_DEFAULT, 0, "tun", CHANNEL_NONBLOCK_SET); - c->datagram = 1; - --+ --+ - #if defined(SSH_TUN_FILTER) -- if (options.tun_open == SSH_TUNMODE_POINTOPOINT) -- channel_register_filter(ssh, c->self, sys_tun_infilter, - diff --git a/compat.c b/compat.c - index 69befa96..90b5f338 100644 - --- a/compat.c - +++ b/compat.c --@@ -149,6 +149,14 @@ compat_banner(struct ssh *ssh, const char *version) -- debug_f("match: %s pat %s compat 0x%08x", -+@@ -43,7 +43,7 @@ compat_datafellows(const char *version) -+ static u_int -+ compat_datafellows(const char *version) -+ { -+- int i; -++ int i, bugs = 0; -+ static struct { -+ char *pat; -+ int bugs; -+@@ -147,11 +147,26 @@ -+ if (match_pattern_list(version, check[i].pat, 0) == 1) { -+ debug("match: %s pat %s compat 0x%08x", - version, check[i].pat, check[i].bugs); -- ssh->compat = check[i].bugs; - + /* Check to see if the remote side is OpenSSH and not HPN */ --+ /* TODO: need to use new method to test for this */ - + if (strstr(version, "OpenSSH") != NULL) { - + if (strstr(version, "hpn") == NULL) { --+ ssh->compat |= SSH_BUG_LARGEWINDOW; -++ bugs |= SSH_BUG_LARGEWINDOW; - + debug("Remote is NON-HPN aware"); - + } - + } -- return; -+- return check[i].bugs; -++ bugs |= check[i].bugs; - } - } -+- debug("no match: %s", version); -+- return 0; -++ /* Check to see if the remote side is OpenSSH and not HPN */ -++ if (strstr(version, "OpenSSH") != NULL) { -++ if (strstr(version, "hpn") == NULL) { -++ bugs |= SSH_BUG_LARGEWINDOW; -++ debug("Remote is NON-HPN aware"); -++ } -++ } -++ if (bugs == 0) -++ debug("no match: %s", version); -++ return bugs; -+ } -+ -+ char * - diff --git a/compat.h b/compat.h - index c197fafc..ea2e17a7 100644 - --- a/compat.h -@@ -459,7 +510,7 @@ - @@ -890,6 +890,10 @@ kex_choose_conf(struct ssh *ssh) - int nenc, nmac, ncomp; - u_int mode, ctos, need, dh_need, authlen; -- int r, first_kex_follows; -+ int r, first_kex_follows = 0; - + int auth_flag = 0; - + - + auth_flag = packet_authentication_state(ssh); -@@ -553,7 +604,7 @@ - #define MAX_PACKETS (1U<<31) - static int - ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) --@@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) -+@@ -1317,7 +1336,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) - struct session_state *state = ssh->state; - int len, r, ms_remain; - fd_set *setp; -@@ -1035,19 +1086,6 @@ - - /* Minimum amount of data to read at a time */ - #define MIN_READ_SIZE 512 --diff --git a/ssh-keygen.c b/ssh-keygen.c --index cfb5f115..36a6e519 100644 ----- a/ssh-keygen.c --+++ b/ssh-keygen.c --@@ -2971,7 +2971,7 @@ do_download_sk(const char *skprovider, const char *device) -- freezero(pin, strlen(pin)); -- error_r(r, "Unable to load resident keys"); -- return -1; --- } --+ } -- if (nkeys == 0) -- logit("No keys to download"); -- if (pin != NULL) - diff --git a/ssh.c b/ssh.c - index 53330da5..27b9770e 100644 - --- a/ssh.c -@@ -1093,7 +1131,7 @@ - + else - + options.hpn_buffer_size = 2 * 1024 * 1024; - + --+ if (ssh->compat & SSH_BUG_LARGEWINDOW) { -++ if (ssh_compat_fellows(ssh, SSH_BUG_LARGEWINDOW)) { - + debug("HPN to Non-HPN Connection"); - + } else { - + int sock, socksize; -@@ -1157,14 +1195,14 @@ - } - @@ -2089,6 +2167,11 @@ ssh_session2_open(struct ssh *ssh) - window, packetmax, CHAN_EXTENDED_WRITE, -- "client-session", /*nonblock*/0); -+ "client-session", CHANNEL_NONBLOCK_STDIO); - - + if ((options.tcp_rcv_buf_poll > 0) && !options.hpn_disabled) { - + c->dynamic_window = 1; - + debug("Enabled Dynamic Window Scaling"); - + } - + -- debug3_f("channel_new: %d", c->self); -+ debug2_f("channel %d", c->self); - - channel_send_open(ssh, c->self); - @@ -2105,6 +2188,13 @@ ssh_session2(struct ssh *ssh, const struct ssh_conn_info *cinfo) -@@ -1335,7 +1373,29 @@ - /* Bind the socket to the desired port. */ - if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) { - error("Bind to port %s on %s failed: %.200s.", --@@ -1727,6 +1734,19 @@ main(int ac, char **av) -+@@ -1625,13 +1632,14 @@ -+ if (ssh_digest_update(ctx, sshbuf_ptr(server_cfg), -+ sshbuf_len(server_cfg)) != 0) -+ fatal_f("ssh_digest_update"); -+- len = ssh_digest_bytes(digest_alg); -+- hash = xmalloc(len); -+- if (ssh_digest_final(ctx, hash, len) != 0) -+- fatal_f("ssh_digest_final"); -+- options.timing_secret = PEEK_U64(hash); -+- freezero(hash, len); -+- ssh_digest_free(ctx); -++ if ((len = ssh_digest_bytes(digest_alg)) > 0) { -++ hash = xmalloc(len); -++ if (ssh_digest_final(ctx, hash, len) != 0) -++ fatal_f("ssh_digest_final"); -++ options.timing_secret = PEEK_U64(hash); -++ freezero(hash, len); -++ ssh_digest_free(ctx); -++ } -+ ctx = NULL; -+ return; -+ } -+@@ -1727,6 +1735,19 @@ main(int ac, char **av) - fatal("AuthorizedPrincipalsCommand set without " - "AuthorizedPrincipalsCommandUser"); - -@@ -1355,7 +1415,7 @@ - /* - * Check whether there is any path through configured auth methods. - * Unfortunately it is not possible to verify this generally before --@@ -2166,6 +2186,9 @@ main(int ac, char **av) -+@@ -2166,6 +2187,9 @@ main(int ac, char **av) - rdomain == NULL ? "" : "\""); - free(laddr); - -@@ -1365,7 +1425,7 @@ - /* - * We don't want to listen forever unless the other side - * successfully authenticates itself. So we set up an alarm which is --@@ -2343,6 +2366,12 @@ do_ssh2_kex(struct ssh *ssh) -+@@ -2343,6 +2367,12 @@ do_ssh2_kex(struct ssh *ssh) - struct kex *kex; - int r; - -@@ -1405,14 +1465,3 @@ - # Example of overriding settings on a per-user basis - #Match User anoncvs - # X11Forwarding no --diff --git a/version.h b/version.h --index 6b4fa372..332fb486 100644 ----- a/version.h --+++ b/version.h --@@ -3,4 +3,5 @@ -- #define SSH_VERSION "OpenSSH_8.5" -- -- #define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_HPN "-hpn15v2" --+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN -diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-PeakTput-15.2.diff b/openssh-8_5_P1-hpn-PeakTput-15.2.diff ---- a/openssh-8_5_P1-hpn-PeakTput-15.2.diff 2021-08-31 11:12:16.778011216 -0700 -+++ b/openssh-8_5_P1-hpn-PeakTput-15.2.diff 2021-08-31 11:13:11.573211934 -0700 -@@ -12,9 +12,9 @@ - static long stalled; /* how long we have been stalled */ - static int bytes_per_second; /* current speed in bytes per second */ - @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update) -+ off_t bytes_left; - int cur_speed; -- int hours, minutes, seconds; -- int file_len; -+ int len; - + off_t delta_pos; - - if ((!force_update && !alarm_fired && !win_resized) || !can_output()) -@@ -30,15 +30,17 @@ - if (bytes_left > 0) - elapsed = now - last_update; - else { --@@ -166,7 +173,7 @@ refresh_progress_meter(int force_update) -- -+@@ -166,8 +173,8 @@ refresh_progress_meter(int force_update) -+ buf[1] = '\0'; -+ - /* filename */ -- buf[0] = '\0'; --- file_len = win_size - 36; --+ file_len = win_size - 45; -- if (file_len > 0) { -- buf[0] = '\r'; -- snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s", -+- if (win_size > 36) { -++ if (win_size > 45) { -+- int file_len = win_size - 36; -++ int file_len = win_size - 45; -+ snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ", -+ file_len, file); -+ } - @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update) - (off_t)bytes_per_second); - strlcat(buf, "/s ", win_size); -@@ -63,15 +65,3 @@ - } - - /*ARGSUSED*/ --diff --git a/ssh-keygen.c b/ssh-keygen.c --index cfb5f115..986ff59b 100644 ----- a/ssh-keygen.c --+++ b/ssh-keygen.c --@@ -2959,7 +2959,6 @@ do_download_sk(const char *skprovider, const char *device) -- -- if (skprovider == NULL) -- fatal("Cannot download keys without provider"); --- -- pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN); -- if (!quiet) { -- printf("You may need to touch your authenticator " diff --git a/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-glue.patch b/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-glue.patch deleted file mode 100644 index 309e57e88643..000000000000 --- a/net-misc/openssh/files/openssh-8.7_p1-hpn-15.2-glue.patch +++ /dev/null @@ -1,198 +0,0 @@ -diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff ---- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-08-20 11:49:32.351767063 -0700 -+++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2021-08-20 11:58:08.746214945 -0700 -@@ -1026,9 +1026,9 @@ - + } - +#endif - + -- debug("Authentication succeeded (%s).", authctxt.method->name); -- } -- -+ if (ssh_packet_connection_is_on_socket(ssh)) { -+ verbose("Authenticated to %s ([%s]:%d) using \"%s\".", host, -+ ssh_remote_ipaddr(ssh), ssh_remote_port(ssh), - diff --git a/sshd.c b/sshd.c - index 6277e6d6..bf3d6e4a 100644 - --- a/sshd.c -diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff ---- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-08-20 11:49:32.351767063 -0700 -+++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2021-08-20 12:04:45.008038085 -0700 -@@ -536,18 +536,10 @@ - if (state->rekey_limit) - *max_blocks = MINIMUM(*max_blocks, - state->rekey_limit / enc->block_size); --@@ -954,6 +963,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode) -+@@ -954,6 +963,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode) - return 0; - } - --+/* this supports the forced rekeying required for the NONE cipher */ --+int rekey_requested = 0; --+void --+packet_request_rekeying(void) --+{ --+ rekey_requested = 1; --+} --+ - +/* used to determine if pre or post auth when rekeying for aes-ctr - + * and none cipher switch */ - +int -@@ -561,20 +553,6 @@ - #define MAX_PACKETS (1U<<31) - static int - ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) --@@ -980,6 +1007,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) -- if (state->p_send.packets == 0 && state->p_read.packets == 0) -- return 0; -- --+ /* used to force rekeying when called for by the none --+ * cipher switch methods -cjr */ --+ if (rekey_requested == 1) { --+ rekey_requested = 0; --+ return 1; --+ } --+ -- /* Time-based rekeying */ -- if (state->rekey_interval != 0 && -- (int64_t)state->rekey_time + state->rekey_interval <= monotime()) - @@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) - struct session_state *state = ssh->state; - int len, r, ms_remain; -@@ -598,12 +576,11 @@ - }; - - typedef int (ssh_packet_hook_fn)(struct ssh *, struct sshbuf *, --@@ -155,6 +158,10 @@ int ssh_packet_inc_alive_timeouts(struct ssh *); -+@@ -155,6 +158,9 @@ int ssh_packet_inc_alive_timeouts(struct ssh *); - int ssh_packet_set_maxsize(struct ssh *, u_int); - u_int ssh_packet_get_maxsize(struct ssh *); - - +/* for forced packet rekeying post auth */ --+void packet_request_rekeying(void); - +int packet_authentication_state(const struct ssh *); - + - int ssh_packet_get_state(struct ssh *, struct sshbuf *); -@@ -627,9 +604,9 @@ - oLocalCommand, oPermitLocalCommand, oRemoteCommand, - + oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize, - + oNoneEnabled, oNoneMacEnabled, oNoneSwitch, -+ oDisableMTAES, - oVisualHostKey, - oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, -- oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, - @@ -297,6 +300,9 @@ static struct { - { "kexalgorithms", oKexAlgorithms }, - { "ipqos", oIPQoS }, -@@ -637,9 +614,9 @@ - + { "noneenabled", oNoneEnabled }, - + { "nonemacenabled", oNoneMacEnabled }, - + { "noneswitch", oNoneSwitch }, -- { "proxyusefdpass", oProxyUseFdpass }, -- { "canonicaldomains", oCanonicalDomains }, -- { "canonicalizefallbacklocal", oCanonicalizeFallbackLocal }, -+ { "sessiontype", oSessionType }, -+ { "stdinnull", oStdinNull }, -+ { "forkafterauthentication", oForkAfterAuthentication }, - @@ -317,6 +323,11 @@ static struct { - { "securitykeyprovider", oSecurityKeyProvider }, - { "knownhostscommand", oKnownHostsCommand }, -@@ -717,9 +694,9 @@ - + options->hpn_buffer_size = -1; - + options->tcp_rcv_buf_poll = -1; - + options->tcp_rcv_buf = -1; -- options->proxy_use_fdpass = -1; -- options->ignored_unknown = NULL; -- options->num_canonical_domains = 0; -+ options->session_type = -1; -+ options->stdin_null = -1; -+ options->fork_after_authentication = -1; - @@ -2426,6 +2484,41 @@ fill_default_options(Options * options) - options->server_alive_interval = 0; - if (options->server_alive_count_max == -1) -@@ -778,9 +755,9 @@ - int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ - SyslogFacility log_facility; /* Facility for system logging. */ - @@ -120,7 +124,11 @@ typedef struct { -- - int enable_ssh_keysign; - int64_t rekey_limit; -+ int disable_multithreaded; /*disable multithreaded aes-ctr*/ - + int none_switch; /* Use none cipher */ - + int none_enabled; /* Allow none cipher to be used */ - + int nonemac_enabled; /* Allow none MAC to be used */ -@@ -842,9 +819,9 @@ - /* Portable-specific options */ - if (options->use_pam == -1) - @@ -424,6 +434,49 @@ fill_default_server_options(ServerOptions *options) -- } -- if (options->permit_tun == -1) - options->permit_tun = SSH_TUNMODE_NO; -+ if (options->disable_multithreaded == -1) -+ options->disable_multithreaded = 0; - + if (options->none_enabled == -1) - + options->none_enabled = 0; - + if (options->nonemac_enabled == -1) -@@ -1047,17 +1024,17 @@ - Note that - diff --git a/sftp.c b/sftp.c - index fb3c08d1..89bebbb2 100644 ----- a/sftp.c --+++ b/sftp.c --@@ -71,7 +71,7 @@ typedef void EditLine; -- #include "sftp-client.h" -- -- #define DEFAULT_COPY_BUFLEN 32768 /* Size of buffer for up/download */ ---#define DEFAULT_NUM_REQUESTS 64 /* # concurrent outstanding requests */ --+#define DEFAULT_NUM_REQUESTS 256 /* # concurrent outstanding requests */ -+--- a/sftp-client.c -++++ b/sftp-client.c -+@@ -65,7 +65,7 @@ typedef void EditLine; -+ #define DEFAULT_COPY_BUFLEN 32768 -+ -+ /* Default number of concurrent outstanding requests */ -+-#define DEFAULT_NUM_REQUESTS 64 -++#define DEFAULT_NUM_REQUESTS 256 - -- /* File to read commands from */ -- FILE* infile; -+ /* Minimum amount of data to read at a time */ -+ #define MIN_READ_SIZE 512 - diff --git a/ssh-keygen.c b/ssh-keygen.c - index cfb5f115..36a6e519 100644 - --- a/ssh-keygen.c -@@ -1330,9 +1307,9 @@ - + } - + } - + -- debug("Authentication succeeded (%s).", authctxt.method->name); -- } - -+ #ifdef WITH_OPENSSL -+ if (options.disable_multithreaded == 0) { - diff --git a/sshd.c b/sshd.c - index 6277e6d6..d66fa41a 100644 - --- a/sshd.c -@@ -1359,8 +1336,8 @@ - if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) { - error("Bind to port %s on %s failed: %.200s.", - @@ -1727,6 +1734,19 @@ main(int ac, char **av) -- /* Fill in default values for those options not explicitly set. */ -- fill_default_server_options(&options); -+ fatal("AuthorizedPrincipalsCommand set without " -+ "AuthorizedPrincipalsCommandUser"); - - + if (options.none_enabled == 1) { - + char *old_ciphers = options.ciphers; -@@ -1375,9 +1352,9 @@ - + } - + } - + -- /* challenge-response is implemented via keyboard interactive */ -- if (options.challenge_response_authentication) -- options.kbd_interactive_authentication = 1; -+ /* -+ * Check whether there is any path through configured auth methods. -+ * Unfortunately it is not possible to verify this generally before - @@ -2166,6 +2186,9 @@ main(int ac, char **av) - rdomain == NULL ? "" : "\""); - free(laddr); diff --git a/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch b/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch deleted file mode 100644 index b6827623cd66..000000000000 --- a/net-misc/openssh/files/openssh-8.8_p1-X509-glue-13.2.3.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -ur '--exclude=.*.un~' a/openssh-8.8p1+x509-13.2.3.diff b/openssh-8.8p1+x509-13.2.3.diff ---- a/openssh-8.8p1+x509-13.2.3.diff 2021-10-29 14:59:17.070546984 -0700 -+++ b/openssh-8.8p1+x509-13.2.3.diff 2021-10-29 14:59:55.086664489 -0700 -@@ -954,15 +954,16 @@ - char b[512]; - - size_t len = ssh_digest_bytes(SSH_DIGEST_SHA512); - - u_char *hash = xmalloc(len); -+- double delay; - + int digest_alg; - + size_t len; - + u_char *hash; -- double delay; -- -++ double delay = 0; -++ - + digest_alg = ssh_digest_maxbytes(); - + len = ssh_digest_bytes(digest_alg); - + hash = xmalloc(len); --+ -+ - (void)snprintf(b, sizeof b, "%llu%s", - (unsigned long long)options.timing_secret, user); - - if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0) -@@ -51859,12 +51860,11 @@ - - install-files: - $(MKDIR_P) $(DESTDIR)$(bindir) --@@ -391,6 +372,8 @@ -+@@ -391,6 +372,7 @@ - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - $(MKDIR_P) $(DESTDIR)$(libexecdir) - + $(MKDIR_P) $(DESTDIR)$(sshcadir) --+ $(MKDIR_P) $(DESTDIR)$(piddir) - $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) -@@ -71985,7 +71985,7 @@ - +if test "$sshd_type" = "pkix" ; then - + unset_arg='' - +else --+ unset_arg=none -++ unset_arg= - +fi - + - cat > $OBJ/sshd_config.i << _EOF -@@ -132360,16 +132360,6 @@ - +int asnmprintf(char **, size_t, int *, const char *, ...) - __attribute__((format(printf, 4, 5))); - void msetlocale(void); --diff -ruN openssh-8.8p1/version.h openssh-8.8p1+x509-13.2.3/version.h ----- openssh-8.8p1/version.h 2021-09-26 17:03:19.000000000 +0300 --+++ openssh-8.8p1+x509-13.2.3/version.h 2021-10-23 16:27:00.000000000 +0300 --@@ -2,5 +2,4 @@ -- -- #define SSH_VERSION "OpenSSH_8.8" -- ---#define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-8.8p1/version.m4 openssh-8.8p1+x509-13.2.3/version.m4 - --- openssh-8.8p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-8.8p1+x509-13.2.3/version.m4 2021-10-23 16:27:00.000000000 +0300 diff --git a/net-misc/openssh/files/openssh-9.3_p1-disable-conch-interop-tests.patch b/net-misc/openssh/files/openssh-9.3_p1-disable-conch-interop-tests.patch new file mode 100644 index 000000000000..a5647ce9d8d3 --- /dev/null +++ b/net-misc/openssh/files/openssh-9.3_p1-disable-conch-interop-tests.patch @@ -0,0 +1,20 @@ +Disable conch interop tests which are failing when called +via portage for yet unknown reason and because using conch +seems to be flaky (test is failing when using Python2 but +passing when using Python3). + +Bug: https://bugs.gentoo.org/605446 + +--- a/regress/conch-ciphers.sh ++++ b/regress/conch-ciphers.sh +@@ -3,6 +3,10 @@ + + tid="conch ciphers" + ++# https://bugs.gentoo.org/605446 ++echo "conch interop tests skipped due to Gentoo bug #605446" ++exit 0 ++ + if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then + echo "conch interop tests not enabled" + exit 0 diff --git a/net-misc/openssh/files/openssh-9.3_p1-fix-putty-tests.patch b/net-misc/openssh/files/openssh-9.3_p1-fix-putty-tests.patch new file mode 100644 index 000000000000..9ac02c188000 --- /dev/null +++ b/net-misc/openssh/files/openssh-9.3_p1-fix-putty-tests.patch @@ -0,0 +1,57 @@ +Make sure that host keys are already accepted before +running tests. + +https://bugs.gentoo.org/493866 + +--- a/regress/putty-ciphers.sh ++++ b/regress/putty-ciphers.sh +@@ -16,11 +16,17 @@ + + for c in aes 3des aes128-ctr aes192-ctr aes256-ctr chacha20 ; do + verbose "$tid: cipher $c" ++ rm -f ${COPY} + cp ${OBJ}/.putty/sessions/localhost_proxy \ + ${OBJ}/.putty/sessions/cipher_$c + echo "Cipher=$c" >> ${OBJ}/.putty/sessions/cipher_$c + +- rm -f ${COPY} ++ env HOME=$PWD echo "y" | ${PLINK} -load cipher_$c \ ++ -i ${OBJ}/putty.rsa2 "exit" ++ if [ $? -ne 0 ]; then ++ fail "failed to pre-cache host key" ++ fi ++ + env HOME=$PWD ${PLINK} -load cipher_$c -batch -i ${OBJ}/putty.rsa2 \ + cat ${DATA} > ${COPY} + if [ $? -ne 0 ]; then +--- a/regress/putty-kex.sh ++++ b/regress/putty-kex.sh +@@ -20,6 +20,12 @@ + ${OBJ}/.putty/sessions/kex_$k + echo "KEX=$k" >> ${OBJ}/.putty/sessions/kex_$k + ++ env HOME=$PWD echo "y" | ${PLINK} -load kex_$k \ ++ -i ${OBJ}/putty.rsa2 "exit" ++ if [ $? -ne 0 ]; then ++ fail "failed to pre-cache host key" ++ fi ++ + env HOME=$PWD ${PLINK} -load kex_$k -batch -i ${OBJ}/putty.rsa2 true + if [ $? -ne 0 ]; then + fail "KEX $k failed" +--- a/regress/putty-transfer.sh ++++ b/regress/putty-transfer.sh +@@ -26,6 +26,13 @@ + cp ${OBJ}/.putty/sessions/localhost_proxy \ + ${OBJ}/.putty/sessions/compression_$c + echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k ++ ++ env HOME=$PWD echo "y" | ${PLINK} -load compression_$c \ ++ -i ${OBJ}/putty.rsa2 "exit" ++ if [ $? -ne 0 ]; then ++ fail "failed to pre-cache host key" ++ fi ++ + env HOME=$PWD ${PLINK} -load compression_$c -batch \ + -i ${OBJ}/putty.rsa2 cat ${DATA} > ${COPY} + if [ $? -ne 0 ]; then diff --git a/net-misc/openssh/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch b/net-misc/openssh/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch new file mode 100644 index 000000000000..379a3981d7ea --- /dev/null +++ b/net-misc/openssh/files/openssh-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch @@ -0,0 +1,44 @@ +From 45b491ce13fcf7dbc0b3bd6df986c9cf59190721 Mon Sep 17 00:00:00 2001 +From: Jordan R Abrahams-Whitehead <ajordanr@google.com> +Date: Tue, 12 Dec 2023 22:54:02 +0000 +Subject: [PATCH] Allow MAP_NORESERVE in sandbox seccomp filter maps + +While debugging Scudo on ChromeOS, we found that the no reserve mode +immediately crashed `sshd`. We tracked it down to the +sandbox-seccomp-filter. + +Being able to mmap with MAP_NORESERVE is useful (if not necessary) for +some overcommitting allocators. + +During mmap calls, the flag MAP_NORESERVE is used by some allocators +such as LLVM's Scudo for layout optimisation. This causes the sandbox +seccomp filter for the client subprocess to die with some Scudo +configurations. + +Upstream patch submission: +https://lists.mindrot.org/pipermail/openssh-unix-dev/2023-December/041095.html +--- + sandbox-seccomp-filter.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 23b40b643..a49c5ca99 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -190,9 +190,11 @@ + + #if defined(__NR_mmap) || defined(__NR_mmap2) + # ifdef MAP_FIXED_NOREPLACE +-# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_FIXED_NOREPLACE ++# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED \ ++ |MAP_NORESERVE|MAP_FIXED_NOREPLACE + # else +-# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED ++# define SC_MMAP_FLAGS MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED \ ++ |MAP_NORESERVE + # endif /* MAP_FIXED_NOREPLACE */ + /* Use this for both __NR_mmap and __NR_mmap2 variants */ + # define SC_MMAP(_nr) \ +-- +2.43.0.472.g3155946c3a-goog + diff --git a/net-misc/openssh/files/openssh-9.6_p1-fix-xmss-c99.patch b/net-misc/openssh/files/openssh-9.6_p1-fix-xmss-c99.patch new file mode 100644 index 000000000000..cf06b80cd5fa --- /dev/null +++ b/net-misc/openssh/files/openssh-9.6_p1-fix-xmss-c99.patch @@ -0,0 +1,20 @@ +xmss_hash.c: In function ‘core_hash_SHA2’: +xmss_hash.c:56:5: error: implicit declaration of function ‘SHA256’ [-Wimplicit-function-declaration] + 56 | SHA256(buf, inlen + keylen + n, out); + | ^~~~~~ +xmss_hash.c:61:7: error: implicit declaration of function ‘SHA512’ [-Wimplicit-function-declaration] + 61 | SHA512(buf, inlen + keylen + n, out); + | ^~~~~~ + +diff --git a/xmss_hash.c b/xmss_hash.c +index 70c126ae2..cb17de2af 100644 +--- a/xmss_hash.c ++++ b/xmss_hash.c +@@ -12,6 +12,7 @@ Public domain. + #include "xmss_hash_address.h" + #include "xmss_commons.h" + #include "xmss_hash.h" ++#include <openssl/sha.h> + + #include <stddef.h> + #ifdef HAVE_STDINT_H diff --git a/net-misc/openssh/files/sshd.service.1 b/net-misc/openssh/files/sshd.service.1 new file mode 100644 index 000000000000..a541164cd7f2 --- /dev/null +++ b/net-misc/openssh/files/sshd.service.1 @@ -0,0 +1,15 @@ +[Unit] +Description=OpenSSH server daemon +After=network.target auditd.service + +[Service] +ExecStartPre=/usr/bin/ssh-keygen -A +ExecStart=/usr/sbin/sshd -D -e +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process +OOMPolicy=continue +Restart=on-failure +RestartSec=42s + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/openssh/files/sshd_at.service.1 b/net-misc/openssh/files/sshd_at.service.1 new file mode 100644 index 000000000000..e43a457994f4 --- /dev/null +++ b/net-misc/openssh/files/sshd_at.service.1 @@ -0,0 +1,8 @@ +[Unit] +Description=OpenSSH per-connection server daemon +After=auditd.service + +[Service] +ExecStart=-/usr/sbin/sshd -i -e +StandardInput=socket +StandardError=journal diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml index 58ff739e1d4c..da1b4330c4d7 100644 --- a/net-misc/openssh/metadata.xml +++ b/net-misc/openssh/metadata.xml @@ -1,37 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> - </maintainer> - <longdescription> -OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that -increasing numbers of people on the Internet are coming to rely on. Many users of telnet, -rlogin, ftp, and other such programs might not realize that their password is transmitted -across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) -to effectively eliminate eavesdropping, connection hijacking, and other network-level attacks. -Additionally, OpenSSH provides a myriad of secure tunneling capabilities, as well as a variety -of authentication methods. + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <longdescription> + OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that + increasing numbers of people on the Internet are coming to rely on. Many users of telnet, + rlogin, ftp, and other such programs might not realize that their password is transmitted + across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) + to effectively eliminate eavesdropping, connection hijacking, and other network-level attacks. + Additionally, OpenSSH provides a myriad of secure tunneling capabilities, as well as a variety + of authentication methods. -The OpenSSH suite includes the ssh program which replaces rlogin and telnet, scp which -replaces rcp, and sftp which replaces ftp. Also included is sshd which is the server side of -the package, and the other basic utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan, -ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and 2.0. -</longdescription> - <use> - <flag name="bindist">Disable EC/RC5 algorithms in OpenSSL for patent reasons.</flag> - <flag name="scp">Enable scp command with known security problems. See bug 733802</flag> - <flag name="hpn">Enable high performance ssh</flag> - <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag> - <flag name="livecd">Enable root password logins for live-cd environment.</flag> - <flag name="security-key">Include builtin U2F/FIDO support</flag> - <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag> - <flag name="X509">Adds support for X.509 certificate authentication</flag> - <flag name="xmss">Enable XMSS post-quantum authentication algorithm</flag> - </use> - <upstream> - <remote-id type="cpe">cpe:/a:openbsd:openssh</remote-id> - <remote-id type="sourceforge">hpnssh</remote-id> - </upstream> + The OpenSSH suite includes the ssh program which replaces rlogin and telnet, scp which + replaces rcp, and sftp which replaces ftp. Also included is sshd which is the server side of + the package, and the other basic utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan, + ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and 2.0. + </longdescription> + <use> + <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag> + <flag name="livecd">Enable root password logins for live-cd environment.</flag> + <flag name="security-key">Include builtin U2F/FIDO support</flag> + <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag> + <flag name="xmss">Enable XMSS post-quantum authentication algorithm</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:openbsd:openssh</remote-id> + <remote-id type="github">openssh/openssh-portable</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/openssh/openssh-8.5_p1-r2.ebuild b/net-misc/openssh/openssh-8.5_p1-r2.ebuild deleted file mode 100644 index 96e4f161abd5..000000000000 --- a/net-misc/openssh/openssh-8.5_p1-r2.ebuild +++ /dev/null @@ -1,510 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user-info flag-o-matic autotools pam systemd toolchain-funcs - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} - -# PV to USE for HPN patches -HPN_PV="${PV^^}" - -HPN_VER="15.2" -HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff -) - -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="13.0.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="https://www.openssh.com/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )} - ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} -" -S="${WORKDIR}/${PARCH}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -# Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp !security-key ssl !xmss ) - xmss? ( ssl ) - test? ( ssl ) -" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - || ( - ( - >=dev-libs/openssl-1.0.1:0[bindist(-)=] - <dev-libs/openssl-1.1.0:0[bindist(-)=] - ) - >=dev-libs/openssl-1.1.0g:0[bindist(-)=] - ) - dev-libs/openssl:0=[static-libs(+)] - ) - virtual/libcrypt:=[static-libs(+)] - >=sys-libs/zlib-1.2.3:=[static-libs(+)] -" -RDEPEND=" - acct-group/sshd - acct-user/sshd - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam ) - kerberos? ( virtual/krb5 ) -" -DEPEND="${RDEPEND} - virtual/os-headers - kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) - static? ( ${LIB_DEPEND} ) -" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( !prefix? ( sys-apps/shadow ) ) - X? ( x11-apps/xauth ) -" -BDEPEND=" - virtual/pkgconfig - sys-devel/autoconf -" - -pkg_pretend() { - # this sucks, but i'd rather have people unable to `emerge -u openssh` - # than not be able to log in to their server any more - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use hpn && maybe_fail hpn HPN_VER) - $(use sctp && maybe_fail sctp SCTP_PATCH) - $(use X509 && maybe_fail X509 X509_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "Missing requested third party patch." - fi - - # Make sure people who are using tcp wrappers are notified of its removal. #531156 - if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then - ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" - ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." - fi -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch - eapply "${FILESDIR}"/${PN}-8.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex - eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch - - # workaround for https://bugs.gentoo.org/734984 - use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.patch - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches - - local PATCHSET_VERSION_MACROS=() - - if use X509 ; then - pushd "${WORKDIR}" &>/dev/null || die - eapply "${FILESDIR}/${P}-X509-glue-${X509_VER}.patch" - popd &>/dev/null || die - - eapply "${WORKDIR}"/${X509_PATCH%.*} - - # We need to patch package version or any X.509 sshd will reject our ssh client - # with "userauth_pubkey: could not parse key: string is too large [preauth]" - # error - einfo "Patching package version for X.509 patch set ..." - sed -i \ - -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ - "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" - - einfo "Patching version.h to expose X.509 patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in X.509 patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) - fi - - if use sctp ; then - eapply "${WORKDIR}"/${SCTP_PATCH%.*} - - einfo "Patching version.h to expose SCTP patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in SCTP patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) - - einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..." - sed -i \ - -e "/\t\tcfgparse \\\/d" \ - "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" - fi - - if use hpn ; then - local hpn_patchdir="${T}/${P}-hpn${HPN_VER}" - mkdir "${hpn_patchdir}" || die - cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die - pushd "${hpn_patchdir}" &>/dev/null || die - eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch - use X509 && eapply "${FILESDIR}/${PN}-8.5_p1-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch" - use sctp && eapply "${FILESDIR}/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch" - popd &>/dev/null || die - - eapply "${hpn_patchdir}" - - use X509 || eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch" - - einfo "Patching Makefile.in for HPN patch set ..." - sed -i \ - -e "/^LIBS=/ s/\$/ -lpthread/" \ - "${S}"/Makefile.in || die "Failed to patch Makefile.in" - - einfo "Patching version.h to expose HPN patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ - "${S}"/version.h || die "Failed to sed-in HPN patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) - - if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - einfo "Disabling known non-working MT AES cipher per default ..." - - cat > "${T}"/disable_mtaes.conf <<- EOF - - # HPN's Multi-Threaded AES CTR cipher is currently known to be broken - # and therefore disabled per default. - DisableMTAES yes - EOF - sed -i \ - -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ - "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" - - sed -i \ - -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ - "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" - fi - fi - - if use X509 || use sctp || use hpn ; then - einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" - - einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" - - einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." - sed -i \ - -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ - "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" - fi - - sed -i \ - -e "/#UseLogin no/d" \ - "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" - - eapply_user #473004 - - # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox - sed -e '/\t\tpercent \\/ d' \ - -i regress/Makefile || die - - tc-export PKG_CONFIG - local sed_args=( - -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" - # Disable PATH reset, trust what portage gives us #254615 - -e 's:^PATH=/:#PATH=/:' - # Disable fortify flags ... our gcc does this for us - -e 's:-D_FORTIFY_SOURCE=2::' - ) - - # The -ftrapv flag ICEs on hppa #505182 - use hppa && sed_args+=( - -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' - -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' - ) - # _XOPEN_SOURCE causes header conflicts on Solaris - [[ ${CHOST} == *-solaris* ]] && sed_args+=( - -e 's/-D_XOPEN_SOURCE//' - ) - sed -i "${sed_args[@]}" configure{.ac,} || die - - eautoreconf -} - -src_configure() { - addwrite /dev/ptmx - - use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG - use static && append-ldflags -static - use xmss && append-cflags -DWITH_XMSS - - if [[ ${CHOST} == *-solaris* ]] ; then - # Solaris' glob.h doesn't have things like GLOB_TILDE, configure - # doesn't check for this, so force the replacement to be put in - # place - append-cppflags -DBROKEN_GLOB - fi - - # use replacement, RPF_ECHO_ON doesn't exist here - [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no - - local myconf=( - --with-ldflags="${LDFLAGS}" - --disable-strip - --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX}"/etc/ssh - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX}"/usr/share/openssh - --with-privsep-path="${EPREFIX}"/var/empty - --with-privsep-user=sshd - $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX}"/usr) - # We apply the sctp patch conditionally, so can't pass --without-sctp - # unconditionally else we get unknown flag warnings. - $(use sctp && use_with sctp) - $(use_with ldns ldns "${EPREFIX}"/usr) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use_with selinux) - $(usex X509 '' "$(use_with security-key security-key-builtin)") - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 - ) - - if use elibc_musl; then - # stackprotect is broken on musl x86 and ppc - if use x86 || use ppc; then - myconf+=( --without-stackprotect ) - fi - - # musl defines bogus values for UTMP_FILE and WTMP_FILE - # https://bugs.gentoo.org/753230 - myconf+=( --disable-utmp --disable-wtmp ) - fi - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \ - SUDO="" SSH_SK_PROVIDER="" \ - TEST_SSH_UNSAFE_PERMISSIONS=1 \ - emake -k -j1 ${t} </dev/null \ - && passed+=( "${t}" ) \ - || failed+=( "${t}" ) - done - - einfo "Passed tests: ${passed[*]}" - [[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}" - [[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}" -} - -# Gentoo tweaks to default config files. -tweak_ssh_configs() { - local locale_vars=( - # These are language variables that POSIX defines. - # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 - LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME - - # These are the GNU extensions. - # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html - LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE - ) - - # First the server config. - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config - - # Allow client to pass locale environment variables. #367017 - AcceptEnv ${locale_vars[*]} - - # Allow client to pass COLORTERM to match TERM. #658540 - AcceptEnv COLORTERM - EOF - - # Then the client config. - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config - - # Send locale environment variables. #367017 - SendEnv ${locale_vars[*]} - - # Send COLORTERM to match TERM. #658540 - SendEnv COLORTERM - EOF - - if use pam ; then - sed -i \ - -e "/^#UsePAM /s:.*:UsePAM yes:" \ - -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ - -e "/^#PrintMotd /s:.*:PrintMotd no:" \ - -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ - "${ED}"/etc/ssh/sshd_config || die - fi - - if use livecd ; then - sed -i \ - -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ - "${ED}"/etc/ssh/sshd_config || die - fi -} - -src_install() { - emake install-nokeys DESTDIR="${D}" - fperms 600 /etc/ssh/sshd_config - dobin contrib/ssh-copy-id - newinitd "${FILESDIR}"/sshd-r1.initd sshd - newconfd "${FILESDIR}"/sshd-r1.confd sshd - - if use pam; then - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - fi - - tweak_ssh_configs - - doman contrib/ssh-copy-id.1 - dodoc CREDITS OVERVIEW README* TODO sshd_config - use hpn && dodoc HPN-README - use X509 || dodoc ChangeLog - - diropts -m 0700 - dodir /etc/skel/.ssh - - # https://bugs.gentoo.org/733802 - if ! use scp; then - rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \ - || die "failed to remove scp" - fi - - rmdir "${ED}"/var/empty || die - - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' -} - -pkg_preinst() { - if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then - show_ssl_warning=1 - fi -} - -pkg_postinst() { - local old_ver - for old_ver in ${REPLACING_VERSIONS}; do - if ver_test "${old_ver}" -lt "5.8_p1"; then - elog "Starting with openssh-5.8p1, the server will default to a newer key" - elog "algorithm (ECDSA). You are encouraged to manually update your stored" - elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." - fi - if ver_test "${old_ver}" -lt "7.0_p1"; then - elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." - elog "Make sure to update any configs that you might have. Note that xinetd might" - elog "be an alternative for you as it supports USE=tcpd." - fi - if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 - elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" - elog "weak sizes. If you rely on these key types, you can re-enable the key types by" - elog "adding to your sshd_config or ~/.ssh/config files:" - elog " PubkeyAcceptedKeyTypes=+ssh-dss" - elog "You should however generate new keys using rsa or ed25519." - - elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" - elog "to 'prohibit-password'. That means password auth for root users no longer works" - elog "out of the box. If you need this, please update your sshd_config explicitly." - fi - if ver_test "${old_ver}" -lt "7.6_p1"; then - elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." - elog "Furthermore, rsa keys with less than 1024 bits will be refused." - fi - if ver_test "${old_ver}" -lt "7.7_p1"; then - elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." - elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" - elog "if you need to authenticate against LDAP." - elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." - fi - if ver_test "${old_ver}" -lt "8.2_p1"; then - ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" - ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" - ewarn "connection is generally safe." - fi - done - - if [[ -n ${show_ssl_warning} ]]; then - elog "Be aware that by disabling openssl support in openssh, the server and clients" - elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" - elog "and update all clients/servers that utilize them." - fi - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/openssh/openssh-8.6_p1-r2.ebuild b/net-misc/openssh/openssh-8.6_p1-r2.ebuild deleted file mode 100644 index f896a51951ac..000000000000 --- a/net-misc/openssh/openssh-8.6_p1-r2.ebuild +++ /dev/null @@ -1,515 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user-info flag-o-matic autotools pam systemd toolchain-funcs - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} - -# PV to USE for HPN patches -#HPN_PV="${PV^^}" -HPN_PV="8.5_P1" - -HPN_VER="15.2" -HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff -) - -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="13.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="https://www.openssh.com/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )} - ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} -" -S="${WORKDIR}/${PARCH}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -# Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp !security-key ssl !xmss ) - xmss? ( ssl ) - test? ( ssl ) -" - -# tests currently fail with XMSS -REQUIRED_USE+="test? ( !xmss )" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - || ( - ( - >=dev-libs/openssl-1.0.1:0[bindist(-)=] - <dev-libs/openssl-1.1.0:0[bindist(-)=] - ) - >=dev-libs/openssl-1.1.0g:0[bindist(-)=] - ) - dev-libs/openssl:0=[static-libs(+)] - ) - virtual/libcrypt:=[static-libs(+)] - >=sys-libs/zlib-1.2.3:=[static-libs(+)] -" -RDEPEND=" - acct-group/sshd - acct-user/sshd - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam ) - kerberos? ( virtual/krb5 ) -" -DEPEND="${RDEPEND} - virtual/os-headers - kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) - static? ( ${LIB_DEPEND} ) -" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( !prefix? ( sys-apps/shadow ) ) - X? ( x11-apps/xauth ) -" -BDEPEND=" - virtual/pkgconfig - sys-devel/autoconf -" - -pkg_pretend() { - # this sucks, but i'd rather have people unable to `emerge -u openssh` - # than not be able to log in to their server any more - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use hpn && maybe_fail hpn HPN_VER) - $(use sctp && maybe_fail sctp SCTP_PATCH) - $(use X509 && maybe_fail X509 X509_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "Missing requested third party patch." - fi - - # Make sure people who are using tcp wrappers are notified of its removal. #531156 - if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then - ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" - ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." - fi -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch - eapply "${FILESDIR}"/${PN}-8.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex - eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch - - # workaround for https://bugs.gentoo.org/734984 - use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.patch - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches - - local PATCHSET_VERSION_MACROS=() - - if use X509 ; then - pushd "${WORKDIR}" &>/dev/null || die - eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch" - popd &>/dev/null || die - - eapply "${WORKDIR}"/${X509_PATCH%.*} - - # We need to patch package version or any X.509 sshd will reject our ssh client - # with "userauth_pubkey: could not parse key: string is too large [preauth]" - # error - einfo "Patching package version for X.509 patch set ..." - sed -i \ - -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ - "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" - - einfo "Patching version.h to expose X.509 patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in X.509 patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) - fi - - if use sctp ; then - eapply "${WORKDIR}"/${SCTP_PATCH%.*} - - einfo "Patching version.h to expose SCTP patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in SCTP patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) - - einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..." - sed -i \ - -e "/\t\tcfgparse \\\/d" \ - "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" - fi - - if use hpn ; then - local hpn_patchdir="${T}/${P}-hpn${HPN_VER}" - mkdir "${hpn_patchdir}" || die - cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die - pushd "${hpn_patchdir}" &>/dev/null || die - eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch - use X509 && eapply "${FILESDIR}"/${PN}-8.6_p1-hpn-${HPN_VER}-X509-glue.patch - use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch - popd &>/dev/null || die - - eapply "${hpn_patchdir}" - - use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch" - - einfo "Patching Makefile.in for HPN patch set ..." - sed -i \ - -e "/^LIBS=/ s/\$/ -lpthread/" \ - "${S}"/Makefile.in || die "Failed to patch Makefile.in" - - einfo "Patching version.h to expose HPN patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ - "${S}"/version.h || die "Failed to sed-in HPN patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) - - if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - einfo "Disabling known non-working MT AES cipher per default ..." - - cat > "${T}"/disable_mtaes.conf <<- EOF - - # HPN's Multi-Threaded AES CTR cipher is currently known to be broken - # and therefore disabled per default. - DisableMTAES yes - EOF - sed -i \ - -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ - "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" - - sed -i \ - -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ - "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" - fi - fi - - if use X509 || use sctp || use hpn ; then - einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" - - einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" - - einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." - sed -i \ - -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ - "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" - fi - - sed -i \ - -e "/#UseLogin no/d" \ - "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" - - eapply_user #473004 - - # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox - sed -e '/\t\tpercent \\/ d' \ - -i regress/Makefile || die - - tc-export PKG_CONFIG - local sed_args=( - -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" - # Disable PATH reset, trust what portage gives us #254615 - -e 's:^PATH=/:#PATH=/:' - # Disable fortify flags ... our gcc does this for us - -e 's:-D_FORTIFY_SOURCE=2::' - ) - - # The -ftrapv flag ICEs on hppa #505182 - use hppa && sed_args+=( - -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' - -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' - ) - # _XOPEN_SOURCE causes header conflicts on Solaris - [[ ${CHOST} == *-solaris* ]] && sed_args+=( - -e 's/-D_XOPEN_SOURCE//' - ) - sed -i "${sed_args[@]}" configure{.ac,} || die - - eautoreconf -} - -src_configure() { - addwrite /dev/ptmx - - use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG - use static && append-ldflags -static - use xmss && append-cflags -DWITH_XMSS - - if [[ ${CHOST} == *-solaris* ]] ; then - # Solaris' glob.h doesn't have things like GLOB_TILDE, configure - # doesn't check for this, so force the replacement to be put in - # place - append-cppflags -DBROKEN_GLOB - fi - - # use replacement, RPF_ECHO_ON doesn't exist here - [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no - - local myconf=( - --with-ldflags="${LDFLAGS}" - --disable-strip - --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX}"/etc/ssh - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX}"/usr/share/openssh - --with-privsep-path="${EPREFIX}"/var/empty - --with-privsep-user=sshd - $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX}"/usr) - # We apply the sctp patch conditionally, so can't pass --without-sctp - # unconditionally else we get unknown flag warnings. - $(use sctp && use_with sctp) - $(use_with ldns ldns "${EPREFIX}"/usr) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use_with selinux) - $(usex X509 '' "$(use_with security-key security-key-builtin)") - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 - ) - - if use elibc_musl; then - # stackprotect is broken on musl x86 and ppc - if use x86 || use ppc; then - myconf+=( --without-stackprotect ) - fi - - # musl defines bogus values for UTMP_FILE and WTMP_FILE - # https://bugs.gentoo.org/753230 - myconf+=( --disable-utmp --disable-wtmp ) - fi - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \ - SUDO="" SSH_SK_PROVIDER="" \ - TEST_SSH_UNSAFE_PERMISSIONS=1 \ - emake -k -j1 ${t} </dev/null \ - && passed+=( "${t}" ) \ - || failed+=( "${t}" ) - done - - einfo "Passed tests: ${passed[*]}" - [[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}" - [[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}" -} - -# Gentoo tweaks to default config files. -tweak_ssh_configs() { - local locale_vars=( - # These are language variables that POSIX defines. - # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 - LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME - - # These are the GNU extensions. - # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html - LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE - ) - - # First the server config. - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config - - # Allow client to pass locale environment variables. #367017 - AcceptEnv ${locale_vars[*]} - - # Allow client to pass COLORTERM to match TERM. #658540 - AcceptEnv COLORTERM - EOF - - # Then the client config. - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config - - # Send locale environment variables. #367017 - SendEnv ${locale_vars[*]} - - # Send COLORTERM to match TERM. #658540 - SendEnv COLORTERM - EOF - - if use pam ; then - sed -i \ - -e "/^#UsePAM /s:.*:UsePAM yes:" \ - -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ - -e "/^#PrintMotd /s:.*:PrintMotd no:" \ - -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ - "${ED}"/etc/ssh/sshd_config || die - fi - - if use livecd ; then - sed -i \ - -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ - "${ED}"/etc/ssh/sshd_config || die - fi -} - -src_install() { - emake install-nokeys DESTDIR="${D}" - fperms 600 /etc/ssh/sshd_config - dobin contrib/ssh-copy-id - newinitd "${FILESDIR}"/sshd-r1.initd sshd - newconfd "${FILESDIR}"/sshd-r1.confd sshd - - if use pam; then - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - fi - - tweak_ssh_configs - - doman contrib/ssh-copy-id.1 - dodoc CREDITS OVERVIEW README* TODO sshd_config - use hpn && dodoc HPN-README - use X509 || dodoc ChangeLog - - diropts -m 0700 - dodir /etc/skel/.ssh - - # https://bugs.gentoo.org/733802 - if ! use scp; then - rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \ - || die "failed to remove scp" - fi - - rmdir "${ED}"/var/empty || die - - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' -} - -pkg_preinst() { - if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then - show_ssl_warning=1 - fi -} - -pkg_postinst() { - local old_ver - for old_ver in ${REPLACING_VERSIONS}; do - if ver_test "${old_ver}" -lt "5.8_p1"; then - elog "Starting with openssh-5.8p1, the server will default to a newer key" - elog "algorithm (ECDSA). You are encouraged to manually update your stored" - elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." - fi - if ver_test "${old_ver}" -lt "7.0_p1"; then - elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." - elog "Make sure to update any configs that you might have. Note that xinetd might" - elog "be an alternative for you as it supports USE=tcpd." - fi - if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 - elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" - elog "weak sizes. If you rely on these key types, you can re-enable the key types by" - elog "adding to your sshd_config or ~/.ssh/config files:" - elog " PubkeyAcceptedKeyTypes=+ssh-dss" - elog "You should however generate new keys using rsa or ed25519." - - elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" - elog "to 'prohibit-password'. That means password auth for root users no longer works" - elog "out of the box. If you need this, please update your sshd_config explicitly." - fi - if ver_test "${old_ver}" -lt "7.6_p1"; then - elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." - elog "Furthermore, rsa keys with less than 1024 bits will be refused." - fi - if ver_test "${old_ver}" -lt "7.7_p1"; then - elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." - elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" - elog "if you need to authenticate against LDAP." - elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." - fi - if ver_test "${old_ver}" -lt "8.2_p1"; then - ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" - ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" - ewarn "connection is generally safe." - fi - done - - if [[ -n ${show_ssl_warning} ]]; then - elog "Be aware that by disabling openssl support in openssh, the server and clients" - elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" - elog "and update all clients/servers that utilize them." - fi - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/openssh/openssh-9.6_p1-r3.ebuild b/net-misc/openssh/openssh-9.6_p1-r3.ebuild new file mode 100644 index 000000000000..c944856ebe5b --- /dev/null +++ b/net-misc/openssh/openssh-9.6_p1-r3.ebuild @@ -0,0 +1,389 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc +inherit user-info flag-o-matic autotools optfeature pam systemd toolchain-funcs verify-sig + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI=" + mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + xmss? ( ssl ) + test? ( ssl ) +" + +# tests currently fail with XMSS +REQUIRED_USE+="test? ( !xmss )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + net-libs/ldns[ecdsa(+),ssl(+)] + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) + virtual/libcrypt:=[static-libs(+)] + >=sys-libs/zlib-1.2.3:=[static-libs(+)] +" +RDEPEND=" + acct-group/sshd + acct-user/sshd + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( sys-libs/pam ) + kerberos? ( virtual/krb5 ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers + kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) + static? ( ${LIB_DEPEND} ) +" +RDEPEND=" + ${RDEPEND} + !net-misc/openssh-contrib + pam? ( >=sys-auth/pambase-20081028 ) + !prefix? ( sys-apps/shadow ) +" +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-openssh ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch" + "${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch" + "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" +) + +pkg_pretend() { + local i enabled_eol_flags disabled_eol_flags + for i in hpn sctp X509; do + if has_version "net-misc/openssh[${i}]"; then + enabled_eol_flags+="${i}," + disabled_eol_flags+="-${i}," + fi + done + + if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then + # Skip for binary packages entirely because of environment saving, bug #907892 + [[ ${MERGE_TYPE} == binary ]] && return + + ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore." + ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality," + ewarn "since these USE flags required third-party patches that often trigger bugs" + ewarn "and are of questionable provenance." + ewarn + ewarn "If you must continue relying on this functionality, switch to" + ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your" + ewarn "world file first: 'emerge --deselect net-misc/openssh'" + ewarn + ewarn "In order to prevent loss of SSH remote login access, we will abort the build." + ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib" + ewarn "variant, when re-emerging you will have to set" + ewarn + ewarn " OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + + die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." + fi +} + +src_prepare() { + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + default + + # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox + sed -e '/\t\tpercent \\/ d' \ + -i regress/Makefile || die + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + use xmss && append-cflags -DWITH_XMSS + + if [[ ${CHOST} == *-solaris* ]] ; then + # Solaris' glob.h doesn't have things like GLOB_TILDE, configure + # doesn't check for this, so force the replacement to be put in + # place + append-cppflags -DBROKEN_GLOB + fi + + # use replacement, RPF_ECHO_ON doesn't exist here + [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty + --with-privsep-user=sshd + # optional at runtime; guarantee a known path + --with-xauth="${EPREFIX}"/usr/bin/xauth + + # --with-hardening adds the following in addition to flags we + # already set in our toolchain: + # * -ftrapv (which is broken with GCC anyway), + # * -ftrivial-auto-var-init=zero (which is nice, but not the end of + # the world to not have) + # * -fzero-call-used-regs=used (history of miscompilations with + # Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086, + # gcc PR104820, gcc PR104817, gcc PR110934)). + # + # Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK, + # so we cannot just disable -fzero-call-used-regs=used. + # + # Therefore, just pass --without-hardening, given it doesn't negate + # our already hardened toolchain defaults, and avoids adding flags + # which are known-broken in both Clang and GCC and haven't been + # proven reliable. + --without-hardening + + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with security-key security-key-builtin) + $(use_with ssl openssl) + $(use_with ssl ssl-engine) + ) + + if use elibc_musl; then + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) + myconf+=( --disable-utmp --disable-wtmp ) + fi + + # Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all + # bug #869839 (https://github.com/llvm/llvm-project/issues/57692) + tc-is-clang && myconf+=( --without-hardening ) + + econf "${myconf[@]}" +} + +src_test() { + local tests=( compat-tests ) + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + ewarn "user, so we will run a subset only." + tests+=( interop-tests ) + else + tests+=( tests ) + fi + + local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 + mkdir -p "${HOME}"/.ssh || die + emake -j1 "${tests[@]}" </dev/null +} + +# Gentoo tweaks to default config files. +tweak_ssh_configs() { + local locale_vars=( + # These are language variables that POSIX defines. + # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 + LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME + + # These are the GNU extensions. + # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html + LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE + ) + + dodir /etc/ssh/ssh_config.d /etc/ssh/sshd_config.d + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config || die + Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf" + EOF + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config || die + Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf" + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + # Send locale environment variables (bug #367017) + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM (bug #658540) + SendEnv COLORTERM + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts" + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/ssh_revoked_hosts || die + # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/ + ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + # Allow client to pass locale environment variables (bug #367017) + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM (bug #658540) + AcceptEnv COLORTERM + EOF + + if use pam ; then + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + UsePAM yes + # This interferes with PAM. + PasswordAuthentication no + # PAM can do its own handling of MOTD. + PrintMotd no + PrintLastLog no + EOF + fi + + if use livecd ; then + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + # Allow root login with password on livecds. + PermitRootLogin Yes + EOF + fi +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd-r1.initd sshd + newconfd "${FILESDIR}"/sshd-r1.confd sshd + + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi + + tweak_ssh_configs + + doman contrib/ssh-copy-id.1 + dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config + + diropts -m 0700 + dodir /etc/skel/.ssh + rmdir "${ED}"/var/empty || die + + systemd_dounit "${FILESDIR}"/sshd.socket + systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service + systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service' +} + +pkg_preinst() { + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then + show_ssl_warning=1 + fi +} + +pkg_postinst() { + # bug #139235 + optfeature "x11 forwarding" x11-apps/xauth + + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if ver_test "${old_ver}" -lt "5.8_p1"; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if ver_test "${old_ver}" -lt "7.0_p1"; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if ver_test "${old_ver}" -lt "7.6_p1"; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if ver_test "${old_ver}" -lt "7.7_p1"; then + elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." + elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" + elog "if you need to authenticate against LDAP." + elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." + fi + if ver_test "${old_ver}" -lt "8.2_p1"; then + ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" + ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" + ewarn "connection is generally safe." + fi + if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then + ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to" + ewarn "'Restart=on-failure', which causes the service to automatically restart if it" + ewarn "terminates with an unclean exit code or signal. This feature is useful for most users," + ewarn "but it can increase the vulnerability of the system in the event of a future exploit." + ewarn "If you have a web-facing setup or are concerned about security, it is recommended to" + ewarn "set 'Restart=no' in your sshd unit file." + fi + done + + if [[ -n ${show_ssl_warning} ]]; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi +} diff --git a/net-misc/openssh/openssh-9.6_p1-r4.ebuild b/net-misc/openssh/openssh-9.6_p1-r4.ebuild new file mode 100644 index 000000000000..8d611b8b20b5 --- /dev/null +++ b/net-misc/openssh/openssh-9.6_p1-r4.ebuild @@ -0,0 +1,390 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc +inherit user-info flag-o-matic autotools optfeature pam systemd toolchain-funcs verify-sig + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI=" + mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + xmss? ( ssl ) + test? ( ssl ) +" + +# tests currently fail with XMSS +REQUIRED_USE+="test? ( !xmss )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + net-libs/ldns[ecdsa(+),ssl(+)] + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) + virtual/libcrypt:=[static-libs(+)] + >=sys-libs/zlib-1.2.3:=[static-libs(+)] +" +RDEPEND=" + acct-group/sshd + acct-user/sshd + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( sys-libs/pam ) + kerberos? ( virtual/krb5 ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers + kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) + static? ( ${LIB_DEPEND} ) +" +RDEPEND=" + ${RDEPEND} + !net-misc/openssh-contrib + pam? ( >=sys-auth/pambase-20081028 ) + !prefix? ( sys-apps/shadow ) +" +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-openssh ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch" + "${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch" + "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" + "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch" +) + +pkg_pretend() { + local i enabled_eol_flags disabled_eol_flags + for i in hpn sctp X509; do + if has_version "net-misc/openssh[${i}]"; then + enabled_eol_flags+="${i}," + disabled_eol_flags+="-${i}," + fi + done + + if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then + # Skip for binary packages entirely because of environment saving, bug #907892 + [[ ${MERGE_TYPE} == binary ]] && return + + ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore." + ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality," + ewarn "since these USE flags required third-party patches that often trigger bugs" + ewarn "and are of questionable provenance." + ewarn + ewarn "If you must continue relying on this functionality, switch to" + ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your" + ewarn "world file first: 'emerge --deselect net-misc/openssh'" + ewarn + ewarn "In order to prevent loss of SSH remote login access, we will abort the build." + ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib" + ewarn "variant, when re-emerging you will have to set" + ewarn + ewarn " OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + + die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." + fi +} + +src_prepare() { + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + default + + # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox + sed -e '/\t\tpercent \\/ d' \ + -i regress/Makefile || die + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + use xmss && append-cflags -DWITH_XMSS + + if [[ ${CHOST} == *-solaris* ]] ; then + # Solaris' glob.h doesn't have things like GLOB_TILDE, configure + # doesn't check for this, so force the replacement to be put in + # place + append-cppflags -DBROKEN_GLOB + fi + + # use replacement, RPF_ECHO_ON doesn't exist here + [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty + --with-privsep-user=sshd + # optional at runtime; guarantee a known path + --with-xauth="${EPREFIX}"/usr/bin/xauth + + # --with-hardening adds the following in addition to flags we + # already set in our toolchain: + # * -ftrapv (which is broken with GCC anyway), + # * -ftrivial-auto-var-init=zero (which is nice, but not the end of + # the world to not have) + # * -fzero-call-used-regs=used (history of miscompilations with + # Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086, + # gcc PR104820, gcc PR104817, gcc PR110934)). + # + # Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK, + # so we cannot just disable -fzero-call-used-regs=used. + # + # Therefore, just pass --without-hardening, given it doesn't negate + # our already hardened toolchain defaults, and avoids adding flags + # which are known-broken in both Clang and GCC and haven't been + # proven reliable. + --without-hardening + + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with security-key security-key-builtin) + $(use_with ssl openssl) + $(use_with ssl ssl-engine) + ) + + if use elibc_musl; then + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) + myconf+=( --disable-utmp --disable-wtmp ) + fi + + # Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all + # bug #869839 (https://github.com/llvm/llvm-project/issues/57692) + tc-is-clang && myconf+=( --without-hardening ) + + econf "${myconf[@]}" +} + +src_test() { + local tests=( compat-tests ) + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + ewarn "user, so we will run a subset only." + tests+=( interop-tests ) + else + tests+=( tests ) + fi + + local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 + mkdir -p "${HOME}"/.ssh || die + emake -j1 "${tests[@]}" </dev/null +} + +# Gentoo tweaks to default config files. +tweak_ssh_configs() { + local locale_vars=( + # These are language variables that POSIX defines. + # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 + LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME + + # These are the GNU extensions. + # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html + LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE + ) + + dodir /etc/ssh/ssh_config.d /etc/ssh/sshd_config.d + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config || die + Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf" + EOF + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config || die + Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf" + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + # Send locale environment variables (bug #367017) + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM (bug #658540) + SendEnv COLORTERM + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts" + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/ssh_revoked_hosts || die + # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/ + ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + EOF + + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + # Allow client to pass locale environment variables (bug #367017) + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM (bug #658540) + AcceptEnv COLORTERM + EOF + + if use pam ; then + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + UsePAM yes + # This interferes with PAM. + PasswordAuthentication no + # PAM can do its own handling of MOTD. + PrintMotd no + PrintLastLog no + EOF + fi + + if use livecd ; then + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + # Allow root login with password on livecds. + PermitRootLogin Yes + EOF + fi +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd-r1.initd sshd + newconfd "${FILESDIR}"/sshd-r1.confd sshd + + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi + + tweak_ssh_configs + + doman contrib/ssh-copy-id.1 + dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config + + diropts -m 0700 + dodir /etc/skel/.ssh + rmdir "${ED}"/var/empty || die + + systemd_dounit "${FILESDIR}"/sshd.socket + systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service + systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service' +} + +pkg_preinst() { + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then + show_ssl_warning=1 + fi +} + +pkg_postinst() { + # bug #139235 + optfeature "x11 forwarding" x11-apps/xauth + + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if ver_test "${old_ver}" -lt "5.8_p1"; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if ver_test "${old_ver}" -lt "7.0_p1"; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if ver_test "${old_ver}" -lt "7.6_p1"; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if ver_test "${old_ver}" -lt "7.7_p1"; then + elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." + elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" + elog "if you need to authenticate against LDAP." + elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." + fi + if ver_test "${old_ver}" -lt "8.2_p1"; then + ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" + ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" + ewarn "connection is generally safe." + fi + if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then + ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to" + ewarn "'Restart=on-failure', which causes the service to automatically restart if it" + ewarn "terminates with an unclean exit code or signal. This feature is useful for most users," + ewarn "but it can increase the vulnerability of the system in the event of a future exploit." + ewarn "If you have a web-facing setup or are concerned about security, it is recommended to" + ewarn "set 'Restart=no' in your sshd unit file." + fi + done + + if [[ -n ${show_ssl_warning} ]]; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi +} diff --git a/net-misc/openssh/openssh-9.7_p1-r2.ebuild b/net-misc/openssh/openssh-9.7_p1-r2.ebuild new file mode 100644 index 000000000000..ce9e1d1a47c2 --- /dev/null +++ b/net-misc/openssh/openssh-9.7_p1-r2.ebuild @@ -0,0 +1,403 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc +inherit user-info flag-o-matic autotools optfeature pam systemd toolchain-funcs verify-sig + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI=" + mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + xmss? ( ssl ) + test? ( ssl ) +" + +# tests currently fail with XMSS +REQUIRED_USE+="test? ( !xmss )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + net-libs/ldns[ecdsa(+),ssl(+)] + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) + virtual/libcrypt:=[static-libs(+)] + >=sys-libs/zlib-1.2.3:=[static-libs(+)] +" +RDEPEND=" + acct-group/sshd + acct-user/sshd + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( sys-libs/pam ) + kerberos? ( virtual/krb5 ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers + kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) + static? ( ${LIB_DEPEND} ) +" +RDEPEND=" + ${RDEPEND} + !net-misc/openssh-contrib + pam? ( >=sys-auth/pambase-20081028 ) + !prefix? ( sys-apps/shadow ) +" +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-openssh ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" +) + +pkg_pretend() { + local i enabled_eol_flags disabled_eol_flags + for i in hpn sctp X509; do + if has_version "net-misc/openssh[${i}]"; then + enabled_eol_flags+="${i}," + disabled_eol_flags+="-${i}," + fi + done + + if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then + # Skip for binary packages entirely because of environment saving, bug #907892 + [[ ${MERGE_TYPE} == binary ]] && return + + ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore." + ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality," + ewarn "since these USE flags required third-party patches that often trigger bugs" + ewarn "and are of questionable provenance." + ewarn + ewarn "If you must continue relying on this functionality, switch to" + ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your" + ewarn "world file first: 'emerge --deselect net-misc/openssh'" + ewarn + ewarn "In order to prevent loss of SSH remote login access, we will abort the build." + ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib" + ewarn "variant, when re-emerging you will have to set" + ewarn + ewarn " OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + + die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." + fi +} + +src_prepare() { + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + default + + # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox + sed -e '/\t\tpercent \\/ d' \ + -i regress/Makefile || die + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + use xmss && append-cflags -DWITH_XMSS + + if [[ ${CHOST} == *-solaris* ]] ; then + # Solaris' glob.h doesn't have things like GLOB_TILDE, configure + # doesn't check for this, so force the replacement to be put in + # place + append-cppflags -DBROKEN_GLOB + fi + + # use replacement, RPF_ECHO_ON doesn't exist here + [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty + --with-privsep-user=sshd + # optional at runtime; guarantee a known path + --with-xauth="${EPREFIX}"/usr/bin/xauth + + # --with-hardening adds the following in addition to flags we + # already set in our toolchain: + # * -ftrapv (which is broken with GCC anyway), + # * -ftrivial-auto-var-init=zero (which is nice, but not the end of + # the world to not have) + # * -fzero-call-used-regs=used (history of miscompilations with + # Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086, + # gcc PR104820, gcc PR104817, gcc PR110934)). + # + # Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK, + # so we cannot just disable -fzero-call-used-regs=used. + # + # Therefore, just pass --without-hardening, given it doesn't negate + # our already hardened toolchain defaults, and avoids adding flags + # which are known-broken in both Clang and GCC and haven't been + # proven reliable. + --without-hardening + + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with security-key security-key-builtin) + $(use_with ssl openssl) + $(use_with ssl ssl-engine) + ) + + if use elibc_musl; then + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) + myconf+=( --disable-utmp --disable-wtmp ) + fi + + # Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all + # bug #869839 (https://github.com/llvm/llvm-project/issues/57692) + tc-is-clang && myconf+=( --without-hardening ) + + econf "${myconf[@]}" +} + +tweak_ssh_configs() { + cat <<-EOF >> ssh_config.out || die + + Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf" + EOF + cat <<-EOF >> sshd_config.out || die + + Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf" + EOF +} + +create_config_dropins() { + local locale_vars=( + # These are language variables that POSIX defines. + # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 + LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME + + # These are the GNU extensions. + # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html + LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE + ) + + mkdir -p "${WORKDIR}"/etc/ssh/ssh{,d}_config.d || die + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + # Send locale environment variables (bug #367017) + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM (bug #658540) + SendEnv COLORTERM + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts" + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_revoked_hosts || die + # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/ + ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + # Allow client to pass locale environment variables (bug #367017) + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM (bug #658540) + AcceptEnv COLORTERM + EOF + + if use pam ; then + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + UsePAM yes + # This interferes with PAM. + PasswordAuthentication no + # PAM can do its own handling of MOTD. + PrintMotd no + PrintLastLog no + EOF + fi + + if use livecd ; then + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + # Allow root login with password on livecds. + PermitRootLogin Yes + EOF + fi +} + +src_compile() { + default + tweak_ssh_configs + create_config_dropins +} + +src_test() { + local tests=( compat-tests ) + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + ewarn "user, so we will run a subset only." + tests+=( interop-tests ) + else + tests+=( tests ) + fi + + local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 + mkdir -p "${HOME}"/.ssh || die + emake -j1 "${tests[@]}" </dev/null +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd-r1.initd sshd + newconfd "${FILESDIR}"/sshd-r1.confd sshd + + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi + + doman contrib/ssh-copy-id.1 + dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config + + rmdir "${ED}"/var/empty || die + + systemd_dounit "${FILESDIR}"/sshd.socket + systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service + systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service' + + # Install dropins with explicit mode, bug 906638, 915840 + diropts -m0755 + insopts -m0644 + insinto /etc/ssh + doins -r "${WORKDIR}"/etc/ssh/ssh_config.d + doins "${WORKDIR}"/etc/ssh/ssh_revoked_hosts + diropts -m0700 + insopts -m0600 + doins -r "${WORKDIR}"/etc/ssh/sshd_config.d +} + +pkg_preinst() { + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then + show_ssl_warning=1 + fi +} + +pkg_postinst() { + # bug #139235 + optfeature "x11 forwarding" x11-apps/xauth + + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if ver_test "${old_ver}" -lt "5.8_p1"; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if ver_test "${old_ver}" -lt "7.0_p1"; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if ver_test "${old_ver}" -lt "7.6_p1"; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if ver_test "${old_ver}" -lt "7.7_p1"; then + elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." + elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" + elog "if you need to authenticate against LDAP." + elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." + fi + if ver_test "${old_ver}" -lt "8.2_p1"; then + ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" + ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" + ewarn "connection is generally safe." + fi + if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then + ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to" + ewarn "'Restart=on-failure', which causes the service to automatically restart if it" + ewarn "terminates with an unclean exit code or signal. This feature is useful for most users," + ewarn "but it can increase the vulnerability of the system in the event of a future exploit." + ewarn "If you have a web-facing setup or are concerned about security, it is recommended to" + ewarn "set 'Restart=no' in your sshd unit file." + fi + done + + if [[ -n ${show_ssl_warning} ]]; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi +} diff --git a/net-misc/openssh/openssh-9.7_p1-r3.ebuild b/net-misc/openssh/openssh-9.7_p1-r3.ebuild new file mode 100644 index 000000000000..9bb9c924093a --- /dev/null +++ b/net-misc/openssh/openssh-9.7_p1-r3.ebuild @@ -0,0 +1,404 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc +inherit user-info flag-o-matic autotools optfeature pam systemd toolchain-funcs verify-sig + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +DESCRIPTION="Port of OpenBSD's free SSH release" +HOMEPAGE="https://www.openssh.com/" +SRC_URI=" + mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) +" +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +# Probably want to drop ssl defaulting to on in a future version. +IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + xmss? ( ssl ) + test? ( ssl ) +" + +# tests currently fail with XMSS +REQUIRED_USE+="test? ( !xmss )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + net-libs/ldns[ecdsa(+),ssl(+)] + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) + virtual/libcrypt:=[static-libs(+)] + >=sys-libs/zlib-1.2.3:=[static-libs(+)] +" +RDEPEND=" + acct-group/sshd + acct-user/sshd + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( sys-libs/pam ) + kerberos? ( virtual/krb5 ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers + kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) + static? ( ${LIB_DEPEND} ) +" +RDEPEND=" + ${RDEPEND} + !net-misc/openssh-contrib + pam? ( >=sys-auth/pambase-20081028 ) + !prefix? ( sys-apps/shadow ) +" +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-openssh ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" + "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch" +) + +pkg_pretend() { + local i enabled_eol_flags disabled_eol_flags + for i in hpn sctp X509; do + if has_version "net-misc/openssh[${i}]"; then + enabled_eol_flags+="${i}," + disabled_eol_flags+="-${i}," + fi + done + + if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then + # Skip for binary packages entirely because of environment saving, bug #907892 + [[ ${MERGE_TYPE} == binary ]] && return + + ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore." + ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality," + ewarn "since these USE flags required third-party patches that often trigger bugs" + ewarn "and are of questionable provenance." + ewarn + ewarn "If you must continue relying on this functionality, switch to" + ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your" + ewarn "world file first: 'emerge --deselect net-misc/openssh'" + ewarn + ewarn "In order to prevent loss of SSH remote login access, we will abort the build." + ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib" + ewarn "variant, when re-emerging you will have to set" + ewarn + ewarn " OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + + die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" + fi + + # Make sure people who are using tcp wrappers are notified of its removal. #531156 + if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then + ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" + ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." + fi +} + +src_prepare() { + # don't break .ssh/authorized_keys2 for fun + sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die + + [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) + + default + + # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox + sed -e '/\t\tpercent \\/ d' \ + -i regress/Makefile || die + + tc-export PKG_CONFIG + local sed_args=( + -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" + # Disable fortify flags ... our gcc does this for us + -e 's:-D_FORTIFY_SOURCE=2::' + ) + + # _XOPEN_SOURCE causes header conflicts on Solaris + [[ ${CHOST} == *-solaris* ]] && sed_args+=( + -e 's/-D_XOPEN_SOURCE//' + ) + sed -i "${sed_args[@]}" configure{.ac,} || die + + eautoreconf +} + +src_configure() { + addwrite /dev/ptmx + + use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG + use static && append-ldflags -static + use xmss && append-cflags -DWITH_XMSS + + if [[ ${CHOST} == *-solaris* ]] ; then + # Solaris' glob.h doesn't have things like GLOB_TILDE, configure + # doesn't check for this, so force the replacement to be put in + # place + append-cppflags -DBROKEN_GLOB + fi + + # use replacement, RPF_ECHO_ON doesn't exist here + [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no + + local myconf=( + --with-ldflags="${LDFLAGS}" + --disable-strip + --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty + --with-privsep-user=sshd + # optional at runtime; guarantee a known path + --with-xauth="${EPREFIX}"/usr/bin/xauth + + # --with-hardening adds the following in addition to flags we + # already set in our toolchain: + # * -ftrapv (which is broken with GCC anyway), + # * -ftrivial-auto-var-init=zero (which is nice, but not the end of + # the world to not have) + # * -fzero-call-used-regs=used (history of miscompilations with + # Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086, + # gcc PR104820, gcc PR104817, gcc PR110934)). + # + # Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK, + # so we cannot just disable -fzero-call-used-regs=used. + # + # Therefore, just pass --without-hardening, given it doesn't negate + # our already hardened toolchain defaults, and avoids adding flags + # which are known-broken in both Clang and GCC and haven't been + # proven reliable. + --without-hardening + + $(use_with audit audit linux) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) + $(use_with ldns) + $(use_with libedit) + $(use_with pam) + $(use_with pie) + $(use_with selinux) + $(use_with security-key security-key-builtin) + $(use_with ssl openssl) + $(use_with ssl ssl-engine) + ) + + if use elibc_musl; then + # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) + myconf+=( --disable-utmp --disable-wtmp ) + fi + + # Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all + # bug #869839 (https://github.com/llvm/llvm-project/issues/57692) + tc-is-clang && myconf+=( --without-hardening ) + + econf "${myconf[@]}" +} + +tweak_ssh_configs() { + cat <<-EOF >> ssh_config.out || die + + Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf" + EOF + cat <<-EOF >> sshd_config.out || die + + Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf" + EOF +} + +create_config_dropins() { + local locale_vars=( + # These are language variables that POSIX defines. + # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 + LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME + + # These are the GNU extensions. + # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html + LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE + ) + + mkdir -p "${WORKDIR}"/etc/ssh/ssh{,d}_config.d || die + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die + # Send locale environment variables (bug #367017) + SendEnv ${locale_vars[*]} + + # Send COLORTERM to match TERM (bug #658540) + SendEnv COLORTERM + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die + RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts" + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_revoked_hosts || die + # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/ + ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + EOF + + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die + # Allow client to pass locale environment variables (bug #367017) + AcceptEnv ${locale_vars[*]} + + # Allow client to pass COLORTERM to match TERM (bug #658540) + AcceptEnv COLORTERM + EOF + + if use pam ; then + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die + UsePAM yes + # This interferes with PAM. + PasswordAuthentication no + # PAM can do its own handling of MOTD. + PrintMotd no + PrintLastLog no + EOF + fi + + if use livecd ; then + cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die + # Allow root login with password on livecds. + PermitRootLogin Yes + EOF + fi +} + +src_compile() { + default + tweak_ssh_configs + create_config_dropins +} + +src_test() { + local tests=( compat-tests ) + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + ewarn "user, so we will run a subset only." + tests+=( interop-tests ) + else + tests+=( tests ) + fi + + local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 + mkdir -p "${HOME}"/.ssh || die + emake -j1 "${tests[@]}" </dev/null +} + +src_install() { + emake install-nokeys DESTDIR="${D}" + fperms 600 /etc/ssh/sshd_config + dobin contrib/ssh-copy-id + newinitd "${FILESDIR}"/sshd-r1.initd sshd + newconfd "${FILESDIR}"/sshd-r1.confd sshd + + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi + + doman contrib/ssh-copy-id.1 + dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config + + rmdir "${ED}"/var/empty || die + + systemd_dounit "${FILESDIR}"/sshd.socket + systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service + systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service' + + # Install dropins with explicit mode, bug 906638, 915840 + diropts -m0755 + insopts -m0644 + insinto /etc/ssh + doins -r "${WORKDIR}"/etc/ssh/ssh_config.d + doins "${WORKDIR}"/etc/ssh/ssh_revoked_hosts + diropts -m0700 + insopts -m0600 + doins -r "${WORKDIR}"/etc/ssh/sshd_config.d +} + +pkg_preinst() { + if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then + show_ssl_warning=1 + fi +} + +pkg_postinst() { + # bug #139235 + optfeature "x11 forwarding" x11-apps/xauth + + local old_ver + for old_ver in ${REPLACING_VERSIONS}; do + if ver_test "${old_ver}" -lt "5.8_p1"; then + elog "Starting with openssh-5.8p1, the server will default to a newer key" + elog "algorithm (ECDSA). You are encouraged to manually update your stored" + elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." + fi + if ver_test "${old_ver}" -lt "7.0_p1"; then + elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." + elog "Make sure to update any configs that you might have. Note that xinetd might" + elog "be an alternative for you as it supports USE=tcpd." + fi + if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 + elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" + elog "weak sizes. If you rely on these key types, you can re-enable the key types by" + elog "adding to your sshd_config or ~/.ssh/config files:" + elog " PubkeyAcceptedKeyTypes=+ssh-dss" + elog "You should however generate new keys using rsa or ed25519." + + elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" + elog "to 'prohibit-password'. That means password auth for root users no longer works" + elog "out of the box. If you need this, please update your sshd_config explicitly." + fi + if ver_test "${old_ver}" -lt "7.6_p1"; then + elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." + elog "Furthermore, rsa keys with less than 1024 bits will be refused." + fi + if ver_test "${old_ver}" -lt "7.7_p1"; then + elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." + elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" + elog "if you need to authenticate against LDAP." + elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." + fi + if ver_test "${old_ver}" -lt "8.2_p1"; then + ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" + ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" + ewarn "connection is generally safe." + fi + if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then + ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to" + ewarn "'Restart=on-failure', which causes the service to automatically restart if it" + ewarn "terminates with an unclean exit code or signal. This feature is useful for most users," + ewarn "but it can increase the vulnerability of the system in the event of a future exploit." + ewarn "If you have a web-facing setup or are concerned about security, it is recommended to" + ewarn "set 'Restart=no' in your sshd unit file." + fi + done + + if [[ -n ${show_ssl_warning} ]]; then + elog "Be aware that by disabling openssl support in openssh, the server and clients" + elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" + elog "and update all clients/servers that utilize them." + fi +} diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index cc9e42bfb518..19823fb47223 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -1,2 +1,2 @@ -DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b -DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832 +DIST openvswitch-2.17.8.tar.gz 8097747 BLAKE2B d37ae60481255476d41aa94086f6a597107b23176f7ff47eeff9d85a5904da3685886663451317e0b9e512fb049b4024e291f320752aa90fe798ff08f49772c5 SHA512 c94685b67f9f25c81a590696d36c431fadf09c2504b06565011c2945ef242c5039508b312992597822f8ee274ce615ca58bc6bb2aa0a9cf1346bc2dcada70fa1 +DIST openvswitch-2.17.9.tar.gz 8136490 BLAKE2B cdb5ec81fb9ac04786fc1230d60c6c9bbf7ec2929cf5ab40bb1e0e7442480383d0ad8f24f14df4901cab8f39a6532445cf1810c9b9e3a779d7d15bfe35101a37 SHA512 b91212f9c10a208bca9d15cd5a219ae24b7e9bf8b5c8fdebc21cd9fa8229bc655f9f3591d79dd30c1a8212daed15d5a26bf9532b3496e3660bc8b62012f45636 diff --git a/net-misc/openvswitch/files/openvswitch-2.17.8-gcc14-build-fix.patch b/net-misc/openvswitch/files/openvswitch-2.17.8-gcc14-build-fix.patch new file mode 100644 index 000000000000..6a439dc0544a --- /dev/null +++ b/net-misc/openvswitch/files/openvswitch-2.17.8-gcc14-build-fix.patch @@ -0,0 +1,32 @@ +https://github.com/openvswitch/ovs/commit/335a5deac3ff91448ca14651e92f39dfdd512fcf.patch +From: Ilya Maximets <i.maximets@ovn.org> +Date: Thu, 18 Jan 2024 15:59:05 +0100 +Subject: [PATCH] ovs-atomic: Fix inclusion of Clang header by GCC 14. + +GCC 14 started to advertise c_atomic extension, older versions didn't +do that. Add check for __clang__, so GCC doesn't include headers +designed for Clang. + +Another option would be to prefer stdatomic implementation instead, +but some older versions of Clang are not able to use stdatomic.h +supplied by GCC as described in commit: + 07ece367fb5f ("ovs-atomic: Prefer Clang intrinsics over <stdatomic.h>.") + +This change fixes OVS build with GCC on Fedora Rawhide (40). + +Reported-by: Jakob Meng <code@jakobmeng.de> +Acked-by: Jakob Meng <jmeng@redhat.com> +Acked-by: Eelco Chaudron <echaudro@redhat.com> +Acked-by: Simon Horman <horms@ovn.org> +Signed-off-by: Ilya Maximets <i.maximets@ovn.org> +--- a/lib/ovs-atomic.h ++++ b/lib/ovs-atomic.h +@@ -328,7 +328,7 @@ + #if __CHECKER__ + /* sparse doesn't understand some GCC extensions we use. */ + #include "ovs-atomic-pthreads.h" +- #elif __has_extension(c_atomic) ++ #elif __clang__ && __has_extension(c_atomic) + #include "ovs-atomic-clang.h" + #elif HAVE_ATOMIC && __cplusplus >= 201103L + #include "ovs-atomic-c++.h" diff --git a/net-misc/openvswitch/files/openvswitch.tmpfiles b/net-misc/openvswitch/files/openvswitch.tmpfiles index 58c583ee4747..f99f19f89fb2 100644 --- a/net-misc/openvswitch/files/openvswitch.tmpfiles +++ b/net-misc/openvswitch/files/openvswitch.tmpfiles @@ -1 +1 @@ -d /var/run/openvswitch 0770 root root - +d /run/openvswitch 0770 root root - diff --git a/net-misc/openvswitch/files/ovs-delete-transient-ports.service b/net-misc/openvswitch/files/ovs-delete-transient-ports.service deleted file mode 100644 index 4cd4d7f57f97..000000000000 --- a/net-misc/openvswitch/files/ovs-delete-transient-ports.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Open vSwitch Delete Transient Ports -After=ovsdb-server.service -Before=ovs-vswitchd.service -AssertPathExists=/var/run/openvswitch/db.sock - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/share/openvswitch/scripts/ovs-ctl delete-transient-ports diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r1 b/net-misc/openvswitch/files/ovs-vswitchd-r1 index bc5602a60030..f7da8e846789 100644 --- a/net-misc/openvswitch/files/ovs-vswitchd-r1 +++ b/net-misc/openvswitch/files/ovs-vswitchd-r1 @@ -10,12 +10,12 @@ command_args=" --detach --monitor ${OPTIONS} ${DATABASE}" -pidfile="/var/run/openvswitch/ovs-vswitchd.pid" +pidfile="/run/openvswitch/ovs-vswitchd.pid" depend() { use ovsdb-server logger } start_pre() { - checkpath -d "/var/run/openvswitch" -m 0750 + checkpath -d "/run/openvswitch" -m 0750 } diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r3.service b/net-misc/openvswitch/files/ovs-vswitchd-r3.service index 165ea3bfbf81..8f157cfdd870 100644 --- a/net-misc/openvswitch/files/ovs-vswitchd-r3.service +++ b/net-misc/openvswitch/files/ovs-vswitchd-r3.service @@ -6,12 +6,12 @@ Before=network.target network.service Requires=ovsdb-server.service After=ovsdb-server.service network-pre.target systemd-udev-settle.service ReloadPropagatedFrom=ovsdb-server.service -AssertPathIsReadWrite=/var/run/openvswitch/db.sock +AssertPathIsReadWrite=/run/openvswitch/db.sock [Service] Type=forking Restart=on-failure -Environment=HOME=/var/run/openvswitch +Environment=HOME=/run/openvswitch EnvironmentFile=-/etc/conf.d/ovs-vswitchd ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovsdb-server --no-monitor --system-id=random \ diff --git a/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 b/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 index eb4b6c2f2831..6f383500fe7a 100644 --- a/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 +++ b/net-misc/openvswitch/files/ovs-vswitchd.confd-r2 @@ -1,5 +1,5 @@ # Connection string for the configuration database (usually a unix socket) -DATABASE="unix:/var/run/openvswitch/db.sock" +DATABASE="unix:/run/openvswitch/db.sock" # Additional options OPTIONS="--mlockall" diff --git a/net-misc/openvswitch/files/ovs-vswitchd.service b/net-misc/openvswitch/files/ovs-vswitchd.service deleted file mode 100644 index a573a503e14c..000000000000 --- a/net-misc/openvswitch/files/ovs-vswitchd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Open vSwitch Daemon -Documentation=man:ovs-vswitchd -Wants=network.target -Before=network.target -Requires=ovsdb-server.service -After=ovsdb-server.service - -[Service] -# --pidfile options is needed for create file used -# by ovs-appctl command. -ExecStart=/usr/sbin/ovs-vswitchd --mlockall --monitor unix:/var/run/openvswitch/db.sock --pidfile - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/openvswitch/files/ovsdb-server-r1 b/net-misc/openvswitch/files/ovsdb-server-r1 index f7360adbb4c8..5fc2716d91d5 100644 --- a/net-misc/openvswitch/files/ovsdb-server-r1 +++ b/net-misc/openvswitch/files/ovsdb-server-r1 @@ -22,7 +22,7 @@ command_args=" ${bootstrap_ca_cert} ${DATABASE} ${OPTIONS}" -pidfile="/var/run/openvswitch/ovsdb-server.pid" +pidfile="/run/openvswitch/ovsdb-server.pid" depend() { need localmount @@ -30,5 +30,5 @@ depend() { } start_pre() { - checkpath -d "/var/run/openvswitch" -m 0750 + checkpath -d "/run/openvswitch" -m 0750 } diff --git a/net-misc/openvswitch/files/ovsdb-server-r3.service b/net-misc/openvswitch/files/ovsdb-server-r3.service index a1d308478daa..8b779964ee06 100644 --- a/net-misc/openvswitch/files/ovsdb-server-r3.service +++ b/net-misc/openvswitch/files/ovsdb-server-r3.service @@ -9,7 +9,7 @@ Wants=ovs-delete-transient-ports.service Type=forking Restart=on-failure EnvironmentFile=-/etc/conf.d/ovsdb-server -ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch +ExecStartPre=/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovs-vswitchd --no-monitor --system-id=random \ --ovs-user=${OVS_USER_ID} \ diff --git a/net-misc/openvswitch/files/ovsdb-server.service b/net-misc/openvswitch/files/ovsdb-server.service deleted file mode 100644 index 9493c40755d8..000000000000 --- a/net-misc/openvswitch/files/ovsdb-server.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Open vSwitch Database Server -Documentation=man:ovsdb-server - -[Service] -# The file can be shared for this as this values are prone to change -# and that way we don't need to update them in two different places -EnvironmentFile=/etc/conf.d/ovsdb-server -ExecStart=/usr/sbin/ovsdb-server --monitor \ - --remote=punix:${DB_SOCKET} \ - --remote=${REMOTE_DB} \ - --private-key=${PRIVATE_KEY} \ - --certificate=${CERTIFICATE} \ - --bootstrap-ca-cert=${BOOTSTRAP_CA_CERT} diff --git a/net-misc/openvswitch/files/ovsdb-server_conf b/net-misc/openvswitch/files/ovsdb-server_conf deleted file mode 100644 index 1299b820640c..000000000000 --- a/net-misc/openvswitch/files/ovsdb-server_conf +++ /dev/null @@ -1,16 +0,0 @@ -# Socket for bringing the server up -DB_SOCKET="/var/run/openvswitch/db.sock" - -# Remote sockets are defined in the database by default -REMOTE_DB="db:Open_vSwitch,manager_options" - -# All certificates and keys are stored in the database (if any) -PRIVATE_KEY="db:SSL,private_key" -CERTIFICATE="db:SSL,certificate" -BOOTSTRAP_CA_CERT="db:SSL,ca_cert" - -# Alternative path for the database (default is /etc/openvswitch/conf.db) -# DATABASE="/etc/openvswitch/conf.db" - -# Additional options -# OPTIONS="" diff --git a/net-misc/openvswitch/files/ovsdb-server_conf2 b/net-misc/openvswitch/files/ovsdb-server_conf2 index 07eca5e6c9f7..0ffb63c21ccd 100644 --- a/net-misc/openvswitch/files/ovsdb-server_conf2 +++ b/net-misc/openvswitch/files/ovsdb-server_conf2 @@ -1,5 +1,5 @@ # Socket for bringing the server up -DB_SOCKET="/var/run/openvswitch/db.sock" +DB_SOCKET="/run/openvswitch/db.sock" # Remote sockets are defined in the database by default REMOTE_DB="db:Open_vSwitch,Open_vSwitch,manager_options" diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml index 564a93cad57f..fad2a4a6287d 100644 --- a/net-misc/openvswitch/metadata.xml +++ b/net-misc/openvswitch/metadata.xml @@ -11,4 +11,7 @@ <use> <flag name="monitor">Build the Python and GUI dependent monitor applications</flag> </use> + <upstream> + <remote-id type="github">openvswitch/ovs</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/openvswitch/openvswitch-2.14.1.ebuild b/net-misc/openvswitch/openvswitch-2.17.8.ebuild index c873cc5a5478..03f00817ad77 100644 --- a/net-misc/openvswitch/openvswitch-2.14.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.8.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_7 python3_8 python3_9 ) +EAPI=8 -inherit autotools linux-info linux-mod python-r1 systemd tmpfiles +MODULES_OPTIONAL_USE="modules" +PYTHON_COMPAT=( python3_{10..11} ) + +inherit autotools linux-mod-r1 python-single-r1 systemd tmpfiles DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org" @@ -12,24 +14,33 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="debug modules monitor +ssl" +KEYWORDS="amd64 ~arm64 ~ppc64 x86" +IUSE="debug modules monitor +ssl unwind valgrind" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND=" - ssl? ( dev-libs/openssl:0= ) - ${PYTHON_DEPS} - ~dev-python/ovs-2.13.0[${PYTHON_USEDEP}] - dev-python/twisted[conch,${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - debug? ( dev-lang/perl )" +# Check python/ovs/version.py in tarball for dev-python/ovs dep +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + ~dev-python/ovs-2.17.1_p1[${PYTHON_USEDEP}] + dev-python/twisted[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + ') + debug? ( dev-lang/perl ) + unwind? ( sys-libs/libunwind:= ) + ssl? ( dev-libs/openssl:= )" DEPEND="${RDEPEND} - sys-apps/util-linux[caps]" -BDEPEND="virtual/pkgconfig" + sys-apps/util-linux[caps] + valgrind? ( dev-debug/valgrind )" +BDEPEND="virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ')" -PATCHES=" +PATCHES=( "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" -" + "${FILESDIR}/${PN}-2.17.8-gcc14-build-fix.patch" +) CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" @@ -38,10 +49,9 @@ BUILD_TARGETS="all" pkg_setup() { if use modules ; then CONFIG_CHECK+=" ~!OPENVSWITCH" - kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" - # docs state 4.17.x code states 4.15.x - kernel_is le 5 5 999 || die "Linux >= 3.10.0 and <= 4.18 required for userspace modules" - linux-mod_pkg_setup + kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" + kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" + linux-mod-r1_pkg_setup else CONFIG_CHECK+=" ~OPENVSWITCH" linux-info_pkg_setup @@ -49,30 +59,43 @@ pkg_setup() { } src_prepare() { + default + # Never build kernelmodules, doing this manually sed -i \ -e '/^SUBDIRS/d' \ datapath/Makefile.in || die "sed failed" + eautoreconf - default } src_configure() { set_arch_to_kernel - # monitor is statically enabled for bug 596206 + python_setup + + # monitor is statically enabled for bug #596206 # use monitor || export ovs_cv_python="no" # pyside is staticly disabled export ovs_cv_pyuic4="no" # flake8 is primarily a style guide tool, running it as part of the tests - # in Gentoo does not make much sense, only breaks them: bug 607280 + # in Gentoo does not make much sense, only breaks them: bug #607280 export ovs_cv_flake8="no" + # Only adds a diagram to the man page, just skip it as we don't + # want to add a BDEPEND on graphviz right now. bug #856286 + export ovs_cv_dot="no" + + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + local linux_config use modules && linux_config="--with-linux=${KV_OUT_DIR}" - econf ${linux_config} \ - --with-rundir=/var/run/openvswitch \ + export ac_cv_lib_unwind_unw_backtrace="$(usex unwind)" + + # Need PYTHON3 variable for bug #860240 + PYTHON3="${PYTHON}" CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash econf ${linux_config} \ + --with-rundir=/run/openvswitch \ --with-logdir=/var/log/openvswitch \ --with-pkidir=/etc/ssl/openvswitch \ --with-dbdir=/var/lib/openvswitch \ @@ -83,7 +106,7 @@ src_configure() { src_compile() { default - use modules && linux-mod_src_compile + use modules && linux-mod-r1_src_compile } src_install() { @@ -91,9 +114,13 @@ src_install() { local SCRIPT if use monitor; then + # ovs-bugtool is installed to sbin by the build system, but we + # install it to bin below, and these clash in merged-usr + # https://bugs.gentoo.org/889846 + rm "${ED}"/usr/sbin/ovs-bugtool || die + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do - sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" - python_foreach_impl python_doscript utilities/"${SCRIPT}" + python_doscript utilities/"${SCRIPT}" done rm -r "${ED}"/usr/share/openvswitch/python || die fi @@ -117,15 +144,15 @@ src_install() { insinto /etc/logrotate.d newins rhel/etc_logrotate.d_openvswitch openvswitch - use modules && linux-mod_src_install + use modules && linux-mod-r1_src_install } pkg_postinst() { - use modules && linux-mod_pkg_postinst + use modules && linux-mod-r1_pkg_postinst tmpfiles_process openvswitch.conf - # only needed on non-systemd, but helps anyway + # Only needed on non-systemd, but helps anyway elog "Use the following command to create an initial database for ovsdb-server:" elog " emerge --config =${CATEGORY}/${PF}" elog "(will create a database in /var/lib/openvswitch/conf.db)" diff --git a/net-misc/openvswitch/openvswitch-2.15.0.ebuild b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild index 83ea5328d7d0..cc166256aed4 100644 --- a/net-misc/openvswitch/openvswitch-2.15.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.17.9-r1.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_7 python3_8 python3_9 ) +EAPI=8 -inherit autotools linux-info linux-mod python-r1 systemd tmpfiles +MODULES_OPTIONAL_USE="modules" +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools linux-mod-r1 python-single-r1 systemd tmpfiles DESCRIPTION="Production quality, multilayer virtual switch" HOMEPAGE="https://www.openvswitch.org" @@ -12,24 +14,32 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="debug modules monitor +ssl" +KEYWORDS="amd64 ~arm64 ~ppc64 x86" +IUSE="debug modules monitor +ssl unwind valgrind" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND=" - ssl? ( dev-libs/openssl:0= ) - ${PYTHON_DEPS} - ~dev-python/ovs-2.13.3[${PYTHON_USEDEP}] - dev-python/twisted[conch,${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - debug? ( dev-lang/perl )" +# Check python/ovs/version.py in tarball for dev-python/ovs dep +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + ~dev-python/ovs-2.17.9[${PYTHON_USEDEP}] + dev-python/twisted[${PYTHON_USEDEP}] + dev-python/zope-interface[${PYTHON_USEDEP}] + ') + debug? ( dev-lang/perl ) + unwind? ( sys-libs/libunwind:= ) + ssl? ( dev-libs/openssl:= )" DEPEND="${RDEPEND} - sys-apps/util-linux[caps]" -BDEPEND="virtual/pkgconfig" + sys-apps/util-linux[caps] + valgrind? ( dev-debug/valgrind )" +BDEPEND="virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + ')" -PATCHES=" +PATCHES=( "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" -" +) CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" @@ -40,7 +50,7 @@ pkg_setup() { CONFIG_CHECK+=" ~!OPENVSWITCH" kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules" - linux-mod_pkg_setup + linux-mod-r1_pkg_setup else CONFIG_CHECK+=" ~OPENVSWITCH" linux-info_pkg_setup @@ -48,30 +58,43 @@ pkg_setup() { } src_prepare() { + default + # Never build kernelmodules, doing this manually sed -i \ -e '/^SUBDIRS/d' \ datapath/Makefile.in || die "sed failed" + eautoreconf - default } src_configure() { set_arch_to_kernel - # monitor is statically enabled for bug 596206 + python_setup + + # monitor is statically enabled for bug #596206 # use monitor || export ovs_cv_python="no" # pyside is staticly disabled export ovs_cv_pyuic4="no" # flake8 is primarily a style guide tool, running it as part of the tests - # in Gentoo does not make much sense, only breaks them: bug 607280 + # in Gentoo does not make much sense, only breaks them: bug #607280 export ovs_cv_flake8="no" + # Only adds a diagram to the man page, just skip it as we don't + # want to add a BDEPEND on graphviz right now. bug #856286 + export ovs_cv_dot="no" + + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + local linux_config use modules && linux_config="--with-linux=${KV_OUT_DIR}" - econf ${linux_config} \ - --with-rundir=/var/run/openvswitch \ + export ac_cv_lib_unwind_unw_backtrace="$(usex unwind)" + + # Need PYTHON3 variable for bug #860240 + PYTHON3="${PYTHON}" CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash econf ${linux_config} \ + --with-rundir=/run/openvswitch \ --with-logdir=/var/log/openvswitch \ --with-pkidir=/etc/ssl/openvswitch \ --with-dbdir=/var/lib/openvswitch \ @@ -82,7 +105,7 @@ src_configure() { src_compile() { default - use modules && linux-mod_src_compile + use modules && linux-mod-r1_src_compile } src_install() { @@ -90,9 +113,13 @@ src_install() { local SCRIPT if use monitor; then + # ovs-bugtool is installed to sbin by the build system, but we + # install it to bin below, and these clash in merged-usr + # https://bugs.gentoo.org/889846 + rm "${ED}"/usr/sbin/ovs-bugtool || die + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do - sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" - python_foreach_impl python_doscript utilities/"${SCRIPT}" + python_doscript utilities/"${SCRIPT}" done rm -r "${ED}"/usr/share/openvswitch/python || die fi @@ -116,15 +143,15 @@ src_install() { insinto /etc/logrotate.d newins rhel/etc_logrotate.d_openvswitch openvswitch - use modules && linux-mod_src_install + use modules && linux-mod-r1_src_install } pkg_postinst() { - use modules && linux-mod_pkg_postinst + use modules && linux-mod-r1_pkg_postinst tmpfiles_process openvswitch.conf - # only needed on non-systemd, but helps anyway + # Only needed on non-systemd, but helps anyway elog "Use the following command to create an initial database for ovsdb-server:" elog " emerge --config =${CATEGORY}/${PF}" elog "(will create a database in /var/lib/openvswitch/conf.db)" diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest index 8773e5ac937f..bc9d1ab9bc39 100644 --- a/net-misc/owncloud-client/Manifest +++ b/net-misc/owncloud-client/Manifest @@ -1,2 +1,3 @@ -DIST ownCloud-2.9.0.5150.tar.xz 5775740 BLAKE2B c43044dd383d66dd212bcd3efd818fad289ac51b082eaa7b47db03778cdfc87725efbdffc567e416bf5444d7e58f795606f093a782ca783cefc2d4994df3fb2a SHA512 c183b2d4340dc8880d2bf31aedaffb96da518fdb60f1e8c857ee2f8d02c36cb69552475fdbf536f7ecebd9af2a7732f52a9e02f20450452c78d346910be3cf57 -DIST ownCloud-2.9.1.5500.tar.xz 5787048 BLAKE2B 6f7df0c1ca13e6074bbd75caaee838ddb822f9284a4f5cc95e1b2c1432adf2969e2413607bebc1542d4bc7790bd6e61edfba758d2205a23fbede6873b7e22316 SHA512 5c78cd0318b7cd35f32721cf364d6e807d32eb1f3651e7f22ff3f3c7737967193ad089062965b3dcee24c23c14cc0d7acdfc95094f4f90f8aaf718f45f22e18a +DIST libregraphapi-1.0.1.tar.gz 105266 BLAKE2B b5122ca5bb757c58bba0f29eaf119685c0ed119a9a72951f4098d8180e5bf05332b36fa6c884ca29b0414051c9c6d6ca081e3c7eeb7b9810202f11c1a70c5190 SHA512 aaa710642c36b4038dc61e7df4fc904a82a2ab6c34da03c3f5328075e41ab319f6616866b7f9ae472ff256b421751f8f5ce7ce0a6d3451bda75cfa3b307df082 +DIST ownCloud-4.2.0.11670.tar.xz 4126004 BLAKE2B 60a5855239b32bfb6769d38de3eced3dcb6c642d702fa33439dfebdc97947dfaed1f0081d2ec8913edc7ab8688872115abd739e21eae7d06e96cbcd92abb5565 SHA512 277d18581155f663c0c18b44a6c0fb9b31c84695e0980da486028b91c1d1c9f5a7ba956afbc11fb2e7fc4679e46a30c2d737667208f5c0599a39bf91a109ce99 +DIST ownCloud-5.2.1.13040.tar.xz 3989152 BLAKE2B f1bdee88acaa83e2adf66f37ac52070f5f92ba63584b66463a2378439756ed78f8dbecb088a909668cb8ee0c52c58e520906ffd1783feb2ddce7f4d433d39257 SHA512 182768b385e9ef8c841045617e6b2d5c47a1b621d2898ca8d7a6ed153ef2d1ca67072f620d6f380189f239db13a6a50fe178d1c00bd669c81a7df86a52e2a5c5 diff --git a/net-misc/owncloud-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch b/net-misc/owncloud-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch new file mode 100644 index 000000000000..d9762292e881 --- /dev/null +++ b/net-misc/owncloud-client/files/owncloud-client-3.1.0.9872-no_cmake_fetch.patch @@ -0,0 +1,17 @@ +Index: ownCloud-3.1.0.9872/src/libsync/CMakeLists.txt +--- ownCloud-3.1.0.9872/src/libsync/CMakeLists.txt.orig ++++ ownCloud-3.1.0.9872/src/libsync/CMakeLists.txt +@@ -3,12 +3,7 @@ set(LibreGraphAPIVersion v0.13.2) + find_package(LibreGraphAPI QUIET) + if (NOT TARGET OpenAPI::LibreGraphAPI) + message(WARNING "Failed to find system OpenAPI::LibreGraphAPI: fetching ${LibreGraphAPIVersion}") +- include(FetchContent) +- FetchContent_Populate(LibreGraphAPISrc +- QUIET +- GIT_REPOSITORY https://github.com/owncloud/libre-graph-api-cpp-qt-client.git +- GIT_TAG ${LibreGraphAPIVersion}) +- add_subdirectory(${libregraphapisrc_SOURCE_DIR}/client ${libregraphapisrc_BINARY_DIR}/client EXCLUDE_FROM_ALL) ++ add_subdirectory(libregraphapisrc-src/client libregraphapisrc-src/client EXCLUDE_FROM_ALL) + endif() + + set(libsync_SRCS diff --git a/net-misc/owncloud-client/files/owncloud-client-3.2.0.10193-no_fortify_override.patch b/net-misc/owncloud-client/files/owncloud-client-3.2.0.10193-no_fortify_override.patch new file mode 100644 index 000000000000..266596b7bd54 --- /dev/null +++ b/net-misc/owncloud-client/files/owncloud-client-3.2.0.10193-no_fortify_override.patch @@ -0,0 +1,16 @@ +diff -Naur ownCloud-3.2.0.10193.orig/src/CMakeLists.txt ownCloud-3.2.0.10193/src/CMakeLists.txt +--- ownCloud-3.2.0.10193.orig/src/CMakeLists.txt 2023-02-15 18:27:55.000000000 +0100 ++++ ownCloud-3.2.0.10193/src/CMakeLists.txt 2023-02-22 22:55:29.352847663 +0100 +@@ -16,12 +16,6 @@ + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong") + endif() + endif() +- +- string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) +- if(CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") +- endif() + endif() + + if(WIN32) diff --git a/net-misc/owncloud-client/metadata.xml b/net-misc/owncloud-client/metadata.xml index 4587207f73ca..e0dec496e7ee 100644 --- a/net-misc/owncloud-client/metadata.xml +++ b/net-misc/owncloud-client/metadata.xml @@ -9,4 +9,7 @@ <flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag> <flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag> </use> + <upstream> + <remote-id type="github">owncloud/client</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/owncloud-client/owncloud-client-2.9.1.5500.ebuild b/net-misc/owncloud-client/owncloud-client-2.9.1.5500.ebuild deleted file mode 100644 index ef8aeb7b1ca8..000000000000 --- a/net-misc/owncloud-client/owncloud-client-2.9.1.5500.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -MY_PN="ownCloud" -DESCRIPTION="Synchronize files from ownCloud Server with your computer" -HOMEPAGE="https://owncloud.org/" -SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz" - -LICENSE="CC-BY-3.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="dolphin gnome-keyring nautilus test" - -COMMON_DEPEND=">=dev-db/sqlite-3.4:3 - dev-libs/qtkeychain[gnome-keyring?,qt5(+)] - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - sys-fs/inotify-tools - dolphin? ( - kde-frameworks/kcoreaddons:5 - kde-frameworks/kio:5 - ) - nautilus? ( dev-python/nautilus-python )" - -RDEPEND="${COMMON_DEPEND}" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - kde-frameworks/extra-cmake-modules - test? ( - dev-util/cmocka - dev-qt/qttest:5 - )" - -RESTRICT="!test? ( test )" - -S=${WORKDIR}/${MY_PN}-${PV} - -src_prepare() { - # Keep tests in ${T} - sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die - - if ! use nautilus; then - pushd shell_integration > /dev/null || die - cmake_comment_add_subdirectory nautilus - popd > /dev/null || die - fi - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} diff --git a/net-misc/owncloud-client/owncloud-client-2.9.0.5150.ebuild b/net-misc/owncloud-client/owncloud-client-4.2.0.11670.ebuild index ef8aeb7b1ca8..0abca4d750a4 100644 --- a/net-misc/owncloud-client/owncloud-client-2.9.0.5150.ebuild +++ b/net-misc/owncloud-client/owncloud-client-4.2.0.11670.ebuild @@ -1,22 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg MY_PN="ownCloud" +REGRAPHAPI_PV="1.0.1" DESCRIPTION="Synchronize files from ownCloud Server with your computer" -HOMEPAGE="https://owncloud.org/" -SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz" +HOMEPAGE="https://owncloud.com/" +SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz + https://github.com/owncloud/libre-graph-api-cpp-qt-client/archive/refs/tags/v${REGRAPHAPI_PV}.tar.gz + -> libregraphapi-${REGRAPHAPI_PV}.tar.gz" +S=${WORKDIR}/${MY_PN}-${PV} LICENSE="CC-BY-3.0 GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="dolphin gnome-keyring nautilus test" +IUSE="dolphin keyring nautilus test" +RESTRICT="!test? ( test )" -COMMON_DEPEND=">=dev-db/sqlite-3.4:3 - dev-libs/qtkeychain[gnome-keyring?,qt5(+)] +RDEPEND=">=dev-db/sqlite-3.4:3 + dev-libs/qtkeychain[keyring?,qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -32,20 +37,24 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3 ) nautilus? ( dev-python/nautilus-python )" -RDEPEND="${COMMON_DEPEND}" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - kde-frameworks/extra-cmake-modules +DEPEND="${RDEPEND} test? ( dev-util/cmocka dev-qt/qttest:5 )" -RESTRICT="!test? ( test )" +BDEPEND=" + dev-qt/linguist-tools:5 + kde-frameworks/extra-cmake-modules" -S=${WORKDIR}/${MY_PN}-${PV} +PATCHES=( "${FILESDIR}"/${PN}-3.1.0.9872-no_cmake_fetch.patch + "${FILESDIR}"/${PN}-3.2.0.10193-no_fortify_override.patch + ) src_prepare() { + mv ../libre-graph-api-cpp-qt-client-${REGRAPHAPI_PV} \ + src/libsync/libregraphapisrc-src || die + # Keep tests in ${T} sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die @@ -59,7 +68,6 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) -DBUILD_TESTING=$(usex test) diff --git a/net-misc/owncloud-client/owncloud-client-5.2.1.13040.ebuild b/net-misc/owncloud-client/owncloud-client-5.2.1.13040.ebuild new file mode 100644 index 000000000000..b9f26661351c --- /dev/null +++ b/net-misc/owncloud-client/owncloud-client-5.2.1.13040.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +MY_PN="ownCloud" +DESCRIPTION="Synchronize files from ownCloud Server with your computer" +HOMEPAGE="https://owncloud.com/" +SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz" +S=${WORKDIR}/${MY_PN}-${PV} + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="keyring test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-db/sqlite-3.4:3 + dev-libs/qtkeychain[keyring?,qt6(+)] + dev-qt/kdsingleapplication[qt6] + dev-qt/qtbase:6[concurrent,gui,network,ssl,widgets] + net-libs/libre-graph-api-cpp-qt-client + sys-fs/inotify-tools" + +DEPEND="${RDEPEND} + test? ( + dev-util/cmocka + dev-qt/qtbase:6[test] + )" + +BDEPEND=" + dev-qt/qttools:6[linguist] + kde-frameworks/extra-cmake-modules" + +PATCHES=( "${FILESDIR}"/${PN}-3.2.0.10193-no_fortify_override.patch ) + +src_prepare() { + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DBUILD_TESTING=$(usex test) + -DKDE_INSTALL_SYSCONFDIR=/etc + ) + + cmake_src_configure +} diff --git a/net-misc/packETH/Manifest b/net-misc/packETH/Manifest index 8a8e9d5374dd..a25c4d0f12d3 100644 --- a/net-misc/packETH/Manifest +++ b/net-misc/packETH/Manifest @@ -1 +1,2 @@ DIST packETH-2.1.tar.gz 458750 BLAKE2B c08096e0781fc0174922d2eece31fa5e789ccfd7745eac0f16fbd515c6b5f72c7b9f7575fd215a3a1d0b69d6ae1f08427e5d145abbc83b9cbfeb6c6657d28b35 SHA512 55be4a2eb517c1d040664ea1a16d59dab20b06edbbd073cbf709deb4dfcec8d8eb12b88dfbd578f9bdb0ca614036ac4bbb00be6f865b774da2aa62ce8d3d767e +DIST packETH-3.0.tar.gz 288127 BLAKE2B 5ada3df3ebcfb29ea4b035678899d5271a2c9189513ddd43821f2e264fb31dd8923779c39bdf6066e3cd153c04e4409bdad8fde31f02b01e0dd9650117d6c45a SHA512 5b63483159d7b34c236b797fbdac3526d06fd5e0db34664163b19e643e942ad0919b4eae637047f69f017510e943188219345ff1c6fefa09dcb4023c09501f06 diff --git a/net-misc/packETH/metadata.xml b/net-misc/packETH/metadata.xml index fe1725b8caa9..dbaf797912a7 100644 --- a/net-misc/packETH/metadata.xml +++ b/net-misc/packETH/metadata.xml @@ -10,5 +10,6 @@ </use> <upstream> <remote-id type="sourceforge">packeth</remote-id> +<remote-id type="github">jemcek/packETH</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/packETH/packETH-2.1-r1.ebuild b/net-misc/packETH/packETH-2.1-r1.ebuild new file mode 100644 index 000000000000..91f156e28ba9 --- /dev/null +++ b/net-misc/packETH/packETH-2.1-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Packet generator tool for ethernet" +HOMEPAGE="http://packeth.sourceforge.net/" +SRC_URI="https://github.com/jemcek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cli +gtk" +REQUIRED_USE=" + || ( cli gtk ) +" + +RDEPEND=" + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + ) +" +DEPEND=" + ${RDEPEND} + gtk? ( virtual/pkgconfig ) +" +PATCHES=( + "${FILESDIR}"/${PN}-1.8.1-libs-and-flags.patch + "${FILESDIR}"/${PN}-2.1-fno-common.patch +) +DOCS=( AUTHORS CHANGELOG README ) + +src_prepare() { + default + use gtk && eautoreconf +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861695 + # https://github.com/jemcek/packETH/issues/42 + filter-lto + + use gtk && default +} + +src_compile() { + use gtk && default + use cli && emake \ + CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -C cli +} + +src_install() { + use gtk && default + + if use cli; then + dobin cli/${PN}cli + local i + for i in NEWS README TODO; do newdoc cli/${i} ${i}.cli; done + fi +} diff --git a/net-misc/packETH/packETH-2.1.ebuild b/net-misc/packETH/packETH-2.1.ebuild index 1d4deb15c02e..1ef386ad25be 100644 --- a/net-misc/packETH/packETH-2.1.ebuild +++ b/net-misc/packETH/packETH-2.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Packet generator tool for ethernet" HOMEPAGE="http://packeth.sourceforge.net/" @@ -39,6 +39,11 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861695 + # https://github.com/jemcek/packETH/issues/42 + filter-lto + use gtk && default } diff --git a/net-misc/packETH/packETH-3.0.ebuild b/net-misc/packETH/packETH-3.0.ebuild new file mode 100644 index 000000000000..5ac86e17d30c --- /dev/null +++ b/net-misc/packETH/packETH-3.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Packet generator tool for ethernet" +HOMEPAGE="http://packeth.sourceforge.net/" +SRC_URI="https://github.com/jemcek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cli +gtk" +REQUIRED_USE=" + || ( cli gtk ) +" + +RDEPEND=" + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + ) +" +DEPEND=" + ${RDEPEND} + gtk? ( virtual/pkgconfig ) +" +PATCHES=( + "${FILESDIR}"/${PN}-1.8.1-libs-and-flags.patch +) +DOCS=( AUTHORS CHANGELOG README ) + +src_prepare() { + default + use gtk && eautoreconf +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861695 + # https://github.com/jemcek/packETH/issues/42 + filter-lto + + use gtk && default +} + +src_compile() { + use gtk && default + use cli && emake \ + CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -C cli +} + +src_install() { + use gtk && default + + if use cli; then + dobin cli/${PN}cli + local i + for i in NEWS README TODO; do newdoc cli/${i} ${i}.cli; done + fi +} diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest new file mode 100644 index 000000000000..58e08ceca1b8 --- /dev/null +++ b/net-misc/passt/Manifest @@ -0,0 +1,4 @@ +DIST passt-2024.03.26.tar.xz 195348 BLAKE2B d91e6ac1d50aae04ceb53a34341b545ff644ceccdfcfab461907050612d9d871f61591aac02ebddef9a607a9b39ce5017a2fc47c9189f85b9b9a70a30d010e4c SHA512 da771f8f334862f81702b22688c9d3552aefc2883b5a44c39156ff7a69f301cabf52fa0fb13f8695240db5411c498806d28d847fca8caff2bedb69d1a4b4e5a7 +DIST passt-2024.04.05.tar.xz 195772 BLAKE2B 4c237aeda56455f948d4309624d171612d59fa7ec653e7f89c1aeb05c677ccbdeeaaf6e14c09cda1d5bc88a97fca57dbbe480095e9711045fbd381bd30fb644a SHA512 bf14689cb1c4780d4249562965ff9a5a0515756cbf5af4b531c17982a066f33001a65210959ff8da691ddaa75560ab5691c685a4c1a4b73e742a883d12d2a24b +DIST passt-2024.04.26.tar.xz 196148 BLAKE2B f3a9b9d2a9fa42e0dd35894d4c92890af9935965ccfb3b1751c396080ab0482bd541fe22f09ae7b068f336f1e985b6905d2cc93987a17f243ba6ec97d880ee68 SHA512 f25b9bc695de555048f6a24ec9bb603ec6def0449227ce837b6e46f8cda5816c2450aa733257aaa349260b0b7c05b2d5580ad21010a1a45a74e9eb3027e37d98 +DIST passt-2024.05.10.tar.xz 195992 BLAKE2B 9f4b680daa8103c7de0c92c01824df74e1b221a48cf7724c2c09aae13a3575bdc529eeca01d5015095c51194045e1019bbdf38cc7ef2333d61eaa03b4e0249ae SHA512 04add1113ffbc98d61b7c63352899505d8f19bbdf937a0c025726813163ec7fc31abdb94c12ceefed9b49f18b388acc0687298bce8ba156bbb044d1b1bcdaee3 diff --git a/net-misc/passt/files/Makefile-2024.03.20.patch b/net-misc/passt/files/Makefile-2024.03.20.patch new file mode 100644 index 000000000000..30f36d1f084d --- /dev/null +++ b/net-misc/passt/files/Makefile-2024.03.20.patch @@ -0,0 +1,13 @@ +Addressing following bugs: +https://bugs.gentoo.org/924494 +--- a/Makefile ++++ b/Makefile +@@ -35,7 +35,7 @@ + + FLAGS := -Wall -Wextra -Wno-format-zero-length + FLAGS += -pedantic -std=c11 -D_XOPEN_SOURCE=700 -D_GNU_SOURCE +-FLAGS += -D_FORTIFY_SOURCE=2 -O2 -pie -fPIE ++FLAGS += -O2 -pie -fPIE + FLAGS += -DPAGE_SIZE=$(shell getconf PAGE_SIZE) + FLAGS += -DNETNS_RUN_DIR=\"/run/netns\" + FLAGS += -DPASST_AUDIT_ARCH=AUDIT_ARCH_$(AUDIT_ARCH) diff --git a/net-misc/passt/metadata.xml b/net-misc/passt/metadata.xml new file mode 100644 index 000000000000..35350e9c2beb --- /dev/null +++ b/net-misc/passt/metadata.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>me@rahil.rocks</email> + <name>Rahil Bhimjiani</name> + </maintainer> + <maintainer type="person"> + <email>zmedico@gentoo.org</email> + <name>Zac Medico</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + passt implements a translation layer between a Layer-2 network interface and native Layer-4 sockets (TCP, UDP, ICMP/ICMPv6 echo) on a host. It doesn't require any capabilities or privileges, and it can be used as a simple replacement for Slirp. + + pasta (same binary as passt, different command) offers equivalent functionality, for network namespaces: traffic is forwarded using a tap interface inside the namespace, without the need to create further interfaces on the host, hence not requiring any capabilities or privileges. + + qrap is a wrapper, designed specifically for usage with qemu(1) and passt(1), connecting a UNIX domain socket to a file descriptor, and running qemu(1) with given arguments. + </longdescription> + <upstream> + <bugs-to>https://passt.top/passt/bugs</bugs-to> + <doc>https://passt.top/passt/about/</doc> + </upstream> +</pkgmetadata> diff --git a/net-misc/passt/passt-2024.03.26.ebuild b/net-misc/passt/passt-2024.03.26.ebuild new file mode 100644 index 000000000000..90df839f93d9 --- /dev/null +++ b/net-misc/passt/passt-2024.03.26.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" +HOMEPAGE="https://passt.top/" + +RELEASE_COMMIT="4988e2b" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://passt.top/passt" +else + SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" + S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + KEYWORDS="~amd64 ~arm64 ~riscv" +fi + +LICENSE="BSD GPL-2+" +SLOT="0" +IUSE="static" + +PATCHES=( + "${FILESDIR}"/Makefile-2024.03.20.patch +) + +src_prepare() { + default + tc-export CC +} + +src_compile() { + [[ ${PV} != 9999* ]] && export VERSION="${PV}" + export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" + + emake $(usev static) +} diff --git a/net-misc/passt/passt-2024.04.05.ebuild b/net-misc/passt/passt-2024.04.05.ebuild new file mode 100644 index 000000000000..e4201215e520 --- /dev/null +++ b/net-misc/passt/passt-2024.04.05.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" +HOMEPAGE="https://passt.top/" + +RELEASE_COMMIT="954589b" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://passt.top/passt" +else + SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" + S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + KEYWORDS="~amd64 ~arm64 ~riscv" +fi + +LICENSE="BSD GPL-2+" +SLOT="0" +IUSE="static" + +PATCHES=( + "${FILESDIR}"/Makefile-2024.03.20.patch +) + +src_prepare() { + default + tc-export CC +} + +src_compile() { + [[ ${PV} != 9999* ]] && export VERSION="${PV}" + export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" + + emake $(usev static) +} diff --git a/net-misc/passt/passt-2024.04.26.ebuild b/net-misc/passt/passt-2024.04.26.ebuild new file mode 100644 index 000000000000..c73a0f7c146b --- /dev/null +++ b/net-misc/passt/passt-2024.04.26.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" +HOMEPAGE="https://passt.top/" + +RELEASE_COMMIT="d03c4e2" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://passt.top/passt" +else + SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" + S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + KEYWORDS="~amd64 ~arm64 ~riscv" +fi + +LICENSE="BSD GPL-2+" +SLOT="0" +IUSE="static" + +PATCHES=( + "${FILESDIR}"/Makefile-2024.03.20.patch +) + +src_prepare() { + default + tc-export CC +} + +src_compile() { + [[ ${PV} != 9999* ]] && export VERSION="${PV}" + export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" + + emake $(usev static) +} diff --git a/net-misc/passt/passt-2024.05.10.ebuild b/net-misc/passt/passt-2024.05.10.ebuild new file mode 100644 index 000000000000..9e4992ffaab0 --- /dev/null +++ b/net-misc/passt/passt-2024.05.10.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" +HOMEPAGE="https://passt.top/" + +RELEASE_COMMIT="7288448" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://passt.top/passt" +else + SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" + S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + KEYWORDS="~amd64 ~arm64 ~riscv" +fi + +LICENSE="BSD GPL-2+" +SLOT="0" +IUSE="static" + +PATCHES=( + "${FILESDIR}"/Makefile-2024.03.20.patch +) + +src_prepare() { + default + tc-export CC +} + +src_compile() { + [[ ${PV} != 9999* ]] && export VERSION="${PV}" + export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" + + emake $(usev static) +} diff --git a/net-misc/passt/passt-9999.ebuild b/net-misc/passt/passt-9999.ebuild new file mode 100644 index 000000000000..9e4992ffaab0 --- /dev/null +++ b/net-misc/passt/passt-9999.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp" +HOMEPAGE="https://passt.top/" + +RELEASE_COMMIT="7288448" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://passt.top/passt" +else + SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz" + S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" + KEYWORDS="~amd64 ~arm64 ~riscv" +fi + +LICENSE="BSD GPL-2+" +SLOT="0" +IUSE="static" + +PATCHES=( + "${FILESDIR}"/Makefile-2024.03.20.patch +) + +src_prepare() { + default + tc-export CC +} + +src_compile() { + [[ ${PV} != 9999* ]] && export VERSION="${PV}" + export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}" + + emake $(usev static) +} diff --git a/net-misc/pcapfix/Manifest b/net-misc/pcapfix/Manifest index 23a3cc3dde91..606bb40cbba3 100644 --- a/net-misc/pcapfix/Manifest +++ b/net-misc/pcapfix/Manifest @@ -1 +1,2 @@ -DIST pcapfix-1.1.4.tar.gz 52184 BLAKE2B 4def04cebc9144af86d43c28892575627ed98bf14fa99e5e4fe5181a406871ceeac1f431c73d90daae151bb8b6e5315e8bc47c430d2ed55f9e0c3de1decbe0e9 SHA512 6203e9032d2f24fe5d4aaefd9cfd57ece97a318af3ecd8da7171307a59c2a10b2e92206d5cf96e2dd9bfafc239dd9bc95a224bf5fef9e0c0432a6e76ff10d1da +DIST pcapfix-1.1.7-musl-stdint.patch.bz2 2084 BLAKE2B 2dafe8597f247c1b403e89552403850f10e9a0149a74d092a9187510a997b6339af831ea6f3b01d7ab04367a966828aedc665b517e7108fea9b6d3607815d531 SHA512 5e6d197d6bda6bd10525066a46dc301ae7b92a2a0d9062e3dcef22730b27b12d1b8cd1e58e344f6b4a7bd5b0dfe1351bf868489285bf1651f8aa96f0014b3adf +DIST pcapfix-1.1.7.tar.gz 54784 BLAKE2B c688b3eabf04ff4baf88170c5868edd2b504779a9550ce6a2ca8b4839310b75a26c7e6ae6afc82cf763f19f8ffebe357c730b0ea1bd4b05ed071e78ad6c9f6e5 SHA512 d8d1106349116303f35254f680916f1ea26b163f9afceb5d237eed89880810d4b7b40ebca9de58ec95af2336dd78f4e11af1a08b89f6765055843a9791c156bd diff --git a/net-misc/pcapfix/files/pcapfix-1.1.7-respect-CFLAGS.patch b/net-misc/pcapfix/files/pcapfix-1.1.7-respect-CFLAGS.patch new file mode 100644 index 000000000000..a80419b1a87b --- /dev/null +++ b/net-misc/pcapfix/files/pcapfix-1.1.7-respect-CFLAGS.patch @@ -0,0 +1,21 @@ +https://github.com/Rup0rt/pcapfix/pull/27 + +From: Sam James <sam@gentoo.org> +Date: Wed, 29 Dec 2021 06:48:09 +0000 +Subject: [PATCH] build: respect CFLAGS + +Allow overriding in the environment by using our value +as just a default. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ MANDIR ?= $(PREFIX)/share/man + OPTFLAGS = $(shell getconf LFS_CFLAGS) -D_FORTIFY_SOURCE=2 -O2 -fstack-protector --param=ssp-buffer-size=4 + WARNFLAGS = -Wall -Wextra -std=gnu99 -pedantic -Wformat -Werror=format-security + DEBUGFLAGS = -g +-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) ++CFLAGS ?= $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) + + # Determine extra LDFLAGS + OS := $(shell uname) diff --git a/net-misc/pcapfix/pcapfix-1.1.4.ebuild b/net-misc/pcapfix/pcapfix-1.1.4.ebuild deleted file mode 100644 index 9f2ecbc9c679..000000000000 --- a/net-misc/pcapfix/pcapfix-1.1.4.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Repair and fix broken pcap files" -HOMEPAGE="http://f00l.de/pcapfix/" -SRC_URI="http://f00l.de/pcapfix/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -DOCS=( Changelog README ) - -src_prepare() { - default - sed -e 's/gcc/$(CC) $(CFLAGS)/g' -i Makefile || die - use debug || sed -e 's/DEBUGFLAGS = -g/DEBUGFLAGS =/g' -i Makefile || die -} - -src_install() { - doman pcapfix.1 - dobin pcapfix - einstalldocs -} diff --git a/net-misc/pcapfix/pcapfix-1.1.7.ebuild b/net-misc/pcapfix/pcapfix-1.1.7.ebuild new file mode 100644 index 000000000000..71f00b4ceb75 --- /dev/null +++ b/net-misc/pcapfix/pcapfix-1.1.7.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Repair and fix broken pcap files" +HOMEPAGE="https://f00l.de/pcapfix/" +SRC_URI="https://f00l.de/pcapfix/${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.7-musl-stdint.patch.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +DOCS=( Changelog README ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.7-respect-CFLAGS.patch + "${WORKDIR}"/${PN}-1.1.7-musl-stdint.patch +) + +src_prepare() { + default + + use debug || sed -e 's/DEBUGFLAGS = -g/DEBUGFLAGS =/g' -i Makefile || die +} + +src_configure() { + tc-export CC + + append-lfs-flags +} + +src_install() { + doman pcapfix.1 + dobin pcapfix + einstalldocs +} diff --git a/net-misc/pedro/Manifest b/net-misc/pedro/Manifest index e6352a903816..ea0c572650c4 100644 --- a/net-misc/pedro/Manifest +++ b/net-misc/pedro/Manifest @@ -1,4 +1,2 @@ -DIST pedro-1.12.tgz 1181678 BLAKE2B ed882ab3dae0912519283229d10ff6f12ef4f623d72beaf22b8467e8072752fbd57836a0ebbad0f0ce3da1b4837049161bcb12673e3c38c94eb167e16c0c0a1e SHA512 936b2c6cac526d9d3c0e146b53dc65ed0508c6abd1b66c97656fa5b4011d7dd11912d1c0bf091a29b56e13c3e19ec3e0ad7760d44d4887b939699cdd2389c819 -DIST pedro-1.6.tgz 711856 BLAKE2B 5027dd438995e212889786996debb5765d49828d38ce715672e44776b5fb63db0d6bca0e72339fd5067254aed0b731d3f77656ad510d978e4f456af45d6cf008 SHA512 263f53e447d4b3baab405a1d7313fc397f8a62958957688265c7485a5697b642138636659b5515b9010341655ba8045e5d85f69a86c20baa28edc0dcff0aef42 -DIST pedro-manual-1.6.tar.gz 222863 BLAKE2B 085b118585808aced9217a8001080b589d9dad958ad14787f929a4808b10bb2be80ae7bc04c07b676e41aed9e2ec916215c5d15dda2317f71ecebbc7c1737d96 SHA512 87f8e07e3a687d12e366f1974398996f2346e417680ab534622f901c0c7e1efeb171f0c0dadad46b578122c9e98531570c303d2d3ce04b1cd8150816d6138f99 +DIST pedro-1.14.tgz 1213309 BLAKE2B 104f3816d79534411ba5d78517a744d9a0bf892cf99a1c654a94b9041f4ff038c00d029b182b8f825cfe80cb9861e9440b4e73de3be1f74945a34dbaefb995e7 SHA512 ffe32c296c8325ea31a4bf5d937504e9076654253f19dea17b234f53ba62a4b96e8611cab1dbf545f30734cfd8924e4140b08956180886ac21849546b9ad0cad DIST pedro-manual-1.x.tar.gz 222863 BLAKE2B 085b118585808aced9217a8001080b589d9dad958ad14787f929a4808b10bb2be80ae7bc04c07b676e41aed9e2ec916215c5d15dda2317f71ecebbc7c1737d96 SHA512 87f8e07e3a687d12e366f1974398996f2346e417680ab534622f901c0c7e1efeb171f0c0dadad46b578122c9e98531570c303d2d3ce04b1cd8150816d6138f99 diff --git a/net-misc/pedro/files/pedro-1.12-portage.patch b/net-misc/pedro/files/pedro-1.14-portage.patch index 17b027cebdf0..2bd26d0d92e6 100644 --- a/net-misc/pedro/files/pedro-1.12-portage.patch +++ b/net-misc/pedro/files/pedro-1.14-portage.patch @@ -1,14 +1,18 @@ ---- pedro-1.12.orig/configure.ac 2021-01-06 21:02:47.000000000 -0000 -+++ pedro-1.12/configure.ac 2021-05-31 18:52:32.205375746 -0000 -@@ -4,30 +4,31 @@ +Adapted Gentoo patch from version 1.12 + +diff --git a/configure.ac b/configure.ac +index 21f803d..d89b296 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,30 +4,21 @@ AM_INIT_AUTOMAKE AC_PROG_CC - AC_PROG_LEX + AC_PROG_LEX([noyywrap]) AC_PROG_INSTALL +AM_PROG_AR AC_PROG_RANLIB #AC_PROG_LIBTOOL PKG_CHECK_MODULES([GLIB],[glib-2.0 >= 2.12]) - AM_CONFIG_HEADER(config.h) + AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) -CPPFLAGS="-DNDEBUG -O2 -g `pkg-config --cflags glib-2.0`" +CPPFLAGS="`${PKG_CONFIG} --cflags glib-2.0`" @@ -19,27 +23,23 @@ - LDFLAGS="" - #LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" - LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" -+ #LDFLAGS="" -+ #LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" -+ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" - ;; - *x86*) - WIN32="no" +- ;; +- *x86*) +- WIN32="no" - LDFLAGS="" - #LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" - LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" -+ #LDFLAGS="" -+ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" -+ #LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" ++ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm -lwsock32 -lws2_32 -lwinmm" ;; *) WIN32="no" - #LDFLAGS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" - LDFLAGS="" - LIBS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" -+ #LDFLAGS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" -+ #LDFLAGS="" -+ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" ++ LIBS="-L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" ;; esac - AC_OUTPUT(Makefile src/Makefile src/server/Makefile src/lib/Makefile src/examples/Makefile doc/Makefile) + AC_CONFIG_FILES([Makefile src/Makefile src/server/Makefile src/lib/Makefile src/examples/Makefile doc/Makefile]) +-- +2.43.2 + diff --git a/net-misc/pedro/files/pedro-1.6-portage.patch b/net-misc/pedro/files/pedro-1.6-portage.patch deleted file mode 100644 index 9c9829129b2b..000000000000 --- a/net-misc/pedro/files/pedro-1.6-portage.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure -+++ b/configure -@@ -10478,7 +10478,7 @@ - ac_config_headers="$ac_config_headers config.h" - - #AC_CONFIG_MACRO_DIR([m4]) --CPPFLAGS="-O2 -g `pkg-config --cflags glib-2.0`" -+CPPFLAGS="`${PKG_CONFIG} --cflags glib-2.0`" - case "${host}" in - i[3456789]86-*-mingw32*) - WIN32="yes" -@@ -10486,7 +10486,7 @@ - ;; - *) - WIN32="no" -- LDFLAGS="-L../lib -lpedro `pkg-config --libs glib-2.0` -lm" -+ LDFLAGS="$LDFLAGS -L../lib -lpedro `${PKG_CONFIG} --libs glib-2.0` -lm" - ;; - esac - ac_config_files="$ac_config_files Makefile src/Makefile src/server/Makefile src/lib/Makefile src/examples/Makefile doc/Makefile" diff --git a/net-misc/pedro/metadata.xml b/net-misc/pedro/metadata.xml index 776ccf273d9d..85e4ed814fa2 100644 --- a/net-misc/pedro/metadata.xml +++ b/net-misc/pedro/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>keri@gentoo.org</email> - <name>Keri Harris</name> -</maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/pedro/pedro-1.12.ebuild b/net-misc/pedro/pedro-1.14.ebuild index f513594a09f5..44f6236944f0 100644 --- a/net-misc/pedro/pedro-1.12.ebuild +++ b/net-misc/pedro/pedro-1.14.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools toolchain-funcs @@ -13,7 +13,7 @@ S="${WORKDIR}"/${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="doc examples" RDEPEND="dev-libs/glib:2" diff --git a/net-misc/pedro/pedro-1.6-r1.ebuild b/net-misc/pedro/pedro-1.6-r1.ebuild deleted file mode 100644 index 0d2ffbd916f8..000000000000 --- a/net-misc/pedro/pedro-1.6-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Pedro is a subscription/notification communications system" -HOMEPAGE="https://staff.itee.uq.edu.au/pjr/HomePages/PedroHome.html" -SRC_URI="https://staff.itee.uq.edu.au/pjr/HomePages/PedroFiles/${P}.tgz - doc? ( mirror://gentoo/${PN}-manual-${PV}.tar.gz )" -S="${WORKDIR}"/${P} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="doc examples" - -RDEPEND="dev-libs/glib:2" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-portage.patch -) - -src_configure() { - tc-export PKG_CONFIG - - default -} - -src_install() { - default - - if use doc ; then - dodoc "${WORKDIR}"/${PN}.pdf - fi - - if use examples ; then - docinto examples - dodoc src/examples/*.{c,tcl} - - docinto examples/java_api - dodoc src/java_api/*.java - - docinto examples/python_api - dodoc src/python_api/*.py - fi -} diff --git a/net-misc/pen/metadata.xml b/net-misc/pen/metadata.xml index 85e4ed814fa2..a2b92b59cb82 100644 --- a/net-misc/pen/metadata.xml +++ b/net-misc/pen/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">UlricE/pen</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/pen/pen-0.34.1.ebuild b/net-misc/pen/pen-0.34.1-r1.ebuild index fe17b110abdb..8c9b34137f16 100644 --- a/net-misc/pen/pen-0.34.1.ebuild +++ b/net-misc/pen/pen-0.34.1-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit autotools DESCRIPTION="TCP Load Balancing Port Forwarder" HOMEPAGE="http://siag.nu/pen/" @@ -14,10 +16,17 @@ IUSE="geoip ssl" RDEPEND=" geoip? ( dev-libs/geoip ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( dev-libs/openssl:= ) " DEPEND="${RDEPEND}" +src_prepare() { + default + + # Clang 16, bug #900304 + eautoreconf +} + src_configure() { econf --with-docdir=/usr/share/doc/${PF} \ $(use_with geoip) \ diff --git a/net-misc/pimpd/pimpd-0.8-r1.ebuild b/net-misc/pimpd/pimpd-0.8-r1.ebuild index 8c5762a44ff5..444c6799e7cb 100644 --- a/net-misc/pimpd/pimpd-0.8-r1.ebuild +++ b/net-misc/pimpd/pimpd-0.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://cats.meow.at/~peter/pimpd_${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc sparc x86" +KEYWORDS="~amd64 ~ppc sparc x86" src_compile() { emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" diff --git a/net-misc/pingu/pingu-1.5.ebuild b/net-misc/pingu/pingu-1.5-r1.ebuild index 1d074daa34ea..95ee72e03c46 100644 --- a/net-misc/pingu/pingu-1.5.ebuild +++ b/net-misc/pingu/pingu-1.5-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit systemd tmpfiles toolchain-funcs +inherit edo systemd tmpfiles toolchain-funcs DESCRIPTION="Policy routing daemon with failover and load-balancing" HOMEPAGE="https://github.com/ncopa/pingu" @@ -14,26 +14,33 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug doc" -RDEPEND="dev-libs/libev:=" +RDEPEND="dev-libs/libev" DEPEND="${RDEPEND} - sys-kernel/linux-headers + sys-kernel/linux-headers" +BDEPEND=" virtual/pkgconfig - doc? ( app-text/asciidoc )" + doc? ( app-text/asciidoc ) +" # Fix QA with install into path /run/pingu must be created at runtime PATCHES=( "${FILESDIR}"/"${P}"-makefile.patch ) +QA_CONFIG_IMPL_DECL_SKIP=( 'strlcpy' ) + src_prepare() { default # Fix compilation issue - sed -i '/icp->un.frag.__unused = 0;/d' src/icmp.c \ - || die "sed failed for src/icmp.c" + sed -e '/icp->un.frag.__unused = 0;/d' -i src/icmp.c || die } src_configure() { - ./configure "$(use_enable debug)" "$(use_enable doc)" \ - --prefix=/usr || die "configure failed" + local myconf=( + $(use_enable debug) + $(use_enable doc) + --prefix=/usr + ) + edo ./configure "${myconf[@]}" } src_compile() { diff --git a/net-misc/pingu/pingu-9999.ebuild b/net-misc/pingu/pingu-9999.ebuild deleted file mode 100644 index 30ea3b2eab70..000000000000 --- a/net-misc/pingu/pingu-9999.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit git-r3 systemd tmpfiles toolchain-funcs - -DESCRIPTION="Policy routing daemon with failover and load-balancing" -HOMEPAGE="https://github.com/ncopa/pingu" -SRC_URI="" -EGIT_REPO_URI="https://github.com/ncopa/${PN}.git" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="" -IUSE="debug doc" - -RDEPEND="dev-libs/libev:=" -DEPEND="${RDEPEND} - sys-kernel/linux-headers - virtual/pkgconfig - doc? ( app-text/asciidoc )" - -# Fix QA with install into path /run/pingu must be created at runtime -PATCHES=( "${FILESDIR}"/"${PN}"-1.5-makefile.patch ) - -src_configure() { - ./configure "$(use_enable debug)" "$(use_enable doc)" \ - --prefix=/usr || die "configure failed" -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - default - - newtmpfiles "${FILESDIR}"/pingu.tmpfile pingu.conf - newinitd "${FILESDIR}"/pingu.initd pingu - newconfd "${FILESDIR}"/pingu.confd pingu - systemd_dounit "${FILESDIR}"/pingu.service - keepdir /var/lib/pingu - insinto /etc/pingu - newins pingu.conf pingu.conf.example -} - -pkg_postinst() { - tmpfiles_process pingu.conf -} diff --git a/net-misc/pipes/pipes-1.16.1-r1.ebuild b/net-misc/pipes/pipes-1.16.1-r1.ebuild index 11036b37088e..d70a57b6fc05 100644 --- a/net-misc/pipes/pipes-1.16.1-r1.ebuild +++ b/net-misc/pipes/pipes-1.16.1-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="Very versatile TCP pipes" @@ -11,6 +12,7 @@ SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ~s390 x86" + PATCHES=( "${FILESDIR}"/${P}-execlp.patch ) @@ -19,7 +21,7 @@ src_compile() { # Prevent the build system from looking for dependencies touch .depend || die - emake CC=$(tc-getCC) OPTIM="${CFLAGS}" LDFLAGS="${CFLAGS} ${LDFLAGS}" + emake CC="$(tc-getCC)" OPTIM="${CFLAGS}" LDFLAGS="${CFLAGS} ${LDFLAGS}" } src_install() { diff --git a/net-misc/plowshare/Manifest b/net-misc/plowshare/Manifest index f19083910926..21887a16b4c6 100644 --- a/net-misc/plowshare/Manifest +++ b/net-misc/plowshare/Manifest @@ -1,2 +1 @@ -DIST plowshare-2.1.6.tar.gz 95946 BLAKE2B 1a3c420bc3370e03946f3f813ccecdec6b567245ee49cdf9f7b7788e41fed60b93931e7038e34f6edcbe8a00ed201681c28ae29ffb0aaec10112d03f653231c8 SHA512 bccc72f1add6389fd7fc41a27f9e169c622e3a4e7c9c1040c01a8a4569accc9b0b6910815a013d5e8aff7103ee26d943665ffeccc02db1879eca580b3892190d DIST plowshare-2.1.7.tar.gz 96282 BLAKE2B bfec7fba200d783fcba5051738f98f7cd862eede1661b4d72062bd111b394800406443e52ecf2f0b771b90a9834a87fae01a6055828e8a12446126c593daa01c SHA512 7fe91d3756c55ffc1daf9275bfd2413f2644accd8fa69f2b1064696e1435f9b8be9515907c8249ffde85436dc6966f1d42bad94ccfbde93ae584dcc0d642c215 diff --git a/net-misc/plowshare/plowshare-2.1.6-r1.ebuild b/net-misc/plowshare/plowshare-2.1.6-r1.ebuild deleted file mode 100644 index cacd5eb72e61..000000000000 --- a/net-misc/plowshare/plowshare-2.1.6-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Command-line downloader and uploader for file-sharing websites" -HOMEPAGE="https://github.com/mcrapet/plowshare" -SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="+javascript view-captcha" - -RDEPEND=" - >=app-shells/bash-4 - || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) - dev-vcs/git - net-misc/curl - sys-apps/util-linux - virtual/imagemagick-tools[tiff] - javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) - view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )" - -# NOTES: -# javascript dep should be any javascript interpreter using /usr/bin/js - -src_prepare() { - # Fix doc install path - sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed" - - default -} - -src_compile() { - # There is a Makefile but it's not compiling anything, let's not try. - : -} - -src_test() { - # Disable tests because all of them need a working Internet connection. - : -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" \ - PLOWSHARE_FORCE_VERSION="${PV}" install -} - -pkg_postinst() { - elog "plowshare is not delivered with modules by default anymore" - elog "Per-user modules can be installed/updated with the plowmod command" - if ! use javascript; then - ewarn "Without javascript you will not be able to use modules" - ewarn "requering a Javascript shell (/usr/bin/js)" - fi -} diff --git a/net-misc/plowshare/plowshare-2.1.7-r1.ebuild b/net-misc/plowshare/plowshare-2.1.7-r2.ebuild index cacd5eb72e61..f2207e36da41 100644 --- a/net-misc/plowshare/plowshare-2.1.7-r1.ebuild +++ b/net-misc/plowshare/plowshare-2.1.7-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Command-line downloader and uploader for file-sharing websites" HOMEPAGE="https://github.com/mcrapet/plowshare" @@ -10,7 +10,7 @@ SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="+javascript view-captcha" +IUSE="javascript view-captcha" RDEPEND=" >=app-shells/bash-4 @@ -19,7 +19,7 @@ RDEPEND=" net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] - javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) + javascript? ( dev-java/rhino ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )" # NOTES: diff --git a/net-misc/plowshare/plowshare-9999.ebuild b/net-misc/plowshare/plowshare-9999.ebuild index 1c454b8d9c40..314455ade5a5 100644 --- a/net-misc/plowshare/plowshare-9999.ebuild +++ b/net-misc/plowshare/plowshare-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit git-r3 @@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/mcrapet/plowshare.git" LICENSE="GPL-3" SLOT="0" -IUSE="+javascript view-captcha" +IUSE="javascript view-captcha" RDEPEND=" >=app-shells/bash-4 @@ -20,7 +20,7 @@ RDEPEND=" net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] - javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) + javascript? ( dev-java/rhino ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )" # NOTES: diff --git a/net-misc/portfwd/files/portfwd-0.29-build-system.patch b/net-misc/portfwd/files/portfwd-0.29-build-system.patch new file mode 100644 index 000000000000..e69c33cb5ef2 --- /dev/null +++ b/net-misc/portfwd/files/portfwd-0.29-build-system.patch @@ -0,0 +1,77 @@ +--- a/configure.in ++++ b/configure.in +@@ -8,6 +8,7 @@ dnl Checks for programs. + AC_PROG_CC + AC_PROG_CXX + AC_PROG_YACC ++AM_PROG_AR + AM_PROG_LEX + AC_PROG_RANLIB + +@@ -45,6 +46,7 @@ dnl ) + dnl Checks for MSG_PROXY symbol + AC_TRY_RUN( + [ ++#include <stdlib.h> + #include <sys/socket.h> + int main() + { +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,3 @@ + SUBDIRS = getopt src tools doc + +-docdir = $(prefix)/doc/portfwd + doc_DATA = COPYING README CREDITS TODO +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -3,5 +3,4 @@ + man_MANS = portfwd.8 portfwd.cfg.5 + noinst_DATA = INSTALL.configure + +-docdir = $(prefix)/doc/portfwd + doc_DATA = FAQ conf.txt +--- a/getopt/Makefile.am ++++ b/getopt/Makefile.am +@@ -3,9 +3,9 @@ noinst_LIBRARIES = libgetopt.a + libgetopt_a_SOURCES = getopt.c getopt1.c + + getopt.o: getopt.c +- $(CC) -o $@ -c $< ++ $(CC) @CFLAGS@ -o $@ -c $< + cp $@ ../src + getopt1.o: getopt1.c +- $(CC) -o $@ -c $< ++ $(CC) @CFLAGS@ -o $@ -c $< + cp $@ ../src + +--- a/getopt/getopt.c ++++ b/getopt/getopt.c +@@ -91,6 +91,8 @@ + # endif + #endif + ++#include <string.h> ++ + /* This version of `getopt' appears to the caller like standard Unix `getopt' + but it behaves differently for the user, since it allows the user + to intersperse the options with the other arguments. +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,6 +1,4 @@ +-CFLAGS = -Wall -ggdb -O3 -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\" +-CXXFLAGS = $(CFLAGS) +-INCLUDES = -I$(top_srcdir)/src ++AM_CPPFLAGS = -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\" -I$(top_srcdir)/src + + sbin_PROGRAMS = portfwd + portfwd_SOURCES = addr.cc from_addr.cc host_map.cc portfwd.cc \ +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -1,5 +1,4 @@ +-CXXFLAGS = -Wall -g -O3 +-INCLUDES = -I$(top_srcdir)/src ++AM_CPPFLAGS = -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\" -I$(top_srcdir)/src + + noinst_PROGRAMS = t_vector udp_rcv udp_snd + diff --git a/net-misc/portfwd/portfwd-0.29-r1.ebuild b/net-misc/portfwd/portfwd-0.29-r1.ebuild deleted file mode 100644 index c64a3293d245..000000000000 --- a/net-misc/portfwd/portfwd-0.29-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools systemd - -DESCRIPTION="Port Forwarding Daemon" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -HOMEPAGE="http://portfwd.sourceforge.net" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86" - -src_prepare() { - default - - cd src - sed -iorig \ - -e "s:^CFLAGS =.*:CFLAGS = @CFLAGS@ -Wall -DPORTFWD_CONF=\\\\\"\$(sysconfdir)/portfwd.cfg\\\\\":" \ - -e "s:^CXXFLAGS =.*:CPPFLAGS = @CXXFLAGS@ -Wall -DPORTFWD_CONF=\\\\\"\$(sysconfdir)/portfwd.cfg\\\\\":" \ - Makefile.am || die - cd ../tools - sed -iorig \ - -e "s:^CXXFLAGS =.*:CPPFLAGS = @CXXFLAGS@ -Wall -DPORTFWD_CONF=\\\\\"\$(sysconfdir)/portfwd.cfg\\\\\":" \ - Makefile.am || die - cd ../getopt - sed -iorig -e "s:$.CC.:\$(CC) @CFLAGS@:g" Makefile.am || die - cd ../doc - sed -iorig -e "s:/doc/portfwd:/share/doc/$P:" Makefile.am || die - cd .. - sed -iorig -e "s:/doc/portfwd:/share/doc/$P:" Makefile.am || die - - eautoreconf -} - -src_install() { - default - - dodoc cfg/* - - newinitd "${FILESDIR}"/${PN}.init ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service -} diff --git a/net-misc/portfwd/portfwd-0.29-r2.ebuild b/net-misc/portfwd/portfwd-0.29-r2.ebuild new file mode 100644 index 000000000000..1b230495fa9e --- /dev/null +++ b/net-misc/portfwd/portfwd-0.29-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="Port Forwarding Daemon" +HOMEPAGE="http://portfwd.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86" + +PATCHES=( + "${FILESDIR}"/${PN}-0.29-build-system.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + + dodoc cfg/* + + newinitd "${FILESDIR}"/${PN}.init ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + systemd_dounit "${FILESDIR}"/${PN}.service +} diff --git a/net-misc/portspoof/portspoof-1.3.ebuild b/net-misc/portspoof/portspoof-1.3-r1.ebuild index 48332848d894..7eec0c399ab3 100644 --- a/net-misc/portspoof/portspoof-1.3.ebuild +++ b/net-misc/portspoof/portspoof-1.3-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit flag-o-matic DESCRIPTION="return SYN+ACK for every port connection attempt" HOMEPAGE="http://portspoof.org/" @@ -9,9 +11,6 @@ LICENSE="GPL-2+" SLOT="0" IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" - if [[ ${PV} == "9999" ]] ; then inherit git-r3 autotools EGIT_REPO_URI="https://github.com/drk1wi/${PN}.git" @@ -21,15 +20,27 @@ else fi src_prepare() { + default if [[ ${PV} == "9999" ]] ; then - mv configure.in configure.ac || die + mv configure.in configure.ac || die eautoreconf fi sed -i \ 's#/usr/local/bin/portspoof -D -c /usr/local/etc/portspoof.conf -s /usr/local/etc/portspoof_signatures#/usr/bin/portspoof -D -c /etc/portspoof.conf -s /etc/portspoof_signatures#'\ system_files/init.d/portspoof.sh sed -i '/#include <sys\/sysctl.h>/d' src/connection.h || die - eapply_user +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861698 + # https://github.com/drk1wi/portspoof/issues/48 + # + # Do not trust it with LTO either + append-flags -fno-strict-aliasing + filter-lto + + default } src_install() { diff --git a/net-misc/portspoof/portspoof-9999.ebuild b/net-misc/portspoof/portspoof-9999.ebuild index 48332848d894..7eec0c399ab3 100644 --- a/net-misc/portspoof/portspoof-9999.ebuild +++ b/net-misc/portspoof/portspoof-9999.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit flag-o-matic DESCRIPTION="return SYN+ACK for every port connection attempt" HOMEPAGE="http://portspoof.org/" @@ -9,9 +11,6 @@ LICENSE="GPL-2+" SLOT="0" IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" - if [[ ${PV} == "9999" ]] ; then inherit git-r3 autotools EGIT_REPO_URI="https://github.com/drk1wi/${PN}.git" @@ -21,15 +20,27 @@ else fi src_prepare() { + default if [[ ${PV} == "9999" ]] ; then - mv configure.in configure.ac || die + mv configure.in configure.ac || die eautoreconf fi sed -i \ 's#/usr/local/bin/portspoof -D -c /usr/local/etc/portspoof.conf -s /usr/local/etc/portspoof_signatures#/usr/bin/portspoof -D -c /etc/portspoof.conf -s /etc/portspoof_signatures#'\ system_files/init.d/portspoof.sh sed -i '/#include <sys\/sysctl.h>/d' src/connection.h || die - eapply_user +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861698 + # https://github.com/drk1wi/portspoof/issues/48 + # + # Do not trust it with LTO either + append-flags -fno-strict-aliasing + filter-lto + + default } src_install() { diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest index 0aab6ab8a197..a97efc6454f4 100644 --- a/net-misc/pps-tools/Manifest +++ b/net-misc/pps-tools/Manifest @@ -1 +1,2 @@ DIST pps-tools-1.0.2.tar.gz 12701 BLAKE2B bc60a9ea94bb57bcc2b7870da433ef04fbbc30e5c4d880b719a8e7fcabba0bef2996c086e6993b879f2515cd0c685659bfed5371904401e35120ae1e9dc0891a SHA512 fa86455ece83700d5a1c522082f78ed324927fb9f53d3cf5f615a566a39e54938a41e82b6d4ae23d57c273fb923f96db4ca2d071199795d020952703afa53fcb +DIST pps-tools-1.0.3.tar.gz 12949 BLAKE2B a57be9e7e3c9969a6bfd91bbdd618ab875c9c92cad3a2206653f2719896cf293e87ca941484d60d9af22ae1a64daa10689621504edc652a31b2bf6af8741eb64 SHA512 0906180a95346f315e784c7e28e1b5efc2a70a76b7489337a5fc215d174eac37ba58bdc1bc96fe2a0f9083334ed96b9b09ade2a252652095bab7ced5504deeea diff --git a/net-misc/pps-tools/pps-tools-1.0.2.ebuild b/net-misc/pps-tools/pps-tools-1.0.2-r1.ebuild index be0e8d3fa125..d279c9009305 100644 --- a/net-misc/pps-tools/pps-tools-1.0.2.ebuild +++ b/net-misc/pps-tools/pps-tools-1.0.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 inherit toolchain-funcs @@ -11,8 +11,7 @@ SRC_URI="https://github.com/redlab-i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~sparc x86" PATCHES=( "${FILESDIR}"/${PN}-1.0.2-build.patch diff --git a/net-misc/pps-tools/pps-tools-1.0.3.ebuild b/net-misc/pps-tools/pps-tools-1.0.3.ebuild new file mode 100644 index 000000000000..8936557e6f07 --- /dev/null +++ b/net-misc/pps-tools/pps-tools-1.0.3.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="User-space tools for LinuxPPS" +HOMEPAGE="https://github.com/redlab-i/pps-tools" +SRC_URI="https://github.com/redlab-i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86" + +src_configure() { + tc-export CC + + default +} diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest index 5dd68809c8d0..1549eddf5141 100644 --- a/net-misc/proxychains/Manifest +++ b/net-misc/proxychains/Manifest @@ -1 +1,2 @@ DIST proxychains-ng-4.14.tar.xz 33844 BLAKE2B 598dd7973fd341a9916ece55ee18aeb0e0654d01659ffd3f5b7b9437fbb3660376aca77cd1326553a1beffd1ea4f95c6eb3da9c0f6ce43f3d72b1a16cf2bab4e SHA512 75a1a4629d2b7ebac9b909a694b395339cf669fa4e23bfcc57938e46377b5619f31c9651d2bc457d1ad10ec1be7747981106392bf8bf65999cb7bb9c748d7e95 +DIST proxychains-ng-4.17.tar.xz 45288 BLAKE2B 3e34742dc06fa80fceeb5250c48584c53fc8d4231147d9ef7a5aff21acfae0f814916c89033d1f92d3cf0cbb96d4031cb9769fa81c1cba81259ca34fb1182f63 SHA512 aa35ae27305065a7f296cbf99b3308b2ac759287761a5d234ddaa558292467fae88c33a3ced1d71329cf6a7e8f56aa4e2ffd4274d57d87857f13ca8393d5d983 diff --git a/net-misc/proxychains/files/proxychains-4.17-makefile.patch b/net-misc/proxychains/files/proxychains-4.17-makefile.patch new file mode 100644 index 000000000000..149fd39be88e --- /dev/null +++ b/net-misc/proxychains/files/proxychains-4.17-makefile.patch @@ -0,0 +1,54 @@ +diff --git a/Makefile b/Makefile +index 11d0df8..8e9874d 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,9 +28,8 @@ LOBJS = src/version.o \ + + GENH = src/version.h + +-CFLAGS += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe +-NO_AS_NEEDED = -Wl,--no-as-needed +-LDFLAGS = -fPIC $(NO_AS_NEEDED) $(LIBDL) $(PTHREAD) ++CFLAGS = -Wall -std=c99 -D_GNU_SOURCE ++LIBS = -ldl -lpthread + INC = + PIC = -fPIC + AR = $(CROSS_COMPILE)ar +@@ -41,15 +40,15 @@ LDSO_SUFFIX = so + LD_SET_SONAME = -Wl,-soname= + INSTALL = ./tools/install.sh + +-LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX) ++LDSO_PATHNAME = libproxychains.$(LDSO_SUFFIX) + + SHARED_LIBS = $(LDSO_PATHNAME) + ALL_LIBS = $(SHARED_LIBS) +-PXCHAINS = proxychains4 +-PXCHAINS_D = proxychains4-daemon ++PXCHAINS = proxychains ++PXCHAINS_D = proxychains-daemon + ALL_TOOLS = $(PXCHAINS) $(PXCHAINS_D) + ALL_CONFIGS = src/proxychains.conf +-ZSH_COMPLETION = completions/zsh/_proxychains4 ++ZSH_COMPLETION = completions/zsh/_proxychains + + -include config.mak + +@@ -93,14 +92,13 @@ src/version.o: src/version.h + $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $< + + $(LDSO_PATHNAME): $(LOBJS) +- $(CC) $(LDFLAGS) $(FAT_LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) \ +- $(USER_LDFLAGS) -shared -o $@ $^ $(SOCKET_LIBS) ++ $(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -shared $(PIC) -o $@ $^ $(LIBS) $(SOCKET_LIBS) + + $(PXCHAINS): $(OBJS) +- $(CC) $^ $(FAT_BIN_LDFLAGS) $(USER_LDFLAGS) $(LIBDL) -o $@ ++ $(CC) $(LDFLAGS) $^ $(FAT_BIN_LDFLAGS) $(USER_LDFLAGS) $(LIBDL) -o $@ + + $(PXCHAINS_D): $(DOBJS) +- $(CC) $^ $(FAT_BIN_LDFLAGS) $(USER_LDFLAGS) -o $@ ++ $(CC) $(LDFLAGS) $^ $(FAT_BIN_LDFLAGS) $(USER_LDFLAGS) -o $@ + + + .PHONY: all clean install install-config install-libs install-tools install-zsh-completion diff --git a/net-misc/proxychains/metadata.xml b/net-misc/proxychains/metadata.xml index 17257e610c72..63d1cbd32283 100644 --- a/net-misc/proxychains/metadata.xml +++ b/net-misc/proxychains/metadata.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> + <maintainer type="person" proxied="yes"> + <email>hlein@korelogic.com</email> + <name>Hank Leininger</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <longdescription lang="en"> Program that hooks network-related libc functions diff --git a/net-misc/proxychains/proxychains-4.14.ebuild b/net-misc/proxychains/proxychains-4.14.ebuild index 286e4ae4ae23..cf482e5bfd32 100644 --- a/net-misc/proxychains/proxychains-4.14.ebuild +++ b/net-misc/proxychains/proxychains-4.14.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 @@ -14,7 +14,7 @@ SRC_URI="http://ftp.barfooze.de/pub/sabotage/tarballs/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~sparc x86" +KEYWORDS="amd64 ppc ~riscv ~sparc x86" S=${WORKDIR}/${MY_P} diff --git a/net-misc/proxychains/proxychains-4.17.ebuild b/net-misc/proxychains/proxychains-4.17.ebuild new file mode 100644 index 000000000000..54aa7c5f8772 --- /dev/null +++ b/net-misc/proxychains/proxychains-4.17.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PN=${PN}-ng +MY_P=${MY_PN}-${PV} + +DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)" +HOMEPAGE="https://github.com/rofl0r/proxychains-ng/" +SRC_URI="http://ftp.barfooze.de/pub/sabotage/tarballs/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86" + +S=${WORKDIR}/${MY_P} + +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) + +src_prepare() { + default + sed -i "s/^\(LDSO_SUFFIX\).*/\1 = so.${PV}/" Makefile || die + mv completions/zsh/_proxychains4 completions/zsh/_proxychains || die + tc-export CC +} + +src_configure() { + # not autotools + ./configure \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --sysconfdir="${EPREFIX}"/etc \ + || die +} + +src_install() { + dobin ${PN} + dodoc AUTHORS README TODO + + dolib.so lib${PN}.so.${PV} + dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1} + dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so + + insinto /etc + doins src/${PN}.conf +} diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest index 20fb7d1cc425..400919b07711 100644 --- a/net-misc/proxytunnel/Manifest +++ b/net-misc/proxytunnel/Manifest @@ -1,3 +1 @@ -DIST proxytunnel-1.10.20200907.tar.gz 54711 BLAKE2B 79b5fc459ece793997b4407679498af29c53aa495802259f95ec600665fca815f9e43cafcbf1d0407c4f7184c21e7dae3f899413dbeeaf0924034e1bbd26cddb SHA512 f04570e87a0fda024661135b6598f87f1d7407c368fe3453300a655fefedb66ade96a742223de08b500ba9fc1fdc2e6519005ea38529ceaa3c1815f5012fca84 -DIST proxytunnel-1.10.20210128.tar.gz 54702 BLAKE2B e873f20c37b5c0dc66a2a6767cfb8d9f73e7cfceaf99e03750eb5fd72acd33bd42281c2eec7e1a72ccecdd7fcd62c8592926c55c206aad220ed5b0b9bc3d357e SHA512 188ab239362cc7c9fd05ddaeaa85aee45c9040ac8f39f10cd0a97c2b92f49a9f5b854690b945109474492955c46b1f5c87e3251bfe68b22d3f1b3a21cf17eda0 -DIST proxytunnel-1.10.20210604.tar.gz 54872 BLAKE2B f8e70bd81a541bd3ecf0ed09fedc57396531aeec460eaff125046700d1a9c69f110590a5b81f650fdaba0c5938dd401a2937ee7347a4e33a3b89ac36bb915a7c SHA512 8cf88cda45646575b1eebbca3e8fe0de0edb6bcbecfb5b06cc50fdb863717f7c72b0a52c6d0f70f99284c1b2914f455f0965366b16e331c12e1bb98296b9b7ae +DIST proxytunnel-1.12.2.tar.gz 58973 BLAKE2B ffa518278660c816b27ae6c497d744d6588ba9be29fab2ce254bcbc4695fc8e5339e836da541c6aed7a73c2d1e5207f529ca9b818ddbf02b699856d43bb85a57 SHA512 b336e24e9243900999f7253032d666322404377e62d56e2365c13008f242dcc8f7c7c3075d362a9ee29d424aa698feca7d973f839362a40314caa984ee8ad352 diff --git a/net-misc/proxytunnel/proxytunnel-1.10.20200907.ebuild b/net-misc/proxytunnel/proxytunnel-1.10.20200907.ebuild deleted file mode 100644 index c4cce456a92d..000000000000 --- a/net-misc/proxytunnel/proxytunnel-1.10.20200907.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Connect stdin and stdout to a server via an HTTPS proxy" -HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ https://proxytunnel.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="static" - -RDEPEND="dev-libs/openssl:=" -DEPEND="${RDEPEND} - app-text/asciidoc - app-text/xmlto - " -BDEPEND="virtual/pkgconfig" - -DOCS=( CHANGES CREDITS INSTALL.md KNOWN_ISSUES LICENSE.txt README.md RELNOTES TODO ) - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -fi - -src_prepare() { - default - sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!" -} - -src_compile() { - use static && append-ldflags -static - emake CC="$(tc-getCC)" -} - -src_install() { - emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" - einstalldocs -} diff --git a/net-misc/proxytunnel/proxytunnel-1.10.20210128.ebuild b/net-misc/proxytunnel/proxytunnel-1.10.20210128.ebuild deleted file mode 100644 index e15bad2afce3..000000000000 --- a/net-misc/proxytunnel/proxytunnel-1.10.20210128.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Connect stdin and stdout to a server via an HTTPS proxy" -HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ https://proxytunnel.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="static" - -RDEPEND="dev-libs/openssl:=" -DEPEND="${RDEPEND} - app-text/asciidoc - app-text/xmlto - " -BDEPEND="virtual/pkgconfig" - -DOCS=( CHANGES CREDITS INSTALL.md KNOWN_ISSUES LICENSE.txt README.md RELNOTES TODO ) - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -fi - -src_prepare() { - default - sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!" -} - -src_compile() { - use static && append-ldflags -static - emake CC="$(tc-getCC)" -} - -src_install() { - emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" - einstalldocs -} diff --git a/net-misc/proxytunnel/proxytunnel-1.10.20210604.ebuild b/net-misc/proxytunnel/proxytunnel-1.12.2.ebuild index e15bad2afce3..3de0355f2f6c 100644 --- a/net-misc/proxytunnel/proxytunnel-1.10.20210604.ebuild +++ b/net-misc/proxytunnel/proxytunnel-1.12.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/net-misc/ps3mediaserver/metadata.xml b/net-misc/ps3mediaserver/metadata.xml index e2d40d1092d9..fbdbd02c4d42 100644 --- a/net-misc/ps3mediaserver/metadata.xml +++ b/net-misc/ps3mediaserver/metadata.xml @@ -4,8 +4,8 @@ <!-- maintainer-needed --> <use> <flag name="multiuser">Allow renderer customization per-user.</flag> - <flag name="transcode">Install optional dependencies for transcoding support via media-video/mplayer</flag> - <flag name="tsmuxer">Install optional dependencies for transcoding support via media-video/tsmuxer</flag> + <flag name="transcode">Install optional dependencies for transcoding support via <pkg>media-video/mplayer</pkg></flag> + <flag name="tsmuxer">Install optional dependencies for transcoding support via <pkg>media-video/tsmuxer</pkg></flag> </use> <upstream> <remote-id type="google-code">ps3mediaserver</remote-id> diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.90.1-r1.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.90.1-r2.ebuild index 9549e0bea26f..b0938ec85d0f 100644 --- a/net-misc/ps3mediaserver/ps3mediaserver-1.90.1-r1.ebuild +++ b/net-misc/ps3mediaserver/ps3mediaserver-1.90.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit desktop xdg DESCRIPTION="DLNA compliant UPNP server for streaming media to Playstation 3" HOMEPAGE="https://github.com/ps3mediaserver/ps3mediaserver" -SRC_URI="mirror://sourceforge/project/ps3mediaserver/pms-${PV}-generic-linux-unix.tar.gz" +SRC_URI="https://downloads.sourceforge.net/project/ps3mediaserver/pms-${PV}-generic-linux-unix.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="multiuser +transcode tsmuxer" BDEPEND="app-arch/unzip" -RDEPEND=">=virtual/jre-1.6.0 +RDEPEND=">=virtual/jre-1.8:* media-libs/libmediainfo media-libs/libzen tsmuxer? ( media-video/tsmuxer ) @@ -28,7 +28,7 @@ src_prepare() { default if use multiuser; then - cat > ${PN} <<-EOF + cat > ${PN} <<-EOF || die #!/bin/sh if [ ! -e ~/.${PN} ]; then echo "Copying ${PMS_HOME} to ~/.${PN}" @@ -38,14 +38,14 @@ src_prepare() { exec "\${PMS_HOME}/PMS.sh" "\$@" EOF else - cat > ${PN} <<-EOF + cat > ${PN} <<-EOF || die #!/bin/sh export PMS_HOME=${PMS_HOME} exec "\${PMS_HOME}/PMS.sh" "\$@" EOF fi - cat > ${PN}.desktop <<-EOF + cat > ${PN}.desktop <<-EOF || die [Desktop Entry] Name=PS3 Media Server GenericName=Media Server diff --git a/net-misc/pssh/pssh-2.3.4-r1.ebuild b/net-misc/pssh/pssh-2.3.4-r3.ebuild index 81921416658f..7992ab01da29 100644 --- a/net-misc/pssh/pssh-2.3.4-r1.ebuild +++ b/net-misc/pssh/pssh-2.3.4-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_SINGLE_IMPL=1 - +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 DESCRIPTION="PSSH provides parallel versions of OpenSSH and related tools" @@ -15,19 +15,16 @@ SRC_URI="https://github.com/lilydjwg/pssh/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" -RDEPEND="net-misc/openssh - !net-misc/putty" +RDEPEND=" + !net-misc/putty + virtual/openssh +" DEPEND="${RDEPEND}" # Requires ssh access to run. RESTRICT="test" -pkg_setup() { - python-single-r1_pkg_setup -} - python_prepare_all() { sed -i -e "s|man/man1'|share/&|g" setup.py || die distutils-r1_python_prepare_all diff --git a/net-misc/ptpd/files/ptpd2.rc b/net-misc/ptpd/files/ptpd2.rc index bf8e14332298..4896d68149c0 100644 --- a/net-misc/ptpd/files/ptpd2.rc +++ b/net-misc/ptpd/files/ptpd2.rc @@ -27,9 +27,9 @@ checkconfig() { # colorize output echo "$msgout" | while read ln; do - if [[ "$ln" == *ignored* ]]; then + if [ "$ln" = *ignored* ]; then ewarn "$ln" - elif [[ "$ln" != "Configuration OK" ]]; then + elif [ "$ln" != "Configuration OK" ]; then eerror "$ln" fi done diff --git a/net-misc/ptpd/ptpd-2.3.1-r1.ebuild b/net-misc/ptpd/ptpd-2.3.1-r1.ebuild deleted file mode 100644 index 9c358e02c8f6..000000000000 --- a/net-misc/ptpd/ptpd-2.3.1-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic systemd - -DESCRIPTION="Precision Time Protocol daemon" -HOMEPAGE="https://github.com/ptpd/ptpd" - -SRC_URI="https://github.com/ptpd/ptpd/archive/${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~x86" - -LICENSE="BSD" -SLOT="0" -IUSE="debug experimental ntp +pcap snmp slave-only +statistics" -RDEPEND=" - pcap? ( net-libs/libpcap ) - snmp? ( net-analyzer/net-snmp )" -DEPEND="${RDEPEND}" -RDEPEND="${RDEPEND} - ntp? ( net-misc/ntp )" - -S=${WORKDIR}/ptpd-${P} - -src_prepare() { - eapply_user - sed -i -e 's/U64/struct counter64/' src/dep/snmp.c || die "sed failed" - eautoreconf -} - -src_configure() { - append-flags -fno-strict-aliasing - econf \ - --enable-daemon \ - $(use_enable snmp) \ - $(use_enable experimental experimental-options) \ - $(use_enable statistics) \ - $(use_enable debug runtime-debug) \ - $(use_enable pcap) \ - $(use_enable slave-only) -} - -src_install() { - emake install DESTDIR="${D}" - - insinto /etc - newins "src/ptpd2.conf.minimal" ptpd2.conf - - newinitd "${FILESDIR}/ptpd2.rc" ptpd2 - newconfd "${FILESDIR}/ptpd2.confd" ptpd2 - - systemd_dounit "${FILESDIR}/ptpd2.service" -} - -pkg_postinst() { - elog "Do not forget to setup correct network interface." - elog "Change the config file ${EROOT}etc/ptpd2.conf to suit your needs." -} diff --git a/net-misc/ptpd/ptpd-2.3.1-r2.ebuild b/net-misc/ptpd/ptpd-2.3.1-r2.ebuild index 96dae3022e0d..6b5600180760 100644 --- a/net-misc/ptpd/ptpd-2.3.1-r2.ebuild +++ b/net-misc/ptpd/ptpd-2.3.1-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools flag-o-matic systemd DESCRIPTION="Precision Time Protocol daemon" HOMEPAGE="https://github.com/ptpd/ptpd" SRC_URI="https://github.com/ptpd/ptpd/archive/${P}.tar.gz" +S="${WORKDIR}/ptpd-${P}" KEYWORDS="~amd64 ~arm ~x86" LICENSE="BSD" @@ -25,11 +26,8 @@ PATCHES=( "${FILESDIR}"/${PN}-2.3.1-fix-snmp.patch ) -S=${WORKDIR}/ptpd-${P} - src_prepare() { default - eautoreconf } @@ -61,5 +59,5 @@ src_install() { pkg_postinst() { elog "Do not forget to setup correct network interface." - elog "Change the config file ${EROOT}etc/ptpd2.conf to suit your needs." + elog "Change the config file ${EROOT}/etc/ptpd2.conf to suit your needs." } diff --git a/net-misc/puf/puf-1.0.0-r1.ebuild b/net-misc/puf/puf-1.0.0-r1.ebuild deleted file mode 100644 index cc241aa7a92c..000000000000 --- a/net-misc/puf/puf-1.0.0-r1.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A download tool for UNIX-like systems" -HOMEPAGE="http://puf.sourceforge.net/" -SRC_URI="mirror://sourceforge/puf/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -DOCS=( AUTHORS NEWS README TODO ) diff --git a/net-misc/puf/puf-1.0.0-r2.ebuild b/net-misc/puf/puf-1.0.0-r2.ebuild new file mode 100644 index 000000000000..bb6d8e87f1c2 --- /dev/null +++ b/net-misc/puf/puf-1.0.0-r2.ebuild @@ -0,0 +1,12 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Download tool for UNIX-like systems" +HOMEPAGE="https://puf.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/puf/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest new file mode 100644 index 000000000000..0d4ba16c8758 --- /dev/null +++ b/net-misc/pulseaudio-dlna/Manifest @@ -0,0 +1 @@ +DIST pulseaudio-dlna-0.6.5-1.tar.gz 712483 BLAKE2B baf1fc94f41c9ac2ca7df5c239ace36b36da4d7a40e30cf19fa630f51a0e94fa44a1ba531943ad5c4425580e4bbe68af1d5de48f5f17163783aab7b471faa72e SHA512 6fd59ac6ff0dfa98baed7a5d929c6f7d9f3539016a6383770895732f7066bc260b3d56751691573d0834a0ee29a6e542ef26e66e48c7a7af97cc84ca23ff5c2d diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1-r1.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1-r1.ebuild new file mode 100644 index 000000000000..596bd3f68add --- /dev/null +++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools + +inherit desktop distutils-r1 + +DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio" +HOMEPAGE="https://github.com/Cygn/pulseaudio-dlna" + +if [[ ${PV} == *9999 ]];then + EGIT_REPO_URI="https://github.com/Cygn/pulseaudio-dlna" + inherit git-r3 +else + MY_P=${PN}-${PV/_p/-} + + SRC_URI="https://github.com/Cygn/pulseaudio-dlna/archive/refs/tags/${MY_P}.tar.gz" + S="${WORKDIR}"/${PN}-${MY_P} + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" + +RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}] + >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] + >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] + >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] + >=dev-python/notify2-0.3[${PYTHON_USEDEP}] + >=dev-python/psutil-5.4.7[${PYTHON_USEDEP}] + >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}] + >=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}] + >=dev-python/netifaces-0.10.0[${PYTHON_USEDEP}] + >=dev-python/lxml-3[${PYTHON_USEDEP}] + >=dev-python/pychromecast-10[${PYTHON_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + >=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}] + >=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}] + gnome-base/librsvg[introspection] + x11-libs/gtk+:3[introspection] + || ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] ) + || ( + || ( + media-video/ffmpeg[encode,mp3,opus,vorbis] + media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] + ) + ( + media-libs/flac + media-sound/lame + media-sound/opus-tools + media-sound/sox + media-sound/vorbis-tools + ) + )" + +python_prepare_all() { + sed -i -e 's/.gz//' setup.py || die + + distutils-r1_python_prepare_all +} + +src_install() { + distutils-r1_src_install + + domenu "${FILESDIR}"/${PN}.desktop +} diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild index d314e16809df..41b49563f683 100644 --- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild +++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild @@ -1,27 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_7 python3_8 python3_9 ) +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools inherit desktop distutils-r1 DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio" -HOMEPAGE="https://github.com/masmu/pulseaudio-dlna" +HOMEPAGE="https://github.com/Cygn/pulseaudio-dlna" if [[ ${PV} == *9999 ]];then + EGIT_REPO_URI="https://github.com/Cygn/pulseaudio-dlna" inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/masmu/pulseaudio-dlna" - EGIT_BRANCH="python3" else - SRC_URI="https://github.com/masmu/pulseaudio-dlna/archive/v${PV}.tar.gz -> ${P}.tar.gz" + MY_P=${PN}-${PV/_p/-} + + SRC_URI="https://github.com/Cygn/pulseaudio-dlna/archive/refs/tags/${MY_P}.tar.gz" + S="${WORKDIR}"/${PN}-${MY_P} + KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-3" SLOT="0" -IUSE="" RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}] >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] @@ -33,13 +36,13 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}] >=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}] >=dev-python/netifaces-0.10.0[${PYTHON_USEDEP}] >=dev-python/lxml-3[${PYTHON_USEDEP}] - >=dev-python/pychromecast-2.3.0[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] + >=dev-python/pychromecast-10[${PYTHON_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] >=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}] >=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}] - dev-python/pygobject[cairo,${PYTHON_USEDEP}] gnome-base/librsvg[introspection] x11-libs/gtk+:3[introspection] + media-sound/pulseaudio-daemon || ( || ( media-video/ffmpeg[encode,mp3,opus,vorbis] @@ -54,20 +57,14 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}] ) )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - media-sound/pulseaudio" - python_prepare_all() { - sed -i '/dbus-python/d' setup.py || die - sed -i '/notify2/d' setup.py || die - sed -i '/docopt/d' setup.py || die - sed -i '/pychromecast/d' setup.py || die + sed -i -e 's/.gz//' setup.py || die + distutils-r1_python_prepare_all } src_install() { distutils-r1_src_install - domenu "${FILESDIR}/${PN}.desktop" + domenu "${FILESDIR}"/${PN}.desktop } diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest index 071ce9c471f5..e13e75e9f078 100644 --- a/net-misc/putty/Manifest +++ b/net-misc/putty/Manifest @@ -1,2 +1,2 @@ -DIST putty-0.76.tar.gz 2735687 BLAKE2B 7994a8ea4eb735091e92438fd9558b1047b2ddffe53e3cd2ae7c182e333d21482de7c1a549b738d00af1e592e078648b153fa095a9e5310ee4a884c0cc9fb896 SHA512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25 +DIST putty-0.81.tar.gz 2844616 BLAKE2B f4f687555ae6d043f9eb868eccb1086227a0fa3ec1a5eff68ab7ccd96c877fd87afad9c9639930e899e0fc16058ea0f4553a3035ab477761038d6257332d64af SHA512 d86f2fd0e126b18275d58cf64334b3b27c450899a1c2be2502de9faa2ef58f7fc8efc5d45f25c8395623f1e21917aa02407343bb2fee44c4c00b9f81267d5ecd DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml index 56d8ef2b4271..6d9cc6eb57e8 100644 --- a/net-misc/putty/metadata.xml +++ b/net-misc/putty/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> </maintainer> <longdescription lang="en"> PuTTY is a free implementation of Telnet and SSH for Windows and Unix @@ -15,6 +15,5 @@ <use> <flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag> <flag name="gtk">Build the PuTTY client which requires <pkg>x11-libs/gtk+</pkg>. If disabled only the CLI tools puttygen, plink, pscp and psftp will be built</flag> - <flag name="gtk2">Build the PuTTY client with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3</flag> </use> </pkgmetadata> diff --git a/net-misc/putty/putty-0.76.ebuild b/net-misc/putty/putty-0.76.ebuild deleted file mode 100644 index 62ac436ba4c6..000000000000 --- a/net-misc/putty/putty-0.76.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools desktop toolchain-funcs xdg-utils - -DESCRIPTION="A Free Telnet/SSH Client" -HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/" -LICENSE="MIT" - -SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86" -SRC_URI=" - https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2 - https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz -" -IUSE="doc +gtk gtk2 ipv6 gssapi" -RDEPEND=" - !net-misc/pssh - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf - x11-libs/libX11 - x11-libs/pango - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3[X] ) - ) - gssapi? ( virtual/krb5 ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - dev-lang/perl - virtual/pkgconfig -" -REQUIRED_USE=" - gtk2? ( gtk ) -" - -src_prepare() { - default - - sed -i \ - -e 's|-Werror||g' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - cd "${S}"/unix || die - econf \ - $(use_with gssapi) \ - $(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) ) -} - -src_compile() { - emake -C "${S}"/doc - emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6) -} - -src_test() { - emake -C unix cgtest - unix/cgtest || die -} - -src_install() { - dodoc doc/puttydoc.txt - - if use doc; then - docinto html - dodoc doc/*.html - fi - - cd "${S}"/unix || die - default - - if use gtk ; then - for i in 16 22 24 32 48 64 128 256; do - newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png - done - - # install desktop file provided by Gustav Schaffter in #49577 - make_desktop_entry ${PN} PuTTY ${PN} Network - fi -} - -pkg_postinst() { - use gtk && xdg_icon_cache_update -} - -pkg_postrm() { - use gtk && xdg_icon_cache_update -} diff --git a/net-misc/putty/putty-0.81.ebuild b/net-misc/putty/putty-0.81.ebuild new file mode 100644 index 000000000000..fdd92be3c643 --- /dev/null +++ b/net-misc/putty/putty-0.81.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake desktop xdg-utils + +DESCRIPTION="A Free Telnet/SSH Client" +HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/" +SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git" +else + SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz" + KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86" +fi +LICENSE="MIT" + +SLOT="0" +IUSE="debug doc +gtk gssapi" + +RDEPEND=" + !net-misc/pssh + gtk? ( + dev-libs/glib:2 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + x11-libs/libX11 + x11-libs/pango + ) + gssapi? ( virtual/krb5 ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + doc? ( app-text/halibut ) +" + +src_unpack() { + [[ ${PV} == *9999 ]] && git-r3_src_unpack + default +} + +src_configure() { + cd "${S}"/unix || die + local mycmakeargs=( + -DPUTTY_DEBUG="$(usex debug)" + -DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)" + -DPUTTY_GTK_VERSION=$(usex gtk 3 '') + -DPUTTY_IPV6=yes + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile all doc +} + +src_install() { + cmake_src_install + + doman "${BUILD_DIR}"/doc/*.1 + + if use doc ; then + docinto html + dodoc "${BUILD_DIR}"/doc/html/*.html + fi + + if use gtk ; then + local i + for i in 16 22 24 32 48 64 128 256; do + newicon -s ${i} \ + "${WORKDIR}"/${PN}-icons/${PN}-${i}.png \ + ${PN}.png + done + + # install desktop file provided by Gustav Schaffter in #49577 + make_desktop_entry ${PN} PuTTY ${PN} Network + fi +} + +pkg_postinst() { + use gtk && xdg_icon_cache_update +} + +pkg_postrm() { + use gtk && xdg_icon_cache_update +} diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild deleted file mode 100644 index 68b02e9dd70b..000000000000 --- a/net-misc/putty/putty-9999.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 autotools desktop git-r3 toolchain-funcs xdg-utils - -DESCRIPTION="A Free Telnet/SSH Client" -HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/" -EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git" -SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2" -LICENSE="MIT" - -SLOT="0" -KEYWORDS="" -IUSE="doc +gtk gtk2 ipv6 gssapi" - -RDEPEND=" - !net-misc/pssh - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf - x11-libs/libX11 - x11-libs/pango - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3[X] ) - ) - gssapi? ( virtual/krb5 ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - app-doc/halibut - dev-lang/perl - virtual/pkgconfig -" -REQUIRED_USE=" - gtk2? ( gtk ) -" - -src_unpack() { - git-r3_src_unpack - default -} - -src_prepare() { - default - - sed -i \ - -e 's|-Werror||g' \ - configure.ac || die - - ./mkfiles.pl || die - - eautoreconf -} - -src_configure() { - cd "${S}"/unix || die - econf \ - $(use_with gssapi) \ - $(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) ) -} - -src_compile() { - emake -C "${S}"/doc - emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6) -} - -src_test() { - emake -C unix cgtest - unix/cgtest || die -} - -src_install() { - dodoc doc/puttydoc.txt - - if use doc; then - docinto html - dodoc doc/*.html - fi - - cd "${S}"/unix || die - default - - if use gtk ; then - for i in 16 22 24 32 48 64 128 256; do - newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png - done - - # install desktop file provided by Gustav Schaffter in #49577 - make_desktop_entry ${PN} PuTTY ${PN} Network - fi -} - -pkg_postinst() { - use gtk && xdg_icon_cache_update -} - -pkg_postrm() { - use gtk && xdg_icon_cache_update -} diff --git a/net-misc/pyhoca-cli/Manifest b/net-misc/pyhoca-cli/Manifest deleted file mode 100644 index 5d6dd9b07e1a..000000000000 --- a/net-misc/pyhoca-cli/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pyhoca-cli-0.6.1.2.tar.gz 41891 BLAKE2B a3183acc8b4a809e5b3894bbcb276972f3bf0178f2a9f596e697866db4217ca4e04d6b3d698b202e124a2e42a3b1f9b2f0fbd595bf0483f55dd7dbe9ea108ef3 SHA512 02bb6a0dcb72bc67e8b8109e554f04fa57d5b2da2682b50a081b60e19c257842ae31aabb7faa945579fb23d0e922befd0678c413b31393d368b4173e0d4315f6 diff --git a/net-misc/pyhoca-cli/metadata.xml b/net-misc/pyhoca-cli/metadata.xml deleted file mode 100644 index 16a79c44fca7..000000000000 --- a/net-misc/pyhoca-cli/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>voyageur@gentoo.org</email> - <name>Bernard Cafarelli</name> - </maintainer> - <stabilize-allarches/> - <longdescription> -PyHoca-CLI is a client implementation for X2Go using the project's Python API (Python module). PyHoca-CLI can be operated completely from the command line and the goal is to reflect the full functionality spectrum of Python X2Go. - </longdescription> -</pkgmetadata> diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild deleted file mode 100644 index 153510b8ebcd..000000000000 --- a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 - -DESCRIPTION="X2Go command line client" -HOMEPAGE="http://www.x2go.org" -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" - -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -RDEPEND=" - dev-python/setproctitle[${PYTHON_USEDEP}] - >=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]" - -python_prepare_all() { - # we don't need setuptools at runtime - sed -i -e '/install_requires/d' setup.py || die - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install - python_doscript ${PN} -} - -python_install_all() { - distutils-r1_python_install_all - doman man/man1/* - find "${ED}" -name '*.pth' -delete || die -} diff --git a/net-misc/pyhoca-gui/Manifest b/net-misc/pyhoca-gui/Manifest deleted file mode 100644 index 00ef21627149..000000000000 --- a/net-misc/pyhoca-gui/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pyhoca-gui-0.6.1.1.tar.gz 2099727 BLAKE2B 944ee3cd743d502ce320759b9200c74de13802e23aabc2a5fe5659e123e2bbc368bf8a216c73de2c2ed22408d8fe50b4b945cc0714d05e1cb0faa1e5617dd4b0 SHA512 e7e24d60c1e4ecca2201c2a25bfc8c5552e54e30a5f744c5bc9c36ba4050a64cbb8616ab2e035b34cd14c62702ff88e32c863cac8aef0f8f4cb18db1d2e737b6 diff --git a/net-misc/pyhoca-gui/metadata.xml b/net-misc/pyhoca-gui/metadata.xml deleted file mode 100644 index 4c89615fa22e..000000000000 --- a/net-misc/pyhoca-gui/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>voyageur@gentoo.org</email> - <name>Bernard Cafarelli</name> - </maintainer> - <stabilize-allarches/> - <longdescription> -PyHoca-GUI is a client implementation for X2Go using the project's Python X2Go client API (a Python module). PyHoca-GUI uses wxPython for rendering graphical desktop elements (menus, dialog boxes etc.). - -PyHoca-GUI is designed as a very minimal GUI that behaves very similar to GNOME's network manager applet (nm-applet). It appears as a small Phoca icon (a little seal) that docks to your systray panel (also called notification area) and allows you to manage multiple X2go sessions simultaneously. - </longdescription> -</pkgmetadata> diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild deleted file mode 100644 index 671e506e1ffe..000000000000 --- a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 - -DESCRIPTION="X2Go graphical client applet" -HOMEPAGE="http://www.x2go.org" -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" - -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/pycups[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}] - dev-python/wxpython[${PYTHON_USEDEP}] - >=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}] - x11-libs/libnotify" -BDEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]" - -python_prepare_all() { - # we don't need setuptools at runtime - sed -i -e '/install_requires/d' setup.py || die - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install - python_doscript ${PN} -} - -python_install_all() { - distutils-r1_python_install_all - doman man/man1/* - find "${ED}" -name '*.pth' -delete || die -} diff --git a/net-misc/python-x2go/Manifest b/net-misc/python-x2go/Manifest deleted file mode 100644 index 5e9ae0111bf7..000000000000 --- a/net-misc/python-x2go/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST python-x2go-0.6.1.3.tar.gz 247754 BLAKE2B 9c5705da9c1656a29ae7382dfaedb1798d8728006dbfcb0ec47441bba63a1c85f9ee60f0d8e5cb040dfec177ab72381518e0756ca5a9374e3ea7f1ab29d54dfb SHA512 3933ad8ee7debd6d643ce12ce06a6a98c7c97fae5a30f99ca147ce57ac7fa8e1b2fd97439a8c3b39ac5c5d0c7cecf4f3571193092e057db536d061f0d1d4accc diff --git a/net-misc/python-x2go/metadata.xml b/net-misc/python-x2go/metadata.xml deleted file mode 100644 index 842c118f5ebe..000000000000 --- a/net-misc/python-x2go/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>voyageur@gentoo.org</email> - <name>Bernard Cafarelli</name> - </maintainer> - <stabilize-allarches/> - <longdescription> -The Python X2Go module integrates X2Go client support into your python programmes. -Python X2Go is used in the headless X2Go client "pyhoca-cli" and by the tiny systray GUI applet "pyhoca-gui" - </longdescription> -</pkgmetadata> diff --git a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild deleted file mode 100644 index 8b908430c3c8..000000000000 --- a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 - -DESCRIPTION="X2Go client-side Python API" -HOMEPAGE="http://www.x2go.org" -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -# TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp -RDEPEND=" - dev-python/gevent[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/python-xlib[${PYTHON_USEDEP}] - net-misc/nx" diff --git a/net-misc/qtm/metadata.xml b/net-misc/qtm/metadata.xml index c59a75f5deff..4ff4504747c1 100644 --- a/net-misc/qtm/metadata.xml +++ b/net-misc/qtm/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">catkin</remote-id> </upstream> diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest deleted file mode 100644 index 579eea17a844..000000000000 --- a/net-misc/quagga/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b056958ae2fa28bd2e9e8d9902e569a8f9a2925ba45396bb92e345bfcaf8ca1ef9136a433c615a5bd12a279e7c062939549a SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8 -DIST quagga-1.2.4.tar.gz 2925847 BLAKE2B e0e8d8b8e2243bc5cecc2e66d26040780f839414a16fb8a719d25a6fe1c29dc8545a92700a3758100715e1efb3d874584903885af51ef9f5d88c4a02d02dbc74 SHA512 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd diff --git a/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch b/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch deleted file mode 100644 index f6b726b591f7..000000000000 --- a/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix for missing definitions on some Hardened configurations -Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=437292 - -diff -Naur quagga-0.99.16.orig/zebra/ipforward_sysctl.c quagga-0.99.16/zebra/ipforward_sysctl.c ---- quagga-0.99.16.orig/zebra/ipforward_sysctl.c 2010-03-11 12:11:32.000000000 -0500 -+++ quagga-0.99.16/zebra/ipforward_sysctl.c 2010-03-11 12:11:39.000000000 -0500 -@@ -31,6 +31,15 @@ - - #define MIB_SIZ 4 - -+/* Fix for recent (2.6.14) kernel headers */ -+#ifndef IPCTL_FORWARDING -+ #define IPCTL_FORWARDING NET_IPV4_FORWARD -+#endif -+ -+#ifndef IP6CTL_FORWARDING -+ #define IP6CTL_FORWARDING NET_IPV6_FORWARDING -+#endif -+ - extern struct zebra_privs_t zserv_privs; - - /* IPv4 forwarding control MIB. */ diff --git a/net-misc/quagga/files/quagga-services.init.3 b/net-misc/quagga/files/quagga-services.init.3 deleted file mode 100644 index e613b26abb03..000000000000 --- a/net-misc/quagga/files/quagga-services.init.3 +++ /dev/null @@ -1,43 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -: ${CFGFILE:=/etc/quagga/${SVCNAME}.conf} - -pidfile=/run/quagga/${SVCNAME}.pid - -command=/usr/sbin/${SVCNAME} -command_args="-d -f ${CFGFILE} ${EXTRA_OPTS} --pid_file ${pidfile}" - -get_service_config() { - [ -e "$CFGFILE" ] || return - - awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE" -} - -depend() { - config "$CFGFILE" - - [ ${SVCNAME} = "zebra" ] && need net || need zebra - - [ "$(get_service_config log)" = "syslog" ] && \ - use logger -} - -start_pre() { - if [ ! -e "${CFGFILE}" ] ; then - eerror "Before starting ${SVCNAME} you have to configure it, by creating" - eerror "a ${CFGFILE} file." - eerror "" - eerror "A sample file has been installed in `echo /usr/share/doc/quagga-*/samples/${SVCNAME}.conf.sample*`" - return 1 - fi - - checkpath -d -m 0750 -o quagga:quagga /run/quagga - - if [ ${SVCNAME} = "zebra" ]; then - ebegin "Cleaning up stale zebra routes..." - ip route flush proto zebra - eend $? - fi -} diff --git a/net-misc/quagga/files/quagga.pam b/net-misc/quagga/files/quagga.pam deleted file mode 100644 index 9a91ad852fbd..000000000000 --- a/net-misc/quagga/files/quagga.pam +++ /dev/null @@ -1,26 +0,0 @@ -#%PAM-1.0 -# - -##### if running quagga as root: -# Only allow root (and possibly wheel) to use this because enable access -# is unrestricted. -auth sufficient pam_rootok.so - -# Uncomment the following line to implicitly trust users in the "wheel" group. -#auth sufficient pam_wheel.so trust use_uid -# Uncomment the following line to require a user to be in the "wheel" group. -#auth required pam_wheel.so use_uid -########################################################### - -# If using quagga privileges and with a seperate group for vty access, then -# access can be controlled via the vty access group, and pam can simply -# check for valid user/password, eg: -# -# only allow local users. -#auth required pam_securetty.so -#auth include system-auth -#auth required pam_nologin.so -#account include system-auth -#password include system-auth -#session include system-auth -#session optional pam_console.so diff --git a/net-misc/quagga/files/systemd/bgpd.service b/net-misc/quagga/files/systemd/bgpd.service deleted file mode 100644 index f5db0b2510ec..000000000000 --- a/net-misc/quagga/files/systemd/bgpd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=BGP routing daemon -Documentation=man:bgpd(8) man:zebra(8) -BindsTo=zebra.service -After=network.target zebra.service -ConditionPathExists=/etc/quagga/bgpd.conf - -[Service] -Type=forking -PIDFile=/run/quagga/bgpd.pid -ExecStart=/usr/sbin/bgpd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/isisd.service b/net-misc/quagga/files/systemd/isisd.service deleted file mode 100644 index 10eb0a8fe1d8..000000000000 --- a/net-misc/quagga/files/systemd/isisd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=IS-IS routing daemon -Documentation=man:isis(8) man:zebra(8) -BindsTo=zebra.service -After=network.target zebra.service -ConditionPathExists=/etc/quagga/isisd.conf - -[Service] -Type=forking -PIDFile=/run/quagga/isisd.pid -ExecStart=/usr/sbin/isisd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/nhrpd.service b/net-misc/quagga/files/systemd/nhrpd.service deleted file mode 100644 index 1a93bae61b14..000000000000 --- a/net-misc/quagga/files/systemd/nhrpd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=NHRP daemon -Documentation=man:nhrpd(8) man:zebra(8) -BindsTo=zebra.service -After=network.target zebra.service -ConditionPathExists=/etc/quagga/nhrpd.conf - -[Service] -Type=forking -PIDFile=/run/quagga/nhrpd.pid -ExecStart=/usr/sbin/nhrpd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/ospf6d.service b/net-misc/quagga/files/systemd/ospf6d.service deleted file mode 100644 index b6372d10d898..000000000000 --- a/net-misc/quagga/files/systemd/ospf6d.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=OSPF routing daemon for IPv6 -Documentation=man:ospfd(8) man:zebra(8) -BindsTo=zebra.service -After=network.target zebra.service -ConditionPathExists=/etc/quagga/ospf6d.conf - -[Service] -Type=forking -PIDFile=/run/quagga/ospf6d.pid -ExecStart=/usr/sbin/ospf6d -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/ospfd.service b/net-misc/quagga/files/systemd/ospfd.service deleted file mode 100644 index 310d219c0014..000000000000 --- a/net-misc/quagga/files/systemd/ospfd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=OSPF routing daemon -Documentation=man:ospfd(8) man:zebra(8) -BindsTo=zebra.service -After=network.target zebra.service -ConditionPathExists=/etc/quagga/ospfd.conf - -[Service] -Type=forking -PIDFile=/run/quagga/ospfd.pid -ExecStart=/usr/sbin/ospfd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/pimd.service b/net-misc/quagga/files/systemd/pimd.service deleted file mode 100644 index d39f59696c51..000000000000 --- a/net-misc/quagga/files/systemd/pimd.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=PIM-SSM routing daemon -Documentation=man:zebra(8) -BindsTo=zebra.service -After=network.target zebra.service -ConditionPathExists=/etc/quagga/pimd.conf - -[Service] -Type=forking -PIDFile=/run/quagga/pimd.pid -ExecStart=/usr/sbin/pimd -d -ExecReload=/bin/kill -HUP $MAINPID -SuccessExitStatus=1 -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/quagga.conf b/net-misc/quagga/files/systemd/quagga.conf deleted file mode 100644 index 296083753e0a..000000000000 --- a/net-misc/quagga/files/systemd/quagga.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/quagga 0750 quagga quagga diff --git a/net-misc/quagga/files/systemd/ripd.service b/net-misc/quagga/files/systemd/ripd.service deleted file mode 100644 index b2a74df47fb9..000000000000 --- a/net-misc/quagga/files/systemd/ripd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=RIP routing daemon -Documentation=man:ripd(8) man:zebra(8) -BindsTo=zebra.service -After=network.target zebra.service -ConditionPathExists=/etc/quagga/ripd.conf - -[Service] -Type=forking -PIDFile=/run/quagga/ripd.pid -ExecStart=/usr/sbin/ripd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/ripngd.service b/net-misc/quagga/files/systemd/ripngd.service deleted file mode 100644 index 75c60d8395b5..000000000000 --- a/net-misc/quagga/files/systemd/ripngd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=RIP routing daemon for IPv6 -Documentation=man:ripngd(8) man:zebra(8) -BindsTo=zebra.service -After=network.target zebra.service -ConditionPathExists=/etc/quagga/ripngd.conf - -[Service] -Type=forking -PIDFile=/run/quagga/ripngd.pid -ExecStart=/usr/sbin/ripngd -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/quagga/files/systemd/zebra.service b/net-misc/quagga/files/systemd/zebra.service deleted file mode 100644 index d2374411b459..000000000000 --- a/net-misc/quagga/files/systemd/zebra.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=GNU Zebra routing manager -Documentation=man:zebra(8) -After=network.target -ConditionPathExists=/etc/quagga/zebra.conf - -[Service] -Type=forking -PIDFile=/run/quagga/zebra.pid -ExecStartPre=/bin/ip route flush proto zebra -ExecStart=/usr/sbin/zebra -d -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml deleted file mode 100644 index b4781a230f1f..000000000000 --- a/net-misc/quagga/metadata.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> - <longdescription> - Quagga is a modern fork of Zebra. Quagga is a routing software package that provides TCP/IP - based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2, - OSPFv3, BGP-4, and BGP-4+. Quagga also supports special BGP Route Reflector and Route Server - behavior. In addition to traditional IPv4 routing protocols, Quagga also supports IPv6 routing - protocols. With SNMP daemon which supports SMUX protocol, Quagga provides routing protocol - MIBs. Furthermore Quagga supports OSPFAPI, a API interface to the OSPF LSDB. It supports - inspection as well as injection of normal and opaque OSPF LSAs. Applications like SRRD - The - Service Rounting Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF - routing domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood - service state information into the routing domain - </longdescription> - <use> - <flag name="bgpclassless"> - Apply unofficial patch to enable classless prefixes for BGP. Patch and information to be found - at http://hasso.linux.ee/doku.php/english:network:quagga - </flag> - <flag name="fpm"> - Enable Forwarding Plane Manager support - </flag> - <flag name="multipath"> - Enable multipath routes support for any number of routes - </flag> - <flag name="nhrpd"> - Build Next Hop Resolution Protocol daemon - </flag> - <flag name="ospfapi"> - Enable OSPFAPI support for client applications accessing the OSPF link state database - </flag> - <flag name="pam"> - Add support for PAM (via <pkg>sys-libs/pam</pkg>) to the Quagga Virtual Terminal Interface - Shell (vtysh); if the readline USE flag is disabled, this flag is ignored - </flag> - <flag name="protobuf"> - Enable support for <pkg>dev-libs/protobuf</pkg> - </flag> - <flag name="readline"> - Enable support for <pkg>sys-libs/readline</pkg> to provide the Quagga Virtual Terminal - Interface Shell (vtysh) - </flag> - <flag name="tcp-zebra"> - Enable TCP zserv interface on port 2600 for Zebra/protocol-daemon communication. Unix domain - sockets are chosen otherwise - </flag> - </use> -</pkgmetadata> diff --git a/net-misc/quagga/quagga-1.2.4-r2.ebuild b/net-misc/quagga/quagga-1.2.4-r2.ebuild deleted file mode 100644 index a2be0d887b3d..000000000000 --- a/net-misc/quagga/quagga-1.2.4-r2.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch - -inherit autotools flag-o-matic pam readme.gentoo-r1 systemd tmpfiles - -DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP" -HOMEPAGE="https://www.quagga.net/" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz - bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ppc ~s390 sparc x86" - -IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - acct-group/quagga - acct-user/quagga - virtual/libcrypt:= - caps? ( sys-libs/libcap ) - nhrpd? ( net-dns/c-ares:0= ) - protobuf? ( dev-libs/protobuf-c:0= ) - readline? ( - sys-libs/readline:0= - pam? ( sys-libs/pam ) - ) - snmp? ( net-analyzer/net-snmp:= ) - !elibc_glibc? ( dev-libs/libpcre )" -DEPEND="${COMMON_DEPEND} - sys-apps/gawk - sys-devel/libtool:2 - test? ( dev-util/dejagnu )" -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2" - -PATCHES=( - "${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch" -) - -DISABLE_AUTOFORMATTING=1 -DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples -You have to create config files in /etc/quagga before -starting one of the daemons. - -You can pass additional options to the daemon by setting the EXTRA_OPTS -variable in their respective file in /etc/conf.d" - -src_prepare() { - # Classless prefixes for BGP - # http://hasso.linux.ee/doku.php/english:network:quagga - use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}" - - eapply "${PATCHES[@]}" - eapply_user - eautoreconf -} - -src_configure() { - # -fcommon is added as a workaround for bug #707422 - append-flags -fno-strict-aliasing -fcommon - - # do not build PDF docs - export ac_cv_prog_PDFLATEX=no - export ac_cv_prog_LATEXMK=no - - econf \ - --enable-exampledir=/usr/share/doc/${PF}/samples \ - --enable-irdp \ - --enable-isisd \ - --enable-isis-topology \ - --enable-pimd \ - --enable-user=quagga \ - --enable-group=quagga \ - --enable-vty-group=quagga \ - --with-cflags="${CFLAGS}" \ - --with-pkg-extra-version="-gentoo" \ - --sysconfdir=/etc/quagga \ - --localstatedir=/run/quagga \ - --disable-static \ - $(use_enable caps capabilities) \ - $(usex snmp '--enable-snmp' '' '' '') \ - $(use_enable !elibc_glibc pcreposix) \ - $(use_enable fpm) \ - $(use_enable tcp-zebra) \ - $(use_enable doc) \ - $(usex multipath $(use_enable multipath) '' '=0' '') \ - $(usex ospfapi '--enable-ospfclient' '' '' '') \ - $(use_enable readline vtysh) \ - $(use_with pam libpam) \ - $(use_enable nhrpd) \ - $(use_enable protobuf) \ - $(use_enable ipv6 ripngd) \ - $(use_enable ipv6 ospf6d) \ - $(use_enable ipv6 rtadv) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - readme.gentoo_create_doc - - keepdir /etc/quagga - fowners root:quagga /etc/quagga - fperms 0770 /etc/quagga - - # Install systemd-related stuff, bug #553136 - dotmpfiles "${FILESDIR}/systemd/quagga.conf" - systemd_dounit "${FILESDIR}/systemd/zebra.service" - - # install zebra as a file, symlink the rest - newinitd "${FILESDIR}"/quagga-services.init.3 zebra - - for service in bgpd isisd ospfd pimd ripd $(use ipv6 && echo ospf6d ripngd) $(use nhrpd && echo nhrpd); do - dosym zebra /etc/init.d/${service} - systemd_dounit "${FILESDIR}/systemd/${service}.service" - done - - use readline && use pam && newpamd "${FILESDIR}/quagga.pam" quagga - - insinto /etc/logrotate.d - newins redhat/quagga.logrotate quagga -} - -pkg_postinst() { - # Path for PIDs before first reboot should be created here, bug #558194 - tmpfiles_process quagga.conf - - readme.gentoo_print_elog -} diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest new file mode 100644 index 000000000000..e6a6b380d23b --- /dev/null +++ b/net-misc/r8125/Manifest @@ -0,0 +1,5 @@ +DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6 +DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d +DIST r8125-9.009.02.tar.bz2 89916 BLAKE2B 2dd8ad226f8ad9dd4e6646cdce66f0c12a6a657aa39c6e91892f410780ed245046fc94f247939958db7b950aa045e011716ecd7f6ebb6099ca3d9ffc54cfd0de SHA512 29bfe60410727f09b004f172e5046292eff511dfca5af8a21c24719e4068925103ba12af0ce808316ef206b329ce886693e7330c1c68d8e77fc50ab40bd7dcfe +DIST r8125-9.011.01.tar.bz2 97867 BLAKE2B 0981c71795d3e839b97f7b41dbaddcc0743676c6bd0b656258e6e9b2e0879128ae4869e9ab3ab837d0ae10eb8c963177c3779b4e4a69d8a5c3d95b7b8d54f9c5 SHA512 833199cc0ce8179ef93c202fc89d4c4368b73e9515d1ef2550ebb209243dd2c8943aa9f267903d8fa21c46304b7703410f1c354d4ce1b6f6aee7ece97017dba2 +DIST r8125-9.013.02.tar.bz2 105923 BLAKE2B 0ae1a6a7ad651d30ac2ca29ab98af06c6facc26bfacac8ce5b51e92e8c7955c150a995c424f875a9a1cb315fe41f474ea3429cd7675ceec1ef82d454ad2bd434 SHA512 acb16992182c4c6b79357a511cfcedb53bb6513185caec91a5cb76aa41dc922e6c74099546886b32dba584d614f9bcaf36d31e40f3328b9ebc4ccd6b91296065 diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch new file mode 100644 index 000000000000..1a4afdb31bea --- /dev/null +++ b/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch @@ -0,0 +1,115 @@ +Added compatibility with Linux Kernel 5.17+. + +Author: Karlson2k (Evgeny Grin) +Gentoo bug: https://bugs.gentoo.org/839282 + +diff --git a/src/r8125_n.c b/src/r8125_n.c +--- a/src/r8125_n.c ++++ b/src/r8125_n.c +@@ -349,7 +349,7 @@ static int rtl8125_change_mtu(struct net_device *dev, int new_mtu); + static void rtl8125_down(struct net_device *dev); + + static int rtl8125_set_mac_address(struct net_device *dev, void *p); +-static void rtl8125_rar_set(struct rtl8125_private *tp, uint8_t *addr); ++static void rtl8125_rar_set(struct rtl8125_private *tp, const uint8_t *addr); + static void rtl8125_desc_addr_fill(struct rtl8125_private *); + static void rtl8125_tx_desc_init(struct rtl8125_private *tp); + static void rtl8125_rx_desc_init(struct rtl8125_private *tp); +@@ -1750,7 +1750,13 @@ static void rtl8125_proc_module_init(void) + static int rtl8125_proc_open(struct inode *inode, struct file *file) + { + struct net_device *dev = proc_get_parent_data(inode); +- int (*show)(struct seq_file *, void *) = PDE_DATA(inode); ++ int (*show)(struct seq_file *, void *) = ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) ++ PDE_DATA(inode); ++#else ++ pde_data(inode); ++#endif ++ + + return single_open(file, show, dev); + } +@@ -5234,8 +5240,15 @@ rtl8125_set_ring_size(struct rtl8125_private *tp, u32 rx, u32 tx) + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) + static void rtl8125_get_ringparam(struct net_device *dev, + struct ethtool_ringparam *ring) ++#else ++static void rtl8125_get_ringparam(struct net_device* dev, ++ struct ethtool_ringparam* ring, ++ struct kernel_ethtool_ringparam* kernel_ring, ++ struct netlink_ext_ack* extack) ++#endif + { + struct rtl8125_private *tp = netdev_priv(dev); + +@@ -5245,8 +5258,15 @@ static void rtl8125_get_ringparam(struct net_device *dev, + ring->tx_pending = tp->tx_ring[0].num_tx_desc; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) + static int rtl8125_set_ringparam(struct net_device *dev, + struct ethtool_ringparam *ring) ++#else ++static int rtl8125_set_ringparam(struct net_device* dev, ++ struct ethtool_ringparam* ring, ++ struct kernel_ethtool_ringparam* kernel_ring, ++ struct netlink_ext_ack* extack) ++#endif + { + struct rtl8125_private *tp = netdev_priv(dev); + u32 new_rx_count, new_tx_count; +@@ -10889,6 +10909,9 @@ rtl8125_get_mac_address(struct net_device *dev) + struct rtl8125_private *tp = netdev_priv(dev); + int i; + u8 mac_addr[MAC_ADDR_LEN]; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0) ++ u8 addr[ETH_ALEN]; ++#endif + + for (i = 0; i < MAC_ADDR_LEN; i++) + mac_addr[i] = RTL_R8(tp, MAC0 + i); +@@ -10916,9 +10939,17 @@ rtl8125_get_mac_address(struct net_device *dev) + rtl8125_rar_set(tp, mac_addr); + + for (i = 0; i < MAC_ADDR_LEN; i++) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) + dev->dev_addr[i] = RTL_R8(tp, MAC0 + i); + tp->org_mac_addr[i] = dev->dev_addr[i]; /* keep the original MAC address */ ++#else ++ addr[i] = RTL_R8(tp, MAC0 + i); ++ tp->org_mac_addr[i] = addr[i]; /* keep the original MAC address */ ++#endif + } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0) ++ eth_hw_addr_set(dev, addr); ++#endif + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) + memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); + #endif +@@ -10944,7 +10975,11 @@ rtl8125_set_mac_address(struct net_device *dev, + if (!is_valid_ether_addr(addr->sa_data)) + return -EADDRNOTAVAIL; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) + memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); ++#else ++ eth_hw_addr_set(dev, addr->sa_data); ++#endif + + rtl8125_rar_set(tp, dev->dev_addr); + +@@ -10959,7 +10994,7 @@ rtl8125_set_mac_address(struct net_device *dev, + *****************************************************************************/ + void + rtl8125_rar_set(struct rtl8125_private *tp, +- uint8_t *addr) ++ const uint8_t *addr) + { + uint32_t rar_low = 0; + uint32_t rar_high = 0; + + diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch new file mode 100644 index 000000000000..6da1bdae6b6a --- /dev/null +++ b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch @@ -0,0 +1,31 @@ +Added compatibility with Linux Kernel 5.18+. + +Author: Karlson2k (Evgeny Grin) +Gentoo bug: https://bugs.gentoo.org/852311 + +diff --git a/src/r8125_n.c b/src/r8125_n.c + +--- a/src/r8125_n.c ++++ b/src/r8125_n.c +@@ -11852,11 +11852,20 @@ rtl8125_init_board(struct pci_dev *pdev, + + if ((sizeof(dma_addr_t) > 4) && + use_dac && ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) + !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) && + !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) { ++#else // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) ++ !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) && ++ !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) { ++#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) + dev->features |= NETIF_F_HIGHDMA; + } else { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) + rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); ++#else // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) ++ rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); ++#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) + if (rc < 0) { + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) + if (netif_msg_probe(tp)) + diff --git a/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch b/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch new file mode 100644 index 000000000000..8dc3f8749a11 --- /dev/null +++ b/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch @@ -0,0 +1,35 @@ +From c96e5ffc40585d463bea056f2fe02c29d43dcba7 Mon Sep 17 00:00:00 2001 +From: Evgeny Grin <k2k@narod.ru> +Date: Mon, 3 Apr 2023 18:17:24 +0300 +Subject: [PATCH] Backport kernel 5.19 compatibility + +--- + src/r8125_n.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/r8125_n.c b/src/r8125_n.c +index 0bc5eec..e35e557 100644 +--- a/src/r8125_n.c ++++ b/src/r8125_n.c +@@ -12715,6 +12715,10 @@ rtl8125_init_one(struct pci_dev *pdev, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) + dev->hw_features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6; + dev->features |= NETIF_F_IPV6_CSUM; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) ++ netif_set_tso_max_size(dev, LSO_64K); ++ netif_set_tso_max_segs(dev, NIC_MAX_PHYS_BUF_COUNT_LSO2); ++#else //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) + netif_set_gso_max_size(dev, LSO_64K); + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) + dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO2; +@@ -12722,6 +12726,7 @@ rtl8125_init_one(struct pci_dev *pdev, + dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT; + #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0) + #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) ++#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) + + #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) + #endif //LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) +-- +2.40.0 + diff --git a/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch b/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch new file mode 100644 index 000000000000..343ab8ccf125 --- /dev/null +++ b/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch @@ -0,0 +1,28 @@ +From cc2a99963b0039573464816f0cf86803381d5f11 Mon Sep 17 00:00:00 2001 +From: Evgeny Grin <k2k@narod.ru> +Date: Mon, 3 Apr 2023 16:46:39 +0300 +Subject: [PATCH] Fixed compatibility with Linux kernel versions >= 6.1 + +--- + src/r8125.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/r8125.h b/src/r8125.h +index 9eac0eb..4a29116 100644 +--- a/src/r8125.h ++++ b/src/r8125.h +@@ -676,7 +676,11 @@ typedef int *napi_budget; + typedef struct napi_struct *napi_ptr; + typedef int napi_budget; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) ++#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add_weight(ndev, &priv->napi, function, weight) ++#else // LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) + #define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(ndev, &priv->napi, function, weight) ++#endif // LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) + #define RTL_NAPI_QUOTA(budget, ndev) min(budget, budget) + #define RTL_GET_PRIV(stuct_ptr, priv_struct) container_of(stuct_ptr, priv_struct, stuct_ptr) + #define RTL_GET_NETDEV(priv_ptr) struct net_device *dev = priv_ptr->dev; +-- +2.40.0 + diff --git a/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch b/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch new file mode 100644 index 000000000000..26bb8620fbfd --- /dev/null +++ b/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch @@ -0,0 +1,42 @@ +From 2ef10e8ccbd16a67a1585ebb627af0f1ae172e0f Mon Sep 17 00:00:00 2001 +From: Evgeny Grin <k2k@narod.ru> +Date: Tue, 27 Jun 2023 11:16:26 +0300 +Subject: [PATCH] Patched PTP functionality for Linux 6.2+ + +--- + src/r8125_ptp.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/r8125_ptp.c b/src/r8125_ptp.c +index 6010a18..b92fb18 100644 +--- a/src/r8125_ptp.c ++++ b/src/r8125_ptp.c +@@ -195,6 +195,13 @@ static int rtl8125_phc_adjfreq(struct ptp_clock_info *ptp, s32 delta) + return 0; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) ++static int rtl8125_phc_adjfine(struct ptp_clock_info *ptp, long scaled_ppm) ++{ ++ return rtl8125_phc_adjfreq(ptp, scaled_ppm_to_ppb(scaled_ppm)); ++} ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */ ++ + static int rtl8125_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts64) + { + struct rtl8125_private *tp = container_of(ptp, struct rtl8125_private, ptp_clock_info); +@@ -296,7 +303,11 @@ static const struct ptp_clock_info rtl_ptp_clock_info = { + .n_per_out = 0, + .n_pins = 0, + .pps = 1, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0) + .adjfreq = rtl8125_phc_adjfreq, ++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */ ++ .adjfine = rtl8125_phc_adjfine, ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */ + .adjtime = rtl8125_phc_adjtime, + .gettime64 = rtl8125_phc_gettime, + .settime64 = rtl8125_phc_settime, +-- +2.41.0.windows.1 + diff --git a/net-misc/r8125/metadata.xml b/net-misc/r8125/metadata.xml new file mode 100644 index 000000000000..a0cb8723713f --- /dev/null +++ b/net-misc/r8125/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>k2k@narod.ru</email> + <name>Evgeny Grin</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription>Official Realtek r8125 vendor linux driver. The following cards are currently supported: +RTL8125 RTL8125A RTL8125B(S)(G)</longdescription> + <use> + <flag name="multi-tx-q">Enable Multiple Tx Queue ("RSS" for sending)</flag> + <flag name="ptp">Enable Precision Time Protocol support</flag> + <flag name="rss">Enable Receive Side Scaling (RSS)</flag> + <flag name="use-firmware">Support automatic firmware loading</flag> + </use> +</pkgmetadata> diff --git a/net-misc/r8125/r8125-9.008.00-r1.ebuild b/net-misc/r8125/r8125-9.008.00-r1.ebuild new file mode 100644 index 000000000000..3779fd117278 --- /dev/null +++ b/net-misc/r8125/r8125-9.008.00-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" + +# The alternative direct URL for the file from the link above with description +# "2.5G Ethernet LINUX driver r8125 for kernel up to 5.6" to avoid CAPTCHA +SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="+multi-tx-q ptp +rss use-firmware" + +PATCHES=( + "${FILESDIR}/${PN}-9.008.00-linux-5.17.patch" # bug 839282 + "${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311 + "${FILESDIR}/${PN}-9.009.01-linux-5.19.patch" + "${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714 + "${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645 +) + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_PTP_SUPPORT=$(usex ptp y n) + ENABLE_RSS_SUPPORT=$(usex rss y n) + ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ) + + linux-mod-r1_src_compile +} diff --git a/net-misc/r8125/r8125-9.009.01-r1.ebuild b/net-misc/r8125/r8125-9.009.01-r1.ebuild new file mode 100644 index 000000000000..87bff3e7fb42 --- /dev/null +++ b/net-misc/r8125/r8125-9.009.01-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" + +SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="+multi-tx-q ptp +rss use-firmware" + +PATCHES=( + "${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311 + "${FILESDIR}/${PN}-9.009.01-linux-5.19.patch" + "${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714 + "${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645 +) + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_PTP_SUPPORT=$(usex ptp y n) + ENABLE_RSS_SUPPORT=$(usex rss y n) + ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ) + + linux-mod-r1_src_compile +} diff --git a/net-misc/r8125/r8125-9.009.02-r1.ebuild b/net-misc/r8125/r8125-9.009.02-r1.ebuild new file mode 100644 index 000000000000..61bad3803fde --- /dev/null +++ b/net-misc/r8125/r8125-9.009.02-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" + +SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="+multi-tx-q ptp +rss use-firmware" + +PATCHES=( + "${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714 + "${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645 +) + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_PTP_SUPPORT=$(usex ptp y n) + ENABLE_RSS_SUPPORT=$(usex rss y n) + ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ) + + linux-mod-r1_src_compile +} diff --git a/net-misc/r8125/r8125-9.011.01-r1.ebuild b/net-misc/r8125/r8125-9.011.01-r1.ebuild new file mode 100644 index 000000000000..e206e4deaa7c --- /dev/null +++ b/net-misc/r8125/r8125-9.011.01-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" + +SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="+multi-tx-q ptp +rss use-firmware" + +PATCHES=( + "${FILESDIR}/${P}-linux-6.2.patch" # bug 908645 +) + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_PTP_SUPPORT=$(usex ptp y n) + ENABLE_RSS_SUPPORT=$(usex rss y n) + ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ENABLE_PAGE_REUSE=$(usex ptp n y) # Not compatible with PTP + ENABLE_RX_PACKET_FRAGMENT=$(usex ptp n y) # Not compatible with PTP + ) + + linux-mod-r1_src_compile +} diff --git a/net-misc/r8125/r8125-9.013.02-r1.ebuild b/net-misc/r8125/r8125-9.013.02-r1.ebuild new file mode 100644 index 000000000000..9c0cdfaa93f8 --- /dev/null +++ b/net-misc/r8125/r8125-9.013.02-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/Download/List?cate_id=584" +# Mirrored to avoid captcha +SRC_URI="https://github.com/Karlson2k/r8125/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="+multi-tx-q ptp +rss use-firmware" + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_PTP_SUPPORT=$(usex ptp y n) + ENABLE_RSS_SUPPORT=$(usex rss y n) + ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ENABLE_PAGE_REUSE=y + ENABLE_RX_PACKET_FRAGMENT=y + ) + + linux-mod-r1_src_compile +} diff --git a/net-misc/r8125/r8125-9.013.02.ebuild b/net-misc/r8125/r8125-9.013.02.ebuild new file mode 100644 index 000000000000..f331c3c35866 --- /dev/null +++ b/net-misc/r8125/r8125-9.013.02.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" +# Mirrored to avoid captcha +SRC_URI="https://github.com/Karlson2k/r8125/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="+multi-tx-q ptp +rss use-firmware" + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_PTP_SUPPORT=$(usex ptp y n) + ENABLE_RSS_SUPPORT=$(usex rss y n) + ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n) + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ENABLE_PAGE_REUSE=$(usex ptp n y) # Not compatible with PTP + ENABLE_RX_PACKET_FRAGMENT=$(usex ptp n y) # Not compatible with PTP + ) + + linux-mod-r1_src_compile +} diff --git a/net-misc/r8152/Manifest b/net-misc/r8152/Manifest new file mode 100644 index 000000000000..f03e2096515f --- /dev/null +++ b/net-misc/r8152/Manifest @@ -0,0 +1,2 @@ +DIST r8152-2.16.3.tar.bz2 73331 BLAKE2B 9e22ee6d9d0197def782f77bfd0c88a2d8827d4f8cc0bbb1a6583ab67533cd07ba79a16cd9350272ed18c733fe809ea1ff70596627abdc65d452bdf817628bc8 SHA512 c37bf5199d3a857c9a7a12f3aa4ecfe9c04b49413aea862a053ebee24c137cd35769e5d5cc7e2bb7dd3bf9057f51ffada0b4e0c53cb3d417e05c8e3fc830705c +DIST r8152-2.17.1.tar.bz2 75156 BLAKE2B 05b55ea17a579add9a9abee89db490685086bfe29aeea6cbfbdbb63a81dbee4d1cac151822c178e52febe4bee14a3b5deb20737f671fcdbc6dd6d01938b1d18c SHA512 e465b524ee8aaed12da8258195fb8a4c9fea0862812c1ab268e31ad6ec61444c4f4332d643124063b389fd1df7a271c6c057537d4cbe67188a1a2262b4793f42 diff --git a/net-misc/r8152/files/r8152-2.16.3-asus-c5000-support.patch b/net-misc/r8152/files/r8152-2.16.3-asus-c5000-support.patch new file mode 100644 index 000000000000..4c9d9b9dd601 --- /dev/null +++ b/net-misc/r8152/files/r8152-2.16.3-asus-c5000-support.patch @@ -0,0 +1,23 @@ +From: https://github.com/wget/realtek-r8152-linux/issues/30 +From: Mark Taylor <mark.taylor.hq@gmail.com> +Date: Thu, 8 Jun 2023 14:36:30 -0400 +Subject: [PATCH] Add support for ASUS C2500 + +--- a/r8152.c ++++ b/r8152.c +@@ -807,6 +807,7 @@ + #define VENDOR_ID_LINKSYS 0x13b1 + #define VENDOR_ID_NVIDIA 0x0955 + #define VENDOR_ID_TPLINK 0x2357 ++#define VENDOR_ID_ASUS 0x0b05 + + #define MCU_TYPE_PLA 0x0100 + #define MCU_TYPE_USB 0x0000 +@@ -20846,6 +20847,8 @@ + /* Getac */ + REALTEK_USB_DEVICE(0x2baf, 0x0012), + ++ /* ASUS */ ++ REALTEK_USB_DEVICE(VENDOR_ID_ASUS, 0x1976), + {} + }; diff --git a/net-misc/r8152/files/r8152-2.16.3-kernel-5.19-fix.patch b/net-misc/r8152/files/r8152-2.16.3-kernel-5.19-fix.patch new file mode 100644 index 000000000000..076d78f46062 --- /dev/null +++ b/net-misc/r8152/files/r8152-2.16.3-kernel-5.19-fix.patch @@ -0,0 +1,43 @@ +From: https://github.com/wget/realtek-r8152-linux/commit/6ffb3760c34a904467d70830ac9c10211e8f5d3a +From: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr> +Date: Wed, 14 Sep 2022 15:13:31 +0200 +Subject: [PATCH] Fix for linux 5.19 without breaking older kernel + compatibility + +--- a/r8152.c ++++ b/r8152.c +@@ -20458,9 +20458,13 @@ static ssize_t sg_en_store(struct device *dev, struct device_attribute *attr, + return -EINVAL; + } + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) ++/* LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) */ ++ netif_set_tso_max_size(netdev, tso_size); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++/* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */ + netif_set_gso_max_size(netdev, tso_size); +-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */ ++#endif + + return count; + } +@@ -20620,12 +20624,16 @@ static int rtl8152_probe(struct usb_interface *intf, + rtl_get_mapt_ver(tp); + + netdev->ethtool_ops = &ops; +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) ++/* LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0) */ ++ netif_set_tso_max_size(netdev, RTL_LIMITED_TSO_SIZE); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++/* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */ + if (!tp->sg_use) + netif_set_gso_max_size(netdev, RTL_LIMITED_TSO_SIZE); + #else + netdev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6); +-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */ ++#endif + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0) + /* MTU range: 68 - 1500 or 9194 */ diff --git a/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch b/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch new file mode 100644 index 000000000000..d20db413a16b --- /dev/null +++ b/net-misc/r8152/files/r8152-2.16.3-kernel-6.1-fix.patch @@ -0,0 +1,46 @@ +https://github.com/ervinpopescu/realtek-r8152-linux/commit/0029747c3cf68dbccbebfcb560277040673dfe36.patch +From: ervinpopescu <ervin.popescu10@gmail.com> +Date: Tue, 15 Nov 2022 19:30:16 +0200 +Subject: [PATCH] Fix for linux 6.1 without breaking older kernel compatibility + +--- a/r8152.c ++++ b/r8152.c +@@ -17558,7 +17558,6 @@ static void r8156_init(struct r8152 *tp) + // break; + // } + +- + r8153b_mcu_spdown_en(tp, false); + + ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS); +@@ -18339,7 +18338,6 @@ int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd) + cmd->autoneg = AUTONEG_DISABLE; + } + +- + if (netif_running(netdev) && netif_carrier_ok(netdev)) { + u16 speed = rtl8152_get_speed(tp); + +@@ -19202,7 +19200,6 @@ static int rtltool_ioctl(struct r8152 *tp, struct ifreq *ifr) + } + break; + +- + case RTLTOOL_USB_OCP_WRITE_DWORD: + if (!tp->rtk_enable_diag && net_ratelimit()) + netif_warn(tp, drv, netdev, +@@ -20708,10 +20705,14 @@ static int rtl8152_probe(struct usb_interface *intf, + + usb_set_intfdata(intf, tp); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) + if (tp->support_2500full) + netif_napi_add(netdev, &tp->napi, r8152_poll, 256); + else + netif_napi_add(netdev, &tp->napi, r8152_poll, 64); ++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) */ ++ netif_napi_add(netdev, &tp->napi, r8152_poll); ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) */ + + ret = register_netdev(netdev); + if (ret != 0) { diff --git a/net-misc/r8152/files/r8152-2.16.3-kernel-6.4.10-fix.patch b/net-misc/r8152/files/r8152-2.16.3-kernel-6.4.10-fix.patch new file mode 100644 index 000000000000..016e6c24fb0c --- /dev/null +++ b/net-misc/r8152/files/r8152-2.16.3-kernel-6.4.10-fix.patch @@ -0,0 +1,27 @@ +From: https://github.com/wget/realtek-r8152-linux/pull/33.patch +From ea0387211368754fb1d3fe9f72ddc766ba2dacce Mon Sep 17 00:00:00 2001 +From: Martin Pecka <peckama2@fel.cvut.cz> +Date: Mon, 14 Aug 2023 13:44:36 +0200 +Subject: [PATCH] Fixed compatibility with Linux 6.4.10+ + +--- + r8152.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/r8152.c b/r8152.c +index c3ba2ca..47aad6d 100644 +--- a/r8152.c ++++ b/r8152.c +@@ -25,6 +25,12 @@ + #include <linux/ip.h> + #include <linux/ipv6.h> + #include <net/ip6_checksum.h> ++// Linux 6.4.10 added net/gso.h ++#if defined __has_include ++#if __has_include (<net/gso.h>) ++#include <net/gso.h> ++#endif ++#endif + #include <linux/usb/cdc.h> + #include <linux/suspend.h> + #include <linux/atomic.h> diff --git a/net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch b/net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch new file mode 100644 index 000000000000..2449d2883346 --- /dev/null +++ b/net-misc/r8152/files/r8152-2.17.1-kernel-6.8-strscpy.patch @@ -0,0 +1,32 @@ +Bug: https://bugs.gentoo.org/926829 +Patch from Christian Bricart to remove strlcpy and replace with strscpy +so this builds with linux kernels =>6.8. + +Signed-Off-By: Jay Faulkner <jay@jvf.cc> + +diff -Naur r8152-2.17.1/compatibility.h r8152-2.17.1.patched/compatibility.h +--- r8152-2.17.1/compatibility.h 2024-03-12 09:43:05.150688533 +0100 ++++ r8152-2.17.1.patched/compatibility.h 2024-03-12 09:46:20.913759268 +0100 +@@ -18,6 +18,10 @@ + #include <net/gso.h> + #endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) ++#define strscpy strlcpy ++#endif ++ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) + #include <linux/mdio.h> + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) +diff -Naur r8152-2.17.1/r8152.c r8152-2.17.1.patched/r8152.c +--- r8152-2.17.1/r8152.c 2024-03-12 09:43:05.130688336 +0100 ++++ r8152-2.17.1.patched/r8152.c 2024-03-12 09:45:13.264694513 +0100 +@@ -19691,7 +19691,7 @@ + uinfo->idVendor = __le16_to_cpu(udev->descriptor.idVendor); + uinfo->idProduct = __le16_to_cpu(udev->descriptor.idProduct); + uinfo->bcdDevice = __le16_to_cpu(udev->descriptor.bcdDevice); +- strlcpy(uinfo->devpath, udev->devpath, sizeof(udev->devpath)); ++ strscpy(uinfo->devpath, udev->devpath, sizeof(udev->devpath)); + pla_ocp_read(tp, PLA_IDR, sizeof(uinfo->dev_addr), + uinfo->dev_addr); + diff --git a/net-misc/r8152/metadata.xml b/net-misc/r8152/metadata.xml new file mode 100644 index 000000000000..b840941c9ce9 --- /dev/null +++ b/net-misc/r8152/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>jay@jvf.cc</email> + <name>Jay Faulkner</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription>Official Realtek r8152 linux driver. The following cards are currently supported: +RTL8156 RTL8156B(S)(G) RTL8153 RTL8153B RTL8154 RTL8154B RTL8152B</longdescription> + <use> + <flag name="center-tap-short">Enable support for center tap short</flag> + </use> +</pkgmetadata> diff --git a/net-misc/r8152/r8152-2.16.3-r1.ebuild b/net-misc/r8152/r8152-2.16.3-r1.ebuild new file mode 100644 index 000000000000..82753f37ac20 --- /dev/null +++ b/net-misc/r8152/r8152-2.16.3-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 udev + +DESCRIPTION="r8152 driver for Realtek USB FE / GBE / 2.5G Gaming Ethernet Family Controller" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software" +SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~x86" + +RDEPEND="virtual/udev" +DEPEND="${RDEPEND}" + +IUSE="+center-tap-short" + +# https://github.com/wget/realtek-r8152-linux/ keeps reasonably up to date +# with kernel support patches. It appears to be used by the AUR maintainer. +PATCHES=( + "${FILESDIR}"/${PN}-2.16.3-kernel-5.19-fix.patch + "${FILESDIR}"/${PN}-2.16.3-kernel-6.1-fix.patch + "${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch + "${FILESDIR}"/${PN}-2.16.3-asus-c5000-support.patch +) + +src_compile() { + local modlist=( ${PN}=kernel/net/usb:. ) + local modargs=( + KERNELDIR="${KV_OUT_DIR}" + CONFIG_CTAP_SHORT="$(usex center-tap-short on off)" + ) + + linux-mod-r1_src_compile +} + +src_install() { + linux-mod-r1_src_install + udev_dorules 50-usb-realtek-net.rules +} + +pkg_postinst() { + linux-mod-r1_pkg_postinst + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-misc/r8152/r8152-2.17.1.ebuild b/net-misc/r8152/r8152-2.17.1.ebuild new file mode 100644 index 000000000000..865057ee5c0d --- /dev/null +++ b/net-misc/r8152/r8152-2.17.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 udev + +DESCRIPTION="r8152 driver for Realtek USB FE / GBE / 2.5G Gaming Ethernet Family Controller" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software" +SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~x86" + +RDEPEND="virtual/udev" +DEPEND="${RDEPEND}" + +IUSE="+center-tap-short" + +# https://github.com/wget/realtek-r8152-linux/ keeps reasonably up to date +# with kernel support patches. It appears to be used by the AUR maintainer. +PATCHES=( + "${FILESDIR}"/${PN}-2.16.3-kernel-6.4.10-fix.patch + "${FILESDIR}"/${PN}-2.16.3-asus-c5000-support.patch + "${FILESDIR}"/${PN}-2.17.1-kernel-6.8-strscpy.patch +) + +src_compile() { + local modlist=( ${PN}=kernel/net/usb:. ) + local modargs=( + KERNELDIR="${KV_OUT_DIR}" + CONFIG_CTAP_SHORT="$(usex center-tap-short on off)" + ) + + linux-mod-r1_src_compile +} + +src_install() { + linux-mod-r1_src_install + udev_dorules 50-usb-realtek-net.rules +} + +pkg_postinst() { + linux-mod-r1_pkg_postinst + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index d780aca28ae1..fc4b6790183e 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,2 +1,3 @@ -DIST r8168-8.048.03.tar.bz2 109351 BLAKE2B f31ef24d42af737a97986f0e46bc6c737c43e8ccfe9fac8386eb9957a5d81620faa62602e1bec15840792785444b1d1bf8bafa2e5878c21f1962c7141d9bb32e SHA512 8da615a96cca413ca172e260c52c9f77a782e4feb466e4a4296ae11d895e9cc56bde0ed8634cc3a7a531a292072b68d19dcbe74d20ad9549266d3ee8e082096f -DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0 +DIST r8168-8.051.02.tar.bz2 115969 BLAKE2B 28b809c0330920ee0db7a8f8d41e178882531cd0a6793efeadd9670b1a9b5cbe903061073fd1d461f4234feb41249a244f9ef35cdbb780da498e5a6d6f1a5490 SHA512 2f29a413e7db2b7295ea0a970b3385de1dfd6e41e1820097355687daa5c8d155c1cf6115c72875bff4f366365579bffc81733469a62d76f437065b7e514387ca +DIST r8168-8.052.01.tar.bz2 126861 BLAKE2B dccee164ea1151859752d525390a3786d31d445e05188a86d2d17c9cbd4435aac788dc5ca1350fcc719bba1c42bd358f39221666f8575d52a9cbf9c78b65c70d SHA512 ae90e108ba3eaaa1c8a639392b21ff98e71abdba514a19b2f286603fbdae69c88592380d9dacda2c10d711348797006a8b518383e4a0519d1bd26dc60266b4b5 +DIST r8168-8.053.00.tar.gz 169102 BLAKE2B 4be044fec5edb78d3050c66f92ffce56487347c171da6d0e29593584e23b173536e48a18ffaf47df4e99999867a65b658a0deace333948bb0d77cd0f5c619719 SHA512 c44a63b04eb5cfb2b8ae434b26098c96067f7a2d6193e206801236fa38832b4f20a0b1a05a374f1d7d5b7ce973d38b6f49744f8b029e22930ebbd2763fbc6440 diff --git a/net-misc/r8168/files/r8168-8.051.02-6.1-fix.patch b/net-misc/r8168/files/r8168-8.051.02-6.1-fix.patch new file mode 100644 index 000000000000..9a9e3e539259 --- /dev/null +++ b/net-misc/r8168/files/r8168-8.051.02-6.1-fix.patch @@ -0,0 +1,25 @@ +From 39dd0fd2e5dc45cd63113f33a9890e36c304916d Mon Sep 17 00:00:00 2001 +From: zu1k <i@zu1k.com> +Date: Sat, 29 Oct 2022 21:57:39 +0800 +Subject: [PATCH] Adapted for Linux 6.1 + +--- + src/r8168.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/r8168.h b/src/r8168.h +index 662974a..baf48c6 100755 +--- a/src/r8168.h ++++ b/src/r8168.h +@@ -561,7 +561,11 @@ typedef int *napi_budget; + typedef struct napi_struct *napi_ptr; + typedef int napi_budget; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(ndev, &priv->napi, function) ++#else + #define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(ndev, &priv->napi, function, weight) ++#endif + #define RTL_NAPI_QUOTA(budget, ndev) min(budget, budget) + #define RTL_GET_PRIV(stuct_ptr, priv_struct) container_of(stuct_ptr, priv_struct, stuct_ptr) + #define RTL_GET_NETDEV(priv_ptr) struct net_device *dev = priv_ptr->dev; diff --git a/net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch b/net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch new file mode 100644 index 000000000000..f10b86447971 --- /dev/null +++ b/net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch @@ -0,0 +1,17 @@ +Fixed build with kernels 6.4.10+ +Gentoo Bug: https://bugs.gentoo.org/912242 +See also: https://github.com/mtorromeo/r8168/issues/54 + +--- +--- a/src/r8168_n.c 2023-08-13 03:33:06.977422132 +0400 ++++ b/src/r8168_n.c 2023-08-13 03:38:39.767005101 +0400 +@@ -81,6 +81,10 @@ + #include <linux/mdio.h> + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,10) ++#include <net/gso.h> ++#endif ++ + #include <asm/io.h> + #include <asm/irq.h> diff --git a/net-misc/r8168/r8168-8.048.03-r1.ebuild b/net-misc/r8168/r8168-8.048.03-r1.ebuild deleted file mode 100644 index 49c108910168..000000000000 --- a/net-misc/r8168/r8168-8.048.03-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info linux-mod - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" - -# "GBE Ethernet LINUX driver r8168 for kernel up to 5.6" from above link, -# we need to mirror it to avoid users from needing to fill a captcha to -# download -SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" - -CONFIG_CHECK="!R8169" -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - einstalldocs -} diff --git a/net-misc/r8168/r8168-8.049.02-r1.ebuild b/net-misc/r8168/r8168-8.049.02-r1.ebuild deleted file mode 100644 index 2f271eb31f74..000000000000 --- a/net-misc/r8168/r8168-8.049.02-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info linux-mod - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" - -# "GBE Ethernet LINUX driver r8168 for kernel up to 5.6" from above link, -# we need to mirror it to avoid users from needing to fill a captcha to -# download -SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" -IUSE="use-firmware" - -CONFIG_CHECK="~!R8169" -WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" - BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)" -} - -src_install() { - linux-mod_src_install - einstalldocs -} diff --git a/net-misc/r8168/r8168-8.049.02.ebuild b/net-misc/r8168/r8168-8.049.02.ebuild deleted file mode 100644 index 7a3513fe3b08..000000000000 --- a/net-misc/r8168/r8168-8.049.02.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info linux-mod - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" - -# "GBE Ethernet LINUX driver r8168 for kernel up to 5.6" from above link, -# we need to mirror it to avoid users from needing to fill a captcha to -# download -SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" - -CONFIG_CHECK="!R8169" -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - einstalldocs -} diff --git a/net-misc/r8168/r8168-8.051.02-r1.ebuild b/net-misc/r8168/r8168-8.051.02-r1.ebuild new file mode 100644 index 000000000000..4a7da024fbfc --- /dev/null +++ b/net-misc/r8168/r8168-8.051.02-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" + +SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="use-firmware" + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +PATCHES=( + "${FILESDIR}/${P}-6.1-fix.patch" + "${FILESDIR}/${P}-6.4.10-fix.patch" # bug 912242 +) + +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ) + + linux-mod-r1_src_compile +} diff --git a/net-misc/r8168/r8168-8.052.01.ebuild b/net-misc/r8168/r8168-8.052.01.ebuild new file mode 100644 index 000000000000..8d93a0a7f5fe --- /dev/null +++ b/net-misc/r8168/r8168-8.052.01.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" + +SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="use-firmware" + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ) + + linux-mod-r1_src_compile +} diff --git a/net-misc/r8168/r8168-8.053.00.ebuild b/net-misc/r8168/r8168-8.053.00.ebuild new file mode 100644 index 000000000000..c413c7299d97 --- /dev/null +++ b/net-misc/r8168/r8168-8.053.00.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-mod-r1 + +DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/Download/List?cate_id=584" +SRC_URI="https://github.com/mtorromeo/${PN}/archive/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="use-firmware" + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +src_compile() { + local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src ) + local modargs=( + # Build parameters + KERNELDIR="${KV_OUT_DIR}" + # Configuration settings + ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n) + ) + + linux-mod-r1_src_compile +} diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest index 2d79ff58e5cd..7d9d925cd1be 100644 --- a/net-misc/rabbitmq-server/Manifest +++ b/net-misc/rabbitmq-server/Manifest @@ -1 +1,3 @@ -DIST rabbitmq-server-3.8.19.tar.xz 3263712 BLAKE2B 3dc990d3720883fe2b6b61d48122b64c81564124f48f0a0e6aa2dc1d0837f6dce0bf174b4044c39dc0c8da64b2f78499922c58c90d7e7f80e50b80b4535f55c7 SHA512 05c789dc25e2f236d9643e582792c8a9ab90129247d9306e60c303fa3a707e68dcbe685460b255b6f610c8ab55d48cb7b372ea51ce1d3c86d8d770e4e4f7cfea +DIST rabbitmq-server-3.11.2.tar.xz 3752644 BLAKE2B bc98808579cbaa12371fc95d137fd18a0d784a859471d4dac6c328e819bb7ba5cb0256509a678788452f6dbeaa6fc48b4dbe39b24bd7cf0b1698fb6e4f67cb03 SHA512 ceec07fb9dfe8ba76850aa94543396a4e878aca13b9e3e303e86bb44bbbb1cea863148a1480b83517bfd2bdc66b814c3177ad2ed595604f5710f8f98e8dcc439 +DIST rabbitmq-server-3.12.9.tar.xz 4437392 BLAKE2B 19c1e88e79c29af0c06d732d25098ee7b5575e8f269ba08e3247a65ba206c8cdc819767572071063dcbd8816756366d0a3f059d8e060ffe47fb221e1546b4c23 SHA512 c6015ee9593336104fc043ed20d99a476e7b36802ae36798f23c2caf91a01a71913963fdbe6de249f234cb3ba82379e5c5b2976e07d098c287ee72e3f238f2eb +DIST rabbitmq-server-3.13.1.tar.xz 5083312 BLAKE2B 1821d05c1be2da491019605de7877f26cb8d47bf67f901d5bb2ede961558a44900a3b8697e254167eb5622d37b20b668dc919fadbe5c5c98f5cc644b948986b3 SHA512 022c6e213cf7cea865a6931a3481897efea65dffa649dd77df9d88bb5f9b7abaaa83b525f983de4cb336b1e0469073cadc2ce48d4f47f93005c87b9fdadb3857 diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r4 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r4 index 9e7dd9d5d6fd..11bd36b2e7fa 100644 --- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r4 +++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r4 @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 depend() { - need net epmd + need epmd use dns } diff --git a/net-misc/rabbitmq-server/metadata.xml b/net-misc/rabbitmq-server/metadata.xml index 40de168a4ac6..f9ae34dd3cab 100644 --- a/net-misc/rabbitmq-server/metadata.xml +++ b/net-misc/rabbitmq-server/metadata.xml @@ -5,4 +5,7 @@ <email>ultrabug@gentoo.org</email> <name>Ultrabug</name> </maintainer> + <upstream> + <remote-id type="github">rabbitmq/rabbitmq-server</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.11.2-r1.ebuild index 2410ca43590f..1db10de5cfac 100644 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.19-r1.ebuild +++ b/net-misc/rabbitmq-server/rabbitmq-server-3.11.2-r1.ebuild @@ -1,37 +1,43 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="xml(+)" inherit python-any-r1 systemd DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang" HOMEPAGE="https://www.rabbitmq.com/" -SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz" +SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/${P}.tar.xz" -LICENSE="GPL-2 MPL-2.0" +LICENSE="MPL-2.0" SLOT="0" KEYWORDS="amd64 ~arm64 x86" RESTRICT="test" +# See https://www.rabbitmq.com/which-erlang.html for Erlang version +# See https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbitmq_cli#requirements for Elixir version RDEPEND=" acct-group/rabbitmq acct-user/rabbitmq - >=dev-lang/erlang-22[ssl] + >=dev-lang/erlang-25.0[ssl] <dev-lang/erlang-25.4 " DEPEND="${RDEPEND} app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto - >=dev-lang/elixir-1.10.0 <dev-lang/elixir-1.12.0 + >=dev-lang/elixir-1.13.4 <dev-lang/elixir-1.15.0 dev-libs/libxslt $(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]') " +python_check_deps() { + python_has_version -d "dev-python/simplejson[${PYTHON_USEDEP}]" +} + pkg_setup() { python-any-r1_pkg_setup } @@ -53,7 +59,7 @@ src_install() { doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins einfo "Installing server scripts to /usr/sbin" - rm -v deps/rabbit/scripts/*.bat + rm -v deps/rabbit/scripts/*.bat || die exeinto /usr/libexec/rabbitmq for script in deps/rabbit/scripts/*; do doexe ${script} diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.12.9.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.12.9.ebuild new file mode 100644 index 000000000000..1ba1abad96c0 --- /dev/null +++ b/net-misc/rabbitmq-server/rabbitmq-server-3.12.9.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE="xml(+)" + +inherit python-any-r1 systemd + +DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang" +HOMEPAGE="https://www.rabbitmq.com/" +SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +RESTRICT="test" + +# See https://www.rabbitmq.com/which-erlang.html for Erlang version +# See https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbitmq_cli#requirements for Elixir version +RDEPEND=" + acct-group/rabbitmq + acct-user/rabbitmq + >=dev-lang/erlang-25.0[ssl] <dev-lang/erlang-26.2 +" +DEPEND=" + ${RDEPEND} + app-arch/zip + app-arch/unzip + app-text/docbook-xml-dtd:4.5 + app-text/xmlto + >=dev-lang/elixir-1.13.4 <dev-lang/elixir-1.16.0 + dev-libs/libxslt + ${PYTHON_DEPS} +" + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_compile() { + emake all docs dist +} + +src_install() { + # erlang module + local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}" + + einfo "Setting correct RABBITMQ_HOME in scripts" + sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ + -i deps/rabbit/scripts/rabbitmq-env || die + + einfo "Installing Erlang modules to ${targetdir}" + insinto "${targetdir}" + doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins + + einfo "Installing server scripts to /usr/sbin" + rm -v deps/rabbit/scripts/*.bat || die + exeinto /usr/libexec/rabbitmq + for script in deps/rabbit/scripts/*; do + doexe ${script} + newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script) + done + + # install the init script + newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq + systemd_dounit "${FILESDIR}/rabbitmq.service" + + # install documentation + dodoc deps/rabbit/docs/*.example + dodoc deps/rabbit/README.md + doman deps/rabbit/docs/*.5 + doman deps/rabbit/docs/*.8 + + # create the directory where our log file will go. + diropts -m 0770 -o rabbitmq -g rabbitmq + keepdir /var/log/rabbitmq /etc/rabbitmq + + # create the mnesia directory + diropts -m 0770 -o rabbitmq -g rabbitmq + keepdir /var/lib/rabbitmq/mnesia +} + +pkg_preinst() { + if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.12; then + elog "Upgrading to RabbitMQ 3.12 requires all feature flags" + elog "from 3.11 to be enabled. If any feature flags are not" + elog "enabled, the node will refuse to start." + fi +} diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.13.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.13.1.ebuild new file mode 100644 index 000000000000..2fdd45494c53 --- /dev/null +++ b/net-misc/rabbitmq-server/rabbitmq-server-3.13.1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE="xml(+)" + +inherit python-any-r1 systemd + +DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang" +HOMEPAGE="https://www.rabbitmq.com/" +SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +RESTRICT="test" + +# See https://www.rabbitmq.com/which-erlang.html for Erlang version +# See https://github.com/rabbitmq/rabbitmq-server/blob/main/deps/rabbitmq_cli/mix.exs for Elixir version +RDEPEND=" + acct-group/rabbitmq + acct-user/rabbitmq + >=dev-lang/erlang-26.0[ssl] <dev-lang/erlang-26.3 +" +DEPEND=" + ${RDEPEND} + app-arch/zip + app-arch/unzip + app-text/docbook-xml-dtd:4.5 + app-text/xmlto + >=dev-lang/elixir-1.13.4 <dev-lang/elixir-1.17.0 + dev-libs/libxslt + ${PYTHON_DEPS} +" + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_compile() { + # Disable parallel make + # https://bugs.gentoo.org/930093 + # https://bugs.gentoo.org/930098 + # https://bugs.gentoo.org/930133 + emake -j1 all docs dist +} + +src_install() { + # erlang module + local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}" + + einfo "Setting correct RABBITMQ_HOME in scripts" + sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ + -i deps/rabbit/scripts/rabbitmq-env || die + + einfo "Installing Erlang modules to ${targetdir}" + insinto "${targetdir}" + chmod +x escript/* || die + insopts -m0755 + doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins + + einfo "Installing server scripts to /usr/sbin" + exeinto /usr/libexec/rabbitmq + for script in deps/rabbit/scripts/*; do + doexe ${script} + newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script) + done + + # install the init script + newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq + systemd_dounit "${FILESDIR}/rabbitmq.service" + + # install documentation + dodoc deps/rabbit/docs/*.example + dodoc deps/rabbit/README.md + doman deps/rabbit/docs/*.5 + doman deps/rabbit/docs/*.8 + + # create the directory where our log file will go. + diropts -m 0770 -o rabbitmq -g rabbitmq + keepdir /var/log/rabbitmq /etc/rabbitmq + + # create the mnesia directory + diropts -m 0770 -o rabbitmq -g rabbitmq + keepdir /var/lib/rabbitmq/mnesia +} + +pkg_preinst() { + # https://www.rabbitmq.com/docs/upgrade#rabbitmq-version-upgradability + if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.12; then + elog "Upgrading to RabbitMQ 3.12 requires all feature flags" + elog "from 3.11 to be enabled. If any feature flags are not" + elog "enabled, the node will refuse to start." + fi +} diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest index acedd8af8fa2..9f1864d92042 100644 --- a/net-misc/radvd/Manifest +++ b/net-misc/radvd/Manifest @@ -1 +1 @@ -DIST radvd-2.19.tar.gz 222794 BLAKE2B 1c877d5a9eda6bda41b5c20ac9c1e28a26defc192fe14fc2d65888280bc96fc1ff6f4212ccaeac5f7e899087b2805772ed4c0cbbda163b2a87c79a2c178eda2b SHA512 caa621fd77e34ff6858d60a41b0ee02aff967ac14f2b84c402359744f4bece5c1563419860431c328adc0385e9893ed1f2421d652247a3aa0dfc0aaad1e01233 +DIST radvd-2.19.tar.xz 168264 BLAKE2B e28705837263d2d377721e4eaee56b2f86d636d77cf052f08a7c74d5d7f3871f6821a2681ba4997f283b4debe9b3df28a88b01f6fc16b87ee7c3f8b6bbf431b4 SHA512 a1eb40af90fc83ebab2517c16a0f7e85c11338ab276bec400b7c33177748d1e36bc5abd7e373b6742f12f7c690dd7ae6b951bc832c7de9bbb56f7e9bc844ed22 diff --git a/net-misc/radvd/files/radvd-2.19-clang16.patch b/net-misc/radvd/files/radvd-2.19-clang16.patch new file mode 100644 index 000000000000..793126dbcc1b --- /dev/null +++ b/net-misc/radvd/files/radvd-2.19-clang16.patch @@ -0,0 +1,62 @@ +https://github.com/radvd-project/radvd/commit/f4baa88bfd77710a6034e3c23b95ef5efb80f83b +https://bugs.gentoo.org/880823 + +From ff7ab0cf445236f30e58531175ba912614fed952 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 17 Nov 2022 22:03:25 +0000 +Subject: [PATCH 1/2] Makefile.am: drop -Wno-implicit-function-declaration + +1. Clang 16 makes -Wimplicit-function-declaration error by default + (and it's planned that GCC 14 will do the same) so we need to fix + the real problem. This is papering over it. + +2. It's not true that there's nothing we can do about it. Fix in a follow-up + commit. + +Bug: https://bugs.gentoo.org/880823 +Fixes: b5e6b09cf914a960ac3b1676b77d3ea9f91821c7 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile.am ++++ b/Makefile.am +@@ -66,9 +66,6 @@ radvd_LDADD = \ + scanner.c: gram.h + gram.h: gram.c + +-libradvd_parser_a_CFLAGS = \ +- -Wno-implicit-function-declaration +- + libradvd_parser_a_SOURCES = \ + gram.h \ + gram.y \ + +From e0f5bcd9091a5f7abd423fce9f372c8079849a64 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 17 Nov 2022 22:03:25 +0000 +Subject: [PATCH 2/2] gram.y: Fix -Wimplicit-function-declaration + +Clang 16 makes -Wimplicit-function-declaration an error by default. + +For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], +or the (new) c-std-porting mailing list [3]. + +[0] https://lwn.net/Articles/913505/ +[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 +[2] https://wiki.gentoo.org/wiki/Modern_C_porting +[3] hosted at lists.linux.dev. + +Bug: https://bugs.gentoo.org/880823 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/gram.y ++++ b/gram.y +@@ -20,6 +20,10 @@ + + #define YYERROR_VERBOSE 1 + ++int yylex (void); ++void yyset_in (FILE * _in_str); ++int yylex_destroy (void); ++ + #if 0 /* no longer necessary? */ + #ifndef HAVE_IN6_ADDR_S6_ADDR + # ifdef __FreeBSD__ + diff --git a/net-misc/radvd/files/radvd-2.19-configure-c99.patch b/net-misc/radvd/files/radvd-2.19-configure-c99.patch new file mode 100644 index 000000000000..38a6d070657f --- /dev/null +++ b/net-misc/radvd/files/radvd-2.19-configure-c99.patch @@ -0,0 +1,46 @@ +https://github.com/radvd-project/radvd/commit/5acb1c64766dfaf37c9745632f99feecf11d1403 + +From 5acb1c64766dfaf37c9745632f99feecf11d1403 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 3 Feb 2023 02:33:13 +0000 +Subject: [PATCH] configure.ac: Fix -Wint-conversion warnings + +These become fatal with Clang 15 and may lead to incorrect configure +test results. + +``` +-ignoreme: warning: incompatible pointer to integer conversion initializing 'int' with an expression of type 'uint16_t[8]' (aka 'unsigned short[8]') [-Wint-conversion] ++ignoreme: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'uint16_t[8]' (aka 'unsigned short[8]') [-Wint-conversion] + int u = in6_u.s6_addr16; + ^ ~~~~~~~~~~~~~~~ +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -178,15 +178,19 @@ AC_HEADER_TIME + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_MSG_CHECKING(whether struct sockaddr_in6 has sin6_scope_id) +-AC_TRY_COMPILE([#include <sys/types.h> +-#include <netinet/in.h>], [static struct sockaddr_in6 ac_sin6; int ac_size = +-sizeof (ac_sin6.sin6_scope_id);], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_SIN6_SCOPE_ID], ++AC_TRY_COMPILE([#include <stdint.h> ++#include <sys/types.h> ++#include <netinet/in.h>], [ ++static struct sockaddr_in6 ac_sin6; ++uint32_t ac_size = sizeof (ac_sin6.sin6_scope_id); ++], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_SIN6_SCOPE_ID], + 1, [whether struct sockaddr_in6 has sin6_scope_id])], + AC_MSG_RESULT(no)) + + AC_MSG_CHECKING(whether struct in6_addr has u6_addrXX and defines s6_addrXX) +-AC_TRY_COMPILE([#include <netinet/in.h>], [static struct in6_addr in6_u; +-int u = in6_u.s6_addr16;], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IN6_ADDR_S6_ADDR], ++AC_TRY_COMPILE([#include <stdint.h> ++#include <netinet/in.h>], [static struct in6_addr in6_u; ++uint16_t u = in6_u.s6_addr16[0];], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IN6_ADDR_S6_ADDR], + 1, [whether struct in6_addr has u6_addrXX and defines s6_addrXX])], + AC_MSG_RESULT(no)) + + diff --git a/net-misc/radvd/files/radvd-2.19-musl-include.patch b/net-misc/radvd/files/radvd-2.19-musl-include.patch new file mode 100644 index 000000000000..cba7666f8129 --- /dev/null +++ b/net-misc/radvd/files/radvd-2.19-musl-include.patch @@ -0,0 +1,28 @@ +https://github.com/radvd-project/radvd/commit/06689f8c06f44c7e87f7ff1d814428f88375b53f +https://github.com/radvd-project/radvd/pull/161 +https://github.com/radvd-project/radvd/issues/158 + +From: Jonathan Davies <jpds@protonmail.com> +Date: Thu, 25 Nov 2021 15:29:18 +0000 +Subject: [PATCH] Reverts the include.h change in + 46883f8a1a02fe42040dd8e48aec0ed871545d4d + +Closes: #158 + +Signed-off-by: Jonathan Davies <jpds@protonmail.com> +--- a/includes.h ++++ b/includes.h +@@ -76,12 +76,7 @@ + #include <sys/sysctl.h> + #endif + +-#if !defined(__GLIBC__) && defined(linux) +-#include <linux/if.h> +-#define IF_NAMESIZE IFNAMSIZ +-#else + #include <net/if.h> +-#endif + + #ifdef HAVE_NET_IF_DL_H + #include <net/if_dl.h> + diff --git a/net-misc/radvd/files/radvd-2.19.init b/net-misc/radvd/files/radvd-2.19.init new file mode 100644 index 000000000000..069801e841ab --- /dev/null +++ b/net-misc/radvd/files/radvd-2.19.init @@ -0,0 +1,83 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +CONFIGFILE=/etc/radvd.conf +PIDFILE=/run/radvd/radvd.pid +SYSCTL_FORWARD=net.ipv6.conf.all.forwarding + +description="IPv6 Router Advertisement Daemon" + +extra_commands="configtest" +extra_started_commands="reload" +description_configtest="Test the configuration and run startup tests" +description_reload="Reload the radvd configuration file" + +depend() { + need net +} + +checkconfig() { + if [ ! -f "${CONFIGFILE}" ]; then + eerror "Configuration file ${CONFIGFILE} not found" + return 1 + fi + + if ! /usr/sbin/radvd -c -C "${CONFIGFILE}" ; then + eerror "Configuration file ${CONFIGFILE} failed test" + return 1 + fi +} + +configtest() { + ebegin "Checking ${RC_SVCNAME} configuration" + checkconfig + eend $? +} + +start() { + if [ "${FORWARD}" != "no" ]; then + ebegin "Enabling IPv6 forwarding" + sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null + eend $? + fi + + checkconfig || return 1 + + checkpath -d -o radvd:radvd "${PIDFILE%/*}" + + ebegin "Starting IPv6 Router Advertisement Daemon" + start-stop-daemon --start --exec /usr/sbin/radvd \ + --pidfile "${PIDFILE}" \ + -- -C "${CONFIGFILE}" -p "${PIDFILE}" -u radvd ${OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping IPv6 Router Advertisement Daemon" + start-stop-daemon --stop --exec /usr/sbin/radvd --pidfile "${PIDFILE}" + eend $? + + if [ "${FORWARD}" != "no" ]; then + ebegin "Disabling IPv6 forwarding" + sysctl -w "${SYSCTL_FORWARD}=0" > /dev/null + eend $? + fi +} + +reload() { + if [ "${FORWARD}" != "no" ]; then + ebegin "Enabling IPv6 forwarding" + sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null + eend $? + fi + + checkconfig || return 1 + + checkpath -d -o radvd:radvd "${PIDFILE%/*}" + + ebegin "Reloading IPv6 Router Advertisement Daemon" + start-stop-daemon --signal HUP \ + --exec /usr/sbin/radvd --pidfile "${PIDFILE}" + eend $? +} diff --git a/net-misc/radvd/metadata.xml b/net-misc/radvd/metadata.xml index 0d25bb4f2910..f35e65745627 100644 --- a/net-misc/radvd/metadata.xml +++ b/net-misc/radvd/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="cpe">cpe:/a:litech:router_advertisement_daemon</remote-id> + <remote-id type="github">radvd-project/radvd</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/radvd/radvd-2.19-r2.ebuild b/net-misc/radvd/radvd-2.19-r2.ebuild deleted file mode 100644 index 151ad5c9031e..000000000000 --- a/net-misc/radvd/radvd-2.19-r2.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 - -inherit readme.gentoo-r1 systemd 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 ~riscv sparc x86" -IUSE="kernel_FreeBSD selinux test" -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" -CDEPEND="dev-libs/libdaemon" -DEPEND=" - ${CDEPEND} - sys-devel/bison - sys-devel/flex - test? ( dev-libs/check ) -" -RDEPEND=" - ${CDEPEND} - acct-group/radvd - acct-user/radvd - selinux? ( sec-policy/selinux-radvd ) -" - -DOCS=( CHANGES README TODO radvd.conf.example ) - -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 - - docinto html - dodoc 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 -e \ - 's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \ - -i "${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.19-r5.ebuild b/net-misc/radvd/radvd-2.19-r5.ebuild new file mode 100644 index 000000000000..5baaa8d279bc --- /dev/null +++ b/net-misc/radvd/radvd-2.19-r5.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools readme.gentoo-r1 systemd toolchain-funcs + +DESCRIPTION="Linux IPv6 Router Advertisement Daemon" +HOMEPAGE="https://radvd.litech.org/" +SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86" +IUSE="selinux test" +RESTRICT="!test? ( test )" + +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig" +DEPEND="test? ( dev-libs/check )" +RDEPEND=" + acct-group/radvd + acct-user/radvd + selinux? ( sec-policy/selinux-radvd )" + +PATCHES=( + "${FILESDIR}"/${P}-musl-include.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + + # Drop once clang16 patch is in a release + eautoreconf +} + +src_configure() { + # Needs reentrant functions (yyset_in), bug #884375 + export LEX=flex + + econf --with-pidfile=/run/radvd/radvd.pid \ + --with-systemdsystemunitdir=no \ + $(use_with test check) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + HTML_DOCS=( INTRO.html ) + default + dodoc radvd.conf.example + + newinitd "${FILESDIR}"/${PN}-2.15.init ${PN} + newconfd "${FILESDIR}"/${PN}.conf ${PN} + + systemd_dounit "${FILESDIR}"/${PN}.service + + DISABLE_AUTOFORMATTING=1 + local DOC_CONTENTS="Please create a configuration file ${EPREFIX}/etc/radvd.conf. +See ${EPREFIX}/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." + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-misc/radvd/radvd-2.19-r6.ebuild b/net-misc/radvd/radvd-2.19-r6.ebuild new file mode 100644 index 000000000000..1d81dd69fda5 --- /dev/null +++ b/net-misc/radvd/radvd-2.19-r6.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools readme.gentoo-r1 systemd toolchain-funcs + +DESCRIPTION="Linux IPv6 Router Advertisement Daemon" +HOMEPAGE="https://radvd.litech.org/" +SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="selinux test" +RESTRICT="!test? ( test )" + +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig" +DEPEND="test? ( dev-libs/check )" +RDEPEND=" + acct-group/radvd + acct-user/radvd + selinux? ( sec-policy/selinux-radvd )" + +PATCHES=( + "${FILESDIR}"/${P}-musl-include.patch + "${FILESDIR}"/${P}-clang16.patch + "${FILESDIR}"/${P}-configure-c99.patch +) + +src_prepare() { + default + + # Drop once clang16 patch is in a release + eautoreconf +} + +src_configure() { + # Needs reentrant functions (yyset_in), bug #884375 + export LEX=flex + + econf --with-pidfile=/run/radvd/radvd.pid \ + --with-systemdsystemunitdir=no \ + $(use_with test check) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + HTML_DOCS=( INTRO.html ) + default + dodoc radvd.conf.example + + newinitd "${FILESDIR}"/${PN}-2.15.init ${PN} + newconfd "${FILESDIR}"/${PN}.conf ${PN} + + systemd_dounit "${FILESDIR}"/${PN}.service + + DISABLE_AUTOFORMATTING=1 + local DOC_CONTENTS="Please create a configuration file ${EPREFIX}/etc/radvd.conf. +See ${EPREFIX}/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." + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-misc/radvd/radvd-2.19-r7.ebuild b/net-misc/radvd/radvd-2.19-r7.ebuild new file mode 100644 index 000000000000..803571c1bfce --- /dev/null +++ b/net-misc/radvd/radvd-2.19-r7.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools readme.gentoo-r1 systemd toolchain-funcs + +DESCRIPTION="Linux IPv6 Router Advertisement Daemon" +HOMEPAGE="https://radvd.litech.org/" +SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="selinux test" +RESTRICT="!test? ( test )" + +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig" +DEPEND="test? ( dev-libs/check )" +RDEPEND=" + acct-group/radvd + acct-user/radvd + selinux? ( sec-policy/selinux-radvd )" + +PATCHES=( + "${FILESDIR}"/${P}-musl-include.patch + "${FILESDIR}"/${P}-clang16.patch + "${FILESDIR}"/${P}-configure-c99.patch +) + +src_prepare() { + default + + # Drop once clang16 patch is in a release + eautoreconf +} + +src_configure() { + # Needs reentrant functions (yyset_in), bug #884375 + export LEX=flex + + econf --with-pidfile=/run/radvd/radvd.pid \ + --with-systemdsystemunitdir=no \ + $(use_with test check) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + HTML_DOCS=( INTRO.html ) + default + dodoc radvd.conf.example + + newinitd "${FILESDIR}"/${PN}-2.19.init ${PN} + newconfd "${FILESDIR}"/${PN}.conf ${PN} + + systemd_dounit "${FILESDIR}"/${PN}.service + + DISABLE_AUTOFORMATTING=1 + local DOC_CONTENTS="Please create a configuration file ${EPREFIX}/etc/radvd.conf. +See ${EPREFIX}/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." + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest index b88762fa99e9..d920dc4e4452 100644 --- a/net-misc/rclone/Manifest +++ b/net-misc/rclone/Manifest @@ -1,784 +1,8 @@ -DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.mod 158 BLAKE2B 2b8e2dc6a4055bfa30dcc2df66c47140ac85a3b998210ae97cac41cf2a0f13125fda57c580b08f48377ac58be6a192af8cf4387ca9d3a010b012ab5fc468a172 SHA512 570386c94cfce7255778442222ff746186dc7e8ce1471deaec672f7efa157f2069b493a30b9e700dfce68d48c29eb95e8a373a5300e14fe01e58c37cf29478c5 -DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.zip 236558 BLAKE2B 1426f4d517d149ad1b04b50345d7dd1a16592e8eb7e774ef00ba7d4829904c410f772c4480f4c2055093c390ad0db623c88a254ca6116895ed97a62a0d1b545e SHA512 8ea9fccff666a16c4e4328d715c3cb90bdbc745357bb19e5df3c495af8b6f6eef2ded330f43f4e8759fc2f027a20f483bc9fa472a1c0914c64f9d745f9c210de -DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f -DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea -DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c -DIST cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod 1129 BLAKE2B 975226b22ad0291e83a5e47d901c79ac5a7c684010972581dc15f9713154141f3d6dd7231407255240620e29cbfeb877f05f5b5d388100a70d381f8f54f7db5f SHA512 70400a50eedc5305fef765d38f0428f636f439195d09cbb283ee7779b8aba1f881f83d894acbc6ee90ff016358aa9b117c79557da15d10fc60264eb36ed3fe3c -DIST cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod 1226 BLAKE2B d0544ce288b6beec6b76bfd106924e8a9ad50913946ae7e8243dc3e61356363a361384ee6c827bb4040976d783b217ad1619be3a34cba533940ed4ecfce4be41 SHA512 104e7cd0eb1c4a3bccfca3feb31f1530973d4829d853ee30e8e03c2ef80ccef784bc0560342d31d8dcdc6d410fe8f64a302140e452fb77d96ea2b342bfb8b319 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod 1149 BLAKE2B bc4e8c16d0c809b4f5d46d8b29112192ff51066e7df99242923eed643339599ca3d1180afe571c3e826d656d935ccc9ff1ba1b79701de859cc15364415bb35ae SHA512 de15381b36dd6691bf40592be83b4ae5b58fc92111a3ccb8cb4b540e1230dc0798d86c149884e8dfb6f93ec827447acdd7ccca2f2942c81aeafd1b035f5c482a -DIST cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod 982 BLAKE2B 9e5e32bacbfe15d8c72b4ee66a6e4124a3d58b989ecf022cdcda38e99b83924382f412067de8f6bdf3b1ecf8deffdf8fc74a8be671221f39fc2c8b11b2919e88 SHA512 86e2e042bcb371780189029b21afe24ba8ee166a9c0a4eacc314444844cfca3dfdace1678b01a213b7452cd69acd1d46b7051614569b99ac6fed84887b0e3097 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod 1048 BLAKE2B 8e1306450c5e8dbba561b9b24ed532f78fdd40a27c989b2bb6a981f4583959f4ab71e913685444c291648254455662909243a547bd623aecc426a1a6971d0376 SHA512 deb18eadb388fdf52fc6345b05c30a459777f3cfc67ed44d072a16e214c4ad1ef88d4775d38a3abf03df26d42fad13405f6fba081c5c19c129ec39df1973d8fd -DIST cloud.google.com%2Fgo%2F@v%2Fv0.56.0.zip 1365713 BLAKE2B d6dcaeeed2ba93cc3c8da0f92685d0c14252827497bbf54a736b6284c92b599cd4e176d6c458b643ab1d41b91499c3b0fa8e6a8265e52e432162a034273155f6 SHA512 b82cefd32e011cd1d821ed93665e0f08be55d81c33397587120d05fef31a3941d2dfdc84399414636170bbc3553f5ccc3048621ae6417d6b9ec07804546d27ab -DIST cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod 1096 BLAKE2B 6e3982479d332fbcf74ee167d41289e6f4cb4c2982e85e0631bb4b2bad291d3b76d86a8c4e18b7aec9e6494b54e67a0ff2b2b65ff3f113f530501ba964f93e60 SHA512 cbd08504799b151d34a9f3594f0713077ed5b421ef9c0fe9dd90b773638617e6f6aa153e6241dbbffa891fdaad4b14e0523834cb45e84d28f7e213b007e7e08c -DIST cloud.google.com%2Fgo%2F@v%2Fv0.59.0.mod 946 BLAKE2B 84e81b1fa7285b9db6ec0fdc6249b926b365ead14c764ee800bd83c8f4bc67aa20ff1039af00949f08e69e360d0164a830c0448aaa65234016c5a25caad6c01c SHA512 651169872f8c1b6525b0a6209a76984ed1aca2f41fbdad505c15884bbd96beb9c4fb335f6975bafbaa87be68f6bb6444c06de16226763117193dd2e769cb4e70 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.59.0.zip 1442518 BLAKE2B 12d927fb2d38324eab3ba3e7d47b1473018b0e345afbb2b1607a6c4e37c9bae5cf9eb2e0a26f649bf84e318ce304260a063c8091256597f465a542626d76b281 SHA512 bda8bc184eb1996b48ecb37b2009490bd55b0330f849cbec771c1e07fc82cc5be2c582e202739417cd2be6c6be0cefc8fba02737328c7663d5eb699805ee6360 -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1 -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039 -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod 489 BLAKE2B 036e068699429032701dd26044fd2353645e54260a7aab7f924fbfa1e1954eb814addbd9a0751ed1c786ed6c44566db5289cd4ba9e54727d5b24b6edd38a8562 SHA512 5f6a8f8f2d4ab26bdf3f150f22e6ef4feb26f264630315fdde8c171b6c2da5314057c4d763d4c61a66bc42badeba2745f576d52009c4549919e4afafa748b3be -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod 649 BLAKE2B d4ef60eed1eb5c4b84623a6bfb8bcdd52be49ea6723e2c39f8c7c87e34943aed3629d7413fbffbbac9e888bfbafd6f0f07ee84002901afb3a8cf1090b87b53a3 SHA512 3adbceec8b4bd989e804054b56e271f73658adc8a4a8bd53e32ced709a8796b33d9cf09f5ea3165dff931acc942de45508ae79634dcd9722c2220814b275f425 -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod 639 BLAKE2B dfcb82794bc8e88465ca9c754b798d6f1f270e1fe5891221d482f6b5854524d09e3d19b6f75e494f69b4861e2f1b2329c08fe9e4235005f2dff41928950dccc3 SHA512 74886885016c92ce56b584665bdcc925404bab745a25ace03dacc2ace3f812a0d568ab8d19044097906b9da479037c41468c33f1243e6d55b36fba4571117607 -DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382 -DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52 -DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c -DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c -DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a -DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod 625 BLAKE2B 43378388e5a3391a431d0e842e23ef1fc74263a797bfefacebb61ad88b42f21d133d99638f06e03cadb7894d271884f06d1f3ad9743648c31b7d22bf7e19283d SHA512 0e2dc636df1de8119b3b4153466d8f31b4e2e9fa637c625ea0a7fd94951ee38edc02064cc00d7fe9a4d9f7e3d1ed521809003602398d68508772b11939755cdf -DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b -DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba -DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0 -DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38 -DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1 -DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.mod 114 BLAKE2B 970e1a4ad4507dea0b0edd259c1ca8439bff37a76b9f706cbde70a15c57a90ad7fea738c03762e83824052cb84d025ea65e32d76b395dd7a968daada036918c4 SHA512 d03d2cd1f8e526d2efbea4cbb3d5915b70095cd921a111d97b5acea9dd1e7594f5fa1719df17637606945269563c9e6c64deb00af61adf2ad1581dcc485aaeea -DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.2.2.zip 22219 BLAKE2B d516576021eaafe8bf16205681fb2da682eb151e889320ca8cf110275959dee546bb30c8485dffb76a7e8a5cbdf2cc5040bc0169505feada70dce48d664cff10 SHA512 6044ee433265b00ce865312c00aa848f2578affe0fa86a6ce5d05697539e373783eadfabac905e2114ee1efabd16151e6004c15e4b0ae7b79545667450a8ae5d -DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.10.0.mod 383 BLAKE2B 02151eb0738757d716e533a60ba232da493cc10563decdba722a1739ebf9db92c44f4436b064cea42f9b6a6f4324a1a35270eba2f05cbe89a597254ab21b04cf SHA512 926ec3206d9bacb0e63bfe59db4af366d44fd5d76ee987e82db32d978a36a6d55880a0328b8587f99bc1d2c35ee71fc17405c3383ce94fd079aa0be8f874e540 -DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.10.0.zip 260982 BLAKE2B c7444e807f04e766596f049ee867e23f57c3087477c71fdf44c7bf62e65f40f033fa082cbaef24647eb371085230cfd35a40cf59dbcc39e5304a08ba5758f996 SHA512 7880691f61d8decc2e5e1f6647fe13574ef89ba06459a2bb192da218527b71b76fdafa9152fc3d11bbfa751b25d5300be7f15a0c812d8fa358f637d3556908e5 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.zip 96932 BLAKE2B d2dc2a89edf90b671ae441ab2c2ca6a5aa2b228cd5279f78714f43563ce98d5755386fb544fc007886315b4ebfb139205f70e5f7bc8e3c8e69fb779162e3848a SHA512 ad0798726a0c4c15525c3511b28785a626d6835e872956549d38ca1fce7351a2c8be930081c6d2f22c409665218bd854c54460e149a91dfa9f57d6fe6ef2ad1b -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.3.zip 40676 BLAKE2B caaf1d9fe9b5eeb4809bea57c8f66cd28fbfcc7c7c05a2a387aafe615dde1dd7dab7acbe5a52cc5d09b5af68bb3282a117a49a809349e93054ff535859b1f8fa SHA512 85c9d9d28312e52cef5a3f6900342ee9c4324405aa79a3f93be96d4b981bbef450f67aee77f86c941fa637e62c90b5cf9612ed8703c1243124d7ea1ac6315566 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod 113 BLAKE2B 7822bd4ddff863c4fe4e3caf59e722121828f61b08d5504216e1fea40401108199708fb07d7cef2b9dd7ddc7ed7d8feb4e0c823b8a7962217881601107404ca2 SHA512 08860dbcc27a83f322c07cb64b9fb1dad3810f8a7dda4ad5914b3fb8dcdc14fd20640e5aa78ad5dbd220c6dd95b8c9ab6e15c4bd75dc476db743f1c5df1fac95 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip 18897 BLAKE2B 984f84c50aa5024a3eb78369d669ad73e9b6a7ee6bc7a7ae95667d29706bbb7f6d1f06a8e8e98e037a1226ac9f9637e6072735a3d01b8467f3f21657ccbf7929 SHA512 3eb5646b62d06c1d610de05889dc4533e0bfe1ee5de2fd9feda4f4dea0606ddc7c667a41c73687460ab1f28f4fb17ea9b3f79b5c93ad6c4aaac6b0b9f15cd8ce -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod 114 BLAKE2B fec15aa5a362d73dbe839818a965fbf0a0183e7de3fa5b739739e7dcac4e88ae037848ccd7e6a35a4f6c3d7bc26988e0e1219ef6a3527c2533598777a0e5fdd2 SHA512 a119491d5a5b513a2ec0d0f5960ce04d03c263842f35a86a3efcb3931b5fefd19ef74df546e4b79ec119fb20dfa62d0f251c7812f144bc8258bf3acd902b693e -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip 9849 BLAKE2B 710903822f31a6678941a4489984af5b5cb7a82a97476a642fbe35061d4df496ce79159a82e4e7871fb9dfdbc3cead15416d29ac8d293165bfeb29b4c973c546 SHA512 1529a7855dce3307332e12e3b717b8c6ed9c274637e357007801df890332304f88f7aa159da3bc3685701f49edd78cbd10895131daea9c6c034d7619d21847a5 -DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod 52 BLAKE2B 83e3b09b165e45af373e2e62dc0b7799ac204794e1922b4134ebbeba4cf6cd9b6d883f6035624f2421e8ae613d071a2e281379ee4935e55b73540ad8104d79cd SHA512 ad433e42696f3b605cdb12c70438d3b1a4d4d52890cb28b8e76cb26bf1ae51f324e6dbe2043bd74bc9086efe743da65b8cbddd10618f4b59d27858e0898279d5 -DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip 9362 BLAKE2B aef4f369994d869906ca45a1051cc706579525324b8fe2a5c98dd4d80d4181366ff7e3cbb08f3274762a6f2ab2259a2770fa11a9b088b07ff3abf1a241d01814 SHA512 f81a070b61e026440ddd9b29174fd1d59241eb32d1fb4a2202c38fe80022aaff07b389ed6d75eff27da9408a7832f74c51f3c53866774cd9125e83c9f258bb61 -DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d -DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B 1c42d23c77848911af642fd38f79aab655056e731f015a62374a23cdaade84b53f61b80f65f9416bd4f0e4b72a0b42203b56d659d30a44bb244a6ed5ed1869eb SHA512 f1a334ef91dd9410c57efbeece2ebef6ea326485e790e47de67efc9495d3e252cd7e981bd9da3f94f2f7e35c1bad9a8d5153e671a9b81758ad0584883c916155 -DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146 -DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f -DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d -DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4 -DIST github.com%2F!roaring!bitmap%2Froaring%2F@v%2Fv0.4.7.mod 40 BLAKE2B b44c63cdfc82888697723b5342dd100042599a8b5ed94e0f743f3c3e44833432bfe9cb1a673aceba123c14fd054c93e4398cb391717b805faa39f7090ec0796a SHA512 f6ce2a55f08fca0d8d18a21570db3933e816f0117d8b8f792da159d6798a19726d850d2427cfa3c7d8c78beaba0609d80fb7486594b57ae01d4d222fb908e966 -DIST github.com%2F!unknwon%2Fgoconfig%2F@v%2Fv0.0.0-20191126170842-860a72fb44fd.mod 35 BLAKE2B 3fa6b1095c574b70b16551036cb056f2682bee7c4d72561a517b78a0639fb7087763a843cfe440a2e16d6d9e1ae8fbd7b23d494b3c2c329c1e334f385d6c26c0 SHA512 c3587cf56f66da44740ab45674394b4106398eec10361095205cfabe29f53ca11dcfe91c964c7a46de152a715e2ea56d5c4c13e3c94d729561450754f7dd15e8 -DIST github.com%2F!unknwon%2Fgoconfig%2F@v%2Fv0.0.0-20191126170842-860a72fb44fd.zip 21167 BLAKE2B 01ffca9794bf32b323526d27d1840b753cf7a42523b9f5a407c2984c3dafc6cb963023dac3254b31241507ff4514ad8ef2804cbcf27a1813b7e53298b35a3d38 SHA512 b42ad4612415fdeac1ddf90850e0ce70d3f5946a6eb4ca63260a4d88b2b1625a32eece98b2a1438d845fc32c0e4335352d803d961ed9951307c8c60d6c3df5f6 -DIST github.com%2Fa8m%2Ftree%2F@v%2Fv0.0.0-20181222104329-6a0b80129de4.mod 27 BLAKE2B 95d66662dce1ab5bc9800eb098b36c6494cc2cf3e742f6537d6361401325b18bdd7b6e933a9f72a6a8aad0d19e38e38b18b2002a1dd25ab26fc96b7505d4388b SHA512 c64df5fe6e4ec181850a2c87595e0a9cf3f4c8b13303c8f90c21d55fddfbc26b5dc2f6765708bb72992eeb61662047f0b3f3bc951d223b54831a743bf164938f -DIST github.com%2Fa8m%2Ftree%2F@v%2Fv0.0.0-20181222104329-6a0b80129de4.zip 17087 BLAKE2B 18a4c6d31fc947c95da7aee0c36a91fc08540afe817963e8b43367d69f7ae43c1bdc3c89bbf36f49b6d49a60c098ff08aa648472010d1718ec6712a7a47044e4 SHA512 53f6bd666dc8c41c2452faddde42c392a14695797dcf91aa86554aa9d9fb19289306d5060008c7dccccf6f954aeac45a2d75d2911155ae76885a797a9be17f4f -DIST github.com%2Faalpar%2Fdeheap%2F@v%2Fv0.0.0-20200318053559-9a0c2883bd56.mod 32 BLAKE2B 478fad943b5ed2e3ec1262a81f7544af90bd56ab659fd2146ad54b22229c99fcfda8f6c0c0e091d97987cfa47a460b731c964cd705ea9353df31c19e73c94138 SHA512 e1a3ec96c7c5b844625f6a4534d0e93332a055afa6c2499dd72bdfd342bf79b5478075b8c5812e566f9ab98acd228f987f58dbf8980e8be119b0db8c2b4c561e -DIST github.com%2Faalpar%2Fdeheap%2F@v%2Fv0.0.0-20200318053559-9a0c2883bd56.zip 10285 BLAKE2B 230272d5f0e626ba2e5a4891bf3da2eec3d287407f1b4375caac0a5cacf3aeae874faebc1c9facce0ce9285f2341cfb678bea6ce826f7d20b40dae7d3f33a894 SHA512 a2c8a1977d946a6da80d32a21b051bb27e1c6ec057d1f692c949d40106a8f9eb74ad32716cc7e8d9a188e0eb3974c21f9e1c323a3916c6b9e18625fc6d2b5a4c -DIST github.com%2Fabbot%2Fgo-http-auth%2F@v%2Fv0.4.0.mod 37 BLAKE2B c2092425b8c00b2d65f9acd280a767c1688bf3836e447a49d9e16e1f36984d6f0a8efffe35ed40fda5553a4bf45202f716e0471dd95086064c67da107a535730 SHA512 37c17489e7a493c676569f210c4909a5dbe595992919a65b1e5e5111fe39c567e8e8238e31d9e034b64fb72f5c9addc4ed958b3e7ef264ba9387b24760ddff78 -DIST github.com%2Fabbot%2Fgo-http-auth%2F@v%2Fv0.4.0.zip 23279 BLAKE2B 8487b3dc039694c667e6769bb6e7932f494152c88a34f1a66ea323135d37273a3236897477409d9b455a843664c83212e6e6af432aa0a1e1f207c597d6c7683c SHA512 f16edacebb801d79443bdbfd6d68bda2b607dfcd7ac3a422ad39051bfd4a53a0b42508515d46f0ea153184af5400652e93145b7ff7af384dc3274e3ad18cde2a -DIST github.com%2Faead%2Fsiphash%2F@v%2Fv1.0.1.mod 31 BLAKE2B 0e07ae1110a18d70ea6586009db68ef57051a89f7476c219cc584815e896efd2b3a40ba9603aea815152caf8ba655183fa65441b0de346aba273dd73459c73a0 SHA512 27782423c17ad862a5697922bcf0222239aef0b7915493caeb133743520490e07927a5b3c63227278e7abd352856ed276554d4e59639667336f23ff0bf111900 -DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929 -DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929 -DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175 -DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175 -DIST github.com%2Fanacrolix%2Fdms%2F@v%2Fv1.1.0.mod 376 BLAKE2B 97d08ba9f83c8b82f43833909845dc9aa6f9c7859f8bbb8953cd9b9bbd1e4fc7d6edd84c10e26e4a2c24ee933f6fe1f801f50189126de7186ee3508b74efd247 SHA512 4a6262db1fe6923cd4a34bc3e32993b20a3b95a414066713f40025bcb314e90418a3c2270766b2610c5e9d2e3d6aa0d8deb77d55529ead40a36f1f3a0caafd50 -DIST github.com%2Fanacrolix%2Fdms%2F@v%2Fv1.1.0.zip 108220 BLAKE2B d876eeaecf4670d30623555f91b0d17c55cfcbab0680eef2b40b64b69947c66320a09c1886168fd0f456ecc11ba0a453016ad5483188a1a237156cd1627b783b SHA512 8f5bf35e21d8c1e836d5d088860f44bbd92a5c1adc3162f3699bb874cc3f8fdd7cab62dfd41e5c89d358fa9aa536699a7d7c0b46b223361f826a38d06afa263a -DIST github.com%2Fanacrolix%2Fenvpprof%2F@v%2Fv0.0.0-20180404065416-323002cec2fa.mod 37 BLAKE2B 2be005ea8ce42a1629269d167c77636df54ae9b2d8c3ed79fdebc06e86caf1c7928f80c428dec483ba6bcc62faab1f8d7ec34b48206d0f9ab458ce3182176888 SHA512 ad4351065ed4868cef802996d30ee247a80c78dcc60697ada59d344c337d7fc491ddd29fc2dfc98f7286e13bb5d085cbdbf9554118e55e2e63928998205e1a47 -DIST github.com%2Fanacrolix%2Fenvpprof%2F@v%2Fv1.0.0.mod 37 BLAKE2B 2be005ea8ce42a1629269d167c77636df54ae9b2d8c3ed79fdebc06e86caf1c7928f80c428dec483ba6bcc62faab1f8d7ec34b48206d0f9ab458ce3182176888 SHA512 ad4351065ed4868cef802996d30ee247a80c78dcc60697ada59d344c337d7fc491ddd29fc2dfc98f7286e13bb5d085cbdbf9554118e55e2e63928998205e1a47 -DIST github.com%2Fanacrolix%2Fffprobe%2F@v%2Fv1.0.0.mod 171 BLAKE2B 7088dc8d10a1a7666c6813ad5af2b85e36689775698a73edd6389130f6ac8be565ea6fa187afeac9d4b1a98031cb094fe373347ea53553b7e6eac875a7d2fcfe SHA512 3544df151636db722418dc220e92705ab4e2fbf8c05a1d2f7b371ec7e3f7409dca0d77174da16d6a010a75cd180679d083979639c6d140846521394ba5480ece -DIST github.com%2Fanacrolix%2Fmissinggo%2F@v%2Fv1.1.0.mod 1448 BLAKE2B e4d09585f9af692ca0ad58dc6f31f5df1d20baded0edca1fc5bfeab5c13830f1cf4a512b0506f9cca6f9fb54e6c38a686d444b0e758d1f2d877150a4852dd656 SHA512 d7c9b897f4bcd64247997ae4fe1f7d86efac3be694a4d247d95e2720b232aa7a3a86b1c3e3d4de014f23023d19b43708fd6828be6b61ef021c8bab6bde5d555a -DIST github.com%2Fanacrolix%2Ftagflag%2F@v%2Fv0.0.0-20180109131632-2146c8d41bf0.mod 36 BLAKE2B 38b353e62e91963d6621ce69d4b3248d7e069db279cb01700d9a6e14761af309430f56075fe5a25abafb131b77e6fce9418cd0b515bc0c45369b826a7d41d2fd SHA512 dfbf8bd282ab5d6a0ea06c5c74f2f48a679020cc4df5b103bc3888211a373df482340e2d979502dc31430dbaca4bab7408897d34ddac349bb03201d24e7a5f11 -DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8 -DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod 35 BLAKE2B 15461787708b56993bf7904db63ae2a711c78fe67157ff2adec29bcdce2f6c29b7ef5d997ed7a0123ab24b0f3069d3833405849924037ca4da8c05032725706a SHA512 49d95d7db5b42c6948c50dcbee20a5ec6b554e78f8ee4beec2303b318d6289a32be807084806bd17ee8e680e58c2693f753614fdb6788f424c9d7496790b20ba -DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip 7610 BLAKE2B 98f86c3092146db7614ab394d67f720bc3a8852576c0ede1f7ff053df2222d8811274d0ba981efa7dc2c8fc3350c360f21ed45f429ecbcfd2a2da8663a209079 SHA512 5df11a2def2b93ec0465fffaeee22cf12802fd63574dccf977a6153aaddbe95c2a3ce20388fa3c3dba0b41d0cafbfa827ab9e6c311cfeb491e5b09aa907cb6cb -DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.32.11.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e -DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.32.11.zip 16575309 BLAKE2B 6ace087d5aab49228ba959abdf1415bd466076486bcb18772140169075f7b02a0145d87cf8f00b5caa2102aed30daa353720de30b47b050777e341ac74a88014 SHA512 8f36d5c32a31d9eb9d433afd69c3fc8eaece1112ed3a5197054c71574f1ab63d5df3b7a1b98ad3f12ad0814ffa04f8f3c800320d9b881b70d6e479fc668c1f4f -DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f -DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b -DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570 -DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf -DIST github.com%2Fbillziss-gh%2Fcgofuse%2F@v%2Fv1.4.0.mod 38 BLAKE2B 2875fac9a8321bda4e5140346a3ca9fb4ab7bd444f37c019fba0868bf0ae512bbc0ac2c68ca0ac5e9578cb5d7cbbb3a0ff2900fc6df62bf2649ce485b1ee2df8 SHA512 6e0448a21c35cec11670db74efd8363f5800ac5d8d403f6beac134d8fa932a4371ff31d22e9e1142f815a202ac952a95bdd5b3906c719209752e850bb2d9e29b -DIST github.com%2Fbillziss-gh%2Fcgofuse%2F@v%2Fv1.4.0.zip 52228 BLAKE2B a7f41080ac20e7d0b78cb93cabc462eb2805e6d324d62ec21fcf3691f0068a6af47346351b57f4d4615245e6a400c3f164217f281f1e094945eddb6e4866c4ab SHA512 416fe0778ada2da15e778263fe8d7f9fbfcf79c81b7df69c361aa811b1094537587994ce8a2086c3fab0f0e6561a52dde18d3e2254ab4c000a61953ecad484e9 -DIST github.com%2Fbradfitz%2Fiter%2F@v%2Fv0.0.0-20140124041915-454541ec3da2.mod 32 BLAKE2B f20fbc4e3042b1dddaa45f1ab247212893f1ee88362854b7c749fbf0d2ad8f3c9b1daca87ad81deb253abed79b5d29c8172705403332eca84185e69f63d843b1 SHA512 d021d8d7be814bdd917803136739c245b8e84543b0a0a011e74e2b022714ccbd186d727b10442deee78e620974f898a5edf3aab86293a577a4af6dc465ea1e22 -DIST github.com%2Fbradfitz%2Fiter%2F@v%2Fv0.0.0-20190303215204-33e6a9893b0c.mod 32 BLAKE2B f20fbc4e3042b1dddaa45f1ab247212893f1ee88362854b7c749fbf0d2ad8f3c9b1daca87ad81deb253abed79b5d29c8172705403332eca84185e69f63d843b1 SHA512 d021d8d7be814bdd917803136739c245b8e84543b0a0a011e74e2b022714ccbd186d727b10442deee78e620974f898a5edf3aab86293a577a4af6dc465ea1e22 -DIST github.com%2Fbtcsuite%2Fbtcd%2F@v%2Fv0.20.1-beta.mod 913 BLAKE2B 34c74ca4a6b36d48d11cd24559e58f5f2d389db9c8946811bf60b4e36ca7ed0e1ec32da129b16b6d2e904200212761c0e0cc997886a96c195778c9f3305acad0 SHA512 eeca58cd15d73e4074d3139430632556301392118e1c1f468cd6c86331993ffeaed407503d0b687a455a4052dfd46a2049bd839437276133e009c4477b778b3c -DIST github.com%2Fbtcsuite%2Fbtclog%2F@v%2Fv0.0.0-20170628155309-84c8d2346e9f.mod 34 BLAKE2B c775b370ca97e395887e54ab02aefe9e14a50db63424bb16ef5879042a1cefe65147ce346999678bcebfe7148db5ed9f9eb136b4e13ce3420c475059118dbecc SHA512 9a9bfcfd623331e8b3e4b49de79bc3ab07d9c84aa5fb96a226a16acb479b9aaab06ef9f7a5a0b1af5da407d17dbe3c99760f76e22e113aa73f9fb4bcec3806e2 -DIST github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv0.0.0-20190425235716-9e5f4b9a998d.mod 35 BLAKE2B cd84a8bb023a5f82f7f7a3175704104f8180f9f81a38a56f7fd76a28fcd0456d1b70ae6c28e5a25b5fa2c03cc5b685aeaf800325372d575eb97af1bdbaeea18d SHA512 52310213cf480b7e62c96946555127515fe4874772e9cd88ba21be58a95a7e71c99d2935a304b56c5ac6901615eef0d942e6da39c9899dec4b3d7ecdd2aa5c5b -DIST github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv1.0.1.mod 308 BLAKE2B 61a7c5781c1f7d591f91be8e620a8ed45c6ff850b801dcd22f7418f61672c287438e447b75b089d1b54a515c4411d850582fcf2a701b55b7a0568a2668913016 SHA512 4b7e20b65cc412af8e42385923df770e333912942f517df080a87d1793761ba88cd1b76b4e0faa9d2a6b5cd2ee9c9b783a746b08027b6bb4e41e2c9020acef5d -DIST github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv1.0.1.zip 140582 BLAKE2B 4aba947aedaec6cbd5790b650f2b88beff59882eb112bb613df4c3d47f1585180fd61a6ed67b4a52d742e472803e6a947ab26dc60da5868afec22722a9355c1a SHA512 a8f506fad0391906f5b7d5d8e9ba0c8ed2491051e07a05ba22e335620b0bf21b9df114d5b1a1bed438bdb13d00bad043a3ca5e628b0950215cd69fe57c6df30e -DIST github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv1.0.2.mod 308 BLAKE2B 61a7c5781c1f7d591f91be8e620a8ed45c6ff850b801dcd22f7418f61672c287438e447b75b089d1b54a515c4411d850582fcf2a701b55b7a0568a2668913016 SHA512 4b7e20b65cc412af8e42385923df770e333912942f517df080a87d1793761ba88cd1b76b4e0faa9d2a6b5cd2ee9c9b783a746b08027b6bb4e41e2c9020acef5d -DIST github.com%2Fbtcsuite%2Fbtcutil%2F@v%2Fv1.0.2.zip 140582 BLAKE2B 5e46b3e5e219db004db4669357b887771a27dff9e5421f924413caa1178552d605046ae87b1fe1898893c73c796668ce68a0e0848e5e7bb10f640c640d78cf61 SHA512 af63731024f998963e3965fac49ee40d63b6d5b8158c48472077612d7ba6d8d5152f8fab142e1361279330b4dc07bc473b596d86297ee4527d5bc1c91470ab74 -DIST github.com%2Fbtcsuite%2Fgo-socks%2F@v%2Fv0.0.0-20170105172521-4720035b7bfd.mod 36 BLAKE2B 3232773544bcbba9d275a4547e52dcbe3a1f1cf7806e71e4ddb3ec1453130a8d64214b3c7410187b005abf33160441dde141c25ff967484c3caabb3afa4fddf4 SHA512 a0c78d97cb6ebedc110f96b2b163fb7ff5d07650f5d6c2f4f715d6c79fdccb15a6b13eb65e51bb1b352bd7960a0a45555c5aeaf5df2475e56749cbf2172f3704 -DIST github.com%2Fbtcsuite%2Fgoleveldb%2F@v%2Fv0.0.0-20160330041536-7834afc9e8cd.mod 37 BLAKE2B ced8ff9a67a6fdc521b30ce66ea72f1fafa31d692ea99d2a723f3a571817ebfb7f61f86dd13e494e348504066d4d28f162e1ff73c4012230d3fddb3a0f4351a3 SHA512 e11603e97773889aa6eb953de16e6affce4530db9ab4f4ce5468277879785689779817e1737d302974b0be25b9331152be67a417f222b329ff6f4d52d2b6217e -DIST github.com%2Fbtcsuite%2Fsnappy-go%2F@v%2Fv0.0.0-20151229074030-0bdef8d06723.mod 37 BLAKE2B 64da3d86f39de934212b6a45e6d9a6c2d373651f41f102297926935b866fd8be1015a0ea57ea2b74a8f78fe2726fa58879017e1164802fc547548869bfe4ed7d SHA512 50d63b876c12da0423ae718f3db7ec1e829f6c651ed6cf530bf8b09a14435f3092b73650e56e0da631e23f53330146edd9f7765be1eca72802bac596e8a62437 -DIST github.com%2Fbtcsuite%2Fwebsocket%2F@v%2Fv0.0.0-20150119174127-31079b680792.mod 37 BLAKE2B 2abbda206e6e06f01e6cf7f41f604175d0fc0ea76fbcd691272ce5248d6c68ca83bbb1ab54e27d51a2cb988ec7582c2386118ce040dad32ec7816f4b039630d2 SHA512 fcc74c64b0213c552b7c65b5d4d4ba756320ce9a8b0fca1721ea475cfba07c5589ca01f20c1ed49975300a8ecea1367f3e614bf602611a526891f8105fce57d1 -DIST github.com%2Fbtcsuite%2Fwinsvc%2F@v%2Fv1.0.0.mod 34 BLAKE2B b28e5f8509b703acec802140a2faac942edde87f448d478dc7da699cf058157f2c0d1bf0db9234243203747687c743e28164cb1c6ab432575e988d34738edf4c SHA512 3c291f18f0e2f5fea861239ae9dec3c70e4a6ba904a0c09f36c835bdeeaa25a49b2c7f290c8d030e9e731cd86e27966b7e41d57628c7ac5cb42e4e9fb2e6ace7 -DIST github.com%2Fcalebcase%2Ftmpfile%2F@v%2Fv1.0.2-0.20200602150926-3af473ef8439.mod 106 BLAKE2B 7db78383c50815cc449b185607f3cc0e35d1d71392da0241908a4844b00d4f7656594b01ff13468e7267e752a957043eb3ab0d5fb149cd9fc1f95e98e1821d47 SHA512 b6f881c4d30ad3922f27d7ad236eebd063690f00a231d9541a3e98f094c3e046bfc8c72e4c905a981581136646ed795feec97a125f5dfa8c7c7075d93034db01 -DIST github.com%2Fcalebcase%2Ftmpfile%2F@v%2Fv1.0.2.mod 106 BLAKE2B 7db78383c50815cc449b185607f3cc0e35d1d71392da0241908a4844b00d4f7656594b01ff13468e7267e752a957043eb3ab0d5fb149cd9fc1f95e98e1821d47 SHA512 b6f881c4d30ad3922f27d7ad236eebd063690f00a231d9541a3e98f094c3e046bfc8c72e4c905a981581136646ed795feec97a125f5dfa8c7c7075d93034db01 -DIST github.com%2Fcalebcase%2Ftmpfile%2F@v%2Fv1.0.2.zip 10102 BLAKE2B dcee459762b34b202fd9aa83bab29ec43bfdd56651ed846f0863b28ccb7127feea0b9bb84b60df8901e5f6a767b07ab709c821e3ef2cb81d8842c2685db00c07 SHA512 2c4609ed998ba8fe734dbb04d0572ef2de22f120d3c090418fe1b0703cc3b0860d30da266f53e0ca8af1640bf623e372e5f2327a3c99d829f71201d12e5050c7 -DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4 -DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9 -DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6 -DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b -DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486 -DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2 -DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d -DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556 -DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5 -DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014 -DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251 -DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f -DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2 -DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2 -DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip 13848 BLAKE2B dc2ec3bf79baaafad410ac2b4625dbc1c520803659b480c2014ffef484d409135ea5d09035669457162457962dc6b3532a480893f399b876810fbc1adfdab8e2 SHA512 918009558869443193fed748b3cc807dbfc540967d60e0315c74c6a09324d7d783067e0f21c5461ebadcdec3c7e6417522565a00e33617af8a8168281a0040c3 -DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d -DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33 -DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d -DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20171005155431-ecdeabc65495.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb -DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec -DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2 -DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e -DIST github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod 35 BLAKE2B 03d1120023db31c39a39e5b7f336b05bed30e652c890e12986c81778e49c771e97e8ff0dcbb053f00627ffdb229223b385a9524fa1d35ee83860ca3e0b0701e8 SHA512 7f90935b89bc2fc83b0f52d0090d8cc3f7262415b1feb9c19420f663da4ab8d87bb5cf42c2a558038c57e3e772b468132509b45fe40a4993d0b64b80aeb64ebf -DIST github.com%2Fdropbox%2Fdropbox-sdk-go-unofficial%2F@v%2Fv5.6.0+incompatible.mod 52 BLAKE2B b6867085a8be02f41e2086ec3bdefb4b197ad47d25bc579a25511cb2631a0d430cd47ab951724c51bdc4841a1471b281163fe050261c9d4854bb10cf1637c910 SHA512 5734f12f0b724b06f1203deeee723e6d29131b8e767ccb7a97366fbf05909a10facdc17a3312174e094d3493a6d4d1d75621d71b67a261255eb658b2f50cc8db -DIST github.com%2Fdropbox%2Fdropbox-sdk-go-unofficial%2F@v%2Fv5.6.0+incompatible.zip 260967 BLAKE2B 5d32d1f8cf329af48a6e5117ea72a1f4381cde45ddf092cb91bbeb349d3a9fe2d81695fb8983993bba655a9ef82f27e3377570ebe94da1bfaf53df2365570e2c SHA512 c01494347cf019e68952c501b18dbe59d2678fe3a680f8d3bcbb1d719ade0b9ddd5fe383635af07fbfdd748cd357816ae8bd5db3902b631b82307d8f71e14162 -DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20180421182945-02af3965c54e.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b -DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b -DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58 -DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58 -DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf -DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa -DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341 -DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3 -DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741 -DIST github.com%2Fglycerine%2Fgo-unsnap-stream%2F@v%2Fv0.0.0-20180323001048-9f0cb55181dd.mod 45 BLAKE2B bac7691d817e47764a81e469868f9b02deae3674d8853e7e9e089000dc2c8c94414c978dde8f7b8da65bb692bde21f569db9de8b94c2944d92b17b9534ef9b55 SHA512 d74f84f6297e89c221091296b305df98c6a28d30385a5a4dccbdb664040f23dd211528e2d859e259e862b0f626f94dcdd20ff58aa8afe26af5b95d9e675507e4 -DIST github.com%2Fglycerine%2Fgoconvey%2F@v%2Fv0.0.0-20180728074245-46e3a41ad493.mod 37 BLAKE2B a1d5e990a4760ee43e0e3ecfcfed98cadb6870b30fd5bc4015c5d4ad89eed058453f2f48a771eb12f0952e7fca5a817aeb0139f529b6fa7a82a1445e19c066f2 SHA512 f8c65c717d960464e2773cd3f6d73a481d9694ed90627a08eefd42f9fbac72c60a5fa4b0b28942eac6292afe62d244eaed51a6514133a8d0ff41282b3bc71c26 -DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8 -DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e -DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e -DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c -DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c -DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea -DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7 -DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc -DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0 -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5 -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106 -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip 2656615 BLAKE2B 08542db845ecffd88d279cd63919a705d566084bb556aa4a6c98164a11520ec6476841128134f8fac2e5132d5fb298c9ef6670074891e91ca90577a8535049ff SHA512 2e51e876c4533c4b34f0017f6f13ff3c34922a1905f6a4f90bab241152dbb344689d8d1f5ff1040c79632feb21fbd8f213831179bd424579ac9b5bb602325bac -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142 -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa55efca631fe5def383ec089fab784cad7d6a031ea390463a0c552f5fc4698f7648d271f40fb0ae3eee525f149347bb409c951d15d86b7f560e16 SHA512 c7e2170eda176da203ca64e402c11489c1fd183afd3359742e373927ff228d62e445f5dfc001a471303e1708862998c125ad4c2db86919596297b11cae4aee9e -DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip 39701 BLAKE2B ecac1c4212267252571babe2c7332b517c22a7c535777a40b6e318299bc284ba3676ca75df60670dad69698450e97dc614b98c6c9fa793a4f3daa3bf88859167 SHA512 e4cc88b9e484d43a328c2ce80b812d4886fee13b915a41fb64b28cacb163960059de066b9be8aec33be081fdcd3db847ee491aeeb1a74b25aadca2c206c9587f -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96 -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96 -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32 -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod 154 BLAKE2B 8645404d124dde54c3e9c284b1243b1faf2124f2b7d6c5e6566ca600d3c965f7787f09f6825840f5e3ea6d36c016ef2c7fef10e8e12dce354593f7a8a3210a33 SHA512 4c9416c4777123a39b23b49ecf6265295fc3432de083a04dbefc87264b8c69f0d9e342ebb7e8e488f30c3efdc02951fd7dec23dfd1fef0802c8f0250f96612a8 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip 206762 BLAKE2B 13c74350dfc3bf39540c37f6b7771f18930d6bfd6a5c83c27c723065da6458e0de544a6fa4d57c027e6c67eb528493c620228a56249b889f00d67a064218dbb0 SHA512 3d92469995664037149e3e11363db685b3175fff01f4ef3b578ada273853a16131b3c97899b497ab75ffbeb6191fe59a28f073779828f719681b8e15182b6211 -DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5 -DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180124185431-e89373fe6b4a.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410 -DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410 -DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.zip 125740 BLAKE2B 53846b62364384c96a4a1038e7c04213e5623fc97365708174ba705781fa07760fe7726615901bc18a2fa099e90b7e4a5f9023daa5c5a3db8c421360a730e97e SHA512 6ad2ac900d1a8812eb6dd037a2ad5342ef74a339eeb490f23acc207819b8ba9e0c53185364908dfb65e57510146084c7e35e75de0a9fa4bf0898112f8ca8f551 -DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574 -DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e -DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee -DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200507031123-427632fa3b1c.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02 -DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b -DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba -DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73 -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19 -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d -DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771 -DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181103185306-d547d1d9531e.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771 -DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181103185306-d547d1d9531e.zip 257755 BLAKE2B 9b1b767f10d3d48e9b7b1af7997185a056bedffdb313efc687ee6443d008c3ec829cc0a22cde09086bc8724a7a0c341672c15019b6a9c620a312640291a11986 SHA512 8e2b7ada7d24509c72b7b7d6e9e58c198af2a5648ce1a90a95360747ef043a5816f803c073cc17bcd50f8468df4c700b2e5dd87ab69d8a804616a022255191da -DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a -DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945 -DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e -DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49 -DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.mod 94 BLAKE2B 36f3fb449d60fd88b98ab51277603a6c6aa551a1b15fc01ec289506cbb22fca2d7bc2841dd8574c9cdcc5ef14d70aacd5eecd240060b396c76422326f5e5dcea SHA512 a4ec6bdb7df5b5706be0a19144023042cce1fe54d1fe23d2556fcf1c23fadc112f5c4f16d6b497ab0ddf595fb21550543e65ace43a147747d894c220da346ce2 -DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.zip 219180 BLAKE2B 8b80ef3028be429c025c8b75aaae686cac7fcbd0d6b196311dc77c1079a5c8db5b8b2db602282345bb0fd25037669b00796e7a92a40cfc42a79cd299ebe0940d SHA512 b5a5bea977945d4305b3506e5a6f96d1acce91280e103f1c88f3b2c072437d5bbf84b8ef8760ae073106156342356a763ef0db9339b6e2c72002a73f8187ebf6 -DIST github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.0.3.mod 211 BLAKE2B 4604f3d1536562b6e551f4c29f5bd3dc7133c5deda037eb7e4c7587826368915c21b5224a303accfc9afbab65c8d3480f2690d5916944d85e43eee0881a4742c SHA512 1634d1763ce6ec00a5a631612b59067e2997462e74bdef3d2d10279b3d8513399f341e392504ea6091f0c69a6424291a27eaf278004b83a6f73db7bcc510e804 -DIST github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.0.3.zip 302016 BLAKE2B 4a89f8a51eb3327b831c5ad1239d17ba5a6cb93dec55ffd574b1f27f83115f40fa01b867bf030ce25c20d04370f4fc313daa536ddc28352adf15d540c42d9b79 SHA512 b9a87b855078a50bdbef2301a76279d5b55a757e703fa03f302267a67e108374f397ae07895341d46e68d40f982c16e6deefbbd41de72bf541ddf7df1b915d86 -DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1 -DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1 -DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b -DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23 -DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a -DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.0.0.mod 34 BLAKE2B 81df5fc82ecf06f4af986fb96b311889bc5bcd3f540654d68db7dd4d9550794cc5238791bfef309e64e11bdfd87d630520f3f21c542c9c6c791c323cd8175e37 SHA512 205880e4165d85c7ee34805bfd02b5c7ff04368a7b4fd25ee1fef1968f3dd356b94125d1de4beff92b33b145009ebc49f01b57650660cdf14b81f99f1b5e2278 -DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9 -DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac -DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411 -DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv0.0.0-20141203071132-1679536dcc89.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b -DIST github.com%2Fjlaffaye%2Fftp%2F@v%2Fv0.0.0-20190624084859-c1312a7102bf.mod 31 BLAKE2B f53385449b309e99d17e2b95124042ea4f925c7e6b14c7f88ba1c1635e4cbfb7fa12ed0a18f2fcf108339531edfbcb77c3e1f8fc40c5752a148afc707e4dc375 SHA512 7784ec205537b0d055ac1a97c48ec824b4afa1513e0bcb2b236580d8c6d37eaf489969ded622d6928ae13a5749338b0ff1657065d5bbc4386095cbd44f8502e7 -DIST github.com%2Fjlaffaye%2Fftp%2F@v%2Fv0.0.0-20200720194710-13949d38913e.mod 84 BLAKE2B ec90864628b5c04047f1f4a1ad0aa2ef2d264fe3fdae06c5607b26c35e0479f3dffa04491c16697e71a8299ea8ee0f73d7c6625cdba20092d85906e0e2258a73 SHA512 7977bcc4c3c805ab661cded7297af35b24bfe9121fa5b08db09fd2bd8a261fec4a582fd086bc3158343a247715515402fb03b3917664169d96260611f333d3f0 -DIST github.com%2Fjlaffaye%2Fftp%2F@v%2Fv0.0.0-20200720194710-13949d38913e.zip 25648 BLAKE2B 567d08cf6c87929bb1aa501dcad9c08014800112f22d5dbf8e87fb250f520b0420f58ed2b7afd98fedd99f7b9dbbf28194ab416c3ae4410f066ccb722e1bc891 SHA512 f0470a61ab44a89b61c7bad083e86b420440a444525730627a676c1119d17d1efa17eed3207e438fb0234fc519f76358bcfcf662983148531afb10e7688e1820 -DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod 92 BLAKE2B 8b5eebcb883871ea090297a64f2ac5171b87eb4881fab71e73fc737e2ca4c301d8fa3a14f184d5c468120ea4b3f22c89867c952795fedbea7abc9b7e618d14c1 SHA512 8361dae50e9bc2db7887bd94f516f817dfc1a3c509c776640b0f9380343236d52a3f43a5ca0093a49a4ab6b5474ec2ad24a4c8549d5949e4f5fed0b322b83c21 -DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip 195553 BLAKE2B 82dfb1c701a06e1759c91bede2d7ac9614b92909431a1619d6bbb2dc2977d7628379c6ed622b57562ff6f2a1b063f1d8bf325435c85bc66f1a684adc29011a95 SHA512 8eba43cd8e422879a1b92a672826867a89691207b99cde00ed906c4fd6fa87b5c2ba4b0e58f5f1b1dd79bf7376aa790aa18b1d3eaec4b144cc1d789ff763c4f4 -DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d -DIST github.com%2Fjrick%2Flogrotate%2F@v%2Fv1.0.0.mod 34 BLAKE2B 3554aabb23c972e7c781764a6567185f03aa6ec5df9bef7efb4b8de72e636f05cc46fd9a69792890947a6bc87f2487acccd632b04bdbda33c5defd722599c2ca SHA512 3f05b1093804c352af0a61ba1d85c7a381096fa2677404521fa607ad4603f8034cbfcf1c813399449b8d443107eaa8bade87f87b6db4dd957c938d832c97abfd -DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff -DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip 138645 BLAKE2B 90b085fefbded221903d24f63cf0fe9f2dc95c215b5ec2f9738c384c9118642425d810ca405bfae689fa1985f4d6a8a44c832f79300ef82fd28419138dbe5630 SHA512 1e1e5ed05000dce783b69b47af8ed0d59b11bb0b1739eb9620b576f67b98976cba9e9227519fe247a1aa3ac9c8c423b4896d1dfd9af6877e5eeaa6514761ba7c -DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c -DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c -DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667 -DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f -DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f -DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0 -DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc -DIST github.com%2Fjzelinskie%2Fwhirlpool%2F@v%2Fv0.0.0-20170603002051-c19460b8caa6.mod 39 BLAKE2B 424ba7513a289d255b15fd07993ddcb67ac4102fa4f927b0042495ecf5de01611dc7cfc8a5cb156a5eef7749b60d47e349d79ca62605ef0340a0ebc5d695f5c5 SHA512 f3a865a4dddb24d9652528d49ac0051f290cb641a1cf761157ea87d22c0d0fca2f292722428854cafc40207aad3be8771b79054544c779da81f5caa5f6886451 -DIST github.com%2Fjzelinskie%2Fwhirlpool%2F@v%2Fv0.0.0-20170603002051-c19460b8caa6.zip 20544 BLAKE2B 6f7d7adc5068c7bf93b3de68ff314c9ffb9a53fe575d9f6c864f769ad4d658111b0a29eb61c3fa2e72c24a51c585a1dc5f41bd7e6cb73617f390af5ba3b6ad9d SHA512 ec1bfa5de80eecaa51b559c83ae5719f000ba50eff04416722d78955801d04634655ce2948f1a27e439a4d13392064f1a433cc109ed7663bae1e07c8febeeec9 -DIST github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mod 34 BLAKE2B 478d9f3a5b214f002fcd08abafc3b9738ee5a997c612d017bf40def473be58c81d69489ecf546cae460f2ee38c9489ccb1c3bcbf1c27ca572169425b059c3019 SHA512 535a205c3f8b1d8c1c0cfd13ad5881f0174977c0de81ab5927d5c23c99f067eebc8f5c371530234f9626252f52832c3e8d229ab3c0dd6472bd570ac4464c7e36 -DIST github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip 8274 BLAKE2B 9f7261226e45d83c0c0645eb1df0e99fcfd3e5de3e0f4bdfdb702aa81f6e4f9b9d0e5a36023c2c723893e10697acce9b32e8a806e9e231d9d150340299f9224e SHA512 0ca91b5d7133f7e71ba33e41f5d87b39eee842986f7c356c1751d03377ca266743b1b00ac912631b8c96f82de03109e3141273730accf160f1a2b91791bdf016 -DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790 -DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68 -DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9 -DIST github.com%2Fkkdai%2Fbstream%2F@v%2Fv0.0.0-20161212061736-f391b8402d23.mod 32 BLAKE2B ef8053acab503fd01809102291aaae3aa8b492bc3bee24dd49201ebd8ba17a68c7d86e44326692b2f9bdd7d59a5197963eacc8f8191ed51ff77baba2f8e25ab9 SHA512 3d3b4f2ee0f2a150983cd17b60e1056fee31445c544151a1051aaa8f9355796ae569d218aeb717893807ac4092ba2e96901fa376edd20cde64a63628041f6ecc -DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.11.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd -DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.11.zip 18203317 BLAKE2B f279848753b69f2f253ec2fc1eca38817dc3d946dd6ab00e5e05ed22f73494d3fec1c97131db98bfbd2866ab50cbf44e3041cf10108ffed06fedebd7eaaff9e6 SHA512 5e443f74d15d42609253c96f71bfdb0ea64b78a008771b89d1db7e70640d7afec74f6d336d88f1d487b07f1e32053dbfdb83cb4e64607a35288925cb56284be0 -DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5 -DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5 -DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip 3966 BLAKE2B b638ca22c4f9df8cce5b84837e4f72b009c1ead300c08807b8268d26f04d6cc5476d9af56f676d8f4ac046c78c333614670e0853bee13de3439b5d89b96bfbb0 SHA512 ff98f8c05d8e23fca69ee5ed780e728f9d1779ab55cecd16bff890a91d14af81ae7a0304f34b3e04fbcbbb61e3c97c044dd9c190bd8359f3b19bdd31f8a37329 -DIST github.com%2Fkoofr%2Fgo-httpclient%2F@v%2Fv0.0.0-20200420163713-93aa7c75b348.mod 123 BLAKE2B 219ebff4a6ec614056a0a04649f29e6745082eb9147cc5505ac73ad6f3a1acdb52aa1bbed77753154ee218c24f1b94fa1d5f80fcb03b1846709fbd8d17f31007 SHA512 39c131b026dd57de03cedec47b04789586ea13f3f37f1b9a185b674bdd6dbf96d685b2ab1f0297b45829f5467259523cbf55d7b8d29ef3a6ee145f6057a6ab2b -DIST github.com%2Fkoofr%2Fgo-httpclient%2F@v%2Fv0.0.0-20200420163713-93aa7c75b348.zip 15864 BLAKE2B f0f05acb2786b719d3fcfa46d4e7253f552e9cb7c9bfce6786bc0ec712c439e9d8047cbd77f073c4c41bb8bf850d4c8fc88bb5235451f8808570f0b24e2170e3 SHA512 f4dd31f57f83c445cc41bdc8d225c52c83b22cfe457dd733e809b4f4f8f9930967fbce75ab10868d4589a4ef6cc46fde4c4759b305543197c056a5fcb5d34a30 -DIST github.com%2Fkoofr%2Fgo-koofrclient%2F@v%2Fv0.0.0-20190724113126-8e5366da203a.mod 39 BLAKE2B 7a2fefdaaf63a527c1bbc545772bc46ea74bbcc6686d3182648c2bb488cec193a70c6865667e4e08f86b875a1e391435686be5f636e12a1e38d73705d4b363d7 SHA512 3f6d0160fb4b8771e52426b043eadf755b20363dcac41eb3c3ba37246384778252c3ae37f9358181aa46d4b44a3f68ff564ede662f412068cf060eb4e8ce7bd8 -DIST github.com%2Fkoofr%2Fgo-koofrclient%2F@v%2Fv0.0.0-20190724113126-8e5366da203a.zip 13123 BLAKE2B ce51bb9c67e8bce8bad7c144fb5e6159dbf633443e8b811cb0bdedea17dde2e69b289018512a12cdca0e97b76a9e1ca5708ebe4eff42f037c64a38cd0687ebde SHA512 878c22833f23fac45a1e34111297863959f3e596580afa9f984f8922531eca81047762124f8b5fa0532547af0770740dbfc5d2afe32164ab55e1a6f4d57e3047 -DIST github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod 26 BLAKE2B cb393cd37dc2b7c07fc316b588fac0f245ee33a37ff3d4ca0df67ce952976463df9a79d600a37d5cbd3f596c0135c2c0330aba871cc941cea13325eb24e6e56d SHA512 c151e8d0c5002b25d399fe4a7420e5735cca46dc6f3bd18837f110f5a72659406a3b92d7f870898c97f58b6f42364d4c97e9457491a0534ce456ec46d15b1697 -DIST github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.zip 5552 BLAKE2B db12ce748ecb80b3417133273f1ddc61efb8898b55fe4f387bb9b08800bba65623128557f7e939470116b96b0ee1dff0b2496e264616e1c0e3a5ba1cbe367be6 SHA512 1133134d79de4e0b45085c13c228358b77e0a01b77c39bb9d1b0af668aea816cfc9fd1efd9a325b75b65543ec7d71fceaf8c6d8190801ccfc4ff41bee9db8bc8 -DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7 -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f -DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f -DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod 37 BLAKE2B 0ff43371511295cc3819b33c0dc26e3d9352a4b931ad3dabdf79561e5ee077ddfdaf5a601827246c0b5cd8992d53d47ef74aab0b7deac6d08ef5f60f44a728ff SHA512 60a202487e693d925ec13186a89ca6b7f322cf53b2bb3d8657d50a0fa0561ef9f2d8416901478fa9783b7a44774511486fcc8735b1d15b558f7ce111f53d5a27 -DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.zip 23150 BLAKE2B 2fc19beafda9932e04610567453293fa89470f7510f1a5ba15f11bfad72d21727b5b49327589047fba1dc37b290b556c6a5b3b1f6705f1f88bb0d00a24365482 SHA512 c9261d31ebe9504965d774e193a9ff146b0f628fc108a4bc52e1684ae1ad6e8008c080c4776943c8c3e8ed3ba94c9e3a8daa23c830643015e9ab9cc2805af97a -DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1 -DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5 -DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip 13682 BLAKE2B d7065d3799d84593a9f7f7d93b8c286b7673505bb292208ba0475573667831ecf1aca5236f4703f1bd4d43e41b7cb688a9abe7502181edc9a76305e2a5842ebf SHA512 60a5dfa6c733fa6f71f2b0fb16ee153b2905f940b5eb7e95ff0d04bd3537961467426a1f6064d079fb164190d6a8b3c4bdeece2bf643057f34f7f96e9842f54f -DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.mod 35 BLAKE2B 0a7015c7402b5f49d0778bb3fdd06dab38d0a0252c40d08b0e236c94b78b7d6d7970e63efd25ee038f94b0d150979c1f81753ba1d73b34cb79ae5d57f18fee2e SHA512 66fe9fc0d2bd738f679bc576f84a807e5fa393b174d1193b448a84098cf1d5f17f884d4dc7d177092d3675176ad79070d51db45b3a5e3383246710e0f63d2018 -DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.0-20190702010315-6dee0af9227d.zip 14952 BLAKE2B e9473cb69c75c703002f625f4bc9004c4ceaabc53b88292bf6ad40f1297a95665ee3ba8dc11486ef810153cc0f552a88c1d863e3dd4621a0ff36d54ba26d00d7 SHA512 bfc0e6fcc4fed647584b0c841164d202ec4c4356b6bbb76fa478f32d7e6ff849f8f5a09dc5673cfedc7e6c7f8875fad950911d6968c812d858b3b096d1ae9069 -DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.mod 201 BLAKE2B e7d70655a2b746b1ebac46650c7539e492dd2b40c44d7fcaa397167be74f2bdd8a3997d4e31fb30739dc562eb883b82df5f7b95125ee6569e598517b13452d02 SHA512 65713ddcb3bf3c4b8352e7f07ebaa48ea539170b9bfa1026e7ec95084dc0ad4ae9217fcad5793ce9b01582c5cf225fbbadb0d79380df07f48703373b2e7f5237 -DIST github.com%2Fmattn%2Fgo-ieproxy%2F@v%2Fv0.0.1.zip 15873 BLAKE2B 3da4b067d6eeb81a3a4b4c93c955b2fd63443f589c322735a9f2397b5ce21b7eb8da4ce201001fdaecec2857a971f2baa8a094b86e866bd43a5ba2f0159acc3e SHA512 ceac4faa43badb809362d1ee92623f1cbc1d17bb9ce067e8f7cb4e5f3e27126a7001aef2b536894611066792f3fd25572b562242fa7153cdc24daa95d358c848 -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503 -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098 -DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61 -DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92 -DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba -DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0 -DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.46.mod 448 BLAKE2B 712593a33a124b367b23b7f6643100826947babdf727a82ab1881733b3e5426c13e771ac5db86ea9325b8e0db82fe976ec9b588e3a83d2cbe2fc03ac2271d6ed SHA512 44dd6e6dba8908e3793b57a0d4e8b87a09e14bf491e4aa0afcb62861d4bdddf58dff24ba8807cf0a08081591c24e151e2da881a472d2d7a4531994fb771875bd -DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.46.zip 355843 BLAKE2B a10885484fad2834afdb092665b5aa191126c410137ef3ef0cff37e8f6b61796b177bb7ae6e57891183be4a87844225d93b1b80e085af26b62befb1a2de4a19a SHA512 51daf1c6c7a2bbf9d52d858215678be8c82add0c0e1657926eab2b064b24cbda64494c63dd06dea36321e0892d96938be764195542575a91c44320024f79c9e1 -DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod 45 BLAKE2B 4868e4a4afda265cf4dd2e7c5a25657237687b3b1ba21d24f280174a05dece76ba902c1447586a7c632a961b8454a1d1c8a0e7d523fabcbf98dddee26d26e341 SHA512 2341ff459cb2432feff920048aac90868260d97c5ff68724b0b7e22c8e5c65da2b4055026d74578983020e24506d2f064e47e3fa247a4560a37951e205cd0a15 -DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip 84306 BLAKE2B a22f077e8a63a951ca47f6d62a6de017245ae81ad57f788996c9efc722a5df7bf3ef9cda993ac8c524d75a95a2218732471d46d21e8bfc56f324ed8b126ba1ff SHA512 7732e181c4a620e81e77d261addf74c7d7edaa50fe41f13512124650a572ec258ebac8a4144bffa3107115f9c65968cc67a3aa5de8c8dbfffbcffceecfccbc63 -DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee -DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2 -DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e -DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844 -DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844 -DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c -DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9 -DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9 -DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562 -DIST github.com%2Fmschoch%2Fsmat%2F@v%2Fv0.0.0-20160514031455-90eadee771ae.mod 31 BLAKE2B bed30df7f6ef3446cc884987b8529c2201f1d0fe4a855fd198c73ad47b293a7d66136abb092d2462a73ddca30baaab574376825019b47198d961a840d4d6b07a SHA512 6a9c039028a543ecef585f043beff78d099ab0890e0e3471cbda4cdc40db4f433f9b2aa6c5ea185f8a7dfe70546b69b415def4c0785691fac0bdd067ed65a186 -DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b -DIST github.com%2Fncw%2Fgo-acd%2F@v%2Fv0.0.0-20171120105400-887eb06ab6a2.mod 29 BLAKE2B 795905927c49dc62e862e80899020cb3900ba18f217e279f6bbfff5f774b7b9b770b359a6295d04a1ff7a3dadbb1388420a981f966fc5c4393ea9695975bfe19 SHA512 3726b62dbd6623eb08e45964e513d6e8156795741c8066db0ca03d82c4c63362934b423302b9616c5ff8c19cc87636348253ab495eacf8933a0ae4ea406ec238 -DIST github.com%2Fncw%2Fgo-acd%2F@v%2Fv0.0.0-20171120105400-887eb06ab6a2.zip 17429 BLAKE2B 6b5dc6a8b9cc39289944c3fcf0d21f40c7108d8f552be799a57c474ef5be1d92b0282e91b7e5017f10076dfb78d9003744f9bd396791ab6d5e172ee0b536bfc0 SHA512 30e47fbdc2f06663d00f7d8eb68d923aa547b0757b8b717e85c2c6057e7f2afac336843eb29314d0e001b0913f2aa081e302ff0941d2a91cb6540a190d276426 -DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.mod 28 BLAKE2B 57fb6c274af3e1f296bbb2c4b81cf52ecd31af71afac9be2f77ca58c67831ecac4eb2f4f8819c510f3e2982d9a5ffdfbb5f384db878b37b531e59e06e0093a31 SHA512 2f4794d0c8dfff16f1fa252eb5e3396e2cc5479c96b5e4af9ec01931387790e51273d4a308fb2813a699a54a3cbf6b3adb5e92d831d3032120cb5f19698bfd19 -DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.52.zip 77749 BLAKE2B eaa632604b6808cdd0e6f7c864183f8d8cf0423a1e8ef7a9b6906cebcd55a4e6312a44d46b998a6f3ffdf4dfa7c84b13a50c2adddcbd6cb5205f7f3400dfbecc SHA512 b26f93046b971097b675fcc6ee4c8a53598e95625f7d71556787384bfb4b60706b88dfbb4071472611467e0a8b2cf09af490129be0c28d48f2bbf6042b7e1636 -DIST github.com%2Fnfnt%2Fresize%2F@v%2Fv0.0.0-20180221191011-83c6a9932646.mod 30 BLAKE2B f341cbc3c99d90e1f30ce42b1e0442916e1c5e79d673a0a77347b4f9de6a145c630e4e4b8c11a4aed24f4d8e7344121524605bf85f6c8a29055ce2ad83ecc42e SHA512 2014d24781e25f535cef3ec241bf618048237c877e4299a1fcfc8f2598cf59f8f7cda2e1ec3617dab6879bb612addb6f796764a0de6c5400fe3c8ba77c3c41cd -DIST github.com%2Fnsf%2Ftermbox-go%2F@v%2Fv0.0.0-20200418040025-38ba6e5628f1.mod 33 BLAKE2B 3b94575248b0ca76fa0f9ace94919d628824ba1328d5dc087b270247c29817ad0d4fd6f24cb218541f598443828d440efad018d1d96c26ff070554fce840cd49 SHA512 d96b326f421417a67e9db79350043b29f2b2c9b7ca00f696955303f0ba090c8fd82f018f312ebef4d443ef87732af99d807dcb6f6e16187d00ba0c0502d78876 -DIST github.com%2Fnsf%2Ftermbox-go%2F@v%2Fv0.0.0-20200418040025-38ba6e5628f1.zip 46747 BLAKE2B 43b996369a2f47691254036500f1443acb25027d19093b3d40199422c78b7147895a79f47794aea594529436fafc2b80dd3b1fb3c2cdedf1871c17a2ab924acf SHA512 4541502796fc10bba0b9898ecf54a6b8c476678a86786a2d783231e39a4715490cdd1314b2cea79c42628c71d3e2e4e31f6fe6019ac34b673961c5cd83563268 -DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf -DIST github.com%2Fokzk%2Fsdnotify%2F@v%2Fv0.0.0-20180710141335-d9becc38acbd.mod 32 BLAKE2B aedae6255a0338e267561154b409f98abae7cca759d727ee0c3101c20ee4ebf8e8b1d8711f0f53709eedd5ffecf67df2b131eb38ad52bd6dd4ed0dd403613b9f SHA512 0d59980974668876764088d581caf5817f25e79568adc2719f846ed5a4d609cd8f7205bd861e1c72a723e85414eafc6a0a0b5defa96c984f7b070473e5c11c04 -DIST github.com%2Fokzk%2Fsdnotify%2F@v%2Fv0.0.0-20180710141335-d9becc38acbd.zip 3871 BLAKE2B ed849325c4f917d7c77838e77e5549ed3dd425a629d3468dca888bd3ecdd91cfe4a073fc7cc0e84c02f8004f7b5c8327254c613f8a39bbe736ef5bf0415b0f10 SHA512 383bc17265946c1bfb3980b100625104a3f49678e3612998de7a48968805a4153b2994124d2930bf903f026f0501a6a05976349cd3c143157e58e312c8b21da3 -DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.mod 168 BLAKE2B 5c8f6f90e14aef57fb8fa7dee546f60a73a2b1c16f7d5688d6a0b40a3d04ce308a8622f64242d60c1a014e3aa9264c3069404cf764026016d746fa7de031e236 SHA512 c73c807f01657cfadb139db3684cf680e40ebadd4db38cdff690407741675556e534aee37c96e4f54be64283937c81114856225f3d3f64999cecf5df11cce2a0 -DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.0.zip 247496 BLAKE2B d869b0e31f60dbee0cb306ec60f7f77d75dc44214be54f295a525692ab2153d979d139f16b87b071b7382b4f9299a59c4795fd78bc1f541ed98bc3b869a63f8e SHA512 c1a57fcbe01ab401f55b4e6ffce452fe578c5af100ae5e3c2234e5066cd7ebb0da98b7033bed9b28f7ee2c33457b450c0869355fe05c4cc86bba0210eb2d56ca -DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba -DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba -DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8 -DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod 556 BLAKE2B 8e36edf565660234a9c939b93e99acfd61c30620cf45619158d5a87c102492333387de1bda35aa226695f913358a4385d1b8b768527d8a63d056ab8f13cdae61 SHA512 3c48b6f2cd9bc71efc218b11ae432776164936d4474df73510a785819c417fc894ca71f5783da77f323754ece56b681f8f1e9dacd5bf309f189997ba0b317dfb -DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.mod 613 BLAKE2B 5c582ba17d40173653cf739137d0bd6cb866c34fa1f76bf8f0b96c1d05304c5ea52247ef99d6d31d5c6f41bbebdf5ad9e0fb21e275b2cb888098e0ca3ac8f30e SHA512 1a7624cfc159a3444be19238a2aacd003e1b0c6f586d3f6862adec175578e0bf40fca303049a15ae3cd96a1c61395dfded8427f867e1aed4dcca180417fd80f5 -DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.9.0.zip 162928 BLAKE2B 57b8631946af88b368834e7fb04f0f0dfb9c2c8f0edf2f53d6578cf569f395a3534289d1401d2b76e818949ab695f8716874feb84f3e7d16a7045fb326eb8b90 SHA512 c5e494b291ea08f880b0ad557bc712059b94dbc9514d3261651305f97979ac66f2244cfc9bfae4393ef6311f3438c30433f30ee0f64c05d52248dc3ee40277a7 -DIST github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B 0e37253242e439c5d26f3782ec2a3790b799c1014089101fe2a3b6996ce12b001495e11efdc1de203059231cc4d759445a43fc5e9617e56864082337383d0c41 SHA512 5a7842b9804240c1cbf50e2812f26821a0ccd68d5dbffdc3e761e0e60014dda69de842246c45569c7b09c8129bcdbcf9ddbff1071ae14b7be875a9351ed46f0a -DIST github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip 15715 BLAKE2B fecf95052bf2bf9ca21e6fdab3c9ee60a01afe8de700050877f1ce4af0c6f05ca044ea9be9228280e6dd2682616f14cfedf678a92c66c00936b8fde0fe336082 SHA512 0bd072a733e99c2af2cd83792a13a0c0f625e63ef71fa9ecf1a50c9d93c2879c5965bc5457655617ff4f23cdb854718958d9657557ab09730ed0404a252f8749 -DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d -DIST github.com%2Fpengsrc%2Fgo-shared%2F@v%2Fv0.2.1-0.20190131101655-1999055a4a14.mod 36 BLAKE2B 6e585540f293ba33281bd3116cd94f3035b34828c2cdaabfee7c81e544c745d9ab334ba2ac6ad4138c25187e4abed280355c92f8a6bb278e9628446df5e57236 SHA512 744e623203f8d5be1154704fda2713732596072f5ed4d0b8dcdf294e96c0357dd9a5b7dbc8d02948a481b0fd2f42e2ad5d599352c37901b6e148b52af4a04a64 -DIST github.com%2Fpengsrc%2Fgo-shared%2F@v%2Fv0.2.1-0.20190131101655-1999055a4a14.zip 47339 BLAKE2B e90687379f4425f313d5e0db97dff521d89cee82947b3152adf82b00a799f3aa21f1fe805ac75a0957c601cb030e0a51559f5d566b0de67b2360298c25246788 SHA512 9394f91eda61f8ad635947975a294405123ea301b313aab23da6e2021b2143bc93c74405fff4f6280727a664ddb9199f09910fc680e89482f20c6dc5e5d216d9 -DIST github.com%2Fphilhofer%2Ffwd%2F@v%2Fv1.0.0.mod 32 BLAKE2B 400d176245ffce370598e46c8fd88ac601298451d873a65c290009413570ed38f3c5be35fe800e95d1c23b894c9e8c1cc787ac54dc5c6b7e2d11c2f1ebd031dc SHA512 75eb2b85e2900d2e0a492e281f2b9f8b88a6b480478bc38e33b8d957ed2b65be5835f03dc8bf0903e80ddb5af268db410ce9db9a1569bc25e50523f74878fbeb -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321 -DIST github.com%2Fpkg%2Fsftp%2F@v%2Fv1.11.0.mod 196 BLAKE2B ad2d0b1c9f2c509812872f3e24d86ad3a1b193e624092b8225cf1f3bdfcb28e634ce330934bd742617b3d141ccda41de177231cc7501fea2b18a6e798e27aa77 SHA512 0fb15e3a1ab36a6d413110e7d6e7e441c9d7943f4d7bab935b2ce53feeb7e560d63960f1a9ce340d6b3f3e7fc400824354945a12628c65de1ce2d81856b119f2 -DIST github.com%2Fpkg%2Fsftp%2F@v%2Fv1.11.0.zip 97617 BLAKE2B 55bd1e8d4656bd25fb4a6c6f292fc37757a0246cc1d54a835ac1bebda821eb744cd048fca406957cd16ed9ac2db2c3a4f8120f605e9a1e46749587e737b91a6c SHA512 73e6c4e336cd7ceed76b1b3872660898e4a419bd411ff2e4b2b2010ab13118f994d7633c9abfc38dc684ded662231788cc1e86bf4d5a7a358ef8eb1e0d79fc8d -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2 -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130 -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655 -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip 226158 BLAKE2B 899457f410f559d70cac7131e9c6057bfd749964b8b133943635b0ee78a12485d933718569d085f51dd34f831114c2f74986818536cf21ad642dac793b00390a SHA512 5c4d5e70be8984c9eea4211e06e1f9478fea4ee4cc227167b9a99d87fa773e060e42aa4866eaed39e58a251821840643d5117b12006a6809902daa08cca14b2b -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6 -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6 -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6 -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip 13785 BLAKE2B 2cd44410ea7af88683792807b0f2c31b0943d8664a4be050f2e422095ef3674e6d42f4b9b6a76083e13bc9f44be1578cb06a7389b4a4b201b5a88e756b40193c SHA512 db2396362357b6d5e99b21bd4aa8d8dc193dd2676a8f437c62eafae849a56a53875bce7411d58ad78e4fe36445b72ee1a34360b174a23ca84de911f5df189354 -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod 817 BLAKE2B b4cabfb93633359c6ac6dcd400484e6162bc6b609bf0edfc4a82a2cc0137edef114d0d3e9c55bc47d1abd906d9ac00f9d84f07ee7072452c570ba9f98118f4b2 SHA512 7e1b17c424c8ec889d0efb0f5a171043ac0fffb48725144836d8ac635c036e877e65f34f75055359747142051afd00374cec9e39911175adddca2c50fde4c893 -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip 163523 BLAKE2B 6d31ee2f8495605c967a41b12da3e854dadf4666641fa8a324f9926d1e965cb2693e390065f34892876c2eae5c1909b5bae8c11e484dd948b7c80983c8adb551 SHA512 74273a10b05fc2e0ea263ba57a52783c147e1f0ee6a1156879c387d0823f90d2c0072b5eea4325116fa621de0af1d5c2ba19e5dc188315c60ecdf74ff8ddcc99 -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335 -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip 262428 BLAKE2B 6334337329e564dfddb576464864b53d4da3cd7c0988cb6b0eeefd3ea9141f36429f09c1f75d11560dc12e23751fe5c52a4c7d46cec0ed3454fd3684562bad72 SHA512 8dc2a0f05fea67aa9a64d2e91807cd9fc111be3ad4fcde2b8f53757ed38a478467f5edf68f990d124e1019cdcfef133cbd0278600df8abdc1c0971808d729956 -DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a -DIST github.com%2Fputdotio%2Fgo-putio%2Fputio%2F@v%2Fv0.0.0-20200123120452-16d982cac2b8.mod 51 BLAKE2B 1e0beaa3a4825acb034fe955fad1c4d2e49f7eaef90263a20d0baeea8bc382fed9533eb66acfc6ab988337af3a5408cb389d8d9f9cde376c049dcd06c26fb123 SHA512 a45d267b4bc33cdbaba803da191767f6f1b3bad2f398681bce8e198d062dc9d3b49f6d3e67cdfd6f44d6bc579c377f332535d93d3a3d0e2df7e0204b9ac11a38 -DIST github.com%2Fputdotio%2Fgo-putio%2Fputio%2F@v%2Fv0.0.0-20200123120452-16d982cac2b8.zip 25508 BLAKE2B a5db884263b41e7cb1bbab5a7446dedefb5df1431469f2752fcdae7cdfa21f64e1564e0cd3dd21bf1768bfc321201bb325e77d4258ed12ba82aebda8ea2af710 SHA512 fb904ed158c5196867586b517e0d7b05e7f4bd342528e456bf54c6f6e05c7c20383ed7d765dd9d962ed8a8b41df84387410239e7acdb95943a93a684fb988427 -DIST github.com%2Frfjakob%2Feme%2F@v%2Fv1.1.1.mod 30 BLAKE2B 912ce02c21042b980aba2bb57bb792d4c88078555e1bea7fa70b3aef98b59a0101925dc91fd6cc472b6ddfeaf284b8cbbd7bbee0fcfaf3cd20cdc866cf626a72 SHA512 b992bde786dba5df445b4841172028fd4f2592c8d37b243d59ab78c205c036454c6ff78d2d300a1d637e300ad6c448f250b24c5b1ac235a07cd057b7c752ca49 -DIST github.com%2Frfjakob%2Feme%2F@v%2Fv1.1.1.zip 23622 BLAKE2B 692046ea8a3a79a026c770b27dafa435630d05ccfe41ced1c3871afb1a3dfb09583dff2295c159203f3f9ddeec97f9504375f82975a4c2ece03653891f3aee7c SHA512 f5dd91a01c49ddfc850c114c9119cd7122e4549ef67fa19126713ae1662e84988f8917214b0a8f8bcdac50da362ce2fa057828eae1d4acc6b7420a89bb99f0a7 -DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d -DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613 -DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738 -DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d -DIST github.com%2Fryszard%2Fgoskiplist%2F@v%2Fv0.0.0-20150312221310-2dfbae5fcf46.mod 37 BLAKE2B 2003311e08dcce7ffe4b6516d0b1aa25e28bc65d67e2a46464cbb8a69e075460d9b4e6c412a03d560e472c74076214cb50805d89f45a50c4a4d317fc55e8bb1f SHA512 c26452bc04b5138531c3d36334e33fb8ce743299cc08db9628e85797ea14098879fcd109f08b6dfa0bd60594b773999664851c9d4950e22a905ca2bebe82262e -DIST github.com%2Fsevlyar%2Fgo-daemon%2F@v%2Fv0.1.5.mod 36 BLAKE2B bf24b6a9ff886b4536e7df9b8667f3663f74d2591eb4c716846224f52dcba57d54380d02b283a5e2c1fa8a3f5ad5bd09b7ee29180efae41a8db7d6eadfbdf1b1 SHA512 eeec8b9435f18e3329fe3373307bd8b6330f22747bd9349147d31b704435b0f5e5f62bf4cceedeefa598fa9cd16041d5d2b9bb0ada2e312db21b89e3264d173f -DIST github.com%2Fsevlyar%2Fgo-daemon%2F@v%2Fv0.1.5.zip 71423 BLAKE2B f0f4a9ecb3c7702e5714fc412ab275fcf506124868b98e7cba5b993d3f2fafc0d2496397079030568e6377bdf3bbd5d7fc75d5cc0ab1a03a7eeed50815e2a928 SHA512 e331647c37bedf2d95cbd550f6b13669a677f30ec82872eca3d66f13a671ad25db3f7bd778ebdf76a0639a13aa400219479c116528027c5df8a3d30871e11050 -DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3 -DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46 -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035 -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418 -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be7914862368eba07f521c046dbd7580edafd47ac633116b8c9f4b61526d0d63df11ba6894223590a1ffcf4bf478c394a335c305010ca9fc18107d4e61b7 SHA512 8fe5a437a5f3f8c1ce0aff067ee261a946d946d7640aa5acf7c34b9c8c4ee65128a6421aa38bbb1feeba1339b356952ad58b4bad98f1c89ac455d94e86684a8c -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip 65802 BLAKE2B e0487985824efba7ee61c5a73df7b591d625dcda32f833ae276191cd82bec8f3db30cc2ba217d80cb56af1436b8954fcd22ed3f861c6c7fcb4a94818357bbde3 SHA512 abd13a98d10b6c996918712443edacf97ba5fcb9ece7615f59458a583130f68920dd313533ff0d8c84c6011fd2c4d221783b1250e3250b569a6ead9d7c02f7a7 -DIST github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20200116055534-eef842397966.mod 41 BLAKE2B da40259a83c14d444c933f97bb673c4edee72b95d5c19ef021479afe2ebfb6f01bc157527214a19e35d100a6f4d353eeefc60badf51cb85dcd735a773aa5b033 SHA512 7a7b948320e1df47d23498732e5fd7e63fcd7e905299e11f74ee86a8146fe8df29dfea06abd59185810d75c7ff670e2ecba07ccc461b681a9469beafcfb7801b -DIST github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20200116055534-eef842397966.zip 10942 BLAKE2B 4a005718197a71d02645058b05709d48b8fa5b47abd6b09510e49f2ccebd4df64e44c2384738620df78ea9374916526df8c32b3a57862d27c781546bdee1d15d SHA512 c6c281f254babe495259203720ee46fc6a5efdaec50d2504781289d7ca6358cdcac6cff4ce2556d505926bb8f9a352ac55caa5a8389fb5c15a2de5d2919cf24a -DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d -DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f -DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20181108003508-044398e4856c.mod 41 BLAKE2B aeccb766735cab34f6559537127886e3227273ec40f78cb289b852430e5cb967e2b3b8a798dd20ab0d1c8481c62d25976a76831092bc114cc6c04214ce7ab081 SHA512 8ce1457d8f4e3cd2d997306844a157198039ae5feb9132f22d5768c1de32800469f682d33a8c3c455f7728332136f376858c23bf00da180a53f9d32d4e4ef291 -DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f -DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip 1529663 BLAKE2B f5bac351e33600e56b635602a487b592e9d54623bffdccdf9c6d9ca8eff7f358c8a1de307c2ed6dcdad5c94b9d569ed7efc3eda22044a2ef8aedfba985d7578a SHA512 e3504b80d856f46158f6997bce909f8fd6345d5177b556ca63b63be5d74a7b108e1dd621483478f20ff03932551132a1a80578f3561819072952fafe81c23993 -DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32 -DIST github.com%2Fspacemonkeygo%2Fmonkit%2Fv3%2F@v%2Fv3.0.4.mod 187 BLAKE2B fd11452858fe06e5f7c06ff5ad4699c98f57162e3fa25b837a0d5d424cfc123824f6357df3ce18f573893e9d340cf3ec59344d75d62db9f5eea71dd23ccd9edd SHA512 fae0fa84469a11d40308bfef4cfddd15abcba5379bc02fad7a0313f54e704ae9d7e8bd5d01be20dfb2c34b04a41daded17970ed1686877671a7dd36c55480e7f -DIST github.com%2Fspacemonkeygo%2Fmonkit%2Fv3%2F@v%2Fv3.0.5.mod 187 BLAKE2B fd11452858fe06e5f7c06ff5ad4699c98f57162e3fa25b837a0d5d424cfc123824f6357df3ce18f573893e9d340cf3ec59344d75d62db9f5eea71dd23ccd9edd SHA512 fae0fa84469a11d40308bfef4cfddd15abcba5379bc02fad7a0313f54e704ae9d7e8bd5d01be20dfb2c34b04a41daded17970ed1686877671a7dd36c55480e7f -DIST github.com%2Fspacemonkeygo%2Fmonkit%2Fv3%2F@v%2Fv3.0.7-0.20200515175308-072401d8c752.mod 112 BLAKE2B a2f8c698c00e89d559cdf073739c2562ac0c9a43a5c636aae458b48d0a253891b8791b1bd43e2e957f930a68816b0ca1d1edfb8aa4e905972f0639a3f6c11e5f SHA512 bf99fa2bb5f2421a331e41fb970626c55a42e3e437532080a734621c52b9e81cddcdd2f3117b8c25909040576c7697e1ce449ada397d26c00db6ca1ecae31693 -DIST github.com%2Fspacemonkeygo%2Fmonkit%2Fv3%2F@v%2Fv3.0.7-0.20200515175308-072401d8c752.zip 404585 BLAKE2B 0b6a6742cb559b9f3c2c87d19fdc12dec4c5519b11c3c9becba6e816f2d524d88552c983b29406dba01848adec499e4183bd519cf6cf578efc957f3a6982f538 SHA512 531a8ea0ee24769cede3f4a592965448551b464e91817ca28c20ab679729f14be9cfb4d9f6a27bcd7ad2f8cc1ccab65280fdf5a097d8c57f532ec4785bf3c6cf -DIST github.com%2Fspacemonkeygo%2Fmonotime%2F@v%2Fv0.0.0-20180824235756-e3f48a95f98a.mod 41 BLAKE2B ff2665bde5ea3b266027e0c2767fcb5d065d19e19b927e7f8f9daafe123453c88d0fa6bab6bfc6f6a9c8433643c88d9f65c3659520af71ef8e4b329d754203c0 SHA512 845d72c59e97bdd225c7da9a032f9bca49b17b50ddaa15912565ca35e1c1bc41b9d0a75461e1e170749e32e2f5cfdbb992ab5053565181f5be3e26511d45a8e7 -DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25 -DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648 -DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9 -DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f -DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip 171286 BLAKE2B efa68ba65ecac895de82fc8f8ae470ed9b2e24e7343f24429a5764fa042f7c91dbe8aedcc0ae003fdfa188bca32e7c4c82481b69736a72df76b50fad3e9094ba SHA512 f311c5ccb68a0b5dfe41f993e0867cbe9742dc3fd50904ed688d4b89777f4739f7a9293f548e7c2ee940d1742e921a3cc82cfe1b9d1b210e435d16c8f0c91880 -DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d -DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc -DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5 -DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9 -DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.1.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.1-0.20190311161405-34c6fa2dc709.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f -DIST github.com%2Ft3rm1n4l%2Fgo-mega%2F@v%2Fv0.0.0-20200416171014-ffad7fcb44b8.mod 99 BLAKE2B 5e4e1302ab69a0246eb4a07b6d63ef2c5b8e61a2bbc603d13a3423ee1b2f933a9237d11aac44628356ae3c4a6bf9229e7ea8d60f1668cd75e91010f3c2f10e86 SHA512 6b1b8b7cd668e2e7f16c125ba73bb9e45ff5587a9b934af35bdcb4c774eb2fd9bdff45299c1c5b8c5d200fe869b908d71353296c767fbd59e868238c9acce511 -DIST github.com%2Ft3rm1n4l%2Fgo-mega%2F@v%2Fv0.0.0-20200416171014-ffad7fcb44b8.zip 24424 BLAKE2B e4fc6f1cd80c2a55c953754b1baf37ca880f3d09d19529664b74ab9320f90a56087044e3cd0fb8aa45823605eb0b134783e2aa58c11c4450013ab31b1cd8a0ea SHA512 3bbaaf1b488e15012ac8138c2e58acfc52e2ba2e569b1d04cdae2b1cd581f118c27004131e9aec650da3a8fae7cd3e8cc8243246565c86b00d9e0e95046e1f55 -DIST github.com%2Ftinylib%2Fmsgp%2F@v%2Fv1.0.2.mod 31 BLAKE2B 263bfb05ef35498c4876a40273bb21f3bb2c5145e95ee0365f912a6b46919b145d7497e97cfd88b68c47b581ea4d65c31cb3de65f15929137f89091faa5eda86 SHA512 c9dea92ef8c32130b2d28820cf3f4d49e43fea4b36e82343030c1acb63ca120927d94e0ec8d496ce2319a36a22654cf3463c0023d7ce6cc7d1d4b07832f31ced -DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b -DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.mod 41 BLAKE2B 378ab9c63802f76983c723f6eeac15d66879448bb4f5356a2c3946c0a8364b28254740e767c1e93f4ef184e281da6b492ec80303408f2a8a195e91b41523d41c SHA512 03629fc253c30ee850ded4bf4704da2fb8f9225038cb061eca49948215df7f924d85bb9b31c9d5726015d08e4817be6754f80c7db1186ad306853a208efc06af -DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.zip 3754 BLAKE2B 55e0026b79ac8c2b9aa9871194b3722732b37c67b61c8cda2ea865b2a7d051d6012042480e91e9ebadcd638192ebdd42f9be2e1c0e938327ecf70c5614103bd0 SHA512 8163ab76d5b8212659f38a6b63c5d7868f05588456ff04aa9dcd63394e637ebe2c7448c2082beb881e6d2816dbfe29520a723ec4d5afb7113f74f4b621012a3a -DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625 -DIST github.com%2Fvivint%2Finfectious%2F@v%2Fv0.0.0-20200605153912-25a574ae18a3.mod 106 BLAKE2B 39196fabc47f0a3d8db96bf1a1e57fd2e53fb85724347d753e93c4deaff2b923210e7cbf0cbf26f19e0f1734896299d638056c373faab783309cb952387aa3c6 SHA512 3e1ac2da7a8e92f616a2687002ac3fb3982ea48dde317bd4568ab8ef1cddfac720a15fa1145b5804a1407325054421f5ffc682f333ff765376d903f5df4fbbcd -DIST github.com%2Fvivint%2Finfectious%2F@v%2Fv0.0.0-20200605153912-25a574ae18a3.zip 47896 BLAKE2B 04d15f489e0859243cb9e9320a00fcd41f5d384584100bdc29c5eb5199344bb808c778b2b018ff63118ea1d28775c16609086a05d5abb688622aa69c42a21d91 SHA512 31203488a2c2ae736a33f855b9a58e1c89233dd466eb5a10fd888886eb627c46c3fece61efab1c1c58564832f33c9d72f1167dac7e40562c5abefc61b65664a7 -DIST github.com%2Fwillf%2Fbitset%2F@v%2Fv1.1.9.mod 31 BLAKE2B eb05706f9dc60f41414a9d2b5c3acee3f615e0d1249c2e9b9776bc255fcfeb05593fb3bf06351d763d4ae4b465aee3f64d9630f4ae5fdd2d4e9ad847e5d4675d SHA512 f220b8b8bbc82fa03107ec51399e2e8c90a442b8b4ad57db441772c1ef66b16a77b71f0601f8aa22b60de4c1da4dffd1d746cd567158fbcd12b1677d88d4b17b -DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod 168 BLAKE2B 61409485b5a15b6972b31745d6d4153561aba9608993faefed322829f885949f7f09f4455d786ad2b088cc8b40f30bc6746388e86625964fe9adee36adc33035 SHA512 8685959ca2e8ca2ae8e0d802e8fa954c91c9cffd318b476669fc1a2bf969a0463ebe3fc0ec2588a5f151e2da394b0d37fabafb83c8d25337d9b65a307d79b51b -DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.zip 10353 BLAKE2B 386f5fcd209b8a2f2428e8460dae57d3f5a41649f8a42ba7c5c0f2037fa3b858e949ad3b526d99d71a4f5b094d5b409788dd398a8daacf8e28166be7f290c936 SHA512 8feb5dc97b7c8acbcb7989f7ee6d87b1b3b1074163482438c609418b0dd02135238f80edd968ef7a730aced473d18ea08f5c23ab8b0f7a5e63e76d39d7d8cc96 -DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964 -DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a -DIST github.com%2Fyoumark%2Fpkcs8%2F@v%2Fv0.0.0-20200520070018-fad002e585ce.mod 105 BLAKE2B cfc2a0810a3d1b9a71f1b4ddac892ca9025943ff338879c40589321bd35ad85cffbb64f7dc9c29886fed15d90773d5a7662d8c4155bbfe4c9922c0ec2b49be3f SHA512 68c927d3cb17519c2abcf2e39b673868a59057056e088859ff326277ffb347b6f73c99dc8a6b0e25bb1f0d9272b5625f2e625b4c40225239f8baf70a50de7a13 -DIST github.com%2Fyoumark%2Fpkcs8%2F@v%2Fv0.0.0-20200520070018-fad002e585ce.zip 18523 BLAKE2B d28a5cfe812661a3403661d859b6bf05b639dbd47a30e80a93d877f60348b937c6ec394b642997285a95c190e6040470d655a7e6921ce4a29dd6535f5adde5de SHA512 2456dd6ed14924874b9c7801b1ffe8a8cc5a7861b44c429b5c19b01e7f3068f30c86c1424c2e3aca1e08b0955122d5df5e17462b12290224b3564438802aa55c -DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950 -DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950 -DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950 -DIST github.com%2Fyunify%2Fqingstor-sdk-go%2Fv3%2F@v%2Fv3.2.0.mod 224 BLAKE2B c93118e283fff11cdcdd896917fbdd94438f7451bea1c600b302e8ae2b67d1bd327efa8b30cdd09694aec8ce11e474311a00a9ca9f3912f008f86aca31259ec7 SHA512 7b6ddba4779172fae9bb771b55a9940b26cc14a2ac6179eb90fff3e93e6b6cd5c3068e0ce59a268c530937be582602fb15d7399b0bd73b058d137d23ad98a845 -DIST github.com%2Fyunify%2Fqingstor-sdk-go%2Fv3%2F@v%2Fv3.2.0.zip 185090 BLAKE2B 62163a12c440130375a5ffb7bb1e561f7a6a2f381f50de6c0c2a8d193fd2893f559c266526147214e6dcef412413327bbbcb70634fb9780c7c518ff61dc379fe SHA512 2cf4262cb7f11499b6a2685da20942dae5a15563b48b7db6b6aa2b3762f0a3eebda0917fd892dd094985e18aa8c7e194597fb1a5ad3a57b9519f248a10749bde -DIST github.com%2Fzeebo%2Fadmission%2Fv3%2F@v%2Fv3.0.1.mod 225 BLAKE2B b134db2c5777d88a1988ac9aa515664afeb268c3a1a83f872ea93203418f2d895b7d31c5e3c60b8209253991210ff9bfe963d5e190ff3a03f4692a3341c2e5c0 SHA512 d52eb6cd23c4a60d2b4fe7851725e19cb32d6b78d2c5a0857aedbc4eef3286cab3e1c11c2266252c027dd19c2085e8229048b6f0832b3b8f974f3d4387d39ea1 -DIST github.com%2Fzeebo%2Fassert%2F@v%2Fv1.1.0.mod 40 BLAKE2B 1e835f200ac4b67032b8270101c8a566d2502f8a5ebe5aa02c6b738dfec1b9ed315684ebe89d99434d2671e33b751d7f73e0ef6cfca2de5bfa18d3e08ba1f8f0 SHA512 d6aa7c9136feab2a9d11e0575e6a8a1044c7e211d5b64b1e932ba5bcde966c635c8ca9caa27c32adfa80770ae48dc523c7ff31869a64171ba0cdcce6f82b3944 -DIST github.com%2Fzeebo%2Fassert%2F@v%2Fv1.1.0.zip 998 BLAKE2B 6578079ea3c0787e4ffd45ed93baf629196d31a6bba78507c47ea3eba9bc386e5ebb2fbf50fe6d73fd91161e50dc2145d07376ed9020bbac98cd6abbb129ac9c SHA512 f4ea92e1df5e393c7f0fd10a0351c7a9c047a1ae41fbb76b13c6809b975406a7e18ba70cd29ad62c001baa9082a166804dcee59e091e19fc26b8e25f1bf8ae07 -DIST github.com%2Fzeebo%2Ferrs%2F@v%2Fv1.2.2.mod 38 BLAKE2B 2b105421f45c247c0e953e9ad444c6d969453fb8e6cf91407f298eba55360f9be014c9027034fcf97fbaea7c58cade29243407fe0c26a2f6393a2722e42e49c7 SHA512 c1c7f7a6ad74e10b58926021d4cb4887bdf8e48615e8af8f120b418efb011c60c3ce423eb102762c1bdbdcf032b10c06d508b54177b1baf5a71836ab0e7e101b -DIST github.com%2Fzeebo%2Ferrs%2F@v%2Fv1.2.2.zip 11580 BLAKE2B 359a80b10c8d6a527be147d16b2ac6a54f7a79c666644529fcf0baec2ab93e39d15bd8baca505d09caf1f92337cf08140b4ec9991df248ce5e850f45236686d6 SHA512 f7279ebe3367a87b4767dd95352e281f10827a059e90a8025889cb4a4ea46b05d0b6ad909d76a5564f7557187b40b85b234aa573432bb9f58a760bade51b2d1b -DIST github.com%2Fzeebo%2Ffloat16%2F@v%2Fv0.1.0.mod 32 BLAKE2B 2f34c0ee8f763d9d0105c05784b9f41ce4ad05563b26d9dd257408e4bdef9cf407210e2857f037de34fac87eeb7bf4ee57afeb11b5c6b4d67031215b1889f521 SHA512 8c0302647721b7b42accd23840adc51cf3cf63a889b066fd3c15a41f6fd13d86e5df35444ac558dbc23a9cf2e872e2bec8845a59789b9f62b033def959aa4f1c -DIST github.com%2Fzeebo%2Fincenc%2F@v%2Fv0.0.0-20180505221441-0d92902eec54.mod 31 BLAKE2B 465ea833e59b4484cffe5443e75eaf2768a732bef9162cc771b2813e5fbd76b7b249b6a4ccce96aff76c9aec12f22b91074527efe3fab4c413cf7ce1d7bc4c08 SHA512 647347a72c8bcffbea3bc1286dc74bd8876011db6991415dafd18ff77d38758d58ef903060e52e483521255cd3143ea522351cddfbd6ee03363995cb41521416 -DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529 -DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.mod 94 BLAKE2B 5014c2a8459f1f01661c7cac0a7d2ad7de372b3e2916d56d721fd454e459fc75d5b4f6249a73dc54b46b91df00b1ef5c3d47d099fa28429a6967427ec7bfb36a SHA512 d3cfb7a75e321d2a6fc145b727dea76002189ae2caa8dd3162e5e6903a1acbe5bd55be81d7f112c71b47e61351534ff991be30993632be9c9d7443111600fe39 -DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.5.zip 115621 BLAKE2B f59bced3cd34292c237fe5a472a66fabca151ffdfd39553bd060bcc706433c248d0712fc4fcc7c44a67ee86fb3517a30cd1846c5c5e70b4549d42c1f12be9495 SHA512 0b6a8a073673708adc8fc0d01c96fb0ec4276db63a17f45ff02b4243235de9634952747aff63382ed767157c6dcbcaebd5399ace63a14e52cc826bd5c9749f82 -DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8 -DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1 -DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0 -DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0 -DIST go.opencensus.io%2F@v%2Fv0.22.3.zip 299798 BLAKE2B 6adc76c28569e177bf40cd2d4c7de912e92bb679c29ce669bda7e001d33f8e758d3f2a413857b2b74efc676d4d0cf239e9c7acefd2cb7cc502121f07b31d640a SHA512 99fe389fbe5fed1db31068ce5c4ebf597ac5b39203e3c5f13b0f92c3e66ed0b1ee9f6f3ec0d953a7f5d02d2db46969b8d3cb642703acf43cc0df5cda61c3e355 -DIST go.opencensus.io%2F@v%2Fv0.22.4.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0 -DIST go.opencensus.io%2F@v%2Fv0.22.4.zip 303399 BLAKE2B 86c43ff5f92434a5f549a1d7e1a4e9a64075cc5ba35a3b2bee58bdd3e264ea53c6bf5372e597e01f6ed8b2179b40c9aeba691cd165b7e26464e4f58b7f304759 SHA512 33a8ca783794ac23e1300971bd6d4fe5b41b8a444c6ed5a83669134d523565c5e58289ee2cb5938a87c1e9d257b3f756f17949d1010107e769fae6961bd521f0 -DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6 -DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.zip 17248 BLAKE2B da92637915783bd89117a7b763271151c72f3494eeebdc23d4a0197f5ed394d4ceb3b105e1eb5f0892ac61e0fe617050c1d741b17ea37ff8eff42758329ca68f SHA512 ad71851217d27e72d13db4d8aa1accc069f5ad5ef3fb9ab922c79cc0e6f0ee10025d499478d99e2f46418b36b4410c5bbdf8ea421919d6f60ec95f08c904b267 -DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23 -DIST go.uber.org%2Fatomic%2F@v%2Fv1.6.0.zip 19110 BLAKE2B 749dab9cbf012066f0d8eb694b6592fd4d1819dd3b27052a76940502d65900b39820091e683c1c8561f4b65262dade55db6be331b1ba8517c22ef7aa39ade990 SHA512 21b8036b73a07887db6ffb620557794241c085e01be44e45c93ffdb2aa6b47783151f37fc4023bf847e091e1150466e84a67394070d945cc4a35a771d278f61f -DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4 -DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip 14488 BLAKE2B 3bb8df1a459b2cf1dd63ab200f06a9f41f968f828b815b70bff899972a4c913656dbd3856dc6f4626836175d32b63c439e32a5aeb6a034f4733e2d09ef53f7f9 SHA512 d5fff733045694509ef1100fb8701526002b0841a11b5e1acbdea7e186c80738f651bd973c5eba2db5d2b8fff1b3057ea5d7d0e46645268b2f3619656238fdf4 -DIST go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.mod 324 BLAKE2B 46301f4e5db74421da813b0c2d3d178417435ede42a1857da3d3af84b5ba353f10cad25fd48b777325dc33edd05f0a17b019a9f37c4e13f28e7ca5ee833c0d5a SHA512 aa82aeb1b0559b9c9b2585b8d584d9be60b6d6aa48e9613cec7ca440e267b93b2eaf67e3e88fc2faca68062792f3f6c9b03d080b6f13dc7f967e1b403521a909 -DIST go.uber.org%2Fmultierr%2F@v%2Fv1.5.0.zip 20218 BLAKE2B 35528c5c70a5f9fc80cee48c0d983b0fa9b23ce5e8273742db3a5678b9d0a56bfb93cc904c0a8678114d114af5cbde5e818240751904873bdca4d7ac87cade58 SHA512 4a52ab2241ca171cce47c0ab5dbcb8f57d6cb0355c5d372d75822ee866536c4943538543fd7926846085d4a91b5d154e54865f32e9c3a8ac485b41edf217bdde -DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f -DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip 27032 BLAKE2B 58b337663e7a5625521925deadcd0d686ccbaa7d04925852bee0ff1cf3ada22c078e9715930dd20858b16bf51632a4e4d7e76986b0092107bc07ad46d132840c SHA512 b0f1b10667e0e600a4ebca7b4cd9983a27c3ec5f2c54cd46eb055cc0a07504642bea7ccfd0e0f6e3d007422633506efe863817b7c7bc9d18eec3642c84b28f8c -DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946 -DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.zip 224175 BLAKE2B 839e4b40c818d9ed889cb4f00b3b4c1e1a21add9e4732da956da63d77e5b8c2211443c9c2528f3c7a6886455d94d0818932e19876cf5576318426451d10eebb5 SHA512 deff970d323e0023cb39fd3aa38c419ccafef4c10af4edc8e9b70671e5892d60229e47f176495bdc4602b1cc4f344e8724e06eb740dd7858fde006bf121d5c1e -DIST go.uber.org%2Fzap%2F@v%2Fv1.15.0.mod 257 BLAKE2B 2e5fab0b1a188fb7fffa1c9ca0799fa286f74732ceb0f45a904a3620f636af45d8b30d199cbb54ca46114aaffeeaf66bfa04715abe02711d6af46bbdba9bd6dd SHA512 4922fb6e20d2f5d2fa00888b8d644c51e1b558edb69b9f7d70a883314c3e971b6f8fc707b072aa0602d4c451ca0f20983796b65edcb737e5090dda1ffed0c757 -DIST go.uber.org%2Fzap%2F@v%2Fv1.15.0.zip 226617 BLAKE2B 8f21641500327ea1bed28c3820f7103773d8955367dde6eee133b92e18631c5b5adb09a3d9f3c441f32e0ed8dd45acdccd211417a51be3be87e3b874f90897af SHA512 3fa001713fe2b81add9e841bac8ea606373d3c7d58941cfcff3f6535f252fdf608a573d614aa19981a2241fc4b7393427c1ba3c37ba4c617aa409b71ed9aa8e6 -DIST goftp.io%2Fserver%2F@v%2Fv0.4.0.mod 415 BLAKE2B 9ada7c22eede3f6ac2f42d47cbe1a2839dfeeb0d35b06bc550b29c3432f2af03c112f8184bf163f5379016252251b5890d8566270f8f73595799a8b733019451 SHA512 046270e478950ae118160c840de2cae0330f1be7b2e7120ca4a71d11c16eb5c18134be5bdcda4623579785d97fa252b4348e5897b807b26855013e188636b9a8 -DIST goftp.io%2Fserver%2F@v%2Fv0.4.0.zip 37154 BLAKE2B d8a041341001617f5fe2590d2a0a389908133ea09af7c0906b09b0280c8543af6b10439a1beeec6f5926cc9a1ced3d6015afba6ed6c0559252ddb29ec7b1f457 SHA512 e6ae37725224d46fd55bee7ee97d5f362e139bd08b3003240bd19aa48e82e7712c61d024b7357d3f59c45a93711ff90206246eb81c398325714181fa7dddc05d -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20170930174604-9419663f5a44.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190131182504-b8fe1690c613.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 -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-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200115085410-6d4e4cb37c7d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.zip 1876217 BLAKE2B 6ccbf46dcc9a97f60214af41470bc123c8b48a46737792d063ed6db50e937fdb87223032ff8f3c4d3f5ad0542a63e230ef70fa79ce681ab1ce71431b8a40caad SHA512 4795794202014a02396ae6e774ac5d9882d50c928660424f90798d806b1b5fd69f59e2bb23c5bf12a5841787cbc2f38142104b4427358dd527e539201415b35c -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb -DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8 -DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip 46076 BLAKE2B a3611608a1963ae2e1e326da29671c30a1d44c7afd2698f85081aed84ae5699c16362af284e299bd4ed721d20052801a79886f0b1305f91b17a2bc5a091a3f27 SHA512 b35cfd6b7640a526780db3c3bc62a89ec731793e350a49894c1de278b8033c4105b5534b09c1ffbfedc8e020fce2f42757808550e98e0ef5d493891f971bf247 -DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32 -DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip 128895 BLAKE2B c2543ab5e3e1eacc16790bcae51ef70962f035b9b95de3797a1fa1142726ec00c66e4e79b717e363fbc5dae3e91b79f05826d623f9251c0648437efaf007d018 SHA512 06f329247189a6a61e54902e9adf7f309b71818150f2ee43ca7ead80b8f03070edb31c4646b7a379b31e1a8aa81e15fcdb2d0e92f9375fcb4d5a8e2194b954e9 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -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-20190415214537-1da14a5a36f2.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785 -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5 -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip 84373 BLAKE2B 39bd0256afae566a53bb0b7b95adf0416653fd003bf5312c7a316a2d7c3e5d1fa25fd08bdbcdf75df45a56116fea54dcb1bf9b68b07d15d3a909e072f8f9fa06 SHA512 10a924e5fb556c2726795462c91fe7086472d6baab511ac21c1fb3c137e5a3e0db55f9ce8fe1952566d887225e3528ec8b747136f8984163acf71e869a0d8c58 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip 27028 BLAKE2B 1148f5197f3701698ea33c6185b918fdada2b3f55d401dfb90d33731dfe80b53bfdd891df3c4fa572606cd88963de20d9b44f5296946d80aa0daedbdf6b658a7 SHA512 a93111e63671ef38bdf0ae2bd9209d6b3d7dc9ad138077d3bc22dad12f0657982667b7e88fc9a4162b0f6765184172957b05797a29a2d614c975df00b12c4aba -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -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-20190221075227-b4e8571b14e0.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190415145633-3fd5a3612ccd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191112214154-59a1497f0cea.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.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-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200610111108-226ff32320da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200720211630-cb9d2d5c5666.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200720211630-cb9d2d5c5666.zip 1479413 BLAKE2B 3ab19a985b7d88ef669c9e6e87ed79f7b7ff693b76d6968d625281830e4011996e97e62981af6581eb5234e8dbc9641eba02f4cc7fed307154dc6d7336ec4a0e SHA512 b629323ec37e2a174ed2fb036da12c72468d6921980a88f6cdf2c9ce95ede8e50bf4ee58af92756d40dd219e1549c66f6e6292bcdeafc768834933a980d0b068 -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884 -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip 11992 BLAKE2B f5b83bee24babf643a85b1ad338c9cda760634c279e495f2faae96138854cf433abd98552ecf7e4fb815bce96f38a8cb2601dcca0966f244d6e55e9622a95542 SHA512 3b325af08ffac024bf39a06676e4daf051b82bc765803224fd14c3251b87c5d4376269eb4ad6f2a511b72e065b062bc41823400cde602013cc1d3e687509f85c -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod 237 BLAKE2B 32be8e5d58d0c78633cbb17e75ae67087f14d1ed4faed5d5698b1861d27348aa71a0da1dd865e7be1e7b9704f0aee19fc87d3f6262a5f4a05a1111498995638f SHA512 712b296362aae221fdc5b56a6a9bdb0c5fd26c8f45a9602ed227f00508cd640e89fa020bf5a30367a9a5f4bcda1c18f2170a3ae69a623fde7bcf9d71d4fc6e28 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod 271 BLAKE2B daceb2d4e388208a2619f2476085e0daa6b6546122a32355a3e005e6ac51ce72069c959a72c76078dedf82201fb217941091d3cc2b1bf4be8c77949b78ef6cd5 SHA512 c2c79e2a50a05d79909d58a13703e35f9cc9cf209be9593546c84883ac272e4e31a8ec9b2247d750b7cb42b088ad90214279c04b83a48173388fa13a71b6572d -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200622203043-20e05c1c8ffa.mod 271 BLAKE2B a7f35788b75abb2e24bcb7310d0584fa51045a86c35beb84ebc00cd6eaabb0e1ea2c81394a693ac528969222da686c64d064fd827f709b3d6695b80ae8e57e96 SHA512 8281ef87f633ddec7f1c4711773b09563e5695a44ef8140d062cdd9a14731a2edf24fde739c42e2a52038d6e100c3c5d7039db9adb62001e5e27a2e282faa057 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200622203043-20e05c1c8ffa.zip 3191521 BLAKE2B f42c1d4d116f010aa34a4072ef46b6bda4df6929009e02db2cf61c5de7d6244fec605efa55b1894c487526ca5036d2af628e22ba0450cd06bf56f7072560c2a4 SHA512 a9937101ba826860db1ddbec642f974daa181816c824a12c9f8dd48704139bdb0b17df446457baaf013b2212777d2186695802ed7661f92c0e9084fba163c356 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200820180210-c8f393745106.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200820180210-c8f393745106.zip 3282476 BLAKE2B 897c21d1d6f566d73a8583ed08d3f6ea8a43ac06b31029d286b6b9a1410df18e7a1013b19abc2ac43483632cf4f0fd7e7d0f2318335d758089af7897a0520a05 SHA512 682a5556217b3cc7d288b1f203e149895c12e7b1806bf9b17a3c2abd189efc03e73d178809b6cbd5f9edb471f5382bb0293e2367af7f8e12ce6e5ac20beffb14 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28 -DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330 -DIST google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330 -DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330 -DIST google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d -DIST google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d -DIST google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d -DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d -DIST google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d -DIST google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67 -DIST google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod 618 BLAKE2B 2b9706e395117be1f6fb728c055c6ba3dc9c2931589ac4fa66554a1a69a13961044f8d227cd5ca0643c8be742ab719af4866bf7f7cd2c60d7a9286458fda163a SHA512 ef0fe8dab48d31a477dfd1037229f12a47f6c1953ceafedb813facba73fcb6d880952151c50ed0a05279d7d93f288f8ad0381841ba263bfcb559b83d23b65c67 -DIST google.golang.org%2Fapi%2F@v%2Fv0.28.0.zip 16321976 BLAKE2B bd970b8c1754edb6a22e592b09f2b381560dc115adf29eea36ee4e0ad7d1c5724a1f4eb375721b1802fd9cdf1afef7021d1047e18747eab70a2a6107ef52f1eb SHA512 1c5aa7f26a0755fd569e9fb01887b623c94b4a260b2dda6f2adf22247bf891f8fe751f224c966cc628d5d00dcb75a31764f43caa40ccfccebca925b561c91362 -DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a -DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c -DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e -DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e -DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip 417678 BLAKE2B cdb4e693ed5fb2bb77ed1ce0e0b1b25dbc3648c00554ade874ce28fffd5824f487fac744f9f2cb0920aad2c94a82024e1d233d1663887f0681790488a3af6f3c SHA512 1ffe3894d8fd004f6c28916e06d8e64708c20321ff914e82d05c50ce4c62b76bcd93e74e45871f7adc779791240ef8e25df08fdaaf2abdce20a3640d8964bb28 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.6.zip 417793 BLAKE2B 7219518f67d83fad94a863f889af4c3a28a48b60fced31f33a3026c00bccfb6319060c5ff4712fed598824b5bf1448b0981fc21a6755855e91ce53b4026db062 SHA512 26520c7bbc5ec3c02dc86e5882ffae74b040f0600aa99832cb08cead5d3cd5c21a32d6df332c2c74a76b6c2a684141720b4fce874a07241412bc01837784b115 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod 340 BLAKE2B 70822d80e0c64a18bea901e30359c66d790629dfcfd7b4512b215b2c29bcfcc862bb68f9480357118c7adbe6a1b42754ef7703bb28e608abef8f8cdcbf6d2396 SHA512 461bf9e9c747d61500f3884c67f82cdf9394b186b512f6ff7537620a8f7a8de7a5c30af81c9a1303c0babfbc748c80460313e6b8e440e1f553fd4e1e8e12321c -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200228133532-8c2c7df3a383.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200312145019-da6875a35672.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200331122359-1ee6d9798940.zip 10905622 BLAKE2B fa7037a66af229074f131c575009c288956af871447536e3ebbfd134b8ac504978fff144f738c682306546d1eec39316dcca4e22891b2a9f278a5ac0df555c41 SHA512 d988d865f01a43ae07f2a22d427c273979a0c44dcba38f1dfb22b93852019d90a818d0465f39c66e342446854dd7f20dcc45847a8eb752f514df9c4b6d33bc2c -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200430143042-b979b6f78d84.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200511104702-f5ebc3bea380.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200515170657-fc4c6c6a6587.mod 323 BLAKE2B 76123f14f32c6702557406271ddd9e0304f0c9d5bb53c2b503a0a1ca74892da8a685270b6463faf7fe746f7398080f8364afc94b6f7ac8ba1170d645328ce5ca SHA512 67bb03661d5b872932d9a18ee7edc2908612a31db6391a8797e1cfa9aec45c6a3643b7943c4157db60f7e7aa235368a844c5e1fb382fa705074fc721c855a441 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200623002339-fbb79eadd5eb.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200626011028-ee7919e894b5.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200626011028-ee7919e894b5.zip 13831558 BLAKE2B 07f3268585bb3448a2f2fb22b4c772d828f4807e7adb274530845f04e28d0ca961cef945a494dedd3a4cdb1678bc23272b46419a5c1dc694eaf3ee67b5583a8e SHA512 becabfda2f0da2ec95a9dac5e926f07abdcb6ed151e59ee8430428d67ba5d8a2cf66e421d55861f15231915f6ddf8031e243d8d318b48306fcac3c1dcc430cef -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod 532 BLAKE2B ebe5fc28123fed2d7c497a7e237039a4a90f6eeb389b61650cede1d3bb850a1cd09c1574ee57fe65b6f4d338bb440a67ff802a28805b044bcc78b39ce2acd5b6 SHA512 85a0f6a03de8c151aacca3944a75738ac01ba368be98d6e4756a772976fccfd0faac55df170feb51ac86a10241a613b2ce1ac7d7c5cbef41ee2ed8eb93416801 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.zip 1198538 BLAKE2B 5341833998b96b52e75a00a527ad0e8ba7914634be6f2b4bd596bcb5a3551153fe75480f6b3cf5c89e7571e0b636ed2147fe64ad56b83ed715b2584f9ecf4ddf SHA512 00ba0e0b6b45e1501a7170ad4d9c9495f13bcfbca444c82560f72d3ef41e62c0488690ce0ce9ac2b60a2b8e3d4b19f683892ae45b87fcfc3ce32eb4740c39cfe -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod 542 BLAKE2B d2411d4096489755e1a83388e3b3271930614b11b5d677af4a7ce0ee9c5d4618bda9ccf29c9dce7a2d0254676dfea8bd54c88ec857473f4beaee92d61da9c209 SHA512 a8ff8c888452392a2026849edd07ad5aa36691f7cb30357c33aee3457e03cac9daf48195b90c2ea62b71337c37bcea23d7a5996eaddc4330749487789dd70fb3 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.mod 511 BLAKE2B 94c30e556883cd2f7149d49865821ebebbb0858d6a78ab03471b876dd57294308437ecafc7122f894310c5aa3558d18c9402ce54a62f666232a3a6bcb5bb8a24 SHA512 a41ca5b114ddc35287b79e63133b1e753dc9baf5e993dd08045c9400a91a741cfab96dad0870c0ae835226031ba3eae11bbb48df814b9613308be63a0d70b603 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.30.0.zip 1147269 BLAKE2B 99e915e8178a1bc4dfbbc925a8b6ab8d166cec2728991a9d6d1a2a35c9221341158426cc14ada02b4c4d531111d866a0b3ce47e9dc118ce24da754402e053353 SHA512 1a199881c480f94e5c26e5996c0ad2ac17405efa2e645bf015e07a18d7b32d13665ca4639d05d3c9948b597add528a5a82c943e0d76bea4d4e6f635934d2aecf -DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6 -DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414 -DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378 -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9 -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip 1491602 BLAKE2B 7fcfd0d05fe509a3e30885304b7ec76a538fdc9cde84d44fb90a32aebbd14bdffd5f3f7e36f9ba24ef87decec89fa824963780b152faf43f3799c8e64e822f34 SHA512 91a070430e3a44edc4f66d6b2ecfcfeb4c633a07c252d1494ecbc9a37141483cb7bc9bfc641022a59e740ccfe9c4ed52e263d59eb85b5bc37a66088bafb6ca8a -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65 -DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7 -DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d -DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178 -DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34 -DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63 -DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73 -DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip 48918 BLAKE2B aca803aaefb327d186b7f703ca85ce70caabd200938d8fdaae4a0c8fb41e73adc0a3a9fafc15483a2e6f13d5854a79a2753b8a67a3e33b39a351016856297bd4 SHA512 653c33136dadca777b3c9863cf7fd3f71d6fd51346cd1b812f30c901298728aeeceb03b48a87becca5eb3e980ca2b26ca374cb713d92d017e4d8e8873f3a6c98 -DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57 -DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41 -DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2 -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 -DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d -DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994 -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9 -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9 -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.zip 561290 BLAKE2B 2bdf9fb92ee838f5a9112bc5e3ace3e1cdc7a4dd5b3940c94b36abdbd6def28f9629a49e9ec901a32b76c944cc82af19f0f99f281b15ce666ebf153d062bc052 SHA512 9d01facc2b973a45604ac010f0bf0ec6aa3121966eaea6d7e1ac15869a8f5892077c3bbf0cbc21517890e24379848b8def33bf7dee7b1152ce232dd996ad017f -DIST rclone-1.53.3.tar.gz 14714224 BLAKE2B 0669bd046484867febe6ae201153540c40ce213d5a25eab84e84c97e577012a19423c89a1bc88ac0450ab58279fdd41e746fba266c96618bd0c19983cba3a205 SHA512 17d0ccf1165bc9d36e2aae5729dded2ccc6ecddd8a9902f1ca6b2bb26628afa99f58da5521ec5a1ebb27e8ea04cb736f88279603eeaeb0740cfe633cbe9de083 -DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774 -DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5 -DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863 -DIST storj.io%2Fcommon%2F@v%2Fv0.0.0-20200729140050-4c1ddac6fa63.mod 745 BLAKE2B 6bc3e0286db10f8f60ed0047028c6a51cdae1c7211bb41b8f7a28bdfc2f9598e7dfcfc4468d702f5cf30c703db88d7342d6ca7ddc9fc68e46787dbc793de0df5 SHA512 843c6ac9333afb6eb0e2f80ff205742f8e12d35559f4eaa65df1f817f4a9bcf67ee3b1b7e2c9de076ef50be29624760ed751985f815866e1d41cd884f4ace2c2 -DIST storj.io%2Fcommon%2F@v%2Fv0.0.0-20200729140050-4c1ddac6fa63.zip 556203 BLAKE2B 8f70d38aabd26101aa18ba029167083e9907e3639c644ee8fb3d9317b85aa973024840c3976ea8c9f95424cc1e05329321baf766426e7631be92e4dfdd8f929e SHA512 86380a8de97a27c3e8148c90a510f6364dd58abc8beec92559c883d4246aab2ec23e49218355aab1831897ff4843b2cd8785e997ea948d970d9ddb9fd388890e -DIST storj.io%2Fdrpc%2F@v%2Fv0.0.14.mod 181 BLAKE2B 745dfaea0c55cb72e86eaec930d2ca5a61eb1cbad8f4c1acefac1314aed9ae525ece2a7389d54e1c71be6eaa8544aa7c1be9bba90119a9a44a79b796fd43d4d8 SHA512 b455bd2de8341d1f307c396b03b91f70ed2675d22082be9a62e395cbea60e0727ed4662d4d73f5a02b5f31e5d8493b2019722d351f6503323f64a7e827e552c2 -DIST storj.io%2Fdrpc%2F@v%2Fv0.0.14.zip 174752 BLAKE2B c2c40b8a46f7dc5e485a149cf261c08f14ae5d8ec8dfd1c732b29a1960488f53c17189d339ceff176b32058c19fdd2ab0ba6c97199855be9f8fd314b65908300 SHA512 f10a3cf08b4a758cb745cd559e7997f1954148bd4b583c7a5df69efaada6222a4dfdccf5fec129f8c032c84be57efe8418d57403f6649a2ac92a337dcb0fa749 -DIST storj.io%2Fuplink%2F@v%2Fv1.2.0.mod 416 BLAKE2B f7461a1c108d9cacdd6e3131d82490fed0f3e35b6eaa2bd24e199bff10ab3c28540d6c841f091259bb5f4827480b207a697ad42f1721967344b3bd4b022ab045 SHA512 a14dd3bb957b80081434441941a69fe45b062ee0305f5c4f7a32996a05e7a2379501bbfcb8f631a065aa2dbd805c3ec74cf202adfa537e290255e6d3cdf2af64 -DIST storj.io%2Fuplink%2F@v%2Fv1.2.0.zip 100495 BLAKE2B 61fb78c4292fdc02ecc7cb63b6773fff52680dbaf5f86f63dbe21a902c56125cb6fa422f804ba4ffe60b4971fcd3cd0fec7aa64e7e2c1b47440168ab5e4a9e27 SHA512 3a803d8704d6d52018a1110896543a5a1efdaa1b26ee550ae41c8a578b145838b047d23ac5abbf12c6661460ed0973174a52a4192be921551c08ffaf161d3c4f +DIST rclone-1.62.2-deps.tar.xz 294265336 BLAKE2B 7f44b9972ab902ea53beb2cb6475dc4bbc1ca3b7254d1177a8d49107d6ce90724b0bb37567aecbd9421151ca0f7e7eaa01e6b4ed0d995264ddfc944cae98220e SHA512 2e1a6b864094b364745402b857036ebdea4dd83dddee6f18e3e40fbb0e740bae4d460b6f592d9ee50632fa73d6447f8dee0748a73a738a6dce263a20a1eae975 +DIST rclone-1.62.2.tar.gz 16172767 BLAKE2B 29dd755a25adb3b332b45a662dd6ae1280c38a940e76cc6e3c5ccd38620b43b0b9f0a4598d752583ddff7e2c860416e4e36b6cdfc00cf81f03437ac13e88aba3 SHA512 c29b666ab5573e80f9e61955e987cf3834306bfebce209775f5838a0844e26b5c5ec41d64b8a8444745a99fd8e9c104b18631aeffb438e89839f996221b1c8ca +DIST rclone-1.63.0-deps.tar.xz 297987608 BLAKE2B cfda8663ca32b36f5e56db74a724bded03473d4626a55111cf6e06c70b9d8a1678e371eb129cfa5ab4c09df67a22a6887e1681c099e4459f83521c6ad424e4e7 SHA512 604339abaead46ea4332c3eb8459575a6e26b5440f8743a17a5ae95954adf7f8f17039aea555b5e5534211d5091fd345646a6b43e1deba4fb4fb2576fb783881 +DIST rclone-1.63.0.tar.gz 16291884 BLAKE2B 540755808dd73fac061c481e2ea4f1ee241bcd55ccabda9b05343f2074f1672868c4246baff42471ecc7000455fe2c2a04c93578faa994aa0323e0033681bb38 SHA512 5f4590a5244d4eb1a51fc15a4ebef70941af94db8790d3ea1bd56b91f399f580b2cd1cc168c5d5e1fd9ee4bc4a3a4a908c8720aead8f8c24bcee3eacc6423ef3 +DIST rclone-1.63.1-deps.tar.xz 298002884 BLAKE2B e9dc1dcd3240d4a649b26606109f4ceb9e4e03448da8d27a11c19ed0dc6df39569c3f4714194c3a62e3d80c7a22591ac392d4187df464a4cf203c6135438ec5b SHA512 fff9e6d8ec7721abfd6c95220163478cf1bb3c8fd551a4310641b1213c072ed853e3ca40fd4109ff642d621cc441434f93608af590bb1b07ac2854ddd1d54147 +DIST rclone-1.63.1.tar.gz 16294505 BLAKE2B ccb83d5c748f8b68ba7eb7f5910f9b3e8e503407855b4bdd10d5feafaaa96bbf113305cb90952d05922a0ccae6e8efe88737271f4a193cf7a38f79820439c007 SHA512 fff03146ae7de4b47b883576b67852f9ff0558137ecb966300bd357c706d4b71c20ad0f87d0028c90b570d9351024f4ae8ddcce13333df1cabd0e76e08b29063 +DIST rclone-1.66.0-deps.tar.xz 367625224 BLAKE2B 244dc6c77315d1e1038b5e784deb55ca597ce728df34b0619a62ebd40524547a8e12c90f85385bf8515eb69f5cb07d5db6dbcb0de2c7a259edb1d934ce1eb747 SHA512 b238069636da506826deb99ddab869789bf7bda58d4eb47e47101c5011dd35dfd9a39f481f1c874d57a3330fa8b969fed2b98bb1d13ec8e79495f55403cf6001 +DIST rclone-1.66.0.tar.gz 17066102 BLAKE2B 587208635c2154782a9f3285c7972a567625120140d1b43096b572d19ab74ae9c7e12b485d6a74d88f1ef4bbce9656bea8f21c67c641227756dd48856a4da9a7 SHA512 955ed1457ebe7e6ac2288484109ba263601e147f767ce71b70e14ddcf3f97659d90704de094e4e83c0820267e0f41b1950fc3db534bb3577bcf27f0a2401eb84 diff --git a/net-misc/rclone/metadata.xml b/net-misc/rclone/metadata.xml index e85252a96df1..77f51273cdf6 100644 --- a/net-misc/rclone/metadata.xml +++ b/net-misc/rclone/metadata.xml @@ -5,4 +5,12 @@ <email>perfinion@gentoo.org</email> <name>Jason Zaman</name> </maintainer> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <upstream> + <bugs-to>https://gitlab.com/rclone/rclone/-/issues/</bugs-to> + <remote-id type="github">rclone/rclone</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/rclone/rclone-1.53.3.ebuild b/net-misc/rclone/rclone-1.53.3.ebuild deleted file mode 100644 index 454851f221e2..000000000000 --- a/net-misc/rclone/rclone-1.53.3.ebuild +++ /dev/null @@ -1,835 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit bash-completion-r1 go-module - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/rclone/rclone.git" -else - -EGO_SUM=( - "bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512" - "bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod" - "cloud.google.com/go v0.26.0/go.mod" - "cloud.google.com/go v0.34.0/go.mod" - "cloud.google.com/go v0.38.0/go.mod" - "cloud.google.com/go v0.44.1/go.mod" - "cloud.google.com/go v0.44.2/go.mod" - "cloud.google.com/go v0.45.1/go.mod" - "cloud.google.com/go v0.46.3/go.mod" - "cloud.google.com/go v0.50.0/go.mod" - "cloud.google.com/go v0.52.0/go.mod" - "cloud.google.com/go v0.53.0/go.mod" - "cloud.google.com/go v0.54.0/go.mod" - "cloud.google.com/go v0.56.0" - "cloud.google.com/go v0.56.0/go.mod" - "cloud.google.com/go v0.57.0/go.mod" - "cloud.google.com/go v0.59.0" - "cloud.google.com/go v0.59.0/go.mod" - "cloud.google.com/go/bigquery v1.0.1/go.mod" - "cloud.google.com/go/bigquery v1.3.0/go.mod" - "cloud.google.com/go/bigquery v1.4.0/go.mod" - "cloud.google.com/go/bigquery v1.5.0/go.mod" - "cloud.google.com/go/bigquery v1.7.0/go.mod" - "cloud.google.com/go/bigquery v1.8.0/go.mod" - "cloud.google.com/go/datastore v1.0.0/go.mod" - "cloud.google.com/go/datastore v1.1.0/go.mod" - "cloud.google.com/go/pubsub v1.0.1/go.mod" - "cloud.google.com/go/pubsub v1.1.0/go.mod" - "cloud.google.com/go/pubsub v1.2.0/go.mod" - "cloud.google.com/go/pubsub v1.3.1/go.mod" - "cloud.google.com/go/storage v1.0.0/go.mod" - "cloud.google.com/go/storage v1.5.0/go.mod" - "cloud.google.com/go/storage v1.6.0/go.mod" - "cloud.google.com/go/storage v1.8.0/go.mod" - "dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod" - "github.com/Azure/azure-pipeline-go v0.2.2" - "github.com/Azure/azure-pipeline-go v0.2.2/go.mod" - "github.com/Azure/azure-storage-blob-go v0.10.0" - "github.com/Azure/azure-storage-blob-go v0.10.0/go.mod" - "github.com/Azure/go-autorest/autorest v0.9.0" - "github.com/Azure/go-autorest/autorest v0.9.0/go.mod" - "github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod" - "github.com/Azure/go-autorest/autorest/adal v0.8.3" - "github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod" - "github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod" - "github.com/Azure/go-autorest/autorest/date v0.2.0" - "github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod" - "github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod" - "github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod" - "github.com/Azure/go-autorest/autorest/mocks v0.3.0" - "github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod" - "github.com/Azure/go-autorest/logger v0.1.0" - "github.com/Azure/go-autorest/logger v0.1.0/go.mod" - "github.com/Azure/go-autorest/tracing v0.5.0" - "github.com/Azure/go-autorest/tracing v0.5.0/go.mod" - "github.com/BurntSushi/toml v0.3.1" - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod" - "github.com/OneOfOne/xxhash v1.2.2/go.mod" - "github.com/RoaringBitmap/roaring v0.4.7/go.mod" - "github.com/Unknwon/goconfig v0.0.0-20191126170842-860a72fb44fd" - "github.com/Unknwon/goconfig v0.0.0-20191126170842-860a72fb44fd/go.mod" - "github.com/a8m/tree v0.0.0-20181222104329-6a0b80129de4" - "github.com/a8m/tree v0.0.0-20181222104329-6a0b80129de4/go.mod" - "github.com/aalpar/deheap v0.0.0-20200318053559-9a0c2883bd56" - "github.com/aalpar/deheap v0.0.0-20200318053559-9a0c2883bd56/go.mod" - "github.com/abbot/go-http-auth v0.4.0" - "github.com/abbot/go-http-auth v0.4.0/go.mod" - "github.com/aead/siphash v1.0.1/go.mod" - "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" - "github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod" - "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" - "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod" - "github.com/anacrolix/dms v1.1.0" - "github.com/anacrolix/dms v1.1.0/go.mod" - "github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa/go.mod" - "github.com/anacrolix/envpprof v1.0.0/go.mod" - "github.com/anacrolix/ffprobe v1.0.0/go.mod" - "github.com/anacrolix/missinggo v1.1.0/go.mod" - "github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod" - "github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod" - "github.com/atotto/clipboard v0.1.2" - "github.com/atotto/clipboard v0.1.2/go.mod" - "github.com/aws/aws-sdk-go v1.32.11" - "github.com/aws/aws-sdk-go v1.32.11/go.mod" - "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" - "github.com/beorn7/perks v1.0.0/go.mod" - "github.com/beorn7/perks v1.0.1" - "github.com/beorn7/perks v1.0.1/go.mod" - "github.com/billziss-gh/cgofuse v1.4.0" - "github.com/billziss-gh/cgofuse v1.4.0/go.mod" - "github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod" - "github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod" - "github.com/btcsuite/btcd v0.20.1-beta/go.mod" - "github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod" - "github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod" - "github.com/btcsuite/btcutil v1.0.1" - "github.com/btcsuite/btcutil v1.0.1/go.mod" - "github.com/btcsuite/btcutil v1.0.2" - "github.com/btcsuite/btcutil v1.0.2/go.mod" - "github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod" - "github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod" - "github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod" - "github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod" - "github.com/btcsuite/winsvc v1.0.0/go.mod" - "github.com/calebcase/tmpfile v1.0.2-0.20200602150926-3af473ef8439/go.mod" - "github.com/calebcase/tmpfile v1.0.2" - "github.com/calebcase/tmpfile v1.0.2/go.mod" - "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod" - "github.com/cespare/xxhash v1.1.0" - "github.com/cespare/xxhash v1.1.0/go.mod" - "github.com/cespare/xxhash/v2 v2.1.1" - "github.com/cespare/xxhash/v2 v2.1.1/go.mod" - "github.com/chzyer/logex v1.1.10/go.mod" - "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod" - "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" - "github.com/client9/misspell v0.3.4/go.mod" - "github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod" - "github.com/coreos/bbolt v1.3.2/go.mod" - "github.com/coreos/etcd v3.3.10+incompatible/go.mod" - "github.com/coreos/go-semver v0.2.0/go.mod" - "github.com/coreos/go-semver v0.3.0" - "github.com/coreos/go-semver v0.3.0/go.mod" - "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod" - "github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.0" - "github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod" - "github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" - "github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod" - "github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod" - "github.com/dropbox/dropbox-sdk-go-unofficial v5.6.0+incompatible" - "github.com/dropbox/dropbox-sdk-go-unofficial v5.6.0+incompatible/go.mod" - "github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod" - "github.com/dustin/go-humanize v1.0.0/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.0/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.4/go.mod" - "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod" - "github.com/fsnotify/fsnotify v1.4.7" - "github.com/fsnotify/fsnotify v1.4.7/go.mod" - "github.com/ghodss/yaml v1.0.0/go.mod" - "github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod" - "github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493/go.mod" - "github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod" - "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod" - "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod" - "github.com/go-kit/kit v0.8.0/go.mod" - "github.com/go-kit/kit v0.9.0/go.mod" - "github.com/go-logfmt/logfmt v0.3.0/go.mod" - "github.com/go-logfmt/logfmt v0.4.0/go.mod" - "github.com/go-sql-driver/mysql v1.5.0/go.mod" - "github.com/go-stack/stack v1.8.0/go.mod" - "github.com/gogo/protobuf v1.1.1/go.mod" - "github.com/gogo/protobuf v1.2.1" - "github.com/gogo/protobuf v1.2.1/go.mod" - "github.com/gogo/protobuf v1.3.1" - "github.com/gogo/protobuf v1.3.1/go.mod" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" - "github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod" - "github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod" - "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod" - "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e" - "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod" - "github.com/golang/mock v1.1.1/go.mod" - "github.com/golang/mock v1.2.0/go.mod" - "github.com/golang/mock v1.3.1/go.mod" - "github.com/golang/mock v1.4.0/go.mod" - "github.com/golang/mock v1.4.1/go.mod" - "github.com/golang/mock v1.4.3/go.mod" - "github.com/golang/protobuf v1.2.0/go.mod" - "github.com/golang/protobuf v1.3.1/go.mod" - "github.com/golang/protobuf v1.3.2/go.mod" - "github.com/golang/protobuf v1.3.3/go.mod" - "github.com/golang/protobuf v1.3.4/go.mod" - "github.com/golang/protobuf v1.3.5/go.mod" - "github.com/golang/protobuf v1.4.0-rc.1/go.mod" - "github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod" - "github.com/golang/protobuf v1.4.0-rc.2/go.mod" - "github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod" - "github.com/golang/protobuf v1.4.0/go.mod" - "github.com/golang/protobuf v1.4.1/go.mod" - "github.com/golang/protobuf v1.4.2" - "github.com/golang/protobuf v1.4.2/go.mod" - "github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod" - "github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod" - "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" - "github.com/google/btree v1.0.0/go.mod" - "github.com/google/go-cmp v0.2.0/go.mod" - "github.com/google/go-cmp v0.3.0/go.mod" - "github.com/google/go-cmp v0.3.1/go.mod" - "github.com/google/go-cmp v0.4.0/go.mod" - "github.com/google/go-cmp v0.4.1/go.mod" - "github.com/google/go-cmp v0.5.0" - "github.com/google/go-cmp v0.5.0/go.mod" - "github.com/google/go-querystring v1.0.0" - "github.com/google/go-querystring v1.0.0/go.mod" - "github.com/google/gofuzz v1.0.0/go.mod" - "github.com/google/martian v2.1.0+incompatible/go.mod" - "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod" - "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod" - "github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod" - "github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod" - "github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod" - "github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod" - "github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod" - "github.com/google/renameio v0.1.0/go.mod" - "github.com/google/uuid v1.1.1" - "github.com/google/uuid v1.1.1/go.mod" - "github.com/googleapis/gax-go/v2 v2.0.4/go.mod" - "github.com/googleapis/gax-go/v2 v2.0.5" - "github.com/googleapis/gax-go/v2 v2.0.5/go.mod" - "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod" - "github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e" - "github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod" - "github.com/gorilla/websocket v1.4.0/go.mod" - "github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod" - "github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod" - "github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod" - "github.com/hanwen/go-fuse v1.0.0" - "github.com/hanwen/go-fuse v1.0.0/go.mod" - "github.com/hanwen/go-fuse/v2 v2.0.3" - "github.com/hanwen/go-fuse/v2 v2.0.3/go.mod" - "github.com/hashicorp/golang-lru v0.5.0/go.mod" - "github.com/hashicorp/golang-lru v0.5.1/go.mod" - "github.com/hashicorp/hcl v1.0.0/go.mod" - "github.com/hpcloud/tail v1.0.0" - "github.com/hpcloud/tail v1.0.0/go.mod" - "github.com/huandu/xstrings v1.0.0/go.mod" - "github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod" - "github.com/inconshreveable/mousetrap v1.0.0" - "github.com/inconshreveable/mousetrap v1.0.0/go.mod" - "github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod" - "github.com/jlaffaye/ftp v0.0.0-20190624084859-c1312a7102bf/go.mod" - "github.com/jlaffaye/ftp v0.0.0-20200720194710-13949d38913e" - "github.com/jlaffaye/ftp v0.0.0-20200720194710-13949d38913e/go.mod" - "github.com/jmespath/go-jmespath v0.3.0" - "github.com/jmespath/go-jmespath v0.3.0/go.mod" - "github.com/jonboulle/clockwork v0.1.0/go.mod" - "github.com/jrick/logrotate v1.0.0/go.mod" - "github.com/json-iterator/go v1.1.6/go.mod" - "github.com/json-iterator/go v1.1.10" - "github.com/json-iterator/go v1.1.10/go.mod" - "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod" - "github.com/jstemmer/go-junit-report v0.9.1/go.mod" - "github.com/jtolds/gls v4.2.1+incompatible/go.mod" - "github.com/jtolds/gls v4.20.0+incompatible" - "github.com/jtolds/gls v4.20.0+incompatible/go.mod" - "github.com/julienschmidt/httprouter v1.2.0/go.mod" - "github.com/jzelinskie/whirlpool v0.0.0-20170603002051-c19460b8caa6" - "github.com/jzelinskie/whirlpool v0.0.0-20170603002051-c19460b8caa6/go.mod" - "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0" - "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod" - "github.com/kisielk/errcheck v1.1.0/go.mod" - "github.com/kisielk/errcheck v1.2.0/go.mod" - "github.com/kisielk/gotool v1.0.0/go.mod" - "github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod" - "github.com/klauspost/compress v1.10.11" - "github.com/klauspost/compress v1.10.11/go.mod" - "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" - "github.com/konsorten/go-windows-terminal-sequences v1.0.3" - "github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod" - "github.com/koofr/go-httpclient v0.0.0-20200420163713-93aa7c75b348" - "github.com/koofr/go-httpclient v0.0.0-20200420163713-93aa7c75b348/go.mod" - "github.com/koofr/go-koofrclient v0.0.0-20190724113126-8e5366da203a" - "github.com/koofr/go-koofrclient v0.0.0-20190724113126-8e5366da203a/go.mod" - "github.com/kr/fs v0.1.0" - "github.com/kr/fs v0.1.0/go.mod" - "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348" - "github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod" - "github.com/magiconair/properties v1.8.0/go.mod" - "github.com/mattn/go-colorable v0.1.7" - "github.com/mattn/go-colorable v0.1.7/go.mod" - "github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d" - "github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod" - "github.com/mattn/go-ieproxy v0.0.1" - "github.com/mattn/go-ieproxy v0.0.1/go.mod" - "github.com/mattn/go-isatty v0.0.12" - "github.com/mattn/go-isatty v0.0.12/go.mod" - "github.com/mattn/go-runewidth v0.0.9" - "github.com/mattn/go-runewidth v0.0.9/go.mod" - "github.com/matttproud/golang_protobuf_extensions v1.0.1" - "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" - "github.com/minio/minio-go/v6 v6.0.46" - "github.com/minio/minio-go/v6 v6.0.46/go.mod" - "github.com/minio/sha256-simd v0.1.1" - "github.com/minio/sha256-simd v0.1.1/go.mod" - "github.com/mitchellh/go-homedir v1.1.0" - "github.com/mitchellh/go-homedir v1.1.0/go.mod" - "github.com/mitchellh/mapstructure v1.1.2/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd" - "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" - "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" - "github.com/modern-go/reflect2 v1.0.1" - "github.com/modern-go/reflect2 v1.0.1/go.mod" - "github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod" - "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod" - "github.com/ncw/go-acd v0.0.0-20171120105400-887eb06ab6a2" - "github.com/ncw/go-acd v0.0.0-20171120105400-887eb06ab6a2/go.mod" - "github.com/ncw/swift v1.0.52" - "github.com/ncw/swift v1.0.52/go.mod" - "github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod" - "github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1" - "github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1/go.mod" - "github.com/oklog/ulid v1.3.1/go.mod" - "github.com/okzk/sdnotify v0.0.0-20180710141335-d9becc38acbd" - "github.com/okzk/sdnotify v0.0.0-20180710141335-d9becc38acbd/go.mod" - "github.com/onsi/ginkgo v1.6.0/go.mod" - "github.com/onsi/ginkgo v1.7.0/go.mod" - "github.com/onsi/ginkgo v1.12.0" - "github.com/onsi/ginkgo v1.12.0/go.mod" - "github.com/onsi/gomega v1.4.3/go.mod" - "github.com/onsi/gomega v1.7.1/go.mod" - "github.com/onsi/gomega v1.9.0" - "github.com/onsi/gomega v1.9.0/go.mod" - "github.com/patrickmn/go-cache v2.1.0+incompatible" - "github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod" - "github.com/pelletier/go-toml v1.2.0/go.mod" - "github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14" - "github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14/go.mod" - "github.com/philhofer/fwd v1.0.0/go.mod" - "github.com/pkg/errors v0.8.0/go.mod" - "github.com/pkg/errors v0.8.1/go.mod" - "github.com/pkg/errors v0.9.1" - "github.com/pkg/errors v0.9.1/go.mod" - "github.com/pkg/sftp v1.11.0" - "github.com/pkg/sftp v1.11.0/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/prometheus/client_golang v0.9.1/go.mod" - "github.com/prometheus/client_golang v0.9.3/go.mod" - "github.com/prometheus/client_golang v1.0.0/go.mod" - "github.com/prometheus/client_golang v1.7.1" - "github.com/prometheus/client_golang v1.7.1/go.mod" - "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" - "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod" - "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod" - "github.com/prometheus/client_model v0.2.0" - "github.com/prometheus/client_model v0.2.0/go.mod" - "github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod" - "github.com/prometheus/common v0.4.0/go.mod" - "github.com/prometheus/common v0.4.1/go.mod" - "github.com/prometheus/common v0.10.0" - "github.com/prometheus/common v0.10.0/go.mod" - "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod" - "github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod" - "github.com/prometheus/procfs v0.0.2/go.mod" - "github.com/prometheus/procfs v0.1.3" - "github.com/prometheus/procfs v0.1.3/go.mod" - "github.com/prometheus/tsdb v0.7.1/go.mod" - "github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8" - "github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8/go.mod" - "github.com/rfjakob/eme v1.1.1" - "github.com/rfjakob/eme v1.1.1/go.mod" - "github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod" - "github.com/rogpeppe/go-internal v1.3.0/go.mod" - "github.com/russross/blackfriday/v2 v2.0.1" - "github.com/russross/blackfriday/v2 v2.0.1/go.mod" - "github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod" - "github.com/sevlyar/go-daemon v0.1.5" - "github.com/sevlyar/go-daemon v0.1.5/go.mod" - "github.com/shurcooL/sanitized_anchor_name v1.0.0" - "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod" - "github.com/sirupsen/logrus v1.2.0/go.mod" - "github.com/sirupsen/logrus v1.4.2/go.mod" - "github.com/sirupsen/logrus v1.6.0" - "github.com/sirupsen/logrus v1.6.0/go.mod" - "github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966" - "github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod" - "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d" - "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod" - "github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod" - "github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a" - "github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod" - "github.com/soheilhy/cmux v0.1.4/go.mod" - "github.com/spacemonkeygo/monkit/v3 v3.0.4/go.mod" - "github.com/spacemonkeygo/monkit/v3 v3.0.5/go.mod" - "github.com/spacemonkeygo/monkit/v3 v3.0.7-0.20200515175308-072401d8c752" - "github.com/spacemonkeygo/monkit/v3 v3.0.7-0.20200515175308-072401d8c752/go.mod" - "github.com/spacemonkeygo/monotime v0.0.0-20180824235756-e3f48a95f98a/go.mod" - "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" - "github.com/spf13/afero v1.1.2/go.mod" - "github.com/spf13/cast v1.3.0/go.mod" - "github.com/spf13/cobra v1.0.0" - "github.com/spf13/cobra v1.0.0/go.mod" - "github.com/spf13/jwalterweatherman v1.0.0/go.mod" - "github.com/spf13/pflag v1.0.3/go.mod" - "github.com/spf13/pflag v1.0.5" - "github.com/spf13/pflag v1.0.5/go.mod" - "github.com/spf13/viper v1.4.0/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/objx v0.1.1/go.mod" - "github.com/stretchr/testify v1.2.1/go.mod" - "github.com/stretchr/testify v1.2.2/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709/go.mod" - "github.com/stretchr/testify v1.4.0/go.mod" - "github.com/stretchr/testify v1.5.1/go.mod" - "github.com/stretchr/testify v1.6.1" - "github.com/stretchr/testify v1.6.1/go.mod" - "github.com/t3rm1n4l/go-mega v0.0.0-20200416171014-ffad7fcb44b8" - "github.com/t3rm1n4l/go-mega v0.0.0-20200416171014-ffad7fcb44b8/go.mod" - "github.com/tinylib/msgp v1.0.2/go.mod" - "github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod" - "github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c" - "github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod" - "github.com/ugorji/go v1.1.4/go.mod" - "github.com/vivint/infectious v0.0.0-20200605153912-25a574ae18a3" - "github.com/vivint/infectious v0.0.0-20200605153912-25a574ae18a3/go.mod" - "github.com/willf/bitset v1.1.9/go.mod" - "github.com/xanzy/ssh-agent v0.2.1" - "github.com/xanzy/ssh-agent v0.2.1/go.mod" - "github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod" - "github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod" - "github.com/youmark/pkcs8 v0.0.0-20200520070018-fad002e585ce" - "github.com/youmark/pkcs8 v0.0.0-20200520070018-fad002e585ce/go.mod" - "github.com/yuin/goldmark v1.1.25/go.mod" - "github.com/yuin/goldmark v1.1.27/go.mod" - "github.com/yuin/goldmark v1.1.32/go.mod" - "github.com/yunify/qingstor-sdk-go/v3 v3.2.0" - "github.com/yunify/qingstor-sdk-go/v3 v3.2.0/go.mod" - "github.com/zeebo/admission/v3 v3.0.1/go.mod" - "github.com/zeebo/assert v1.1.0" - "github.com/zeebo/assert v1.1.0/go.mod" - "github.com/zeebo/errs v1.2.2" - "github.com/zeebo/errs v1.2.2/go.mod" - "github.com/zeebo/float16 v0.1.0/go.mod" - "github.com/zeebo/incenc v0.0.0-20180505221441-0d92902eec54/go.mod" - "go.etcd.io/bbolt v1.3.2/go.mod" - "go.etcd.io/bbolt v1.3.5" - "go.etcd.io/bbolt v1.3.5/go.mod" - "go.opencensus.io v0.21.0/go.mod" - "go.opencensus.io v0.22.0/go.mod" - "go.opencensus.io v0.22.2/go.mod" - "go.opencensus.io v0.22.3" - "go.opencensus.io v0.22.3/go.mod" - "go.opencensus.io v0.22.4" - "go.opencensus.io v0.22.4/go.mod" - "go.uber.org/atomic v1.4.0" - "go.uber.org/atomic v1.4.0/go.mod" - "go.uber.org/atomic v1.6.0" - "go.uber.org/atomic v1.6.0/go.mod" - "go.uber.org/multierr v1.1.0" - "go.uber.org/multierr v1.1.0/go.mod" - "go.uber.org/multierr v1.5.0" - "go.uber.org/multierr v1.5.0/go.mod" - "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee" - "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod" - "go.uber.org/zap v1.10.0" - "go.uber.org/zap v1.10.0/go.mod" - "go.uber.org/zap v1.15.0" - "go.uber.org/zap v1.15.0/go.mod" - "goftp.io/server v0.4.0" - "goftp.io/server v0.4.0/go.mod" - "golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod" - "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod" - "golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod" - "golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod" - "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" - "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod" - "golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod" - "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod" - "golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod" - "golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod" - "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod" - "golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod" - "golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod" - "golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod" - "golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod" - "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9" - "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod" - "golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899" - "golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod" - "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" - "golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod" - "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod" - "golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod" - "golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod" - "golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod" - "golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod" - "golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod" - "golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod" - "golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod" - "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod" - "golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod" - "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" - "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" - "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod" - "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" - "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod" - "golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod" - "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod" - "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod" - "golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod" - "golang.org/x/lint v0.0.0-20200302205851-738671d3881b" - "golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod" - "golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod" - "golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod" - "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod" - "golang.org/x/mod v0.1.0/go.mod" - "golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod" - "golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod" - "golang.org/x/mod v0.2.0/go.mod" - "golang.org/x/mod v0.3.0" - "golang.org/x/mod v0.3.0/go.mod" - "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" - "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" - "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" - "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod" - "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod" - "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod" - "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod" - "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" - "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" - "golang.org/x/net v0.0.0-20190415214537-1da14a5a36f2/go.mod" - "golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod" - "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" - "golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod" - "golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod" - "golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod" - "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" - "golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod" - "golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod" - "golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod" - "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod" - "golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod" - "golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod" - "golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod" - "golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod" - "golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod" - "golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod" - "golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod" - "golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod" - "golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod" - "golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod" - "golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod" - "golang.org/x/net v0.0.0-20200707034311-ab3426394381" - "golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod" - "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" - "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod" - "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod" - "golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod" - "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d" - "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod" - "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" - "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" - "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" - "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" - "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" - "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod" - "golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208" - "golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod" - "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" - "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" - "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" - "golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod" - "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod" - "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" - "golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod" - "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod" - "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" - "golang.org/x/sys v0.0.0-20190415145633-3fd5a3612ccd/go.mod" - "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" - "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" - "golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod" - "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod" - "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod" - "golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod" - "golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod" - "golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod" - "golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod" - "golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod" - "golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod" - "golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod" - "golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod" - "golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod" - "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" - "golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod" - "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod" - "golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod" - "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod" - "golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod" - "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" - "golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod" - "golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod" - "golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod" - "golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod" - "golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod" - "golang.org/x/sys v0.0.0-20200610111108-226ff32320da/go.mod" - "golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod" - "golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666" - "golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666/go.mod" - "golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod" - "golang.org/x/text v0.3.2/go.mod" - "golang.org/x/text v0.3.3" - "golang.org/x/text v0.3.3/go.mod" - "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod" - "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" - "golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod" - "golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1" - "golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod" - "golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod" - "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" - "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" - "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" - "golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod" - "golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod" - "golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod" - "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod" - "golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod" - "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" - "golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod" - "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod" - "golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod" - "golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod" - "golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod" - "golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod" - "golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod" - "golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod" - "golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod" - "golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod" - "golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod" - "golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod" - "golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod" - "golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod" - "golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod" - "golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod" - "golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod" - "golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod" - "golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod" - "golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod" - "golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod" - "golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod" - "golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod" - "golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod" - "golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod" - "golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod" - "golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod" - "golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod" - "golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod" - "golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa" - "golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod" - "golang.org/x/tools v0.0.0-20200820180210-c8f393745106" - "golang.org/x/tools v0.0.0-20200820180210-c8f393745106/go.mod" - "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" - "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" - "google.golang.org/api v0.4.0/go.mod" - "google.golang.org/api v0.7.0/go.mod" - "google.golang.org/api v0.8.0/go.mod" - "google.golang.org/api v0.9.0/go.mod" - "google.golang.org/api v0.13.0/go.mod" - "google.golang.org/api v0.14.0/go.mod" - "google.golang.org/api v0.15.0/go.mod" - "google.golang.org/api v0.17.0/go.mod" - "google.golang.org/api v0.18.0/go.mod" - "google.golang.org/api v0.19.0/go.mod" - "google.golang.org/api v0.20.0/go.mod" - "google.golang.org/api v0.22.0/go.mod" - "google.golang.org/api v0.24.0/go.mod" - "google.golang.org/api v0.28.0" - "google.golang.org/api v0.28.0/go.mod" - "google.golang.org/appengine v1.1.0/go.mod" - "google.golang.org/appengine v1.4.0/go.mod" - "google.golang.org/appengine v1.5.0/go.mod" - "google.golang.org/appengine v1.6.1/go.mod" - "google.golang.org/appengine v1.6.5" - "google.golang.org/appengine v1.6.5/go.mod" - "google.golang.org/appengine v1.6.6" - "google.golang.org/appengine v1.6.6/go.mod" - "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" - "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod" - "google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod" - "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" - "google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod" - "google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod" - "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" - "google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod" - "google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod" - "google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod" - "google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod" - "google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod" - "google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod" - "google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod" - "google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod" - "google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod" - "google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod" - "google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod" - "google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod" - "google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod" - "google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940" - "google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod" - "google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod" - "google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod" - "google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod" - "google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod" - "google.golang.org/genproto v0.0.0-20200623002339-fbb79eadd5eb/go.mod" - "google.golang.org/genproto v0.0.0-20200626011028-ee7919e894b5" - "google.golang.org/genproto v0.0.0-20200626011028-ee7919e894b5/go.mod" - "google.golang.org/grpc v1.19.0/go.mod" - "google.golang.org/grpc v1.20.1/go.mod" - "google.golang.org/grpc v1.21.0/go.mod" - "google.golang.org/grpc v1.21.1/go.mod" - "google.golang.org/grpc v1.23.0/go.mod" - "google.golang.org/grpc v1.25.1/go.mod" - "google.golang.org/grpc v1.26.0/go.mod" - "google.golang.org/grpc v1.27.0/go.mod" - "google.golang.org/grpc v1.27.1/go.mod" - "google.golang.org/grpc v1.28.0" - "google.golang.org/grpc v1.28.0/go.mod" - "google.golang.org/grpc v1.29.1/go.mod" - "google.golang.org/grpc v1.30.0" - "google.golang.org/grpc v1.30.0/go.mod" - "google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod" - "google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod" - "google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod" - "google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod" - "google.golang.org/protobuf v1.21.0/go.mod" - "google.golang.org/protobuf v1.22.0/go.mod" - "google.golang.org/protobuf v1.23.0" - "google.golang.org/protobuf v1.23.0/go.mod" - "google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod" - "google.golang.org/protobuf v1.24.0/go.mod" - "google.golang.org/protobuf v1.25.0" - "google.golang.org/protobuf v1.25.0/go.mod" - "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/errgo.v2 v2.1.0/go.mod" - "gopkg.in/fsnotify.v1 v1.4.7" - "gopkg.in/fsnotify.v1 v1.4.7/go.mod" - "gopkg.in/ini.v1 v1.42.0" - "gopkg.in/ini.v1 v1.42.0/go.mod" - "gopkg.in/resty.v1 v1.12.0/go.mod" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" - "gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod" - "gopkg.in/yaml.v2 v2.2.1/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.4/go.mod" - "gopkg.in/yaml.v2 v2.2.5/go.mod" - "gopkg.in/yaml.v2 v2.3.0" - "gopkg.in/yaml.v2 v2.3.0/go.mod" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" - "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776" - "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod" - "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" - "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod" - "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod" - "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" - "honnef.co/go/tools v0.0.1-2019.2.3/go.mod" - "honnef.co/go/tools v0.0.1-2020.1.3/go.mod" - "honnef.co/go/tools v0.0.1-2020.1.4" - "honnef.co/go/tools v0.0.1-2020.1.4/go.mod" - "rsc.io/binaryregexp v0.2.0/go.mod" - "rsc.io/quote/v3 v3.1.0/go.mod" - "rsc.io/sampler v1.3.0/go.mod" - "storj.io/common v0.0.0-20200729140050-4c1ddac6fa63" - "storj.io/common v0.0.0-20200729140050-4c1ddac6fa63/go.mod" - "storj.io/drpc v0.0.14" - "storj.io/drpc v0.0.14/go.mod" - "storj.io/uplink v1.2.0" - "storj.io/uplink v1.2.0/go.mod" - ) -go-module_set_globals - - KEYWORDS="amd64 ~arm ~arm64 x86" - SRC_URI="https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" -fi - -DESCRIPTION="A program to sync files to and from various cloud storage providers" -HOMEPAGE="https://rclone.org/" - -LICENSE="Apache-2.0 BSD BSD-2 ISC MIT" -SLOT="0" -IUSE="" - -src_unpack() { - if [[ ${PV} == *9999 ]]; then - git-r3_src_unpack - go-module_live_vendor - else - go-module_src_unpack - fi -} - -src_compile() { - go build -mod=mod . || die "compile failed" -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - dodoc README.md - - ./rclone genautocomplete bash ${PN}.bash || die - newbashcomp ${PN}.bash ${PN} - - ./rclone genautocomplete zsh ${PN}.zsh || die - insinto /usr/share/zsh/site-functions - newins ${PN}.zsh _${PN} -} diff --git a/net-misc/rclone/rclone-1.62.2-r1.ebuild b/net-misc/rclone/rclone-1.62.2-r1.ebuild new file mode 100644 index 000000000000..fad2bbf730a5 --- /dev/null +++ b/net-misc/rclone/rclone-1.62.2-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit bash-completion-r1 go-module + +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" +SRC_URI=" + https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-deps.tar.xz +" + +DESCRIPTION="A program to sync files to and from various cloud storage providers" +HOMEPAGE="https://rclone.org/" + +LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" +SLOT="0" +IUSE="" + +RDEPEND="sys-fs/fuse:3" + +src_compile() { + go build -mod=readonly . || die "compile failed" +} + +src_test() { + # Setting CI skips unreliable tests, see fstest/testy/testy.go + # TestAddPlugin and TestRemovePlugin fail + RCLONE_CONFIG="/notfound" CI="true" go test -mod=readonly -v -run "!Test.*Plugin" ./... || die "test failed" +} + +src_install() { + dobin ${PN} + doman ${PN}.1 + dodoc README.md + + ./rclone genautocomplete bash ${PN}.bash || die + newbashcomp ${PN}.bash ${PN} + + ./rclone genautocomplete zsh ${PN}.zsh || die + insinto /usr/share/zsh/site-functions + newins ${PN}.zsh _${PN} +} diff --git a/net-misc/rclone/rclone-1.63.0.ebuild b/net-misc/rclone/rclone-1.63.0.ebuild new file mode 100644 index 000000000000..715bda67b36e --- /dev/null +++ b/net-misc/rclone/rclone-1.63.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit bash-completion-r1 go-module + +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +SRC_URI=" + https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-deps.tar.xz +" + +DESCRIPTION="A program to sync files to and from various cloud storage providers" +HOMEPAGE="https://rclone.org/" + +LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" +SLOT="0" +IUSE="" + +RDEPEND="sys-fs/fuse:3" + +src_compile() { + go build -mod=readonly . || die "compile failed" +} + +src_test() { + # Setting CI skips unreliable tests, see fstest/testy/testy.go + # TestAddPlugin and TestRemovePlugin fail + RCLONE_CONFIG="/notfound" CI="true" go test -mod=readonly -v -run "!Test.*Plugin" ./... || die "test failed" +} + +src_install() { + dobin ${PN} + doman ${PN}.1 + dodoc README.md + + ./rclone genautocomplete bash ${PN}.bash || die + newbashcomp ${PN}.bash ${PN} + + ./rclone genautocomplete zsh ${PN}.zsh || die + insinto /usr/share/zsh/site-functions + newins ${PN}.zsh _${PN} +} diff --git a/net-misc/rclone/rclone-1.63.1.ebuild b/net-misc/rclone/rclone-1.63.1.ebuild new file mode 100644 index 000000000000..9087a250f9f2 --- /dev/null +++ b/net-misc/rclone/rclone-1.63.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit bash-completion-r1 go-module + +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" +SRC_URI=" + https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}-deps.tar.xz +" + +DESCRIPTION="A program to sync files to and from various cloud storage providers" +HOMEPAGE="https://rclone.org/" + +LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" +SLOT="0" +IUSE="" + +RDEPEND="sys-fs/fuse:3" + +src_compile() { + go build -mod=readonly . || die "compile failed" +} + +src_test() { + # Setting CI skips unreliable tests, see fstest/testy/testy.go + # TestAddPlugin and TestRemovePlugin fail + RCLONE_CONFIG="/notfound" CI="true" go test -mod=readonly -v -run "!Test.*Plugin" ./... || die "test failed" +} + +src_install() { + dobin ${PN} + doman ${PN}.1 + dodoc README.md + + ./rclone genautocomplete bash ${PN}.bash || die + newbashcomp ${PN}.bash ${PN} + + ./rclone genautocomplete zsh ${PN}.zsh || die + insinto /usr/share/zsh/site-functions + newins ${PN}.zsh _${PN} +} diff --git a/net-misc/rclone/rclone-1.66.0-r1.ebuild b/net-misc/rclone/rclone-1.66.0-r1.ebuild new file mode 100644 index 000000000000..b59ebe324c66 --- /dev/null +++ b/net-misc/rclone/rclone-1.66.0-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 check-reqs edo go-module + +DESCRIPTION="A program to sync files to and from various cloud storage providers" +HOMEPAGE="https://rclone.org/ + https://github.com/rclone/rclone/" +SRC_URI=" + https://github.com/rclone/rclone/archive/v${PV}.tar.gz + -> ${P}.tar.gz + https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz +" + +LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + +RDEPEND=" + sys-fs/fuse:3 +" + +CHECKREQS_DISK_BUILD="2500M" + +pkg_setup() { + check-reqs_pkg_setup +} + +src_compile() { + local go_ldflags=" + -X github.com/rclone/rclone/fs.Version=${PV} + " + local -a go_buildargs=( + -ldflags "${go_ldflags}" + -mod=readonly + -o ./ + ) + ego build "${go_buildargs[@]}" . + + edob ./rclone genautocomplete bash "${PN}.bash" + edob ./rclone genautocomplete zsh "${PN}.zsh" +} + +src_test() { + # Setting CI skips unreliable tests, see "fstest/testy/testy.go" + # "TestAddPlugin" and "TestRemovePlugin" fail. + local -x CI="true" + local -x RCLONE_CONFIG="/not_found" + + edob go test -mod=readonly -v -run "!Test.*Plugin" ./... +} + +src_install() { + exeinto /usr/bin + doexe "${PN}" + dosym -r "/usr/bin/${PN}" /usr/bin/mount.rclone + dosym -r "/usr/bin/${PN}" /usr/bin/rclonefs + + newbashcomp "${PN}.bash" "${PN}" + insinto /usr/share/zsh/site-functions + newins "${PN}.zsh" "_${PN}" + + doman "${PN}.1" + einstalldocs +} diff --git a/net-misc/rclone/rclone-9999.ebuild b/net-misc/rclone/rclone-9999.ebuild deleted file mode 100644 index 1066e69c03e7..000000000000 --- a/net-misc/rclone/rclone-9999.ebuild +++ /dev/null @@ -1,835 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit bash-completion-r1 go-module - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/rclone/rclone.git" -else - -EGO_SUM=( - "bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512" - "bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod" - "cloud.google.com/go v0.26.0/go.mod" - "cloud.google.com/go v0.34.0/go.mod" - "cloud.google.com/go v0.38.0/go.mod" - "cloud.google.com/go v0.44.1/go.mod" - "cloud.google.com/go v0.44.2/go.mod" - "cloud.google.com/go v0.45.1/go.mod" - "cloud.google.com/go v0.46.3/go.mod" - "cloud.google.com/go v0.50.0/go.mod" - "cloud.google.com/go v0.52.0/go.mod" - "cloud.google.com/go v0.53.0/go.mod" - "cloud.google.com/go v0.54.0/go.mod" - "cloud.google.com/go v0.56.0" - "cloud.google.com/go v0.56.0/go.mod" - "cloud.google.com/go v0.57.0/go.mod" - "cloud.google.com/go v0.59.0" - "cloud.google.com/go v0.59.0/go.mod" - "cloud.google.com/go/bigquery v1.0.1/go.mod" - "cloud.google.com/go/bigquery v1.3.0/go.mod" - "cloud.google.com/go/bigquery v1.4.0/go.mod" - "cloud.google.com/go/bigquery v1.5.0/go.mod" - "cloud.google.com/go/bigquery v1.7.0/go.mod" - "cloud.google.com/go/bigquery v1.8.0/go.mod" - "cloud.google.com/go/datastore v1.0.0/go.mod" - "cloud.google.com/go/datastore v1.1.0/go.mod" - "cloud.google.com/go/pubsub v1.0.1/go.mod" - "cloud.google.com/go/pubsub v1.1.0/go.mod" - "cloud.google.com/go/pubsub v1.2.0/go.mod" - "cloud.google.com/go/pubsub v1.3.1/go.mod" - "cloud.google.com/go/storage v1.0.0/go.mod" - "cloud.google.com/go/storage v1.5.0/go.mod" - "cloud.google.com/go/storage v1.6.0/go.mod" - "cloud.google.com/go/storage v1.8.0/go.mod" - "dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod" - "github.com/Azure/azure-pipeline-go v0.2.2" - "github.com/Azure/azure-pipeline-go v0.2.2/go.mod" - "github.com/Azure/azure-storage-blob-go v0.10.0" - "github.com/Azure/azure-storage-blob-go v0.10.0/go.mod" - "github.com/Azure/go-autorest/autorest v0.9.0" - "github.com/Azure/go-autorest/autorest v0.9.0/go.mod" - "github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod" - "github.com/Azure/go-autorest/autorest/adal v0.8.3" - "github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod" - "github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod" - "github.com/Azure/go-autorest/autorest/date v0.2.0" - "github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod" - "github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod" - "github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod" - "github.com/Azure/go-autorest/autorest/mocks v0.3.0" - "github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod" - "github.com/Azure/go-autorest/logger v0.1.0" - "github.com/Azure/go-autorest/logger v0.1.0/go.mod" - "github.com/Azure/go-autorest/tracing v0.5.0" - "github.com/Azure/go-autorest/tracing v0.5.0/go.mod" - "github.com/BurntSushi/toml v0.3.1" - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod" - "github.com/OneOfOne/xxhash v1.2.2/go.mod" - "github.com/RoaringBitmap/roaring v0.4.7/go.mod" - "github.com/Unknwon/goconfig v0.0.0-20191126170842-860a72fb44fd" - "github.com/Unknwon/goconfig v0.0.0-20191126170842-860a72fb44fd/go.mod" - "github.com/a8m/tree v0.0.0-20181222104329-6a0b80129de4" - "github.com/a8m/tree v0.0.0-20181222104329-6a0b80129de4/go.mod" - "github.com/aalpar/deheap v0.0.0-20200318053559-9a0c2883bd56" - "github.com/aalpar/deheap v0.0.0-20200318053559-9a0c2883bd56/go.mod" - "github.com/abbot/go-http-auth v0.4.0" - "github.com/abbot/go-http-auth v0.4.0/go.mod" - "github.com/aead/siphash v1.0.1/go.mod" - "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" - "github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod" - "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" - "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod" - "github.com/anacrolix/dms v1.1.0" - "github.com/anacrolix/dms v1.1.0/go.mod" - "github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa/go.mod" - "github.com/anacrolix/envpprof v1.0.0/go.mod" - "github.com/anacrolix/ffprobe v1.0.0/go.mod" - "github.com/anacrolix/missinggo v1.1.0/go.mod" - "github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod" - "github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod" - "github.com/atotto/clipboard v0.1.2" - "github.com/atotto/clipboard v0.1.2/go.mod" - "github.com/aws/aws-sdk-go v1.32.11" - "github.com/aws/aws-sdk-go v1.32.11/go.mod" - "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" - "github.com/beorn7/perks v1.0.0/go.mod" - "github.com/beorn7/perks v1.0.1" - "github.com/beorn7/perks v1.0.1/go.mod" - "github.com/billziss-gh/cgofuse v1.4.0" - "github.com/billziss-gh/cgofuse v1.4.0/go.mod" - "github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod" - "github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod" - "github.com/btcsuite/btcd v0.20.1-beta/go.mod" - "github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod" - "github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod" - "github.com/btcsuite/btcutil v1.0.1" - "github.com/btcsuite/btcutil v1.0.1/go.mod" - "github.com/btcsuite/btcutil v1.0.2" - "github.com/btcsuite/btcutil v1.0.2/go.mod" - "github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod" - "github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod" - "github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod" - "github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod" - "github.com/btcsuite/winsvc v1.0.0/go.mod" - "github.com/calebcase/tmpfile v1.0.2-0.20200602150926-3af473ef8439/go.mod" - "github.com/calebcase/tmpfile v1.0.2" - "github.com/calebcase/tmpfile v1.0.2/go.mod" - "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod" - "github.com/cespare/xxhash v1.1.0" - "github.com/cespare/xxhash v1.1.0/go.mod" - "github.com/cespare/xxhash/v2 v2.1.1" - "github.com/cespare/xxhash/v2 v2.1.1/go.mod" - "github.com/chzyer/logex v1.1.10/go.mod" - "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod" - "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" - "github.com/client9/misspell v0.3.4/go.mod" - "github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod" - "github.com/coreos/bbolt v1.3.2/go.mod" - "github.com/coreos/etcd v3.3.10+incompatible/go.mod" - "github.com/coreos/go-semver v0.2.0/go.mod" - "github.com/coreos/go-semver v0.3.0" - "github.com/coreos/go-semver v0.3.0/go.mod" - "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod" - "github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.0" - "github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod" - "github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" - "github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod" - "github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod" - "github.com/dropbox/dropbox-sdk-go-unofficial v5.6.0+incompatible" - "github.com/dropbox/dropbox-sdk-go-unofficial v5.6.0+incompatible/go.mod" - "github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod" - "github.com/dustin/go-humanize v1.0.0/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.0/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.4/go.mod" - "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod" - "github.com/fsnotify/fsnotify v1.4.7" - "github.com/fsnotify/fsnotify v1.4.7/go.mod" - "github.com/ghodss/yaml v1.0.0/go.mod" - "github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod" - "github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493/go.mod" - "github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod" - "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod" - "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod" - "github.com/go-kit/kit v0.8.0/go.mod" - "github.com/go-kit/kit v0.9.0/go.mod" - "github.com/go-logfmt/logfmt v0.3.0/go.mod" - "github.com/go-logfmt/logfmt v0.4.0/go.mod" - "github.com/go-sql-driver/mysql v1.5.0/go.mod" - "github.com/go-stack/stack v1.8.0/go.mod" - "github.com/gogo/protobuf v1.1.1/go.mod" - "github.com/gogo/protobuf v1.2.1" - "github.com/gogo/protobuf v1.2.1/go.mod" - "github.com/gogo/protobuf v1.3.1" - "github.com/gogo/protobuf v1.3.1/go.mod" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" - "github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod" - "github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod" - "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod" - "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e" - "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod" - "github.com/golang/mock v1.1.1/go.mod" - "github.com/golang/mock v1.2.0/go.mod" - "github.com/golang/mock v1.3.1/go.mod" - "github.com/golang/mock v1.4.0/go.mod" - "github.com/golang/mock v1.4.1/go.mod" - "github.com/golang/mock v1.4.3/go.mod" - "github.com/golang/protobuf v1.2.0/go.mod" - "github.com/golang/protobuf v1.3.1/go.mod" - "github.com/golang/protobuf v1.3.2/go.mod" - "github.com/golang/protobuf v1.3.3/go.mod" - "github.com/golang/protobuf v1.3.4/go.mod" - "github.com/golang/protobuf v1.3.5/go.mod" - "github.com/golang/protobuf v1.4.0-rc.1/go.mod" - "github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod" - "github.com/golang/protobuf v1.4.0-rc.2/go.mod" - "github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod" - "github.com/golang/protobuf v1.4.0/go.mod" - "github.com/golang/protobuf v1.4.1/go.mod" - "github.com/golang/protobuf v1.4.2" - "github.com/golang/protobuf v1.4.2/go.mod" - "github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod" - "github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod" - "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" - "github.com/google/btree v1.0.0/go.mod" - "github.com/google/go-cmp v0.2.0/go.mod" - "github.com/google/go-cmp v0.3.0/go.mod" - "github.com/google/go-cmp v0.3.1/go.mod" - "github.com/google/go-cmp v0.4.0/go.mod" - "github.com/google/go-cmp v0.4.1/go.mod" - "github.com/google/go-cmp v0.5.0" - "github.com/google/go-cmp v0.5.0/go.mod" - "github.com/google/go-querystring v1.0.0" - "github.com/google/go-querystring v1.0.0/go.mod" - "github.com/google/gofuzz v1.0.0/go.mod" - "github.com/google/martian v2.1.0+incompatible/go.mod" - "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod" - "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod" - "github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod" - "github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod" - "github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod" - "github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod" - "github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod" - "github.com/google/renameio v0.1.0/go.mod" - "github.com/google/uuid v1.1.1" - "github.com/google/uuid v1.1.1/go.mod" - "github.com/googleapis/gax-go/v2 v2.0.4/go.mod" - "github.com/googleapis/gax-go/v2 v2.0.5" - "github.com/googleapis/gax-go/v2 v2.0.5/go.mod" - "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod" - "github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e" - "github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod" - "github.com/gorilla/websocket v1.4.0/go.mod" - "github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod" - "github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod" - "github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod" - "github.com/hanwen/go-fuse v1.0.0" - "github.com/hanwen/go-fuse v1.0.0/go.mod" - "github.com/hanwen/go-fuse/v2 v2.0.3" - "github.com/hanwen/go-fuse/v2 v2.0.3/go.mod" - "github.com/hashicorp/golang-lru v0.5.0/go.mod" - "github.com/hashicorp/golang-lru v0.5.1/go.mod" - "github.com/hashicorp/hcl v1.0.0/go.mod" - "github.com/hpcloud/tail v1.0.0" - "github.com/hpcloud/tail v1.0.0/go.mod" - "github.com/huandu/xstrings v1.0.0/go.mod" - "github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod" - "github.com/inconshreveable/mousetrap v1.0.0" - "github.com/inconshreveable/mousetrap v1.0.0/go.mod" - "github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod" - "github.com/jlaffaye/ftp v0.0.0-20190624084859-c1312a7102bf/go.mod" - "github.com/jlaffaye/ftp v0.0.0-20200720194710-13949d38913e" - "github.com/jlaffaye/ftp v0.0.0-20200720194710-13949d38913e/go.mod" - "github.com/jmespath/go-jmespath v0.3.0" - "github.com/jmespath/go-jmespath v0.3.0/go.mod" - "github.com/jonboulle/clockwork v0.1.0/go.mod" - "github.com/jrick/logrotate v1.0.0/go.mod" - "github.com/json-iterator/go v1.1.6/go.mod" - "github.com/json-iterator/go v1.1.10" - "github.com/json-iterator/go v1.1.10/go.mod" - "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod" - "github.com/jstemmer/go-junit-report v0.9.1/go.mod" - "github.com/jtolds/gls v4.2.1+incompatible/go.mod" - "github.com/jtolds/gls v4.20.0+incompatible" - "github.com/jtolds/gls v4.20.0+incompatible/go.mod" - "github.com/julienschmidt/httprouter v1.2.0/go.mod" - "github.com/jzelinskie/whirlpool v0.0.0-20170603002051-c19460b8caa6" - "github.com/jzelinskie/whirlpool v0.0.0-20170603002051-c19460b8caa6/go.mod" - "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0" - "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod" - "github.com/kisielk/errcheck v1.1.0/go.mod" - "github.com/kisielk/errcheck v1.2.0/go.mod" - "github.com/kisielk/gotool v1.0.0/go.mod" - "github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod" - "github.com/klauspost/compress v1.10.11" - "github.com/klauspost/compress v1.10.11/go.mod" - "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" - "github.com/konsorten/go-windows-terminal-sequences v1.0.3" - "github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod" - "github.com/koofr/go-httpclient v0.0.0-20200420163713-93aa7c75b348" - "github.com/koofr/go-httpclient v0.0.0-20200420163713-93aa7c75b348/go.mod" - "github.com/koofr/go-koofrclient v0.0.0-20190724113126-8e5366da203a" - "github.com/koofr/go-koofrclient v0.0.0-20190724113126-8e5366da203a/go.mod" - "github.com/kr/fs v0.1.0" - "github.com/kr/fs v0.1.0/go.mod" - "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348" - "github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod" - "github.com/magiconair/properties v1.8.0/go.mod" - "github.com/mattn/go-colorable v0.1.7" - "github.com/mattn/go-colorable v0.1.7/go.mod" - "github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d" - "github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod" - "github.com/mattn/go-ieproxy v0.0.1" - "github.com/mattn/go-ieproxy v0.0.1/go.mod" - "github.com/mattn/go-isatty v0.0.12" - "github.com/mattn/go-isatty v0.0.12/go.mod" - "github.com/mattn/go-runewidth v0.0.9" - "github.com/mattn/go-runewidth v0.0.9/go.mod" - "github.com/matttproud/golang_protobuf_extensions v1.0.1" - "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" - "github.com/minio/minio-go/v6 v6.0.46" - "github.com/minio/minio-go/v6 v6.0.46/go.mod" - "github.com/minio/sha256-simd v0.1.1" - "github.com/minio/sha256-simd v0.1.1/go.mod" - "github.com/mitchellh/go-homedir v1.1.0" - "github.com/mitchellh/go-homedir v1.1.0/go.mod" - "github.com/mitchellh/mapstructure v1.1.2/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd" - "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" - "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" - "github.com/modern-go/reflect2 v1.0.1" - "github.com/modern-go/reflect2 v1.0.1/go.mod" - "github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod" - "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod" - "github.com/ncw/go-acd v0.0.0-20171120105400-887eb06ab6a2" - "github.com/ncw/go-acd v0.0.0-20171120105400-887eb06ab6a2/go.mod" - "github.com/ncw/swift v1.0.52" - "github.com/ncw/swift v1.0.52/go.mod" - "github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod" - "github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1" - "github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1/go.mod" - "github.com/oklog/ulid v1.3.1/go.mod" - "github.com/okzk/sdnotify v0.0.0-20180710141335-d9becc38acbd" - "github.com/okzk/sdnotify v0.0.0-20180710141335-d9becc38acbd/go.mod" - "github.com/onsi/ginkgo v1.6.0/go.mod" - "github.com/onsi/ginkgo v1.7.0/go.mod" - "github.com/onsi/ginkgo v1.12.0" - "github.com/onsi/ginkgo v1.12.0/go.mod" - "github.com/onsi/gomega v1.4.3/go.mod" - "github.com/onsi/gomega v1.7.1/go.mod" - "github.com/onsi/gomega v1.9.0" - "github.com/onsi/gomega v1.9.0/go.mod" - "github.com/patrickmn/go-cache v2.1.0+incompatible" - "github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod" - "github.com/pelletier/go-toml v1.2.0/go.mod" - "github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14" - "github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14/go.mod" - "github.com/philhofer/fwd v1.0.0/go.mod" - "github.com/pkg/errors v0.8.0/go.mod" - "github.com/pkg/errors v0.8.1/go.mod" - "github.com/pkg/errors v0.9.1" - "github.com/pkg/errors v0.9.1/go.mod" - "github.com/pkg/sftp v1.11.0" - "github.com/pkg/sftp v1.11.0/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/prometheus/client_golang v0.9.1/go.mod" - "github.com/prometheus/client_golang v0.9.3/go.mod" - "github.com/prometheus/client_golang v1.0.0/go.mod" - "github.com/prometheus/client_golang v1.7.1" - "github.com/prometheus/client_golang v1.7.1/go.mod" - "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" - "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod" - "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod" - "github.com/prometheus/client_model v0.2.0" - "github.com/prometheus/client_model v0.2.0/go.mod" - "github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod" - "github.com/prometheus/common v0.4.0/go.mod" - "github.com/prometheus/common v0.4.1/go.mod" - "github.com/prometheus/common v0.10.0" - "github.com/prometheus/common v0.10.0/go.mod" - "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod" - "github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod" - "github.com/prometheus/procfs v0.0.2/go.mod" - "github.com/prometheus/procfs v0.1.3" - "github.com/prometheus/procfs v0.1.3/go.mod" - "github.com/prometheus/tsdb v0.7.1/go.mod" - "github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8" - "github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8/go.mod" - "github.com/rfjakob/eme v1.1.1" - "github.com/rfjakob/eme v1.1.1/go.mod" - "github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod" - "github.com/rogpeppe/go-internal v1.3.0/go.mod" - "github.com/russross/blackfriday/v2 v2.0.1" - "github.com/russross/blackfriday/v2 v2.0.1/go.mod" - "github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod" - "github.com/sevlyar/go-daemon v0.1.5" - "github.com/sevlyar/go-daemon v0.1.5/go.mod" - "github.com/shurcooL/sanitized_anchor_name v1.0.0" - "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod" - "github.com/sirupsen/logrus v1.2.0/go.mod" - "github.com/sirupsen/logrus v1.4.2/go.mod" - "github.com/sirupsen/logrus v1.6.0" - "github.com/sirupsen/logrus v1.6.0/go.mod" - "github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966" - "github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod" - "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d" - "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod" - "github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod" - "github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a" - "github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod" - "github.com/soheilhy/cmux v0.1.4/go.mod" - "github.com/spacemonkeygo/monkit/v3 v3.0.4/go.mod" - "github.com/spacemonkeygo/monkit/v3 v3.0.5/go.mod" - "github.com/spacemonkeygo/monkit/v3 v3.0.7-0.20200515175308-072401d8c752" - "github.com/spacemonkeygo/monkit/v3 v3.0.7-0.20200515175308-072401d8c752/go.mod" - "github.com/spacemonkeygo/monotime v0.0.0-20180824235756-e3f48a95f98a/go.mod" - "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" - "github.com/spf13/afero v1.1.2/go.mod" - "github.com/spf13/cast v1.3.0/go.mod" - "github.com/spf13/cobra v1.0.0" - "github.com/spf13/cobra v1.0.0/go.mod" - "github.com/spf13/jwalterweatherman v1.0.0/go.mod" - "github.com/spf13/pflag v1.0.3/go.mod" - "github.com/spf13/pflag v1.0.5" - "github.com/spf13/pflag v1.0.5/go.mod" - "github.com/spf13/viper v1.4.0/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/objx v0.1.1/go.mod" - "github.com/stretchr/testify v1.2.1/go.mod" - "github.com/stretchr/testify v1.2.2/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709/go.mod" - "github.com/stretchr/testify v1.4.0/go.mod" - "github.com/stretchr/testify v1.5.1/go.mod" - "github.com/stretchr/testify v1.6.1" - "github.com/stretchr/testify v1.6.1/go.mod" - "github.com/t3rm1n4l/go-mega v0.0.0-20200416171014-ffad7fcb44b8" - "github.com/t3rm1n4l/go-mega v0.0.0-20200416171014-ffad7fcb44b8/go.mod" - "github.com/tinylib/msgp v1.0.2/go.mod" - "github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod" - "github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c" - "github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod" - "github.com/ugorji/go v1.1.4/go.mod" - "github.com/vivint/infectious v0.0.0-20200605153912-25a574ae18a3" - "github.com/vivint/infectious v0.0.0-20200605153912-25a574ae18a3/go.mod" - "github.com/willf/bitset v1.1.9/go.mod" - "github.com/xanzy/ssh-agent v0.2.1" - "github.com/xanzy/ssh-agent v0.2.1/go.mod" - "github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod" - "github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod" - "github.com/youmark/pkcs8 v0.0.0-20200520070018-fad002e585ce" - "github.com/youmark/pkcs8 v0.0.0-20200520070018-fad002e585ce/go.mod" - "github.com/yuin/goldmark v1.1.25/go.mod" - "github.com/yuin/goldmark v1.1.27/go.mod" - "github.com/yuin/goldmark v1.1.32/go.mod" - "github.com/yunify/qingstor-sdk-go/v3 v3.2.0" - "github.com/yunify/qingstor-sdk-go/v3 v3.2.0/go.mod" - "github.com/zeebo/admission/v3 v3.0.1/go.mod" - "github.com/zeebo/assert v1.1.0" - "github.com/zeebo/assert v1.1.0/go.mod" - "github.com/zeebo/errs v1.2.2" - "github.com/zeebo/errs v1.2.2/go.mod" - "github.com/zeebo/float16 v0.1.0/go.mod" - "github.com/zeebo/incenc v0.0.0-20180505221441-0d92902eec54/go.mod" - "go.etcd.io/bbolt v1.3.2/go.mod" - "go.etcd.io/bbolt v1.3.5" - "go.etcd.io/bbolt v1.3.5/go.mod" - "go.opencensus.io v0.21.0/go.mod" - "go.opencensus.io v0.22.0/go.mod" - "go.opencensus.io v0.22.2/go.mod" - "go.opencensus.io v0.22.3" - "go.opencensus.io v0.22.3/go.mod" - "go.opencensus.io v0.22.4" - "go.opencensus.io v0.22.4/go.mod" - "go.uber.org/atomic v1.4.0" - "go.uber.org/atomic v1.4.0/go.mod" - "go.uber.org/atomic v1.6.0" - "go.uber.org/atomic v1.6.0/go.mod" - "go.uber.org/multierr v1.1.0" - "go.uber.org/multierr v1.1.0/go.mod" - "go.uber.org/multierr v1.5.0" - "go.uber.org/multierr v1.5.0/go.mod" - "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee" - "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod" - "go.uber.org/zap v1.10.0" - "go.uber.org/zap v1.10.0/go.mod" - "go.uber.org/zap v1.15.0" - "go.uber.org/zap v1.15.0/go.mod" - "goftp.io/server v0.4.0" - "goftp.io/server v0.4.0/go.mod" - "golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod" - "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod" - "golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613/go.mod" - "golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod" - "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" - "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod" - "golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod" - "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod" - "golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod" - "golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod" - "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod" - "golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod" - "golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod" - "golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod" - "golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod" - "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9" - "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod" - "golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899" - "golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod" - "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" - "golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod" - "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod" - "golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod" - "golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod" - "golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod" - "golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod" - "golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod" - "golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod" - "golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod" - "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod" - "golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod" - "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" - "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" - "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod" - "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" - "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod" - "golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod" - "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod" - "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod" - "golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod" - "golang.org/x/lint v0.0.0-20200302205851-738671d3881b" - "golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod" - "golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod" - "golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod" - "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod" - "golang.org/x/mod v0.1.0/go.mod" - "golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod" - "golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod" - "golang.org/x/mod v0.2.0/go.mod" - "golang.org/x/mod v0.3.0" - "golang.org/x/mod v0.3.0/go.mod" - "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" - "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" - "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" - "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod" - "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod" - "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod" - "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod" - "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" - "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" - "golang.org/x/net v0.0.0-20190415214537-1da14a5a36f2/go.mod" - "golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod" - "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" - "golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod" - "golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod" - "golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod" - "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" - "golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod" - "golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod" - "golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod" - "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod" - "golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod" - "golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod" - "golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod" - "golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod" - "golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod" - "golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod" - "golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod" - "golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod" - "golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod" - "golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod" - "golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod" - "golang.org/x/net v0.0.0-20200707034311-ab3426394381" - "golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod" - "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" - "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod" - "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod" - "golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod" - "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d" - "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod" - "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" - "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" - "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" - "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" - "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" - "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod" - "golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208" - "golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod" - "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" - "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" - "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" - "golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod" - "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod" - "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" - "golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod" - "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod" - "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" - "golang.org/x/sys v0.0.0-20190415145633-3fd5a3612ccd/go.mod" - "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" - "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" - "golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod" - "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod" - "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod" - "golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod" - "golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod" - "golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod" - "golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod" - "golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod" - "golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod" - "golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod" - "golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod" - "golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod" - "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" - "golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod" - "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod" - "golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod" - "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod" - "golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod" - "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" - "golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod" - "golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod" - "golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod" - "golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod" - "golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod" - "golang.org/x/sys v0.0.0-20200610111108-226ff32320da/go.mod" - "golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod" - "golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666" - "golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666/go.mod" - "golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod" - "golang.org/x/text v0.3.2/go.mod" - "golang.org/x/text v0.3.3" - "golang.org/x/text v0.3.3/go.mod" - "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod" - "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" - "golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod" - "golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1" - "golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod" - "golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod" - "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" - "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" - "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" - "golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod" - "golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod" - "golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod" - "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod" - "golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod" - "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" - "golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod" - "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod" - "golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod" - "golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod" - "golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod" - "golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod" - "golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod" - "golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod" - "golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod" - "golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod" - "golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod" - "golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod" - "golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod" - "golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod" - "golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod" - "golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod" - "golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod" - "golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod" - "golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod" - "golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod" - "golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod" - "golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod" - "golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod" - "golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod" - "golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod" - "golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod" - "golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod" - "golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod" - "golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod" - "golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa" - "golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod" - "golang.org/x/tools v0.0.0-20200820180210-c8f393745106" - "golang.org/x/tools v0.0.0-20200820180210-c8f393745106/go.mod" - "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" - "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" - "google.golang.org/api v0.4.0/go.mod" - "google.golang.org/api v0.7.0/go.mod" - "google.golang.org/api v0.8.0/go.mod" - "google.golang.org/api v0.9.0/go.mod" - "google.golang.org/api v0.13.0/go.mod" - "google.golang.org/api v0.14.0/go.mod" - "google.golang.org/api v0.15.0/go.mod" - "google.golang.org/api v0.17.0/go.mod" - "google.golang.org/api v0.18.0/go.mod" - "google.golang.org/api v0.19.0/go.mod" - "google.golang.org/api v0.20.0/go.mod" - "google.golang.org/api v0.22.0/go.mod" - "google.golang.org/api v0.24.0/go.mod" - "google.golang.org/api v0.28.0" - "google.golang.org/api v0.28.0/go.mod" - "google.golang.org/appengine v1.1.0/go.mod" - "google.golang.org/appengine v1.4.0/go.mod" - "google.golang.org/appengine v1.5.0/go.mod" - "google.golang.org/appengine v1.6.1/go.mod" - "google.golang.org/appengine v1.6.5" - "google.golang.org/appengine v1.6.5/go.mod" - "google.golang.org/appengine v1.6.6" - "google.golang.org/appengine v1.6.6/go.mod" - "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" - "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod" - "google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod" - "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" - "google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod" - "google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod" - "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" - "google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod" - "google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod" - "google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod" - "google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod" - "google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod" - "google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod" - "google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod" - "google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod" - "google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod" - "google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod" - "google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod" - "google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod" - "google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod" - "google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940" - "google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod" - "google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod" - "google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod" - "google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod" - "google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod" - "google.golang.org/genproto v0.0.0-20200623002339-fbb79eadd5eb/go.mod" - "google.golang.org/genproto v0.0.0-20200626011028-ee7919e894b5" - "google.golang.org/genproto v0.0.0-20200626011028-ee7919e894b5/go.mod" - "google.golang.org/grpc v1.19.0/go.mod" - "google.golang.org/grpc v1.20.1/go.mod" - "google.golang.org/grpc v1.21.0/go.mod" - "google.golang.org/grpc v1.21.1/go.mod" - "google.golang.org/grpc v1.23.0/go.mod" - "google.golang.org/grpc v1.25.1/go.mod" - "google.golang.org/grpc v1.26.0/go.mod" - "google.golang.org/grpc v1.27.0/go.mod" - "google.golang.org/grpc v1.27.1/go.mod" - "google.golang.org/grpc v1.28.0" - "google.golang.org/grpc v1.28.0/go.mod" - "google.golang.org/grpc v1.29.1/go.mod" - "google.golang.org/grpc v1.30.0" - "google.golang.org/grpc v1.30.0/go.mod" - "google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod" - "google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod" - "google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod" - "google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod" - "google.golang.org/protobuf v1.21.0/go.mod" - "google.golang.org/protobuf v1.22.0/go.mod" - "google.golang.org/protobuf v1.23.0" - "google.golang.org/protobuf v1.23.0/go.mod" - "google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod" - "google.golang.org/protobuf v1.24.0/go.mod" - "google.golang.org/protobuf v1.25.0" - "google.golang.org/protobuf v1.25.0/go.mod" - "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/errgo.v2 v2.1.0/go.mod" - "gopkg.in/fsnotify.v1 v1.4.7" - "gopkg.in/fsnotify.v1 v1.4.7/go.mod" - "gopkg.in/ini.v1 v1.42.0" - "gopkg.in/ini.v1 v1.42.0/go.mod" - "gopkg.in/resty.v1 v1.12.0/go.mod" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" - "gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod" - "gopkg.in/yaml.v2 v2.2.1/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.4/go.mod" - "gopkg.in/yaml.v2 v2.2.5/go.mod" - "gopkg.in/yaml.v2 v2.3.0" - "gopkg.in/yaml.v2 v2.3.0/go.mod" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" - "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776" - "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod" - "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" - "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod" - "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod" - "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" - "honnef.co/go/tools v0.0.1-2019.2.3/go.mod" - "honnef.co/go/tools v0.0.1-2020.1.3/go.mod" - "honnef.co/go/tools v0.0.1-2020.1.4" - "honnef.co/go/tools v0.0.1-2020.1.4/go.mod" - "rsc.io/binaryregexp v0.2.0/go.mod" - "rsc.io/quote/v3 v3.1.0/go.mod" - "rsc.io/sampler v1.3.0/go.mod" - "storj.io/common v0.0.0-20200729140050-4c1ddac6fa63" - "storj.io/common v0.0.0-20200729140050-4c1ddac6fa63/go.mod" - "storj.io/drpc v0.0.14" - "storj.io/drpc v0.0.14/go.mod" - "storj.io/uplink v1.2.0" - "storj.io/uplink v1.2.0/go.mod" - ) -go-module_set_globals - - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - SRC_URI="https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" -fi - -DESCRIPTION="A program to sync files to and from various cloud storage providers" -HOMEPAGE="https://rclone.org/" - -LICENSE="Apache-2.0 BSD BSD-2 ISC MIT" -SLOT="0" -IUSE="" - -src_unpack() { - if [[ ${PV} == *9999 ]]; then - git-r3_src_unpack - go-module_live_vendor - else - go-module_src_unpack - fi -} - -src_compile() { - go build -mod=mod . || die "compile failed" -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - dodoc README.md - - ./rclone genautocomplete bash ${PN}.bash || die - newbashcomp ${PN}.bash ${PN} - - ./rclone genautocomplete zsh ${PN}.zsh || die - insinto /usr/share/zsh/site-functions - newins ${PN}.zsh _${PN} -} diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest index 412fbf81d9c1..14681570b96b 100644 --- a/net-misc/rdate/Manifest +++ b/net-misc/rdate/Manifest @@ -1,2 +1,3 @@ +DIST rdate-1.10.2.tar.gz 19839 BLAKE2B d51ff68303a05abd8049abebafd76a01d8dedff6a294057640989989f851f1b381d75f2ad7ab94a850de76c485340770e06cf086225d641a2fee6d43112b473f SHA512 6e3759e73c05532b54f004592989572f78a0cfef7a2af1ae33708c9d239b63203702466664d39701afbc0012ff53fbf0bc3917ad8bb3df3322c4b613fd2e8aba DIST rdate-1.10.tar.gz 19159 BLAKE2B 71c858b5eb10b07a2974fcb463a91808fc59582dfce786dc936370b3fc2122bfe72cc32cb3635a1e77ec663fd44712852ab85d8ba46702d1e222ec63ad46f3bb SHA512 7a7647102b5663218fff6c1364b83250a199a0169adf40db87a49709aa24c3b1fae5acf01732d5432fcb2883d29a24b2ae38cf5333ff75075e5d7a6fd90e7146 -DIST rdate-1.4.tar.gz 11500 BLAKE2B 705324648f30685135d3ba3936b05a82bc6a027d3d1c407950cb7631858f6d9dba34f97f065482988caf4a68addc3ba122fe475cfd1684c526f5224113657ac3 SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996 +DIST rdate-1.11.tar.gz 20210 BLAKE2B 0ff4abebe08f33b45c753dd2912c36e3895c1745b2d78340c7574116f50cd4d05364c5bee97e883b7ad587fcd5261931d928689cd583aa86b43aac408d2a4a6d SHA512 916952c26cdd51c8666bf62cdd823cf8a07fd4487fbf73213d529525b31a90f056120ea2ff16e6d37ea7c662853ba3c15789fef90724b2dbf17c21a6ff3f415d diff --git a/net-misc/rdate/files/rdate-1.10.2-fix-musl-compat-stdint.patch b/net-misc/rdate/files/rdate-1.10.2-fix-musl-compat-stdint.patch new file mode 100644 index 000000000000..a6ff70b353d5 --- /dev/null +++ b/net-misc/rdate/files/rdate-1.10.2-fix-musl-compat-stdint.patch @@ -0,0 +1,180 @@ +https://github.com/resurrecting-open-source-projects/openrdate/pull/3 + +From: Sam James <sam@gentoo.org> +Date: Thu, 3 Feb 2022 09:23:35 +0000 +Subject: [PATCH] Use <stdint.h> to fix musl compatibility + +uint32_t and friends are provided by <stdint.h> and the types +previously being relied on are non-standard, so let's swap. + +This fixes building rdate on e.g. musl rather than glibc. + +Bug: https://bugs.gentoo.org/832554 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/src/ntp.c ++++ b/src/ntp.c +@@ -52,6 +52,7 @@ + #include <netdb.h> + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + #include <string.h> + #include <time.h> + #include <unistd.h> +@@ -106,11 +107,11 @@ struct ntp_data { + double receive; + double transmit; + double current; +- u_int64_t recvck; ++ uint64_t recvck; + + /* Local State */ + double originate; +- u_int64_t xmitck; ++ uint64_t xmitck; + }; + + void ntp_client(const char *, int, struct timeval *, struct timeval *, int, int, int); +@@ -282,7 +283,7 @@ write_packet(int fd, struct ntp_data *data) + + packet[0] = (NTP_VERSION << 3) | (NTP_MODE_CLIENT); + +- data->xmitck = (u_int64_t)arc4random() << 32 | arc4random(); ++ data->xmitck = (uint64_t)arc4random() << 32 | arc4random(); + + /* + * Send out a random 64-bit number as our transmit time. The NTP +@@ -300,7 +301,7 @@ write_packet(int fd, struct ntp_data *data) + * the transmit field intelligible. + */ + +- *(u_int64_t *)(packet + NTP_TRANSMIT) = data->xmitck; ++ *(uint64_t *)(packet + NTP_TRANSMIT) = data->xmitck; + + data->originate = current_time(JAN_1970); + +@@ -453,7 +454,7 @@ double + current_time(double offset) + { + struct timeval current; +- u_int64_t t; ++ uint64_t t; + + if (gettimeofday(¤t, NULL)) + err(1, "Could not get local time of day"); +--- a/src/ntpleaps.c ++++ b/src/ntpleaps.c +@@ -45,12 +45,13 @@ + #include <fcntl.h> + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + #include <string.h> + #include <unistd.h> + + #include "ntpleaps.h" + +-static u_int64_t *leapsecs; ++static uint64_t *leapsecs; + static unsigned int leapsecs_num; + + +@@ -81,10 +82,10 @@ ntpleaps_init(void) + } + + int +-ntpleaps_sub(u_int64_t *t) ++ntpleaps_sub(uint64_t *t) + { + unsigned int i = 0; +- u_int64_t u; ++ uint64_t u; + int r = 1; + + if (ntpleaps_init() == -1) +@@ -105,10 +106,10 @@ ntpleaps_sub(u_int64_t *t) + return (r); + } + +-u_int32_t +-read_be_dword(u_int8_t *ptr) ++uint32_t ++read_be_dword(uint8_t *ptr) + { +- u_int32_t res; ++ uint32_t res; + + memcpy(&res, ptr, 4); + return (ntohl(res)); +@@ -120,10 +121,10 @@ ntpleaps_read(void) + { + int fd; + unsigned int r; +- u_int8_t buf[32]; +- u_int32_t m1, m2, m3; +- u_int64_t s; +- u_int64_t *l; ++ uint8_t buf[32]; ++ uint32_t m1, m2, m3; ++ uint64_t s; ++ uint64_t *l; + + fd = open("/usr/share/zoneinfo/right/UTC", O_RDONLY | O_NDELAY); + if (fd == -1) +@@ -153,7 +154,7 @@ ntpleaps_read(void) + close(fd); + return (-1); + } +- if ((l = (u_int64_t *)malloc(r << 3)) == NULL) { ++ if ((l = (uint64_t *)malloc(r << 3)) == NULL) { + close(fd); + return (-1); + } +--- a/src/ntpleaps.h ++++ b/src/ntpleaps.h +@@ -46,11 +46,13 @@ + #ifndef _NTPLEAPS_H + #define _NTPLEAPS_H + ++#include <stdint.h> ++ + /* Offset between struct timeval.tv_sec and a tai64_t */ + #define NTPLEAPS_OFFSET (4611686018427387914ULL) + + /* Hide this ugly value from programmes */ +-#define SEC_TO_TAI64(s) (NTPLEAPS_OFFSET + (u_int64_t)(s)) ++#define SEC_TO_TAI64(s) (NTPLEAPS_OFFSET + (uint64_t)(s)) + #define TAI64_TO_SEC(t) ((t) - NTPLEAPS_OFFSET) + + /* Initializes the leap second table. Does not need to be called +@@ -70,6 +72,6 @@ int ntpleaps_read(void); + * to posix clock tick time. + * returns 0 on success, -1 on error (time is unchanged), 1 on leap second + */ +-int ntpleaps_sub(u_int64_t *); ++int ntpleaps_sub(uint64_t *); + + #endif +--- a/src/rfc868time.c ++++ b/src/rfc868time.c +@@ -50,6 +50,7 @@ + #include <stdio.h> + #include <ctype.h> + #include <err.h> ++#include <stdint.h> + #include <string.h> + #include <netdb.h> + #include <unistd.h> +@@ -68,10 +69,10 @@ rfc868time_client (const char *hostname, int family, struct timeval *new, + { + struct addrinfo hints, *res0, *res; + struct timeval old; +- u_int32_t tim; /* RFC 868 states clearly this is an uint32 */ ++ uint32_t tim; /* RFC 868 states clearly this is an uint32 */ + int s; + int error; +- u_int64_t td; ++ uint64_t td; + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = family; diff --git a/net-misc/rdate/files/rdate-1.10.2-respect-AR.patch b/net-misc/rdate/files/rdate-1.10.2-respect-AR.patch new file mode 100644 index 000000000000..05289f3453c9 --- /dev/null +++ b/net-misc/rdate/files/rdate-1.10.2-respect-AR.patch @@ -0,0 +1,40 @@ +https://github.com/resurrecting-open-source-projects/openrdate/pull/4 + +From: Sam James <sam@gentoo.org> +Date: Thu, 3 Feb 2022 09:30:53 +0000 +Subject: [PATCH] Respect AR from environment + +Detect `AR` from the environment (first the AR environment variable, but +failing that, ${CHOST}-ar). This allows using different toolchains (e.g. +Clang and LLVM's tooling) and also facilitates cross-compilation. + +Bug: https://bugs.gentoo.org/729998 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -11,6 +11,8 @@ AC_CONFIG_SRCDIR([src/rdate.c]) + AC_CONFIG_HEADERS([config.h]) + AC_ARG_VAR([kernel_version], [the version of the kernel to build against]) + ++AC_CANONICAL_HOST ++ + # Checks for programs. + AC_PROG_CC + +@@ -22,6 +24,8 @@ AC_PROG_INSTALL + AC_PROG_RANLIB + AC_PROG_EGREP + ++AM_PROG_AR ++ + # Checks for libraries. + AC_CHECK_LIB([c], [fork]) + AC_CHECK_LIB([util], [malloc]) +@@ -52,7 +56,6 @@ AC_CHECK_FUNCS([gettimeofday memset select socket]) + AC_PATH_PROG([UNAME], [uname], + [:]) + +-AC_CANONICAL_HOST + # Determine the particulars of the host + case "${host}" in + *-*-linux*) diff --git a/net-misc/rdate/rdate-1.10.2.ebuild b/net-misc/rdate/rdate-1.10.2.ebuild new file mode 100644 index 000000000000..f64d1f48a116 --- /dev/null +++ b/net-misc/rdate/rdate-1.10.2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="openrdate" + +inherit autotools + +DESCRIPTION="Use TCP or UDP to retrieve the current time of another machine" +HOMEPAGE="https://github.com/resurrecting-open-source-projects/openrdate" +SRC_URI="https://github.com/resurrecting-open-source-projects/${MY_P}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}-${PV}" + +LICENSE="BSD-4" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86" + +DEPEND="dev-libs/libbsd" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.2-fix-musl-compat-stdint.patch + "${FILESDIR}"/${PN}-1.10.2-respect-AR.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_install() { + default + + newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate + newconfd "${FILESDIR}"/rdate-confd rdate +} diff --git a/net-misc/rdate/rdate-1.11.ebuild b/net-misc/rdate/rdate-1.11.ebuild new file mode 100644 index 000000000000..8f015a7c25e8 --- /dev/null +++ b/net-misc/rdate/rdate-1.11.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="openrdate" + +inherit autotools + +DESCRIPTION="Use TCP or UDP to retrieve the current time of another machine" +HOMEPAGE="https://github.com/resurrecting-open-source-projects/openrdate" +SRC_URI="https://github.com/resurrecting-open-source-projects/${MY_P}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}-${PV}" + +LICENSE="BSD-4" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" + +DEPEND="dev-libs/libbsd" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + eautoreconf +} + +src_install() { + default + + newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate + newconfd "${FILESDIR}"/rdate-confd rdate +} diff --git a/net-misc/rdate/rdate-1.4-r4.ebuild b/net-misc/rdate/rdate-1.4-r4.ebuild deleted file mode 100644 index 8e279dfd9bfd..000000000000 --- a/net-misc/rdate/rdate-1.4-r4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="use TCP or UDP to retrieve the current time of another machine" -HOMEPAGE="http://www.apps.ietf.org/rfc/rfc868.html" -SRC_URI="ftp://people.redhat.com/sopwith/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="ipv6" - -DEPEND="" - -src_prepare() { - sed -i \ - -e '/^CFLAGS=/d' \ - -e '/^rdate: /,+1d' \ - -e '/\tinstall/s:\([^ ]\+\)$:$(DESTDIR)&:' \ - Makefile || die "Sed failed!" -} - -src_compile() { - use ipv6 && append-cppflags "-DINET6" - tc-export CC - emake -} - -src_install() { - emake DESTDIR="${D}" install - newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate - newconfd "${FILESDIR}"/rdate-confd rdate -} diff --git a/net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch b/net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch new file mode 100644 index 000000000000..7222fdbb1e46 --- /dev/null +++ b/net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/900310 +https://github.com/rdesktop/rdesktop/pull/407 + +From 0a38f855c2f6bb197539fbb9ec0ce5a97775a178 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Tue, 18 Apr 2023 09:55:39 +0200 +Subject: [PATCH] configure.ac: Fix statvfs64 check for C99 compatibility + +C99 does not support implicit ints and implicit function declarations +(such as exit here). Avoid them, so that the configure check does +not fail unconditionally with such compilers. +--- a/configure.ac ++++ b/configure.ac +@@ -668,12 +668,13 @@ if test $space = no; then + # SVR4 + AC_CACHE_CHECK([statvfs64 function (SVR4)], fu_cv_sys_stat_statvfs64, + [AC_TRY_RUN([ ++#include <stdlib.h> + #if defined(HAVE_UNISTD_H) + #include <unistd.h> + #endif + #include <sys/types.h> + #include <sys/statvfs.h> +- main () ++ int main (void) + { + struct statvfs64 fsd; + exit (statvfs64 (".", &fsd)); diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml index 78d68487d7b8..ae7d2ea19dd6 100644 --- a/net-misc/rdesktop/metadata.xml +++ b/net-misc/rdesktop/metadata.xml @@ -15,5 +15,6 @@ </use> <upstream> <remote-id type="sourceforge">rdesktop</remote-id> + <remote-id type="github">rdesktop/rdesktop</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/rdesktop/rdesktop-1.9.0-r1.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r1.ebuild deleted file mode 100644 index 7365519e21fb..000000000000 --- a/net-misc/rdesktop/rdesktop-1.9.0-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -MY_PV=${PV/_/-} - -DESCRIPTION="A Remote Desktop Protocol Client" -HOMEPAGE="http://www.rdesktop.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr" - -S=${WORKDIR}/${PN}-${MY_PV} - -RDEPEND=" - dev-libs/nettle:0= - >=net-libs/gnutls-3.2.0:0= - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXau - x11-libs/libXdmcp - alsa? ( - media-libs/alsa-lib - media-libs/libsamplerate - ) - ao? ( - >=media-libs/libao-0.8.6 - media-libs/libsamplerate - ) - kerberos? ( virtual/krb5 ) - pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) - oss? ( media-libs/libsamplerate ) - pulseaudio? ( - media-libs/libsamplerate - media-sound/pulseaudio - ) - xrandr? ( x11-libs/libXrandr )" -DEPEND="${RDEPEND} - x11-libs/libXt" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.3-no_strip.patch - "${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch - "${FILESDIR}"/${P}-rdssl_rkey_get_exp_mod.patch -) - -DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - if use pulseaudio; then - sound_conf="--with-sound=pulse" - elif use ao; then - sound_conf="--with-sound=libao" - elif use alsa; then - sound_conf="--with-sound=alsa" - else - sound_conf=$(use_with oss sound oss) - fi - - econf \ - $(use_with ipv6) \ - $(use_with xrandr) \ - $(use_enable kerberos credssp) \ - $(use_enable pcsc-lite smartcard) \ - ${sound_conf} -} diff --git a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r4.ebuild index 1f5e5559a2bc..00c0ed9fec58 100644 --- a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild +++ b/net-misc/rdesktop/rdesktop-1.9.0-r4.ebuild @@ -1,22 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools +EAPI=8 -MY_PV=${PV/_/-} +inherit autotools flag-o-matic DESCRIPTION="A Remote Desktop Protocol Client" HOMEPAGE="http://www.rdesktop.org/" SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" +S=${WORKDIR}/${PN}-${PV/_/-} LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr" -S=${WORKDIR}/${PN}-${MY_PV} - RDEPEND=" dev-libs/nettle:0= >=net-libs/gnutls-3.2.0:0= @@ -37,8 +35,8 @@ RDEPEND=" pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) oss? ( media-libs/libsamplerate ) pulseaudio? ( + media-libs/libpulse media-libs/libsamplerate - media-sound/pulseaudio ) xrandr? ( x11-libs/libXrandr )" DEPEND="${RDEPEND} @@ -50,6 +48,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch "${FILESDIR}"/${P}-rdssl_rkey_get_exp_mod.patch "${FILESDIR}"/${P}-gssapi-check.patch + "${FILESDIR}"/${P}-configure-clang16.patch ) DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt ) @@ -60,6 +59,13 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861824 + # https://github.com/rdesktop/rdesktop/issues/414 + # + # Upstream is "in need of new maintainers" so it may never be fixed. + filter-lto + if use pulseaudio; then sound_conf="--with-sound=pulse" elif use ao; then diff --git a/net-misc/rdesktop/rdesktop-1.9.0.ebuild b/net-misc/rdesktop/rdesktop-1.9.0.ebuild deleted file mode 100644 index 51ea75d88e8a..000000000000 --- a/net-misc/rdesktop/rdesktop-1.9.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -MY_PV=${PV/_/-} - -DESCRIPTION="A Remote Desktop Protocol Client" -HOMEPAGE="http://www.rdesktop.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr" - -S=${WORKDIR}/${PN}-${MY_PV} - -RDEPEND=" - dev-libs/nettle:0= - >=net-libs/gnutls-3.2.0:0= - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXau - x11-libs/libXdmcp - alsa? ( - media-libs/alsa-lib - media-libs/libsamplerate - ) - ao? ( - >=media-libs/libao-0.8.6 - media-libs/libsamplerate - ) - kerberos? ( virtual/krb5 ) - pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) - oss? ( media-libs/libsamplerate ) - pulseaudio? ( - media-libs/libsamplerate - media-sound/pulseaudio - ) - xrandr? ( x11-libs/libXrandr )" -DEPEND="${RDEPEND} - x11-libs/libXt" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.3-no_strip.patch - "${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch -) - -DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - if use pulseaudio; then - sound_conf="--with-sound=pulse" - elif use ao; then - sound_conf="--with-sound=libao" - elif use alsa; then - sound_conf="--with-sound=alsa" - else - sound_conf=$(use_with oss sound oss) - fi - - econf \ - $(use_with ipv6) \ - $(use_with xrandr) \ - $(use_enable kerberos credssp) \ - $(use_enable pcsc-lite smartcard) \ - ${sound_conf} -} diff --git a/net-misc/realtek-r8152/Manifest b/net-misc/realtek-r8152/Manifest deleted file mode 100644 index 6827d73dcf86..000000000000 --- a/net-misc/realtek-r8152/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST realtek-r8152-2.14.0.tar.gz 88356 BLAKE2B c530080cab5e6f7433aa6452e3c5f1f19f14c2ac473751958d85efa5553d2b2889d80cc47c2ad4064ad5673008df97dce197254f445c5fc7ae3905c7833e1641 SHA512 2908e9963b6bec9d638514e6a54ab8bca0b56c4866245f476889e4c8462c36f2bece86abac2e5ece9aee1776f00f7d4a67fd5561d830a67e02e386d79aba07dd -DIST realtek-r8152-2.15.0.tar.gz 93420 BLAKE2B 24b7a71adfddde3ff2ecc8c0b92d51f50202dada31a2f86a19d518f37814dd52d7ca5ffb5f81f07c7a92436f4fef53c8538a64d6bc5afbb0b6b7ccbace0a7923 SHA512 b46012d6e9c48ebb0eb0b7387933977bc56df7a9e010f0707907719e833a8f409d5af55ef84ebb0d54de89239e69697b6995c75e194ef7d0fa2c371d5fc362ba diff --git a/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild b/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild deleted file mode 100644 index 1f3685ed7ba4..000000000000 --- a/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod linux-info udev - -SRC_URI="https://github.com/slashbeast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 x86" - -DESCRIPTION="Out-of-tree driver for Realtek's 2.5 GbE USB NICs." -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software" - -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -DEPEND=" - virtual/linux-sources - sys-kernel/linux-headers -" -RDEPEND="" - -MODULE_NAMES="r8152(net/usb)" - -pkg_setup() { - linux_config_exists - - for module in USB_USBNET USB_NET_CDC_NCM USB_NET_CDCETHER; do - linux_chkconfig_module "${module}" || ewarn "CONFIG_${module} needs to be built as module (builtin doesn't work)" - done - - linux_chkconfig_present MII || ewarn "CONFIG_MII needs to be built as module or builtin into the kernel" - - linux_chkconfig_present USB_RTL8152 && ewarn "CONFIG_USB_RTL8152 must NOT be enabled in the kernel!" - - linux-mod_pkg_setup - - BUILD_TARGETS="modules" - BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERNELDIR=${KERNEL_DIR}" -} - -src_install() { - linux-mod_src_install - - udev_newrules 50-usb-realtek-net.rules 50-usb-realtek-net.rules -} - -pkg_postinst() { - linux-mod_pkg_postinst - udev_reload - - echo - elog "If the cdc_ncm was loaded before this r8152 driver, one might get a flood" - elog "of 'usbN: network connection: disconnected' in kernel log." - elog "In that case one needs to unload r8152, cdc_ether and cdc_ncm modules and" - elog "let udev load them in right order or manually load r8152." - echo -} diff --git a/net-misc/realtek-r8152/realtek-r8152-2.15.0.ebuild b/net-misc/realtek-r8152/realtek-r8152-2.15.0.ebuild deleted file mode 100644 index ac2d53b76ca1..000000000000 --- a/net-misc/realtek-r8152/realtek-r8152-2.15.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod linux-info udev - -SRC_URI="https://github.com/slashbeast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="Out-of-tree driver for Realtek's 2.5 GbE USB NICs." -HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software" - -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -DEPEND=" - virtual/linux-sources - sys-kernel/linux-headers -" -RDEPEND="" - -MODULE_NAMES="r8152(net/usb)" - -pkg_setup() { - linux_config_exists - - for module in USB_USBNET USB_NET_CDC_NCM USB_NET_CDCETHER; do - linux_chkconfig_module "${module}" || ewarn "CONFIG_${module} needs to be built as module (builtin doesn't work)" - done - - linux_chkconfig_present MII || ewarn "CONFIG_MII needs to be built as module or builtin into the kernel" - - linux_chkconfig_present USB_RTL8152 && ewarn "CONFIG_USB_RTL8152 must NOT be enabled in the kernel!" - - linux-mod_pkg_setup - - BUILD_TARGETS="modules" - BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERNELDIR=${KERNEL_DIR}" -} - -src_install() { - linux-mod_src_install - - udev_newrules 50-usb-realtek-net.rules 50-usb-realtek-net.rules -} - -pkg_postinst() { - linux-mod_pkg_postinst - udev_reload - - echo - elog "If the cdc_ncm was loaded before this r8152 driver, one might get a flood" - elog "of 'usbN: network connection: disconnected' in kernel log." - elog "In that case one needs to unload r8152, cdc_ether and cdc_ncm modules and" - elog "let udev load them in right order or manually load r8152." - echo -} diff --git a/net-misc/redir/metadata.xml b/net-misc/redir/metadata.xml index 4c0d3032d69c..115e9d64a669 100644 --- a/net-misc/redir/metadata.xml +++ b/net-misc/redir/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest index 823c045aef46..f9c5e481ca42 100644 --- a/net-misc/remmina/Manifest +++ b/net-misc/remmina/Manifest @@ -1,2 +1 @@ -DIST Remmina-v1.4.20.tar.gz 2489535 BLAKE2B 8d557dfc8629572d3fc930aea85e62fdc6294521c4997e1d211b8aac385f1bab3a13f082cff7f40e3add839d3922b4884736a9a50eb3e043df4c6314d3e456c5 SHA512 27a4bfbcb77f1cebe527bdcdd78f1dedb703c888c9452bdac7162e18e7eee0bf2e49143f3a3f98d451d4c1cf7cd6b9f89ae9fb67755930501e4f08e08d311892 -DIST Remmina-v1.4.21.tar.gz 2982350 BLAKE2B d076db92290ead724e6b5c13beba2ef94d16e8209c5095e5db754a8b25ee236ed7a87b5ce29ac0b9424d3c55e5443467b1cc628fb80a0f63c59d915d9fc7839e SHA512 3fb7a29bf9e001203bdc5c176a0cf11a5c98638d605a02e2edbb16669b9e85526706c11e15bd2c308919ee6ef14217356bbafa0328ce337053bba20da6f2905a +DIST Remmina-v1.4.35.tar.bz2 2150047 BLAKE2B 3ba730cd4009a797ee7d66bbe4390e9db221ee5cf0b008e0eb3df4a992d7260ddc65983c8c34d1aa1bb2190ed1104653e269369565d7e4eecaf3078ffc84330c SHA512 36dc419b4473c71f6b3e53338f4a3cf7a1fe60534ea0dce375b4c9fd00cd9d8a618c4376be4d031bdee1eed8b4aade4538a6cc414629ef6dde41cdcd513a6d36 diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml index 78554c55848c..2aa71df8ae84 100644 --- a/net-misc/remmina/metadata.xml +++ b/net-misc/remmina/metadata.xml @@ -18,7 +18,6 @@ <flag name="kwallet">Enable KDE Wallet plugin</flag> <flag name="spice">Support connecting to SPICE-enabled virtual machines</flag> <flag name="ssh">Enable support for SSH/SFTP protocol</flag> - <flag name="x2go">Enable support for X2Go</flag> </use> <upstream> <remote-id type="gitlab">Remmina/Remmina</remote-id> diff --git a/net-misc/remmina/remmina-1.4.20-r1.ebuild b/net-misc/remmina/remmina-1.4.35-r1.ebuild index 0d23b7a13176..e5f045ac8a94 100644 --- a/net-misc/remmina/remmina-1.4.20-r1.ebuild +++ b/net-misc/remmina/remmina-1.4.35-r1.ebuild @@ -1,61 +1,73 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake optfeature xdg +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-single-r1 xdg MY_P="${PN^}-v${PV}" DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client" HOMEPAGE="https://remmina.org/" -SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz" +SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit zeroconf" +KEYWORDS="amd64 ~arm64 ~riscv x86" +IUSE="+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf" -DEPEND=" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +COMMON_DEPEND=" dev-libs/glib:2 dev-libs/json-glib - dev-libs/libappindicator:3 dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= - net-libs/libsoup:2.4 x11-libs/gdk-pixbuf - x11-libs/gtk+:3 + x11-libs/gtk+:3[wayland?] x11-libs/libX11 x11-libs/libxkbfile + appindicator? ( dev-libs/libayatana-appindicator ) crypt? ( dev-libs/libgcrypt:0= ) - rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] - <net-misc/freerdp-3[X] - cups? ( net-print/cups:= ) ) - gnome-keyring? ( app-crypt/libsecret ) + keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) - kwallet? ( kde-frameworks/kwallet ) + kwallet? ( kde-frameworks/kwallet:5 ) + python? ( ${PYTHON_DEPS} ) + rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129:2=[X] + cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) - webkit? ( net-libs/webkit-gtk:4 ) + webkit? ( net-libs/webkit-gtk:4.1 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) " + +DEPEND=" + ${COMMON_DEPEND} + spice? ( app-emulation/spice-protocol ) +" + BDEPEND=" - dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) " RDEPEND=" - ${DEPEND} + ${COMMON_DEPEND} virtual/freedesktop-icon-theme " DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}/${PN^}-v${PV}" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} src_prepare() { xdg_environment_reset @@ -64,32 +76,28 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DWITH_GCRYPT=$(usex crypt) + -DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF) + -DWITH_AVAHI=$(usex zeroconf) + -DWITH_CUPS=$(usex cups) -DWITH_EXAMPLES=$(usex examples) - -DWITH_LIBSECRET=$(usex gnome-keyring) - -DWITH_KF5WALLET=$(usex kwallet) - -DWITH_GETTEXT=$(usex nls) - -DWITH_TRANSLATIONS=$(usex nls) -DWITH_FREERDP=$(usex rdp) -DWITH_FREERDP3=OFF - -DWITH_CUPS=$(usex cups) - -DWITH_SPICE=$(usex spice) + -DWITH_GCRYPT=$(usex crypt) + -DWITH_GETTEXT=$(usex nls) + -DWITH_ICON_CACHE=OFF + -DWITH_KF5WALLET=$(usex kwallet) + -DWITH_LIBSECRET=$(usex keyring) -DWITH_LIBSSH=$(usex ssh) - -DWITH_VTE=$(usex ssh) -DWITH_LIBVNCSERVER=$(usex vnc) - -DWITH_WWW=$(usex webkit) - -DWITH_AVAHI=$(usex zeroconf) - -DWITH_NEWS=$(usex telemetry) - -DWITH_ICON_CACHE=OFF + -DWITH_PYTHONLIBS=$(usex python ON OFF) + -DWITH_SPICE=$(usex spice) + -DWITH_TRANSLATIONS=$(usex nls) -DWITH_UPDATE_DESKTOP_DB=OFF + -DWITH_VTE=$(usex ssh) + -DWITH_WWW=$(usex webkit) + -DWITH_X2GO=OFF # when this feature is stable, add python eclass usage to optionally enable -DWITH_PYTHON=OFF ) cmake_src_configure } - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt] -} diff --git a/net-misc/remmina/remmina-1.4.21.ebuild b/net-misc/remmina/remmina-1.4.35-r2.ebuild index aface4e51caf..45ab59869345 100644 --- a/net-misc/remmina/remmina-1.4.21.ebuild +++ b/net-misc/remmina/remmina-1.4.35-r2.ebuild @@ -1,62 +1,75 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake optfeature xdg +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-single-r1 xdg MY_P="${PN^}-v${PV}" DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client" HOMEPAGE="https://remmina.org/" -SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz" +SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.bz2" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf X" -DEPEND=" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) || ( X wayland )" + +COMMON_DEPEND=" dev-libs/glib:2 dev-libs/json-glib - dev-libs/libappindicator:3 dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:0= - net-libs/libsoup:2.4 x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libxkbfile + x11-libs/gtk+:3[X?,wayland?] + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) + appindicator? ( dev-libs/libayatana-appindicator ) crypt? ( dev-libs/libgcrypt:0= ) - gnome-keyring? ( app-crypt/libsecret ) + keyring? ( app-crypt/libsecret ) gvnc? ( net-libs/gtk-vnc ) - kwallet? ( kde-frameworks/kwallet ) - rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] - <net-misc/freerdp-3[X] + kwallet? ( kde-frameworks/kwallet:5 ) + python? ( ${PYTHON_DEPS} ) + rdp? ( net-misc/freerdp:3= cups? ( net-print/cups:= ) ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) vnc? ( net-libs/libvncserver[jpeg] ) - webkit? ( net-libs/webkit-gtk:4 ) - x2go? ( net-misc/pyhoca-cli ) + webkit? ( net-libs/webkit-gtk:4.1 ) zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) " + +DEPEND=" + ${COMMON_DEPEND} + spice? ( app-emulation/spice-protocol ) +" + BDEPEND=" - dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) " RDEPEND=" - ${DEPEND} + ${COMMON_DEPEND} virtual/freedesktop-icon-theme " DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}/${PN^}-v${PV}" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} src_prepare() { xdg_environment_reset @@ -65,33 +78,28 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF) -DWITH_AVAHI=$(usex zeroconf) -DWITH_CUPS=$(usex cups) -DWITH_EXAMPLES=$(usex examples) -DWITH_FREERDP=$(usex rdp) - -DWITH_FREERDP3=OFF + -DWITH_FREERDP3=ON -DWITH_GCRYPT=$(usex crypt) -DWITH_GETTEXT=$(usex nls) -DWITH_ICON_CACHE=OFF -DWITH_KF5WALLET=$(usex kwallet) - -DWITH_LIBSECRET=$(usex gnome-keyring) + -DWITH_LIBSECRET=$(usex keyring) -DWITH_LIBSSH=$(usex ssh) -DWITH_LIBVNCSERVER=$(usex vnc) - -DWITH_NEWS=$(usex telemetry) + -DWITH_PYTHONLIBS=$(usex python ON OFF) -DWITH_SPICE=$(usex spice) -DWITH_TRANSLATIONS=$(usex nls) -DWITH_UPDATE_DESKTOP_DB=OFF -DWITH_VTE=$(usex ssh) -DWITH_WWW=$(usex webkit) - -DWITH_X2GO=$(usex x2go) + -DWITH_X2GO=OFF # when this feature is stable, add python eclass usage to optionally enable -DWITH_PYTHON=OFF ) cmake_src_configure } - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt] -} diff --git a/net-misc/rinetd/Manifest b/net-misc/rinetd/Manifest index 28de4a7f75d5..d7df5fbf9d00 100644 --- a/net-misc/rinetd/Manifest +++ b/net-misc/rinetd/Manifest @@ -1 +1 @@ -DIST rinetd-0.62.tar.gz 115541 BLAKE2B 11a6db6955181ba6c823c3b8d9697e4efac10962364b4e993e9057b3500b09161826d325ac0dc3f6756c5cc91b29885c493ba5f053dffd28da97ecae25d2346f SHA512 b6ddb496b4542ad46aacaef4b2241b16b9ee43f2f6761a18a4813d83a0a9db23fbd73a554393dcf01ae7350e8b6662571414ca6f93a949ce4effbbeddc198606 +DIST rinetd-0.73.tar.bz2 115343 BLAKE2B c85ff0b65d28095a554b53bc7a1b162cbbdb8eabd1c3d1bd8475c64a5b9dd7ec576036e2318d3a8125ac52af323f8238bb4a3e05fe37d1d9ad87e4d6d6fbcb3b SHA512 e5d1c7e5826a75c520453032f6e4651700860505dfced625698fc036249b9f585a894e1fee905321878b2d2a265c843f5a746090311929518594263b33b64ed8 diff --git a/net-misc/rinetd/metadata.xml b/net-misc/rinetd/metadata.xml index 85e4ed814fa2..381cfd02c871 100644 --- a/net-misc/rinetd/metadata.xml +++ b/net-misc/rinetd/metadata.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>ceamac@gentoo.org</email> + <name>Viorel Munteanu</name> + </maintainer> + <upstream> + <remote-id type="github">samhocevar/rinetd</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/rinetd/rinetd-0.62-r2.ebuild b/net-misc/rinetd/rinetd-0.62-r2.ebuild deleted file mode 100644 index 527f67d7834f..000000000000 --- a/net-misc/rinetd/rinetd-0.62-r2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs - -DESCRIPTION="redirects TCP connections from one IP address and port to another" -HOMEPAGE="http://www.boutell.com/rinetd/" -SRC_URI="http://www.boutell.com/rinetd/http/rinetd.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -S=${WORKDIR}/${PN} - -src_prepare() { - default - sed -i -e "s:gcc:$(tc-getCC) \$(CFLAGS) \$(LDFLAGS):" Makefile -} - -src_compile() { - emake CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dosbin rinetd - newinitd "${FILESDIR}"/rinetd.rc rinetd - doman rinetd.8 - dodoc CHANGES README index.html -} diff --git a/net-misc/rinetd/rinetd-0.73.ebuild b/net-misc/rinetd/rinetd-0.73.ebuild new file mode 100644 index 000000000000..53c8720abac3 --- /dev/null +++ b/net-misc/rinetd/rinetd-0.73.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="redirects TCP connections from one IP address and port to another" +HOMEPAGE="https://github.com/samhocevar/rinetd" +SRC_URI="https://github.com/samhocevar/rinetd/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="GPL-2+ GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +src_install() { + default + + newinitd "${FILESDIR}"/rinetd.rc rinetd +} diff --git a/net-misc/rsync-bpc/Manifest b/net-misc/rsync-bpc/Manifest new file mode 100644 index 000000000000..62bfacb62647 --- /dev/null +++ b/net-misc/rsync-bpc/Manifest @@ -0,0 +1 @@ +DIST rsync-bpc-3.1.3.0.tar.gz 883808 BLAKE2B 56cb299fb75219043364344d6575a443e32b5992a00f6691dde0f6b99c9b54d73d74bbef8dc98a9c927643985031e027df89d4aa1969d493e624290f28cb19f0 SHA512 24ae86c6108720d7f0ba6d144053ccba6499623018bc2bcff8f1d8e289f9c015f80e73244e965a7fcdccb5f9b2a876f1a54ceed42a19a80fd7c87c6b05c7701d diff --git a/net-misc/buka/metadata.xml b/net-misc/rsync-bpc/metadata.xml index ef8bb31dfe9d..bf9ec30888ef 100644 --- a/net-misc/buka/metadata.xml +++ b/net-misc/rsync-bpc/metadata.xml @@ -2,11 +2,11 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> - <email>mo@dragona.ca</email> - <name>Mohamad Issawi</name> + <email>kernlpanic@dennis-eisele.de</email> + <name>Dennis Eisele</name> </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> - <name>Gentoo Proxy Maintainers</name> + <name>Proxy Maintainers</name> </maintainer> </pkgmetadata> diff --git a/net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild b/net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild new file mode 100644 index 000000000000..0a2235302cda --- /dev/null +++ b/net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Rsync-bpc is a customized version of rsync that is used as part of BackupPC" +HOMEPAGE="https://github.com/backuppc/rsync-bpc" +SRC_URI="https://github.com/backuppc/rsync-bpc/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND="virtual/ssh" +DEPEND="${RDEPEND}" diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index c1ee190e0be4..a5939be1ad9c 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1 +1,4 @@ -DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e +DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12dedd6857897de136d3617c68d38368ce05de13b9b0ef35a5452dca141ebdcdfb6af8456151d0ca0ad546452b504 SHA512 c2afba11a352fd88133f9e96e19d6df80eb864450c83eced13a7faa23df947bccf2ef093f2101df6ee30abff4cbbd39ac802e9aa5f726e42c9caff274fad8377 +DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e1ffaa51b7e7ffd592feaba3ce54772bd563a251e3b30efb0ad07fc96da01158a77dd77c6534eac5d80b46e53 SHA512 bad9f48e033966566c6abf8cd485d35c0d9cf130eafb0c5fff9bcb928882283bbcdd2375e7c2880cf71cf81496ba6b743b61adca3d4678421c32915a2464acc3 +DIST rsync-3.3.0.tar.gz 1153969 BLAKE2B 75a3cc50452086aebd16f42d7a309c173cbc1ea156227afb10d2106d0b9043e973676995b8199d22840775ae3df8db97d1c0de5f3aa58afa130c5b1348c3f825 SHA512 df5c53bc2f2b0e7e30f475903e5e4296dc2fbcf08e9ea6c3c61462d0e52b067c27e82deeb4be79102c86e9aa55a825182e126f22df44dabf5b7328acb2a01d10 +DIST rsync-3.3.0.tar.gz.asc 195 BLAKE2B bd077217bd44d406ac49a55b0c0d38c2accd4867b9fbf78a13fe906f52e1773d5a69aa3116a0c245abdeb1af54705d6ffc75aaba8b276ba9229bbb3340d7c3e8 SHA512 611d26374e0ff98ffb11b6ad6555f08773b9f09e1fbf232abc73c5d472b0defd28fd559bd42707774204d055b93be289f19f4db94bbdfe0b0935918fd922cced diff --git a/net-misc/rsync/files/rsync-3.2.3-cross.patch b/net-misc/rsync/files/rsync-3.2.3-cross.patch deleted file mode 100644 index c61090b7c40b..000000000000 --- a/net-misc/rsync/files/rsync-3.2.3-cross.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 9f9240b661c5f381831b62d72b6ea928a91ff43a Mon Sep 17 00:00:00 2001 -From: Wayne Davison <wayne@opencoder.net> -Date: Thu, 3 Sep 2020 10:07:36 -0700 -Subject: [PATCH] Set CXX_OK=no when cross compiling. - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 64d2e6d6..109546a6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -233,7 +233,7 @@ __attribute__ ((target("ssse3"))) void more_testing(char* buf, int len) - in8_2 = _mm_lddqu_si128((__m128i_u*)&buf[i + 16]); - } - } --]], [[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],[CXX_OK=yes],[CXX_OK=no]) -+]], [[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],[CXX_OK=yes],[CXX_OK=no],[CXX_OK=no]) - AC_LANG(C) - if test x"$CXX_OK" = x"yes"; then - # AC_MSG_RESULT() is called below. -From 7eb59a9152a2ace7bc7858e9915c671b3ab54344 Mon Sep 17 00:00:00 2001 -From: Wayne Davison <wayne@opencoder.net> -Date: Tue, 22 Sep 2020 17:19:45 -0700 -Subject: [PATCH] Change from $build_cpu to $host_cpu as edo1 suggested. - ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 109546a6..e8c06f42 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -211,7 +211,7 @@ CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g //'` - - if test x"$enable_simd" != x"no"; then - # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required -- if test x"$build_cpu" = x"x86_64"; then -+ if test x"$host_cpu" = x"x86_64"; then - AC_LANG(C++) - AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> - #include <immintrin.h> -@@ -283,8 +283,8 @@ AC_ARG_ENABLE(asm, - AS_HELP_STRING([--disable-asm],[disable ASM optimizations])) - - if test x"$enable_asm" != x"no"; then -- if test x"$build_cpu" = x"x86_64"; then -- ASM="$build_cpu" -+ if test x"$host_cpu" = x"x86_64"; then -+ ASM="$host_cpu" - elif test x"$enable_asm" = x"yes"; then - AC_MSG_RESULT(unavailable) - AC_MSG_ERROR(The ASM optimizations are currently x86_64 only. -From b7fab6f285ff0ff3816b109a8c3131b6ded0b484 Mon Sep 17 00:00:00 2001 -From: edo <edo.rus@gmail.com> -Date: Wed, 7 Oct 2020 08:33:57 +0300 -Subject: [PATCH] Allow cross-compilation with SIMD (x86_84) (#104) - -Replace runtime SIMD check with a compile-only test in case of -cross-compilation. - -You can still use '--enable-simd=no' to build x86_64 code without -SIMD instructions. ---- - configure.ac | 20 +++++++++++++------- - 1 file changed, 13 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3fd7e5d5..e469981b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -208,12 +208,7 @@ AC_ARG_ENABLE(simd, - - # Clag is crashing with -g -O2, so we'll get rid of -g for now. - CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g //'` -- --if test x"$enable_simd" != x"no"; then -- # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required -- if test x"$host_cpu" = x"x86_64"; then -- AC_LANG(C++) -- AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> -+m4_define(SIMD_X86_64_TEST, [[#include <stdio.h> - #include <immintrin.h> - __attribute__ ((target("default"))) int test_ssse3(int x) { return x; } - __attribute__ ((target("default"))) int test_sse2(int x) { return x; } -@@ -233,7 +228,18 @@ __attribute__ ((target("ssse3"))) void more_testing(char* buf, int len) - in8_2 = _mm_lddqu_si128((__m128i_u*)&buf[i + 16]); - } - } --]], [[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],[CXX_OK=yes],[CXX_OK=no],[CXX_OK=no]) -+]]) -+ -+if test x"$enable_simd" != x"no"; then -+ # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required -+ if test x"$host_cpu" = x"x86_64"; then -+ AC_LANG(C++) -+ if test x"$host_cpu" = x"$build_cpu"; then -+ AC_RUN_IFELSE([AC_LANG_PROGRAM([SIMD_X86_64_TEST],[[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])], -+ [CXX_OK=yes],[CXX_OK=no]) -+ else -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([SIMD_X86_64_TEST])],[CXX_OK=yes],[CXX_OK=no]) -+ fi - AC_LANG(C) - if test x"$CXX_OK" = x"yes"; then - # AC_MSG_RESULT() is called below. -From 7d830ff52ff7b01f528f39aa27b1ab36ea8c1356 Mon Sep 17 00:00:00 2001 -From: Andrew Aladjev <aladjev.andrew@gmail.com> -Date: Sun, 7 Nov 2021 22:45:49 +0300 -Subject: [PATCH] improved cross compilation detection (#252) - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index fbdd17d8..9e7338cf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -264,7 +264,7 @@ if test x"$enable_simd" != x"no"; then - # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required - if test x"$host_cpu" = x"x86_64" || test x"$host_cpu" = x"amd64"; then - AC_LANG(C++) -- if test x"$host_cpu" = x"$build_cpu"; then -+ if test x"$host" = x"$build"; then - AC_RUN_IFELSE([AC_LANG_PROGRAM([SIMD_X86_64_TEST],[[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])], - [CXX_OK=yes],[CXX_OK=no]) - else diff --git a/net-misc/rsync/files/rsync-3.2.3-glibc-lchmod.patch b/net-misc/rsync/files/rsync-3.2.3-glibc-lchmod.patch deleted file mode 100644 index 970d7af42bad..000000000000 --- a/net-misc/rsync/files/rsync-3.2.3-glibc-lchmod.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 9dd62525f3b98d692e031f22c02be8f775966503 Mon Sep 17 00:00:00 2001 -From: Wayne Davison <wayne@opencoder.net> -Date: Sun, 29 Nov 2020 09:33:54 -0800 -Subject: [PATCH] Work around glibc's lchmod() issue a better way. - -diff --git a/syscall.c b/syscall.c -index b9c3b4ef..11d10e4a 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -227,27 +227,35 @@ int do_open(const char *pathname, int flags, mode_t mode) - #ifdef HAVE_CHMOD - int do_chmod(const char *path, mode_t mode) - { -+ static int switch_step = 0; - int code; - if (dry_run) return 0; - RETURN_ERROR_IF_RO_OR_LO; -+ switch (switch_step) { - #ifdef HAVE_LCHMOD -- code = lchmod(path, mode & CHMOD_BITS); --#else -- if (S_ISLNK(mode)) { -+#include "case_N.h" -+ if ((code = lchmod(path, mode & CHMOD_BITS)) == 0 || errno != ENOTSUP) -+ break; -+ switch_step++; -+#endif -+ -+#include "case_N.h" -+ if (S_ISLNK(mode)) { - # if defined HAVE_SETATTRLIST -- struct attrlist attrList; -- uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */ -+ struct attrlist attrList; -+ uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */ - -- memset(&attrList, 0, sizeof attrList); -- attrList.bitmapcount = ATTR_BIT_MAP_COUNT; -- attrList.commonattr = ATTR_CMN_ACCESSMASK; -- code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW); -+ memset(&attrList, 0, sizeof attrList); -+ attrList.bitmapcount = ATTR_BIT_MAP_COUNT; -+ attrList.commonattr = ATTR_CMN_ACCESSMASK; -+ code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW); - # else -- code = 1; -+ code = 1; - # endif -- } else -- code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */ --#endif /* !HAVE_LCHMOD */ -+ } else -+ code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */ -+ break; -+ } - if (code != 0 && (preserve_perms || preserve_executability)) - return code; - return 0; diff --git a/net-misc/rsync/files/rsync-3.2.3-verify-certificate.patch b/net-misc/rsync/files/rsync-3.2.3-verify-certificate.patch deleted file mode 100644 index 9b462a1df721..000000000000 --- a/net-misc/rsync/files/rsync-3.2.3-verify-certificate.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c3f7414c450faaf6a8281cc4a4403529aeb7d859 Mon Sep 17 00:00:00 2001 -From: Matt McCutchen <matt@mattmccutchen.net> -Date: Wed, 26 Aug 2020 12:16:08 -0400 -Subject: [PATCH] rsync-ssl: Verify the hostname in the certificate when using - openssl. - ---- - rsync-ssl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rsync-ssl b/rsync-ssl -index 8101975a..46701af1 100755 ---- a/rsync-ssl -+++ b/rsync-ssl -@@ -129,7 +129,7 @@ function rsync_ssl_helper { - fi - - if [[ $RSYNC_SSL_TYPE == openssl ]]; then -- exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -connect $hostname:$port -+ exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -verify_hostname $hostname -connect $hostname:$port - elif [[ $RSYNC_SSL_TYPE == gnutls ]]; then - exec $RSYNC_SSL_GNUTLS --logfile=/dev/null $gnutls_cert_opt $gnutls_opts $hostname:$port - else --- -2.25.1 - diff --git a/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch b/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch new file mode 100644 index 000000000000..9aa1b93e2c9c --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch @@ -0,0 +1,21 @@ +https://github.com/WayneD/rsync/issues/427 +https://github.com/WayneD/rsync/issues/429 +https://github.com/WayneD/rsync/commit/90df93e446f9ebbfd4ce97d6755c5fe1f45f9fd0 + +From 90df93e446f9ebbfd4ce97d6755c5fe1f45f9fd0 Mon Sep 17 00:00:00 2001 +From: Wayne Davison <wayne@opencoder.net> +Date: Sun, 8 Jan 2023 21:35:39 -0800 +Subject: [PATCH] Don't call memcmp() on an empty lastdir. + +--- a/flist.c ++++ b/flist.c +@@ -2367,7 +2367,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) + } + + dirlen = dir ? strlen(dir) : 0; +- if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) { ++ if (dirlen != lastdir_len || (dirlen && memcmp(lastdir, dir, dirlen) != 0)) { + if (!change_pathname(NULL, dir, -dirlen)) + goto bad_path; + lastdir = pathname; + diff --git a/net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch b/net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch new file mode 100644 index 000000000000..952af573dfc7 --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.7-fortify-source-3.patch @@ -0,0 +1,54 @@ +https://bugs.gentoo.org/917517 +https://github.com/WayneD/rsync/issues/511 +https://bugzilla.suse.com/show_bug.cgi?id=1214249 +https://bugzilla.redhat.com/show_bug.cgi?id=2229654 +https://src.fedoraproject.org/rpms/rsync/raw/06d55616ec86c3a68a8af917783788b928fefcc4/f/rsync-3.2.7-buffer-overflow.patch + +From 1f83963f59960150e8c46112daa8411324c1f209 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby <jslaby@suse.cz> +Date: Fri, 18 Aug 2023 08:26:20 +0200 +Subject: [PATCH] exclude: fix crashes with fortified strlcpy() + +Fortified (-D_FORTIFY_SOURCE=2 for gcc) builds make strlcpy() crash when +its third parameter (size) is larger than the buffer: + $ rsync -FFXHav '--filter=merge global-rsync-filter' Align-37-43/ xxx + sending incremental file list + *** buffer overflow detected ***: terminated + +It's in the exclude code in setup_merge_file(): + strlcpy(y, save, MAXPATHLEN); + +Note the 'y' pointer was incremented, so it no longer points to memory +with MAXPATHLEN "owned" bytes. + +Fix it by remembering the number of copied bytes into the 'save' buffer +and use that instead of MAXPATHLEN which is clearly incorrect. + +Fixes #511. +--- + exclude.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/exclude.c b/exclude.c +index ffe55b167..1a5de3b9e 100644 +--- a/exclude.c ++++ b/exclude.c +@@ -720,7 +720,8 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + parent_dirscan = True; + while (*y) { + char save[MAXPATHLEN]; +- strlcpy(save, y, MAXPATHLEN); ++ /* copylen is strlen(y) which is < MAXPATHLEN. +1 for \0 */ ++ size_t copylen = strlcpy(save, y, MAXPATHLEN) + 1; + *y = '\0'; + dirbuf_len = y - dirbuf; + strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf)); +@@ -734,7 +735,7 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + lp->head = NULL; + } + lp->tail = NULL; +- strlcpy(y, save, MAXPATHLEN); ++ strlcpy(y, save, copylen); + while ((*x++ = *y++) != '/') {} + } + parent_dirscan = False; diff --git a/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch b/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch new file mode 100644 index 000000000000..1b99dc61088b --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch @@ -0,0 +1,32 @@ +https://github.com/WayneD/rsync/pull/558 + +From d869bcd3850b9a80f27f5aee4d41725f39d84ea7 Mon Sep 17 00:00:00 2001 +From: Ivan Babrou <github@ivan.computer> +Date: Mon, 1 Jan 2024 19:31:01 -0800 +Subject: [PATCH] configure.ac: fix failing IPv6 check due to missing return + type + +Fixing this warning escalated to an error, resuting in no IPv6 support: + +``` +configure.sh:7679: checking whether to enable ipv6 +configure.sh:7718: clang -o conftest -g -O2 -DHAVE_CONFIG_H -Wall -W conftest.c >&5 +conftest.c:73:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] +main() +^ +int +1 error generated. +configure.sh:7718: $? = 1 +configure.sh: program exited with status 1 +``` +--- a/configure.ac ++++ b/configure.ac +@@ -392,7 +392,7 @@ AS_HELP_STRING([--disable-ipv6],[disable to omit ipv6 support]), + #include <stdlib.h> + #include <sys/types.h> + #include <sys/socket.h> +-main() ++int main() + { + if (socket(AF_INET6, SOCK_STREAM, 0) < 0) + exit(1); diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml index 6a684b27c6ce..cceaeff88940 100644 --- a/net-misc/rsync/metadata.xml +++ b/net-misc/rsync/metadata.xml @@ -6,10 +6,13 @@ <name>Gentoo Base System</name> </maintainer> <upstream> + <changelog>https://rsync.samba.org/ftp/rsync/NEWS</changelog> <remote-id type="cpe">cpe:/a:samba:rsync</remote-id> + <remote-id type="github">RsyncProject/rsync</remote-id> </upstream> <use> - <flag name="stunnel">Provide helper scripts for using rsync via >=net-misc/stunnel-4</flag> + <flag name="rrsync">Install rrsync script to setup restricted rsync users via ssh logins</flag> + <flag name="stunnel">Provide helper scripts for using rsync via >=<pkg>net-misc/stunnel</pkg>-4</flag> <flag name="system-zlib">Use system zlib instead of bundled one. This is incompatible with older rsync releases!</flag> <flag name="xxhash">Enable <pkg>dev-libs/xxhash</pkg> support for hashing</flag> </use> diff --git a/net-misc/rsync/rsync-3.2.3-r4.ebuild b/net-misc/rsync/rsync-3.2.3-r4.ebuild deleted file mode 100644 index 38c591855af9..000000000000 --- a/net-misc/rsync/rsync-3.2.3-r4.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} != 3.2.3 ]]; then - # Make sure we revert the autotools hackery applied in 3.2.3. - die "Please use rsync-9999.ebuild as a basis for version bumps" -fi - -WANT_LIBTOOL=none - -inherit autotools prefix systemd - -DESCRIPTION="File transfer program to keep remote files into sync" -HOMEPAGE="https://rsync.samba.org/" -SRC_DIR="src" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz" -S="${WORKDIR}/${P/_/}" - -LICENSE="GPL-3" -SLOT="0" -IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd" - -RDEPEND="acl? ( virtual/acl ) - lz4? ( app-arch/lz4 ) - ssl? ( dev-libs/openssl:0= ) - system-zlib? ( sys-libs/zlib ) - xattr? ( kernel_linux? ( sys-apps/attr ) ) - xxhash? ( dev-libs/xxhash ) - zstd? ( >=app-arch/zstd-1.4 ) - >=dev-libs/popt-1.5 - iconv? ( virtual/libiconv )" -DEPEND="${RDEPEND}" - -src_prepare() { - local PATCHES=( - "${FILESDIR}/rsync-3.2.3-glibc-lchmod.patch" - "${FILESDIR}/rsync-3.2.3-cross.patch" - ) - default - eautoconf -o configure.sh - touch config.h.in || die -} - -src_configure() { - local myeconfargs=( - --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf - --without-included-popt - $(use_enable acl acl-support) - $(use_enable iconv) - $(use_enable ipv6) - $(use_enable lz4) - $(use_enable ssl openssl) - $(use_with !system-zlib included-zlib) - $(use_enable xattr xattr-support) - $(use_enable xxhash) - $(use_enable zstd) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd - newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd - - dodoc NEWS.md README.md TODO tech_report.tex - - insinto /etc - newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf - - insinto /etc/logrotate.d - newins "${FILESDIR}"/rsyncd.logrotate rsyncd - - insinto /etc/xinetd.d - newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd - - # Install stunnel helpers - if use stunnel ; then - emake DESTDIR="${D}" install-ssl-daemon - fi - - # Install the useful contrib scripts - if use examples ; then - exeinto /usr/share/rsync - doexe support/* - rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} - fi - - eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* - - systemd_newunit "packaging/systemd/rsync.service" "rsyncd.service" -} - -pkg_postinst() { - if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ - "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then - ewarn "You have disabled chroot support in your rsyncd.conf. This" - ewarn "is a security risk which you should fix. Please check your" - ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." - fi - if use stunnel ; then - einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." - einfo - einfo "You maybe have to update the certificates configured in" - einfo "${EROOT}/etc/stunnel/rsync.conf" - fi - if use system-zlib ; then - ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" - ewarn "using the --compress option." - ewarn - ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," - ewarn "and the --compress option, add --new-compress (-zz)." - ewarn - ewarn "For syncing the portage tree, add:" - ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" - fi -} diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild deleted file mode 100644 index 684a8e105cd7..000000000000 --- a/net-misc/rsync/rsync-3.2.3-r5.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} != 3.2.3 ]]; then - # Make sure we revert the autotools hackery applied in 3.2.3. - die "Please use rsync-9999.ebuild as a basis for version bumps" -fi - -WANT_LIBTOOL=none - -inherit autotools prefix systemd - -DESCRIPTION="File transfer program to keep remote files into sync" -HOMEPAGE="https://rsync.samba.org/" -SRC_DIR="src" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz" -S="${WORKDIR}/${P/_/}" - -LICENSE="GPL-3" -SLOT="0" -IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd" - -RDEPEND="acl? ( virtual/acl ) - lz4? ( app-arch/lz4 ) - ssl? ( dev-libs/openssl:0= ) - system-zlib? ( sys-libs/zlib ) - xattr? ( kernel_linux? ( sys-apps/attr ) ) - xxhash? ( dev-libs/xxhash ) - zstd? ( >=app-arch/zstd-1.4 ) - >=dev-libs/popt-1.5 - iconv? ( virtual/libiconv )" -DEPEND="${RDEPEND}" - -src_prepare() { - local PATCHES=( - "${FILESDIR}/${P}-glibc-lchmod.patch" - "${FILESDIR}/${P}-cross.patch" - # Fix for (CVE-2020-14387) - net-misc/rsync: improper TLS validation in rsync-ssl script - "${FILESDIR}/${P}-verify-certificate.patch" - ) - default - eautoconf -o configure.sh - touch config.h.in || die -} - -src_configure() { - local myeconfargs=( - --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf - --without-included-popt - $(use_enable acl acl-support) - $(use_enable iconv) - $(use_enable ipv6) - $(use_enable lz4) - $(use_enable ssl openssl) - $(use_with !system-zlib included-zlib) - $(use_enable xattr xattr-support) - $(use_enable xxhash) - $(use_enable zstd) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd - newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd - - dodoc NEWS.md README.md TODO tech_report.tex - - insinto /etc - newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf - - insinto /etc/logrotate.d - newins "${FILESDIR}"/rsyncd.logrotate rsyncd - - insinto /etc/xinetd.d - newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd - - # Install stunnel helpers - if use stunnel ; then - emake DESTDIR="${D}" install-ssl-daemon - fi - - # Install the useful contrib scripts - if use examples ; then - exeinto /usr/share/rsync - doexe support/* - rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} - fi - - eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* - - systemd_newunit "packaging/systemd/rsync.service" "rsyncd.service" -} - -pkg_postinst() { - if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ - "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then - ewarn "You have disabled chroot support in your rsyncd.conf. This" - ewarn "is a security risk which you should fix. Please check your" - ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." - fi - if use stunnel ; then - einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." - einfo - einfo "You maybe have to update the certificates configured in" - einfo "${EROOT}/etc/stunnel/rsync.conf" - fi - if use system-zlib ; then - ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" - ewarn "using the --compress option." - ewarn - ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," - ewarn "and the --compress option, add --new-compress (-zz)." - ewarn - ewarn "For syncing the portage tree, add:" - ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" - fi -} diff --git a/net-misc/rsync/rsync-3.2.7-r3.ebuild b/net-misc/rsync/rsync-3.2.7-r3.ebuild new file mode 100644 index 000000000000..ef0a743c83ee --- /dev/null +++ b/net-misc/rsync/rsync-3.2.7-r3.ebuild @@ -0,0 +1,204 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +#RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{9..11} ) +inherit flag-o-matic prefix python-single-r1 systemd + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/WayneD/rsync.git" + inherit autotools git-r3 + + REQUIRED_USE="${PYTHON_REQUIRED_USE}" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi + + SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz + verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )" + S="${WORKDIR}"/${P/_/} +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) + ssl? ( dev-libs/openssl:= ) + system-zlib? ( sys-libs/zlib ) + xattr? ( kernel_linux? ( sys-apps/attr ) ) + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) + iconv? ( virtual/libiconv )" +DEPEND="${RDEPEND}" +BDEPEND=" + examples? ( ${PYTHON_DEPS} ) + rrsync? ( ${PYTHON_DEPS} ) +" + +if [[ ${PV} == *9999 ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +PATCHES=( + "${FILESDIR}"/${P}-flist-memcmp-ub.patch + "${FILESDIR}"/${P}-fortify-source-3.patch +) + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - 9999 needs commonmark at build time + if [[ ${PV} == *9999 ]] || use examples || use rrsync; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + eaclocal -I m4 + eautoconf -o configure.sh + eautoheader && touch config.h.in + fi + + if use examples || use rrsync; then + python_fix_shebang support/ + fi + + if [[ -f rrsync.1 ]]; then + # If the pre-build rrsync.1 man page exists, then link to it + # from support/rrsync.1 to avoid rsync's build system attempting + # re-creating the man page (bug #883049). + ln -s ../rrsync.1 support/rrsync.1 || die + fi +} + +src_configure() { + local myeconfargs=( + --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf + --without-included-popt + --enable-ipv6 + $(use_enable acl acl-support) + $(use_enable iconv) + $(use_enable lz4) + $(use_with rrsync) + $(use_enable ssl openssl) + $(use_with !system-zlib included-zlib) + $(use_enable xattr xattr-support) + $(use_enable xxhash) + $(use_enable zstd) + ) + + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd + newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd + + dodoc NEWS.md README.md TODO tech_report.tex + + insinto /etc + newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}"/rsyncd.logrotate rsyncd + + insinto /etc/xinetd.d + newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd + + # Install stunnel helpers + if use stunnel ; then + emake DESTDIR="${D}" install-ssl-daemon + fi + + # Install the useful contrib scripts + if use examples ; then + # The 'rrsync' script is installed conditionally via the 'rrysnc' + # USE flag, and not via the 'examples' USE flag. + rm support/rrsync* || die + + exeinto /usr/share/rsync + doexe support/* + + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} + fi + + eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* + + systemd_newunit packaging/systemd/rsync.service rsyncd.service +} + +pkg_postinst() { + if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ + "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then + ewarn "You have disabled chroot support in your rsyncd.conf. This" + ewarn "is a security risk which you should fix. Please check your" + ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." + fi + + if use stunnel ; then + einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." + einfo + einfo "You maybe have to update the certificates configured in" + einfo "${EROOT}/etc/stunnel/rsync.conf" + fi + + if use system-zlib ; then + ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" + ewarn "using the --compress option." + ewarn + ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," + ewarn "and the --compress option, add --new-compress (-zz)." + ewarn + ewarn "For syncing the portage tree, add:" + ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" + fi +} diff --git a/net-misc/rsync/rsync-3.2.7-r4.ebuild b/net-misc/rsync/rsync-3.2.7-r4.ebuild new file mode 100644 index 000000000000..831a218e466c --- /dev/null +++ b/net-misc/rsync/rsync-3.2.7-r4.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{9..11} ) +inherit flag-o-matic prefix python-single-r1 systemd + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/WayneD/rsync.git" + inherit autotools git-r3 + + REQUIRED_USE="${PYTHON_REQUIRED_USE}" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi + + SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz + verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )" + S="${WORKDIR}"/${P/_/} +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) + ssl? ( dev-libs/openssl:= ) + system-zlib? ( sys-libs/zlib ) + xattr? ( kernel_linux? ( sys-apps/attr ) ) + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) + iconv? ( virtual/libiconv )" +DEPEND="${RDEPEND}" +BDEPEND=" + examples? ( ${PYTHON_DEPS} ) + rrsync? ( ${PYTHON_DEPS} ) +" + +if [[ ${PV} == *9999 ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +PATCHES=( + "${FILESDIR}"/${P}-flist-memcmp-ub.patch + "${FILESDIR}"/${P}-fortify-source-3.patch + "${FILESDIR}"/${PN}-3.2.7-ipv6-configure-c99.patch +) + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - 9999 needs commonmark at build time + if [[ ${PV} == *9999 ]] || use examples || use rrsync; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac + + if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + eaclocal -I m4 + eautoconf -o configure.sh + eautoheader && touch config.h.in + fi + + if use examples || use rrsync; then + python_fix_shebang support/ + fi + + if [[ -f rrsync.1 ]]; then + # If the pre-build rrsync.1 man page exists, then link to it + # from support/rrsync.1 to avoid rsync's build system attempting + # re-creating the man page (bug #883049). + ln -s ../rrsync.1 support/rrsync.1 || die + fi +} + +src_configure() { + local myeconfargs=( + --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf + --without-included-popt + --enable-ipv6 + $(use_enable acl acl-support) + $(use_enable iconv) + $(use_enable lz4) + $(use_with rrsync) + $(use_enable ssl openssl) + $(use_with !system-zlib included-zlib) + $(use_enable xattr xattr-support) + $(use_enable xxhash) + $(use_enable zstd) + ) + + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd + newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd + + dodoc NEWS.md README.md TODO tech_report.tex + + insinto /etc + newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}"/rsyncd.logrotate rsyncd + + insinto /etc/xinetd.d + newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd + + # Install stunnel helpers + if use stunnel ; then + emake DESTDIR="${D}" install-ssl-daemon + fi + + # Install the useful contrib scripts + if use examples ; then + # The 'rrsync' script is installed conditionally via the 'rrysnc' + # USE flag, and not via the 'examples' USE flag. + rm support/rrsync* || die + + exeinto /usr/share/rsync + doexe support/* + + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} + fi + + eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* + + systemd_newunit packaging/systemd/rsync.service rsyncd.service +} + +pkg_postinst() { + if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ + "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then + ewarn "You have disabled chroot support in your rsyncd.conf. This" + ewarn "is a security risk which you should fix. Please check your" + ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." + fi + + if use stunnel ; then + einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." + einfo + einfo "You maybe have to update the certificates configured in" + einfo "${EROOT}/etc/stunnel/rsync.conf" + fi + + if use system-zlib ; then + ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" + ewarn "using the --compress option." + ewarn + ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," + ewarn "and the --compress option, add --new-compress (-zz)." + ewarn + ewarn "For syncing the portage tree, add:" + ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" + fi +} diff --git a/net-misc/rsync/rsync-3.3.0.ebuild b/net-misc/rsync/rsync-3.3.0.ebuild new file mode 100644 index 000000000000..cae9cf177b24 --- /dev/null +++ b/net-misc/rsync/rsync-3.3.0.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit flag-o-matic prefix python-single-r1 systemd + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/WayneD/rsync.git" + inherit autotools git-r3 + + REQUIRED_USE="${PYTHON_REQUIRED_USE}" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi + + SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz + verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )" + S="${WORKDIR}"/${P/_/} +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) + ssl? ( dev-libs/openssl:= ) + system-zlib? ( sys-libs/zlib ) + xattr? ( kernel_linux? ( sys-apps/attr ) ) + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) + iconv? ( virtual/libiconv )" +DEPEND="${RDEPEND}" +BDEPEND=" + examples? ( ${PYTHON_DEPS} ) + rrsync? ( ${PYTHON_DEPS} ) +" + +if [[ ${PV} == *9999 ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - 9999 needs commonmark at build time + if [[ ${PV} == *9999 ]] || use examples || use rrsync; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac + + if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + eaclocal -I m4 + eautoconf -o configure.sh + eautoheader && touch config.h.in + fi + + if use examples || use rrsync; then + python_fix_shebang support/ + fi + + if [[ -f rrsync.1 ]]; then + # If the pre-build rrsync.1 man page exists, then link to it + # from support/rrsync.1 to avoid rsync's build system attempting + # re-creating the man page (bug #883049). + ln -s ../rrsync.1 support/rrsync.1 || die + fi +} + +src_configure() { + local myeconfargs=( + --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf + --without-included-popt + --enable-ipv6 + $(use_enable acl acl-support) + $(use_enable iconv) + $(use_enable lz4) + $(use_with rrsync) + $(use_enable ssl openssl) + $(use_with !system-zlib included-zlib) + $(use_enable xattr xattr-support) + $(use_enable xxhash) + $(use_enable zstd) + ) + + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd + newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd + + dodoc NEWS.md README.md TODO tech_report.tex + + insinto /etc + newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}"/rsyncd.logrotate rsyncd + + insinto /etc/xinetd.d + newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd + + # Install stunnel helpers + if use stunnel ; then + emake DESTDIR="${D}" install-ssl-daemon + fi + + # Install the useful contrib scripts + if use examples ; then + # The 'rrsync' script is installed conditionally via the 'rrysnc' + # USE flag, and not via the 'examples' USE flag. + rm support/rrsync* || die + + exeinto /usr/share/rsync + doexe support/* + + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} + fi + + eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* + + systemd_newunit packaging/systemd/rsync.service rsyncd.service +} + +pkg_postinst() { + if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ + "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then + ewarn "You have disabled chroot support in your rsyncd.conf. This" + ewarn "is a security risk which you should fix. Please check your" + ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." + fi + + if use stunnel ; then + einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." + einfo + einfo "You maybe have to update the certificates configured in" + einfo "${EROOT}/etc/stunnel/rsync.conf" + fi + + if use system-zlib ; then + ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" + ewarn "using the --compress option." + ewarn + ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," + ewarn "and the --compress option, add --new-compress (-zz)." + ewarn + ewarn "For syncing the portage tree, add:" + ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" + fi +} diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index 8c91d4f3a17a..6ea497c2e733 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-9999.ebuild @@ -1,71 +1,121 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit prefix systemd +# Uncomment when introducing a patch which touches configure +RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" -if [[ "${PV}" == *9999 ]] ; then - PYTHON_COMPAT=( python3_{6,7,8} ) - inherit autotools git-r3 python-any-r1 +if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/WayneD/rsync.git" + inherit autotools git-r3 + + REQUIRED_USE="${PYTHON_REQUIRED_USE}" else - if [[ "${PV}" == *_pre* ]] ; then + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi - SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz" - S="${WORKDIR}/${P/_/}" + + SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz + verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )" + S="${WORKDIR}"/${P/_/} fi LICENSE="GPL-3" SLOT="0" -IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd" +IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND="acl? ( virtual/acl ) - lz4? ( app-arch/lz4 ) - ssl? ( dev-libs/openssl:0= ) +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) + ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) - xxhash? ( dev-libs/xxhash ) - zstd? ( >=app-arch/zstd-1.4 ) - >=dev-libs/popt-1.5 + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" - -if [[ "${PV}" == *9999 ]] ; then - BDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep ' +BDEPEND=" + examples? ( ${PYTHON_DEPS} ) + rrsync? ( ${PYTHON_DEPS} ) +" + +if [[ ${PV} == *9999 ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' dev-python/commonmark[${PYTHON_USEDEP}] ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" fi -# Only required for live ebuild -python_check_deps() { - has_version "dev-python/commonmark[${PYTHON_USEDEP}]" +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - 9999 needs commonmark at build time + if [[ ${PV} == *9999 ]] || use examples || use rrsync; then + python-single-r1_pkg_setup + fi } src_prepare() { default - if [[ "${PV}" == *9999 ]] ; then + + sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac + + if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then eaclocal -I m4 eautoconf -o configure.sh eautoheader && touch config.h.in fi + + if use examples || use rrsync; then + python_fix_shebang support/ + fi + + if [[ -f rrsync.1 ]]; then + # If the pre-build rrsync.1 man page exists, then link to it + # from support/rrsync.1 to avoid rsync's build system attempting + # re-creating the man page (bug #883049). + ln -s ../rrsync.1 support/rrsync.1 || die + fi } src_configure() { local myeconfargs=( --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf --without-included-popt + --enable-ipv6 $(use_enable acl acl-support) $(use_enable iconv) - $(use_enable ipv6) $(use_enable lz4) + $(use_with rrsync) $(use_enable ssl openssl) $(use_with !system-zlib included-zlib) $(use_enable xattr xattr-support) @@ -73,6 +123,14 @@ src_configure() { $(use_enable zstd) ) + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + econf "${myeconfargs[@]}" } @@ -100,14 +158,19 @@ src_install() { # Install the useful contrib scripts if use examples ; then + # The 'rrsync' script is installed conditionally via the 'rrysnc' + # USE flag, and not via the 'examples' USE flag. + rm support/rrsync* || die + exeinto /usr/share/rsync doexe support/* + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} fi eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* - systemd_newunit "packaging/systemd/rsync.service" "rsyncd.service" + systemd_newunit packaging/systemd/rsync.service rsyncd.service } pkg_postinst() { @@ -117,12 +180,14 @@ pkg_postinst() { ewarn "is a security risk which you should fix. Please check your" ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." fi + if use stunnel ; then einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." einfo einfo "You maybe have to update the certificates configured in" einfo "${EROOT}/etc/stunnel/rsync.conf" fi + if use system-zlib ; then ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" ewarn "using the --compress option." diff --git a/net-misc/rwbs/rwbs-0.27-r2.ebuild b/net-misc/rwbs/rwbs-0.27-r2.ebuild index d89840ef568c..f5316f9d5c4c 100644 --- a/net-misc/rwbs/rwbs-0.27-r2.ebuild +++ b/net-misc/rwbs/rwbs-0.27-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Roger Wilco base station" HOMEPAGE="http://rogerwilco.gamespy.com/" -SRC_URI="http://games.gci.net/pub/VoiceOverIP/RogerWilco/rwbs_Linux_0_27.tar.gz" +SRC_URI="http://games.gci.net/pub/VoiceOverIP/RogerWilco/rwbs_Linux_$(ver_rs 1-2 '_').tar.gz" SLOT="0" LICENSE="Resounding GPL-2" diff --git a/net-misc/rwhoisd/Manifest b/net-misc/rwhoisd/Manifest index 2f18403d071c..330991fe45d4 100644 --- a/net-misc/rwhoisd/Manifest +++ b/net-misc/rwhoisd/Manifest @@ -1 +1,2 @@ +DIST rwhoisd-1.5.9.6-fix-build-for-clang16.patch.xz 71604 BLAKE2B f528fdf51203210a9c3c268569f3b84d668e45a000d76bd52e3b4eb3f9ad0f317aeb46e26475ca4c79b768232be9116f2ae13feac4e888d40b8359a72c3cb30c SHA512 ed82d09f6ceecaa607b800906780d68e276d26eba480da1a0d7d4867fcf692a9cf6eca90b16066b2065a749f9a07b47bb55bd45a8976058fd63bc25a9040324e DIST rwhoisd-1.5.9.6.tar.gz 491955 BLAKE2B 97587fc6a728cde58bc5049a9bf27ec1673ce7beb751aa0de7c787d08185b597e16a4920e89fa5aaabc6e7e1b5dfecedc50aaf55cbdbe7f85a43d6a125848cb9 SHA512 ab5674d9ed9f9c5fc00b2859b1336c766c546ca067ddf9d3863a0728c6d0eac11be3a9cd22dce8c25999ed8c8e5377e6da4aa1252e396d5b3c8e959794903c52 diff --git a/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-c99.patch b/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-c99.patch new file mode 100644 index 000000000000..8b207d0683ac --- /dev/null +++ b/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-c99.patch @@ -0,0 +1,89 @@ +https://github.com/arineng/rwhoisd/pull/3/commits/285e84dddee471886d84da3ea3579facb9fe7e99 + +From 285e84dddee471886d84da3ea3579facb9fe7e99 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> +Date: Fri, 1 Dec 2023 13:32:08 +0100 +Subject: [PATCH] Fix a return value of signal handlers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 14 will error if a value returned from a function does not match +a function prototype. This can be reproduced with -Wreturn-mismatch +option and is a problem compilers where a signal handler should return +void: + + daemon.c: In function ‘sigchld_handler’: + daemon.c:108:10: error: ‘return’ with a value, in function returning void + 108 | return 0; + | ^ + daemon.c:92:1: note: declared here + 92 | sigchld_handler( + | ^~~~~~~~~~~~~~~ + daemon.c: In function ‘sighup_handler’: + daemon.c:117:10: error: ‘return’ with a value, in function returning void + 117 | return 0; + | ^ + daemon.c:112:1: note: declared here + 112 | sighup_handler( + | ^~~~~~~~~~~~~~ + daemon.c: In function ‘exit_handler’: + daemon.c:127:10: error: ‘return’ with a value, in function returning void + 127 | return 0; + | ^ + +This patch fixes it. +--- + rwhoisd/configure.ac | 3 +++ + rwhoisd/server/daemon.c | 6 ++++++ + 2 files changed, 9 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 0b822ac..b1d659f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -114,6 +114,9 @@ AC_CHECK_FUNCS(getcwd gethostname socket strftime uname flock lockf \ + setsid crypt memset memcpy usleep wait3 getaddrinfo vsnprintf) + AC_REPLACE_FUNCS(strerror) + ++AS_IF([test "${ac_cv_type_signal}" = "int"], ++ AC_DEFINE([RETSIGTYPE_IS_INT], [1], [Define if RETSIGTYPE is int.]) ++ ) + + dnl Optional software. + +diff --git a/server/daemon.c b/server/daemon.c +index a5c638b..c943da9 100644 +--- a/server/daemon.c ++++ b/server/daemon.c +@@ -105,7 +105,9 @@ sigchld_handler( + /* reset the signal handler -- some older systems remove the signal + handler upon use. POSIX systems should not do this */ + signal(SIGCHLD, (__sighandler_t)sigchld_handler); ++#ifdef RETSIGTYPE_IS_INT + return 0; ++#endif + } + + static RETSIGTYPE +@@ -114,7 +116,9 @@ sighup_handler( + { + hup_recvd = TRUE; + signal(SIGHUP, (__sighandler_t)sighup_handler); ++#ifdef RETSIGTYPE_IS_INT + return 0; ++#endif + } + + static RETSIGTYPE +@@ -124,7 +128,9 @@ exit_handler( + log(L_LOG_NOTICE, UNKNOWN, "Exiting"); + delpid(); + exit(0); ++#ifdef RETSIGTYPE_IS_INT + return 0; ++#endif + } + + static void set_sighup (void) + diff --git a/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-fix-direct-ar-call.patch b/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-fix-direct-ar-call.patch new file mode 100644 index 000000000000..c015559fc891 --- /dev/null +++ b/net-misc/rwhoisd/files/rwhoisd-1.5.9.6-fix-direct-ar-call.patch @@ -0,0 +1,33 @@ +Date: Wed, 1 Mar 2023 22:04:45 +0100 +Subject: [PATCH] fix direct ar call + +Prevent build to directly call ar and use a variable instead. + +Bug: https://bugs.gentoo.org/725194 + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/common/Makefile.in ++++ b/common/Makefile.in +@@ -1,7 +1,7 @@ + + # programs + CC = @CC@ +-AR = ar ++AR = @AR@ + RANLIB = @RANLIB@ + SHELL = /bin/sh + +--- a/configure.ac ++++ b/configure.ac +@@ -4,6 +4,8 @@ dnl This has been updated to use autoconf-2.52. + AC_INIT + AC_CONFIG_SRCDIR([common/attributes.c]) + ++AC_CHECK_TOOL(AR, ar, false) ++ + dnl Random substitution variables + if test -f VERSION; then + RWHOIS_VERSION=`cat VERSION` +-- +2.39.2 diff --git a/net-misc/rwhoisd/metadata.xml b/net-misc/rwhoisd/metadata.xml index 115e9d64a669..8a42089e3b73 100644 --- a/net-misc/rwhoisd/metadata.xml +++ b/net-misc/rwhoisd/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <upstream> + <remote-id type="github">arineng/rwhoisd</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.6-r2.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.6-r2.ebuild index f1bdfc975450..1a2f4ab1ba55 100644 --- a/net-misc/rwhoisd/rwhoisd-1.5.9.6-r2.ebuild +++ b/net-misc/rwhoisd/rwhoisd-1.5.9.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,8 +21,8 @@ RDEPEND=" acct-user/rwhoisd " BDEPEND=" - sys-devel/flex - virtual/yacc + app-alternatives/lex + app-alternatives/yacc " src_compile() { diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.6-r3.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.6-r3.ebuild new file mode 100644 index 000000000000..3a5b26274eb5 --- /dev/null +++ b/net-misc/rwhoisd/rwhoisd-1.5.9.6-r3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="ARIN rwhois daemon" +HOMEPAGE="https://projects.arin.net/rwhois/" +SRC_URI="https://github.com/arineng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/rwhoisd-1.5.9.6-fix-build-for-clang16.patch.xz" +S="${WORKDIR}/${P}/${PN}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="virtual/libcrypt:=" +RDEPEND=" + ${DEPEND} + acct-group/rwhoisd + acct-user/rwhoisd +" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc +" + +# upstream PR: https://github.com/arineng/rwhoisd/pull/2 +PATCHES=( + "${WORKDIR}/${P}-fix-build-for-clang16.patch" + "${FILESDIR}/${P}-fix-direct-ar-call.patch" + "${FILESDIR}/${P}-c99.patch" +) + +src_prepare() { + default + eautoreconf #893906 +} + +src_compile() { + append-cflags -DNEW_STYLE_BIN_SORT -std=gnu89 + + emake -C common + emake -C regexp + emake -C mkdb + + default +} + +src_install() { + default + + doinitd "${FILESDIR}"/rwhoisd + newconfd "${FILESDIR}"/rwhoisd.conf rwhoisd +} + +pkg_postinst() { + einfo "Please make sure to set the userid in rwhoisd.conf to rwhoisd." + einfo "It is highly inadvisable to run rwhoisd as root." +} diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest index 7e4ff88b1507..c24a6a7adafa 100644 --- a/net-misc/rygel/Manifest +++ b/net-misc/rygel/Manifest @@ -1,2 +1 @@ -DIST rygel-0.40.1.tar.xz 1693996 BLAKE2B 505b96152c0b73bda2b7c81cb742f48cfea86738ea965f07afc1532a77e2262a5c0050eab185a33a831d57fc2f3c85247bc2a02bf73eab5d0be35817e8f00aac SHA512 180f143f394d7a2697c888eef7e7c2bdb5077b4ad289eb6e3f832cc1efde5147248b46e5ad9e77615d7976de7e7d3e68d737732bf7f91f01c42e18e06d8f89bb -DIST rygel-0.40.2.tar.xz 1696072 BLAKE2B 9071be84a36c603f4c113c5741e427a9b960e97b7262b41c4e4b96bd125ee938508fbae9eceda1dbb9ac9d8cccb096d5fbb3545adee36895845908e79b0dab59 SHA512 23bd31ef4d6d605797dffea4c71eee3770889f5ec54ece39df3743b82973eb0b42a54f3cfc1123e870976f9927987d59d9c0c2b9f69cdec731168dba118b1771 +DIST rygel-0.42.5.tar.xz 1704072 BLAKE2B a00be296956def2bc90b978df5b8c4b23a122b9c30adfa66c634249b5daafe8d21de1cac40417095d72d42e80522ce58fe678a7f7780bd1e134aa2cd66f3d2bf SHA512 cd1aaff4e2eb2c25931197d70f518a30dab75604d62b9f071bc560570c352371d132a10caaf94956d34ecd24505ccd9a7b9f5bf324d544c676ca1f47b124f533 diff --git a/net-misc/rygel/metadata.xml b/net-misc/rygel/metadata.xml index 3d82248dda85..3afa17b2d8a8 100644 --- a/net-misc/rygel/metadata.xml +++ b/net-misc/rygel/metadata.xml @@ -9,4 +9,7 @@ <flag name="tracker">Install dependencies for the tracker plugin</flag> <flag name="transcode">Install dependencies for transcoding support</flag> </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/rygel</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/rygel/rygel-0.40.1.ebuild b/net-misc/rygel/rygel-0.40.1.ebuild deleted file mode 100644 index 882ffb84994e..000000000000 --- a/net-misc/rygel/rygel-0.40.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_MIN_API_VERSION="0.42" -inherit gnome2 meson systemd vala - -DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer" -HOMEPAGE="https://wiki.gnome.org/Projects/Rygel" - -LICENSE="LGPL-2.1+ CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode" -RESTRICT="!test? ( test )" - -DEPEND=" - >=dev-libs/glib-2.56.0:2 - >=dev-libs/libgee-0.8:0.8 - >=dev-libs/libxml2-2.7:2 - >=media-libs/gstreamer-1.12:1.0 - >=media-libs/gst-plugins-base-1.12:1.0 - media-libs/gstreamer-editing-services:1.0 - >=media-libs/gupnp-dlna-0.9.4:2.0= - >=media-libs/libmediaart-0.7:2.0[vala] - media-plugins/gst-plugins-soup:1.0 - >=net-libs/gssdp-1.1.0:0=[vala] - >=net-libs/gupnp-1.1.0:0=[vala] - >=net-libs/gupnp-av-0.12.8:= - >=net-libs/libsoup-2.44:2.4 - >=sys-apps/util-linux-2.20 - x11-misc/shared-mime-info - introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) - sqlite? ( - >=dev-db/sqlite-3.5:3 - dev-libs/libunistring:= - x11-libs/gdk-pixbuf:2 - ) - tracker? ( app-misc/tracker:3= ) - transcode? ( - media-libs/gst-plugins-bad:1.0 - media-plugins/gst-plugins-twolame:1.0 - media-plugins/gst-plugins-libav:1.0 - ) - gtk? ( >=x11-libs/gtk+-3.22:3 ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - $(vala_depend) - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig -" -# Maintainer only -# app-text/docbook-xsl-stylesheets -# >=dev-lang/vala-0.36 -# dev-libs/libxslt - -src_prepare() { - vala_src_prepare - default - # Disable test triggering call to gst-plugins-scanner which causes - # sandbox issues when plugins such as clutter are installed - #sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \ - # -i tests/rygel-playbin-renderer-test.c || die - - #gnome2_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc api-docs) - -Dsystemd-user-units-dir=$(systemd_get_userunitdir) - -Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3") - -Dengines=gstreamer - -Dexamples=false - $(meson_use test tests) - -Dgstreamer=enabled - $(meson_feature gtk) - $(meson_feature introspection) - ) - meson_src_configure -} diff --git a/net-misc/rygel/rygel-0.40.2.ebuild b/net-misc/rygel/rygel-0.42.5.ebuild index 36099977232b..2e511bf9e740 100644 --- a/net-misc/rygel/rygel-0.40.2.ebuild +++ b/net-misc/rygel/rygel-0.42.5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VALA_MIN_API_VERSION="0.42" +EAPI=8 + inherit gnome.org meson systemd vala xdg DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer" @@ -10,43 +10,47 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel" LICENSE="LGPL-2.1+ CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode" RESTRICT="!test? ( test )" +# x11-libs/libX11 from qa-vdb DEPEND=" - >=dev-libs/glib-2.56.0:2 - >=dev-libs/libgee-0.8:0.8 + >=net-libs/gupnp-1.5.2:1.6=[vala] + >=dev-libs/libgee-0.8:0.8= + >=net-libs/gssdp-1.5.0:1.6=[vala] + >=dev-libs/glib-2.62.0:2 >=dev-libs/libxml2-2.7:2 - >=media-libs/gstreamer-1.12:1.0 - >=media-libs/gst-plugins-base-1.12:1.0 - media-libs/gstreamer-editing-services:1.0 + >=net-libs/gupnp-av-0.14.1:=[vala] >=media-libs/gupnp-dlna-0.9.4:2.0= + >=net-libs/libsoup-3:3.0 + sqlite? ( + >=dev-db/sqlite-3.5:3 + dev-libs/libunistring:= + ) + >=media-libs/gstreamer-1.20:1.0 + >=media-libs/gst-plugins-base-1.20:1.0 + media-libs/gstreamer-editing-services:1.0 >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 - >=net-libs/gssdp-1.1.0:0=[vala] - >=net-libs/gupnp-1.1.0:0=[vala] - >=net-libs/gupnp-av-0.12.8:= - >=net-libs/libsoup-2.44:2.4 + x11-libs/gdk-pixbuf:2 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) - sqlite? ( - >=dev-db/sqlite-3.5:3 - dev-libs/libunistring:= - x11-libs/gdk-pixbuf:2 - ) - tracker? ( app-misc/tracker:3= ) + tracker? ( app-misc/tracker:3=[vala(+)] ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 ) + + x11-libs/libX11 " RDEPEND="${DEPEND}" BDEPEND=" $(vala_depend) + app-text/docbook-xml-dtd:4.5 >=sys-devel/gettext-0.19.7 virtual/pkgconfig " @@ -56,7 +60,7 @@ BDEPEND=" # dev-libs/libxslt src_prepare() { - vala_src_prepare + vala_setup default # Disable test triggering call to gst-plugins-scanner which causes # sandbox issues when plugins such as clutter are installed @@ -69,6 +73,7 @@ src_prepare() { src_configure() { local emesonargs=( $(meson_use gtk-doc api-docs) + -Dman_pages=true -Dsystemd-user-units-dir=$(systemd_get_userunitdir) -Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3") -Dengines=gstreamer diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest index 0692454bfeae..9414ff997781 100644 --- a/net-misc/s3cmd/Manifest +++ b/net-misc/s3cmd/Manifest @@ -1,2 +1,3 @@ -DIST s3cmd-2.1.0.tar.gz 127120 BLAKE2B 4282f616eb7ca97fa0d529a2c5acc1359f88888d182b62e1fa7d3f7401a93852a4e0724363a4c6f0a6520d6aef290d64e1775cb252fc0fbaa4b94762402c381e SHA512 98156218c4379e233185662d29fa4299b4a4e45a0fe143a145f30ff7d03362a4558b5fff5e5da0da850f5cce2c760fcd031bcf5ff7a6bd2c6352259e791d65e6 DIST s3cmd-2.2.0.tar.gz 134390 BLAKE2B d578aa13a7b8599c70dc6daa5d21950331b0b07278479d1f3947e6be78a9bd108c7f8ea6f198fa518dfa6ad44d907d979a29d5d9f1a15e4f73484fcebb118225 SHA512 07b2410554233b435b3476e09fd14354abaa19374cc1211f861147023470599483c18d213a44b5c9aee32d71b5a4bc5d9ce25721fb077cbadfd208d457e13845 +DIST s3cmd-2.3.0.tar.gz 136754 BLAKE2B 61feff68d008536d4d31009f4ad18da37ccd0cdab9bfdf151b7112ac66f43bde78f042bc2ad36998fe070428a10a9ba99db5d6d39e9eb74e829a855eb11d1697 SHA512 3507fb8b597617a384508149cb30bdfa8bc8a7b3705782fbf9a943c4be413dc5b7cfb3572b632e8bebbb644ab31f418428ccca996c0d2ba840ad88df1f5a406a +DIST s3cmd-2.4.0.tar.gz 144976 BLAKE2B d854281a029b9865dc40d6bebd0994840a201ad573dfc628916daec00a6b38022f3f3c80aa745870c0b594443da747b1967d24976701e4d97167cfc087ae6dd8 SHA512 78a7fb193ef94759e6b59c8bccc2e736f4195f7de781f6a5d11a5685a3cf93ca9ef946bdefbfe0b0dafd0ea0612c8944283c3177f280d14edfca6553e62e0b49 diff --git a/net-misc/s3cmd/files/s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch b/net-misc/s3cmd/files/s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch deleted file mode 100644 index 92d90c6df9b4..000000000000 --- a/net-misc/s3cmd/files/s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 4806955e05011c3d981e91c12a95d84ab3aa65d4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <obudai@redhat.com> -Date: Fri, 2 Oct 2020 14:24:09 +0200 -Subject: [PATCH] fix compatibility with Python 3.9 - -getchildren() method was removed from the ElementTree and Element classes in -Python 3.9. See the release notes: - -https://docs.python.org/3.9/whatsnew/3.9.html#removed ---- - S3/Exceptions.py | 2 +- - S3/Utils.py | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/S3/Exceptions.py b/S3/Exceptions.py -index d12c5c5..2710d82 100644 ---- a/S3/Exceptions.py -+++ b/S3/Exceptions.py -@@ -126,7 +126,7 @@ class S3Error (S3Exception): - if not error_node.tag == "Error": - error_node = tree.find(".//Error") - if error_node is not None: -- for child in error_node.getchildren(): -+ for child in error_node: - if child.text != "": - debug("ErrorXML: " + child.tag + ": " + repr(child.text)) - info[child.tag] = child.text -diff --git a/S3/Utils.py b/S3/Utils.py -index b9f4fd5..1f66f6c 100644 ---- a/S3/Utils.py -+++ b/S3/Utils.py -@@ -64,9 +64,9 @@ def parseNodes(nodes): - retval = [] - for node in nodes: - retval_item = {} -- for child in node.getchildren(): -+ for child in node: - name = decode_from_s3(child.tag) -- if child.getchildren(): -+ if len(child): - retval_item[name] = parseNodes([child]) - else: - found_text = node.findtext(".//%s" % child.tag) -@@ -122,8 +122,8 @@ __all__.append("getListFromXml") - - def getDictFromTree(tree): - ret_dict = {} -- for child in tree.getchildren(): -- if child.getchildren(): -+ for child in tree: -+ if len(child): - ## Complex-type child. Recurse - content = getDictFromTree(child) - else: --- -2.26.3 - diff --git a/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild b/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild deleted file mode 100644 index 0206e5fe4679..000000000000 --- a/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 python3_8 python3_9 ) -PYTHON_REQ_USE="xml" - -inherit distutils-r1 - -DESCRIPTION="Command line client for Amazon S3" -HOMEPAGE="https://s3tools.org/s3cmd" -SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ia64 x86 ~amd64-linux ~x64-macos" - -RDEPEND=" - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/python-magic[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${P/_/-}" - -PATCHES=( "${FILESDIR}/${P}-fix-compatibility-with-Python-3.9.patch" ) diff --git a/net-misc/s3cmd/s3cmd-2.1.0.ebuild b/net-misc/s3cmd/s3cmd-2.1.0.ebuild deleted file mode 100644 index cafc9522fdfd..000000000000 --- a/net-misc/s3cmd/s3cmd-2.1.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 python3_8 python3_9 ) -PYTHON_REQ_USE="xml" - -inherit distutils-r1 - -DESCRIPTION="Command line client for Amazon S3" -HOMEPAGE="https://s3tools.org/s3cmd" -SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ia64 x86 ~amd64-linux ~x64-macos" - -RDEPEND=" - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/python-magic[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${P/_/-}" diff --git a/net-misc/s3cmd/s3cmd-2.2.0.ebuild b/net-misc/s3cmd/s3cmd-2.2.0.ebuild index 7904b28a3b7c..ff60617f838c 100644 --- a/net-misc/s3cmd/s3cmd-2.2.0.ebuild +++ b/net-misc/s3cmd/s3cmd-2.2.0.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_10 ) +PYTHON_REQ_USE="xml(+)" inherit distutils-r1 DESCRIPTION="Command line client for Amazon S3" HOMEPAGE="https://s3tools.org/s3cmd" -SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/s3tools/${P/_/-}.tar.gz" S="${WORKDIR}/${P/_/-}" LICENSE="GPL-2" diff --git a/net-misc/s3cmd/s3cmd-2.3.0.ebuild b/net-misc/s3cmd/s3cmd-2.3.0.ebuild new file mode 100644 index 000000000000..8a1ddd1d49f9 --- /dev/null +++ b/net-misc/s3cmd/s3cmd-2.3.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" + +inherit distutils-r1 + +DESCRIPTION="Command line client for Amazon S3" +HOMEPAGE="https://s3tools.org/s3cmd" +SRC_URI="https://downloads.sourceforge.net/s3tools/${P/_/-}.tar.gz" +S="${WORKDIR}/${P/_/-}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ia64 ~loong x86 ~amd64-linux ~x64-macos" + +RDEPEND=" + || ( + dev-python/python-magic[${PYTHON_USEDEP}] + sys-apps/file[python,${PYTHON_USEDEP}] + ) + dev-python/python-dateutil[${PYTHON_USEDEP}] + " + +src_install() { + distutils-r1_src_install + rm -r "${ED}/usr/share/doc/packages" || die +} diff --git a/net-misc/s3cmd/s3cmd-2.4.0.ebuild b/net-misc/s3cmd/s3cmd-2.4.0.ebuild new file mode 100644 index 000000000000..4dcbaecc0089 --- /dev/null +++ b/net-misc/s3cmd/s3cmd-2.4.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 + +DESCRIPTION="Command line client for Amazon S3" +HOMEPAGE="https://s3tools.org/s3cmd" +SRC_URI="https://downloads.sourceforge.net/s3tools/${P/_/-}.tar.gz" +S="${WORKDIR}/${P/_/-}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~loong ~x86 ~amd64-linux ~x64-macos" + +RDEPEND=" + || ( + dev-python/python-magic[${PYTHON_USEDEP}] + sys-apps/file[python,${PYTHON_USEDEP}] + ) + dev-python/python-dateutil[${PYTHON_USEDEP}] + " + +src_install() { + distutils-r1_src_install + rm -r "${ED}/usr/share/doc/packages" || die +} diff --git a/net-misc/s4cmd/Manifest b/net-misc/s4cmd/Manifest index b9594713d437..83de44f6b719 100644 --- a/net-misc/s4cmd/Manifest +++ b/net-misc/s4cmd/Manifest @@ -1 +1,3 @@ +DIST s4cmd-2.1.0-botocore-fix.patch 2449 BLAKE2B 5158ded38f8e3417c090d274063a4eaa4f25cd5005c4bb8793cc639d3d87875f31d87464a8dbb44b5c1690570865cb01a0681f2e92edc46fa549828b91f30a0a SHA512 ea889d069a86a1d1f7f5cf5b1f19a9d0b35527c3db5eecf9202cca742ad4442655169d8688fc4b290a1362a0a794ba8ac44abf697ea7830acf8e48b6c7998ef6 +DIST s4cmd-2.1.0-py3-iter.patch 768 BLAKE2B 3e6bf42d40b87048521e1e3672bbb5c75a2d923696c85cfe9cd7140a388b483d830002354562ccc6017a8c8225799c0cb9ead2e136a37fec7ed0722e6ee99c39 SHA512 8070a987bf48c5832a80f39213125b4209141d1c35e612b26dce307fa621772741401f1da355b2a56e7869a3c76f4b91301d4aeae56f3810ce9a6ce6f9fd917b DIST s4cmd-2.1.0.tar.gz 39312 BLAKE2B 9d2d533273543153f2bad69362933315f65c5e70bd45c102e42b1b733989815239ae4d027ac08d658f03263bd9dd75f1f6db802b5f38ed3256da5e7c9f48558c SHA512 05e930e2789ce8ab280dcdb2f08e4162930d946d2ed2e4f1c754c8b875375774779b73729151bd23d9bf3736bc48f7626fe53df66aff71dd11b32e90e9355470 diff --git a/net-misc/s4cmd/metadata.xml b/net-misc/s4cmd/metadata.xml index aaab041e8885..2b826ec06b69 100644 --- a/net-misc/s4cmd/metadata.xml +++ b/net-misc/s4cmd/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="person"> <email>robbat2@gentoo.org</email> </maintainer> +<upstream> + <remote-id type="github">bloomreach/s4cmd</remote-id> +</upstream> </pkgmetadata> diff --git a/net-misc/s4cmd/s4cmd-2.1.0.ebuild b/net-misc/s4cmd/s4cmd-2.1.0-r2.ebuild index c15fbeeee59f..d80445061cdb 100644 --- a/net-misc/s4cmd/s4cmd-2.1.0.ebuild +++ b/net-misc/s4cmd/s4cmd-2.1.0-r2.ebuild @@ -1,16 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_7 python3_8 python3_9 python3_10 ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) +PYTHON_REQ_USE="xml(+)" inherit distutils-r1 bash-completion-r1 DESCRIPTION="Super S3 command line tool" HOMEPAGE="https://github.com/bloomreach/s4cmd" -SRC_URI="https://github.com/bloomreach/s4cmd/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://github.com/bloomreach/s4cmd/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/bloomreach/s4cmd/pull/162.patch -> ${P}-py3-iter.patch + https://github.com/bloomreach/s4cmd/pull/310.patch -> ${P}-botocore-fix.patch +" +PATCHES=( + "${DISTDIR}/${P}-botocore-fix.patch" + "${DISTDIR}/${P}-py3-iter.patch" +) LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest index 6db883a2a0f4..3f01feea5204 100644 --- a/net-misc/s6-networking/Manifest +++ b/net-misc/s6-networking/Manifest @@ -1,5 +1 @@ -DIST s6-networking-2.3.0.2.tar.gz 85977 BLAKE2B 883caa1d2376e1897b35fd6992a512bb9915be08b0fed10447fac3bf3acf8587153bb15d3b2c4750b02e7fdba8793253d7145afe9aef83a10efd33df3ee46c67 SHA512 c99afd9bdbd5003f57de8f88f091971f0269cd8efee5791c3c4aa90ad34b978d0f57724d4128e9d20d6a40d731853bb4bdaa76dd860f975ff7f84a56b0050256 -DIST s6-networking-2.3.0.3.tar.gz 86765 BLAKE2B 1454250de9014597e7cf3dfb7364fc5283b26c5510c5b7a825255af0626bd3b12ce456290c7a1fb58f61fae1bb5757ea4cd803a6896b554511e19cd01fa3741e SHA512 f710c8c67b88523d4d461ab775ad3a56ca148e0e5ee4c02fe40d0783ff43af8779e598548db5048cc32852be6659f2feb7ac29ba07a953daa0039cec0fc14762 -DIST s6-networking-2.3.0.4.tar.gz 87120 BLAKE2B 76d3c8507c489ffd0dd21fd2dfac5ea272e63ef5a7c489619a938bd164bc554bcd501705de78a9737250cb4bccb3f87485cb82cd2abaa601867c1ac451a417a2 SHA512 e0a6dbaf3420beae5b6bab1cedeaeb5d58dea36c9a6e1c3f7140515c83eaf3e872f896d90e43771d74669edcc0a3f25ba8135cc3a21d378a297d92ba2abc62d3 -DIST s6-networking-2.3.1.1.tar.gz 87461 BLAKE2B 43cbb0762c48c31f0ee2f73605436397c2f7ae34bc788844c9fac0f15bd5a5693a8499c808f913b3cd5db53b30c7ffa425ce764c1d701b950c8b18421ff3e8d3 SHA512 3bd7cdbf6f105bb83c5116e736f4288d378571467e7aa93f862eba80ce28255bda77140a2a1cf80af80480789dfb38682049f6769952fb8964b860bdf465551b -DIST s6-networking-2.3.2.0.tar.gz 87949 BLAKE2B 675974fd5a2e2e764944eb314725834bbc1e4a17b87af9559cda4bca4a6cb3f0e766741519a4d5024f7a8608dfe80310801a59a2b04f8ccd42acede27efeffe2 SHA512 876005e3060493fb22efb59dcdc3392eb746454cf9c11c9c0ebdd6b24789db18e364039096a8a4168dcd4023b98e539d8489d490a0b7a24ddccc437f7076618d +DIST s6-networking-2.7.0.2.tar.gz 115997 BLAKE2B 24728f3b5e08eb94b295f345231a348c072c08a84d42585763bed8fe7057eeee6860b0d00f8548a86a896db98f1c4f51346b12f9361d500f962de6defe39308e SHA512 49f80c68d639f2b7ac7451ca2ace828ca4e8c1eeffec4a9b31f8157c26a87228275ea14d8b6495b0af0879a961b37910aa2b769d8db56d8731d0827c96053631 diff --git a/net-misc/s6-networking/metadata.xml b/net-misc/s6-networking/metadata.xml index ee2befa691d5..0bd640ba770c 100644 --- a/net-misc/s6-networking/metadata.xml +++ b/net-misc/s6-networking/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>arkamar@gentoo.org</email> + <name>Petr Vaněk</name> + </maintainer> + <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> diff --git a/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild deleted file mode 100644 index 6aa894cbc45a..000000000000 --- a/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator - -DESCRIPTION="suite of small networking utilities for Unix systems" -HOMEPAGE="https://www.skarnet.org/software/s6-networking/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/$(get_version_component_range 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="static static-libs" - -DEPEND=">=sys-devel/make-3.81 - static? ( - >=dev-lang/execline-2.3.0.2[static-libs] - >=dev-libs/skalibs-2.6.0.0[static-libs] - >=net-dns/s6-dns-2.2.0.1[static-libs] - >=sys-apps/s6-2.6.1.0[static-libs] - ) - !static? ( - >=dev-lang/execline-2.3.0.2[static=] - >=dev-libs/skalibs-2.6.0.0 - >=net-dns/s6-dns-2.2.0.1[static=] - >=sys-apps/s6-2.6.1.0[static=] - ) -" -RDEPEND=" - >=dev-lang/execline-2.3.0.2:=[!static?] - >=sys-apps/s6-2.6.1.0:=[!static?] - !static? ( - >=dev-libs/skalibs-2.6.0.0:= - >=net-dns/s6-dns-2.2.0.1:= - ) -" - -HTML_DOCS="doc/*" - -src_prepare() { - default - - # Remove QA warning about LDFLAGS addition - sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die - - # configure overrides gentoo's -fstack-protector default - sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/s6 \ - --with-lib=/usr/$(get_libdir)/s6-dns \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - --disable-ssl \ - $(use_enable !static shared) \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} diff --git a/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild deleted file mode 100644 index f800a625df77..000000000000 --- a/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="suite of small networking utilities for Unix systems" -HOMEPAGE="https://www.skarnet.org/software/s6-networking/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="static static-libs" - -REQUIRED_USE="static? ( static-libs )" - -DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?] - >=sys-apps/s6-2.7.2.0[static-libs?] - >=net-dns/s6-dns-2.3.0.1[static-libs?] - >=dev-libs/skalibs-2.7.0.0[static-libs?] -" -RDEPEND=">=dev-lang/execline-2.5.0.1:= - >=sys-apps/s6-2.7.2.0:= - !static? ( - >=net-dns/s6-dns-2.3.0.1:= - >=dev-libs/skalibs-2.7.0.0:= - ) -" - -HTML_DOCS="doc/*" - -src_prepare() { - default - - # Remove QA warning about LDFLAGS addition - sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die - - # configure overrides gentoo's -fstack-protector default - sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/s6 \ - --with-lib=/usr/$(get_libdir)/s6-dns \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - --enable-shared \ - --disable-ssl \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} diff --git a/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild deleted file mode 100644 index 7b2f39aa2ae6..000000000000 --- a/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Suite of small networking utilities for Unix systems" -HOMEPAGE="https://www.skarnet.org/software/s6-networking/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="static static-libs" - -REQUIRED_USE="static? ( static-libs )" - -RDEPEND=">=dev-lang/execline-2.5.1.0:=[static-libs?] - >=dev-libs/skalibs-2.8.0.0:=[static-libs?] - >=sys-apps/s6-2.8.0.0:=[static-libs?] - !static? ( - >=net-dns/s6-dns-2.3.0.2:= - ) -" -DEPEND="${RDEPEND} - >=net-dns/s6-dns-2.3.0.2[static-libs?] -" - -HTML_DOCS=( doc/. ) - -src_prepare() { - default - - # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector - sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \ - configure || die -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/usr/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/usr/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/s6 \ - --with-lib=/usr/$(get_libdir)/s6-dns \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - --enable-shared \ - --disable-ssl \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} diff --git a/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild b/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild deleted file mode 100644 index bd50b35c8b36..000000000000 --- a/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Suite of small networking utilities for Unix systems" -HOMEPAGE="https://www.skarnet.org/software/s6-networking/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="static static-libs" - -REQUIRED_USE="static? ( static-libs )" - -RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?] - >=dev-libs/skalibs-2.9.1.0:=[static-libs?] - >=sys-apps/s6-2.9.0.1:=[static-libs?] - !static? ( - >=net-dns/s6-dns-2.3.1.1:= - ) -" -DEPEND="${RDEPEND} - >=net-dns/s6-dns-2.3.1.1[static-libs?] -" - -HTML_DOCS=( doc/. ) - -src_prepare() { - default - - # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector - sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \ - configure || die -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/usr/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/usr/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/s6 \ - --with-lib=/usr/$(get_libdir)/s6-dns \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - --enable-shared \ - --disable-ssl \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} diff --git a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild deleted file mode 100644 index 356302cf9f86..000000000000 --- a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Suite of small networking utilities for Unix systems" -HOMEPAGE="https://www.skarnet.org/software/s6-networking/" -SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="static static-libs" - -REQUIRED_USE="static? ( static-libs )" - -RDEPEND=">=dev-lang/execline-2.6.1.1:=[static-libs?] - >=dev-libs/skalibs-2.9.3.0:=[static-libs?] - >=sys-apps/s6-2.9.2.0:=[execline,static-libs?] - !static? ( - >=net-dns/s6-dns-2.3.3.0:= - ) -" -DEPEND="${RDEPEND} - >=net-dns/s6-dns-2.3.3.0[static-libs?] -" - -HTML_DOCS=( doc/. ) - -src_prepare() { - default - - # Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector - sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \ - configure || die -} - -src_configure() { - econf \ - --bindir=/bin \ - --dynlibdir=/usr/$(get_libdir) \ - --libdir=/usr/$(get_libdir)/${PN} \ - --with-dynlib=/usr/$(get_libdir) \ - --with-lib=/usr/$(get_libdir)/s6 \ - --with-lib=/usr/$(get_libdir)/s6-dns \ - --with-lib=/usr/$(get_libdir)/skalibs \ - --with-sysdeps=/usr/$(get_libdir)/skalibs \ - --enable-shared \ - --disable-ssl \ - $(use_enable static allstatic) \ - $(use_enable static static-libc) \ - $(use_enable static-libs static) -} diff --git a/net-misc/s6-networking/s6-networking-2.7.0.2.ebuild b/net-misc/s6-networking/s6-networking-2.7.0.2.ebuild new file mode 100644 index 000000000000..f5b5ff1a8ae0 --- /dev/null +++ b/net-misc/s6-networking/s6-networking-2.7.0.2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature toolchain-funcs + +DESCRIPTION="Suite of small networking utilities for Unix systems" +HOMEPAGE="https://www.skarnet.org/software/s6-networking/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~x86" +IUSE="ssl" + +RDEPEND=" + dev-lang/execline:= + >=dev-libs/skalibs-2.14.1.0:= + >=net-dns/s6-dns-2.3.7.0:= + sys-apps/s6:=[execline] + ssl? ( dev-libs/libretls:= ) +" +DEPEND="${RDEPEND}" + +HTML_DOCS=( doc/. ) + +src_prepare() { + default + + # Avoid QA warning for LDFLAGS addition + sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die + + sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die +} + +src_configure() { + tc-export AR CC RANLIB + + local myconf=( + --bindir=/bin + --dynlibdir="/$(get_libdir)" + --libdir="/usr/$(get_libdir)/${PN}" + --with-dynlib="/$(get_libdir)" + --with-lib="/usr/$(get_libdir)/s6" + --with-lib="/usr/$(get_libdir)/s6-dns" + --with-lib="/usr/$(get_libdir)/skalibs" + --with-sysdeps="/usr/$(get_libdir)/skalibs" + --enable-shared + --disable-allstatic + --disable-static + --disable-static-libc + $(use_enable ssl ssl libtls) + ) + + econf "${myconf[@]}" +} + +pkg_postinst() { + optfeature "man pages" app-doc/s6-networking-man-pages +} diff --git a/net-misc/scponly/scponly-4.8-r7.ebuild b/net-misc/scponly/scponly-4.8-r8.ebuild index 67f6348fc896..93ddd8138d29 100644 --- a/net-misc/scponly/scponly-4.8-r7.ebuild +++ b/net-misc/scponly/scponly-4.8-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,11 +7,11 @@ inherit readme.gentoo-r1 toolchain-funcs DESCRIPTION="A tiny pseudoshell which only permits scp and sftp" HOMEPAGE="https://github.com/scponly/scponly" -SRC_URI="mirror://sourceforge/scponly/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/scponly/${P}.tgz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ppc sparc x86" +KEYWORDS="amd64 ~ppc sparc x86" IUSE="chroot +sftp scp winscp gftp rsync unison subversion wildcards quota passwd logging" REQUIRED_USE=" || ( sftp scp winscp rsync unison subversion ) @@ -19,7 +19,7 @@ REQUIRED_USE=" RDEPEND=" sys-apps/sed - net-misc/openssh + virtual/openssh chroot? ( acct-user/scponly acct-group/scponly ) quota? ( sys-fs/quota ) rsync? ( net-misc/rsync ) @@ -55,7 +55,7 @@ src_configure() { } src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } src_install() { diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest index 9c728b57e0c1..6014a70f8943 100644 --- a/net-misc/seafile-client/Manifest +++ b/net-misc/seafile-client/Manifest @@ -1,4 +1,2 @@ -DIST seafile-client-8.0.1.tar.gz 11679293 BLAKE2B 52ad28fb316d99240692883218e626a8ca33f8265d62dadfc2eed400c889d47e9aa7887ea6c6fd994596537a5db163b334fb72c791b38529f7219c5a25c813d3 SHA512 ca5dd5a6b27316e1f6fb670e3286d24015d99391c0e1447e2ed42f3d4f72769d6a3dda78bc388ad8d303d4ab1167e4e50844574ecd6f61149b1966e99a3a7719 -DIST seafile-client-8.0.2.tar.gz 11694494 BLAKE2B 7230b17e9b85a990b87b9fae7d2d7bfc3a388ae82a777b3fa3abf8a2e88bb3ad6d73c8ff60aef34587ced6665594a71c0020c90065f6bd4fcaac79e15b41f923 SHA512 f66ea240816ec09b56bf3b121947a26bfbafeacd34c1cdb77f8244c713f0aea3f920c6eb6c3cf161034001a7d8ddb451e507acfb6f97e21ac5ebbb792da7ebf4 -DIST seafile-client-8.0.3.tar.gz 11694141 BLAKE2B 03a30d824ebe45a58a93baf127714b119c73254cdbc3f13f5cc81807dbf7ebfc333a2e1c36a325728d1bc60fa3392eb7c7eb6ea7d978808200abe2e93c63cc72 SHA512 944751e84b5336d07c0a24a69c10ef4e5a84b133c22d148226bceee9ae8f989c45de28950c0a16fb66eb9a5aa43ff83a21c5b0979e5421763383b93acdde5aff -DIST seafile-client-8.0.4.tar.gz 11701804 BLAKE2B 4d1647a4c783be634eca79ff3ca0713888c38222c1c571f11393a4cc6067073c4ac2a41256a678482c8e66c16cc88dc04883f432d81e374a06264650fe198ade SHA512 eb9afa97f02cfd6054dab34c0ce7e268b8faca49d364d0051358c3f69ae4c8b4e130025891a4c99e4d6cd5abe6b617ea23bcc0d6f2b07ea438debf9899b6d406 +DIST seafile-client-8.0.9.tar.gz 11716754 BLAKE2B 2087d2b31ce4696fdaaaa723da7a353c54ebebef86c84b62146d806692066165d0499f5fd6d3be108130d28c297020eafc3497be03131c8a8751f34f33eece90 SHA512 d0b55883f8d00138c092309994047652c6a5aa8b66182f83b6c852f1721794d9d8125da5fba282e9efdb92a0a97a55ecd6e225ab6a7916718a05ea2b7f4bd944 +DIST seafile-client-9.0.3.tar.gz 11718581 BLAKE2B cb2cecc9b02df4edb7b7191fd609ee5bc3548849c68b3c0cd8f59641bd0716791c2272633c0ba0f4f7b374a1302fd81a8f1396736961cb4e6e4ef1dd8db82c85 SHA512 c2d77c5f9407fd6d4ce3dfd47044de83a3c3e0bbbd1b66f1566ad54a8aa5391f51f70c7e094f16216a653a5ef0e9b8de1025ee56ce56c496c31c87983fbee4d7 diff --git a/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch b/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch deleted file mode 100644 index 9b2dd42cc926..000000000000 --- a/net-misc/seafile-client/files/seafile-client-8.0.1-glib-2.68.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fbf1d2f..05e8d4d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,7 @@ SET(SEAFILE_CLIENT_VERSION_MINOR 0) - SET(SEAFILE_CLIENT_VERSION_PATCH 1) - SET(PROJECT_VERSION "${SEAFILE_CLIENT_VERSION_MAJOR}.${SEAFILE_CLIENT_VERSION_MINOR}.${SEAFILE_CLIENT_VERSION_PATCH}") - ADD_DEFINITIONS(-DSEAFILE_CLIENT_VERSION=${PROJECT_VERSION}) -+ADD_DEFINITIONS(-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26) - INCLUDE(FindPkgConfig) - - ## Build crash repoter on release build as default diff --git a/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch new file mode 100644 index 000000000000..4d3a3d172644 --- /dev/null +++ b/net-misc/seafile-client/files/seafile-client-8.0.6-select-qt5.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1c4a4447..5747df46 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -133,14 +133,12 @@ ENDIF() + #################### + ###### BEGIN: QT configuration + #################### +-FIND_PROGRAM(qmake_executable NAMES qmake qmake.exe) +-EXECUTE_PROCESS(COMMAND +- bash -c "${qmake_executable} --version | grep -iE '^using qt version [0-9.]+' | awk '{print $4}'" +- OUTPUT_VARIABLE DETECTED_QT_VERSION +- OUTPUT_STRIP_TRAILING_WHITESPACE) ++FIND_PACKAGE(Qt5Core) ++SET(DETECTED_QT_VERSION ${Qt5Core_VERSION}) + MESSAGE("Qt version: ${DETECTED_QT_VERSION}") ++GET_TARGET_PROPERTY(QMAKE_EXECUTABLE_PATH Qt5::qmake IMPORTED_LOCATION) + EXECUTE_PROCESS(COMMAND +- bash -c "qmake --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'" ++ bash -c "${QMAKE_EXECUTABLE_PATH} --version|grep -iE '^using qt version [0-9]'|awk '{print $4}'|grep -iE '^[0-9]'|awk -F . '{print $1}'" + OUTPUT_VARIABLE QT_VERSION_MAJOR + OUTPUT_STRIP_TRAILING_WHITESPACE) + MESSAGE("QT_VERSION_MAJOR: ${QT_VERSION_MAJOR}") diff --git a/net-misc/seafile-client/files/seafile-client-select-qt5.patch b/net-misc/seafile-client/files/seafile-client-select-qt5.patch deleted file mode 100644 index ed48dcf47573..000000000000 --- a/net-misc/seafile-client/files/seafile-client-select-qt5.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4261fba..24fbbda 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -158,11 +158,8 @@ SET(QT_VERSION_MAJOR 5) - # have to keep using QtWebKit on windows because QtWebEngine can't be - # compiled in msys2/mingw (QtWebEnigne is based on chrome, which has to be - # compiled with MSVC.) --FIND_PROGRAM(qmake_executable NAMES qmake qmake.exe) --EXECUTE_PROCESS(COMMAND -- bash -c "${qmake_executable} --version | grep -iE '^using qt version [0-9.]+' | awk '{print $4}'" -- OUTPUT_VARIABLE DETECTED_QT_VERSION -- OUTPUT_STRIP_TRAILING_WHITESPACE) -+FIND_PACKAGE(Qt5Core) -+SET(DETECTED_QT_VERSION ${Qt5Core_VERSION}) - MESSAGE("qt5 version: ${DETECTED_QT_VERSION}") - IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0) - ADD_DEFINITIONS(-DSEAFILE_USE_WEBKIT) diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml index 652f773a8e4b..1e23f1b9995c 100644 --- a/net-misc/seafile-client/metadata.xml +++ b/net-misc/seafile-client/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@retornaz.com</email> - <name>Quentin Retornaz</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="shibboleth">Build support for Shibboleth single sign-on</flag> </use> diff --git a/net-misc/seafile-client/seafile-client-8.0.1-r3.ebuild b/net-misc/seafile-client/seafile-client-8.0.1-r3.ebuild deleted file mode 100644 index ffac16697ade..000000000000 --- a/net-misc/seafile-client/seafile-client-8.0.1-r3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Seafile desktop client" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" -SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="shibboleth test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-db/sqlite:3 - dev-libs/jansson:= - dev-libs/libevent:= - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-libs/openssl:= - net-libs/libsearpc - ~net-misc/seafile-${PV} - shibboleth? ( dev-qt/qtwebengine:5[widgets] )" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 )" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}/${PN}-select-qt5.patch" - "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" - "${FILESDIR}/${P}-glib-2.68.0.patch" -) - -src_configure() { - local mycmakeargs=( - -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" - -DBUILD_TESTING="$(usex test)" - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-misc/seafile-client/seafile-client-8.0.3-r1.ebuild b/net-misc/seafile-client/seafile-client-8.0.3-r1.ebuild deleted file mode 100644 index 0173c0bb30e0..000000000000 --- a/net-misc/seafile-client/seafile-client-8.0.3-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -RELEASE_COMMIT="c49c317f3bf19001c06f189d0706b6a3a2d6533c" - -inherit xdg cmake - -DESCRIPTION="Seafile desktop client" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="shibboleth test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/libevent:= - dev-libs/openssl:= - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - net-libs/libsearpc - ~net-misc/seafile-${PV} - shibboleth? ( dev-qt/qtwebengine:5[widgets] ) - sys-libs/zlib" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 )" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}/${PN}-select-qt5.patch" - "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" -) - -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - -src_configure() { - local mycmakeargs=( - -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" - -DBUILD_TESTING="$(usex test)" - ) - cmake_src_configure -} diff --git a/net-misc/seafile-client/seafile-client-8.0.2-r1.ebuild b/net-misc/seafile-client/seafile-client-8.0.9.ebuild index d2c2f9add43a..54a7323dc84f 100644 --- a/net-misc/seafile-client/seafile-client-8.0.2-r1.ebuild +++ b/net-misc/seafile-client/seafile-client-8.0.9.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -RELEASE_COMMIT="837be8efd5cab4aea8fc1138ab91e93539a4e010" +# Upstream is moving tags repeatedly, then we use commit hash. +RELEASE_COMMIT="5701514e89114b97795d4cfcbc3b59a1fd2f91e8" -inherit cmake xdg-utils +inherit xdg cmake DESCRIPTION="Seafile desktop client" HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/" @@ -13,30 +14,32 @@ SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="shibboleth test" RESTRICT="!test? ( test )" RDEPEND="dev-db/sqlite:3 + dev-libs/glib:2 dev-libs/jansson:= - dev-libs/libevent:= + dev-libs/openssl:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 - dev-libs/openssl:= - net-libs/libsearpc + >=net-libs/libsearpc-3.2.0_p1 ~net-misc/seafile-${PV} + sys-libs/zlib + virtual/opengl + elibc_musl? ( sys-libs/fts-standalone ) shibboleth? ( dev-qt/qtwebengine:5[widgets] )" DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 )" BDEPEND="dev-qt/linguist-tools:5" PATCHES=( - "${FILESDIR}/${PN}-select-qt5.patch" + "${FILESDIR}/${PN}-8.0.6-select-qt5.patch" "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" - "${FILESDIR}/${PN}-8.0.1-glib-2.68.0.patch" ) S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" @@ -46,13 +49,7 @@ src_configure() { -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" -DBUILD_TESTING="$(usex test)" ) + # 863554 + use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" ) cmake_src_configure } - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-misc/seafile-client/seafile-client-8.0.4.ebuild b/net-misc/seafile-client/seafile-client-9.0.3.ebuild index 243dcf911e7a..40f2512ca009 100644 --- a/net-misc/seafile-client/seafile-client-8.0.4.ebuild +++ b/net-misc/seafile-client/seafile-client-9.0.3.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -RELEASE_COMMIT="7317fb425226961708c6dccf5c0607ba2a177797" +# Upstream is moving tags repeatedly, then we use commit hash. +RELEASE_COMMIT="57aa79cf4d1175a39cde20a38167db4fd3e12293" inherit xdg cmake @@ -26,17 +27,18 @@ RDEPEND="dev-db/sqlite:3 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 - net-libs/libsearpc + >=net-libs/libsearpc-3.2.0_p1 ~net-misc/seafile-${PV} sys-libs/zlib virtual/opengl + elibc_musl? ( sys-libs/fts-standalone ) shibboleth? ( dev-qt/qtwebengine:5[widgets] )" DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 )" BDEPEND="dev-qt/linguist-tools:5" PATCHES=( - "${FILESDIR}/${PN}-select-qt5.patch" + "${FILESDIR}/${PN}-8.0.6-select-qt5.patch" "${FILESDIR}/${PN}-7.0.9-qt-5.15.patch" ) @@ -47,5 +49,7 @@ src_configure() { -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" -DBUILD_TESTING="$(usex test)" ) + # 863554 + use elibc_musl && mycmakeargs+=( -DCMAKE_CXX_STANDARD_LIBRARIES="-lfts" ) cmake_src_configure } diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest index 6555bb0989f0..ed2334a2a495 100644 --- a/net-misc/seafile/Manifest +++ b/net-misc/seafile/Manifest @@ -1,4 +1,2 @@ -DIST seafile-8.0.1.tar.gz 731105 BLAKE2B ac4b79112e40196cce2dbc64bb94a852b3f81ea08e0a833d45a297c02f5f66432345647b9a34aef67d8108d16eb5e3648002a070bb556a70be63b8c0314af9bb SHA512 dd6366c06bfa25f16f5d3b2ef83b39b5886e834697891c274a3b4eafec3aabf72858dd4d341452e8d4fb8cd1166d30bb8a783dddb4370c02526e3a00ed9fdb3c -DIST seafile-8.0.2.tar.gz 732341 BLAKE2B 29bf3187a37c0f01261d3afba996e1165ddebe05a36f734fd3d7ee5d0368ae2f94b70cd9251799ddeeea2318c510094b7b2fe917ce06a6328aca00f378dcb9ae SHA512 772dfb060e381eb2395b7ab094e11865f13e71f8c767d31e4ca8b48eaadf74d5d447298ea261f9cd48ff126828829c8d258ca943b01890f72072a36753d8333b -DIST seafile-8.0.3.tar.gz 738066 BLAKE2B 302de3b5a4f465429955d2819c7b43ddb305cccc76cc7cf67885a75747ec5dcad85d17f94975abdd3b3d54d49a5d9ea05ab7947c3a2b84764b50fe5fb10e7636 SHA512 c51edfc094aa509c730b1b3f4ceb911461081689c8cc2564fb866cddaa54c445d9ad12ca9e4e90e98b771eafc6b6e1496e052538a2475a03642cdceb9212115a -DIST seafile-8.0.4.tar.gz 738250 BLAKE2B 5502160519144764de16fe50ccc922dd2bce43571aa3485758c23667cb1546e60683f2fe7778c5da6c7a4c18d78f544e72a40ba6857a58cec3fa2b817d7e5d82 SHA512 9dad4a4bd288598dbfea316002d0570d759274b55479432f528f78f3a241d6ec826960d65ab5ec5ea4eeca27586398e0db5b76cbbbed27ca3dbd3ac2fd2d7060 +DIST seafile-8.0.9.gh.tar.gz 740920 BLAKE2B c62c7ccea536934a92166db5d2acea45b65f5508c1e5d4f70749c922c12d29da11bc2265203c91e87fe0096cc3f4b6ec4f6125b538a4de88725583871b05e67e SHA512 c4621ea4c08fcd9c5d4cf683152f7504c37212272b5a9535da869de846b71a7f5e9a72c5544f9b7487ad8025a6cdf2866c15788828cc27937209d8242fc13cb8 +DIST seafile-9.0.3.tar.gz 752618 BLAKE2B fc03756934ed36bf6706250e8a41a8d069a4cf0d69fcb76a44acd3a134a80e0705e72cfa1b8e44d1d4cf01e7f94e5781da3e3af88fc9f2cc4cfccbc8ecc15e11 SHA512 07312e56d642de63a5621870d6fe5ff42a0545d5b7def020dabdd36c9a06500c86801a02138de9e3dc6ff16cfdda43b59d651a08395207e108692cfa61db027f diff --git a/net-misc/seafile/metadata.xml b/net-misc/seafile/metadata.xml index 29c3d3908c0d..8864ea04f064 100644 --- a/net-misc/seafile/metadata.xml +++ b/net-misc/seafile/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@retornaz.com</email> - <name>Quentin Retornaz</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">haiwen/seafile</remote-id> </upstream> diff --git a/net-misc/seafile/seafile-8.0.1-r1.ebuild b/net-misc/seafile/seafile-8.0.1-r1.ebuild deleted file mode 100644 index 46724483ffce..000000000000 --- a/net-misc/seafile/seafile-8.0.1-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) - -inherit autotools python-single-r1 vala - -DESCRIPTION="File syncing and sharing software with file encryption and group sharing" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/" -SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - ') - dev-libs/openssl:= - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/libevent:= - net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}] - net-misc/curl - sys-libs/zlib" -DEPEND="${RDEPEND} - $(vala_depend)" - -src_prepare() { - default - sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die - eautoreconf - vala_src_prepare -} - -src_install() { - default - # Remove unnecessary .la files - find "${ED}" -name '*.la' -o -name '*.a' -delete || die - python_fix_shebang "${ED}"/usr/bin -} diff --git a/net-misc/seafile/seafile-8.0.2-r2.ebuild b/net-misc/seafile/seafile-8.0.2-r2.ebuild deleted file mode 100644 index 16d97a5b08c3..000000000000 --- a/net-misc/seafile/seafile-8.0.2-r2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) - -RELEASE_COMMIT="2493113afb174b1a0e6f860512922b69c05cee69" - -inherit autotools python-single-r1 vala - -DESCRIPTION="File syncing and sharing software with file encryption and group sharing" -HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - ') - dev-libs/openssl:= - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/libevent:= - net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}] - net-misc/curl - sys-libs/zlib" -DEPEND="${RDEPEND} - $(vala_depend)" - -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" - -src_prepare() { - default - sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die - eautoreconf - vala_src_prepare -} - -src_install() { - default - # Remove unnecessary .la files - find "${ED}" -name '*.la' -o -name '*.a' -delete || die - python_fix_shebang "${ED}"/usr/bin -} diff --git a/net-misc/seafile/seafile-8.0.3-r3.ebuild b/net-misc/seafile/seafile-8.0.9-r2.ebuild index 296b36c5b240..f44fa93c9cb2 100644 --- a/net-misc/seafile/seafile-8.0.3-r3.ebuild +++ b/net-misc/seafile/seafile-8.0.9-r2.ebuild @@ -1,28 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) -RELEASE_COMMIT="303080b54859d0fc55ce693902c95f9620876c1b" +# Upstream is moving tags repeatedly, then we use commit hash. +# (Please file a bug upstream if this happens!) +#RELEASE_COMMIT="6bd36a957573eda6a53f3d1bc538dbfc001aa9fd" inherit autotools python-single-r1 vala DESCRIPTION="File syncing and sharing software with file encryption and group sharing" HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/" -SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" +#SRC_URI="https://github.com/haiwen/${PN}/archive/${RELEASE_COMMIT}.tar.gz -> ${P}.tar.gz" +#S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" +SRC_URI="https://github.com/haiwen/seafile/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - ') dev-libs/openssl:= dev-db/sqlite:3 dev-libs/glib:2 @@ -30,15 +30,21 @@ RDEPEND="${PYTHON_DEPS} dev-libs/libevent:= net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}] net-misc/curl - sys-libs/zlib" + sys-apps/util-linux + sys-libs/zlib + elibc_musl? ( sys-libs/fts-standalone )" DEPEND="${RDEPEND}" BDEPEND="${PYTHON_DEPS} $(vala_depend)" +pkg_setup() { + python-single-r1_pkg_setup + vala_setup +} + src_prepare() { default eautoreconf - vala_src_prepare } src_configure() { diff --git a/net-misc/seafile/seafile-8.0.4.ebuild b/net-misc/seafile/seafile-9.0.3-r1.ebuild index 6c9c198dc21a..0fe9c3b19303 100644 --- a/net-misc/seafile/seafile-8.0.4.ebuild +++ b/net-misc/seafile/seafile-9.0.3-r1.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{10..11} ) -RELEASE_COMMIT="d01b8de6d378c69525e6ed57b84bd22579b96444" +# Upstream is moving tags repeatedly, then we use commit hash. +RELEASE_COMMIT="90a2bc6e30a14ac4c91250da3957330f1051462e" inherit autotools python-single-r1 vala @@ -19,28 +20,31 @@ KEYWORDS="~amd64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_USEDEP}] - ') dev-libs/openssl:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/jansson:= dev-libs/libevent:= net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}] + net-libs/libwebsockets[client] net-misc/curl sys-apps/util-linux - sys-libs/zlib" + sys-libs/zlib + elibc_musl? ( sys-libs/fts-standalone )" DEPEND="${RDEPEND}" BDEPEND="${PYTHON_DEPS} $(vala_depend)" S="${WORKDIR}/${PN}-${RELEASE_COMMIT}" +pkg_setup() { + python-single-r1_pkg_setup + vala_setup +} + src_prepare() { default eautoreconf - vala_src_prepare } src_configure() { diff --git a/net-misc/secpanel/secpanel-0.6.1-r1.ebuild b/net-misc/secpanel/secpanel-0.6.1-r1.ebuild index cf5470690f02..ba7d33d0c425 100644 --- a/net-misc/secpanel/secpanel-0.6.1-r1.ebuild +++ b/net-misc/secpanel/secpanel-0.6.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Graphical frontend for managing and running SSH and SCP connections" HOMEPAGE="https://themediahost.de/secpanel/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/selfdhcp/Manifest b/net-misc/selfdhcp/Manifest deleted file mode 100644 index 2a367e33ea24..000000000000 --- a/net-misc/selfdhcp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST selfdhcp-0.2a.tar.bz2 162803 BLAKE2B 694719fa4da516afe7ff1b9712b78c05edff51e3c0dcdf67ca0950d1f0ff05e8f8ed70e439c5a9d72ad3cfb9bffb6c723a98c9bbb7141d2c73fd885baccdf098 SHA512 3ffb8a6115502c201b37a6c4179f498d4847d469f5d271dd9408d7fe5714d1ebe10428c890d8ab943a6753f3fbc650730139a78b1f71c9972739ea4b886a53bf diff --git a/net-misc/selfdhcp/files/selfdhcp-0.2a-buffer-overflow.patch b/net-misc/selfdhcp/files/selfdhcp-0.2a-buffer-overflow.patch deleted file mode 100644 index 6f99f7dea895..000000000000 --- a/net-misc/selfdhcp/files/selfdhcp-0.2a-buffer-overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- selfdhcp-0.2a.orig/src/selfdhcp_profiles.c 2004-08-02 18:10:36.000000000 -0400 -+++ selfdhcp-0.2a/src/selfdhcp_profiles.c 2011-01-29 11:54:29.132199679 -0500 -@@ -345,7 +345,7 @@ - { - key = xmlNodeListGetString (doc, cur->xmlChildrenNode, 1); - err_msg (DBG_PROG, "xml element \"%s\"", (char *) key); -- strncpy (netconf_buff.domainname, (char *) key, 49); -+ strncpy (netconf_buff.domainname, (char *) key, sizeof(netconf_buff.domainname)-1); - netconf_buff.what_is_set &= NETADDR; - err_msg (DBG_INFO, "read domain name \"%s\"", - netconf_buff.domainname); diff --git a/net-misc/selfdhcp/metadata.xml b/net-misc/selfdhcp/metadata.xml deleted file mode 100644 index 1bb5d2d43990..000000000000 --- a/net-misc/selfdhcp/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">selfdhcp</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/selfdhcp/selfdhcp-0.2a-r2.ebuild b/net-misc/selfdhcp/selfdhcp-0.2a-r2.ebuild deleted file mode 100644 index 2360e41ade5b..000000000000 --- a/net-misc/selfdhcp/selfdhcp-0.2a-r2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Small stealth network autoconfigure software" -HOMEPAGE="http://selfdhcp.sourceforge.net" -SRC_URI="mirror://sourceforge/selfdhcp/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~ppc ~sparc ~x86" - -DEPEND=" - dev-libs/popt - dev-libs/libxml2:2= - >=net-libs/libnet-1.0.2:1.0 - net-libs/libpcap -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-buffer-overflow.patch" -) - -src_install() { - emake DESTDIR="${ED}" install - dodoc AUTHORS ChangeLog README TODO -} diff --git a/net-misc/ser2net/files/ser2net.initd b/net-misc/ser2net/files/ser2net.initd index 3ce489bd1ff1..f7e22509e72a 100644 --- a/net-misc/ser2net/files/ser2net.initd +++ b/net-misc/ser2net/files/ser2net.initd @@ -1,22 +1,24 @@ #!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="Serial to network proxy (${RC_SVCNAME#*.})" pidfile="/var/run/${RC_SVCNAME}.pid" command="/usr/sbin/ser2net" -name="${RC_SVCNAME}" +name="${description}" extra_started_commands="reload" description_reload="Reread configuration file and make the appropriate changes" -start_stop_daemon_args="--quiet --exec ${command} --name ${name} --pidfile ${pidfile}" +start_stop_daemon_args="--quiet" +command_args_background="-P ${pidfile}" +command_args_foreground="-n" depend() { use logger need net } -config_check() { +start_pre() { command_args="${EXTRA_OPTS}" CONFIG_FILE_DEFAULT="/etc/ser2net.conf" @@ -34,21 +36,8 @@ config_check() { return 0 } -start() { - config_check || return ${?} - ebegin "Starting ${description}" - start-stop-daemon --start ${start_stop_daemon_args} -- ${command_args} -P "${pidfile}" - eend ${?} -} - -stop() { - ebegin "Stopping ${description}" - start-stop-daemon --stop ${start_stop_daemon_args} - eend ${?} -} - reload() { ebegin "Reloading ${description}" - start-stop-daemon --signal HUP ${start_stop_daemon_args} + start-stop-daemon --signal HUP --pidfile "${pidfile}" eend ${?} } diff --git a/net-misc/ser2net/ser2net-2.10.0-r1.ebuild b/net-misc/ser2net/ser2net-2.10.0-r1.ebuild index 6e1a55411988..72d5a604c80c 100644 --- a/net-misc/ser2net/ser2net-2.10.0-r1.ebuild +++ b/net-misc/ser2net/ser2net-2.10.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Serial To Network Proxy" -SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/ser2net/${P}.tar.gz" HOMEPAGE="https://sourceforge.net/projects/ser2net" KEYWORDS="amd64 ppc x86" diff --git a/net-misc/sgopherd/metadata.xml b/net-misc/sgopherd/metadata.xml index 4bab8863127b..9e09974162c5 100644 --- a/net-misc/sgopherd/metadata.xml +++ b/net-misc/sgopherd/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">vain/sgopherd</remote-id> </upstream> diff --git a/net-misc/shmux/Manifest b/net-misc/shmux/Manifest index 0d6da2ec902c..bd34272f776b 100644 --- a/net-misc/shmux/Manifest +++ b/net-misc/shmux/Manifest @@ -1 +1 @@ -DIST shmux-1.0.2.tgz 110473 BLAKE2B 7dcd08c37d0d8d3ee2dfccc89ee9f2c187c97278ba7adfa8e30bd5b86981d3a4b3513dfc884926000cede0b813a922e121c49db75ca4e0ff4efde2b4b9e6480b SHA512 d114678827d4fc203f0d18b4a4e02f8b56efdf490df0aef32756a020c755b387468a88fea7266249445a862d7ed9374640432e5807fa57bca5a7d559d7e67a8a +DIST shmux-1.0.3.tgz 116613 BLAKE2B 3d46edf3633e7d91a7fdb65e578c4541b2de35c885f1f449bdf347d3e3107ae014e6771e54b11f996a2783b303950f6ca66b46c3ef98586b932dc2fe4cb2f9ed SHA512 fb1dbb9701913fb97fb82914b9ae277703aec48cafdf74bcaa4a194ba242b62aff34e004507d6931475f320f89d62ed465360c0bc5cf2ff45abe7482b3127197 diff --git a/net-misc/shmux/files/shmux-1.0.2-tinfo.patch b/net-misc/shmux/files/shmux-1.0.2-tinfo.patch deleted file mode 100644 index 802d5973bdc7..000000000000 --- a/net-misc/shmux/files/shmux-1.0.2-tinfo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -27,7 +27,7 @@ - fi - - # Checks for libraries. --AC_SEARCH_LIBS([tgetent], [termcap curses ncurses]) -+AC_SEARCH_LIBS([tgetent], [termcap tinfo curses ncurses]) - AC_SEARCH_LIBS([basename], [gen]) - if test "x$with_pcre" != "xno"; then - AC_SEARCH_LIBS([pcre_compile], [pcre], , diff --git a/net-misc/shmux/files/shmux-1.0.3-tinfo.patch b/net-misc/shmux/files/shmux-1.0.3-tinfo.patch new file mode 100644 index 000000000000..26d430a60219 --- /dev/null +++ b/net-misc/shmux/files/shmux-1.0.3-tinfo.patch @@ -0,0 +1,11 @@ +--- a/configure.ac 2022-07-25 01:23:55.820951949 +0900 ++++ b/configure.ac 2022-07-25 01:24:07.870920125 +0900 +@@ -28,7 +28,7 @@ if test "x$with_pcre" != "xno"; then + fi + + # Checks for libraries. +-AC_SEARCH_LIBS([tgetent], [termcap curses ncurses], , AC_MSG_ERROR([terminal handling library missing])) ++AC_SEARCH_LIBS([tgetent], [termcap tinfo curses ncurses], , AC_MSG_ERROR([terminal handling library missing])) + AC_SEARCH_LIBS([basename], [gen]) + if test "x$with_pcre" != "xno"; then + AC_SEARCH_LIBS([pcre_compile], [pcre], , diff --git a/net-misc/shmux/metadata.xml b/net-misc/shmux/metadata.xml index ea931d8091e8..0c99cbf3362b 100644 --- a/net-misc/shmux/metadata.xml +++ b/net-misc/shmux/metadata.xml @@ -1,17 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>alicef@gentoo.org</email> - <name>Alice Ferrazzi</name> -</maintainer> -<longdescription> -shmux is program for executing the same command on many hosts in parallel. -For each target, a child process is spawned by shmux, and a shell on the -target obtained one of the supported methods: rsh, ssh, or sh. The output -produced by the children is received by shmux and either (optionally) -output in turn to the user, and/or written to files for later processing. -The list of targets may either be specified on the command line or be read -from the standard input. -</longdescription> + <maintainer type="person"> + <email>alicef@gentoo.org</email> + <name>Alice Ferrazzi</name> + </maintainer> + <longdescription> + shmux is program for executing the same command on many hosts in parallel. + For each target, a child process is spawned by shmux, and a shell on the + target obtained one of the supported methods: rsh, ssh, or sh. The output + produced by the children is received by shmux and either (optionally) + output in turn to the user, and/or written to files for later processing. + The list of targets may either be specified on the command line or be read + from the standard input. + </longdescription> + <upstream> + <remote-id type="github">shmux/shmux</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/shmux/shmux-1.0.2-r1.ebuild b/net-misc/shmux/shmux-1.0.3.ebuild index 81f1b69d314e..e1d72b0d9f1b 100644 --- a/net-misc/shmux/shmux-1.0.2-r1.ebuild +++ b/net-misc/shmux/shmux-1.0.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -22,7 +22,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} - virtual/awk" + app-alternatives/awk" PATCHES=( "${FILESDIR}"/${P}-tinfo.patch ) diff --git a/net-misc/sipp/Manifest b/net-misc/sipp/Manifest index e013d3d46161..8d64804b8f05 100644 --- a/net-misc/sipp/Manifest +++ b/net-misc/sipp/Manifest @@ -1,2 +1 @@ -DIST sipp-3.6.0.tar.gz 1055201 BLAKE2B 48b431bfc33d3a03e6e972ef3ce184989afb12c7e0f20c6c3cf9b72ebcd65cb12cf4cab2b90e010d16e17b9bb4832f42915b104ea9bd1253242d304ab4f3cb32 SHA512 eecbc18a18558a3fbc4f7c841d1fc8bd5be4b0c5d2bb363a12faf730f3c6a0773a24f07dbf062e68baf1a93b21686fa09258d0e08b45b4f941eb5d573bb25c12 -DIST sipp-3.6.1.tar.gz 744407 BLAKE2B a201ecce624c15c51a66c3cb5ac467522755085419c2980b1f76340e7ffca5996516f34d7e52776a8aa0a2170ca2b7301030ecb50272a1c0a8e86aaf18a6de16 SHA512 58504c56ca0c14363fafc5d0598fd93857ef33cc5856f579a225fd0e38238f7d2c409127a18a368e22355cc3912758d4dba07bac7eaa3e8a0d2943ea5fdec602 +DIST sipp-3.7.1.tar.gz 927012 BLAKE2B d79cde44761a22ca5dcc737dead9163056e0dc2504c225d23d834b4ae2bc204b1b87f87753ac662ec59e1a940cf1b4f0c47ff0b427b30b373a3c0ad91a5ad4ae SHA512 4c4c588bb3feebfbc6bad32c1565bb76de7eb433b9b40aa948dfbb63022a9cbadaf6d38cb0826c06593e10cc6a4d328a9bb9c94f885d8f8763432612963db94b diff --git a/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch b/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch deleted file mode 100644 index 6521918339d2..000000000000 --- a/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sipp-3.6.0/Makefile.am.o 2019-12-22 10:40:37.766229344 +0200 -+++ sipp-3.6.0/Makefile.am 2019-12-22 10:42:09.006266083 +0200 -@@ -172,7 +172,7 @@ - - # Ensure that after a reconfigure the source is cleaned. - .autoclean: Makefile -- make clean -+ $(MAKE) clean - echo > .autoclean - BUILT_SOURCES = .autoclean - diff --git a/net-misc/sipp/metadata.xml b/net-misc/sipp/metadata.xml index adc8a22fc56f..7c4abd9bc03d 100644 --- a/net-misc/sipp/metadata.xml +++ b/net-misc/sipp/metadata.xml @@ -12,4 +12,7 @@ <use> <flag name="pcap">Enable functionality to replay RTP data from a pcap file</flag> </use> + <upstream> + <remote-id type="github">SIPp/sipp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/sipp/sipp-3.6.0.ebuild b/net-misc/sipp/sipp-3.6.0.ebuild deleted file mode 100644 index bc7ef82c8b22..000000000000 --- a/net-misc/sipp/sipp-3.6.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A free Open Source test tool / traffic generator for the SIP protocol" -HOMEPAGE="http://sipp.sourceforge.net/ https://github.com/SIPp/sipp/releases" -SRC_URI="https://github.com/SIPp/sipp/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2 ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gsl +pcap sctp +ssl" - -PATCHES=( "${FILESDIR}/sipp-3.6.0-parallel-build.patch" ) - -DEPEND="sys-libs/ncurses:= - gsl? ( sci-libs/gsl:= ) - pcap? ( - net-libs/libpcap - net-libs/libnet:1.1 - ) - ssl? ( dev-libs/openssl:= ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_with gsl) \ - $(use_with pcap) \ - $(use_with sctp) \ - $(use_with ssl openssl) \ - --with-rtpstream -} - -src_install() { - default - - insinto /usr/share/${PN} - use pcap && doins pcap/*.pcap - dodoc CHANGES.md README.md -} diff --git a/net-misc/sipp/sipp-3.6.1-r1.ebuild b/net-misc/sipp/sipp-3.7.1.ebuild index d46f12c26028..e6bcb60d6522 100644 --- a/net-misc/sipp/sipp-3.6.1-r1.ebuild +++ b/net-misc/sipp/sipp-3.7.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -25,15 +25,6 @@ DEPEND="sys-libs/ncurses:= " RDEPEND="${DEPEND}" -src_prepare() { - default - - # version.h is in ${S}, and needs to be in ${S}/include for cmake to work. - ln -s ../version.h "${S}/include/" || die "Error creating version.h symlink" - - cmake_src_prepare -} - src_configure() { local mycmakeargs=( -DUSE_GSL=$(usex gsl 1 0) diff --git a/net-misc/sipsak/metadata.xml b/net-misc/sipsak/metadata.xml index cadb50f9c829..7dcd0f56d11e 100644 --- a/net-misc/sipsak/metadata.xml +++ b/net-misc/sipsak/metadata.xml @@ -4,5 +4,6 @@ <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">sipsak.berlios</remote-id> + <remote-id type="github">nils-ohlmeier/sipsak</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch new file mode 100644 index 000000000000..59b8e089b5a4 --- /dev/null +++ b/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch @@ -0,0 +1,12 @@ +Bug: https://bugs.gentoo.org/921255 +--- a/src/ftp.c ++++ b/src/ftp.c +@@ -634,7 +634,7 @@ static int dtp_open_active(ftp_session *sess, const char *command) + char *a, *p; + int ret; + int listener; +- size_t alen; ++ socklen_t alen; + struct sockaddr_in addr; + + ret = ftp_open(sess); diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild new file mode 100644 index 000000000000..d309794b2639 --- /dev/null +++ b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools + +DESCRIPTION="Maintain remote web sites with ease" +HOMEPAGE=" http://www.manyfish.co.uk/sitecopy/" +SRC_URI="mirror://gentoo/${P}.tar.gz + https://dev.gentoo.org/~jstein/files/sitecopy-0.16.6-04-manpages-addition-fixes.patch" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="expat nls rsh ssl webdav xml zlib" + +RDEPEND=" + rsh? ( net-misc/netkit-rsh ) + >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] + <=net-libs/neon-0.32.9999[zlib?,ssl?,expat?] + xml? ( >=net-libs/neon-0.24.6:=[-expat] ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + # SiteCopy patches are being currently pulled & ported from + # http://ftp.debian.org/debian/pool/main/s/sitecopy/ + # Consider SiteCopy to be more or less being actively maintained by + # Debian maintainers, but GPL patches ported into Gentoo. + + eapply \ + "${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \ + "${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \ + "${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \ + "${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \ + "${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \ + "${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \ + "${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \ + "${FILESDIR}/sitecopy-0.16.6-32-neon-0.31.patch" \ + "${FILESDIR}/sitecopy-0.16.6-33-c99-build-fix.patch" \ + "${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch" + + # Source package uses incorrect '/usr/doc' for the doc folder. So use + # sed to correct this error. + sed -i -e "s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \ + Makefile.in || die "Documentation directory patching failed" + + mv configure.in configure.ac || die + eautoconf + eautomake +} + +src_configure() { + econf \ + $(use_with ssl ssl openssl) \ + $(use_enable webdav) \ + $(use_enable nls) \ + $(use_enable rsh) \ + $(use_with expat) \ + $(use_with xml libxml2 ) \ + --with-neon +} diff --git a/net-misc/sks/files/sks-db.service b/net-misc/sks/files/sks-db.service index bbc3ba7e2b2d..b48db1add6ff 100644 --- a/net-misc/sks/files/sks-db.service +++ b/net-misc/sks/files/sks-db.service @@ -3,8 +3,13 @@ Description=SKS database thread After=network.target [Service] -ExecStart=/usr/bin/sks db +Environment=SKS_DIR=/var/lib/sks +EnvironmentFile=-/etc/sysconfig/sks +ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --directory ${SKS_DIR} ${SKS_DIR}/SKS ${SKS_DIR}/PTree +ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --file ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/* +ExecStart=/usr/bin/sks db ${SKS_OPTIONS} ${SKS_DB_OPTIONS} User=sks +# WorkingDirectory cannot use a variable WorkingDirectory=/var/lib/sks [Install] diff --git a/net-misc/sks/files/sks-recon.service b/net-misc/sks/files/sks-recon.service index 97ee52ffc0ed..d56731d1c961 100644 --- a/net-misc/sks/files/sks-recon.service +++ b/net-misc/sks/files/sks-recon.service @@ -1,10 +1,13 @@ [Unit] Description=SKS key reconnaissance thread -After=network.target +After=network.target sks-db.service [Service] -ExecStart=/usr/bin/sks recon +Environment=SKS_DIR=/var/lib/sks +EnvironmentFile=-/etc/sysconfig/sks +ExecStart=/usr/bin/sks recon ${SKS_OPTIONS} ${SKS_RECON_OPTIONS} User=sks +# WorkingDirectory cannot use a variable WorkingDirectory=/var/lib/sks [Install] diff --git a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild index 12939b3ef43a..133ea06cb8e7 100644 --- a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild +++ b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,7 +37,7 @@ found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering" RDEPEND=" acct-user/sks acct-group/sks - >=dev-lang/ocaml-4.0:= + <dev-lang/ocaml-4.13:= dev-ml/camlp4:= dev-ml/cryptokit:= dev-ml/num:= @@ -62,8 +62,6 @@ src_prepare() { -e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \ -e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \ -e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \ - -e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \ - -e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \ Makefile.local || die sed -i \ -e 's:/usr/sbin/sks:/usr/bin/sks:g' \ @@ -89,6 +87,11 @@ src_test() { } src_install() { + sed -i \ + -e "s:^PREFIX=.*$:PREFIX=${ED}/usr:g" \ + -e "s:^MANDIR=.*$:MANDIR=${ED}/usr/share/man:g" \ + Makefile.local || die + if use optimize; then emake install.bc dosym sks.bc usr/bin/sks diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest index 3e3b455a08f6..5dab83953334 100644 --- a/net-misc/smb4k/Manifest +++ b/net-misc/smb4k/Manifest @@ -1 +1,2 @@ -DIST smb4k-3.1.1.tar.xz 3185504 BLAKE2B c85007bf205a46f7a0c592556d816ed630b91663e443c4b322a611bd64d9b7dcb7ad6627d8b0d194b4dbb350505d95ef43aceb19d8d7fbd1caa14cb6b638c825 SHA512 2a9035f4bfcf982a084f2de20b1b3a1e0b0ceebb262f89b782dfc0229c80d3d43969b6fae90c20bac96749a958fd1f82f1b5cda423562491cba6e2981a79febf +DIST smb4k-3.2.5-bundled-kdsoap-ws-discovery-client.patch.xz 33212 BLAKE2B 774f56888ff29da7bbe9f94b74838d628052520b3c5f97e52d4f3b3dd20c0207d1e706e398b24a54c7a03cc3b9c5693c70e18f4418bfd9c83d8e3ce48cd19fe9 SHA512 004ebf52194a2801c01429990b00ada1b7e2850d1087d3efacf29542cac6a9bb351181ff8ef6713550279d9c5c2f415dcdfba847ef5c848a564b2454e6c05e81 +DIST smb4k-3.2.5.tar.xz 4314812 BLAKE2B 9c5ca6f3d9607be1e5673f7d32a8dc5f191045ccc5607a4ccd9d48d07fc698278db5bbe5e8ffcc4fa9a1f390d52e7ebb877bc01146754873af5d3c266aad16d2 SHA512 6273c9701cf3d65f9b1d7ce0cbe929dc8f422b6a7a308f0b3c4c08e30acf2d189bc1ef4f960dad25aaf71b38b29ce6c41ba8adf50f0bb139e25a0d65a8e67a28 diff --git a/net-misc/smb4k/metadata.xml b/net-misc/smb4k/metadata.xml index beaa6cb29b4e..3874c260304c 100644 --- a/net-misc/smb4k/metadata.xml +++ b/net-misc/smb4k/metadata.xml @@ -6,6 +6,8 @@ <name>Gentoo KDE Project</name> </maintainer> <upstream> + <remote-id type="cpe">cpe:/a:smb4k_project:smb4k</remote-id> + <remote-id type="kde-invent">network/smb4k</remote-id> <remote-id type="sourceforge">smb4k</remote-id> </upstream> <use> diff --git a/net-misc/smb4k/smb4k-3.1.1.ebuild b/net-misc/smb4k/smb4k-3.2.5-r1.ebuild index e64d54449eb4..b164be6392cd 100644 --- a/net-misc/smb4k/smb4k-3.1.1.ebuild +++ b/net-misc/smb4k/smb4k-3.2.5-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.82.0 -QTMIN=5.15.2 +KFMIN=5.106.0 +QTMIN=5.15.9 inherit ecm kde.org DESCRIPTION="Advanced network neighborhood browser" @@ -13,8 +13,8 @@ HOMEPAGE="https://apps.kde.org/smb4k/ https://sourceforge.net/p/smb4k/home/Home/" if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="amd64 x86" + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" + KEYWORDS="amd64 ~arm64 ~riscv x86" fi LICENSE="GPL-2" @@ -26,7 +26,6 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qttest-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 @@ -48,14 +47,14 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 net-fs/samba[cups] discovery? ( - net-libs/kdsoap:= - net-libs/kdsoap-ws-discovery-client + net-libs/kdsoap:=[qt5(+)] + <net-libs/kdsoap-ws-discovery-client-0.3.0 ) " RDEPEND="${DEPEND} plasma? ( >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 ) " diff --git a/net-misc/smb4k/smb4k-3.2.5-r2.ebuild b/net-misc/smb4k/smb4k-3.2.5-r2.ebuild new file mode 100644 index 000000000000..4480250673e4 --- /dev/null +++ b/net-misc/smb4k/smb4k-3.2.5-r2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm kde.org + +DESCRIPTION="Advanced network neighborhood browser" +HOMEPAGE="https://apps.kde.org/smb4k/ +https://sourceforge.net/p/smb4k/home/Home/" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${PN}-3.2.5-bundled-kdsoap-ws-discovery-client.patch.xz" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="GPL-2" +SLOT="5" +IUSE="+discovery plasma" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdnssd-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + net-fs/samba[cups] + discovery? ( net-libs/kdsoap:=[qt5(+)] ) +" +RDEPEND="${DEPEND} + plasma? ( + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + ) +" + +PATCHES=( + "${WORKDIR}/${PN}-3.2.5-bundled-kdsoap-ws-discovery-client.patch" +) + +src_configure() { + local mycmakeargs=( + -DSMB4K_WITH_WS_DISCOVERY=$(usex discovery) + -DSMB4K_INSTALL_PLASMOID=$(usex plasma) + ) + + use discovery && mycmakeargs+=( + # do not attempt to find now Qt6-based system version + -DCMAKE_DISABLE_FIND_PACKAGE_KDSoapWSDiscoveryClient=ON + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + elog "Users of Samba 4.7 and above please note that for the time being," + elog "the following setting has to be added to or changed in the [global]" + elog "section of the smb.conf file:" + elog + elog "[global]" + elog "client max protocol = NT1" +} diff --git a/net-misc/smbc/files/smbc-1.2.2-multiple-definitions-gcc10.patch b/net-misc/smbc/files/smbc-1.2.2-multiple-definitions-gcc10.patch new file mode 100644 index 000000000000..37dcedc4cc1c --- /dev/null +++ b/net-misc/smbc/files/smbc-1.2.2-multiple-definitions-gcc10.patch @@ -0,0 +1,46 @@ +--- smbc-1.2.2.orig/src/static_str.c ++++ smbc-1.2.2/src/static_str.c +@@ -21,6 +21,32 @@ + #include "static_str.h" + #include "fnet.h" + ++char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11, ++ ++ *Rm18, *Rm19, ++ *Rm20, *Rm21, *Rm22, *Rm23, *Rm24, *Rm25, *Rm26, *Rm27, *Rm28, *Rm29, ++ *Rm30, *Rm31, *Rm32, *Rm33, *Rm34, *Rm35, *Rm36, *Rm37, *Rm38, *Rm39, ++ *Rm40, *Rm41, *Rm42, *Rm43, *Rm44, *Rm45, *Rm46, *Rm48, *Rm49, ++ *Rm50, *Rm51, *Rm52, *Rm53, *Rm54, *Rm55, *Rm58, *Rm59, ++ *Rm60, *Rm61, *Rm62, *Rm63, *Rm64, *Rm65, *Rm67, *Rm68, *Rm69, ++ *Rm70, *Rm71, *Rm72, *Rm73, *Rm74, *Rm75, *Rm76, *Rm77, *Rm78, *Rm79, ++ *Rm80, *Rm81, *Rm82, *Rm83, *Rm84, *Rm85, *Rm86, *Rm87, *Rm88, ++ *Rm90, *Rm91, *Rm92, *Rm93, *Rm94, *Rm95, *Rm96, *Rm97, *Rm98, *Rm99, ++ *Rm100, *Rm101, *Rm102, *Rm103, *Rm104, *Rm105, *Rm106, *Rm107, *Rm108, ++ *Rm111, *Rm113, *Rm114, *Rm115, *Rm116, *Rm117, *Rm118, *Rm119, ++ *Rm121, *Rm123, *Rm124, *Rm125, *Rm129, ++ *Rm131, *Rm133, *Rm134, *Rm135, *Rm136, *Rm137, *Rm138, *Rm139, ++ *Rm140, *Rm141, *Rm142, *Rm143, *Rm144, *Rm145, *Rm146, *Rm147, *Rm148, *Rm149, ++ *Rm150, *Rm151, *Rm152, *Rm153, *Rm154, *Rm156, *Rm157, *Rm158, *Rm159, ++ *Rm160, *Rm162, *Rm163, *Rm168, *Rm169, ++ *Rm170, *Rm171, *Rm172, *Rm173, *Rm175, *Rm176, *Rm177, *Rm178, *Rm179, ++ *Rm180, *Rm181, *Rm182, ++ ++ *Rm231, *Rm232, *Rm233, *Rm234, *Rm235, *Rm236, *Rm237, *Rm238, *Rm239, ++ *Rm240, *Rm241, *Rm242, *Rm243, *Rm244, *Rm245, ++ ++ *Rm300, *Rm301, *Rm302, *Rm303, *Rm304, *Rm305, *Rm306, *Rm307; ++ + void + RinitStrings() + { +--- smbc-1.2.2.orig/src/static_str.h ++++ smbc-1.2.2/src/static_str.h +@@ -9,7 +9,7 @@ + */ + // ------------------------------------------------------------------- + +-char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11, ++extern char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11, + + *Rm18, *Rm19, + *Rm20, *Rm21, *Rm22, *Rm23, *Rm24, *Rm25, *Rm26, *Rm27, *Rm28, *Rm29, diff --git a/net-misc/smbc/files/smbc-1.2.2-samba4-includes.patch b/net-misc/smbc/files/smbc-1.2.2-samba4-includes.patch new file mode 100644 index 000000000000..3238fc035e4b --- /dev/null +++ b/net-misc/smbc/files/smbc-1.2.2-samba4-includes.patch @@ -0,0 +1,99 @@ +--- smbc-1.2.2.orig/src/bookmarks.c ++++ smbc-1.2.2/src/bookmarks.c +@@ -23,7 +23,7 @@ + #endif /* not HAVE_STRING_H */ + + #include <libintl.h> +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include <unistd.h> + #include <stdlib.h> + #include "dulist.h" +--- smbc-1.2.2.orig/src/dulist.c ++++ smbc-1.2.2/src/dulist.c +@@ -22,7 +22,7 @@ + + #include <libintl.h> + #include <dirent.h> +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include <unistd.h> + #include <stdlib.h> + #include "fnet.h" +--- smbc-1.2.2.orig/src/find-index-manage.c ++++ smbc-1.2.2/src/find-index-manage.c +@@ -23,7 +23,7 @@ + #include <stdio.h> + #include <sys/types.h> + #include <unistd.h> +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include <stdlib.h> + #include <math.h> + #include "find-index-manage.h" +--- smbc-1.2.2.orig/src/fnet.c ++++ smbc-1.2.2/src/fnet.c +@@ -20,7 +20,7 @@ + #endif /* HAVE_STRINGS_H */ + #endif /* not HAVE_STRING_H */ + +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include <fcntl.h> + #include <stdio.h> + #include <unistd.h> +--- smbc-1.2.2.orig/src/smb-pack.c ++++ smbc-1.2.2/src/smb-pack.c +@@ -21,7 +21,7 @@ + #include <sys/types.h> + #include <signal.h> + #include <curses.h> +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include <unistd.h> + #include <stdlib.h> + #include "smb-pack.h" +--- smbc-1.2.2.orig/src/smb-pack.h ++++ smbc-1.2.2/src/smb-pack.h +@@ -18,7 +18,7 @@ + #endif /* HAVE_STRINGS_H */ + #endif /* not HAVE_STRING_H */ + +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + + #define RstrCmp(src, dst) (!strcmp(src, dst)) + +--- smbc-1.2.2.orig/src/smbc.c ++++ smbc-1.2.2/src/smbc.c +@@ -31,7 +31,7 @@ + #include <dirent.h> + #include <time.h> + #include <errno.h> +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include <popt.h> + #include <unistd.h> + #include <stdlib.h> +--- smbc-1.2.2.orig/src/ttlist.c ++++ smbc-1.2.2/src/ttlist.c +@@ -20,7 +20,7 @@ + #endif /* HAVE_STRINGS_H */ + #endif /* not HAVE_STRING_H */ + +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include <fcntl.h> + #include <stdio.h> + #include <unistd.h> +--- smbc-1.2.2.orig/src/winpopup.c ++++ smbc-1.2.2/src/winpopup.c +@@ -11,7 +11,7 @@ + + #include <stdio.h> + #include <stdlib.h> +-#include <libsmbclient.h> ++#include <samba-4.0/libsmbclient.h> + #include <unistd.h> + #include "winpopup.h" + #include "debug.h" diff --git a/net-misc/smbc/files/smbc-1.2.2-tinfo.patch b/net-misc/smbc/files/smbc-1.2.2-tinfo.patch new file mode 100644 index 000000000000..8c35c4b0b0d0 --- /dev/null +++ b/net-misc/smbc/files/smbc-1.2.2-tinfo.patch @@ -0,0 +1,18 @@ +diff -ur a/configure.in b/configure.in +--- a/configure.in 2022-07-28 13:24:38.673242313 -0500 ++++ b/configure.in 2022-07-28 13:27:43.726466613 -0500 +@@ -94,11 +94,9 @@ + [AC_CHECK_LIB(popt, main)] + ) + +-AC_CHECK_LIB(ncurses, +- main, +- [], +- [AC_CHECK_LIB(ncurses, main)] +- ) ++PKG_CHECK_MODULES([NCURSES], [ncurses], [ ++ LIBS="$NCURSES_LIBS $LIBS" ++], [:]) + + AC_CHECK_LIB(smbclient, + main, diff --git a/net-misc/smbc/metadata.xml b/net-misc/smbc/metadata.xml index 47efa6ba23ca..0c84bcc5bbee 100644 --- a/net-misc/smbc/metadata.xml +++ b/net-misc/smbc/metadata.xml @@ -6,8 +6,8 @@ <name>Samba</name> </maintainer> <longdescription> -Samba Commander is a text mode SMB network commander. In SMBC, you can browse the local network or you can use the search function to find the files. You can also download/upload files and directories or create them both locally and remotely. SMBC has a resume function and supports UTF-8 characters. -</longdescription> + Samba Commander is a text mode SMB network commander. In SMBC, you can browse the local network or you can use the search function to find the files. You can also download/upload files and directories or create them both locally and remotely. SMBC has a resume function and supports UTF-8 characters. + </longdescription> <upstream> <remote-id type="sourceforge">smbc</remote-id> </upstream> diff --git a/net-misc/smbc/smbc-1.2.2-r3.ebuild b/net-misc/smbc/smbc-1.2.2-r3.ebuild index 87ebd6eea0a6..67bb75f96311 100644 --- a/net-misc/smbc/smbc-1.2.2-r3.ebuild +++ b/net-misc/smbc/smbc-1.2.2-r3.ebuild @@ -1,30 +1,38 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools DESCRIPTION="Text mode (ncurses) SMB network commander. Features: resume and UTF-8" HOMEPAGE="https://sourceforge.net/projects/smbc/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~ppc ~x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="nls debug" +BDEPEND="virtual/pkgconfig" DEPEND="dev-libs/popt net-fs/samba sys-libs/ncurses nls? ( sys-devel/gettext )" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/${P}-cflags.patch + "${FILESDIR}"/${P}-size_t.patch + "${FILESDIR}"/${P}-samba4-includes.patch + "${FILESDIR}"/${P}-multiple-definitions-gcc10.patch + "${FILESDIR}"/${P}-tinfo.patch +) + src_prepare() { default mv configure.{in,ac} || die - eapply "${FILESDIR}"/${P}-cflags.patch - eapply "${FILESDIR}"/${P}-size_t.patch + # for some reason some build 32bit x86 objects are bundled + rm src/*.o eautoreconf } diff --git a/net-misc/snarf/files/snarf-fix-build-for-clang16.patch b/net-misc/snarf/files/snarf-fix-build-for-clang16.patch new file mode 100644 index 000000000000..a239696ff8f1 --- /dev/null +++ b/net-misc/snarf/files/snarf-fix-build-for-clang16.patch @@ -0,0 +1,33 @@ +Clang16 will not allow implicit function declarations by default. +This patch overhauls the source to make it build with clang16 defaults. + +This patch was sent upstream via mail. +Bug: https://bugs.gentoo.org/874012 + +# Pascal Jäger <pascal.jaeger@leimstift.de> (2022-11-23) + +--- a/http.c ++++ b/http.c +@@ -2,6 +2,7 @@ + + #include <config.h> + ++#include <ctype.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +--- a/util.c ++++ b/util.c +@@ -33,8 +33,11 @@ + #include <errno.h> + #include <time.h> + #include <libgen.h> +-#include "url.h" ++#include "ftp.h" ++#include "gopher.h" ++#include "http.h" + #include "options.h" ++#include "url.h" + + + char output_buf[BUFSIZ]; diff --git a/net-misc/snarf/snarf-7.0-r5.ebuild b/net-misc/snarf/snarf-7.0-r5.ebuild new file mode 100644 index 000000000000..c82a698d354c --- /dev/null +++ b/net-misc/snarf/snarf-7.0-r5.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WANT_AUTOCONF="2.1" +inherit autotools toolchain-funcs + +DESCRIPTION="Small and fast CLI resource grabber for http, gopher, finger, ftp" +HOMEPAGE="https://www.xach.com/snarf/" +SRC_URI="https://www.xach.com/snarf/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ppc sparc x86" + +PATCHES=( + "${FILESDIR}"/snarf-basename-patch.diff + "${FILESDIR}"/snarf-unlink-empty.diff + "${FILESDIR}"/snarf-fix-off-by-ones.diff + "${FILESDIR}"/snarf-fix-build-for-clang16.patch +) + +src_prepare() { + default + eautoconf +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dobin snarf + doman snarf.1 + dodoc ChangeLog README TODO +} + +pkg_postinst() { + elog 'To use snarf with portage, try these settings in your make.conf' + elog + elog ' FETCHCOMMAND="/usr/bin/snarf -b \${URI} \${DISTDIR}/\${FILE}"' + elog ' RESUMECOMMAND="/usr/bin/snarf -rb \${URI} \${DISTDIR}/\${FILE}"' +} diff --git a/net-misc/sntpd/Manifest b/net-misc/sntpd/Manifest index 299ceb8f52e0..d4c925c0bed8 100644 --- a/net-misc/sntpd/Manifest +++ b/net-misc/sntpd/Manifest @@ -1 +1 @@ -DIST sntpd-3.0.tar.gz 151995 BLAKE2B a67615c874fd119e083d99d269a92a550d875a18a973e0b2904cab1fe6631b6c4e98d86959fbd9c1a387396f1854ed1c264920e2b40e6355871cbc8a4e40a4b5 SHA512 664e95e590b329dc847275c99829711c159bf91fadb2a90989c2706fbd8b074480146a7a05c5532a1bbfcaebd4b489262a44e418fa8ac57362c4f7db659fd1ea +DIST sntpd-3.1.tar.gz 157608 BLAKE2B 3a793e50bc2ee4e5540e10b134ab945bc0993a81342735c3046798738ee14206cdcbaa4d3a316031bd39aaee3ed4c702db2cf85b8ad64ac5d90e19d35c467abf SHA512 6d7693ecf0167aba59a1947c707894896e2b3caaef75354a5794341fce61062562c1c5521b60ddc6154af73837360e3946121c82e3414bb96663747cfc2ea487 diff --git a/net-misc/sntpd/metadata.xml b/net-misc/sntpd/metadata.xml index 54c215eaad58..b43af146c1a4 100644 --- a/net-misc/sntpd/metadata.xml +++ b/net-misc/sntpd/metadata.xml @@ -2,9 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - </maintainer> - <maintainer type="person"> <email>conikost@gentoo.org</email> <name>Conrad Kostecki</name> </maintainer> diff --git a/net-misc/sntpd/sntpd-3.0-r1.ebuild b/net-misc/sntpd/sntpd-3.1-r1.ebuild index 7736ca2eb8bf..97c84bd647d9 100644 --- a/net-misc/sntpd/sntpd-3.0-r1.ebuild +++ b/net-misc/sntpd/sntpd-3.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd @@ -14,7 +14,10 @@ SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" IUSE="adjtimex systemd" -RDEPEND="systemd? ( sys-apps/systemd )" +RDEPEND=" + adjtimex? ( !net-misc/adjtimex ) + systemd? ( sys-apps/systemd ) +" DEPEND="${RDEPEND}" src_configure() { diff --git a/net-misc/sobby/Manifest b/net-misc/sobby/Manifest deleted file mode 100644 index a2ade1523489..000000000000 --- a/net-misc/sobby/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sobby-0.4.8.tar.gz 134766 BLAKE2B 2406f4e71615cd00de7a5dc1b00734d26b96f577d7bfd3bfd56746c63b26fdc089a1560fbbea78b5863ce1755b81c0e0787cab0d6c3c476b1ab2b35bb6df084a SHA512 b946fc5c15257f74213fd6418933f8f4970ca58213a4c5bb33e1110f85964ce137eb5a9fdd0a601d8838310315241b9c29065493f4c9b33a8dbe09e77cc25492 diff --git a/net-misc/sobby/files/sobby-conf-0.4.7 b/net-misc/sobby/files/sobby-conf-0.4.7 deleted file mode 100644 index 0dced5a6df41..000000000000 --- a/net-misc/sobby/files/sobby-conf-0.4.7 +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -SOBBY_OPTS="-c /etc/sobby/sobby.xml" -SOBBY_USER="sobby" -SOBBY_GROUP="sobby" diff --git a/net-misc/sobby/files/sobby-init-0.4.7 b/net-misc/sobby/files/sobby-init-0.4.7 deleted file mode 100644 index 2fc00631147f..000000000000 --- a/net-misc/sobby/files/sobby-init-0.4.7 +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use avahi -} - -start() { - ebegin "Starting obby dedicated server" - start-stop-daemon -b --quiet --start --make-pidfile \ - --pidfile /var/run/sobby.pid -u ${SOBBY_USER} -g ${SOBBY_GROUP} \ - --exec /usr/bin/sobby -- ${SOBBY_OPTS} - eend $? "Failed to start sobby" -} - -stop() { - ebegin "Stopping obby dedicated server" - start-stop-daemon --stop --quiet --pidfile /var/run/sobby.pid - eend $? "Failed to stop sobby" -} diff --git a/net-misc/sobby/files/sobby.xml b/net-misc/sobby/files/sobby.xml deleted file mode 100644 index b61a89f211e5..000000000000 --- a/net-misc/sobby/files/sobby.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sobby_config> - <settings> - <autosave_directory>/var/lib/sobby</autosave_directory> - <autosave_file>autosave.obby</autosave_file> - <autosave_interval>0</autosave_interval> - <command_directory></command_directory> - <name>Standalone obby server</name> - <password>secret</password> - <port>6522</port> - <post_save_hook></post_save_hook> - <session></session> - </settings> -</sobby_config> diff --git a/net-misc/sobby/metadata.xml b/net-misc/sobby/metadata.xml deleted file mode 100644 index bef24d2c2337..000000000000 --- a/net-misc/sobby/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-misc/sobby/sobby-0.4.8-r2.ebuild b/net-misc/sobby/sobby-0.4.8-r2.ebuild deleted file mode 100644 index ce4e8e8f322b..000000000000 --- a/net-misc/sobby/sobby-0.4.8-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic - -DESCRIPTION="Standalone Obby server" -HOMEPAGE="http://gobby.0x539.de/" -SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86" -IUSE="zeroconf" - -DEPEND=" - >=dev-cpp/glibmm-2.6:2 - >=dev-libs/libsigc++-2.0:2 - >=dev-libs/gmp-4.1.4:0 - >=dev-cpp/libxmlpp-2.6:2.6 - >=net-libs/net6-1.3.12 - >=net-libs/obby-0.4.6[zeroconf=] -" -RDEPEND="${DEPEND} - acct-group/sobby - acct-user/sobby -" -BDEPEND=" - acct-group/sobby - acct-user/sobby - virtual/pkgconfig -" - -src_configure() { - append-cxxflags -std=c++11 - econf $(use_enable zeroconf) -} - -src_install() { - default - - newconfd "${FILESDIR}/${PN}-conf-0.4.7" sobby - newinitd "${FILESDIR}/${PN}-init-0.4.7" sobby - - insinto /etc/sobby - doins "${FILESDIR}/sobby.xml" - - fperms -R 0700 /etc/sobby - fowners -R sobby:sobby /etc/sobby -} - -pkg_postinst() { - elog "To start sobby, you can use the init script:" - elog " /etc/init.d/sobby start" - elog "" - elog "Please check the configuration in /etc/sobby/sobby.xml" - elog "before you start sobby" -} diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index 6a41e2eecbf2..5171cae8235d 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -1,4 +1,2 @@ -DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123 -DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568 SHA512 7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756 -DIST socat-1.7.4.2.tar.gz 653068 BLAKE2B 0eba89e2f8993e6c5f2ffaa57ca9e93ae89cb01bf9d6f0f0d5e9550d4cd7e6aa390b26120a47e3661772550f4fb189807bedd31d1477ff0065f478ef2be062ab SHA512 c331a6348e0febb35cd8adc2b116e3b8896cd7f64bcd93e507df4b8197ee1e6738ca256abf74c9b225e7a3769cf9643f0e237826125c6f390b5124ce0f10c972 -DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834 +DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad SHA512 3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651 +DIST socat-1.8.0.0.tar.bz2 564066 BLAKE2B b0b3e8c46f746b1aaff7390bbf9521cca8c421f3c20cd7a7f7d8ffd3d7b5e5e881e2477642f7d29247ee5a9d9edf6c8370a43c5f2757e456966b17e3ba08a58a SHA512 dd15c31204f2843ab473a30aa841e960e7c00ac7487e2265d69f9e8ea0afde3841d57cfcb99084f03935d7223da65cee27166837f2f9b3a20c834bc161af802b diff --git a/net-misc/socat/files/socat-1.7.3.0-filan-build.patch b/net-misc/socat/files/socat-1.7.3.0-filan-build.patch deleted file mode 100644 index 861c673ad91d..000000000000 --- a/net-misc/socat/files/socat-1.7.3.0-filan-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From aae2ea107b543fa908956f2fdcdf6db684e4a2e6 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@chromium.org> -Date: Fri, 24 Apr 2015 23:06:37 -0400 -Subject: [PATCH] filan: fix depend list - -The link line contains more objects than the depend line; sync them like -procan does. Otherwise, parallel builds randomly fail. ---- - Makefile.in | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index f2a6edb..0c00459 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -118,8 +118,9 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut - procan: $(PROCAN_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS) - --filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS) -+FILAN_OBJS=filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o -+filan: $(FILAN_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(FILAN_OBJS) $(CLIBS) - - libxio.a: $(XIOOBJS) $(UTLOBJS) - $(AR) r $@ $(XIOOBJS) $(UTLOBJS) --- -2.3.5 - diff --git a/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch b/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch deleted file mode 100644 index c914a817ceca..000000000000 --- a/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch +++ /dev/null @@ -1,38 +0,0 @@ -When disabling OpenSSL support, nestlex.c still needs stddef.h which is -magically included through the OpenSSL headers otherwise. - ---- a/configure.in -+++ b/configure.in -@@ -61,7 +61,7 @@ - AC_CHECK_HEADERS(inttypes.h) - AC_HEADER_SYS_WAIT - AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h sys/time.h syslog.h unistd.h) --AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h) -+AC_CHECK_HEADERS(pwd.h grp.h stddef.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h) - AC_CHECK_HEADERS(pty.h) - AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h) - AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT ---- a/config.h.in -+++ b/config.h.in -@@ -189,6 +189,9 @@ - /* Define if you have the <grp.h> header file. */ - #undef HAVE_GRP_H - -+/* Define if you have the <stddef.h> header file. */ -+#undef HAVE_STDDEF_H -+ - /* Define if you have the <stdint.h> header file. */ - #undef HAVE_STDINT_H - ---- a/sysincludes.h -+++ b/sysincludes.h -@@ -51,6 +51,9 @@ - #if HAVE_SYS_TIME_H - #include <sys/time.h> /* select(); OpenBSD: struct timespec */ - #endif -+#if HAVE_STDDEF_H -+#include <stddef.h> -+#endif - #if HAVE_STDINT_H - #include <stdint.h> /* uint8_t */ - #endif diff --git a/net-misc/socat/files/socat-1.7.3.4-fno-common.patch b/net-misc/socat/files/socat-1.7.3.4-fno-common.patch deleted file mode 100644 index a7dcf71c376a..000000000000 --- a/net-misc/socat/files/socat-1.7.3.4-fno-common.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/filan.c -+++ b/filan.c -@@ -30,7 +30,9 @@ - - /* dirty workaround so we dont get an error on AIX when being linked with - libwrap */ -+#if _AIX - int allow_severity, deny_severity; -+#endif - - /* global variables for configuring filan */ - bool filan_followsymlinks; ---- a/procan.c -+++ b/procan.c -@@ -21,7 +21,9 @@ - - /* dirty workaround so we dont get an error on AIX when getting linked with - libwrap */ -+#if _AIX - int allow_severity, deny_severity; -+#endif - - - int procan(FILE *outfile) { diff --git a/net-misc/socat/socat-1.7.3.4.ebuild b/net-misc/socat/socat-1.7.3.4.ebuild deleted file mode 100644 index be9f48e777e4..000000000000 --- a/net-misc/socat/socat-1.7.3.4.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -MY_P=${P/_beta/-b} -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bindist ipv6 readline ssl tcpd" - -DEPEND=" - ssl? ( dev-libs/openssl:0= ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers ) -" -RDEPEND="${DEPEND}" - -# Tests are a large bash script -# Hard to disable individual tests needing network or privileges -RESTRICT=" - test - ssl? ( readline? ( bindist ) ) -" - -DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch -) - -pkg_setup() { - # bug #587740 - if use readline && use ssl ; then - elog "You are enabling both readline and openssl USE flags, the licenses" - elog "for these packages conflict. You may not be able to legally" - elog "redistribute the resulting binary." - fi -} - -src_configure() { - # bug #293324 - filter-flags '-Wno-error*' - - tc-export AR - - econf \ - $(use_enable ssl openssl) \ - $(use_enable readline) \ - $(use_enable ipv6 ip6) \ - $(use_enable tcpd libwrap) -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css -} diff --git a/net-misc/socat/socat-1.7.4.2.ebuild b/net-misc/socat/socat-1.7.4.4-r1.ebuild index fbf589fadca9..56c0a04850d6 100644 --- a/net-misc/socat/socat-1.7.4.2.ebuild +++ b/net-misc/socat/socat-1.7.4.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,15 +8,15 @@ inherit flag-o-matic toolchain-funcs MY_P=${P/_beta/-b} DESCRIPTION="Multipurpose relay (SOcket CAT)" HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.gz" +SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bindist ipv6 readline ssl tcpd" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="ipv6 readline ssl tcpd" -DEPEND="ssl? ( dev-libs/openssl:0= ) +DEPEND="ssl? ( >=dev-libs/openssl-3:0= ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers )" RDEPEND="${DEPEND}" @@ -24,19 +24,10 @@ RDEPEND="${DEPEND}" # Tests are a large bash script # Hard to disable individual tests needing network or privileges # in 1.7.4.2: FAILED: 59 329 -RESTRICT="test ssl? ( readline? ( bindist ) )" +RESTRICT="test" DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) -pkg_setup() { - # bug #587740 - if use readline && use ssl ; then - elog "You are enabling both readline and openssl USE flags, the licenses" - elog "for these packages conflict. You may not be able to legally" - elog "redistribute the resulting binary." - fi -} - src_configure() { # bug #293324 filter-flags '-Wno-error*' diff --git a/net-misc/socat/socat-1.7.4.1.ebuild b/net-misc/socat/socat-1.8.0.0.ebuild index 7a65f4b61cdc..ca3d608643a5 100644 --- a/net-misc/socat/socat-1.7.4.1.ebuild +++ b/net-misc/socat/socat-1.8.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit edo flag-o-matic toolchain-funcs MY_P=${P/_beta/-b} DESCRIPTION="Multipurpose relay (SOcket CAT)" @@ -13,11 +13,11 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bindist ipv6 readline ssl tcpd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="ipv6 readline ssl tcpd" DEPEND=" - ssl? ( dev-libs/openssl:0= ) + ssl? ( >=dev-libs/openssl-3:= ) readline? ( sys-libs/readline:= ) tcpd? ( sys-apps/tcp-wrappers ) " @@ -25,32 +25,29 @@ RDEPEND="${DEPEND}" # Tests are a large bash script # Hard to disable individual tests needing network or privileges -RESTRICT=" - test - ssl? ( readline? ( bindist ) ) -" +# in 1.7.4.2: FAILED: 59 329 +#RESTRICT="test" DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) -pkg_setup() { - # bug #587740 - if use readline && use ssl ; then - elog "You are enabling both readline and openssl USE flags, the licenses" - elog "for these packages conflict. You may not be able to legally" - elog "redistribute the resulting binary." - fi -} - src_configure() { # bug #293324 filter-flags '-Wno-error*' + tc-export AR - econf \ - $(use_enable ssl openssl) \ - $(use_enable readline) \ - $(use_enable ipv6 ip6) \ + local myeconfargs=( + $(use_enable ssl openssl) + $(use_enable readline) + $(use_enable ipv6 ip6) $(use_enable tcpd libwrap) + ) + + econf "${myeconfargs[@]}" +} + +src_test() { + edo ./test.sh -v --expect-fail 217,311,313,410,478,528 } src_install() { diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild b/net-misc/socat/socat-2.0.0_beta9.ebuild deleted file mode 100644 index 441acceaeede..000000000000 --- a/net-misc/socat/socat-2.0.0_beta9.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -MY_P=${P/_beta/-b} -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="ipv6 readline ssl tcpd" - -DEPEND=" - ssl? ( dev-libs/openssl:0= ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers ) -" -RDEPEND="${DEPEND}" - -# Tests are a large bash script -# Hard to disable individual tests needing network or privileges -RESTRICT=" - test - ssl? ( readline? ( bindist ) ) -" - -DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch - "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch - "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch -) - -pkg_setup() { - # bug #587740 - if use readline && use ssl ; then - elog "You are enabling both readline and openssl USE flags, the licenses" - elog "for these packages conflict. You may not be able to legally" - elog "redistribute the resulting binary." - fi -} - -src_prepare() { - default - - touch doc/${PN}.1 || die - - eautoreconf -} - -src_configure() { - # bug #293324 - filter-flags -Wall '-Wno-error*' - tc-export AR - - econf \ - $(use_enable ssl openssl) \ - $(use_enable readline) \ - $(use_enable ipv6 ip6) \ - $(use_enable tcpd libwrap) -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css -} diff --git a/net-misc/sock/sock-1.1-r1.ebuild b/net-misc/sock/sock-1.1-r1.ebuild deleted file mode 100644 index 6c8d0615f28e..000000000000 --- a/net-misc/sock/sock-1.1-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A shell interface to network sockets" -SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/${P}.tar.gz" -HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/linux.shtml" -KEYWORDS="amd64 sparc x86" -LICENSE="GPL-2" -SLOT="0" - -src_install() { - dobin "${PN}" - doman "${PN}.1" - einstalldocs -} diff --git a/net-misc/sock/sock-1.1-r2.ebuild b/net-misc/sock/sock-1.1-r2.ebuild new file mode 100644 index 000000000000..80a0820652d1 --- /dev/null +++ b/net-misc/sock/sock-1.1-r2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Shell interface to network sockets" +HOMEPAGE="https://mj.ucw.cz/sw/" +SRC_URI="https://mj.ucw.cz/download/net/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 sparc x86" + +src_prepare() { + default + + # Clang 16, bug #900256 + eautoreconf +} + +src_install() { + dobin ${PN} + doman ${PN}.1 + einstalldocs +} diff --git a/net-misc/socket-burst-dampener/metadata.xml b/net-misc/socket-burst-dampener/metadata.xml index 9f51135504a8..6ea007443ebb 100644 --- a/net-misc/socket-burst-dampener/metadata.xml +++ b/net-misc/socket-burst-dampener/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <upstream> - <remote-id type="github">zmedico/socket-burst-dampener</remote-id> - </upstream> - <stabilize-allarches/> <maintainer type="person"> <email>zmedico@gentoo.org</email> </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="pypi">socket-burst-dampener</remote-id> + <remote-id type="github">zmedico/socket-burst-dampener</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild index 4685d688a2c8..66b660705e66 100644 --- a/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1.ebuild +++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +PYPI_NO_NORMALIZE=1 +inherit distutils-r1 pypi DESCRIPTION="A daemon that spawns one command per connection, and dampens connection bursts" HOMEPAGE="https://github.com/zmedico/socket-burst-dampener" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" -KEYWORDS="~amd64 ~x86" SLOT="0" +KEYWORDS="~amd64 ~x86" distutils_enable_tests pytest diff --git a/net-misc/socket/metadata.xml b/net-misc/socket/metadata.xml index a3862b8ec2fc..115e9d64a669 100644 --- a/net-misc/socket/metadata.xml +++ b/net-misc/socket/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/socket/socket-1.5.ebuild b/net-misc/socket/socket-1.5.ebuild index be38d567737b..0a9cad96c8ec 100644 --- a/net-misc/socket/socket-1.5.ebuild +++ b/net-misc/socket/socket-1.5.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit toolchain-funcs -DESCRIPTION="A shell-level interface to TCP sockets" -HOMEPAGE="http://www.jnickelsen.de/socket/" -SRC_URI="http://www.jnickelsen.de/${PN}/${P}.tar.gz" +DESCRIPTION="Shell-level interface to TCP sockets" +HOMEPAGE="https://w21.org/jnickelsen/socket/" +SRC_URI="https://w21.org/jnickelsen/${PN}/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index 4be76f585699..bef42d99c5d9 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -1,3 +1 @@ -DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029 -DIST spice-gtk-0.38.tar.xz 796112 BLAKE2B c1542b5b76f9e23ffd1910273f358f656198829b1f615c6a8e0931a79d14920132c861facd534f4cf05f03c4f64a50f628f7daa93be581d5ac815f224b81fe16 SHA512 27b44ac9f0cee2737ce03bb3f47c62fc0ee2402c291c49fc56cffc4ccb63e2cab001a68ba865a6375d82cb38444408d59c68469783ee4279fa818d8682e902f3 -DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2 +DIST spice-gtk-0.42.tar.xz 812776 BLAKE2B 406a2218d4ec0765173c911d6305cb0e043cd575c53ba51cbd53d922835b9d395873143f2388a5a02ee60ce617e32a1cb6a95008b67deec787fcf67da0d49736 SHA512 fd567e35f6d4ebfe6ef004f358dca4c41254336f55f7dd26cf67b62b2acb4866907186bd0526b7cb52b0c24020cdc8809251127498a8d357555bb0c5d3b8f137 diff --git a/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch b/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch deleted file mode 100644 index 504cb7c4848b..000000000000 --- a/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 262c84081fbd3cfc3d92e6ae9a60a780549d6c2f Mon Sep 17 00:00:00 2001 -From: Snir Sheriber <ssheribe@redhat.com> -Date: Thu, 28 Feb 2019 11:44:34 +0200 -Subject: [PATCH] Adjust to window scaling - -When GDK_SCALE is != 1 and egl is used, the image presented does not -fit to the window (scale of 2 is often used with hidpi monitors). -Usually this is not a problem since all components are adjusted by -gdk/gtk but with egl, pixel-based data is not being scaled. In this -case window's scale value can be used in order to determine whether -to use a pixel resource with higher resolution data. - -In order to reproduce the problem set spice with virgl/Intel-vGPU -and run spice-gtk with GDK_SCALE=2 - -This issue was also reported at freedesktop gitlab repo: -https://gitlab.freedesktop.org/spice/spice-gtk/issues/99 - -Signed-off-by: Snir Sheriber <ssheribe@redhat.com> -Acked-by: Victor Toso <victortoso@redhat.com> ---- - src/spice-widget-egl.c | 7 ++++--- - src/spice-widget.c | 27 +++++++++++++++++++-------- - 2 files changed, 23 insertions(+), 11 deletions(-) - -diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c -index 43fccd7..7bae4e5 100644 ---- a/src/spice-widget-egl.c -+++ b/src/spice-widget-egl.c -@@ -360,9 +360,9 @@ gboolean spice_egl_realize_display(SpiceDisplay *display, GdkWindow *win, GError - DISPLAY_DEBUG(display, "egl realize"); - if (!spice_widget_init_egl_win(display, win, err)) - return FALSE; -- -- spice_egl_resize_display(display, gdk_window_get_width(win), -- gdk_window_get_height(win)); -+ gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ spice_egl_resize_display(display, gdk_window_get_width(win) * scale_factor, -+ gdk_window_get_height(win) * scale_factor); - - return TRUE; - } -@@ -426,6 +426,7 @@ void spice_egl_unrealize_display(SpiceDisplay *display) - #endif - } - -+/* w and h should be adjusted to gdk scaling */ - G_GNUC_INTERNAL - void spice_egl_resize_display(SpiceDisplay *display, int w, int h) - { -diff --git a/src/spice-widget.c b/src/spice-widget.c -index 1f2a154..a9ba1f1 100644 ---- a/src/spice-widget.c -+++ b/src/spice-widget.c -@@ -1382,7 +1382,8 @@ static void set_egl_enabled(SpiceDisplay *display, bool enabled) - } - - if (enabled && d->egl.context_ready) { -- spice_egl_resize_display(display, d->ww, d->wh); -+ gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ spice_egl_resize_display(display, d->ww * scale_factor, d->wh * scale_factor); - } - - d->egl.enabled = enabled; -@@ -1978,11 +1979,14 @@ static void transform_input(SpiceDisplay *display, - SpiceDisplayPrivate *d = display->priv; - int display_x, display_y, display_w, display_h; - double is; -+ gint scale_factor = 1; - - spice_display_get_scaling(display, NULL, - &display_x, &display_y, - &display_w, &display_h); -- -+ if (egl_enabled(d)) { -+ scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ } - /* For input we need a different scaling factor in order to - be able to reach the full width of a display. For instance, consider - a display of 100 pixels showing in a window 10 pixels wide. The normal -@@ -1998,7 +2002,7 @@ static void transform_input(SpiceDisplay *display, - coordinates in the inverse direction (window -> display) as the fb size - (display -> window). - */ -- is = (double)(d->area.width-1) / (double)(display_w-1); -+ is = ((double)(d->area.width-1) / (double)(display_w-1)) * scale_factor; - - window_x -= display_x; - window_y -= display_y; -@@ -2183,8 +2187,10 @@ static void size_allocate(GtkWidget *widget, GtkAllocation *conf, gpointer data) - d->wh = conf->height; - recalc_geometry(widget); - #if HAVE_EGL -- if (egl_enabled(d)) -- spice_egl_resize_display(display, conf->width, conf->height); -+ if (egl_enabled(d)) { -+ gint scale_factor = gtk_widget_get_scale_factor(widget); -+ spice_egl_resize_display(display, conf->width * scale_factor, conf->height * scale_factor); -+ } - #endif - } - -@@ -2942,10 +2948,14 @@ void spice_display_get_scaling(SpiceDisplay *display, - int ww, wh; - int x, y, w, h; - double s; -+ gint scale_factor = 1; - - if (gtk_widget_get_realized (GTK_WIDGET(display))) { -- ww = gtk_widget_get_allocated_width(GTK_WIDGET(display)); -- wh = gtk_widget_get_allocated_height(GTK_WIDGET(display)); -+ if (egl_enabled(d)) { -+ scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ } -+ ww = gtk_widget_get_allocated_width(GTK_WIDGET(display)) * scale_factor; -+ wh = gtk_widget_get_allocated_height(GTK_WIDGET(display)) * scale_factor; - } else { - ww = fbw; - wh = fbh; -@@ -3091,7 +3101,8 @@ void spice_display_widget_gl_scanout(SpiceDisplay *display) - g_clear_error(&err); - } - -- spice_egl_resize_display(display, d->ww, d->wh); -+ gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display)); -+ spice_egl_resize_display(display, d->ww * scale_factor, d->wh * scale_factor); - } - #endif - --- -2.21.0 - diff --git a/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch b/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch deleted file mode 100644 index 9a3cdd090063..000000000000 --- a/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://gitlab.freedesktop.org/spice/spice-common/-/issues/5 -https://bugs.gentoo.org/820074 ---- a/subprojects/spice-common/meson.build -+++ b/subprojects/spice-common/meson.build -@@ -132,7 +132,7 @@ if spice_common_generate_client_code or spice_common_generate_server_code - if get_option('python-checks') - foreach module : ['six', 'pyparsing'] - message('Checking for python module @0@'.format(module)) -- cmd = run_command(python, '-m', module) -+ cmd = run_command(python, '-c', 'import @0@'.format(module)) - if cmd.returncode() != 0 - error('Python module @0@ not found'.format(module)) - endif diff --git a/net-misc/spice-gtk/files/spice-gtk-0.42-libtool-export-symbols-fix.patch b/net-misc/spice-gtk/files/spice-gtk-0.42-libtool-export-symbols-fix.patch new file mode 100644 index 000000000000..1af5ba26790f --- /dev/null +++ b/net-misc/spice-gtk/files/spice-gtk-0.42-libtool-export-symbols-fix.patch @@ -0,0 +1,66 @@ +Bug: https://bugs.gentoo.org/902853 +Bug: https://bugs.gentoo.org/888705 +Upstream: https://gitlab.freedesktop.org/spice/spice-gtk/-/merge_requests/119 +Upstream Bug: https://gitlab.freedesktop.org/spice/spice-gtk/-/issues/169 + +From 1511f0ad5ea67b4657540c631e3a8c959bb8d578 Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio <freddy77@gmail.com> +Date: Wed, 21 Jun 2023 18:43:59 +0100 +Subject: [PATCH] Do not use libtool -export-symbols option + +This option is intended for libtool, not for any linker. +Check the support of --version-script option using an empty +list of symbols to catch some faulty linker supporting that +option but not allowing not existing symbols (some buggy mold +versions). + +Signed-off-by: Frediano Ziglio <freddy77@gmail.com> +--- a/src/meson.build ++++ b/src/meson.build +@@ -181,14 +181,19 @@ endif + # + + # version-script ++test_syms_path = meson.current_source_dir() / 'test-map-file' ++test_version_script = '-Wl,--version-script=@0@'.format(test_syms_path) ++spice_has_version_script = compiler.has_link_argument(test_version_script) ++ + spice_client_glib_syms = files('map-file') + spice_client_glib_syms_path = meson.current_source_dir() / 'map-file' + spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path) +-spice_gtk_has_version_script = compiler.has_link_argument(spice_gtk_version_script) +-if not spice_gtk_has_version_script +- spice_client_glib_syms = files('spice-glib-sym-file') +- spice_client_glib_syms_path = meson.current_source_dir() / 'spice-glib-sym-file' +- spice_gtk_version_script = ['-export-symbols', spice_client_glib_syms_path] ++if not spice_has_version_script ++ if host_machine.system() == 'linux' ++ error('Version scripts should be supported on Linux') ++ endif ++ spice_client_glib_syms = [] ++ spice_gtk_version_script = [] + endif + + # soversion +@@ -373,11 +378,6 @@ if spice_gtk_has_gtk + # libspice-client-gtk.so + # + spice_client_gtk_syms = spice_client_glib_syms +- if not spice_gtk_has_version_script +- spice_client_gtk_syms = files('spice-gtk-sym-file') +- spice_client_gtk_syms_path = meson.current_source_dir() / 'spice-gtk-sym-file' +- spice_gtk_version_script = ['-export-symbols', spice_client_gtk_syms_path] +- endif + + # soversion + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +--- /dev/null ++++ b/src/test-map-file +@@ -0,0 +1,4 @@ ++TEST_LIB { ++local: ++*; ++}; +-- +GitLab + diff --git a/net-misc/spice-gtk/files/spice-gtk-0.42-lld17-fix.patch b/net-misc/spice-gtk/files/spice-gtk-0.42-lld17-fix.patch new file mode 100644 index 000000000000..b6197fb15ba3 --- /dev/null +++ b/net-misc/spice-gtk/files/spice-gtk-0.42-lld17-fix.patch @@ -0,0 +1,167 @@ +https://gitlab.freedesktop.org/spice/spice-gtk/-/merge_requests/121 +https://bugs.gentoo.org/915210 + +From 7e87382b585a799ced543b0c3fd127b2a813285f Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio <freddy77@gmail.com> +Date: Fri, 23 Jun 2023 21:17:26 +0100 +Subject: [PATCH] Split symbol file in 2 files + +One file for spice-glib and another for spice-gtk. +This avoid having duplicate exports in the future. +spice_g_signal_connect_object, spice_util_get_debug, +spice_util_get_version_string, spice_util_set_debug and +spice_uuid_to_string are exported by both libraries to keep ABI +compatibility. + +Signed-off-by: Frediano Ziglio <freddy77@gmail.com> +--- + src/{map-file => map-file-glib} | 22 --------------------- + src/map-file-gtk | 35 +++++++++++++++++++++++++++++++++ + src/meson.build | 17 ++++++++++------ + 3 files changed, 46 insertions(+), 28 deletions(-) + rename src/{map-file => map-file-glib} (89%) + create mode 100644 src/map-file-gtk + +diff --git a/src/map-file b/src/map-file-glib +similarity index 89% +rename from src/map-file +rename to src/map-file-glib +index c0d8ca6e..ef0a31f3 100644 +--- a/src/map-file ++++ b/src/map-file-glib +@@ -31,18 +31,8 @@ spice_display_channel_get_primary; + spice_display_channel_get_type; + spice_display_channel_gl_draw_done; + spice_display_get_gl_scanout; +-spice_display_get_grab_keys; +-spice_display_get_pixbuf; + spice_display_get_primary; +-spice_display_get_type; + spice_display_gl_draw_done; +-spice_display_key_event_get_type; +-spice_display_keyboard_ungrab; +-spice_display_mouse_ungrab; +-spice_display_new; +-spice_display_new_with_monitor; +-spice_display_send_keys; +-spice_display_set_grab_keys; + spice_file_transfer_task_cancel; + spice_file_transfer_task_get_filename; + spice_file_transfer_task_get_progress; +@@ -52,17 +42,7 @@ spice_file_transfer_task_get_type; + spice_get_option_group; + spice_gl_scanout_free; + spice_gl_scanout_get_type; +-spice_grab_sequence_as_string; +-spice_grab_sequence_copy; +-spice_grab_sequence_free; +-spice_grab_sequence_get_type; +-spice_grab_sequence_new; +-spice_grab_sequence_new_from_string; + spice_g_signal_connect_object; +-spice_gtk_session_copy_to_guest; +-spice_gtk_session_get; +-spice_gtk_session_get_type; +-spice_gtk_session_paste_from_guest; + spice_inputs_button_press; + spice_inputs_button_release; + spice_inputs_channel_button_press; +@@ -185,8 +165,6 @@ spice_usb_device_manager_is_redirecting; + spice_usb_device_manager_allocate_device_for_file_descriptor; + spice_usb_device_manager_create_shared_cd_device; + spice_usb_device_manager_is_device_shared_cd; +-spice_usb_device_widget_get_type; +-spice_usb_device_widget_new; + spice_usbredir_channel_get_type; + spice_util_get_debug; + spice_util_get_version_string; +diff --git a/src/map-file-gtk b/src/map-file-gtk +new file mode 100644 +index 00000000..ca5dd446 +--- /dev/null ++++ b/src/map-file-gtk +@@ -0,0 +1,35 @@ ++SPICEGTK_1 { ++global: ++spice_display_get_grab_keys; ++spice_display_get_pixbuf; ++spice_display_get_type; ++spice_display_key_event_get_type; ++spice_display_keyboard_ungrab; ++spice_display_mouse_ungrab; ++spice_display_new; ++spice_display_new_with_monitor; ++spice_display_send_keys; ++spice_display_set_grab_keys; ++spice_grab_sequence_as_string; ++spice_grab_sequence_copy; ++spice_grab_sequence_free; ++spice_grab_sequence_get_type; ++spice_grab_sequence_new; ++spice_grab_sequence_new_from_string; ++spice_gtk_session_copy_to_guest; ++spice_gtk_session_get; ++spice_gtk_session_get_type; ++spice_gtk_session_paste_from_guest; ++spice_usb_device_widget_get_type; ++spice_usb_device_widget_new; ++ ++/* FIXME: remove the following 5 duplicated symbols in next ABI break */ ++spice_g_signal_connect_object; ++spice_util_get_debug; ++spice_util_get_version_string; ++spice_util_set_debug; ++spice_uuid_to_string; ++ ++local: ++*; ++}; +diff --git a/src/meson.build b/src/meson.build +index 852217ac..68fe7ab2 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -185,14 +185,20 @@ test_syms_path = meson.current_source_dir() / 'test-map-file' + test_version_script = '-Wl,--version-script=@0@'.format(test_syms_path) + spice_has_version_script = compiler.has_link_argument(test_version_script) + +-spice_client_glib_syms = files('map-file') +-spice_client_glib_syms_path = meson.current_source_dir() / 'map-file' +-spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path) +-if not spice_has_version_script ++if spice_has_version_script ++ spice_client_glib_syms = files('map-file-glib') ++ spice_client_gtk_syms = files('map-file-gtk') ++ spice_client_glib_syms_path = meson.current_source_dir() / 'map-file-glib' ++ spice_client_gtk_syms_path = meson.current_source_dir() / 'map-file-gtk' ++ spice_glib_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path) ++ spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_gtk_syms_path) ++else + if host_machine.system() == 'linux' + error('Version scripts should be supported on Linux') + endif + spice_client_glib_syms = [] ++ spice_client_gtk_syms = [] ++ spice_glib_version_script = [] + spice_gtk_version_script = [] + endif + +@@ -210,7 +216,7 @@ spice_client_glib_lib = library('spice-client-glib-2.0', spice_client_glib_sourc + version : spice_client_glib_so_version, + install : true, + include_directories : spice_gtk_include, +- link_args : [spice_gtk_version_script], ++ link_args : [spice_glib_version_script], + link_depends : spice_client_glib_syms, + dependencies : spice_glib_deps) + +@@ -377,7 +383,6 @@ if spice_gtk_has_gtk + # + # libspice-client-gtk.so + # +- spice_client_gtk_syms = spice_client_glib_syms + + # soversion + # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +-- +GitLab + diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml index 8ad630bb0db4..ae48364fa719 100644 --- a/net-misc/spice-gtk/metadata.xml +++ b/net-misc/spice-gtk/metadata.xml @@ -15,4 +15,7 @@ <flag name="webdav">Support for folder-sharing between guest and client using <pkg>net-libs/phodav</pkg></flag> </use> + <upstream> + <remote-id type="freedesktop-gitlab">spice/spice-gtk</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/spice-gtk/spice-gtk-0.37-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.37-r3.ebuild deleted file mode 100644 index e6215587090b..000000000000 --- a/net-misc/spice-gtk/spice-gtk-0.37-r3.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GCONF_DEBUG="no" -VALA_MIN_API_VERSION="0.14" -VALA_USE_DEPEND="vapigen" - -inherit autotools desktop xdg-utils vala readme.gentoo-r1 - -DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" -HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" - -LICENSE="LGPL-2.1" -SLOT="0" -SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav" - -# TODO: -# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h -# * use external pnp.ids as soon as that means not pulling in gnome-desktop -RDEPEND=" - >=dev-libs/glib-2.46:2 - dev-libs/json-glib:0= - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 - media-libs/gstreamer:1.0[introspection?] - media-libs/opus - sys-libs/zlib - virtual/jpeg:0= - >=x11-libs/cairo-1.2 - >=x11-libs/pixman-0.17.7 - gtk3? ( x11-libs/gtk+:3[introspection?] ) - introspection? ( dev-libs/gobject-introspection ) - dev-libs/openssl:0= - lz4? ( app-arch/lz4 ) - pulseaudio? ( media-sound/pulseaudio[glib] ) - sasl? ( dev-libs/cyrus-sasl ) - smartcard? ( app-emulation/qemu[smartcard] ) - usbredir? ( - sys-apps/hwids - >=sys-apps/usbredir-0.4.2 - virtual/libusb:1 - policykit? ( - sys-apps/acl - >=sys-auth/polkit-0.110-r1 - !~sys-auth/polkit-0.111 ) - ) - webdav? ( - net-libs/phodav:2.0 - >=net-libs/libsoup-2.49.91:2.4 ) -" -# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a -# configure knob. The package is relatively lightweight so we just depend -# on it unconditionally for now. It would be cleaner to transform this into -# a USE="vaapi" conditional and patch the buildsystem... -RDEPEND="${RDEPEND} - amd64? ( x11-libs/libva:= ) - arm64? ( x11-libs/libva:= ) - x86? ( x11-libs/libva:= ) -" -DEPEND="${RDEPEND} - >=app-emulation/spice-protocol-0.14.0 - dev-perl/Text-CSV - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -PATCHES=( - "${FILESDIR}"/${P}-adjust-to-window-scaling.patch -) - -src_prepare() { - # bug 558558 - export GIT_CEILING_DIRECTORIES="${WORKDIR}" - - default - - eautoreconf - - use vala && vala_src_prepare -} - -src_configure() { - # Prevent sandbox violations, bug #581836 - # https://bugzilla.gnome.org/show_bug.cgi?id=744134 - # https://bugzilla.gnome.org/show_bug.cgi?id=744135 - addpredict /dev - - # Clean up environment, bug #586642 - xdg_environment_reset - - local myconf - myconf=" - $(use_with gtk3 gtk 3.0) - $(use_enable introspection) - $(use_enable mjpeg builtin-mjpeg) - $(use_enable policykit polkit) - $(use_enable pulseaudio pulse) - $(use_with sasl) - $(use_enable smartcard) - $(use_enable static-libs static) - $(use_enable usbredir) - $(use_with usbredir usb-acl-helper-dir /usr/libexec) - $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) - $(use_enable vala) - $(use_enable webdav) - --disable-celt051 - --disable-gtk-doc - --disable-maintainer-mode - --disable-werror - --enable-pie" - - econf ${myconf} -} - -src_compile() { - # Prevent sandbox violations, bug #581836 - # https://bugzilla.gnome.org/show_bug.cgi?id=744134 - # https://bugzilla.gnome.org/show_bug.cgi?id=744135 - addpredict /dev - - default -} - -src_install() { - default - - # Remove .la files if they're not needed - use static-libs || find "${D}" -name '*.la' -delete || die - - make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" - readme.gentoo_create_doc -} diff --git a/net-misc/spice-gtk/spice-gtk-0.38-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.38-r2.ebuild deleted file mode 100644 index d70e837b73f2..000000000000 --- a/net-misc/spice-gtk/spice-gtk-0.38-r2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VALA_MIN_API_VERSION="0.14" -VALA_USE_DEPEND="vapigen" - -inherit desktop meson readme.gentoo-r1 vala xdg-utils - -DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" -HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" - -LICENSE="LGPL-2.1" -SLOT="0" -SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav" - -# TODO: -# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h -# * use external pnp.ids as soon as that means not pulling in gnome-desktop -RDEPEND=" - >=dev-libs/glib-2.46:2 - dev-libs/json-glib:0= - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 - media-libs/gstreamer:1.0[introspection?] - media-libs/opus - sys-libs/zlib - virtual/jpeg:0= - >=x11-libs/cairo-1.2 - >=x11-libs/pixman-0.17.7 - gtk3? ( x11-libs/gtk+:3[introspection?] ) - introspection? ( dev-libs/gobject-introspection ) - dev-libs/openssl:0= - lz4? ( app-arch/lz4 ) - pulseaudio? ( - media-plugins/gst-plugins-pulse:1.0 - ) - sasl? ( dev-libs/cyrus-sasl ) - smartcard? ( app-emulation/qemu[smartcard] ) - usbredir? ( - sys-apps/hwids - >=sys-apps/usbredir-0.4.2 - virtual/libusb:1 - policykit? ( - sys-apps/acl - >=sys-auth/polkit-0.110-r1 - ) - ) - webdav? ( - net-libs/phodav:2.0 - >=net-libs/libsoup-2.49.91:2.4 ) -" -# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a -# configure knob. The package is relatively lightweight so we just depend -# on it unconditionally for now. It would be cleaner to transform this into -# a USE="vaapi" conditional and patch the buildsystem... -RDEPEND="${RDEPEND} - amd64? ( x11-libs/libva:= ) - arm64? ( x11-libs/libva:= ) - x86? ( x11-libs/libva:= ) -" -DEPEND="${RDEPEND} - >=app-emulation/spice-protocol-0.14.1 - dev-perl/Text-CSV - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -src_prepare() { - default - - use vala && vala_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_feature gtk3 gtk) - $(meson_feature introspection) - $(meson_use mjpeg builtin-mjpeg) - $(meson_feature policykit polkit) - $(meson_feature pulseaudio pulse) - $(meson_feature lz4) - $(meson_feature sasl) - $(meson_feature smartcard) - $(meson_feature usbredir) - $(meson_feature vala vapi) - $(meson_feature webdav) - ) - - if use usbredir; then - emesonargs+=( -D "usb-acl-helper-dir=/usr/libexec" ) - emesonargs+=( -D "usb-ids-path=/usr/share/misc/usb.ids" ) - fi - - meson_src_configure -} - -src_install() { - meson_src_install - - make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" - readme.gentoo_create_doc -} diff --git a/net-misc/spice-gtk/spice-gtk-0.38-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.38-r3.ebuild deleted file mode 100644 index 3d714471af99..000000000000 --- a/net-misc/spice-gtk/spice-gtk-0.38-r3.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VALA_MIN_API_VERSION="0.14" -VALA_USE_DEPEND="vapigen" - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit desktop meson python-any-r1 readme.gentoo-r1 vala xdg-utils - -DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" -HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" - -LICENSE="LGPL-2.1" -SLOT="0" -SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav" - -# TODO: -# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h -# * use external pnp.ids as soon as that means not pulling in gnome-desktop -RDEPEND=" - >=dev-libs/glib-2.46:2 - dev-libs/json-glib:0= - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 - media-libs/gstreamer:1.0[introspection?] - media-libs/opus - sys-libs/zlib - virtual/jpeg:0= - >=x11-libs/cairo-1.2 - >=x11-libs/pixman-0.17.7 - gtk3? ( x11-libs/gtk+:3[introspection?] ) - introspection? ( dev-libs/gobject-introspection ) - dev-libs/openssl:0= - lz4? ( app-arch/lz4 ) - pulseaudio? ( - media-plugins/gst-plugins-pulse:1.0 - ) - sasl? ( dev-libs/cyrus-sasl ) - smartcard? ( app-emulation/qemu[smartcard] ) - usbredir? ( - sys-apps/hwids - >=sys-apps/usbredir-0.4.2 - virtual/libusb:1 - policykit? ( - sys-apps/acl - >=sys-auth/polkit-0.110-r1 - ) - ) - webdav? ( - net-libs/phodav:2.0 - >=net-libs/libsoup-2.49.91:2.4 ) -" -# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a -# configure knob. The package is relatively lightweight so we just depend -# on it unconditionally for now. It would be cleaner to transform this into -# a USE="vaapi" conditional and patch the buildsystem... -RDEPEND="${RDEPEND} - amd64? ( x11-libs/libva:= ) - arm64? ( x11-libs/libva:= ) - x86? ( x11-libs/libva:= ) -" -DEPEND="${RDEPEND} - >=app-emulation/spice-protocol-0.14.1 - dev-perl/Text-CSV - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -BDEPEND=" - $(python_gen_any_dep ' - dev-python/six[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - ') -" - -python_check_deps() { - has_version "dev-python/six[${PYTHON_USEDEP}]" && - has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - sed -i -e "/^ '-Werror',/d" \ - subprojects/spice-common/meson.build || die - use vala && vala_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_feature gtk3 gtk) - $(meson_feature introspection) - $(meson_use mjpeg builtin-mjpeg) - $(meson_feature policykit polkit) - $(meson_feature pulseaudio pulse) - $(meson_feature lz4) - $(meson_feature sasl) - $(meson_feature smartcard) - $(meson_feature usbredir) - $(meson_feature vala vapi) - $(meson_feature webdav) - ) - - if use usbredir; then - emesonargs+=( -D "usb-acl-helper-dir=/usr/libexec" ) - emesonargs+=( -D "usb-ids-path=/usr/share/misc/usb.ids" ) - fi - - meson_src_configure -} - -src_install() { - meson_src_install - - make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" - readme.gentoo_create_doc -} diff --git a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild index 97058d427523..784cfaef5d9a 100644 --- a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild +++ b/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild @@ -1,23 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -VALA_MIN_API_VERSION="0.14" VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{10..11} ) -PYTHON_COMPAT=( python3_{7..9} ) - -inherit desktop meson python-any-r1 readme.gentoo-r1 vala xdg-utils +inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git" + inherit git-r3 + + SPICE_PROTOCOL_VER=9999 +else + SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz" + KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86" + + SPICE_PROTOCOL_VER=0.14.3 +fi LICENSE="LGPL-2.1" SLOT="0" -SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav" +IUSE="gtk-doc +gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav" # TODO: # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h @@ -29,72 +36,79 @@ RDEPEND=" media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus + media-libs/libjpeg-turbo:= sys-libs/zlib - virtual/jpeg:0= >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 + x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) - dev-libs/openssl:0= + dev-libs/openssl:= lz4? ( app-arch/lz4 ) + policykit? ( + >=sys-auth/polkit-0.110-r1 + ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 + virtual/acl virtual/libusb:1 - policykit? ( - sys-apps/acl - >=sys-auth/polkit-0.110-r1 - ) ) webdav? ( - net-libs/phodav:2.0 - >=net-libs/libsoup-2.49.91:2.4 ) + net-libs/phodav:3.0 + net-libs/libsoup:3.0 + ) " -# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a +# TODO: spice-gtk has an automagic dependency on media-libs/libva without a # configure knob. The package is relatively lightweight so we just depend # on it unconditionally for now. It would be cleaner to transform this into # a USE="vaapi" conditional and patch the buildsystem... -RDEPEND="${RDEPEND} - amd64? ( x11-libs/libva:= ) - arm64? ( x11-libs/libva:= ) - x86? ( x11-libs/libva:= ) +RDEPEND=" + ${RDEPEND} + amd64? ( media-libs/libva:= ) + arm64? ( media-libs/libva:= ) + x86? ( media-libs/libva:= ) " -DEPEND="${RDEPEND} - >=app-emulation/spice-protocol-0.14.3 - dev-perl/Text-CSV - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) ) +DEPEND=" + ${RDEPEND} + >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER} + valgrind? ( dev-debug/valgrind ) " - BDEPEND=" $(python_gen_any_dep ' - dev-python/six[${PYTHON_USEDEP}] dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] ') + dev-perl/Text-CSV + dev-util/glib-utils + >=sys-devel/gettext-0.17 + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + vala? ( $(vala_depend) ) " PATCHES=( - "${FILESDIR}"/${PN}-0.39-fix-finding-pyparsing.patch + "${FILESDIR}/${PN}-0.42-libtool-export-symbols-fix.patch" ) python_check_deps() { - has_version -b "dev-python/six[${PYTHON_USEDEP}]" && - has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" + python_has_version "dev-python/six[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" } src_prepare() { default - use vala && vala_src_prepare + + python_fix_shebang subprojects/keycodemapdb/tools/keymap-gen + + use vala && vala_setup } src_configure() { local emesonargs=( + $(meson_feature gtk-doc gtk_doc) $(meson_feature gtk3 gtk) $(meson_feature introspection) $(meson_use mjpeg builtin-mjpeg) @@ -104,14 +118,21 @@ src_configure() { $(meson_feature smartcard) $(meson_feature usbredir) $(meson_feature vala vapi) + $(meson_use valgrind) $(meson_feature webdav) $(meson_feature wayland wayland-protocols) ) + if use elibc_musl; then + emesonargs+=( + -Dcoroutine=gthread + ) + fi + if use usbredir; then emesonargs+=( -Dusb-acl-helper-dir=/usr/libexec - -Dusb-ids-path="${EPREFIX}/usr/share/hwdata/usb.ids" + -Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids ) fi @@ -121,6 +142,18 @@ src_configure() { src_install() { meson_src_install + if use usbredir && use policykit; then + # bug #775554 (and bug #851657) + fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper + fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper + fi + make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" readme.gentoo_create_doc } + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse +} diff --git a/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild new file mode 100644 index 000000000000..508b80c65082 --- /dev/null +++ b/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{10..12} ) + +inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg + +DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" +HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git" + inherit git-r3 + + SPICE_PROTOCOL_VER=9999 +else + SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz" + KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86" + + SPICE_PROTOCOL_VER=0.14.3 +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="gtk-doc +gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav" + +# TODO: +# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h +# * use external pnp.ids as soon as that means not pulling in gnome-desktop +RDEPEND=" + >=dev-libs/glib-2.46:2 + dev-libs/json-glib:0= + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + media-libs/gstreamer:1.0[introspection?] + media-libs/opus + media-libs/libjpeg-turbo:= + sys-libs/zlib + >=x11-libs/cairo-1.2 + >=x11-libs/pixman-0.17.7 + x11-libs/libX11 + gtk3? ( x11-libs/gtk+:3[introspection?] ) + introspection? ( dev-libs/gobject-introspection ) + dev-libs/openssl:= + lz4? ( app-arch/lz4 ) + policykit? ( + >=sys-auth/polkit-0.110-r1 + ) + sasl? ( dev-libs/cyrus-sasl ) + smartcard? ( app-emulation/qemu[smartcard] ) + usbredir? ( + sys-apps/hwdata + >=sys-apps/usbredir-0.4.2 + virtual/acl + virtual/libusb:1 + ) + webdav? ( + net-libs/phodav:3.0 + net-libs/libsoup:3.0 + ) +" +# TODO: spice-gtk has an automagic dependency on media-libs/libva without a +# configure knob. The package is relatively lightweight so we just depend +# on it unconditionally for now. It would be cleaner to transform this into +# a USE="vaapi" conditional and patch the buildsystem... +RDEPEND=" + ${RDEPEND} + amd64? ( media-libs/libva:= ) + arm64? ( media-libs/libva:= ) + x86? ( media-libs/libva:= ) +" +DEPEND=" + ${RDEPEND} + >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER} + valgrind? ( dev-debug/valgrind ) +" +BDEPEND=" + $(python_gen_any_dep ' + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ') + dev-perl/Text-CSV + dev-util/glib-utils + >=sys-devel/gettext-0.17 + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + vala? ( $(vala_depend) ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.42-libtool-export-symbols-fix.patch" + "${FILESDIR}/${PN}-0.42-lld17-fix.patch" +) + +python_check_deps() { + python_has_version "dev-python/six[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + + python_fix_shebang subprojects/keycodemapdb/tools/keymap-gen + + use vala && vala_setup +} + +src_configure() { + local emesonargs=( + $(meson_feature gtk-doc gtk_doc) + $(meson_feature gtk3 gtk) + $(meson_feature introspection) + $(meson_use mjpeg builtin-mjpeg) + $(meson_feature policykit polkit) + $(meson_feature lz4) + $(meson_feature sasl) + $(meson_feature smartcard) + $(meson_feature usbredir) + $(meson_feature vala vapi) + $(meson_use valgrind) + $(meson_feature webdav) + $(meson_feature wayland wayland-protocols) + ) + + if use elibc_musl; then + emesonargs+=( + -Dcoroutine=gthread + ) + fi + + if use usbredir; then + emesonargs+=( + -Dusb-acl-helper-dir=/usr/libexec + -Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids + ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + if use usbredir && use policykit; then + # bug #775554 (and bug #851657) + fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper + fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper + fi + + make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse +} diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild index 59fac8bcb9c5..5f81513a6c11 100644 --- a/net-misc/spice-gtk/spice-gtk-9999.ebuild +++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild @@ -1,23 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -VALA_MIN_API_VERSION="0.14" VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_COMPAT=( python3_{7..9} ) - -inherit desktop git-r3 meson python-any-r1 readme.gentoo-r1 vala xdg-utils +inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git" + inherit git-r3 + + SPICE_PROTOCOL_VER=9999 +else + SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + + SPICE_PROTOCOL_VER=0.14.3 +fi LICENSE="LGPL-2.1" SLOT="0" -EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git" -KEYWORDS="" -IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav" +IUSE="gtk-doc +gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav" # TODO: # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h @@ -29,88 +36,100 @@ RDEPEND=" media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0[introspection?] media-libs/opus + media-libs/libjpeg-turbo:= sys-libs/zlib - virtual/jpeg:0= >=x11-libs/cairo-1.2 >=x11-libs/pixman-0.17.7 + x11-libs/libX11 gtk3? ( x11-libs/gtk+:3[introspection?] ) introspection? ( dev-libs/gobject-introspection ) - dev-libs/openssl:0= + dev-libs/openssl:= lz4? ( app-arch/lz4 ) - pulseaudio? ( - media-plugins/gst-plugins-pulse:1.0 + policykit? ( + >=sys-auth/polkit-0.110-r1 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwdata >=sys-apps/usbredir-0.4.2 + virtual/acl virtual/libusb:1 - policykit? ( - sys-apps/acl - >=sys-auth/polkit-0.110-r1 - ) ) webdav? ( - net-libs/phodav:2.0 - >=net-libs/libsoup-2.49.91:2.4 ) + net-libs/phodav:3.0 + net-libs/libsoup:3.0 + ) " -# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a +# TODO: spice-gtk has an automagic dependency on media-libs/libva without a # configure knob. The package is relatively lightweight so we just depend # on it unconditionally for now. It would be cleaner to transform this into # a USE="vaapi" conditional and patch the buildsystem... -RDEPEND="${RDEPEND} - amd64? ( x11-libs/libva:= ) - arm64? ( x11-libs/libva:= ) - x86? ( x11-libs/libva:= ) +RDEPEND=" + ${RDEPEND} + amd64? ( media-libs/libva:= ) + arm64? ( media-libs/libva:= ) + x86? ( media-libs/libva:= ) " -DEPEND="${RDEPEND} - ~app-emulation/spice-protocol-9999 - dev-perl/Text-CSV - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) ) +DEPEND=" + ${RDEPEND} + >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER} + valgrind? ( dev-debug/valgrind ) " - BDEPEND=" $(python_gen_any_dep ' - dev-python/six[${PYTHON_USEDEP}] dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] ') + dev-perl/Text-CSV + dev-util/glib-utils + >=sys-devel/gettext-0.17 + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + vala? ( $(vala_depend) ) " python_check_deps() { - has_version "dev-python/six[${PYTHON_USEDEP}]" && - has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" + python_has_version "dev-python/six[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" } src_prepare() { default - use vala && vala_src_prepare + python_fix_shebang subprojects/keycodemapdb/tools/keymap-gen + + use vala && vala_setup } src_configure() { local emesonargs=( + $(meson_feature gtk-doc gtk_doc) $(meson_feature gtk3 gtk) $(meson_feature introspection) $(meson_use mjpeg builtin-mjpeg) $(meson_feature policykit polkit) - $(meson_feature pulseaudio pulse) $(meson_feature lz4) $(meson_feature sasl) $(meson_feature smartcard) $(meson_feature usbredir) $(meson_feature vala vapi) + $(meson_use valgrind) $(meson_feature webdav) + $(meson_feature wayland wayland-protocols) ) + if use elibc_musl; then + emesonargs+=( + -Dcoroutine=gthread + ) + fi + if use usbredir; then - emesonargs+=( -D "usb-acl-helper-dir=/usr/libexec" ) - emesonargs+=( -D "usb-ids-path=${EPREFIX}/usr/share/hwdata/usb.ids" ) + emesonargs+=( + -Dusb-acl-helper-dir=/usr/libexec + -Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids + ) fi meson_src_configure @@ -119,6 +138,18 @@ src_configure() { src_install() { meson_src_install + if use usbredir && use policykit; then + # bug #775554 (and bug #851657) + fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper + fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper + fi + make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" readme.gentoo_create_doc } + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse +} diff --git a/net-misc/spiped/Manifest b/net-misc/spiped/Manifest index 9946dbce1cca..3d0735c745f5 100644 --- a/net-misc/spiped/Manifest +++ b/net-misc/spiped/Manifest @@ -1,2 +1 @@ -DIST spiped-1.6.0.tgz 94431 BLAKE2B e994115d5080e4f41d57d3ef88223c7dca373320266a3fe4f0420fb7aef6ecf329fad5a409ec31f53caaeb22d86d0c3a48060758ceee28d011676a12124fc057 SHA512 9bca8e7da31b86f956a653279f9346d8270a7e28a07d30b4a7104b21fbfbd1a81410e6a7dc0827127331a8f10226d5b8d2ddaacb94c9f76ecc6d15d728ead27a -DIST spiped-1.6.1.tgz 115055 BLAKE2B d9ee65c10b183cc8d5451adeb65a728052378811e71ee40d7e6f121c00b6003d4b21cc9402b424aac15d115cdbdc158207ef3e6c60b93fab2a4ba63257fd2f1d SHA512 ec69cb49a19e4e5705526ec74ee683ac3923412bc5ca3a45fc8268699367421cd37354ccc03c18c2d48f06cdb8a4c4bce3ef3b60934997c6770547e02e6f66ae +DIST spiped-1.6.2.tgz 142332 BLAKE2B ce9fe45223eec8bbb741eb3106b17a395347de2766c289def9897321cce9907e104b55752ff3b2c9c7deafd178aaeef1e8fa8afe82c2d25582004c8c92982df6 SHA512 d16262a3e8be876ca1ef1aac8bb38fae91f523a9af0d488eb0dfa23e0b9db795d2a021e55f31095d92f5b94e4516e30ea23f537c3b14a2f1b9871297e26cda76 diff --git a/net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch b/net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch deleted file mode 100644 index e7502d539c94..000000000000 --- a/net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/spiped/Makefile 2020-06-11 10:21:27.592104792 -0000 -+++ b/spiped/Makefile 2020-06-11 10:21:55.028522571 -0000 -@@ -27,7 +27,7 @@ - rm -f ${PROG} ${SRCS:.c=.o} - - ${PROG}:${SRCS:.c=.o} -- ${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX} -+ ${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX} ${LDFLAGS} - - main.o: main.c ../libcperciva/util/asprintf.h ../libcperciva/util/daemonize.h ../libcperciva/events/events.h ../libcperciva/util/getopt.h ../lib/util/graceful_shutdown.h ../libcperciva/util/parsenum.h ../libcperciva/util/sock.h ../libcperciva/util/warnp.h dispatch.h ../proto/proto_crypt.h ../libcperciva/crypto/crypto_dh.h - ${CC} ${CFLAGS} ${CFLAGS_POSIX} -D_POSIX_C_SOURCE=200809L -DCPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\" -I.. ${IDIRS} -c main.c -o main.o ---- a/spipe/Makefile 2020-06-11 10:21:19.025515816 -0000 -+++ b/spipe/Makefile 2020-06-11 10:22:17.924981556 -0000 -@@ -27,7 +27,7 @@ - rm -f ${PROG} ${SRCS:.c=.o} - - ${PROG}:${SRCS:.c=.o} -- ${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX} -+ ${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX} ${LDFLAGS} - - main.o: main.c ../libcperciva/events/events.h ../libcperciva/util/getopt.h ../libcperciva/util/parsenum.h ../libcperciva/util/sock.h ../libcperciva/util/warnp.h ../proto/proto_conn.h ../proto/proto_crypt.h ../libcperciva/crypto/crypto_dh.h pushbits.h - ${CC} ${CFLAGS} ${CFLAGS_POSIX} -D_POSIX_C_SOURCE=200809L -DCPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\" -I.. ${IDIRS} -c main.c -o main.o diff --git a/net-misc/spiped/files/spiped.initd b/net-misc/spiped/files/spiped.initd index 80a164c64999..ce94315c0a6a 100644 --- a/net-misc/spiped/files/spiped.initd +++ b/net-misc/spiped/files/spiped.initd @@ -21,7 +21,7 @@ depend() { } checkconfig() { - if [[ ! "$IS_CONFIGURED" == "yes" ]]; then + if [ ! "$IS_CONFIGURED" = "yes" ]; then eerror "You need to setup /etc/conf.d/spiped first!" return 1 fi diff --git a/net-misc/spiped/metadata.xml b/net-misc/spiped/metadata.xml index 9ad514a59f64..96c92ae9ee97 100644 --- a/net-misc/spiped/metadata.xml +++ b/net-misc/spiped/metadata.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <longdescription> Spiped (pronounced "ess-pipe-dee") is a utility for creating symmetrically encrypted and authenticated pipes between socket addresses, so that one may diff --git a/net-misc/spiped/spiped-1.6.0-r1.ebuild b/net-misc/spiped/spiped-1.6.0-r1.ebuild deleted file mode 100644 index 92bb76e69a0c..000000000000 --- a/net-misc/spiped/spiped-1.6.0-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="secure pipe daemon" -HOMEPAGE="http://www.tarsnap.com/spiped.html" -SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" - -MY_PN="${PN/d/}" - -DEPEND=" - dev-libs/openssl:0=" - -# Blocker added due to #548126 -RDEPEND=" - ${DEPEND} - !net-mail/qlogtools" - -PATCHES=( - "${FILESDIR}/${P}-ldflags-support.patch" -) - -src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin "${MY_PN}/${MY_PN}" - dosbin "${PN}/${PN}" - - doman "${MY_PN}/${MY_PN}.1" "${PN}/${PN}.1" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - - dodir "etc/${PN}" -} - -pkg_postinst() { - elog - elog "You will need to configure spiped via its" - elog "configuration file located in /etc/conf.d/." - elog - elog "Please have a look at this file prior to starting up spiped!" - elog -} diff --git a/net-misc/spiped/spiped-1.6.1.ebuild b/net-misc/spiped/spiped-1.6.2-r1.ebuild index 447f555d5f3a..93fb33b8305d 100644 --- a/net-misc/spiped/spiped-1.6.1.ebuild +++ b/net-misc/spiped/spiped-1.6.2-r1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="secure pipe daemon" -HOMEPAGE="http://www.tarsnap.com/spiped.html" -SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz" +HOMEPAGE="https://www.tarsnap.com/spiped.html" +SRC_URI="https://www.tarsnap.com/${PN}/${P}.tgz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" MY_PN="${PN/d/}" @@ -27,7 +27,7 @@ RDEPEND=" RESTRICT="test" src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_install() { diff --git a/net-misc/spread/Manifest b/net-misc/spread/Manifest deleted file mode 100644 index 5f2ba1e68a36..000000000000 --- a/net-misc/spread/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST spread-src-4.4.1.tar.gz 760038 BLAKE2B 250e6347695f5f6e8047bf527c92baa3cfb6c44ce88ea08ff6ab066b937fab29531743133e73e155a5cc07109b1942efe46fd1d3b74202264a2e8ef0f518a0ad SHA512 19f3fe897e4a4bd68dffc7d28d7b99826bbcbb5c2f44eb18127ed486063594bfd788c03c8c338b9b329302659325fa84a9cbfee3f202a9970afb1a560bb6f496 -DIST spread-src-5.0.1.tar.gz 803058 BLAKE2B b115675cb8ad89bfda7921d7ede0d168bfa833297a13cf5bba866505813fc255d3585b4a02e51409acda73597803ac691b0b6d329b189405004fce5505af7f1c SHA512 f57dbabb6e4d343434fe1c48bb8868cf601e22c599a520521a23c6dfa215b1d835fb2a7dc3b7cf124352060d12566c5f64114544428cc5a95e7899208379b115 diff --git a/net-misc/spread/files/spread.init.d b/net-misc/spread/files/spread.init.d deleted file mode 100644 index c041444e65a9..000000000000 --- a/net-misc/spread/files/spread.init.d +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -mkdir_spreadirs() { - [ -d /var/run/spread ] || mkdir -p /var/run/spread -} - -start() { - ebegin "Starting Spread Daemon" - mkdir_spreadirs - start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/spread.pid --exec /usr/sbin/spread & - eend $? -} - -stop() { - ebegin "Stopping Spread" - start-stop-daemon --stop --pidfile /var/run/spread.pid - eend $? -} diff --git a/net-misc/spread/spread-4.4.1-r1.ebuild b/net-misc/spread/spread-4.4.1-r1.ebuild deleted file mode 100644 index 70da45c67ba2..000000000000 --- a/net-misc/spread/spread-4.4.1-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="spread-src" - -DESCRIPTION="Distributed network messaging system" -HOMEPAGE="http://www.spread.org" -SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="Spread-1.0" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - acct-group/spread - acct-user/spread -" - -src_prepare() { - default - - # don't strip binaries - sed -i -e 's/0755 -s/0755/g' daemon/Makefile.in examples/Makefile.in -} - -src_install() { - emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install - newinitd "${FILESDIR}"/spread.init.d spread -} diff --git a/net-misc/spread/spread-5.0.1-r1.ebuild b/net-misc/spread/spread-5.0.1-r1.ebuild deleted file mode 100644 index 85b0f141896f..000000000000 --- a/net-misc/spread/spread-5.0.1-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="spread-src" - -DESCRIPTION="Distributed network messaging system" -HOMEPAGE="http://www.spread.org" -SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="Spread-1.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - acct-group/spread - acct-user/spread -" - -src_prepare() { - default - - # don't strip binaries - sed -i -e 's/0755 -s/0755/g' daemon/Makefile.in examples/Makefile.in -} - -src_install() { - emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install - newinitd "${FILESDIR}"/spread.init.d spread -} diff --git a/net-misc/ssh-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest index 0f334983106a..81c68555db51 100644 --- a/net-misc/ssh-askpass-fullscreen/Manifest +++ b/net-misc/ssh-askpass-fullscreen/Manifest @@ -1 +1 @@ -DIST ssh-askpass-fullscreen-1.2.tar.gz 101597 BLAKE2B 86c632f83d99ed3d6934b921e499fdb75821659d5b54d380a9d7b04355b93602a481e94320d795b614f2e4c67e7a3ffe1e8380065840e31cb9f5e29c5ae8a75d SHA512 478ae81d8d8b174f9a7ba8f7071aca80503ee3ceed945f12fc44f69d08df4ede010de64ab96cacc901b5b29f4a0e4efb86c220e40f2903b8a4306acc4381f88d +DIST ssh-askpass-fullscreen-1.2.tar.bz2 82078 BLAKE2B 5fbb18e99978e9d2632bb01b6f608c4bb2ed656958bc6e8c9ff9819561abd7dc8a09b333a4cc181115ca3439bf9731e1bdb697d551a771ce4b0777e64b90b88b SHA512 ba8ba726ea618adc66fa1b8b4b1cdbf78bd82ed98bc17dcb5285a78f9e0e1c9ece8b715b8cf89f7beae3d62a80f1dfaf8f561269b92f61445df3ec59ce16522e diff --git a/net-misc/ssh-askpass-fullscreen/metadata.xml b/net-misc/ssh-askpass-fullscreen/metadata.xml index dde3e0dc4ca9..ddc72d39d7d4 100644 --- a/net-misc/ssh-askpass-fullscreen/metadata.xml +++ b/net-misc/ssh-askpass-fullscreen/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!--maintainer-needed--> + <upstream> + <remote-id type="github">atj/ssh-askpass-fullscreen</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild index a1e8c7c4af9c..aa0502e311e4 100644 --- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild +++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,11 +7,11 @@ inherit autotools DESCRIPTION="A small SSH Askpass replacement written with GTK2" HOMEPAGE="https://github.com/atj/ssh-askpass-fullscreen" -SRC_URI="https://github.com/atj/${PN}/releases/download/v${PV}/${P}.tar.gz" +SRC_URI="https://github.com/atj/${PN}/releases/download/v${PV}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~riscv sparc x86" IUSE="" RDEPEND=">=x11-libs/gtk+-2.10.0:2 diff --git a/net-misc/ssh-chain/Manifest b/net-misc/ssh-chain/Manifest deleted file mode 100644 index 8c217ae4b553..000000000000 --- a/net-misc/ssh-chain/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ssh-chain-20131217.tar.gz 3956 BLAKE2B 64df261f9dac1d614d9095cd77b407cb6da44cd1cf97b043834670df63bb5abb7397074c073d7c0a2c10edf1cc19fcda8182a9e1ecac6b8a58a07f793e524d0c SHA512 7d9faa9bbce44a50ca56d65fd778d35f79c7ece982e2bb0e424471c866f9cc584390484dbed73447473016fe5de4564e22883d3dda4aa54e167853a3e0ce2975 diff --git a/net-misc/ssh-chain/ssh-chain-20131217.ebuild b/net-misc/ssh-chain/ssh-chain-20131217.ebuild deleted file mode 100644 index 45a56747325f..000000000000 --- a/net-misc/ssh-chain/ssh-chain-20131217.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit vcs-snapshot - -COMMIT="c1bd9d82d750bf001d12a9cd41b9b24a3fd84f81" -DESCRIPTION="ssh via a chain of intermediary hosts" -HOMEPAGE="https://github.com/ryancdotorg/ssh-chain" -SRC_URI="https://github.com/ryancdotorg/ssh-chain/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="" -RDEPEND="dev-lang/perl - virtual/ssh" - -src_install() { - dobin "${PN}" - dodoc README - if [[ -f "${EROOT}"/etc/ssh/ssh_config ]] && ! grep -q "^Host \*^\*" "${EROOT}"/etc/ssh/ssh_config; then - cp "${EROOT}"/etc/ssh/ssh_config "${T}/ssh_config" - cat >> "${T}/ssh_config" <<EOF - -#for ${PN} -Host *^* - ProxyCommand ssh-chain %h %p - -EOF - insinto /etc/ssh - doins "${T}/ssh_config" - fi -} diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest index 547a7f2d6ac3..2f0ae502f5e3 100644 --- a/net-misc/sshpass/Manifest +++ b/net-misc/sshpass/Manifest @@ -1 +1,2 @@ -DIST sshpass-1.06.tar.gz 112205 BLAKE2B 9bae7ba60ca627664d12bcccb9a9bb76bc92752490458e4d4fdde27cdb14a0d71c94eeeefe83d95810c1cbe0fff0c9ac8a9d6fb8a90e2cd834c387ac2527875b SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8 +DIST sshpass-1.09.tar.gz 112857 BLAKE2B b19e1b7d057e286a895312c62453b9aa5369efb3c617bb24fc7b6b0e521d4c65fad091c68b93cda17aef8350c243bdc2c22d5d58590f6359715159d9dca57bae SHA512 9b4ba83ca4d34364e7c43e29f98493dc3d595d24dc68c2fe3c244600d92a0f8bc0a6a7f8f43d64c0b4d714eb196516f297d904fa66035a76dae89a3726c0f2ff +DIST sshpass-1.10.tar.gz 139652 BLAKE2B 8fb0191abeb43c6c345dd4073f01541337f37d7c286679f50108c0d908a9d3a4179e2ee30bdbd81e3ebb0f277d14e1b8f329fac2e03500ebf15334c79069a386 SHA512 d0fbceb956baee79803fec8bd9a2e0d1e342cbc90fb8bb4baa5a01914f870393f43bd07b62aa1da208318b4971005b9bbccf0e926c590124de11a272169db81d diff --git a/net-misc/sshpass/sshpass-1.06.ebuild b/net-misc/sshpass/sshpass-1.09-r1.ebuild index 3388348d5671..319f78fa5220 100644 --- a/net-misc/sshpass/sshpass-1.06.ebuild +++ b/net-misc/sshpass/sshpass-1.09-r1.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Tool for noninteractively performing password authentication with ssh" -HOMEPAGE="http://sshpass.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" -LICENSE="GPL-2" +HOMEPAGE="https://sourceforge.net/projects/sshpass/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz" +LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" -IUSE="" -RDEPEND="net-misc/openssh" +RDEPEND="virtual/openssh" diff --git a/net-misc/sshpass/sshpass-1.10.ebuild b/net-misc/sshpass/sshpass-1.10.ebuild new file mode 100644 index 000000000000..5f9c807632cf --- /dev/null +++ b/net-misc/sshpass/sshpass-1.10.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Tool for non-interactively performing password authentication with ssh" +HOMEPAGE="https://sourceforge.net/projects/sshpass/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" + +RDEPEND="virtual/openssh" diff --git a/net-misc/sshrc/Manifest b/net-misc/sshrc/Manifest index 120746ca6cb5..85140d5a7a96 100644 --- a/net-misc/sshrc/Manifest +++ b/net-misc/sshrc/Manifest @@ -1,2 +1 @@ -DIST sshrc-0.6.1.tar.gz 3701 BLAKE2B 36cdd0d4dcc80ea1884533f71e6090a6cb393dc1131a6d78fddc43c37e0597aee2da8b92789a59100ad6941d8c17e6ccbf796d73ec704df45aa768cfc6bf36a7 SHA512 69e0919bdef0ec6fb187814f1a0dd360b331dc4c0fc047f7767399944eccb949c172682331e6ebe940c275f0a2b6293a66a6018e12351f566638eed1ac362d64 DIST sshrc-0.6.2.tar.gz 4410 BLAKE2B 982ae3f0a6d3727699cc3cd7ddc20304ad1330b165f7450047f7d3b236ba7f3b297223d88c6ce8e00d0db97d3193c4547d7a10d51e8feb3bb639b6276865a8e8 SHA512 79dd964c5ed825b38aa775d35df6adc0857817c418fa4ae1971378f062536035bd66e4faa0fb84f66504f09c7e6368355f8c57036bea8d269b4d9084af95ddc4 diff --git a/net-misc/sshrc/sshrc-0.6.1.ebuild b/net-misc/sshrc/sshrc-0.6.1.ebuild deleted file mode 100644 index 8c14f3f0ac1f..000000000000 --- a/net-misc/sshrc/sshrc-0.6.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Bring your .bashrc, .vimrc, etc. from your local machine when you ssh" -HOMEPAGE="https://github.com/Russell91/sshrc" -SRC_URI="https://github.com/Russell91/sshrc/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="mosh" - -RDEPEND=" - virtual/ssh:0= - mosh? ( net-misc/mosh:0[client] ) -" - -src_install() { - dobin sshrc - use mosh && dobin moshrc -} diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest index 66c7bd553da1..ba17f3fd47bf 100644 --- a/net-misc/sslh/Manifest +++ b/net-misc/sslh/Manifest @@ -1,7 +1,3 @@ -DIST sslh-1.21.tar.gz 111298 BLAKE2B 46003021292436023c7f2e0d9cbfb283f4ca7497f5da1562cb893a6f20df4ccaa1e6618fa2cdcc28f311518001396d861a5b50e36707327087192b0454f04287 SHA512 e758efc548b68ea4c50a56b6a6169f5c5bcfeb40163ff9968489ef6a3cdf2a69fa46869d1f53e24c6e31de4d44233005608dcf240968de6245653ccb068f692c -DIST sslh-1.21b.tar.gz 111740 BLAKE2B 5d42eab551e05ac1367da9ae85eac945657e086672712c148ee07c78af5c2a546e696d77081c7282e77c8bef535c186f89d541489f07153bd7ca2d338b341a48 SHA512 59bd33b47b70f82ae1ba3d6ffac3d54897dc6b7343d0d9e3bb8384adc30ac8a44a64e71590a7eecc5a83c2f70712bd79c0eb4ea8eef15ae770633dead9888c5f -DIST sslh-1.21c.tar.gz 111895 BLAKE2B 3ec7a4a4f8eb7ec3d22e9630070037ebef7df2cbe3657a38234573ecf4eb9f331914858f703690b094ddc1977cd80b3a5760b94004f35a2ec2c59761f6cd142e SHA512 9446c6afe965684c5d6406ac8917338f57d95f8fbfacd7a51193dd5dbac77e1ed5e39eb8e2575e7025a8612b25e9fba7e64832a48c999f366875217b9328da22 -DIST sslh-1.22.tar.gz 147013 BLAKE2B b23f0a9601a7ba5121a6407872aee2d4c26eab934187070ab7ea3f360e815db9681db46b4f9c7f3ad5efe5446a44e0213c1bd791ad38505668b1cb3fa981bdcd SHA512 59bc40778350efbd21f22b66ecf2926ee04987784b1772450f8ce52b8d4a4270cfa307e3c978db70d420a7c3909a2c26df0b2b6127671be90537e40240a42652 -DIST sslh-1.22b.tar.gz 146854 BLAKE2B abeafeb35274b7d7d2b8e86206c3922deb98390da2fe023045c90ef68fe5720294c873ccdf2aa8443cd1521138e0b7dfe44a505a86d50291b4f7e84347499fee SHA512 de5ba0d5f241fb4742813b5ae1a2fcc4b872aa7d9c6acf7105e6c153b3a0b19482cfe28c96aa33a2561b5bfe7da3490a9c0b59d35dbd102f80f7f3b5ab68d52e DIST sslh-1.22c.tar.gz 146954 BLAKE2B 1870623634b625bb98787be27444403555262f8a9782573c9ed116e65df9e4518c062ef2e2a40fe7bb550f811518ccc2149a23c36deef6c156911b4c42e27473 SHA512 f13560fbe74b5b08e9b360985d6afd27f2c7e157d220919162e354f3711b90f43bb81f9bda341fb21fef2651acd488f52e9a04dc2da28861540f579e7ca798c4 -DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a +DIST sslh-2.1.1.tar.gz 212402 BLAKE2B fbde666b49e30950ff4c5c2f6aa563e538fd070ed0edecf2c19a85884379ea8a699488fd23e742c672656cc89b6911bdb764a0989f3b967ecc75aefe5634ea4b SHA512 f689394028ec25e16dd59a5f1aa4c18a760108f0acf23b4eb2ccf000dc09adf1428272c3e93f5b0012f9603076ab1408a3e1aca98adb3e69743d184cb898a9a4 +DIST sslh-2.1.2.tar.gz 214091 BLAKE2B 220841c7105032b02351b6073ffd994a22efb0241ebec96704bd2ec534197a19c366d925ebf07a494773e89d83df5f284567e34d419b887edb73545523abb71e SHA512 4f0b3c61e6153b912b11c49baba2df1a9df6732ea9fcdee628bf02043efc1b6505ac97eec97740c67d09f7d58a1bb79e0e06d949cb7fabcffa1fb91733372631 diff --git a/net-misc/sslh/files/sslh-1.21c-libconfig-1.7.3.patch b/net-misc/sslh/files/sslh-1.21c-libconfig-1.7.3.patch deleted file mode 100644 index ea2a625a1850..000000000000 --- a/net-misc/sslh/files/sslh-1.21c-libconfig-1.7.3.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 24e7f46a431b59043bf534eb7cdab76c4ffd595a Mon Sep 17 00:00:00 2001 -From: yrutschle <git1@rutschle.net> -Date: Wed, 23 Jun 2021 11:48:59 +0200 -Subject: [PATCH] fix for libconfig 1.7.3 (#292) - ---- - sslh-conf.c | 50 +++++++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 88 insertions(+), 16 deletions(-) - -diff --git a/sslh-conf.c b/sslh-conf.c -index 5f55656..530ef6b 100644 ---- a/sslh-conf.c -+++ b/sslh-conf.c -@@ -126,6 +126,14 @@ typedef int config_t; - return 0; \ - } - -+enum { -+ CONFIG_TYPE_INT, -+ CONFIG_TYPE_BOOL, -+ CONFIG_TYPE_INT64, -+ CONFIG_TYPE_FLOAT, -+ CONFIG_TYPE_STRING -+}; -+ - make_config_setting_lookup(bool); - make_config_setting_lookup(int); - make_config_setting_lookup(int64); -@@ -134,10 +142,14 @@ make_config_setting_lookup(string); - - make_config_setting_get(bool, int); - make_config_setting_get(int, int); --make_config_setting_get(int64, int); -+make_config_setting_get(int64, long long int); - make_config_setting_get(float, double); - make_config_setting_get(string, char*); - -+config_setting_t* config_root_setting(config_t* c) { -+ return NULL; -+} -+ - config_setting_t* config_lookup(config_t* c, const char* b) { - return NULL; - } -@@ -146,10 +158,38 @@ void config_init(config_t* c) { - return; - } - -+char* config_setting_name(config_setting_t* c) { -+ return NULL; -+} -+ -+int config_setting_is_list(config_setting_t* c) { -+ return 0; -+} -+ -+int config_setting_is_array(config_setting_t* c) { -+ return 0; -+} -+ -+int config_setting_is_scalar(config_setting_t* c) { -+ return 0; -+} -+ -+int config_setting_index(const config_setting_t *setting) { -+ return 0; -+} -+ - config_setting_t* config_setting_lookup(config_setting_t* a, char* b) { - return NULL; - } - -+int config_setting_remove(config_setting_t* cfg, char* name) { -+ return 0; -+} -+ -+int config_setting_type(config_setting_t* s) { -+ return -1; -+} -+ - int config_setting_length(config_setting_t* a) { - return 0; - } -@@ -1792,7 +1832,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg) - } - } - -- s = config_lookup(&c, "/"); -+ s = config_root_setting(&c); - - res = read_block(s, cfg, table_sslhcfg, &errmsg); - if (!res) { diff --git a/net-misc/sslh/files/sslh.service b/net-misc/sslh/files/sslh.service new file mode 100644 index 000000000000..9d58362220f0 --- /dev/null +++ b/net-misc/sslh/files/sslh.service @@ -0,0 +1,28 @@ +# /etc/systemd/system/sslh.service +[Unit] +Description=SSL/SSH multiplexer (fork mode) for %I +After=network.target + +[Service] +EnvironmentFile=/etc/conf.d/sslh +ExecStart=/usr/sbin/sslh -f $DAEMON_OPTS +KillMode=process +#Hardening +PrivateTmp=true +CapabilityBoundingSet=CAP_NET_BIND_SERVICE +AmbientCapabilities=CAP_NET_BIND_SERVICE +SecureBits=noroot-locked +ProtectSystem=strict +ProtectHome=true +ProtectKernelModules=true +ProtectKernelTunables=true +ProtectControlGroups=true +MountFlags=private +NoNewPrivileges=true +PrivateDevices=true +RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX +MemoryDenyWriteExecute=true +DynamicUser=true + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/sslh/metadata.xml b/net-misc/sslh/metadata.xml index a739e8ce329a..d8997e1a4379 100644 --- a/net-misc/sslh/metadata.xml +++ b/net-misc/sslh/metadata.xml @@ -2,13 +2,14 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>kensington@gentoo.org</email> - </maintainer> - <maintainer type="person"> <email>candrews@gentoo.org</email> <name>Craig Andrews</name> </maintainer> + <use> + <flag name="libev">Support event loops via <pkg>dev-libs/libev</pkg></flag> + </use> <upstream> <remote-id type="github">yrutschle/sslh</remote-id> + <remote-id type="cpe">cpe:/a:sslh_project:sslh</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/sslh/sslh-1.20-r2.ebuild b/net-misc/sslh/sslh-1.20-r2.ebuild deleted file mode 100644 index f9a1e233c7eb..000000000000 --- a/net-misc/sslh/sslh-1.20-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit flag-o-matic systemd toolchain-funcs - -DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" -HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" - inherit git-r3 -else - KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86" - MY_P="${PN}-v${PV}" - SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz" - S=${WORKDIR}/${MY_P} -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps pcre systemd tcpd" - -RDEPEND="caps? ( sys-libs/libcap ) - pcre? ( dev-libs/libpcre:= ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - >=dev-libs/libconfig-1.5:=" -DEPEND="${RDEPEND} - dev-lang/perl" - -RESTRICT="test" - -src_prepare() { - default - sed -i \ - -e '/MAN/s:| gzip -9 - >:>:' \ - -e '/MAN=sslh.8.gz/s:.gz::' \ - Makefile || die -} - -src_compile() { - # On older versions of GCC, the default gnu89 variant - # will reject within-for-loop initializers, bug #595426 - # Furthermore, we need to use the gnu variant (gnu99) instead - # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro - # to be defined. - append-cflags -std=gnu99 - - emake \ - CC="$(tc-getCC)" \ - USELIBPCRE=$(usev pcre) \ - USELIBCAP=$(usev caps) \ - USELIBWRAP=$(usev tcpd) \ - USESYSTEMD=$(usev systemd) -} - -src_install() { - dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh - - doman ${PN}.8 - - dodoc ChangeLog README.md - - newinitd "${FILESDIR}"/sslh.init.d-3 sslh - newconfd "${FILESDIR}"/sslh.conf.d-2 sslh - - if use systemd; then - # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin - sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die - systemd_newunit scripts/systemd.sslh.service sslh.service - exeinto /usr/lib/systemd/system-generators/ - doexe systemd-sslh-generator - fi -} diff --git a/net-misc/sslh/sslh-1.21-r2.ebuild b/net-misc/sslh/sslh-1.21-r2.ebuild deleted file mode 100644 index fa5062502fa5..000000000000 --- a/net-misc/sslh/sslh-1.21-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic systemd toolchain-funcs - -DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" -HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" - inherit git-r3 -else - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" - SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S=${WORKDIR}/${P} -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps pcre systemd tcpd" - -RDEPEND="caps? ( sys-libs/libcap ) - pcre? ( dev-libs/libpcre:= ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - >=dev-libs/libconfig-1.5:=" -DEPEND="${RDEPEND} - dev-lang/perl" - -RESTRICT="test" - -src_prepare() { - default - sed -i \ - -e '/MAN/s:| gzip -9 - >:>:' \ - -e '/MAN=sslh.8.gz/s:.gz::' \ - Makefile || die -} - -src_compile() { - # On older versions of GCC, the default gnu89 variant - # will reject within-for-loop initializers, bug #595426 - # Furthermore, we need to use the gnu variant (gnu99) instead - # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro - # to be defined. - append-cflags -std=gnu99 - - emake \ - CC="$(tc-getCC)" \ - USELIBPCRE=$(usev pcre) \ - USELIBCAP=$(usev caps) \ - USELIBWRAP=$(usev tcpd) \ - USESYSTEMD=$(usev systemd) -} - -src_install() { - dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh - - doman ${PN}.8 - - dodoc ChangeLog README.md - - newinitd "${FILESDIR}"/sslh.init.d-3 sslh - newconfd "${FILESDIR}"/sslh.conf.d-2 sslh - - if use systemd; then - # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin - sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die - systemd_newunit scripts/systemd.sslh.service sslh.service - exeinto /usr/lib/systemd/system-generators/ - doexe systemd-sslh-generator - fi -} diff --git a/net-misc/sslh/sslh-1.21b-r2.ebuild b/net-misc/sslh/sslh-1.21b-r2.ebuild deleted file mode 100644 index fa5062502fa5..000000000000 --- a/net-misc/sslh/sslh-1.21b-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic systemd toolchain-funcs - -DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" -HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" - inherit git-r3 -else - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" - SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S=${WORKDIR}/${P} -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps pcre systemd tcpd" - -RDEPEND="caps? ( sys-libs/libcap ) - pcre? ( dev-libs/libpcre:= ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - >=dev-libs/libconfig-1.5:=" -DEPEND="${RDEPEND} - dev-lang/perl" - -RESTRICT="test" - -src_prepare() { - default - sed -i \ - -e '/MAN/s:| gzip -9 - >:>:' \ - -e '/MAN=sslh.8.gz/s:.gz::' \ - Makefile || die -} - -src_compile() { - # On older versions of GCC, the default gnu89 variant - # will reject within-for-loop initializers, bug #595426 - # Furthermore, we need to use the gnu variant (gnu99) instead - # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro - # to be defined. - append-cflags -std=gnu99 - - emake \ - CC="$(tc-getCC)" \ - USELIBPCRE=$(usev pcre) \ - USELIBCAP=$(usev caps) \ - USELIBWRAP=$(usev tcpd) \ - USESYSTEMD=$(usev systemd) -} - -src_install() { - dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh - - doman ${PN}.8 - - dodoc ChangeLog README.md - - newinitd "${FILESDIR}"/sslh.init.d-3 sslh - newconfd "${FILESDIR}"/sslh.conf.d-2 sslh - - if use systemd; then - # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin - sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die - systemd_newunit scripts/systemd.sslh.service sslh.service - exeinto /usr/lib/systemd/system-generators/ - doexe systemd-sslh-generator - fi -} diff --git a/net-misc/sslh/sslh-1.21c-r2.ebuild b/net-misc/sslh/sslh-1.21c-r2.ebuild deleted file mode 100644 index fa5062502fa5..000000000000 --- a/net-misc/sslh/sslh-1.21c-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic systemd toolchain-funcs - -DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" -HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" - inherit git-r3 -else - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" - SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S=${WORKDIR}/${P} -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps pcre systemd tcpd" - -RDEPEND="caps? ( sys-libs/libcap ) - pcre? ( dev-libs/libpcre:= ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - >=dev-libs/libconfig-1.5:=" -DEPEND="${RDEPEND} - dev-lang/perl" - -RESTRICT="test" - -src_prepare() { - default - sed -i \ - -e '/MAN/s:| gzip -9 - >:>:' \ - -e '/MAN=sslh.8.gz/s:.gz::' \ - Makefile || die -} - -src_compile() { - # On older versions of GCC, the default gnu89 variant - # will reject within-for-loop initializers, bug #595426 - # Furthermore, we need to use the gnu variant (gnu99) instead - # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro - # to be defined. - append-cflags -std=gnu99 - - emake \ - CC="$(tc-getCC)" \ - USELIBPCRE=$(usev pcre) \ - USELIBCAP=$(usev caps) \ - USELIBWRAP=$(usev tcpd) \ - USESYSTEMD=$(usev systemd) -} - -src_install() { - dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh - - doman ${PN}.8 - - dodoc ChangeLog README.md - - newinitd "${FILESDIR}"/sslh.init.d-3 sslh - newconfd "${FILESDIR}"/sslh.conf.d-2 sslh - - if use systemd; then - # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin - sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die - systemd_newunit scripts/systemd.sslh.service sslh.service - exeinto /usr/lib/systemd/system-generators/ - doexe systemd-sslh-generator - fi -} diff --git a/net-misc/sslh/sslh-1.21c-r3.ebuild b/net-misc/sslh/sslh-1.21c-r3.ebuild deleted file mode 100644 index e062ddf36cad..000000000000 --- a/net-misc/sslh/sslh-1.21c-r3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic systemd toolchain-funcs - -DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" -HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" - inherit git-r3 -else - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" - SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S=${WORKDIR}/${P} -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps pcre systemd tcpd" - -RDEPEND="caps? ( sys-libs/libcap ) - pcre? ( dev-libs/libpcre:= ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - >=dev-libs/libconfig-1.5:=" -DEPEND="${RDEPEND} - dev-lang/perl" -PATCHES=( - "${FILESDIR}/${P}-libconfig-1.7.3.patch" -) -RESTRICT="test" - -src_prepare() { - default - sed -i \ - -e '/MAN/s:| gzip -9 - >:>:' \ - -e '/MAN=sslh.8.gz/s:.gz::' \ - Makefile || die -} - -src_compile() { - # On older versions of GCC, the default gnu89 variant - # will reject within-for-loop initializers, bug #595426 - # Furthermore, we need to use the gnu variant (gnu99) instead - # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro - # to be defined. - append-cflags -std=gnu99 - - emake \ - CC="$(tc-getCC)" \ - USELIBPCRE=$(usev pcre) \ - USELIBCAP=$(usev caps) \ - USELIBWRAP=$(usev tcpd) \ - USESYSTEMD=$(usev systemd) -} - -src_install() { - dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh - - doman ${PN}.8 - - dodoc ChangeLog README.md - - newinitd "${FILESDIR}"/sslh.init.d-3 sslh - newconfd "${FILESDIR}"/sslh.conf.d-2 sslh - - if use systemd; then - # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin - sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die - systemd_newunit scripts/systemd.sslh.service sslh.service - exeinto /usr/lib/systemd/system-generators/ - doexe systemd-sslh-generator - fi -} diff --git a/net-misc/sslh/sslh-1.22.ebuild b/net-misc/sslh/sslh-1.22c-r1.ebuild index 9ecf187a6416..b228c7d0c9de 100644 --- a/net-misc/sslh/sslh-1.22.ebuild +++ b/net-misc/sslh/sslh-1.22c-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" + KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86" SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" S=${WORKDIR}/${P} fi @@ -39,6 +39,8 @@ src_prepare() { } src_compile() { + append-lfs-flags + # On older versions of GCC, the default gnu89 variant # will reject within-for-loop initializers, bug #595426 # Furthermore, we need to use the gnu variant (gnu99) instead diff --git a/net-misc/sslh/sslh-1.22b.ebuild b/net-misc/sslh/sslh-2.1.1.ebuild index 9ecf187a6416..1a3dc9b9f8e3 100644 --- a/net-misc/sslh/sslh-1.22b.ebuild +++ b/net-misc/sslh/sslh-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,19 +11,21 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" + KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86" SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" S=${WORKDIR}/${P} fi LICENSE="GPL-2" SLOT="0" -IUSE="caps systemd tcpd" +IUSE="caps libev systemd tcpd" RDEPEND="caps? ( sys-libs/libcap ) dev-libs/libpcre2:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) + dev-libs/libconfig:= + libev? ( dev-libs/libev ) >=dev-libs/libconfig-1.5:=" DEPEND="${RDEPEND} dev-lang/perl" @@ -31,14 +33,16 @@ DEPEND="${RDEPEND} RESTRICT="test" src_prepare() { - default sed -i \ -e '/MAN/s:| gzip -9 - >:>:' \ -e '/MAN=sslh.8.gz/s:.gz::' \ - Makefile || die + Makefile.in || die + default } src_compile() { + append-lfs-flags + # On older versions of GCC, the default gnu89 variant # will reject within-for-loop initializers, bug #595426 # Furthermore, we need to use the gnu variant (gnu99) instead @@ -49,13 +53,19 @@ src_compile() { emake \ CC="$(tc-getCC)" \ USELIBCAP=$(usev caps) \ + USELIBEV=$(usev libev) \ USELIBWRAP=$(usev tcpd) \ USESYSTEMD=$(usev systemd) } src_install() { dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh + if use libev; then + dosbin sslh-ev + dosym sslh-fork /usr/sbin/sslh + else + dosym sslh-fork /usr/sbin/sslh + fi doman ${PN}.8 diff --git a/net-misc/sslh/sslh-1.22c.ebuild b/net-misc/sslh/sslh-2.1.2.ebuild index 9ecf187a6416..efb4eb40c48d 100644 --- a/net-misc/sslh/sslh-1.22c.ebuild +++ b/net-misc/sslh/sslh-2.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,19 +11,21 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" + KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86" SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" S=${WORKDIR}/${P} fi LICENSE="GPL-2" SLOT="0" -IUSE="caps systemd tcpd" +IUSE="caps libev systemd tcpd" RDEPEND="caps? ( sys-libs/libcap ) dev-libs/libpcre2:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) + dev-libs/libconfig:= + libev? ( dev-libs/libev ) >=dev-libs/libconfig-1.5:=" DEPEND="${RDEPEND} dev-lang/perl" @@ -31,14 +33,16 @@ DEPEND="${RDEPEND} RESTRICT="test" src_prepare() { - default sed -i \ -e '/MAN/s:| gzip -9 - >:>:' \ -e '/MAN=sslh.8.gz/s:.gz::' \ - Makefile || die + Makefile.in || die + default } src_compile() { + append-lfs-flags + # On older versions of GCC, the default gnu89 variant # will reject within-for-loop initializers, bug #595426 # Furthermore, we need to use the gnu variant (gnu99) instead @@ -49,13 +53,19 @@ src_compile() { emake \ CC="$(tc-getCC)" \ USELIBCAP=$(usev caps) \ + USELIBEV=$(usev libev) \ USELIBWRAP=$(usev tcpd) \ USESYSTEMD=$(usev systemd) } src_install() { dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh + if use libev; then + dosbin sslh-ev + dosym sslh-fork /usr/sbin/sslh + else + dosym sslh-fork /usr/sbin/sslh + fi doman ${PN}.8 @@ -66,8 +76,7 @@ src_install() { if use systemd; then # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin - sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die - systemd_newunit scripts/systemd.sslh.service sslh.service + systemd_newunit "${FILESDIR}/sslh.service" sslh.service exeinto /usr/lib/systemd/system-generators/ doexe systemd-sslh-generator fi diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild index 9ecf187a6416..efb4eb40c48d 100644 --- a/net-misc/sslh/sslh-9999.ebuild +++ b/net-misc/sslh/sslh-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,19 +11,21 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" + KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86" SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" S=${WORKDIR}/${P} fi LICENSE="GPL-2" SLOT="0" -IUSE="caps systemd tcpd" +IUSE="caps libev systemd tcpd" RDEPEND="caps? ( sys-libs/libcap ) dev-libs/libpcre2:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) + dev-libs/libconfig:= + libev? ( dev-libs/libev ) >=dev-libs/libconfig-1.5:=" DEPEND="${RDEPEND} dev-lang/perl" @@ -31,14 +33,16 @@ DEPEND="${RDEPEND} RESTRICT="test" src_prepare() { - default sed -i \ -e '/MAN/s:| gzip -9 - >:>:' \ -e '/MAN=sslh.8.gz/s:.gz::' \ - Makefile || die + Makefile.in || die + default } src_compile() { + append-lfs-flags + # On older versions of GCC, the default gnu89 variant # will reject within-for-loop initializers, bug #595426 # Furthermore, we need to use the gnu variant (gnu99) instead @@ -49,13 +53,19 @@ src_compile() { emake \ CC="$(tc-getCC)" \ USELIBCAP=$(usev caps) \ + USELIBEV=$(usev libev) \ USELIBWRAP=$(usev tcpd) \ USESYSTEMD=$(usev systemd) } src_install() { dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh + if use libev; then + dosbin sslh-ev + dosym sslh-fork /usr/sbin/sslh + else + dosym sslh-fork /usr/sbin/sslh + fi doman ${PN}.8 @@ -66,8 +76,7 @@ src_install() { if use systemd; then # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin - sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die - systemd_newunit scripts/systemd.sslh.service sslh.service + systemd_newunit "${FILESDIR}/sslh.service" sslh.service exeinto /usr/lib/systemd/system-generators/ doexe systemd-sslh-generator fi diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest index 5bbc71ccec93..3c0382cbe84f 100644 --- a/net-misc/sstp-client/Manifest +++ b/net-misc/sstp-client/Manifest @@ -1 +1,3 @@ -DIST sstp-client-1.0.12.tar.gz 468683 BLAKE2B 4bb97465ee29eb6dd816a69b45c53e58e9de2cd5d7b5c9e39ea4ebbb3c3de0c21b3d95317114ae8c93bc3be359300bd6a55fa0512540bf25405fb47f8fb4e736 SHA512 d29128e59977fa844b0f2b02580284bb4e909994e5616c4dfa150b7a9807d0f34219355abe8c315c60c5f2482e3255824ce7e05566dbea9a7f13a1739d46468f +DIST sstp-client-1.0.17.tar.gz 482831 BLAKE2B d19c752b3f061401f89eb46bd52091e3ab0a3c931c6646a55c1ee0e6dd7e9c501fba14b7c870a2514cb72fb0fd1d8bc89538562d4d99b9d58a081e0917734f5d SHA512 eff18eb894b2c96d46315b5ac7530fe50e8dd6e6c29ea946cd0e7c05c56416e85088fc65650fb77c05e3a747cb0b4e3575af5457515d240161027910abae9775 +DIST sstp-client-1.0.18-ppp-2.5.0-patches.tar.xz 7244 BLAKE2B 4249787feb98d71f81d50ac4f02cf38f8cd21501bfffc0ec65ba262db5c5ccf3bc3ba728f676e7156e6105181c2706c5bfc242b66c6db63cc39e82a6e4add56a SHA512 ed99b6de0ea57ff80ca175b329b00334cad7ca535fd6465f318bf5db0994a1a9aec6f7026bebcf9087a1d21ecac8a8a3a027e346ca541582470b0570273d4cd7 +DIST sstp-client-1.0.18.tar.gz 477886 BLAKE2B 3a2929a5245a703c36b9bf6c17b7f65d911446a8a44b95894fd990ccf5ad01a98e4b5e843681e4643ff4b28a57de359a98ef42f9bb378d52c6829297970399b6 SHA512 e0dd0fe57b65c2001737222159e58b11177a8f1cb64564e520fad2199c0581d0550a00f49c921be74039dec59062233b4716f8b624a0e4cb48bdf8df9272f93c diff --git a/net-misc/sstp-client/files/sstp-client-1.0.17-fix-bashism-configure.ac.patch b/net-misc/sstp-client/files/sstp-client-1.0.17-fix-bashism-configure.ac.patch new file mode 100644 index 000000000000..a3a41fb206a9 --- /dev/null +++ b/net-misc/sstp-client/files/sstp-client-1.0.17-fix-bashism-configure.ac.patch @@ -0,0 +1,23 @@ +https://gitlab.com/eivnaes/sstp-client/-/merge_requests/2 + +From 3cae209750549b17c547c3025859c0468cd5fcf6 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 10 May 2022 18:04:20 +0000 +Subject: [PATCH] configure.ac: fix bashism + +configure scripts are expected to work with POSIX compliant shells providing +/bin/sh so use = instead of == to work with both Bash and other shells. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -129,7 +129,7 @@ PKG_CHECK_EXISTS([pppd], + AM_CONDITIONAL(WITH_PPP_PLUGIN, test "${enable_ppp_plugin}" = "yes") + AC_ARG_WITH([pppd-auth-notify-support], + AS_HELP_STRING([--with-pppd-auth-notify-support], [is the auth-notifier supported in this pppd version])) +-AS_IF([test "x$with_pppd_auth_notify_support" == "xyes" ], ++AS_IF([test "x$with_pppd_auth_notify_support" = "xyes" ], + [AC_DEFINE(USE_PPPD_AUTH_HOOK,1,[Define if pppd has support for client side authentication complete notification]) + PPPD_AUTH_NOTIFIER="yes"], + [PPPD_AUTH_NOTIFIER="no"]) +GitLab diff --git a/net-misc/sstp-client/files/sstp-client-1.0.18-includes.patch b/net-misc/sstp-client/files/sstp-client-1.0.18-includes.patch new file mode 100644 index 000000000000..3a768f50e889 --- /dev/null +++ b/net-misc/sstp-client/files/sstp-client-1.0.18-includes.patch @@ -0,0 +1,42 @@ +https://gitlab.com/eivnaes/sstp-client/-/merge_requests/4 + +From 1d822cca1c4e5b4db91bcbabe29bf43c05449af7 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Mon, 23 Jan 2023 02:26:28 +0000 +Subject: [PATCH 1/2] libsstp-log: add missing <time.h> include + +Needed for time_t. Fixes build w/ GCC 12 on musl. + +Bug: https://bugs.gentoo.org/854858 +--- a/src/libsstp-log/sstp-log-private.h ++++ b/src/libsstp-log/sstp-log-private.h +@@ -24,6 +24,7 @@ + #ifndef __SSTP_LOG_PRIVATE_H__ + #define __SSTP_LOG_PRIVATE_H__ + ++#include <time.h> + + /*! Keep attributes aligned to a 32-bit boundary */ + #define LOG_ALIGN32(n) \ + +From 835c6226aaccb4c39a8c50dec5d3afd87315fddd Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Mon, 23 Jan 2023 02:28:18 +0000 +Subject: [PATCH 2/2] pppd-plugin: workaround broken pppd.h header for memcpy + +ppp's pppd.h defines a BCOPY macro which expands to memcpy but doesn't +include <string.h> which provides it. Include it in pppd-plugin instead +to workaround it, as it'll be a while before we can assume the system ppp +is fixed. + +Bug: https://bugs.gentoo.org/870865 +--- a/src/pppd-plugin/sstp-mppe.c ++++ b/src/pppd-plugin/sstp-mppe.c +@@ -24,6 +24,7 @@ + + #include <config.h> + ++#include <string.h> + #include <pppd/pppd.h> + #include <sstp-mppe.h> + diff --git a/net-misc/sstp-client/files/sstp-client-1.0.18-sstp-mppe.patch b/net-misc/sstp-client/files/sstp-client-1.0.18-sstp-mppe.patch new file mode 100644 index 000000000000..a9842f6f23dd --- /dev/null +++ b/net-misc/sstp-client/files/sstp-client-1.0.18-sstp-mppe.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/904874 +https://gitlab.com/sstp-project/sstp-client/-/merge_requests/11 + +From e902ce947eaccdbd0399c42371934e16d3737f35 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 23 Apr 2023 12:14:21 -0400 +Subject: [PATCH] Replace sstp-mppe.h with sstp-pppd-compat.h + +Fixes: 3f7835df9ac5e84729903ca536cf65e4a7b04c6c +Signed-off-by: Mike Gilbert <floppym@gentoo.org> +--- + src/pppd-plugin/sstp-mppe.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pppd-plugin/sstp-mppe.c b/src/pppd-plugin/sstp-mppe.c +index 7c7c7c2..207e283 100644 +--- a/src/pppd-plugin/sstp-mppe.c ++++ b/src/pppd-plugin/sstp-mppe.c +@@ -27,7 +27,7 @@ + #include <string.h> + #include <stdarg.h> + #include <pppd/pppd.h> +-#include <sstp-mppe.h> ++#include <sstp-pppd-compat.h> + + #ifndef HAVE_MPPE_KEYS_FUNCTIONS + +-- +GitLab + diff --git a/net-misc/sstp-client/metadata.xml b/net-misc/sstp-client/metadata.xml index 8c9ceb44c429..cc62457fcaa6 100644 --- a/net-misc/sstp-client/metadata.xml +++ b/net-misc/sstp-client/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> + <remote-id type="gitlab">sstp-project/sstp-client</remote-id> <remote-id type="sourceforge">sstp-client</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild b/net-misc/sstp-client/sstp-client-1.0.17.ebuild index 9fb40250d367..4a71dd40ab74 100644 --- a/net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild +++ b/net-misc/sstp-client/sstp-client-1.0.17.ebuild @@ -1,49 +1,50 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools linux-info -DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)" -HOMEPAGE="http://sstp-client.sourceforge.net/" -SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz" +DESCRIPTION="Client implementation of Secure Socket Tunneling Protocol (SSTP)" +HOMEPAGE="https://sstp-client.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/sstp-client/${P}.tar.gz" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="static" -DEPEND=" - dev-libs/libevent:= - dev-libs/openssl:0= - net-dialup/ppp:= -" -RDEPEND=" - ${DEPEND} +DEPEND="dev-libs/libevent:= + dev-libs/openssl:= + net-dialup/ppp:=" +RDEPEND="${DEPEND} acct-group/sstpc - acct-user/sstpc -" + acct-user/sstpc" BDEPEND="virtual/pkgconfig" CONFIG_CHECK="~NETFILTER_NETLINK" PATCHES=( - "${FILESDIR}/${P}-remove-network-test.patch" - "${FILESDIR}/${P}-fix-example.patch" + "${FILESDIR}/${PN}-1.0.12-remove-network-test.patch" + "${FILESDIR}/${PN}-1.0.12-fix-example.patch" + + "${FILESDIR}/${PN}-1.0.17-fix-bashism-configure.ac.patch" ) DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING ) src_prepare() { default + eautoreconf } src_configure() { local PPPD_VER="$(best_version net-dialup/ppp)" - PPPD_VER=${PPPD_VER#*/*-} # reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision + # Reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER#*/*-} + # Main version without beta/pre/patch/revision + PPPD_VER=${PPPD_VER%%[_-]*} local myeconfargs=( --enable-ppp-plugin @@ -59,5 +60,6 @@ src_configure() { src_install() { default - find "${D}" -name '*.la' -delete || die + + find "${ED}" -name '*.la' -delete || die } diff --git a/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild b/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild new file mode 100644 index 000000000000..d6088e295a23 --- /dev/null +++ b/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info + +DESCRIPTION="Client implementation of Secure Socket Tunneling Protocol (SSTP)" +HOMEPAGE="https://sstp-client.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/sstp-client/${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-ppp-2.5.0-patches.tar.xz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" +IUSE="static" + +DEPEND="dev-libs/libevent:= + dev-libs/openssl:= + net-dialup/ppp:=[ipv6(+)]" +RDEPEND="${DEPEND} + acct-group/sstpc + acct-user/sstpc" +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~NETFILTER_NETLINK" + +DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING ) + +PATCHES=( + "${FILESDIR}/${PN}-1.0.12-remove-network-test.patch" + "${FILESDIR}/${PN}-1.0.12-fix-example.patch" + + "${FILESDIR}/${PN}-1.0.18-includes.patch" + "${WORKDIR}/${P}-ppp-2.5.0-patches" + "${FILESDIR}/sstp-client-1.0.18-sstp-mppe.patch" +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local PPPD_VER="$(best_version net-dialup/ppp)" + # Reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER#*/*-} + # Main version without beta/pre/patch/revision + PPPD_VER=${PPPD_VER%%[_-]*} + + local myeconfargs=( + --enable-ppp-plugin + --enable-group=sstpc + --enable-user=sstpc + --with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" + --with-runtime-dir="/run/sstpc" + $(use_enable static) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-misc/sstp-client/sstp-client-1.0.18.ebuild b/net-misc/sstp-client/sstp-client-1.0.18.ebuild new file mode 100644 index 000000000000..77e7c733052f --- /dev/null +++ b/net-misc/sstp-client/sstp-client-1.0.18.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info + +DESCRIPTION="Client implementation of Secure Socket Tunneling Protocol (SSTP)" +HOMEPAGE="https://sstp-client.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/sstp-client/${P}.tar.gz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="static" + +DEPEND="dev-libs/libevent:= + dev-libs/openssl:= + net-dialup/ppp:=" +RDEPEND="${DEPEND} + acct-group/sstpc + acct-user/sstpc" +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~NETFILTER_NETLINK" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.12-remove-network-test.patch" + "${FILESDIR}/${PN}-1.0.12-fix-example.patch" + + "${FILESDIR}/${PN}-1.0.18-includes.patch" +) + +DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING ) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local PPPD_VER="$(best_version net-dialup/ppp)" + # Reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER#*/*-} + # Main version without beta/pre/patch/revision + PPPD_VER=${PPPD_VER%%[_-]*} + + local myeconfargs=( + --enable-ppp-plugin + --enable-group=sstpc + --enable-user=sstpc + --with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" + --with-runtime-dir="/run/sstpc" + $(use_enable static) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest index 0335efdca28a..2050187b073c 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1,3 +1,3 @@ -DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c -DIST streamlink-2.0.0.tar.gz 497816 BLAKE2B e0d8ebf2ae72bb2dc9c9a22810577a34ae6fe3a81bb75b03f5186c69170b9ed94311c1e018bd2a2a0e9a5fc1d8f8470de431f602bd3c8bb2d215c9c8d87dc867 SHA512 ce8b34670ea991ddd9b86eb4f05233468ad9df7ea743ed047cd2e3de8d0844dcded082df1215273e8a22ac5386dd17f64c80662b80fb8dbfae421b7f18c146d6 -DIST streamlink.1-2.0.0.man.xz 12956 BLAKE2B e4e24f1f04a4edabcc9973005a1097a6ed0cf450bf65624fee9dee13c39312e96d48a91c5558b5b4f2e1122510ea64d497588c42c1c6f2a83f1bb6fd92843419 SHA512 3d857b953a10a4c4ca9906cd03d170a7b76ecf724c3627571b90fa584c729cce54f492438c7e9aae32fc65b5c0561e0d325b0b1f9bcc69a98bc000b81e5492c9 +DIST streamlink-6.7.2.tar.gz 741037 BLAKE2B b6ecea883a8b09e524a28ebdee083bb5f1e563605ef16fb3adebba03194ad3f1d8f9dc902cfe80372dc53c5778f1ddc9695680b5cd4a87277b646fc15fffd7e2 SHA512 251e0b03c39dae980367e8a5b6ffcb1c279b0874eeaeff31d9d4486917b759ef27ba2bd5bba0bc74691237e429981f3748002e0ef49befe8c7be69160856ecfe +DIST streamlink-6.7.3.tar.gz 742832 BLAKE2B 5f03a036c3f2170d25e43618f36d7b937e8063f15a965f45d8cc6033b49899b15c19af23aa2a845f8aec74341932721b792dad6bff70400f0dea24a19f1415ed SHA512 0955faab177bcdd0f66500f837124bf0f426829cb5c847fa18bb85aa3fcd7c27a750bab13f3e247b5187e9561713330b582b10729d82984d98081856e976ae65 +DIST streamlink-6.7.4.tar.gz 744387 BLAKE2B bd8fb9af560fbe164a63fd1b698100765c716b44b6f3364e6ad072f69d0fdee9d22dd0fda6c297f249915c9a60f10e2089228a8c19244a7ef18b5809632bf96a SHA512 266c66626624814d708a228d4e2e62c443c3973fb139632a88086619c755fa80d97fad077a2a7383f9beb3e2f4464274beb0bb446b85f6f63d6704a88a9c2e29 diff --git a/net-misc/streamlink/files/streamlink-6.7.2-validator.patch b/net-misc/streamlink/files/streamlink-6.7.2-validator.patch new file mode 100644 index 000000000000..8dc69d62616a --- /dev/null +++ b/net-misc/streamlink/files/streamlink-6.7.2-validator.patch @@ -0,0 +1,61 @@ +https://github.com/streamlink/streamlink/pull/5932 +https://github.com/streamlink/streamlink/commit/0466622dc0bd13db972f6a00d2e2bda31ad50229 + +Quoting the PR: +""" +Since Python 3.11.9 / 3.12.3 / 3.13.0a6, urllib.parse.parse_qsl() now raises a TypeError +if the input is not a str, is truthy and can't be passed to memoryview(), like integers for example, +hence the test failure which previously just checked an invalid input to that validation schema. +""" + +From 51c13ddd45f83384cf7800a881127ad74dec3bb8 Mon Sep 17 00:00:00 2001 +From: bastimeyer <mail@bastimeyer.de> +Date: Tue, 9 Apr 2024 21:36:03 +0200 +Subject: [PATCH] plugin.api.validate: check parse_qsd() input type + +--- + src/streamlink/plugin/api/validate/_validators.py | 6 +++++- + tests/test_api_validate.py | 11 +++++++++-- + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/streamlink/plugin/api/validate/_validators.py b/src/streamlink/plugin/api/validate/_validators.py +index 69135b74919..e99d305733f 100644 +--- a/src/streamlink/plugin/api/validate/_validators.py ++++ b/src/streamlink/plugin/api/validate/_validators.py +@@ -651,4 +651,8 @@ def validator_parse_qsd(*args, **kwargs) -> TransformSchema: + :raise ValidationError: On parsing error + """ + +- return TransformSchema(_parse_qsd, *args, **kwargs, exception=ValidationError, schema=None) ++ def parser(*_args, **_kwargs): ++ validate(AnySchema(str, bytes), _args[0]) ++ return _parse_qsd(*_args, **_kwargs, exception=ValidationError, schema=None) ++ ++ return TransformSchema(parser, *args, **kwargs) +diff --git a/tests/test_api_validate.py b/tests/test_api_validate.py +index ceff9bc1dde..c328116d27b 100644 +--- a/tests/test_api_validate.py ++++ b/tests/test_api_validate.py +@@ -1343,13 +1343,20 @@ def test_success(self): + validate.parse_qsd(), + "foo=bar&foo=baz&qux=quux", + ) == {"foo": "baz", "qux": "quux"} ++ assert validate.validate( ++ validate.parse_qsd(), ++ b"foo=bar&foo=baz&qux=quux", ++ ) == {b"foo": b"baz", b"qux": b"quux"} + + def test_failure(self): + with pytest.raises(ValidationError) as cm: + validate.validate(validate.parse_qsd(), 123) + assert_validationerror(cm.value, """ +- ValidationError: +- Unable to parse query string: 'int' object has no attribute 'decode' (123) ++ ValidationError(AnySchema): ++ ValidationError(type): ++ Type of 123 should be str, but is int ++ ValidationError(type): ++ Type of 123 should be bytes, but is int + """) + + diff --git a/net-misc/streamlink/metadata.xml b/net-misc/streamlink/metadata.xml index 2e20e21fed6b..11ea36c5ea13 100644 --- a/net-misc/streamlink/metadata.xml +++ b/net-misc/streamlink/metadata.xml @@ -2,10 +2,12 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>leio@gentoo.org</email> - <name>Mart Raudsepp</name> + <email>sam@gentoo.org</email> + <name>Sam James</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">streamlink/streamlink</remote-id> + <remote-id type="pypi">streamlink</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/streamlink/streamlink-1.3.1-r1.ebuild b/net-misc/streamlink/streamlink-1.3.1-r1.ebuild deleted file mode 100644 index 339f8b00c2ff..000000000000 --- a/net-misc/streamlink/streamlink-1.3.1-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" - GIT_ECLASS="git-r3" -fi - -PYTHON_COMPAT=( python3_8 ) -PYTHON_REQ_USE='xml(+),threads(+)' -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 ${GIT_ECLASS} - -DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" -HOMEPAGE="https://streamlink.github.io/" - -if [[ ${PV} != 9999* ]]; then - SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD-2 Apache-2.0" -SLOT="0" -IUSE="doc test" -RESTRICT="!test? ( test )" - -# >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too -DEPEND=" - $(python_gen_cond_dep ' - >dev-python/requests-2.21.0[${PYTHON_USEDEP}] - >=dev-python/urllib3-1.23[${PYTHON_USEDEP}] - dev-python/isodate[${PYTHON_USEDEP}] - dev-python/websocket-client[${PYTHON_USEDEP}] - dev-python/pycountry[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] - ') -" -RDEPEND="${DEPEND} - media-video/rtmpdump - media-video/ffmpeg -" -BDEPEND=" - $(python_gen_cond_dep ' - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/recommonmark[${PYTHON_USEDEP}] - ) - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/requests-mock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/freezegun[${PYTHON_USEDEP}] - ) - ')" - -python_configure_all() { - # Avoid iso-639, iso3166 dependencies since we use pycountry. - export STREAMLINK_USE_PYCOUNTRY=1 -} - -python_compile_all() { - use doc && emake -C docs html man -} - -python_test() { - esetup.py test -} - -python_install_all() { - if use doc; then - local HTML_DOCS=( docs/_build/html/. ) - doman docs/_build/man/* - fi - distutils-r1_python_install_all -} diff --git a/net-misc/streamlink/streamlink-2.0.0.ebuild b/net-misc/streamlink/streamlink-2.0.0.ebuild deleted file mode 100644 index 92c0803d4cf5..000000000000 --- a/net-misc/streamlink/streamlink-2.0.0.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" - GIT_ECLASS="git-r3" -fi - -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE='xml(+),threads(+)' -DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 ${GIT_ECLASS} - -DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" -HOMEPAGE="https://streamlink.github.io/" - -if [[ ${PV} != 9999* ]]; then - SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" - SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/streamlink.1-${PV}.man.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD-2 Apache-2.0" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - $(python_gen_cond_dep ' - >dev-python/requests-2.21.0[${PYTHON_USEDEP}] - dev-python/isodate[${PYTHON_USEDEP}] - dev-python/websocket-client[${PYTHON_USEDEP}] - dev-python/pycountry[${PYTHON_USEDEP}] - >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] - ') -" -RDEPEND="${DEPEND} - media-video/rtmpdump - media-video/ffmpeg -" -BDEPEND=" - $(python_gen_cond_dep ' - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/requests-mock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] - ) - ')" - -src_prepare() { - distutils-r1_src_prepare - if [[ ${PV} != 9999* ]]; then - mv "${WORKDIR}"/streamlink.1-${PV}.man "${WORKDIR}"/streamlink.1 || die - fi -} - -python_configure_all() { - # Avoid iso-639, iso3166 dependencies since we use pycountry. - export STREAMLINK_USE_PYCOUNTRY=1 -} - -python_test() { - esetup.py test -} - -python_install_all() { - distutils-r1_python_install_all - if [[ ${PV} != 9999* ]]; then - doman "${WORKDIR}"/streamlink.1 - fi -} diff --git a/net-misc/streamlink/streamlink-6.7.2-r1.ebuild b/net-misc/streamlink/streamlink-6.7.2-r1.ebuild new file mode 100644 index 000000000000..73d54972af03 --- /dev/null +++ b/net-misc/streamlink/streamlink-6.7.2-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" + inherit git-r3 +fi + +DISTUTILS_SINGLE_IMPL=1 +# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools +# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7 +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE='xml(+),threads(+)' +inherit distutils-r1 + +DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" +HOMEPAGE="https://streamlink.github.io/" + +if [[ ${PV} != 9999* ]]; then + SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" +fi + +LICENSE="BSD-2 Apache-2.0" +SLOT="0" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="amd64 ~arm ~arm64 ~x86" +fi + +# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep +# See https://github.com/streamlink/streamlink/pull/5895 re exceptiongroup dep +RDEPEND=" + media-video/ffmpeg + $(python_gen_cond_dep ' + dev-python/certifi[${PYTHON_USEDEP}] + || ( + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] + ) + dev-python/exceptiongroup[${PYTHON_USEDEP}] + >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] + dev-python/isodate[${PYTHON_USEDEP}] + >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] + >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] + dev-python/pycountry[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] + >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] + >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/setuptools-64[${PYTHON_USEDEP}] + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + test? ( + >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-trio[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] + ) + ') +" + +if [[ ${PV} == 9999* ]]; then + RDEPEND+=" + $(python_gen_cond_dep ' + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + ') + " +fi + +PATCHES=( + "${FILESDIR}"/${P}-validator.patch +) + +distutils_enable_tests pytest + +python_test() { + # Skip tests requiring <dev-python/pytest-8.0.0 which is currently masked + # https://github.com/streamlink/streamlink/pull/5901 + EPYTEST_DESELECT+=( + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error + tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach + tests/webbrowser/cdp/test_client.py::TestNavigate::test_error + tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]' + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]' + tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command + tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result + ) + + epytest +} diff --git a/net-misc/streamlink/streamlink-6.7.3.ebuild b/net-misc/streamlink/streamlink-6.7.3.ebuild new file mode 100644 index 000000000000..b224e1c5387a --- /dev/null +++ b/net-misc/streamlink/streamlink-6.7.3.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" + inherit git-r3 +fi + +DISTUTILS_SINGLE_IMPL=1 +# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools +# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7 +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE='xml(+),threads(+)' +inherit distutils-r1 + +DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" +HOMEPAGE="https://streamlink.github.io/" + +if [[ ${PV} != 9999* ]]; then + SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" +fi + +LICENSE="BSD-2 Apache-2.0" +SLOT="0" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep +# See https://github.com/streamlink/streamlink/pull/5895 re exceptiongroup dep +RDEPEND=" + media-video/ffmpeg + $(python_gen_cond_dep ' + dev-python/certifi[${PYTHON_USEDEP}] + || ( + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] + ) + dev-python/exceptiongroup[${PYTHON_USEDEP}] + >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] + dev-python/isodate[${PYTHON_USEDEP}] + >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] + >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] + dev-python/pycountry[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] + >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] + >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/setuptools-64[${PYTHON_USEDEP}] + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + test? ( + >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-trio[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] + ) + ') +" + +if [[ ${PV} == 9999* ]]; then + RDEPEND+=" + $(python_gen_cond_dep ' + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + ') + " +fi + +distutils_enable_tests pytest + +python_test() { + # Skip tests requiring <dev-python/pytest-8.0.0 + # https://github.com/streamlink/streamlink/pull/5901 + EPYTEST_DESELECT+=( + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error + tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach + tests/webbrowser/cdp/test_client.py::TestNavigate::test_error + tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]' + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]' + tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command + tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result + ) + + epytest +} diff --git a/net-misc/streamlink/streamlink-6.7.4.ebuild b/net-misc/streamlink/streamlink-6.7.4.ebuild new file mode 100644 index 000000000000..6d9015879476 --- /dev/null +++ b/net-misc/streamlink/streamlink-6.7.4.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" + inherit git-r3 +fi + +DISTUTILS_SINGLE_IMPL=1 +# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools +# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7 +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE='xml(+),threads(+)' +inherit distutils-r1 + +DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" +HOMEPAGE="https://streamlink.github.io/" + +if [[ ${PV} != 9999* ]]; then + SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" +fi + +LICENSE="BSD-2 Apache-2.0" +SLOT="0" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep +RDEPEND=" + media-video/ffmpeg + $(python_gen_cond_dep ' + dev-python/exceptiongroup[${PYTHON_USEDEP}] + ' 3.10) + $(python_gen_cond_dep ' + dev-python/certifi[${PYTHON_USEDEP}] + || ( + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] + ) + >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] + dev-python/isodate[${PYTHON_USEDEP}] + >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] + >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] + dev-python/pycountry[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] + >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] + >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/setuptools-64[${PYTHON_USEDEP}] + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + test? ( + >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-trio[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] + ) + ') +" + +if [[ ${PV} == 9999* ]]; then + RDEPEND+=" + $(python_gen_cond_dep ' + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + ') + " +fi + +distutils_enable_tests pytest + +python_test() { + # Skip tests requiring <dev-python/pytest-8.0.0 + # https://github.com/streamlink/streamlink/pull/5901 + EPYTEST_DESELECT+=( + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error + tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach + tests/webbrowser/cdp/test_client.py::TestNavigate::test_error + tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]' + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]' + tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command + tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result + ) + + epytest +} diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild index 92c0803d4cf5..6d9015879476 100644 --- a/net-misc/streamlink/streamlink-9999.ebuild +++ b/net-misc/streamlink/streamlink-9999.ebuild @@ -1,74 +1,99 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" - GIT_ECLASS="git-r3" + inherit git-r3 fi -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE='xml(+),threads(+)' DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 ${GIT_ECLASS} +# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools +# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7 +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE='xml(+),threads(+)' +inherit distutils-r1 DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" HOMEPAGE="https://streamlink.github.io/" if [[ ${PV} != 9999* ]]; then SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" - SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/streamlink.1-${PV}.man.xz" - KEYWORDS="~amd64 ~x86" fi LICENSE="BSD-2 Apache-2.0" SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi -DEPEND=" +# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep +RDEPEND=" + media-video/ffmpeg $(python_gen_cond_dep ' - >dev-python/requests-2.21.0[${PYTHON_USEDEP}] + dev-python/exceptiongroup[${PYTHON_USEDEP}] + ' 3.10) + $(python_gen_cond_dep ' + dev-python/certifi[${PYTHON_USEDEP}] + || ( + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] + ) + >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] dev-python/isodate[${PYTHON_USEDEP}] - dev-python/websocket-client[${PYTHON_USEDEP}] + >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] + >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] dev-python/pycountry[${PYTHON_USEDEP}] >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] + >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] + >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] ') " -RDEPEND="${DEPEND} - media-video/rtmpdump - media-video/ffmpeg -" BDEPEND=" $(python_gen_cond_dep ' + >=dev-python/setuptools-64[${PYTHON_USEDEP}] + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/requests-mock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-trio[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] ) - ')" + ') +" -src_prepare() { - distutils-r1_src_prepare - if [[ ${PV} != 9999* ]]; then - mv "${WORKDIR}"/streamlink.1-${PV}.man "${WORKDIR}"/streamlink.1 || die - fi -} +if [[ ${PV} == 9999* ]]; then + RDEPEND+=" + $(python_gen_cond_dep ' + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + ') + " +fi -python_configure_all() { - # Avoid iso-639, iso3166 dependencies since we use pycountry. - export STREAMLINK_USE_PYCOUNTRY=1 -} +distutils_enable_tests pytest python_test() { - esetup.py test -} + # Skip tests requiring <dev-python/pytest-8.0.0 + # https://github.com/streamlink/streamlink/pull/5901 + EPYTEST_DESELECT+=( + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception + tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error + tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach + tests/webbrowser/cdp/test_client.py::TestNavigate::test_error + tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json + tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]' + 'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]' + tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command + tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error + tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result + ) -python_install_all() { - distutils-r1_python_install_all - if [[ ${PV} != 9999* ]]; then - doman "${WORKDIR}"/streamlink.1 - fi + epytest } diff --git a/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild b/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild index c07f5be960e3..dbeeb36c2c99 100644 --- a/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild +++ b/net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,7 +23,7 @@ RDEPEND=" x11-misc/xdg-utils " DEPEND="${RDEPEND} - dev-util/gtk-doc-am + dev-build/gtk-doc-am virtual/pkgconfig " diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index a490446550ff..de88c8164e0d 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -1,3 +1,4 @@ -DIST stunnel-5.58.tar.gz 988551 BLAKE2B 45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d SHA512 6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece -DIST stunnel-5.59.tar.gz 995508 BLAKE2B 12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ddddab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17 SHA512 c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7 -DIST stunnel-5.60.tar.gz 984278 BLAKE2B b20bf85f49751b6ac7ddb56c53daa3bb45848eb5dfcb0fd139883abc8a0a81a80dac6a1b5fec4b7b0d3c1a347620a07ae34734565d212d4fc23c4c58feaf3228 SHA512 4ad0423a7e52c0db8746caf4b64ff69abe1f5c880417779d9933597d7ca86f240b64b578dc3e625fba04bbbddad7aa056dd62d2ecdf6d6a842ffa228bace705e +DIST stunnel-5.64.tar.gz 869088 BLAKE2B c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23 SHA512 85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa +DIST stunnel-5.65.tar.gz 872293 BLAKE2B 45cc4dd0ec91cb9a99c10d26910b05325af29ec2609c0b86d5aceb07fbd495ff6fe39b0fe2c5895358596ee34ed822870c6eb1a538e30557f4485d042f5ae781 SHA512 96ca0535a07d5ea050a5d985c0ab6299bb92e551715120f536869a7b408b795fdc251782aaa7a4a282749d3146726d71c8b3c25430969aa55745a863abe5728a +DIST stunnel-5.68.tar.gz 884989 BLAKE2B e2551b2052db0719203b24dcf16a2ef74c078dccd1200d25502defcef1301456e755a71a1a2b6ab7b43fc9ddc04cd031fca83ffb760528133a0e22ae22e64d40 SHA512 cdc3b8ab4cd35ba722b5248c005ae58a39d79a80600447417b1d0d01fd3aa9e8b22f8568c3177423be99d7395bb15a8754e975fb953556cd80a9cc11e185e9fb +DIST stunnel-5.71.tar.gz 895646 BLAKE2B d323363c7bfdd6c0b7931b84a6069cf9a8337e967c31e14d15976d7932f0c0d6f40f7a1cbf5abbdff0e9edc52176cdcead4f848653088193b2debf4e77443b42 SHA512 c7004f48b93b3415305eec1193d51b7bf51a3bdd2cdc9f6ae588f563b32408b1ecde83b9f3f5b658f945ab5bcc5124390c38235394aad4471bf5b666081af2a2 diff --git a/net-misc/stunnel/files/stunnel-5.71-dont-clobber-fortify-source.patch b/net-misc/stunnel/files/stunnel-5.71-dont-clobber-fortify-source.patch new file mode 100644 index 000000000000..723b9c5e43f2 --- /dev/null +++ b/net-misc/stunnel/files/stunnel-5.71-dont-clobber-fortify-source.patch @@ -0,0 +1,15 @@ +Don't clobber toolchain defaults. + +https://bugs.gentoo.org/892992 +--- a/configure.ac ++++ b/configure.ac +@@ -109,7 +109,8 @@ if test "${GCC}" = yes; then + AX_APPEND_LINK_FLAGS([-Wl,-z,now]) + AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack]) + fi +-AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2]) ++ ++AX_ADD_FORTIFY_SOURCE + + AC_MSG_NOTICE([**************************************** libtool]) + LT_INIT([disable-static]) diff --git a/net-misc/stunnel/files/stunnel-5.71-respect-EPYTHON-for-tests.patch b/net-misc/stunnel/files/stunnel-5.71-respect-EPYTHON-for-tests.patch new file mode 100644 index 000000000000..3c421da91484 --- /dev/null +++ b/net-misc/stunnel/files/stunnel-5.71-respect-EPYTHON-for-tests.patch @@ -0,0 +1,12 @@ +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -7,8 +7,7 @@ EXTRA_DIST = maketest.py plugin_collection.py reader.py error.py plugins + + # try to find a supported python version (>= 3.7) that works + check-local: +- for v in $$(seq 20 -1 7); do command -v python3.$$v && break; done || ( echo "Python 3.7 or later not found" && false ) +- for v in $$(seq 20 -1 7); do command -v python3.$$v && python3.$$v $(srcdir)/maketest.py --debug=10 --libs=$(SSLDIR)/lib64:$(SSLDIR)/lib && break; done ++ ${EPYTHON} $(srcdir)/maketest.py --debug=10 --libs=$(SSLDIR)/lib64:$(SSLDIR)/lib + + dist-hook: + rm -rf $(distdir)/__pycache__ $(distdir)/plugins/__pycache__ diff --git a/net-misc/stunnel/metadata.xml b/net-misc/stunnel/metadata.xml index 208244b65902..4d7c40fdc68c 100644 --- a/net-misc/stunnel/metadata.xml +++ b/net-misc/stunnel/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="stunnel3">Install the stunnel3 wrapper.</flag> </use> diff --git a/net-misc/stunnel/stunnel-5.59.ebuild b/net-misc/stunnel/stunnel-5.64-r2.ebuild index 232fd40bd0b9..da5dd47943e9 100644 --- a/net-misc/stunnel/stunnel-5.59.ebuild +++ b/net-misc/stunnel/stunnel-5.64-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit ssl-cert systemd tmpfiles @@ -67,10 +67,6 @@ src_install() { "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3 - # The binary was moved to /usr/bin with 4.21, - # symlink for backwards compatibility - dosym ../bin/stunnel /usr/sbin/stunnel - dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md docinto html dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ @@ -84,6 +80,8 @@ src_install() { systemd_dounit "${S}/tools/stunnel.service" newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf + + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { diff --git a/net-misc/stunnel/stunnel-5.58.ebuild b/net-misc/stunnel/stunnel-5.65-r2.ebuild index 256081a6b48b..70102e5fd41d 100644 --- a/net-misc/stunnel/stunnel-5.58.ebuild +++ b/net-misc/stunnel/stunnel-5.65-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit ssl-cert systemd tmpfiles DESCRIPTION="TLS/SSL - Port Wrapper" HOMEPAGE="https://www.stunnel.org/index.html" SRC_URI=" + https://www.stunnel.org/downloads/${P}.tar.gz ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz @@ -20,7 +21,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="ipv6 selinux stunnel3 tcpd" +IUSE="selinux stunnel3 tcpd" DEPEND=" dev-libs/openssl:0= @@ -50,7 +51,6 @@ src_prepare() { src_configure() { local myeconfargs=( --libdir="${EPREFIX}/usr/$(get_libdir)" - $(use_enable ipv6) $(use_enable tcpd libwrap) --with-ssl="${EPREFIX}"/usr --disable-fips @@ -66,10 +66,6 @@ src_install() { "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3 - # The binary was moved to /usr/bin with 4.21, - # symlink for backwards compatibility - dosym ../bin/stunnel /usr/sbin/stunnel - dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md docinto html dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ @@ -83,6 +79,8 @@ src_install() { systemd_dounit "${S}/tools/stunnel.service" newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf + + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { diff --git a/net-misc/stunnel/stunnel-5.60.ebuild b/net-misc/stunnel/stunnel-5.68.ebuild index 7f0616ce3608..70102e5fd41d 100644 --- a/net-misc/stunnel/stunnel-5.60.ebuild +++ b/net-misc/stunnel/stunnel-5.68.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit ssl-cert systemd tmpfiles @@ -20,8 +20,8 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="ipv6 selinux stunnel3 tcpd" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="selinux stunnel3 tcpd" DEPEND=" dev-libs/openssl:0= @@ -51,7 +51,6 @@ src_prepare() { src_configure() { local myeconfargs=( --libdir="${EPREFIX}/usr/$(get_libdir)" - $(use_enable ipv6) $(use_enable tcpd libwrap) --with-ssl="${EPREFIX}"/usr --disable-fips @@ -67,10 +66,6 @@ src_install() { "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3 - # The binary was moved to /usr/bin with 4.21, - # symlink for backwards compatibility - dosym ../bin/stunnel /usr/sbin/stunnel - dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md docinto html dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ @@ -84,6 +79,8 @@ src_install() { systemd_dounit "${S}/tools/stunnel.service" newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf + + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { diff --git a/net-misc/stunnel/stunnel-5.71-r1.ebuild b/net-misc/stunnel/stunnel-5.71-r1.ebuild new file mode 100644 index 000000000000..cff4677b2a3c --- /dev/null +++ b/net-misc/stunnel/stunnel-5.71-r1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools python-any-r1 ssl-cert systemd tmpfiles + +DESCRIPTION="TLS/SSL - Port Wrapper" +HOMEPAGE="https://www.stunnel.org/index.html" +SRC_URI=" + https://www.stunnel.org/downloads/${P}.tar.gz + ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz + http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="selinux stunnel3 systemd tcpd test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/openssl:= + tcpd? ( sys-apps/tcp-wrappers ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND=" + ${DEPEND} + acct-user/stunnel + acct-group/stunnel + selinux? ( sec-policy/selinux-stunnel ) + stunnel3? ( dev-lang/perl ) +" +# autoconf-archive for F_S patch +BDEPEND=" + dev-build/autoconf-archive + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/cryptography[${PYTHON_USEDEP}]') + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.71-dont-clobber-fortify-source.patch + "${FILESDIR}"/${PN}-5.71-respect-EPYTHON-for-tests.patch +) + +python_check_deps() { + python_has_version "dev-python/cryptography[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + # Hack away generation of certificate + sed -i -e "s/^install-data-local:/do-not-run-this:/" \ + tools/Makefile.am || die "sed failed" + + echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel || die + + # We pass --disable-fips to configure, so avoid spurious test failures + rm tests/plugins/p10_fips.py tests/plugins/p11_fips_cipher.py || die + + # Needed for FORTIFY_SOURCE patch + eautoreconf +} + +src_configure() { + local myeconfargs=( + --libdir="${EPREFIX}/usr/$(get_libdir)" + --with-ssl="${EPREFIX}"/usr + --disable-fips + $(use_enable tcpd libwrap) + $(use_enable systemd) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + rm -rf "${ED}"/usr/share/doc/${PN} || die + rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \ + "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 || die + + if ! use stunnel3 ; then + rm -f "${ED}"/usr/bin/stunnel3 || die + fi + + dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md + docinto html + dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ + tools/importCA.html + + insinto /etc/stunnel + doins "${FILESDIR}"/stunnel.conf + newinitd "${FILESDIR}"/stunnel-r2 stunnel + + doenvd "${T}"/20stunnel + + systemd_dounit "${S}/tools/stunnel.service" + newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]]; then + install_cert /etc/stunnel/stunnel + chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} + chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} + fi + + tmpfiles_process stunnel.conf + + einfo "If you want to run multiple instances of stunnel, create a new config" + einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change " + einfo "\'pid= \' with a unique filename. For openrc make a symlink from the" + einfo "stunnel init script to \'stunnel.name\' and use that to start|stop" + einfo "your custom instance" +} diff --git a/net-misc/stunnel/stunnel-5.71.ebuild b/net-misc/stunnel/stunnel-5.71.ebuild new file mode 100644 index 000000000000..d23e61f1ca70 --- /dev/null +++ b/net-misc/stunnel/stunnel-5.71.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools python-any-r1 ssl-cert systemd tmpfiles + +DESCRIPTION="TLS/SSL - Port Wrapper" +HOMEPAGE="https://www.stunnel.org/index.html" +SRC_URI=" + https://www.stunnel.org/downloads/${P}.tar.gz + ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz + http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="selinux stunnel3 systemd tcpd test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/openssl:= + tcpd? ( sys-apps/tcp-wrappers ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND=" + ${DEPEND} + acct-user/stunnel + acct-group/stunnel + selinux? ( sec-policy/selinux-stunnel ) + stunnel3? ( dev-lang/perl ) +" +# autoconf-archive for F_S patch +BDEPEND=" + dev-build/autoconf-archive + test? ( ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.71-dont-clobber-fortify-source.patch + "${FILESDIR}"/${PN}-5.71-respect-EPYTHON-for-tests.patch +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + # Hack away generation of certificate + sed -i -e "s/^install-data-local:/do-not-run-this:/" \ + tools/Makefile.am || die "sed failed" + + echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel || die + + # We pass --disable-fips to configure, so avoid spurious test failures + rm tests/plugins/p10_fips.py tests/plugins/p11_fips_cipher.py || die + + # Needed for FORTIFY_SOURCE patch + eautoreconf +} + +src_configure() { + local myeconfargs=( + --libdir="${EPREFIX}/usr/$(get_libdir)" + --with-ssl="${EPREFIX}"/usr + --disable-fips + $(use_enable tcpd libwrap) + $(use_enable systemd) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + rm -rf "${ED}"/usr/share/doc/${PN} || die + rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \ + "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 || die + + if ! use stunnel3 ; then + rm -f "${ED}"/usr/bin/stunnel3 || die + fi + + dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md + docinto html + dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ + tools/importCA.html + + insinto /etc/stunnel + doins "${FILESDIR}"/stunnel.conf + newinitd "${FILESDIR}"/stunnel-r2 stunnel + + doenvd "${T}"/20stunnel + + systemd_dounit "${S}/tools/stunnel.service" + newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]]; then + install_cert /etc/stunnel/stunnel + chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} + chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} + fi + + tmpfiles_process stunnel.conf + + einfo "If you want to run multiple instances of stunnel, create a new config" + einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change " + einfo "\'pid= \' with a unique filename. For openrc make a symlink from the" + einfo "stunnel init script to \'stunnel.name\' and use that to start|stop" + einfo "your custom instance" +} diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest index 5f9a9141c1a7..86e4db3ae2ad 100644 --- a/net-misc/suite3270/Manifest +++ b/net-misc/suite3270/Manifest @@ -1 +1,3 @@ DIST suite3270-4.0ga13-src.tgz 3317494 BLAKE2B 898f279143006e1fc1f470bda3917afe85957de745676dc915f9c94292824ba0e10fc2ccf0a47e307c41e48741a3da7c066c45f63c917295e0522122226b79dd SHA512 bdf9c5d129419c87b45907186e5f158d8623009151357e4d8a3d08ffff2f3729449cead84d005227bfb32968ae363d1a29350692cabe9bf8b71f760eda3f496b +DIST suite3270-4.2ga5-src.tgz 4192998 BLAKE2B 2e29a9e9f25688bd5fc84101cab684c0fcdde9eff5e65cf0f247e9942990c812174eec17569716928de299fec0d87e77c785d8415370f7245cc0909c7e2020dd SHA512 4a5847c81262a099c68a914141bc7eba7b7b46f0ed4dabc1e7421b4244ea1ca5877e472262f9a4ab2f1a9ca72bde3901f8281dc0957046d3355ed98377de0492 +DIST suite3270-4.3ga6-src.tgz 13188235 BLAKE2B 2ca334b82cc42818ac9d0733a8d93f3b73e598f9de94e7166972d88079cfcf98877eb08587ac24e096f9b6457c96344abd37c4bb9d7af4f7e50c3ef191f82714 SHA512 5250d382185acb7f89cb2a6ff5050aa05be809e7bd2bbe25cf74bd3177ebba8ea24d990b3f20e308a5cffa8bdbd5d1c82ba956db76a2812b5ae42ea57602d2bd diff --git a/net-misc/suite3270/files/suite3270-4.1-musl-wint-t-fix.patch b/net-misc/suite3270/files/suite3270-4.1-musl-wint-t-fix.patch new file mode 100644 index 000000000000..8a3330d24b4b --- /dev/null +++ b/net-misc/suite3270/files/suite3270-4.1-musl-wint-t-fix.patch @@ -0,0 +1,12 @@ +# Fix unknown type name wint_t when building against musl +# Closes: https://bugs.gentoo.org/713618 +--- a/c3270/screen.c ++++ b/c3270/screen.c +@@ -63,6 +63,7 @@ + #include "utils.h" + #include "xio.h" + #include "xscroll.h" ++#include "wctype.h" + + #include "cscreen.h" + diff --git a/net-misc/suite3270/files/suite3270-4.2_p5-egrep.patch b/net-misc/suite3270/files/suite3270-4.2_p5-egrep.patch new file mode 100644 index 000000000000..629cbca5f9f3 --- /dev/null +++ b/net-misc/suite3270/files/suite3270-4.2_p5-egrep.patch @@ -0,0 +1,21 @@ +--- a/configure.in ++++ b/configure.in +@@ -29,6 +29,8 @@ AC_PREREQ([2.69]) + + AC_CANONICAL_HOST + ++AC_PROG_EGREP ++ + AC_ARG_ENABLE(unix,[ --enable-unix build all Unix emulators]) + AC_ARG_ENABLE(windows,[ --enable-windows build all Windows emulators]) + +--- a/lib/configure.in ++++ b/lib/configure.in +@@ -31,6 +31,7 @@ dnl Checks for programs. + AC_PROG_INSTALL + AC_PROG_CC + AC_PROG_RANLIB ++AC_PROG_EGREP + AC_CHECK_TOOLS(AR, [ar]) + + dnl Figure out what sort of host this is. diff --git a/net-misc/suite3270/files/suite3270-4.2_p5-ncurses-pkg-config.patch b/net-misc/suite3270/files/suite3270-4.2_p5-ncurses-pkg-config.patch new file mode 100644 index 000000000000..7142bb293c00 --- /dev/null +++ b/net-misc/suite3270/files/suite3270-4.2_p5-ncurses-pkg-config.patch @@ -0,0 +1,48 @@ +Needed to ensure we pick up definitions from ncurses' pkg-config file +like -DNCURSES_WIDECHAR (issue is observable on say, musl). +--- a/x3270if/configure.in ++++ b/x3270if/configure.in +@@ -65,6 +65,9 @@ AC_CHECK_HEADERS(getopt.h) + if test "$with_readline" != no; then + AC_CHECK_HEADERS(readline/history.h) + fi ++ ++dnl Try pkg-config first, and if it fails, try the traditional methods. ++PKG_CHECK_MODULES([ncurses], [ncursesw], [AC_DEFINE([HAVE_NCURSESW_NCURSES_H] ,[1]) AC_DEFINE([HAVE_NCURSESW_TERM_H], [1])], [ + dnl Find the best curses header file and hope it's consistent with the library + dnl we found. + AC_CHECK_HEADERS(ncursesw/ncurses.h, , +@@ -75,15 +78,16 @@ AC_CHECK_HEADERS(ncursesw/term.h, , + [AC_CHECK_HEADERS(ncurses/term.h, , + [AC_CHECK_HEADERS(term.h)])]) + ++ AC_SEARCH_LIBS(newterm, ncursesw ncurses curses, , [AC_MSG_ERROR(Can't find libncurses or new-enough libcurses)]) ++ AC_SEARCH_LIBS(setupterm, tinfow tinfo, , [AC_MSG_ERROR(Can't find terminfo library)]) ++ AC_CHECK_FUNCS(tiparm)]) ++ + dnl Check for --without-readline + AC_ARG_WITH(readline, [ --without-readline Don't use the readline library]) + + dnl Checks for library functions. + AC_CHECK_FUNCS(vasprintf) + AC_FUNC_FSEEKO +-AC_SEARCH_LIBS(newterm, ncursesw ncurses curses, , [AC_MSG_ERROR(Can't find libncurses or new-enough libcurses)]) +-AC_SEARCH_LIBS(setupterm, tinfow tinfo, , [AC_MSG_ERROR(Can't find terminfo library)]) +-AC_CHECK_FUNCS(tiparm) + if test "$with_readline" != no; then + AC_CHECK_LIB(readline, rl_initialize) + fi +--- a/x3270if/Makefile.obj.in ++++ b/x3270if/Makefile.obj.in +@@ -51,9 +51,9 @@ INSTALL_DATA = @INSTALL_DATA@ + + CCOPTIONS = @CCOPTIONS@ + XCPPFLAGS = -I$(THIS) -I$(TOP)/include -I$(TOP)/Common/x3270if @CPPFLAGS@ +-CFLAGS = $(CCOPTIONS) $(CDEBUGFLAGS) $(XCPPFLAGS) @CFLAGS@ ++CFLAGS = $(CCOPTIONS) $(CDEBUGFLAGS) $(XCPPFLAGS) @ncurses_CFLAGS@ @CFLAGS@ + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ @ncurses_LIBS@ + + XVERSION = xversion.c + version.o: mkversion.sh $(VOBJS) version.txt diff --git a/net-misc/suite3270/metadata.xml b/net-misc/suite3270/metadata.xml index 1fdcc14f0d11..0b76a6fdaa83 100644 --- a/net-misc/suite3270/metadata.xml +++ b/net-misc/suite3270/metadata.xml @@ -7,7 +7,7 @@ </maintainer> <maintainer type="project"> <email>s390@gentoo.org</email> - <name>Gentoo Linux s390 Development</name> + <name>s390 architecture team</name> </maintainer> <upstream> <remote-id type="sourceforge">x3270</remote-id> diff --git a/net-misc/suite3270/suite3270-4.0_p13.ebuild b/net-misc/suite3270/suite3270-4.0_p13.ebuild index abd0aab0e1a6..de091ec1bdc9 100644 --- a/net-misc/suite3270/suite3270-4.0_p13.ebuild +++ b/net-misc/suite3270/suite3270-4.0_p13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -17,7 +17,7 @@ inherit font DESCRIPTION="Complete 3270 access package" HOMEPAGE="http://x3270.bgp.nu/" -SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz" +SRC_URI="https://downloads.sourceforge.net/x3270/${MY_P}-src.tgz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild b/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild new file mode 100644 index 000000000000..cc4d1e248b1d --- /dev/null +++ b/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_p/ga} +MY_P=${PN}-${MY_PV} +SUB_PV=${PV:0:3} +S="${WORKDIR}"/${PN}-${SUB_PV} + +# Only the x3270 package installs fonts +FONT_PN="x3270" +FONT_S="${S}"/${FONT_PN} + +inherit autotools font + +DESCRIPTION="Complete 3270 (S390) access package" +HOMEPAGE="http://x3270.bgp.nu/" +SRC_URI="https://downloads.sourceforge.net/x3270/${MY_P}-src.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc ~s390 sparc x86" +IUSE="X cjk doc ncurses ssl tcl" + +RDEPEND=" + X? ( + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) + ssl? ( dev-libs/openssl:= ) + ncurses? ( + sys-libs/ncurses:= + sys-libs/readline:= + ) + tcl? ( dev-lang/tcl:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + X? ( + app-text/rman + x11-apps/bdftopcf + >=x11-apps/mkfontscale-1.2.0 + x11-misc/xbitmaps + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.1-musl-wint-t-fix.patch + "${FILESDIR}"/${PN}-4.2_p5-ncurses-pkg-config.patch + "${FILESDIR}"/${PN}-4.2_p5-egrep.patch +) + +src_prepare() { + default + + # Some subdirs (like c3270/x3270/s3270) install the same set of data files + # (they have the same contents). Wrap that in a retry to avoid errors. + cat <<-EOF > _install + #!/bin/sh + for n in 1 2 3 4 5; do + install "\$@" && exit + echo "retrying ..." + done + exit 1 + EOF + chmod a+rx _install || die + # Can't use the ${INSTALL} var as top level configure also uses it. + # https://sourceforge.net/p/x3270/bugs/15/ + export ac_cv_path_install="${S}"/_install + + AT_NOEAUTOHEADER=yes eautoreconf +} + +src_configure() { + econf \ + --cache-file="${S}"/config.cache \ + --enable-s3270 \ + --enable-pr3287 \ + $(use_enable ncurses c3270) \ + $(use_enable tcl tcl3270) \ + $(use_enable X x3270) \ + $(use_with X x) \ + $(use_with X fontdir "${FONTDIR}") +} + +src_install() { + use X && dodir "${FONTDIR}" + + emake DESTDIR="${D}" install{,.man} + + use X && font_src_install +} + +pkg_postinst() { + use X && font_pkg_postinst +} + +pkg_postrm() { + use X && font_pkg_postrm +} diff --git a/net-misc/suite3270/suite3270-4.2_p5-r2.ebuild b/net-misc/suite3270/suite3270-4.2_p5-r2.ebuild new file mode 100644 index 000000000000..b04eebf8fc56 --- /dev/null +++ b/net-misc/suite3270/suite3270-4.2_p5-r2.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_p/ga} +MY_P=${PN}-${MY_PV} +SUB_PV=${PV:0:3} +S="${WORKDIR}"/${PN}-${SUB_PV} + +# Only the x3270 package installs fonts +FONT_PN="x3270" +FONT_S="${S}"/${FONT_PN} + +inherit autotools font + +DESCRIPTION="Complete 3270 (S390) access package" +HOMEPAGE="http://x3270.bgp.nu/" +SRC_URI="https://downloads.sourceforge.net/x3270/${MY_P}-src.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc ~s390 sparc x86" +IUSE="X cjk doc ncurses ssl tcl" + +RDEPEND=" + X? ( + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) + ssl? ( dev-libs/openssl:= ) + ncurses? ( + sys-libs/ncurses:= + sys-libs/readline:= + ) + tcl? ( dev-lang/tcl:= ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + X? ( + x11-apps/bdftopcf + >=x11-apps/mkfontscale-1.2.0 + x11-misc/xbitmaps + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.1-musl-wint-t-fix.patch + "${FILESDIR}"/${PN}-4.2_p5-ncurses-pkg-config.patch + "${FILESDIR}"/${PN}-4.2_p5-egrep.patch +) + +src_prepare() { + default + + # Some subdirs (like c3270/x3270/s3270) install the same set of data files + # (they have the same contents). Wrap that in a retry to avoid errors. + cat <<-EOF > _install + #!/bin/sh + for n in 1 2 3 4 5; do + install "\$@" && exit + echo "retrying ..." + done + exit 1 + EOF + chmod a+rx _install || die + # Can't use the ${INSTALL} var as top level configure also uses it. + # https://sourceforge.net/p/x3270/bugs/15/ + export ac_cv_path_install="${S}"/_install + + AT_NOEAUTOHEADER=yes eautoreconf +} + +src_configure() { + econf \ + --cache-file="${S}"/config.cache \ + --enable-s3270 \ + --enable-pr3287 \ + $(use_enable ncurses c3270) \ + $(use_enable tcl tcl3270) \ + $(use_enable X x3270) \ + $(use_with X x) \ + $(use_with X fontdir "${FONTDIR}") +} + +src_install() { + use X && dodir "${FONTDIR}" + + emake DESTDIR="${D}" install{,.man} + + use X && font_src_install +} + +pkg_postinst() { + use X && font_pkg_postinst +} + +pkg_postrm() { + use X && font_pkg_postrm +} diff --git a/net-misc/suite3270/suite3270-4.3_p6.ebuild b/net-misc/suite3270/suite3270-4.3_p6.ebuild new file mode 100644 index 000000000000..6566aedd07d5 --- /dev/null +++ b/net-misc/suite3270/suite3270-4.3_p6.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_p/ga} +MY_P=${PN}-${MY_PV} +SUB_PV=${PV:0:3} +S="${WORKDIR}"/${PN}-${SUB_PV} + +# Only the x3270 package installs fonts +FONT_PN="x3270" +FONT_S="${S}"/${FONT_PN} + +inherit autotools font + +DESCRIPTION="Complete 3270 (S390) access package" +HOMEPAGE="http://x3270.bgp.nu/" +SRC_URI="https://downloads.sourceforge.net/x3270/${MY_P}-src.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86" +IUSE="cjk doc gui ncurses ssl tcl" + +RDEPEND=" + gui? ( + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) + ssl? ( dev-libs/openssl:= ) + ncurses? ( + sys-libs/ncurses:= + sys-libs/readline:= + ) + tcl? ( dev-lang/tcl:= ) +" +DEPEND=" + ${RDEPEND} + gui? ( x11-base/xorg-proto ) +" +BDEPEND=" + gui? ( + x11-apps/bdftopcf + >=x11-apps/mkfontscale-1.2.0 + x11-misc/xbitmaps + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.1-musl-wint-t-fix.patch + "${FILESDIR}"/${PN}-4.2_p5-ncurses-pkg-config.patch +) + +src_prepare() { + default + + # Some subdirs (like c3270/x3270/s3270) install the same set of data files + # (they have the same contents). Wrap that in a retry to avoid errors. + cat <<-EOF > _install || die + #!/bin/sh + for n in 1 2 3 4 5; do + install "\$@" && exit + echo "retrying ..." + done + exit 1 + EOF + chmod a+rx _install || die + # Can't use the ${INSTALL} var as top level configure also uses it. + # https://sourceforge.net/p/x3270/bugs/15/ + export ac_cv_path_install="${S}"/_install + + AT_NOEAUTOHEADER=yes eautoreconf +} + +src_configure() { + econf \ + --cache-file="${S}"/config.cache \ + --enable-s3270 \ + --enable-pr3287 \ + $(use_enable ncurses c3270) \ + $(use_enable tcl tcl3270) \ + $(use_enable gui x3270) \ + $(use_with gui x) \ + $(use_with gui fontdir "${FONTDIR}") +} + +src_install() { + use gui && dodir "${FONTDIR}" + + emake DESTDIR="${D}" install{,.man} + + use gui && font_src_install +} + +pkg_postinst() { + use gui && font_pkg_postinst +} + +pkg_postrm() { + use gui && font_pkg_postrm +} diff --git a/net-misc/sunshine/Manifest b/net-misc/sunshine/Manifest new file mode 100644 index 000000000000..2efe3ef8929a --- /dev/null +++ b/net-misc/sunshine/Manifest @@ -0,0 +1,10 @@ +DIST LizardByte-build-deps-2aafe061cd52a944cb3b5f86d1f25e9ad2a19bec.tar.gz 24171 BLAKE2B bcc8f1829eae4ba85a9cbdaca7876a4a52c979f3b8ef0f0a56876fcb171025544bd1997455c2b8fff59564deca433366ae03f14cbb0929f78c87f991b269156f SHA512 892184ec0ff321b2b7e2000dc605d1162955cb04ff259f6032f124f1ff50a1fe485e2cf2c0b735788f8615c9aba87ca040205599cb4b91881daa462a53340bd7 +DIST LizardByte-tray-4d8b798cafdd11285af9409c16b5f792968e0045.tar.gz 1068346 BLAKE2B 6da778c6dc1efb1147363de239a4170dad23288322285b847ed86837b316162bce861b848b8371ea8562efbfa0d36dc6921e8a36da0a05740e3f6aa1da29fae1 SHA512 9c6535a6a3ba4489b5af0821a8c42bbb706259c10d70237bd3d3b31283a7e8ad0e3c2326a34c229d899389156909c36252a931ea47eef8daeb8b7c54b26e92cb +DIST Simple-Web-Server-27b41f5ee154cca0fce4fe2955dd886d04e3a4ed.tar.bz2 63258 BLAKE2B e80a6cd92825038ca75b973281b676584f9e488b45b1f9c6ed526236c0a7188b97ae2bba9d7b5557893452dd1ba8778faff2ade840cc169d20b4cf0e51fc8394 SHA512 2eba1d8bd53bb3e29e51a72000918b44730f73b4df26824f25cb6a4860dd21f8aaa7f77124fb500ffe9601ebeca66d1c21a06cad239ed27481e9cae088afbd44 +DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5 +DIST moonlight-common-c-cbd0ec1b25edfb8ee8645fffa49ff95b6e04c70e.tar.gz 148691 BLAKE2B 2650e48ef5d08b5e4a901e0b394364335503cd717ae75b4ecf5329395f39d3312a9bbfe08137d2b7697f7b1672749d148e100fbaa5c7f87d190ab8157f158639 SHA512 f1d7848138b85a88abf798774f12f6491e19ae5e7699715b0454bfccc184439fba0ebf7e05327fd649e320e5d1ad610c57fe71190f92cf2248c8f974f9d79aaf +DIST moonlight-enet-04e27590670a87a7cd40f5a05cda97467e4e25a3.tar.gz 86434 BLAKE2B 8a5535843e4c650b945882abac1542bf8c79dc420607b88433d239aa5a17380f02e77bb8f1fcbe45dcb8ef894e6c9b4d940f4d3b34b956ce42d86f6a8ca5227a SHA512 6d2e9447e546489365b1fb563ed52664a91981717a3a3a9faa9600ab62be5ac09bd24ee9dd505833d31981ce6222f5ef430268a9f92aa83fa288b5b8d681e2aa +DIST nanors-e9e242e98e27037830490b2a752895ca68f75f8b.tar.gz 194694 BLAKE2B 1effd7c0884ffd38b63d61a7872337797529ef2012f9de0950088a5004cb32a2fb2c14bcab2ec6719968864e5e6b9a67e96afa39466e2071bf4a0cd752ae4b29 SHA512 548be25650619a6c31944cd7a745fd40d5bc5008f2d7f91e0207a10b923764cb88fd2ddcb71eaed7c4863ec89b34d61011b666e292da071ac3b4429e4d7dd027 +DIST sunshine-0.23.1.tar.gz 24503568 BLAKE2B 0c589f38a7d638c49af6385def2676de04af422f85d37228988bd7c822ffc006dbac0a1695e01527ac7a1d5ee28103cff00d78a97d57f61247772a6e6cc1fe18 SHA512 7a9150baf4ecdad1035666993c60744390e227ebeaf467447c53675dc0aecc7031cd9c9b253fbbbbac072f5592c3690c6acfde41f38d441497a17157417f1e16 +DIST sunshine-assets-0.23.1.tar.xz 1269348 BLAKE2B 36dd00fbf4bb1bfa213d53fd9dc78ed1fee9e12efcfb138dbd54932c3f19447d832da506175a982be7564408e06b0699b0b7cb4b9811ab81b47e30681c915bab SHA512 9fe9e0ee29864faa0f67dd4d501d116be1476f2c7ec688646b91eb87cb38e9e9d2baecb8335df29075fd3f60bf05b900c20dcb8406306d68a62c30ff55d1b7aa +DIST wlr-protocols-2b8d43325b7012cc3f9b55c08d26e50e42beac7d.tar.bz2 19708 BLAKE2B fe20f21ee8282d7afcdbb8f3863e50b217fb71e7814f404f288b0d09d30c9e30135769b12342d9e9126a8cb2ab35d6ced0c5562807d274b1d97224f5f3d02511 SHA512 7935b5089820304aa8cb0e1a8f4e0db6ccd5285973a3f3554ccc935dd88e379eb03c3b2dd199da97b6ff8dfbbbf124ca65fb1c12821a168d34bd7e26d8514edb diff --git a/net-misc/sunshine/files/sunshine-0.22.0-nvcodec.patch b/net-misc/sunshine/files/sunshine-0.22.0-nvcodec.patch new file mode 100644 index 000000000000..bc7681beedf0 --- /dev/null +++ b/net-misc/sunshine/files/sunshine-0.22.0-nvcodec.patch @@ -0,0 +1,27 @@ +From 36b5a18ffd0cdf379b579db91bfaacc46e8c4757 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 18 Feb 2024 10:25:25 +0000 +Subject: [PATCH] Be less strict about the nv-codec-headers version + +Using the bundled version is awkward. Restrict the major version only +and deal with any issues later. +--- + src/nvenc/nvenc_base.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nvenc/nvenc_base.cpp b/src/nvenc/nvenc_base.cpp +index b9eba5a..e11c4e2 100644 +--- a/src/nvenc/nvenc_base.cpp ++++ b/src/nvenc/nvenc_base.cpp +@@ -11,7 +11,7 @@ + // - NV_ENC_*_VER definitions where the value inside NVENCAPI_STRUCT_VERSION() was increased
+ // - Incompatible struct changes in nvEncodeAPI.h (fields removed, semantics changed, etc.)
+ // - Test both old and new drivers with all supported codecs
+-#if NVENCAPI_VERSION != MAKE_NVENC_VER(12U, 0U)
++#if NVENCAPI_MAJOR_VERSION != 12
+ #error Check and update NVENC code for backwards compatibility!
+ #endif
+
+-- +2.43.0 + diff --git a/net-misc/sunshine/files/sunshine-cross-cbs.patch b/net-misc/sunshine/files/sunshine-cross-cbs.patch new file mode 100644 index 000000000000..e6173597e476 --- /dev/null +++ b/net-misc/sunshine/files/sunshine-cross-cbs.patch @@ -0,0 +1,59 @@ +From 40654399bd090dda20750b184eb6b15bc615a5dc Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 25 Feb 2024 16:24:25 +0000 +Subject: [PATCH] Fix cross-compiling and don't treat x86 as the default case + +If you set arch-specific CFLAGS, then ffmpeg's configure script may +fail when it tries to use these flags against the build host's compiler. + +Also use CMAKE_SYSTEM_PROCESSOR to set up cross-compiling without +relying on any custom variables. ffmpeg normalises its --arch option and +will accept just about any string that you'll likely throw at it. + +diff --git a/cmake/ffmpeg_cbs.cmake b/cmake/ffmpeg_cbs.cmake +index 573bec0..4a75e1a 100644 +--- a/cmake/ffmpeg_cbs.cmake ++++ b/cmake/ffmpeg_cbs.cmake +@@ -30,23 +30,30 @@ if (WIN32) + set(LEADING_SH_COMMAND sh) + endif () + +-if (CROSS_COMPILE_ARM) +- set(FFMPEG_EXTRA_CONFIGURE +- --arch=aarch64 +- --enable-cross-compile) ++string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} arch) ++ ++if (${arch} STREQUAL "aarch64" OR ${arch} STREQUAL "arm64") + set(CBS_ARCH_PATH arm) +-elseif (CROSS_COMPILE_PPC) +- set(FFMPEG_EXTRA_CONFIGURE +- --arch=powerpc64le +- --enable-cross-compile) ++elseif (${arch} STREQUAL "ppc64le") + set(CBS_ARCH_PATH ppc) +-else () ++elseif (${arch} STREQUAL "amd64" OR ${arch} STREQUAL "x86_64") + set(CBS_ARCH_PATH x86) ++else () ++ message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) ++endif () ++ ++if (CMAKE_CROSSCOMPILING) ++ set(FFMPEG_EXTRA_CONFIGURE --arch=${arch} --enable-cross-compile) + endif () + + # The generated config.h needs to have `CONFIG_CBS_` flags enabled (from `--enable-bsfs`) + execute_process( + COMMAND ${LEADING_SH_COMMAND} ./configure ++ --cc=${CMAKE_C_COMPILER} ++ --cxx=${CMAKE_CXX_COMPILER} ++ --ar=${CMAKE_AR} ++ --ranlib=${CMAKE_RANLIB} ++ --optflags=${CMAKE_C_FLAGS} + --disable-all + --disable-autodetect + --disable-iconv +-- +2.43.2 + diff --git a/net-misc/sunshine/files/sunshine-custom-ffmpeg.patch b/net-misc/sunshine/files/sunshine-custom-ffmpeg.patch new file mode 100644 index 000000000000..172ae3ff7d59 --- /dev/null +++ b/net-misc/sunshine/files/sunshine-custom-ffmpeg.patch @@ -0,0 +1,162 @@ +From 20c589554a1b10dad206619e11d143c420aa6c82 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Mon, 1 Jan 2024 11:17:08 +0000 +Subject: [PATCH 1/2] Allow a custom FFmpeg build to be provided using CMake + options + +--- + cmake/dependencies/common.cmake | 90 ++++++++++++++++++--------------- + 1 file changed, 50 insertions(+), 40 deletions(-) + +diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake +index 29bed10..d43a6e0 100644 +--- a/cmake/dependencies/common.cmake ++++ b/cmake/dependencies/common.cmake +@@ -20,53 +20,63 @@ pkg_check_modules(MINIUPNP miniupnpc REQUIRED) + include_directories(SYSTEM ${MINIUPNP_INCLUDE_DIRS}) + + # ffmpeg pre-compiled binaries +-if(WIN32) +- if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") +- message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) ++if(NOT DEFINED FFMPEG_PREPARED_BINARIES) ++ if(WIN32) ++ if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") ++ message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) ++ endif() ++ set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid vpl) ++ set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/windows-x86_64") ++ elseif(APPLE) ++ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") ++ set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/macos-x86_64") ++ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") ++ set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/macos-aarch64") ++ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc") ++ message(FATAL_ERROR "PowerPC is not supported on macOS") ++ else() ++ message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) ++ endif() ++ elseif(UNIX) ++ set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) ++ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") ++ list(APPEND FFMPEG_PLATFORM_LIBRARIES mfx) ++ set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-x86_64") ++ set(CPACK_DEB_PLATFORM_PACKAGE_DEPENDS "libmfx1,") ++ set(CPACK_RPM_PLATFORM_PACKAGE_REQUIRES "intel-mediasdk >= 22.3.0,") ++ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") ++ set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-aarch64") ++ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64") ++ set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-powerpc64le") ++ else() ++ message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) ++ endif() + endif() +- set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid vpl) +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/windows-x86_64") +-elseif(APPLE) +- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/macos-x86_64") +- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/macos-aarch64") +- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc") +- message(FATAL_ERROR "PowerPC is not supported on macOS") +- else() +- message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) ++ if(EXISTS "${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a") ++ set(HDR10_PLUS_LIBRARY ++ "${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a") + endif() +-elseif(UNIX) +- set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) +- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +- list(APPEND FFMPEG_PLATFORM_LIBRARIES mfx) +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-x86_64") +- set(CPACK_DEB_PLATFORM_PACKAGE_DEPENDS "libmfx1,") +- set(CPACK_RPM_PLATFORM_PACKAGE_REQUIRES "intel-mediasdk >= 22.3.0,") +- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-aarch64") +- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64") +- set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-powerpc64le") +- else() +- message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) +- endif() +-endif() +-set(FFMPEG_INCLUDE_DIRS +- "${FFMPEG_PREPARED_BINARIES}/include") +-if(EXISTS "${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a") +- set(HDR10_PLUS_LIBRARY +- "${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a") +-endif() +-set(FFMPEG_LIBRARIES ++ set(FFMPEG_LIBRARIES ++ "${FFMPEG_PREPARED_BINARIES}/lib/libavcodec.a" ++ "${FFMPEG_PREPARED_BINARIES}/lib/libavutil.a" ++ "${FFMPEG_PREPARED_BINARIES}/lib/libcbs.a" ++ "${FFMPEG_PREPARED_BINARIES}/lib/libSvtAv1Enc.a" ++ "${FFMPEG_PREPARED_BINARIES}/lib/libswscale.a" ++ "${FFMPEG_PREPARED_BINARIES}/lib/libx264.a" ++ "${FFMPEG_PREPARED_BINARIES}/lib/libx265.a" ++ ${HDR10_PLUS_LIBRARY} ++ ${FFMPEG_PLATFORM_LIBRARIES}) ++else() ++ set(FFMPEG_LIBRARIES + "${FFMPEG_PREPARED_BINARIES}/lib/libavcodec.a" + "${FFMPEG_PREPARED_BINARIES}/lib/libavutil.a" + "${FFMPEG_PREPARED_BINARIES}/lib/libcbs.a" +- "${FFMPEG_PREPARED_BINARIES}/lib/libSvtAv1Enc.a" + "${FFMPEG_PREPARED_BINARIES}/lib/libswscale.a" +- "${FFMPEG_PREPARED_BINARIES}/lib/libx264.a" +- "${FFMPEG_PREPARED_BINARIES}/lib/libx265.a" +- ${HDR10_PLUS_LIBRARY} + ${FFMPEG_PLATFORM_LIBRARIES}) ++endif() ++ ++set(FFMPEG_INCLUDE_DIRS ++ "${FFMPEG_PREPARED_BINARIES}/include") + + # platform specific dependencies + if(WIN32) +-- +2.43.2 + +From 53cd96560114dd700c943db63723e340100446a3 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Mon, 1 Jan 2024 13:34:20 +0000 +Subject: [PATCH 2/2] Move numa from general PLATFORM_LIBRARIES to + FFMPEG_PLATFORM_LIBRARIES + +It's only needed if libx265 was built with NUMA support. This support +may be disabled in a custom FFmpeg build. +--- + cmake/compile_definitions/linux.cmake | 1 - + cmake/dependencies/common.cmake | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/cmake/compile_definitions/linux.cmake b/cmake/compile_definitions/linux.cmake +index b6d1990..ec668f7 100644 +--- a/cmake/compile_definitions/linux.cmake ++++ b/cmake/compile_definitions/linux.cmake +@@ -252,7 +252,6 @@ list(APPEND PLATFORM_TARGET_FILES + list(APPEND PLATFORM_LIBRARIES + Boost::dynamic_linking + dl +- numa + pulse + pulse-simple) + +diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake +index d43a6e0..bddee03 100644 +--- a/cmake/dependencies/common.cmake ++++ b/cmake/dependencies/common.cmake +@@ -38,7 +38,7 @@ if(NOT DEFINED FFMPEG_PREPARED_BINARIES) + message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) + endif() + elseif(UNIX) +- set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) ++ set(FFMPEG_PLATFORM_LIBRARIES numa va va-drm va-x11 vdpau X11) + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + list(APPEND FFMPEG_PLATFORM_LIBRARIES mfx) + set(FFMPEG_PREPARED_BINARIES "${CMAKE_SOURCE_DIR}/third-party/build-deps/ffmpeg/linux-x86_64") +-- +2.43.2 + diff --git a/net-misc/sunshine/files/sunshine-find-npm.patch b/net-misc/sunshine/files/sunshine-find-npm.patch new file mode 100644 index 000000000000..ab25b4527b78 --- /dev/null +++ b/net-misc/sunshine/files/sunshine-find-npm.patch @@ -0,0 +1,92 @@ +From 66740900522f42564a2b0bd4e8a435ed24a61725 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 12 May 2024 17:26:14 +0100 +Subject: [PATCH] Unify asset building and use find_program to find NPM (#2522) + +--- + cmake/targets/common.cmake | 33 +++++++++++++++++++++------------ + cmake/targets/unix.cmake | 6 ------ + cmake/targets/windows.cmake | 6 ------ + 3 files changed, 21 insertions(+), 24 deletions(-) + +diff --git a/cmake/targets/common.cmake b/cmake/targets/common.cmake +index ee79528c..941ef0b7 100644 +--- a/cmake/targets/common.cmake ++++ b/cmake/targets/common.cmake +@@ -3,18 +3,6 @@ + + add_executable(sunshine ${SUNSHINE_TARGET_FILES}) + +-# Homebrew build fails the vite build if we set these environment variables +-# this block must be before the platform specific code +-if(${SUNSHINE_BUILD_HOMEBREW}) +- set(NPM_SOURCE_ASSETS_DIR "") +- set(NPM_ASSETS_DIR "") +- set(NPM_BUILD_HOMEBREW "true") +-else() +- set(NPM_SOURCE_ASSETS_DIR ${SUNSHINE_SOURCE_ASSETS_DIR}) +- set(NPM_ASSETS_DIR ${CMAKE_BINARY_DIR}) +- set(NPM_BUILD_HOMEBREW "") +-endif() +- + # platform specific target definitions + if(WIN32) + include(${CMAKE_MODULE_PATH}/targets/windows.cmake) +@@ -49,6 +37,27 @@ endif() + + target_compile_options(sunshine PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${SUNSHINE_COMPILE_OPTIONS}>;$<$<COMPILE_LANGUAGE:CUDA>:${SUNSHINE_COMPILE_OPTIONS_CUDA};-std=c++17>) # cmake-lint: disable=C0301 + ++# Homebrew build fails the vite build if we set these environment variables ++if(${SUNSHINE_BUILD_HOMEBREW}) ++ set(NPM_SOURCE_ASSETS_DIR "") ++ set(NPM_ASSETS_DIR "") ++ set(NPM_BUILD_HOMEBREW "true") ++else() ++ set(NPM_SOURCE_ASSETS_DIR ${SUNSHINE_SOURCE_ASSETS_DIR}) ++ set(NPM_ASSETS_DIR ${CMAKE_BINARY_DIR}) ++ set(NPM_BUILD_HOMEBREW "") ++endif() ++ ++#WebUI build ++find_program(NPM npm REQUIRED) ++add_custom_target(web-ui ALL ++ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" ++ COMMENT "Installing NPM Dependencies and Building the Web UI" ++ COMMAND "$<$<BOOL:${WIN32}>:cmd;/C>" "${NPM}" install ++ COMMAND "${CMAKE_COMMAND}" -E env "SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW}" "SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR}" "SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR}" "$<$<BOOL:${WIN32}>:cmd;/C>" "${NPM}" run build # cmake-lint: disable=C0301 ++ COMMAND_EXPAND_LISTS ++ VERBATIM) ++ + # tests + if(BUILD_TESTS) + add_subdirectory(tests) +diff --git a/cmake/targets/unix.cmake b/cmake/targets/unix.cmake +index 5527a987..047a0b3d 100644 +--- a/cmake/targets/unix.cmake ++++ b/cmake/targets/unix.cmake +@@ -1,8 +1,2 @@ + # unix specific target definitions + # put anything here that applies to both linux and macos +- +-#WebUI build +-add_custom_target(web-ui ALL +- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" +- COMMENT "Installing NPM Dependencies and Building the Web UI" +- COMMAND sh -c \"npm install && SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW} SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR} SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR} npm run build\") # cmake-lint: disable=C0301 +diff --git a/cmake/targets/windows.cmake b/cmake/targets/windows.cmake +index e429feaa..341d7c2e 100644 +--- a/cmake/targets/windows.cmake ++++ b/cmake/targets/windows.cmake +@@ -4,9 +4,3 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll") + find_library(ZLIB ZLIB1) + list(APPEND SUNSHINE_EXTERNAL_LIBRARIES + Wtsapi32.lib) +- +-#WebUI build +-add_custom_target(web-ui ALL +- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" +- COMMENT "Installing NPM Dependencies and Building the Web UI" +- COMMAND cmd /C "npm install && set \"SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR}\" && set \"SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR}\" && npm run build") # cmake-lint: disable=C0301 +-- +2.44.0 + diff --git a/net-misc/sunshine/metadata.xml b/net-misc/sunshine/metadata.xml new file mode 100644 index 000000000000..11dc749f56cf --- /dev/null +++ b/net-misc/sunshine/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + <upstream> + <remote-id type="github">LizardByte/Sunshine</remote-id> + <bugs-to>https://bugs.gentoo.org</bugs-to> + </upstream> + <use> + <flag name="cuda">Enable accelerated video encoding on NVIDIA hardware</flag> + <flag name="libdrm">Enable video encoding via <pkg>x11-libs/libdrm</pkg></flag> + <flag name="svt-av1">Enables software AV1 encoding via <pkg>media-libs/svt-av1</pkg></flag> + <flag name="trayicon">Enable system tray icon</flag> + <flag name="x264">Enable software H.264 encoding via <pkg>media-libs/x264</pkg></flag> + <flag name="x265">Enable software HEVC encoding via <pkg>media-libs/x265</pkg></flag> + </use> +</pkgmetadata> diff --git a/net-misc/sunshine/sunshine-0.23.1.ebuild b/net-misc/sunshine/sunshine-0.23.1.ebuild new file mode 100644 index 000000000000..f700216a63b6 --- /dev/null +++ b/net-misc/sunshine/sunshine-0.23.1.ebuild @@ -0,0 +1,377 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# These don't necessarily have to align with the upstream release. +BUILD_DEPS_COMMIT="2aafe061cd52a944cb3b5f86d1f25e9ad2a19bec" +ENET_COMMIT="04e27590670a87a7cd40f5a05cda97467e4e25a3" +MOONLIGHT_COMMIT="cbd0ec1b25edfb8ee8645fffa49ff95b6e04c70e" +NANORS_COMMIT="e9e242e98e27037830490b2a752895ca68f75f8b" +TRAY_COMMIT="4d8b798cafdd11285af9409c16b5f792968e0045" +SWS_COMMIT="27b41f5ee154cca0fce4fe2955dd886d04e3a4ed" +WLRP_COMMIT="2b8d43325b7012cc3f9b55c08d26e50e42beac7d" +FFMPEG_VERSION="6.1.1" + +# To make the assets tarball: +# PV= +# EGIT_OVERRIDE_COMMIT_LIZARDBYTE_SUNSHINE=v$PV ebuild sunshine-9999.ebuild clean compile +# XZ_OPT=-9 tar --xform="s:^:Sunshine-$PV/:" -Jcf /var/cache/distfiles/sunshine-assets-$PV.tar.xz -C /var/tmp/portage/net-misc/sunshine-9999/work/sunshine-9999 assets/ + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 +else + SRC_URI=" + https://github.com/LizardByte/Sunshine/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + https://github.com/LizardByte/build-deps/archive/${BUILD_DEPS_COMMIT}.tar.gz + -> LizardByte-build-deps-${BUILD_DEPS_COMMIT}.tar.gz + https://github.com/cgutman/enet/archive/${ENET_COMMIT}.tar.gz + -> moonlight-enet-${ENET_COMMIT}.tar.gz + https://github.com/moonlight-stream/moonlight-common-c/archive/${MOONLIGHT_COMMIT}.tar.gz + -> moonlight-common-c-${MOONLIGHT_COMMIT}.tar.gz + https://github.com/sleepybishop/nanors/archive/${NANORS_COMMIT}.tar.gz + -> nanors-${NANORS_COMMIT}.tar.gz + https://github.com/LizardByte/tray/archive/${TRAY_COMMIT}.tar.gz + -> LizardByte-tray-${TRAY_COMMIT}.tar.gz + https://gitlab.com/eidheim/Simple-Web-Server/-/archive/${SWS_COMMIT}/Simple-Web-Server-${SWS_COMMIT}.tar.bz2 + https://gitlab.freedesktop.org/wlroots/wlr-protocols/-/archive/${WLRP_COMMIT}/wlr-protocols-${WLRP_COMMIT}.tar.bz2 + https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.xz + https://dev.gentoo.org/~chewi/distfiles/${PN}-assets-${PV}.tar.xz + " + KEYWORDS="~amd64 ~arm64" + S="${WORKDIR}/Sunshine-${PV}" +fi + +inherit cmake fcaps flag-o-matic systemd toolchain-funcs udev xdg + +DESCRIPTION="Self-hosted game stream host for Moonlight" +HOMEPAGE="https://github.com/LizardByte/Sunshine" +LICENSE="GPL-3" +SLOT="0" +IUSE="cuda debug libdrm svt-av1 trayicon vaapi wayland X x264 x265" + +# Strings for CPU features in the useflag[:configure_option] form +# if :configure_option isn't set, it will use 'useflag' as configure option +ARM_CPU_FEATURES=( + cpu_flags_arm_thumb:armv5te + cpu_flags_arm_v6:armv6 + cpu_flags_arm_thumb2:armv6t2 + cpu_flags_arm_neon:neon + cpu_flags_arm_vfp:vfp + cpu_flags_arm_vfpv3:vfpv3 + cpu_flags_arm_v8:armv8 + cpu_flags_arm_asimddp:dotprod + cpu_flags_arm_i8mm:i8mm +) +ARM_CPU_REQUIRED_USE=" + arm64? ( cpu_flags_arm_v8 ) + cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) + cpu_flags_arm_neon? ( + cpu_flags_arm_vfp + arm? ( cpu_flags_arm_thumb2 ) + ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( + arm? ( cpu_flags_arm_thumb ) + ) +" +PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 ) +PPC_CPU_REQUIRED_USE=" + cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) + cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) +" +X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx + mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) +X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) +X86_CPU_REQUIRED_USE=" + cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) + cpu_flags_x86_xop? ( cpu_flags_x86_avx ) + cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) + cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) + cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) + cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) + cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) + cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) + cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) + cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) + cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) +" + +CPU_FEATURES_MAP=( + ${ARM_CPU_FEATURES[@]} + ${PPC_CPU_FEATURES[@]} + ${X86_CPU_FEATURES[@]} +) +IUSE="${IUSE} + ${CPU_FEATURES_MAP[@]%:*}" + +CPU_REQUIRED_USE=" + ${ARM_CPU_REQUIRED_USE} + ${PPC_CPU_REQUIRED_USE} + ${X86_CPU_REQUIRED_USE} +" + +REQUIRED_USE=" + ${CPU_REQUIRED_USE} + || ( cuda libdrm wayland X ) +" + +CDEPEND=" + dev-libs/boost:=[nls] + dev-libs/libevdev + dev-libs/openssl:= + media-libs/opus + net-libs/miniupnpc:= + net-misc/curl + || ( + media-libs/libpulse + media-sound/apulse[sdk] + ) + libdrm? ( + sys-libs/libcap + x11-libs/libdrm + ) + svt-av1? ( media-libs/svt-av1 ) + trayicon? ( + dev-libs/libayatana-appindicator + x11-libs/libnotify + ) + vaapi? ( media-libs/libva:=[wayland?,X?] ) + wayland? ( dev-libs/wayland ) + X? ( x11-libs/libX11 ) + x264? ( media-libs/x264:= ) + x265? ( media-libs/x265:= ) +" + +RDEPEND=" + ${CDEPEND} + media-libs/mesa[vaapi?] + X? ( + x11-libs/libxcb + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + ) +" + +DEPEND=" + ${CDEPEND} + media-libs/amf-headers + =media-libs/nv-codec-headers-12* + wayland? ( dev-libs/wayland-protocols ) +" + +BDEPEND=" + net-libs/nodejs[npm] + virtual/pkgconfig + cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) + cuda? ( dev-util/nvidia-cuda-toolkit ) + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-custom-ffmpeg.patch + "${FILESDIR}"/${PN}-0.22.0-nvcodec.patch + "${FILESDIR}"/${PN}-find-npm.patch +) + +# Make this mess a bit simpler. +CMAKE_IN_SOURCE_BUILD=1 + +# Make npm behave. +export npm_config_audit=false +export npm_config_color=false +export npm_config_foreground_scripts=true +export npm_config_loglevel=verbose +export npm_config_optional=false +export npm_config_progress=false +export npm_config_save=false + +src_unpack() { + if [[ ${PV} = 9999* ]]; then + local EGIT_REPO_URI="https://github.com/LizardByte/build-deps.git" + local EGIT_SUBMODULES=( '-*' ) + local EGIT_CHECKOUT_DIR=${WORKDIR}/build-deps + git-r3_src_unpack + + # Use upstream server like our ffmpeg package does, not GitHub. + local EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" + local EGIT_SUBMODULES=( '-*' ) + local EGIT_CHECKOUT_DIR=${EGIT_CHECKOUT_DIR}/ffmpeg_sources/ffmpeg + local EGIT_COMMIT=$(git --git-dir=build-deps/.git rev-parse HEAD:ffmpeg_sources/ffmpeg) + local EGIT_BRANCH=release/$(ver_cut 1-2 ${FFMPEG_VERSION}) + git-r3_src_unpack + + local EGIT_REPO_URI="https://github.com/LizardByte/Sunshine.git" + local EGIT_SUBMODULES=( + third-party/{moonlight-common-c{,/enet},nanors,tray,Simple-Web-Server,wlr-protocols} + ) + unset EGIT_CHECKOUT_DIR EGIT_COMMIT EGIT_BRANCH + git-r3_src_unpack + + # This downloads things so must go in src_unpack to avoid the sandbox. + cd "${S}" || die + npm install || die + else + default + ln -snf build-deps-${BUILD_DEPS_COMMIT} build-deps || die + find moonlight-common-c-${MOONLIGHT_COMMIT} "${S}"/third-party build-deps/ffmpeg_sources \ + -mindepth 1 -type d -empty -delete || die + ln -snf ../enet-${ENET_COMMIT} moonlight-common-c-${MOONLIGHT_COMMIT}/enet || die + ln -snf ../../moonlight-common-c-${MOONLIGHT_COMMIT} "${S}"/third-party/moonlight-common-c || die + ln -snf ../../nanors-${NANORS_COMMIT} "${S}"/third-party/nanors || die + ln -snf ../../tray-${TRAY_COMMIT} "${S}"/third-party/tray || die + ln -snf ../../Simple-Web-Server-${SWS_COMMIT} "${S}"/third-party/Simple-Web-Server || die + ln -snf ../../wlr-protocols-${WLRP_COMMIT} "${S}"/third-party/wlr-protocols || die + ln -snf ../../ffmpeg-${FFMPEG_VERSION} build-deps/ffmpeg_sources/ffmpeg || die + fi +} + +src_prepare() { + # Apply CBS patch. + cd "${WORKDIR}"/build-deps || die + eapply "${FILESDIR}"/${PN}-cross-cbs.patch + + # Apply general ffmpeg patches. + cd "${WORKDIR}"/build-deps/ffmpeg_sources/ffmpeg || die + eapply "${WORKDIR}"/build-deps/ffmpeg_patches/ffmpeg/*.patch + + # Copy ffmpeg sources because CBS build applies extra patches. + cp -a ./ "${WORKDIR}"/ffmpeg-build || die + + cd "${S}" || die + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_prepare + default_src_prepare() { :; } # Hack to avoid double patching! :( + CMAKE_USE_DIR="${S}" cmake_src_prepare +} + +src_configure() { + local myconf=( + --prefix="${S}"/third-party/ffmpeg + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --ar="$(tc-getAR)" + --nm="$(tc-getNM)" + --strip="$(tc-getSTRIP)" + --ranlib="$(tc-getRANLIB)" + --pkg-config="$(tc-getPKG_CONFIG)" + --optflags="${CFLAGS}" + --disable-all + --disable-autodetect + --disable-error-resilience + --disable-everything + --disable-faan + --disable-iconv + --disable-network + --disable-optimizations + --disable-stripping + --enable-amf + --enable-avcodec + --enable-ffnvcodec + --enable-gpl + --enable-nvenc + --enable-static + --enable-swscale + --enable-v4l2_m2m + $(use_enable cuda) + $(use_enable cuda cuda_llvm) + $(use_enable svt-av1 libsvtav1) + $(use_enable vaapi) + $(use_enable x264 libx264) + $(use_enable x265 libx265) + $(usex svt-av1 --enable-encoder=libsvtav1 "") + $(usex vaapi --enable-encoder=h264_vaapi,hevc_vaapi,av1_vaapi "") + $(usex x264 --enable-encoder=libx264 "") + $(usex x265 --enable-encoder=libx265 "") + --enable-encoder=h264_amf,hevc_amf,av1_amf + --enable-encoder=h264_nvenc,hevc_nvenc,av1_nvenc + --enable-encoder=h264_v4l2m2m,hevc_v4l2m2m + ) + + # CPU features + for i in "${CPU_FEATURES_MAP[@]}" ; do + use ${i%:*} || myconf+=( --disable-${i#*:} ) + done + + # Try to get cpu type based on CFLAGS. + # Bug #172723 + # We need to do this so that features of that CPU will be better used + # If they contain an unknown CPU it will not hurt since ffmpeg's configure + # will just ignore it. + for i in $(get-flag mcpu) $(get-flag march) ; do + [[ ${i} = native ]] && i="host" # bug #273421 + myconf+=( --cpu=${i} ) + break + done + + # cross compile support + if tc-is-cross-compiler ; then + myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) + case ${CHOST} in + *mingw32*) + myconf+=( --target-os=mingw32 ) + ;; + *linux*) + myconf+=( --target-os=linux ) + ;; + esac + fi + + cd "${WORKDIR}"/ffmpeg-build || die + echo ./configure "${myconf[@]}" + ./configure "${myconf[@]}" || die + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=no + -DCMAKE_INSTALL_PREFIX="${S}"/third-party/ffmpeg + ) + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_configure + + local mycmakeargs=( + -DBUILD_TESTS=no + -DCMAKE_DISABLE_FIND_PACKAGE_Git=yes + -DFFMPEG_PLATFORM_LIBRARIES="$(usex svt-av1 SvtAv1Enc '');$(usex vaapi 'va;va-drm' '');$(usev x264);$(usev x265)" + -DFFMPEG_PREPARED_BINARIES="${S}"/third-party/ffmpeg + -DSUNSHINE_ASSETS_DIR=share/${PN} + -DSUNSHINE_ENABLE_CUDA=$(usex cuda) + -DSUNSHINE_ENABLE_DRM=$(usex libdrm) + -DSUNSHINE_ENABLE_VAAPI=$(usex vaapi) + -DSUNSHINE_ENABLE_WAYLAND=$(usex wayland) + -DSUNSHINE_ENABLE_X11=$(usex X) + -DSUNSHINE_ENABLE_TRAY=$(usex trayicon) + -DSUNSHINE_REQUIRE_TRAY=$(usex trayicon) + -DSUNSHINE_SYSTEM_WAYLAND_PROTOCOLS=yes + -DSYSTEMD_USER_UNIT_INSTALL_DIR=$(systemd_get_userunitdir) + -DUDEV_RULES_INSTALL_DIR=$(get_udevdir)/rules.d + ) + [[ ${PV} = 9999* ]] || mycmakeargs+=( -DNPM="${BROOT}"/bin/true ) + CMAKE_USE_DIR="${S}" cmake_src_configure +} + +src_compile() { + emake -C "${WORKDIR}"/ffmpeg-build V=1 + emake -C "${WORKDIR}"/ffmpeg-build V=1 install + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_compile + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_build install + CMAKE_USE_DIR="${S}" npm_config_offline=1 cmake_src_compile +} + +pkg_postinst() { + udev_reload + xdg_pkg_postinst + use libdrm && fcaps cap_sys_admin+p usr/bin/"$(readlink "${EROOT}"/usr/bin/${PN})" + + elog "At upstream's request, please report any issues to https://bugs.gentoo.org" + elog "rather than going directly to them." +} + +pkg_postrm() { + udev_reload + xdg_pkg_postrm +} diff --git a/net-misc/sunshine/sunshine-9999.ebuild b/net-misc/sunshine/sunshine-9999.ebuild new file mode 100644 index 000000000000..daa9608b1d60 --- /dev/null +++ b/net-misc/sunshine/sunshine-9999.ebuild @@ -0,0 +1,375 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# These don't necessarily have to align with the upstream release. +BUILD_DEPS_COMMIT="2aafe061cd52a944cb3b5f86d1f25e9ad2a19bec" +ENET_COMMIT="04e27590670a87a7cd40f5a05cda97467e4e25a3" +MOONLIGHT_COMMIT="cbd0ec1b25edfb8ee8645fffa49ff95b6e04c70e" +NANORS_COMMIT="e9e242e98e27037830490b2a752895ca68f75f8b" +TRAY_COMMIT="4d8b798cafdd11285af9409c16b5f792968e0045" +SWS_COMMIT="27b41f5ee154cca0fce4fe2955dd886d04e3a4ed" +WLRP_COMMIT="2b8d43325b7012cc3f9b55c08d26e50e42beac7d" +FFMPEG_VERSION="6.1.1" + +# To make the assets tarball: +# PV= +# EGIT_OVERRIDE_COMMIT_LIZARDBYTE_SUNSHINE=v$PV ebuild sunshine-9999.ebuild clean compile +# XZ_OPT=-9 tar --xform="s:^:Sunshine-$PV/:" -Jcf /var/cache/distfiles/sunshine-assets-$PV.tar.xz -C /var/tmp/portage/net-misc/sunshine-9999/work/sunshine-9999 assets/ + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 +else + SRC_URI=" + https://github.com/LizardByte/Sunshine/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + https://github.com/LizardByte/build-deps/archive/${BUILD_DEPS_COMMIT}.tar.gz + -> LizardByte-build-deps-${BUILD_DEPS_COMMIT}.tar.gz + https://github.com/cgutman/enet/archive/${ENET_COMMIT}.tar.gz + -> moonlight-enet-${ENET_COMMIT}.tar.gz + https://github.com/moonlight-stream/moonlight-common-c/archive/${MOONLIGHT_COMMIT}.tar.gz + -> moonlight-common-c-${MOONLIGHT_COMMIT}.tar.gz + https://github.com/sleepybishop/nanors/archive/${NANORS_COMMIT}.tar.gz + -> nanors-${NANORS_COMMIT}.tar.gz + https://github.com/LizardByte/tray/archive/${TRAY_COMMIT}.tar.gz + -> LizardByte-tray-${TRAY_COMMIT}.tar.gz + https://gitlab.com/eidheim/Simple-Web-Server/-/archive/${SWS_COMMIT}/Simple-Web-Server-${SWS_COMMIT}.tar.bz2 + https://gitlab.freedesktop.org/wlroots/wlr-protocols/-/archive/${WLRP_COMMIT}/wlr-protocols-${WLRP_COMMIT}.tar.bz2 + https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.xz + https://dev.gentoo.org/~chewi/distfiles/${PN}-assets-${PV}.tar.xz + " + KEYWORDS="~amd64 ~arm64" + S="${WORKDIR}/Sunshine-${PV}" +fi + +inherit cmake fcaps flag-o-matic systemd toolchain-funcs udev xdg + +DESCRIPTION="Self-hosted game stream host for Moonlight" +HOMEPAGE="https://github.com/LizardByte/Sunshine" +LICENSE="GPL-3" +SLOT="0" +IUSE="cuda debug libdrm svt-av1 trayicon vaapi wayland X x264 x265" + +# Strings for CPU features in the useflag[:configure_option] form +# if :configure_option isn't set, it will use 'useflag' as configure option +ARM_CPU_FEATURES=( + cpu_flags_arm_thumb:armv5te + cpu_flags_arm_v6:armv6 + cpu_flags_arm_thumb2:armv6t2 + cpu_flags_arm_neon:neon + cpu_flags_arm_vfp:vfp + cpu_flags_arm_vfpv3:vfpv3 + cpu_flags_arm_v8:armv8 + cpu_flags_arm_asimddp:dotprod + cpu_flags_arm_i8mm:i8mm +) +ARM_CPU_REQUIRED_USE=" + arm64? ( cpu_flags_arm_v8 ) + cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) + cpu_flags_arm_neon? ( + cpu_flags_arm_vfp + arm? ( cpu_flags_arm_thumb2 ) + ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( + arm? ( cpu_flags_arm_thumb ) + ) +" +PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 ) +PPC_CPU_REQUIRED_USE=" + cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) + cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) +" +X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx + mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) +X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) +X86_CPU_REQUIRED_USE=" + cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) + cpu_flags_x86_xop? ( cpu_flags_x86_avx ) + cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) + cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) + cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) + cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) + cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) + cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) + cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) + cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) + cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) +" + +CPU_FEATURES_MAP=( + ${ARM_CPU_FEATURES[@]} + ${PPC_CPU_FEATURES[@]} + ${X86_CPU_FEATURES[@]} +) +IUSE="${IUSE} + ${CPU_FEATURES_MAP[@]%:*}" + +CPU_REQUIRED_USE=" + ${ARM_CPU_REQUIRED_USE} + ${PPC_CPU_REQUIRED_USE} + ${X86_CPU_REQUIRED_USE} +" + +REQUIRED_USE=" + ${CPU_REQUIRED_USE} + || ( cuda libdrm wayland X ) +" + +CDEPEND=" + dev-libs/boost:=[nls] + dev-libs/libevdev + dev-libs/openssl:= + media-libs/opus + net-libs/miniupnpc:= + net-misc/curl + || ( + media-libs/libpulse + media-sound/apulse[sdk] + ) + libdrm? ( + sys-libs/libcap + x11-libs/libdrm + ) + svt-av1? ( media-libs/svt-av1 ) + trayicon? ( + dev-libs/libayatana-appindicator + x11-libs/libnotify + ) + vaapi? ( media-libs/libva:=[wayland?,X?] ) + wayland? ( dev-libs/wayland ) + X? ( x11-libs/libX11 ) + x264? ( media-libs/x264:= ) + x265? ( media-libs/x265:= ) +" + +RDEPEND=" + ${CDEPEND} + media-libs/mesa[vaapi?] + X? ( + x11-libs/libxcb + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + ) +" + +DEPEND=" + ${CDEPEND} + media-libs/amf-headers + =media-libs/nv-codec-headers-12* + wayland? ( dev-libs/wayland-protocols ) +" + +BDEPEND=" + net-libs/nodejs[npm] + virtual/pkgconfig + cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) + cuda? ( dev-util/nvidia-cuda-toolkit ) + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.22.0-nvcodec.patch +) + +# Make this mess a bit simpler. +CMAKE_IN_SOURCE_BUILD=1 + +# Make npm behave. +export npm_config_audit=false +export npm_config_color=false +export npm_config_foreground_scripts=true +export npm_config_loglevel=verbose +export npm_config_optional=false +export npm_config_progress=false +export npm_config_save=false + +src_unpack() { + if [[ ${PV} = 9999* ]]; then + local EGIT_REPO_URI="https://github.com/LizardByte/build-deps.git" + local EGIT_SUBMODULES=( '-*' ) + local EGIT_CHECKOUT_DIR=${WORKDIR}/build-deps + git-r3_src_unpack + + # Use upstream server like our ffmpeg package does, not GitHub. + local EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" + local EGIT_SUBMODULES=( '-*' ) + local EGIT_CHECKOUT_DIR=${EGIT_CHECKOUT_DIR}/ffmpeg_sources/ffmpeg + local EGIT_COMMIT=$(git --git-dir=build-deps/.git rev-parse HEAD:ffmpeg_sources/ffmpeg) + local EGIT_BRANCH=release/$(ver_cut 1-2 ${FFMPEG_VERSION}) + git-r3_src_unpack + + local EGIT_REPO_URI="https://github.com/LizardByte/Sunshine.git" + local EGIT_SUBMODULES=( + third-party/{moonlight-common-c{,/enet},nanors,tray,Simple-Web-Server,wlr-protocols} + ) + unset EGIT_CHECKOUT_DIR EGIT_COMMIT EGIT_BRANCH + git-r3_src_unpack + + # This downloads things so must go in src_unpack to avoid the sandbox. + cd "${S}" || die + npm install || die + else + default + ln -snf build-deps-${BUILD_DEPS_COMMIT} build-deps || die + find moonlight-common-c-${MOONLIGHT_COMMIT} "${S}"/third-party build-deps/ffmpeg_sources \ + -mindepth 1 -type d -empty -delete || die + ln -snf ../enet-${ENET_COMMIT} moonlight-common-c-${MOONLIGHT_COMMIT}/enet || die + ln -snf ../../moonlight-common-c-${MOONLIGHT_COMMIT} "${S}"/third-party/moonlight-common-c || die + ln -snf ../../nanors-${NANORS_COMMIT} "${S}"/third-party/nanors || die + ln -snf ../../tray-${TRAY_COMMIT} "${S}"/third-party/tray || die + ln -snf ../../Simple-Web-Server-${SWS_COMMIT} "${S}"/third-party/Simple-Web-Server || die + ln -snf ../../wlr-protocols-${WLRP_COMMIT} "${S}"/third-party/wlr-protocols || die + ln -snf ../../ffmpeg-${FFMPEG_VERSION} build-deps/ffmpeg_sources/ffmpeg || die + fi +} + +src_prepare() { + # Apply CBS patch. + cd "${WORKDIR}"/build-deps || die + eapply "${FILESDIR}"/${PN}-cross-cbs.patch + + # Apply general ffmpeg patches. + cd "${WORKDIR}"/build-deps/ffmpeg_sources/ffmpeg || die + eapply "${WORKDIR}"/build-deps/ffmpeg_patches/ffmpeg/*.patch + + # Copy ffmpeg sources because CBS build applies extra patches. + cp -a ./ "${WORKDIR}"/ffmpeg-build || die + + cd "${S}" || die + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_prepare + default_src_prepare() { :; } # Hack to avoid double patching! :( + CMAKE_USE_DIR="${S}" cmake_src_prepare +} + +src_configure() { + local myconf=( + --prefix="${S}"/third-party/ffmpeg + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --ar="$(tc-getAR)" + --nm="$(tc-getNM)" + --strip="$(tc-getSTRIP)" + --ranlib="$(tc-getRANLIB)" + --pkg-config="$(tc-getPKG_CONFIG)" + --optflags="${CFLAGS}" + --disable-all + --disable-autodetect + --disable-error-resilience + --disable-everything + --disable-faan + --disable-iconv + --disable-network + --disable-optimizations + --disable-stripping + --enable-amf + --enable-avcodec + --enable-ffnvcodec + --enable-gpl + --enable-nvenc + --enable-static + --enable-swscale + --enable-v4l2_m2m + $(use_enable cuda) + $(use_enable cuda cuda_llvm) + $(use_enable svt-av1 libsvtav1) + $(use_enable vaapi) + $(use_enable x264 libx264) + $(use_enable x265 libx265) + $(usex svt-av1 --enable-encoder=libsvtav1 "") + $(usex vaapi --enable-encoder=h264_vaapi,hevc_vaapi,av1_vaapi "") + $(usex x264 --enable-encoder=libx264 "") + $(usex x265 --enable-encoder=libx265 "") + --enable-encoder=h264_amf,hevc_amf,av1_amf + --enable-encoder=h264_nvenc,hevc_nvenc,av1_nvenc + --enable-encoder=h264_v4l2m2m,hevc_v4l2m2m + ) + + # CPU features + for i in "${CPU_FEATURES_MAP[@]}" ; do + use ${i%:*} || myconf+=( --disable-${i#*:} ) + done + + # Try to get cpu type based on CFLAGS. + # Bug #172723 + # We need to do this so that features of that CPU will be better used + # If they contain an unknown CPU it will not hurt since ffmpeg's configure + # will just ignore it. + for i in $(get-flag mcpu) $(get-flag march) ; do + [[ ${i} = native ]] && i="host" # bug #273421 + myconf+=( --cpu=${i} ) + break + done + + # cross compile support + if tc-is-cross-compiler ; then + myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) + case ${CHOST} in + *mingw32*) + myconf+=( --target-os=mingw32 ) + ;; + *linux*) + myconf+=( --target-os=linux ) + ;; + esac + fi + + cd "${WORKDIR}"/ffmpeg-build || die + echo ./configure "${myconf[@]}" + ./configure "${myconf[@]}" || die + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=no + -DCMAKE_INSTALL_PREFIX="${S}"/third-party/ffmpeg + ) + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_configure + + local mycmakeargs=( + -DBUILD_TESTS=no + -DCMAKE_DISABLE_FIND_PACKAGE_Git=yes + -DFFMPEG_PLATFORM_LIBRARIES="$(usex svt-av1 SvtAv1Enc '');$(usex vaapi 'va;va-drm' '');$(usev x264);$(usev x265)" + -DFFMPEG_PREPARED_BINARIES="${S}"/third-party/ffmpeg + -DSUNSHINE_ASSETS_DIR=share/${PN} + -DSUNSHINE_ENABLE_CUDA=$(usex cuda) + -DSUNSHINE_ENABLE_DRM=$(usex libdrm) + -DSUNSHINE_ENABLE_VAAPI=$(usex vaapi) + -DSUNSHINE_ENABLE_WAYLAND=$(usex wayland) + -DSUNSHINE_ENABLE_X11=$(usex X) + -DSUNSHINE_ENABLE_TRAY=$(usex trayicon) + -DSUNSHINE_REQUIRE_TRAY=$(usex trayicon) + -DSUNSHINE_SYSTEM_WAYLAND_PROTOCOLS=yes + -DSYSTEMD_USER_UNIT_INSTALL_DIR=$(systemd_get_userunitdir) + -DUDEV_RULES_INSTALL_DIR=$(get_udevdir)/rules.d + ) + [[ ${PV} = 9999* ]] || mycmakeargs+=( -DNPM="${BROOT}"/bin/true ) + CMAKE_USE_DIR="${S}" cmake_src_configure +} + +src_compile() { + emake -C "${WORKDIR}"/ffmpeg-build V=1 + emake -C "${WORKDIR}"/ffmpeg-build V=1 install + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_compile + CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_build install + CMAKE_USE_DIR="${S}" npm_config_offline=1 cmake_src_compile +} + +pkg_postinst() { + udev_reload + xdg_pkg_postinst + use libdrm && fcaps cap_sys_admin+p usr/bin/"$(readlink "${EROOT}"/usr/bin/${PN})" + + elog "At upstream's request, please report any issues to https://bugs.gentoo.org" + elog "rather than going directly to them." +} + +pkg_postrm() { + udev_reload + xdg_pkg_postrm +} diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest index 0e5e295a52df..e7cea24a125a 100644 --- a/net-misc/sysrepo/Manifest +++ b/net-misc/sysrepo/Manifest @@ -1,2 +1,2 @@ -DIST sysrepo-2.0.47.tar.gz 667259 BLAKE2B 9869fb936322f317156842daa71f1c07176914df4bcec73d2e8976dc28429555a1754eb5e2c5b0626f040bdf664d121dae711bc698974b727f27ecd544e6535b SHA512 ef9f7c2698180a820566f46d5155b0bf7b31c2c5b7675e17180bb7f28a9ebb10f4fefd7fe983d89b4e40a28f2b905f4a6541644ca3805975339ea7827a364d92 -DIST sysrepo-2.0.53.tar.gz 669484 BLAKE2B f612080b316d6cf86ea70d88834f75b647dc16b29ad824829338d2144784bd7f425d3811055b9b956ef4e6820d467ecbe9a33a3d54a51a4024999b79e62b8255 SHA512 47949514df988a7a8a3b2a506f69baf6ea31bb32d5e80b85af968c827382cadf96e1ab237519308564a59ae67514d6ca3f5e300855259b9baf6ab49252a2eb12 +DIST sysrepo-2.2.150.tar.gz 873758 BLAKE2B 55a9d22fede4f226f24b87829c88b72096ea8a18aa9aa44e168cd3f9817f49080a4757c99d5a179cadf0352c3cbbe09d92006195140a9973d39bc0db6ed103d8 SHA512 b9ee7db9ca32c68576fdb300c3c5605c130b6639d942d5e39bd9ce48039fe90e0e69756e7914071f49c2db3083ba36f1f431f3f9bdaf02e3d040646e051e4cef +DIST sysrepo-2.2.60.tar.gz 782781 BLAKE2B afaef4e0a3d21a636f84d76ee0de55b1365e0e66cb9335ca748752747af99eb58c368eafd7c087a1df050ff4d1c2800601d125915f2debaad8ccc77278d30b84 SHA512 720299b57a0615ba99e01e7d42bc85d5ba5482d82680c47961f6876400009850e8fdf5c0753c39600ef0947a318394eb6108772ac1a575584f26bdc6e2305a57 diff --git a/net-misc/sysrepo/sysrepo-2.0.53.ebuild b/net-misc/sysrepo/sysrepo-2.2.150.ebuild index 622f5a98a45b..0594007d2f3d 100644 --- a/net-misc/sysrepo/sysrepo-2.0.53.ebuild +++ b/net-misc/sysrepo/sysrepo-2.2.150.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,9 +15,9 @@ KEYWORDS="~amd64 ~x86" IUSE="doc test" RESTRICT="!test? ( test )" -RDEPEND=">=net-libs/libyang-2.0.112:=" +RDEPEND=">=net-libs/libyang-2.1.148" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen[dot] )" +BDEPEND="doc? ( app-text/doxygen[dot] )" src_configure() { local mycmakeargs=( diff --git a/net-misc/sysrepo/sysrepo-2.0.47.ebuild b/net-misc/sysrepo/sysrepo-2.2.60.ebuild index 1cfc5beff760..449c9eed931d 100644 --- a/net-misc/sysrepo/sysrepo-2.0.47.ebuild +++ b/net-misc/sysrepo/sysrepo-2.2.60.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,13 +11,13 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~x86" IUSE="doc test" RESTRICT="!test? ( test )" -RDEPEND=">=net-libs/libyang-2.0.97:=" +RDEPEND=">=net-libs/libyang-2.1.55" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen[dot] )" +BDEPEND="doc? ( app-text/doxygen[dot] )" src_configure() { local mycmakeargs=( diff --git a/net-misc/taptap/Manifest b/net-misc/taptap/Manifest index b2457d873818..71a3aea69f6d 100644 --- a/net-misc/taptap/Manifest +++ b/net-misc/taptap/Manifest @@ -1 +1 @@ -DIST taptap-1.0.tar.bz2 1640 BLAKE2B ae2bea178439991057dca6dfd2478f4927e0c762da96f8358eeb029a97cce051c894c4181801daf70681b4a3a1257ab3371a4f9ee039df2157cac226cced846b SHA512 ab9264823c470fd76530258fa3b8993799bd1170269b1e8e143ef072ac5749cc51716cd53ffec285b3a3266e4503be8d0d91094f82c30dd85607ef8cd368f53e +DIST taptap-1.0.c 2665 BLAKE2B 3c857770fd016c1837a3cdf6b8244965cd4128c9d260ab584ffa2e6e7e6deac4e35cb3800aec81f4950e0cd891bc7391be0a5a7b926681595ddde671d571d9bf SHA512 74ec6012cc34f5f4b5e2d16aff3840e842b7a7f297df5277b8ee7305fed900a16d25a853b8e9544b464037f9946ca1588959e5faafeff3afd14813ac419551e1 diff --git a/net-misc/taptap/taptap-1.0-r1.ebuild b/net-misc/taptap/taptap-1.0-r1.ebuild new file mode 100644 index 000000000000..5ea681d0e963 --- /dev/null +++ b/net-misc/taptap/taptap-1.0-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +DESCRIPTION="Program to link two /dev/net/tun to form virtual ethernet" +HOMEPAGE="https://grumpf.hope-2000.org/" +SRC_URI="https://grumpf.hope-2000.org/${PN}.c -> ${P}.c" +S="${WORKDIR}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~sparc ~x86" + +src_unpack() { + cp "${DISTDIR}"/${P}.c ${P}.c || die +} + +src_compile() { + edo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${P}.c +} + +src_install() { + dobin ${PN} +} diff --git a/net-misc/taptap/taptap-1.0.ebuild b/net-misc/taptap/taptap-1.0.ebuild deleted file mode 100644 index f95f52794ab5..000000000000 --- a/net-misc/taptap/taptap-1.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="A program to link two /dev/net/tun to form virtual ethernet" -HOMEPAGE="http://www.munted.org.uk/programming/taptap/" -SRC_URI="http://www.munted.org.uk/programming/${PN}/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" -IUSE="" - -S=${WORKDIR}/${PN} - -src_prepare() { - default - sed -i \ - -e 's:= -Wall -s:+= -Wall:' \ - -e 's:$(CFLAGS):$(LDFLAGS) &:' \ - Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" -} diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r4.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r6.ebuild index 40489f01df10..5e6763a1d14c 100644 --- a/net-misc/taylor-uucp/taylor-uucp-1.07-r4.ebuild +++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -59,7 +59,3 @@ src_install() { dodoc ChangeLog NEWS README TODO } - -pkg_preinst() { - usermod -s /bin/bash uucp || die -} diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest index 59af4b539082..057c602d7868 100644 --- a/net-misc/teamviewer/Manifest +++ b/net-misc/teamviewer/Manifest @@ -1,8 +1,4 @@ -DIST teamviewer_15.21.4_amd64.tar.xz 59986736 BLAKE2B cfc437d5af70ff67358642ef7283a7d6c7be5fc49519f36ce9da962105ad194e3e4c485d993535f4f8979c37c01515ae0221a7f18f397b6ac74f1935ec4834d2 SHA512 49b060326a41951655763480b995dbd4d51d00f71262daae85b025d4fb69548a52601fba9520668f1292cb635a2434f081ec2f2eacceae5e03c88bba9b80b8bf -DIST teamviewer_15.21.4_arm64.tar.xz 60252416 BLAKE2B 54895af7df588a03d136029c39f3107a4a634bc60f2d032d02e87e31ec11730cddc033895ac15ca4b2050500bcca1cfed484561459146b051ccc2c865230bfe6 SHA512 4640362b54e3a25962ccb29ea436d0928f19433ef07a946e515f972ba130932ce6bcf3ed403178f39e70735bf881bae56f56ce38fe8c4547b6a09d7ba859243b -DIST teamviewer_15.21.4_armhf.tar.xz 54634980 BLAKE2B 152a42be4dc340f567034f2425c8a92c600000d1219f8d5ddaf0af78e3a720990d6375ee2724d3e8728958fce890a427d3ac0f36643a1af68f43f253cf43eac4 SHA512 fcb6551c47ed5d14a1b39540d93b50da7bc559a49dae907c406e10a15a29609514488a752ddfeefd10e0f5a00d0ec3a551d811cf421a1d7f46461a2507a385c4 -DIST teamviewer_15.21.4_i386.tar.xz 63280600 BLAKE2B c224b71cdfc01c8327503a6464c46b5e3c06f4886bbd40d93cc65662f6c53dee6bc0319a675117fac1670d98523186805b8bd002fda5cb7503a45a32c733c316 SHA512 933a09a41d42423aa4dbd6879ca9ed64dcc21ca2fb91aa1a9391fee7aee3d6e382635f20dbeeffebf9de3cb36b91f240668d4792a0d60a94ccfbf912289a385c -DIST teamviewer_15.23.9_amd64.tar.xz 63137476 BLAKE2B fcdbb980514f7261b75b23556c538c64ba620c210c1a4ff8ca8300590f92eb4551e67d1669a835fccd5382bc8e5f347876544e994ca92c50585c2113548bb45d SHA512 e504931de01f4cf8ec5a246563584e898a14f11a4714307b321b01c62cfb7e2774398680d532df4e799259bea7e77dbf82e8c368d7ac981f99b87a2745f08304 -DIST teamviewer_15.23.9_arm64.tar.xz 62300228 BLAKE2B 2f27d6cee782d756e8007120e2dc847960b2011fff016c20745bb429d28bf07d3eef6bf4f4ac8411c1133dcd9ed3792e409dc6c3181b6a60afe98364e6fe1b7d SHA512 af3a9d3556918287bffadcaecc4f42b3a8435f60c5238d9091ae917f71c259458c3393cee8c3b3866617fd8bed67835519f9b1efe9d7ff6e4422f0fa6dc58dd4 -DIST teamviewer_15.23.9_armhf.tar.xz 56261744 BLAKE2B 24c1c4eb600d4ec7a8a5d0df002b5b54fdceb3e623bcb89dbbd4161ef5d2cf645ba1ff69f17708b996c1cdba5df50c262c6273f8491182006fd509a7ce636114 SHA512 5a767a53a12f4852395731e549be2d7ce2e674e127472b5c80999eff50b52a2781432cc39af3104e7bf16aa95bb63b14831ab197ea6c2c81d9021531ca8279c9 -DIST teamviewer_15.23.9_i386.tar.xz 62347476 BLAKE2B 2e9e6c27c2da518b21c1be6e281e9bb00b2ff2ab8618511b575853f2f8d3c0c159a5b89388a982a0958e9afd2da04de4036c524d56b741f45639b37ee90d1d60 SHA512 d209b246aaf48d998f69664d35788513a2b5d1ebb213e08639b0f35192859188e4556bc7470a4117d30852e5becc3d87355bf8ac0f78d5214f804a9d9e58da90 +DIST teamviewer_15.48.4_amd64.tar.xz 90151736 BLAKE2B 9a62255790361c7627cd8158f7278f923ded0f19214a45088f8f36118a8700156f7dcb6ab6b3e5aff13997968b2c6ba7140b996e371f9451fda1b75e8382448d SHA512 60819003e38373fdf34a0eec8ee29023d0a787c47fdfa1d3bf663a801f7d71341cd2416d63a94c0751fd6ede96c5bdfefea037863f25862f0b098cf2c8ba4687 +DIST teamviewer_15.48.4_arm64.tar.xz 85987048 BLAKE2B 2c863f312c08ab3f79ad0c420a6f7ef984625e5fe2bdbbe924ca43fd0b96b351e056274f67099773a3b59a7d5c618b894133a14e3f79d104cf723e73f43f946e SHA512 c3d6e98f28fa7a99746fece3067bc3b1d4e0fbbb74d85112f00928b9acc7ab769717974564089d3b00cd3fe86b94ddff4bde2247fb91281492208c960b1e02af +DIST teamviewer_15.48.4_armhf.tar.xz 83553336 BLAKE2B 9524777e4489aac133cde30d4045d3d0ad14bd2848d09bbbf8c797aacfa7aa962dcae7e5fbbcc1d3df913142ba38faafaee8590eee5317a0727f064983ba8438 SHA512 ad1d4aa69d8f3b63295c145e495d0e65e6983dad522b2f5bd46768136a04268475bdfe4ea11c766f36e6c709f6dcd6ddd201ae87067ad4fa7a44b3453a5ff5ba +DIST teamviewer_15.48.4_i386.tar.xz 91591284 BLAKE2B 4353591f9d3cc67105ad26bb33e1640db06be9d0caa4a0e3461e4e9f0f3313577c87640278b3a3c64df6a5687f637017720ef117e19588d00e776979c3ed3299 SHA512 0141eb380b8816d99de753e061056da2b0acf21d93f4ff6d9f8fa615c03257a8f70b5552d18c66fbce3dd5540591a9b9e483504ffc96027fee1a7cc1e202a270 diff --git a/net-misc/teamviewer/teamviewer-15.21.4.ebuild b/net-misc/teamviewer/teamviewer-15.21.4.ebuild deleted file mode 100644 index 156bef4ed7c7..000000000000 --- a/net-misc/teamviewer/teamviewer-15.21.4.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop optfeature systemd xdg - -MY_MAJOR="$(ver_cut 1)" -MY_P="${PN}${MY_MAJOR}" -DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet" -HOMEPAGE="https://www.teamviewer.com" -MY_URI="https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}" -SRC_URI="amd64? ( ${MY_URI}_amd64.tar.xz ) - arm? ( ${MY_URI}_armhf.tar.xz ) - arm64? ( ${MY_URI}_arm64.tar.xz ) - x86? ( ${MY_URI}_i386.tar.xz )" -S="${WORKDIR}"/teamviewer - -LICENSE="TeamViewer MIT" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -RESTRICT="bindist mirror" - -# Unpack will fail without app-arch/xz-utils[extra-filters], bug #798027 -BDEPEND="app-arch/xz-utils[extra-filters]" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - media-libs/fontconfig - media-libs/freetype - media-libs/libglvnd[X] - sys-apps/dbus - sys-apps/util-linux - sys-libs/zlib:0/1[minizip] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libxcb - x11-libs/libxkbcommon[X] - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm -" -# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956 - -QA_PREBUILT="opt/${MY_P}/*" - -src_prepare() { - default - - # Switch operation mode from 'portable' to 'installed' - sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die - - sed -i \ - -e "/^ExecStart/s|${PN}|${MY_P}|" \ - -e "/^PIDFile/s|/var/run/|/run/|" \ - tv_bin/script/teamviewerd.service || die -} - -src_install() { - local dst="/opt/${MY_P}" # install destination - - # Quirk: - # Remove Intel 80386 32-bit ELF binary 'libdepend' present in all - # archives. It will trip the 'emerge @preserved-libs' logic on amd64 - # when changing the ABI of one of its dependencies. According to the - # TeamViewer devs, this binary is an unused remnant of previous Wine- - # based builds and will be removed in future releases anyway - rm tv_bin/script/libdepend || die - - insinto ${dst} - doins -r tv_bin - - # Set permissions for executables and libraries - local exe - for exe in $(find tv_bin -type f -executable -or -name '*.so' || die); do - fperms +x ${dst}/${exe} - done - - newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd - systemd_dounit tv_bin/script/teamviewerd.service - - insinto /usr/share/dbus-1/services - doins tv_bin/script/com.teamviewer.TeamViewer.service - doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service - - insinto /usr/share/polkit-1/actions - doins tv_bin/script/com.teamviewer.TeamViewer.policy - - local size - for size in 16 24 32 48 256; do - newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png teamviewer.png - done - - dodoc -r doc - - # Make docs available in expected location - dosym ../../usr/share/doc/${PF}/doc ${dst}/doc - - # We need to keep docs uncompressed, bug #778617 - docompress -x /usr/share/doc/${PF}/. - - keepdir /etc/${MY_P} - dosym ../../etc/${MY_P} ${dst}/config - - # Create directory and symlink for log files (NOTE: according to Team- - # Viewer devs, all paths are hard-coded in the binaries; therefore - # using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer - # <major-version>') - keepdir /var/log/${MY_P} - dosym ../../var/log/${MY_P} ${dst}/logfiles - - dodir /opt/bin - dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd - dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer - - make_desktop_entry teamviewer "TeamViewer ${MY_MAJOR}" -} - -pkg_postinst() { - xdg_pkg_postinst - - ewarn - ewarn "Please note that the teamviewer gui works only when started from" - ewarn "a session initiated by a display manager." #799137 - optfeature_header "Install one of the following display managers:" - optfeature "an example display manager" x11-misc/cdm gnome-base/gdm gui-apps/gtkgreet x11-misc/lightdm lxde-base/lxdm sys-apps/qingy x11-misc/sddm x11-misc/slim x11-misc/wdm x11-apps/xdm - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - elog "Please note that parallel installation of multiple versions of" - elog "TeamViewer is currently not supported at runtime. Bug #621818" - elog - elog "Before using TeamViewer, you need to start its daemon:" - elog "OpenRC:" - elog "# /etc/init.d/teamviewerd start" - elog "# rc-update add teamviewerd default" - elog - elog "Systemd:" - elog "# systemctl start teamviewerd.service" - elog "# systemctl enable teamviewerd.service" - elog - elog "To display additional command line options simply run:" - elog "$ teamviewer help" - elog - elog "Most likely TeamViewer will work normally only on systems with systemd" - elog "or elogind. See this thread for additional info:" - elog "https://forums.gentoo.org/viewtopic-p-8332956.html#8332956" - fi -} diff --git a/net-misc/teamviewer/teamviewer-15.23.9.ebuild b/net-misc/teamviewer/teamviewer-15.48.4.ebuild index 0d60c13390df..ceef9a916e07 100644 --- a/net-misc/teamviewer/teamviewer-15.23.9.ebuild +++ b/net-misc/teamviewer/teamviewer-15.48.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,8 +18,8 @@ S="${WORKDIR}"/teamviewer LICENSE="TeamViewer MIT" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -RESTRICT="bindist mirror" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +RESTRICT="bindist mirror strip" # Unpack will fail without app-arch/xz-utils[extra-filters], bug #798027 BDEPEND="app-arch/xz-utils[extra-filters]" @@ -33,6 +33,7 @@ RDEPEND=" media-libs/libglvnd[X] sys-apps/dbus sys-apps/util-linux + sys-libs/glibc sys-libs/zlib:0/1[minizip] x11-libs/libICE x11-libs/libSM @@ -48,11 +49,6 @@ RDEPEND=" x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb - x11-libs/libxkbcommon[X] - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm " # For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956 @@ -73,14 +69,6 @@ src_prepare() { src_install() { local dst="/opt/${MY_P}" # install destination - # Quirk: - # Remove Intel 80386 32-bit ELF binary 'libdepend' present in all - # archives. It will trip the 'emerge @preserved-libs' logic on amd64 - # when changing the ABI of one of its dependencies. According to the - # TeamViewer devs, this binary is an unused remnant of previous Wine- - # based builds and will be removed in future releases anyway - rm tv_bin/script/libdepend || die - insinto ${dst} doins -r tv_bin diff --git a/net-misc/telnet-bsd/files/telnet-bsd-1.2-musl.patch b/net-misc/telnet-bsd/files/telnet-bsd-1.2-musl.patch new file mode 100644 index 000000000000..0194015968a7 --- /dev/null +++ b/net-misc/telnet-bsd/files/telnet-bsd-1.2-musl.patch @@ -0,0 +1,42 @@ +diff --git a/telnet/misc-proto.h b/telnet/misc-proto.h +index 5845751..777a700 100644 +--- a/telnet/misc-proto.h ++++ b/telnet/misc-proto.h +@@ -63,7 +63,7 @@ + #ifndef __MISC_PROTO__ + #define __MISC_PROTO__ + +-#include <sys/cdefs.h> ++#define __P(protos) protos /* full-blown ANSI C */ + + void auth_encrypt_init __P((char *, char *, char *, int)); + void auth_encrypt_user __P((char *)); +diff --git a/telnet/ring.h b/telnet/ring.h +index 9ef8fb8..65762b2 100644 +--- a/telnet/ring.h ++++ b/telnet/ring.h +@@ -28,8 +28,8 @@ + * + */ + +-#include <sys/cdefs.h> + #include <sys/types.h> ++#define __P(protos) protos /* full-blown ANSI C */ + #define P __P + + /* +diff --git a/telnetd/sys_term.c b/telnetd/sys_term.c +index 31897d8..3c43f8f 100644 +--- a/telnetd/sys_term.c ++++ b/telnetd/sys_term.c +@@ -838,8 +838,10 @@ cleanup (int sig) + * receive another signal while we're in that function. */ + sigfillset(&sigset); + sigprocmask(SIG_SETMASK, &sigset, &sigset); ++#if defined(logwtmp) + if (logout (p)) + logwtmp (p, "", ""); ++#endif + sigprocmask(SIG_SETMASK, &sigset, NULL); + #ifdef PARANOID_TTYS + /* diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r2.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild index f7e8097c0bcc..8ba189abbfd1 100644 --- a/net-misc/telnet-bsd/telnet-bsd-1.2-r2.ebuild +++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,15 +11,17 @@ SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="nls xinetd" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +IUSE="nls selinux xinetd" -RDEPEND=" +DEPEND=" sys-libs/ncurses:= !net-misc/netkit-telnetd " -RDEPEND="${DEPEND} - xinetd? ( sys-apps/xinetd ) +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-telnet ) + xinetd? ( sys-apps/xinetd ) !net-misc/netkit-telnetd " BDEPEND="virtual/pkgconfig" @@ -27,6 +29,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-fbsd.patch "${FILESDIR}"/${PN}-1.2-format-security.patch + "${FILESDIR}"/${P}-musl.patch ) src_prepare() { @@ -34,15 +37,6 @@ src_prepare() { eautoreconf } -src_configure() { - # FreeBSD doesn't seem to support PIE neither does hppa - if use kernel_FreeBSD; then - export libc_cv_fpie="no" - fi - - econf -} - src_compile() { emake LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)" } diff --git a/net-misc/tiers/tiers-1.1.ebuild b/net-misc/tiers/tiers-1.1.ebuild index 5d489c5a5959..841db16c476f 100644 --- a/net-misc/tiers/tiers-1.1.ebuild +++ b/net-misc/tiers/tiers-1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc x86" IUSE="" RDEPEND="sci-visualization/gnuplot - virtual/awk" + app-alternatives/awk" S=${WORKDIR}/${MY_P} diff --git a/net-misc/tigervnc-xorg-module/metadata.xml b/net-misc/tigervnc-xorg-module/metadata.xml new file mode 100644 index 000000000000..814c80fe2416 --- /dev/null +++ b/net-misc/tigervnc-xorg-module/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>ceamac@gentoo.org</email> + <name>Viorel Munteanu</name> + </maintainer> + <upstream> + <remote-id type="github">TigerVNC/tigervnc</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild new file mode 100644 index 000000000000..48f881ebf961 --- /dev/null +++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild @@ -0,0 +1,18 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XSERVER_VERSION="21.1.1" + +DESCRIPTION="Metapackage for the xorg module provided by tigervnc" +HOMEPAGE="https://tigervnc.org/" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" + +RDEPEND=" + ~net-misc/tigervnc-${PV}[server] + =x11-base/xorg-server-${XSERVER_VERSION%.*}* +" diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 7c7e79a01771..a892cc0077f4 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,3 +1,2 @@ -DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac SHA512 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025 -DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d -DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde +DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5 +DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937 diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch new file mode 100644 index 000000000000..bfcf6ceaef16 --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch @@ -0,0 +1,28 @@ +Add more possible paths for Xsession, depending on which display manager is +installed. We need an Xsession that executes its command line parameters, so +leave xinit last. + +See also https://bugs.gentoo.org/746227 + +--- a/unix/vncserver/vncserver.in ++++ b/unix/vncserver/vncserver.in +@@ -437,11 +437,14 @@ + die "$prog: couldn't find \"$cmd\" on your PATH.\n"; + } + +- foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession") { +- if (-x "$cmd") { +- $Xsession = $cmd; +- last; +- } ++ $Xsession=$ENV{TIGERVNC_XSESSION_FILE}; ++ if (not defined $Xsession) { ++ foreach $cmd ("/usr/share/sddm/scripts/Xsession", "/etc/gdm/Xsession", "/etc/lightdm/Xsession", "/usr/share/slim/Xsession", "/etc/X11/Sessions/Xsession", "/etc/X11/xinit/Xsession", "/etc/X11/Xsession") { ++ if (-x "$cmd") { ++ $Xsession = $cmd; ++ last; ++ } ++ } + } + if (not defined $Xsession) { + die "$prog: Couldn't find suitable Xsession.\n"; diff --git a/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch b/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch new file mode 100644 index 000000000000..e61f099d397a --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch @@ -0,0 +1,57 @@ +See https://bugs.gentoo.org/852830 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -234,6 +234,7 @@ + add_subdirectory(java) + endif() + ++option(BUILD_SERVER "Build TigerVNC server" ON) + option(BUILD_VIEWER "Build TigerVNC viewer" ON) + if(BUILD_VIEWER) + # Check for FLTK +@@ -276,7 +277,7 @@ + endif() + + # Check for PAM library +-if(UNIX AND NOT APPLE) ++if(BUILD_SERVER AND UNIX AND NOT APPLE) + check_include_files(security/pam_appl.h HAVE_PAM_H) + set(CMAKE_REQUIRED_LIBRARIES -lpam) + check_function_exists(pam_start HAVE_PAM_START) +@@ -315,9 +316,6 @@ + add_subdirectory(media) + endif() + +-add_subdirectory(tests) +- +- + if(BUILD_VIEWER) + add_subdirectory(release) + endif() +--- a/common/rfb/CMakeLists.txt ++++ b/common/rfb/CMakeLists.txt +@@ -88,7 +88,7 @@ + target_sources(rfb PRIVATE WinPasswdValidator.cxx) + endif(WIN32) + +-if(UNIX AND NOT APPLE) ++if(BUILD_SERVER AND UNIX AND NOT APPLE) + target_sources(rfb PRIVATE UnixPasswordValidator.cxx pam.c) + target_link_libraries(rfb ${PAM_LIBS}) + endif() +--- a/unix/CMakeLists.txt ++++ b/unix/CMakeLists.txt +@@ -1,6 +1,8 @@ + add_subdirectory(tx) + add_subdirectory(common) +-add_subdirectory(vncconfig) +-add_subdirectory(vncpasswd) +-add_subdirectory(vncserver) +-add_subdirectory(x0vncserver) ++if(BUILD_SERVER) ++ add_subdirectory(vncconfig) ++ add_subdirectory(vncpasswd) ++ add_subdirectory(vncserver) ++ add_subdirectory(x0vncserver) ++endif() diff --git a/net-misc/tigervnc/files/tigervnc-1.13.1.confd b/net-misc/tigervnc/files/tigervnc-1.13.1.confd new file mode 100644 index 000000000000..bb6dae7df032 --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.13.1.confd @@ -0,0 +1,13 @@ +# Config file for /etc/init.d/tigervnc + +# Add the user(s) Xvnc(1) should be run for to /etc/tigervnc/vncserver.users +# DISPLAYS is no loger used. + +# Optionally override the default Xsession file +# TIGERVNC_XSESSION_FILE="/usr/share/sddm/scripts/Xsession" +# TIGERVNC_XSESSION_FILE="/etc/gdm/Xsession" +# TIGERVNC_XSESSION_FILE="/etc/lightdm/Xsession" +# TIGERVNC_XSESSION_FILE="/usr/share/slim/Xsession" + +# vncsession no longer supports VNC_OPTS +# Use /etc/tigervnc/vncserver-config-defaults or $HOME/.vnc/config instead diff --git a/net-misc/tigervnc/files/tigervnc-1.13.1.initd b/net-misc/tigervnc/files/tigervnc-1.13.1.initd new file mode 100644 index 000000000000..f7e72fa84c07 --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.13.1.initd @@ -0,0 +1,88 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License, v2 or later + +# shellcheck shell=sh + +# Create symlinks for all displays. +# For example for display :1, run `ln -s tigervnc /etc/init.d/tigervnc.1` +# Then `rc-update add tigervnc.1 default` +# For compatibility, /etc/init.d/tigervnc will start all displays. + +DISPLAYS=${SVCNAME#*.} +if [ "$DISPLAYS" = "tigervnc" ]; then + should_warn=1 + DISPLAYS=$(grep -v "^#" /etc/tigervnc/vncserver.users | sed -e 's/=.*//' -e 's/^://') +fi + +depend() { + need net +} + +checkconfig() { + if [ -n "${DISPLAYS}" ]; then + if [ "$1" = "start" ]; then + for display in $DISPLAYS; do + user="$(grep "^:${display}" /etc/tigervnc/vncserver.users)" + user=${user#*=} + # bug #690046 + if [ -z "${user}" ]; then + eerror "User is not defined for display :${display} in /etc/tigervnc/vncserver.users" + return 1 + elif ! runuser -l "${user}" -c "[ -f ~/.vnc/passwd ]"; then + eerror "There are no passwords defined for user ${user}." + return 1 + elif [ -e "/tmp/.X11-unix/X${display}" ]; then + eerror "Display :${display} appears to be already in use because of /tmp/.X11-unix/X${display}" + eerror "Remove this file if there is no X server for :${display}" + return 1 + elif [ -e "/tmp/.X${display}-lock" ]; then + eerror "Display :${display} appears to be already in use because of /tmp/.X${display}-lock" + eerror "Remove this file if there is no X server for :${display}" + return 1 + fi + FREEDISPLAYS="${FREEDISPLAYS} ${display}" + done + fi + return 0 + else + eerror 'There are no displays configured in /etc/tigervnc/vncserver.users' + return 1 + fi +} + +checkwarn() { + if [ "${should_warn}" = "1" ]; then + ewarn 'Running /etc/init.d/tigervnc in compatibility mode' + ewarn 'Please migrate to one service per display as detailed here:' + ewarn 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:' + fi +} + +start() { + checkwarn + FREEDISPLAYS="" + checkconfig start || return 1 + for display in $FREEDISPLAYS; do + [ -n "${TIGERVNC_XSESSION_FILE}" ] && export TIGERVNC_XSESSION_FILE + ebegin "Starting TigerVNC server :${display}" + start-stop-daemon --start --pidfile=/run/vncsession-":${display}".pid /usr/libexec/vncsession-start -- ":${display}" + eend $? + done +} + +stop() { + checkconfig stop || return 2 + for display in $DISPLAYS; do + ebegin "Stopping TigerVNC server :${display}" + start-stop-daemon --stop --pidfile=/run/vncsession-":${display}".pid + eend $? + done + # Do not fail if a server is missing + /bin/true +} + +restart() { + svc_stop + svc_start +} diff --git a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch b/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch deleted file mode 100644 index 8a30f18d7d92..000000000000 --- a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/unix/vncserver b/unix/vncserver -index 9e7a6ac5..139f9601 100755 ---- a/unix/vncserver -+++ b/unix/vncserver -@@ -684,6 +684,7 @@ sub Usage - " [-geometry <width>x<height>]\n". - " [-pixelformat rgbNNN|bgrNNN]\n". - " [-fp <font-path>]\n". -+ " [-cc <visual>]\n". - " [-fg]\n". - " [-autokill]\n". - " [-noxstartup]\n". -diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx -index f076565f..05669a42 100644 ---- a/vncviewer/vncviewer.cxx -+++ b/vncviewer/vncviewer.cxx -@@ -352,6 +352,11 @@ static void usage(const char *programName) - " %s [parameters] -listen [port] [parameters]\n" - " %s [parameters] [.tigervnc file]\n", - programName, programName, programName); -+ fprintf(stderr,"\n" -+ "Options:\n\n" -+ " -display Xdisplay - Specifies the X display for the viewer window\n" -+ " -geometry geometry - Standard X position and sizing specification.\n"); -+ - fprintf(stderr,"\n" - "Parameters can be turned on with -<param> or off with -<param>=0\n" - "Parameters which take a value can be specified as " -diff --git a/vncviewer/vncviewer.man b/vncviewer/vncviewer.man -index 729c01d6..07dc58f1 100644 ---- a/vncviewer/vncviewer.man -+++ b/vncviewer/vncviewer.man -@@ -240,6 +240,10 @@ This option specifies the preferred encoding to use from one of "Tight", "ZRLE", - Disable lossy JPEG compression in Tight encoding. Default is off. - . - .TP -+.B \-ImprovedHextile -+Try harder to compress data (default). -+. -+.TP - .B \-QualityLevel \fIlevel\fP - JPEG quality level. 0 = Low, 9 = High. May be adjusted automatically if - \fB-AutoSelect\fP is turned on. Default is 8. -@@ -296,6 +300,11 @@ respectively. - .B \-AlertOnFatalError - Display a dialog with any fatal error before exiting. Default is on. - -+. -+.TP -+.B \-ZlibLevel -+Zlib compression level. -+ - .SH FILES - .TP - $HOME/.vnc/default.tigervnc diff --git a/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch b/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch deleted file mode 100644 index 8b50d8ccf159..000000000000 --- a/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/unix/vncserver b/unix/vncserver -index 9e7a6ac5..fff53bdb 100755 ---- a/unix/vncserver -+++ b/unix/vncserver -@@ -63,27 +63,7 @@ $defaultXStartup - = ("#!/bin/sh\n\n". - "unset SESSION_MANAGER\n". - "unset DBUS_SESSION_BUS_ADDRESS\n". -- "OS=`uname -s`\n". -- "if [ \$OS = 'Linux' ]; then\n". -- " case \"\$WINDOWMANAGER\" in\n". -- " \*gnome\*)\n". -- " if [ -e /etc/SuSE-release ]; then\n". -- " PATH=\$PATH:/opt/gnome/bin\n". -- " export PATH\n". -- " fi\n". -- " ;;\n". -- " esac\n". -- "fi\n". -- "if [ -x /etc/X11/xinit/xinitrc ]; then\n". -- " exec /etc/X11/xinit/xinitrc\n". -- "fi\n". -- "if [ -f /etc/X11/xinit/xinitrc ]; then\n". -- " exec sh /etc/X11/xinit/xinitrc\n". -- "fi\n". -- "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n". -- "xsetroot -solid grey\n". -- "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n". -- "twm &\n"); -+ "exec /etc/X11/xinit/xinitrc\n"); - - $defaultConfig - = ("## Supported server options to pass to vncserver upon invocation can be listed\n". diff --git a/net-misc/tigervnc/files/tigervnc.confd b/net-misc/tigervnc/files/tigervnc.confd deleted file mode 100644 index e651dbbe7889..000000000000 --- a/net-misc/tigervnc/files/tigervnc.confd +++ /dev/null @@ -1,9 +0,0 @@ -# Config file for /etc/init.d/tigervnc - -# Specify the user(s) Xvnc(1) should be run for. The syntax is: "username:display". -# example: "DISPLAYS="foo:1 bar:2" You can specify more users separated by space. -# DISPLAYS="myuser:1" - -# Specify any of vncserver(1) and Xvnc(1) options. See the respective man pages for more information. -# VNC_OPTS="" - diff --git a/net-misc/tigervnc/files/tigervnc.initd b/net-misc/tigervnc/files/tigervnc.initd deleted file mode 100644 index 06a154257e6f..000000000000 --- a/net-misc/tigervnc/files/tigervnc.initd +++ /dev/null @@ -1,72 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -depend() { - need net -} - -checkconfig() { - if [ -n "${DISPLAYS}" ]; then - if [ $1 = "start" ]; then - local user - for user in $DISPLAYS; do - if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; then - eerror "There are no passwords defined for user ${user%%:*}." - return 1 - elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then - eerror "Display :${user##*:} appears to be already in use because of /tmp/.X11-unix/X${user##*:}" - eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}" - return 1 - elif [ -e "/tmp/.X${user##*:}-lock" ]; then - eerror "Display :${user##*:} appears to be already in use because of /tmp/.X${user##*:}-lock" - eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}" - return 1 - fi - done - fi - return 0 - else - eerror 'Please define $DISPLAYS in /etc/conf.d/tigervnc' - return 1 - fi -} - -start() { - checkconfig start || return 1 - ebegin "Starting TigerVNC server" - for user in $DISPLAYS; do - usrname=${user%%:*} - usropts=VNC_OPTS_${usrname} - usrdisp=${user##*:} - usrvar=$usropts"["$usrdisp"]" - [ -z ${!usrvar} ] && vnc_opts=$VNC_OPTS || vnc_opts=${!usrvar} - - # A user may have an invalid shell, so we default to /bin/sh if its the case - if [ -x /usr/bin/getent ] ; then - usrshell=`getent passwd ${user%%:*} | cut -d: -f 7` - case "$usrshell" in - */bash|*/ksh|*/sh|*/csh|*/tcsh) ;; - *) shell="-s /bin/sh" ;; - esac - echo $usrshell $shell - fi - - su ${shell} ${user%%:*} -c "source /etc/profile && cd ~${user%%:*} && vncserver :${user##*:} $vnc_opts" &>/dev/null - done - eend $? -} - -stop() { - checkconfig stop || return 2 - ebegin "Stopping TigerVNC server" - for user in $DISPLAYS; do - su -s /bin/sh ${user%%:*} -c "vncserver -kill :${user##*:}" &>/dev/null - done - eend $? -} - -restart() { - svc_stop - svc_start -} diff --git a/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch b/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch deleted file mode 100644 index 4028ebb74518..000000000000 --- a/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -urpN xorg-server-1.20.0.orig/dri3/dri3.c xorg-server-1.20.0/dri3/dri3.c ---- xorg-server-1.20.0.orig/dri3/dri3.c 2018-05-10 09:32:34.000000000 -0700 -+++ xorg-server-1.20.0/dri3/dri3.c 2018-06-13 19:32:52.131915519 -0700 -@@ -26,7 +26,7 @@ - - #include "dri3_priv.h" - --#include <drm_fourcc.h> -+#include <libdrm/drm_fourcc.h> - - static int dri3_request; - DevPrivateKeyRec dri3_screen_private_key; -diff -urpN xorg-server-1.20.0.orig/dri3/dri3_request.c xorg-server-1.20.0/dri3/dri3_request.c ---- xorg-server-1.20.0.orig/dri3/dri3_request.c 2018-05-10 09:32:34.000000000 -0700 -+++ xorg-server-1.20.0/dri3/dri3_request.c 2018-06-13 19:33:46.164444267 -0700 -@@ -30,7 +30,7 @@ - #include <xace.h> - #include "../Xext/syncsdk.h" - #include <protocol-versions.h> --#include <drm_fourcc.h> -+#include <libdrm/drm_fourcc.h> - - static Bool - dri3_screen_can_one_point_two(ScreenPtr screen) -diff -urpN xorg-server-1.20.0.orig/dri3/dri3_screen.c xorg-server-1.20.0/dri3/dri3_screen.c ---- xorg-server-1.20.0.orig/dri3/dri3_screen.c 2018-05-10 09:32:34.000000000 -0700 -+++ xorg-server-1.20.0/dri3/dri3_screen.c 2018-06-13 19:33:13.885725528 -0700 -@@ -29,7 +29,7 @@ - #include <misync.h> - #include <misyncshm.h> - #include <randrstr.h> --#include <drm_fourcc.h> -+#include <libdrm/drm_fourcc.h> - #include <unistd.h> - - int diff --git a/net-misc/tigervnc/files/xserver120.patch b/net-misc/tigervnc/files/xserver120.patch deleted file mode 100644 index e823a651ae03..000000000000 --- a/net-misc/tigervnc/files/xserver120.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -urpN xorg-server-1.20.0.orig/configure.ac xorg-server-1.20.0/configure.ac ---- xorg-server-1.20.0.orig/configure.ac 2018-05-10 09:32:34.000000000 -0700 -+++ xorg-server-1.20.0/configure.ac 2018-06-13 19:04:47.536413626 -0700 -@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x - AC_CONFIG_HEADERS(include/version-config.h) - - AM_PROG_AS -+AC_PROG_CXX - AC_PROG_LN_S - LT_PREREQ([2.2]) - LT_INIT([disable-static win32-dll]) -@@ -1777,6 +1778,10 @@ if test "x$XVFB" = xyes; then - AC_SUBST([XVFB_SYS_LIBS]) - fi - -+dnl Xvnc DDX -+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) -+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) -+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) - - dnl Xnest DDX - -@@ -1812,6 +1817,8 @@ if test "x$XORG" = xauto; then - fi - AC_MSG_RESULT([$XORG]) - -+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) -+ - if test "x$XORG" = xyes; then - XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' - XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' -@@ -2029,7 +2036,6 @@ if test "x$XORG" = xyes; then - AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) - AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) - AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) -- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) - AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) - AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) - AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) -@@ -2565,6 +2571,7 @@ hw/dmx/Makefile - hw/dmx/man/Makefile - hw/vfb/Makefile - hw/vfb/man/Makefile -+hw/vnc/Makefile - hw/xnest/Makefile - hw/xnest/man/Makefile - hw/xwin/Makefile -diff -urpN xorg-server-1.20.0.orig/hw/Makefile.am xorg-server-1.20.0/hw/Makefile.am ---- xorg-server-1.20.0.orig/hw/Makefile.am 2018-05-10 09:32:34.000000000 -0700 -+++ xorg-server-1.20.0/hw/Makefile.am 2018-06-13 19:04:47.536413626 -0700 -@@ -38,7 +38,8 @@ SUBDIRS = \ - $(DMX_SUBDIRS) \ - $(KDRIVE_SUBDIRS) \ - $(XQUARTZ_SUBDIRS) \ -- $(XWAYLAND_SUBDIRS) -+ $(XWAYLAND_SUBDIRS) \ -+ vnc - - DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland - -diff -urpN xorg-server-1.20.0.orig/include/os.h xorg-server-1.20.0/include/os.h ---- xorg-server-1.20.0.orig/include/os.h 2018-05-10 09:32:36.000000000 -0700 -+++ xorg-server-1.20.0/include/os.h 2018-06-13 19:04:47.537413618 -0700 -@@ -633,7 +633,7 @@ LogSetDisplay(void); - extern _X_EXPORT void - LogClose(enum ExitCode error); - extern _X_EXPORT Bool --LogSetParameter(LogParameter param, int value); -+LogSetParameter(enum _LogParameter param, int value); - extern _X_EXPORT void - LogVWrite(int verb, const char *f, va_list args) - _X_ATTRIBUTE_PRINTF(2, 0); -diff -urpN xorg-server-1.20.0.orig/mi/miinitext.c xorg-server-1.20.0/mi/miinitext.c ---- xorg-server-1.20.0.orig/mi/miinitext.c 2018-05-10 09:32:37.000000000 -0700 -+++ xorg-server-1.20.0/mi/miinitext.c 2018-06-13 19:05:14.742200675 -0700 -@@ -107,8 +107,15 @@ SOFTWARE. - #include "os.h" - #include "globals.h" - -+#ifdef TIGERVNC -+extern void vncExtensionInit(INITARGS); -+#endif -+ - /* List of built-in (statically linked) extensions */ - static const ExtensionModule staticExtensions[] = { -+#ifdef TIGERVNC -+ {vncExtensionInit, "VNC-EXTENSION", NULL}, -+#endif - {GEExtensionInit, "Generic Event Extension", &noGEExtension}, - {ShapeExtensionInit, "SHAPE", NULL}, - #ifdef MITSHM diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml index 18e35d3fa75e..7c4c48e857d6 100644 --- a/net-misc/tigervnc/metadata.xml +++ b/net-misc/tigervnc/metadata.xml @@ -1,12 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>ceamac@gentoo.org</email> + <name>Viorel Munteanu</name> + </maintainer> <use> + <flag name="dri3">Build with DRI3 support</flag> <flag name="drm">Build with DRM support</flag> + <flag name="java">Build TigerVNC Java viewer</flag> <flag name="server">Build TigerVNC server</flag> - <flag name="xorgmodule">Build the Xorg module</flag> - <flag name="dri3">Build with DRI3 support</flag> + <flag name="viewer">Build TigerVNC viewer</flag> </use> <upstream> <remote-id type="github">TigerVNC/tigervnc</remote-id> diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild deleted file mode 100644 index 34e7e078e373..000000000000 --- a/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -CMAKE_IN_SOURCE_BUILD=1 - -inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg - -XSERVER_VERSION="1.20.0" - -DESCRIPTION="Remote desktop viewer display system" -HOMEPAGE="http://www.tigervnc.org" -SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz - server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule" - -CDEPEND=" - virtual/jpeg:0 - sys-libs/zlib:= - >=x11-libs/fltk-1.3.1 - gnutls? ( net-libs/gnutls:= ) - nls? ( virtual/libiconv ) - pam? ( sys-libs/pam ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - x11-libs/pixman - server? ( - x11-libs/libXau - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXfont2 - x11-libs/libXtst - >=x11-libs/pixman-0.27.2 - >=x11-apps/xauth-1.0.3 - x11-apps/xsetroot - >=x11-misc/xkeyboard-config-2.4.1-r3 - xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) - drm? ( x11-libs/libdrm ) - dev-libs/openssl:0= - ) - xinerama? ( x11-libs/libXinerama ) - " - -RDEPEND="${CDEPEND} - !net-misc/tightvnc - !net-misc/vnc - !net-misc/xf4vnc - java? ( virtual/jre:1.8 )" - -DEPEND="${CDEPEND} - nls? ( sys-devel/gettext ) - java? ( virtual/jdk:1.8 ) - x11-base/xorg-proto - media-libs/fontconfig - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - server? ( - dev-libs/libbsd - x11-libs/libxkbfile - x11-libs/libxshmfence - virtual/pkgconfig - media-fonts/font-util - x11-misc/util-macros - >=x11-libs/xtrans-1.3.3 - opengl? ( >=media-libs/mesa-10.3.4-r1 ) - )" - -PATCHES=( - # Restore Java viewer - "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch -) - -src_prepare() { - if use server; then - cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die - fi - - cmake_src_prepare - - if use server; then - cd unix/xserver || die - eapply "${FILESDIR}"/xserver120.patch - eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch - sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die - eautoreconf - fi -} - -src_configure() { - if use arm || use hppa; then - append-flags "-fPIC" - fi - - local mycmakeargs=( - -DENABLE_GNUTLS=$(usex gnutls) - -DENABLE_NLS=$(usex nls) - -DENABLE_PAM=$(usex pam) - -DBUILD_JAVA=$(usex java) - ) - - cmake_src_configure - - if use server; then - cd unix/xserver || die - econf \ - $(use_enable opengl glx) \ - $(use_enable drm libdrm) \ - --disable-config-hal \ - --disable-config-udev \ - --disable-devel-docs \ - --disable-dmx \ - --disable-dri \ - $(use_enable dri3) \ - --disable-glamor \ - --disable-kdrive \ - --disable-libunwind \ - --disable-linux-acpi \ - --disable-record \ - --disable-selective-werror \ - --disable-static \ - --disable-unit-tests \ - --disable-xephyr \ - $(use_enable xinerama) \ - --disable-xnest \ - --disable-xorg \ - --disable-xvfb \ - --disable-xwin \ - --disable-xwayland \ - --enable-dri2 \ - --with-pic \ - --without-dtrace \ - --disable-present \ - --with-sha1=libcrypto - fi -} - -src_compile() { - cmake_src_compile - - if use server; then - # deps of the vnc module and the module itself - local d subdirs=( - fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render - damageext miext Xi xkb composite dix mi os hw/vnc - ) - for d in "${subdirs[@]}"; do - emake -C unix/xserver/"${d}" - done - fi -} - -src_install() { - cmake_src_install - - if use server; then - emake -C unix/xserver/hw/vnc DESTDIR="${D}" install - if ! use xorgmodule; then - rm -rv "${ED}"/usr/$(get_libdir)/xorg || die - else - rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die - fi - - newconfd "${FILESDIR}"/${PN}.confd ${PN} - newinitd "${FILESDIR}"/${PN}.initd ${PN} - - systemd_douserunit unix/vncserver/vncserver@.service - else - local f - for f in x0vncserver vncconfig; do - rm "${ED}"/usr/bin/${f} || die - rm "${ED}"/usr/share/man/man1/${f}.1 || die - done - rm -r "${ED}"/usr/{sbin,libexec} || die - rm -r "${ED}"/usr/share/man/man8 || die - fi -} diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild b/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild new file mode 100644 index 000000000000..62d96695236a --- /dev/null +++ b/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_IN_SOURCE_BUILD=1 +inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg + +XSERVER_VERSION="21.1.8" +XSERVER_PATCH_VERSION="21.1.1" + +DESCRIPTION="Remote desktop viewer display system" +HOMEPAGE="https://tigervnc.org" +SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/" +else + SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama" +REQUIRED_USE=" + dri3? ( drm ) + java? ( viewer ) + opengl? ( server ) + || ( server viewer ) +" + +# TODO: sys-libs/libselinux +COMMON_DEPEND=" + dev-libs/gmp:= + dev-libs/nettle:= + media-libs/libjpeg-turbo:= + sys-libs/zlib:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + x11-libs/pixman + gnutls? ( net-libs/gnutls:= ) + nls? ( virtual/libiconv ) + server? ( + dev-libs/libbsd + dev-libs/openssl:0= + sys-libs/pam + x11-libs/libXau + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXfixes + x11-libs/libXfont2 + x11-libs/libXtst + x11-libs/pixman + x11-apps/xauth + x11-apps/xinit + x11-apps/xkbcomp + x11-apps/xsetroot + x11-misc/xkeyboard-config + opengl? ( media-libs/libglvnd[X] ) + !net-misc/turbovnc[server] + ) + viewer? ( + media-video/ffmpeg:= + x11-libs/fltk:1 + x11-libs/libXi + x11-libs/libXrender + !net-misc/turbovnc[viewer] + ) +" +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.8:* ) + server? ( dev-lang/perl ) +" +DEPEND="${COMMON_DEPEND} + java? ( >=virtual/jdk-1.8:* ) + drm? ( x11-libs/libdrm ) + server? ( + media-fonts/font-util + x11-base/xorg-proto + x11-libs/libxcvt + x11-libs/libXi + x11-libs/libxkbfile + x11-libs/libXrender + x11-libs/xtrans + x11-misc/util-macros + opengl? ( media-libs/mesa ) + ) +" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( + # Restore Java viewer + "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch + "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch + "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch +) + +src_unpack() { + if [[ ${PV} == *9999 ]]; then + git-r3_src_unpack + use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz + else + default + fi +} + +src_prepare() { + if use server; then + cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die + fi + + cmake_src_prepare + + if use server; then + cd unix/xserver || die + eapply ../xserver${XSERVER_PATCH_VERSION}.patch + eautoreconf + sed -i 's:\(present.h\):../present/\1:' os/utils.c || die + sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die + + if use drm; then + cd "${WORKDIR}" && \ + sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die + fi + fi +} + +src_configure() { + if use arm || use hppa; then + append-flags "-fPIC" + fi + + local mycmakeargs=( + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_NLS=$(usex nls) + -DBUILD_JAVA=$(usex java) + -DBUILD_SERVER=$(usex server) + -DBUILD_VIEWER=$(usex viewer) + ) + + cmake_src_configure + + if use server; then + cd unix/xserver || die + econf \ + $(use_enable opengl glx) \ + $(use_enable drm libdrm) \ + --disable-config-hal \ + --disable-config-udev \ + --disable-devel-docs \ + --disable-dri \ + $(use_enable dri3) \ + --disable-glamor \ + --disable-kdrive \ + --disable-libunwind \ + --disable-linux-acpi \ + --disable-record \ + --disable-selective-werror \ + --disable-static \ + --disable-unit-tests \ + --disable-xephyr \ + $(use_enable xinerama) \ + --disable-xnest \ + --disable-xorg \ + --disable-xvfb \ + --disable-xwin \ + --enable-dri2 \ + --with-pic \ + --without-dtrace \ + --disable-present \ + --with-sha1=libcrypto + fi +} + +src_compile() { + cmake_src_compile + + if use server; then + # deps of the vnc module and the module itself + local d subdirs=( + fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render + damageext miext Xi xkb composite dix mi os hw/vnc + ) + for d in "${subdirs[@]}"; do + emake -C unix/xserver/"${d}" + done + fi +} + +src_install() { + cmake_src_install + + if use server; then + emake -C unix/xserver/hw/vnc DESTDIR="${D}" install + rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die + + newconfd "${FILESDIR}"/${PN}-1.13.1.confd ${PN} + newinitd "${FILESDIR}"/${PN}-1.13.1.initd ${PN} + + systemd_douserunit unix/vncserver/vncserver@.service + + # comment out pam_selinux.so, the server does not start if missing + # part of bug #746227 + sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die + + # install vncserver to /usr/bin too, see bug #836620 + dosym -r /usr/libexec/vncserver /usr/bin/vncserver + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + use server && { + elog 'OpenRC users: please migrate to one service per display as documented here:' + elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:' + } + + local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim" + use server && \ + optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \ + optfeature_header "Install any additional display manager package:" && \ + optfeature "proper session support" ${OPTIONAL_DM} +} diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild deleted file mode 100644 index 2b4a80d051da..000000000000 --- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_IN_SOURCE_BUILD=1 - -inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg - -XSERVER_VERSION="1.20.0" - -DESCRIPTION="Remote desktop viewer display system" -HOMEPAGE="http://www.tigervnc.org" -SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz - server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule" - -CDEPEND=" - virtual/jpeg:0 - sys-libs/zlib:= - >=x11-libs/fltk-1.3.1 - gnutls? ( net-libs/gnutls:= ) - nls? ( virtual/libiconv ) - pam? ( sys-libs/pam ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - server? ( - x11-libs/libXau - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXfont2 - x11-libs/libXtst - >=x11-libs/pixman-0.27.2 - >=x11-apps/xauth-1.0.3 - x11-apps/xsetroot - >=x11-misc/xkeyboard-config-2.4.1-r3 - xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) - drm? ( x11-libs/libdrm ) - dev-libs/openssl:0= - ) - xinerama? ( x11-libs/libXinerama ) - " - -RDEPEND="${CDEPEND} - !net-misc/tightvnc - !net-misc/vnc - !net-misc/xf4vnc - java? ( virtual/jre:1.8 )" - -DEPEND="${CDEPEND} - nls? ( sys-devel/gettext ) - java? ( virtual/jdk:1.8 ) - x11-base/xorg-proto - media-libs/fontconfig - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - server? ( - dev-libs/libbsd - x11-libs/libxkbfile - x11-libs/libxshmfence - virtual/pkgconfig - media-fonts/font-util - x11-misc/util-macros - >=x11-libs/xtrans-1.3.3 - opengl? ( >=media-libs/mesa-10.3.4-r1 ) - )" - -PATCHES=( - "${FILESDIR}"/${P}-030_manpages.patch - "${FILESDIR}"/${P}-055_xstartup.patch -) - -src_prepare() { - if use server ; then - cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die - fi - - # do not rely on the build system to install docs - sed -i 's:^\(install(.* DESTINATION ${DOC_DIR})\):#\1:' \ - cmake/BuildPackages.cmake || die - - cmake_src_prepare - - if use server ; then - cd unix/xserver || die - eapply "${FILESDIR}"/xserver120.patch - eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch - sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die - eautoreconf - fi -} - -src_configure() { - if use arm || use hppa ; then - append-flags "-fPIC" - fi - - local mycmakeargs=( - -DENABLE_GNUTLS=$(usex gnutls) - -DENABLE_NLS=$(usex nls) - -DENABLE_PAM=$(usex pam) - -DBUILD_JAVA=$(usex java) - ) - - cmake_src_configure - - if use server ; then - cd unix/xserver || die - econf \ - $(use_enable opengl glx) \ - $(use_enable drm libdrm) \ - --disable-config-hal \ - --disable-config-udev \ - --disable-devel-docs \ - --disable-dmx \ - --disable-dri \ - $(use_enable dri3) \ - --disable-glamor \ - --disable-kdrive \ - --disable-libunwind \ - --disable-linux-acpi \ - --disable-record \ - --disable-selective-werror \ - --disable-static \ - --disable-unit-tests \ - --disable-xephyr \ - $(use_enable xinerama) \ - --disable-xnest \ - --disable-xorg \ - --disable-xvfb \ - --disable-xwin \ - --disable-xwayland \ - --enable-dri2 \ - --with-pic \ - --without-dtrace \ - --disable-present \ - --with-sha1=libcrypto - fi -} - -src_compile() { - cmake_src_compile - - if use server ; then - # deps of the vnc module and the module itself - local d subdirs=( - fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render damageext miext Xi xkb - composite dix mi os hw/vnc - ) - for d in "${subdirs[@]}"; do - emake -C unix/xserver/"${d}" - done - fi -} - -src_install() { - cmake_src_install - - if use server ; then - emake -C unix/xserver/hw/vnc DESTDIR="${D}" install - if ! use xorgmodule; then - rm -rv "${ED}"/usr/$(get_libdir)/xorg || die - else - rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die - fi - - newconfd "${FILESDIR}"/${PN}.confd ${PN} - newinitd "${FILESDIR}"/${PN}.initd ${PN} - - systemd_douserunit contrib/systemd/user/vncserver@.service - else - local f - cd "${ED}" || die - for f in vncserver x0vncserver vncconfig; do - rm usr/bin/$f || die - rm usr/share/man/man1/$f.1 || die - done - fi -} diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild new file mode 100644 index 000000000000..23b38081e296 --- /dev/null +++ b/net-misc/tigervnc/tigervnc-9999.ebuild @@ -0,0 +1,227 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_IN_SOURCE_BUILD=1 +inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg + +XSERVER_VERSION="21.1.8" +XSERVER_PATCH_VERSION="21.1.1" + +DESCRIPTION="Remote desktop viewer display system" +HOMEPAGE="https://tigervnc.org" +SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/" +else + SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama" +REQUIRED_USE=" + dri3? ( drm ) + java? ( viewer ) + opengl? ( server ) + || ( server viewer ) +" + +# TODO: sys-libs/libselinux +COMMON_DEPEND=" + dev-libs/gmp:= + dev-libs/nettle:= + media-libs/libjpeg-turbo:= + sys-libs/zlib:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + x11-libs/pixman + gnutls? ( net-libs/gnutls:= ) + nls? ( virtual/libiconv ) + server? ( + dev-libs/libbsd + dev-libs/openssl:0= + sys-libs/pam + x11-libs/libXau + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXfixes + x11-libs/libXfont2 + x11-libs/libXtst + x11-libs/pixman + x11-apps/xauth + x11-apps/xinit + x11-apps/xkbcomp + x11-apps/xsetroot + x11-misc/xkeyboard-config + opengl? ( media-libs/libglvnd[X] ) + !net-misc/turbovnc[server] + ) + viewer? ( + media-video/ffmpeg:= + x11-libs/fltk:1 + x11-libs/libXi + x11-libs/libXrender + !net-misc/turbovnc[viewer] + ) +" +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.8:* ) + server? ( dev-lang/perl ) +" +DEPEND="${COMMON_DEPEND} + java? ( >=virtual/jdk-1.8:* ) + drm? ( x11-libs/libdrm ) + server? ( + media-fonts/font-util + x11-base/xorg-proto + x11-libs/libxcvt + x11-libs/libXi + x11-libs/libxkbfile + x11-libs/libXrender + x11-libs/xtrans + x11-misc/util-macros + opengl? ( media-libs/mesa ) + ) +" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( + # Restore Java viewer + "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch + "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch + "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch +) + +src_unpack() { + if [[ ${PV} == *9999 ]]; then + git-r3_src_unpack + use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz + else + default + fi +} + +src_prepare() { + if use server; then + cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die + fi + + cmake_src_prepare + + if use server; then + cd unix/xserver || die + eapply ../xserver${XSERVER_PATCH_VERSION}.patch + eautoreconf + sed -i 's:\(present.h\):../present/\1:' os/utils.c || die + sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die + + if use drm; then + cd "${WORKDIR}" && \ + sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die + fi + fi +} + +src_configure() { + if use arm || use hppa; then + append-flags "-fPIC" + fi + + local mycmakeargs=( + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_NLS=$(usex nls) + -DBUILD_JAVA=$(usex java) + -DBUILD_SERVER=$(usex server) + -DBUILD_VIEWER=$(usex viewer) + ) + + cmake_src_configure + + if use server; then + cd unix/xserver || die + econf \ + $(use_enable opengl glx) \ + $(use_enable drm libdrm) \ + --disable-config-hal \ + --disable-config-udev \ + --disable-devel-docs \ + --disable-dri \ + $(use_enable dri3) \ + --disable-glamor \ + --disable-kdrive \ + --disable-libunwind \ + --disable-linux-acpi \ + --disable-record \ + --disable-selective-werror \ + --disable-static \ + --disable-unit-tests \ + --disable-xephyr \ + $(use_enable xinerama) \ + --disable-xnest \ + --disable-xorg \ + --disable-xvfb \ + --disable-xwin \ + --enable-dri2 \ + --with-pic \ + --without-dtrace \ + --disable-present \ + --with-sha1=libcrypto + fi +} + +src_compile() { + cmake_src_compile + + if use server; then + # deps of the vnc module and the module itself + local d subdirs=( + fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render + damageext miext Xi xkb composite dix mi os hw/vnc + ) + for d in "${subdirs[@]}"; do + emake -C unix/xserver/"${d}" + done + fi +} + +src_install() { + cmake_src_install + + if use server; then + emake -C unix/xserver/hw/vnc DESTDIR="${D}" install + rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die + + newconfd "${FILESDIR}"/${PN}-1.13.1.confd ${PN} + newinitd "${FILESDIR}"/${PN}-1.13.1.initd ${PN} + + systemd_douserunit unix/vncserver/vncserver@.service + + # comment out pam_selinux.so, the server does not start if missing + # part of bug #746227 + sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die + + # install vncserver to /usr/bin too, see bug #836620 + dosym -r /usr/libexec/vncserver /usr/bin/vncserver + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + use server && elog 'OpenRC users: please migrate to one service per display as documented here' #FIXME: add link + + local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim" + use server && \ + optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \ + optfeature_header "Install any additional display manager package:" && \ + optfeature "proper session support" ${OPTIONAL_DM} +} diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest new file mode 100644 index 000000000000..2bd2ee5a59e1 --- /dev/null +++ b/net-misc/tinyssh/Manifest @@ -0,0 +1 @@ +DIST tinyssh-20240101.tar.gz 249848 BLAKE2B 228547c6f4acae3b77a338df1ced3a49e0b4c72257ce081b3b50941c29c5a39a0b1623f6aefce2721b9dde9fae03cb8c1c87b6b019658d578ddcca99e0a021f5 SHA512 b48561cfc11bb6d2e9b1c805c9dfc36be5f1bbbf04a455b8db3f02b5b8df15e420fcd93d58fb23526baaf0fd70e9969deca261152a656015f12a433a61092e90 diff --git a/net-misc/tinyssh/files/tinyssh-20240101_c99.patch b/net-misc/tinyssh/files/tinyssh-20240101_c99.patch new file mode 100644 index 000000000000..38b2e845eaa5 --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh-20240101_c99.patch @@ -0,0 +1,33 @@ +From ae059fda00c11236a32499f105e803f962d1e243 Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me> +Date: Tue, 9 Jan 2024 19:51:14 +0100 +Subject: [PATCH] packet_put: Add missing bug.h include for global_die + +``` +packet_put.c:53:9: error: call to undeclared function 'global_die'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + global_die(111); + ^ +1 error generated. +``` + +Upstream: https://github.com/janmojzis/tinyssh/pull/84 + +--- + tinyssh/packet_put.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tinyssh/packet_put.c b/tinyssh/packet_put.c +index 17e8d84..7f46ff6 100644 +--- a/tinyssh/packet_put.c ++++ b/tinyssh/packet_put.c +@@ -6,6 +6,7 @@ Public domain. + + #include "uint32_pack_big.h" + #include "buf.h" ++#include "bug.h" + #include "sshcrypto.h" + #include "ssh.h" + #include "log.h" +-- +2.41.0 + diff --git a/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch b/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch new file mode 100644 index 000000000000..8dd35d91b828 --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch @@ -0,0 +1,10 @@ +diff --git a/conf-cflags b/conf-cflags +--- a/conf-cflags ++++ b/conf-cflags +@@ -15,6 +15,3 @@ + -fstack-protector-strong + -fwrapv + -fno-strict-overflow +--Os +--fomit-frame-pointer +--funroll-loops diff --git a/net-misc/tinyssh/files/tinyssh-makekey.service b/net-misc/tinyssh/files/tinyssh-makekey.service new file mode 100644 index 000000000000..841a516ce390 --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh-makekey.service @@ -0,0 +1,8 @@ +[Unit] +Description=TinySSH Key Generation +ConditionPathIsDirectory=!/etc/tinyssh/keys + +[Service] +ExecStart=/usr/sbin/tinysshd-makekey /etc/tinyssh/keys +Type=oneshot +RemainAfterExit=true diff --git a/net-misc/tinyssh/files/tinyssh.confd b/net-misc/tinyssh/files/tinyssh.confd new file mode 100644 index 000000000000..d1aefde2be9f --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh.confd @@ -0,0 +1,7 @@ +# TinySSH config file for /etc/init.d/tinyssh + +#TINYSSH_PORT="22" +#TINYSSH_IP="0.0.0.0" +#TINYSSH_CONFDIR="/etc/tinyssh" +#TINYSSH_KEYDIR="${TINYSSH_CONFDIR}/keys" +#TINYSSH_OPTS="-l -v" diff --git a/net-misc/tinyssh/files/tinyssh.initd b/net-misc/tinyssh/files/tinyssh.initd new file mode 100644 index 000000000000..095a7f4e1056 --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh.initd @@ -0,0 +1,30 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +TINYSSH_CONFDIR="${TINYSSH_CONFDIR:-/etc/tinyssh}" +TINYSSH_KEYDIR="${TINYSSH_KEYDIR:-${TINYSSH_CONFDIR}/keys}" + +TINYSSHD="/usr/sbin/tinysshd" +MAKEKEY="${TINYSSHD}-makekey" +PRINTKEY="/usr/bin/tinysshd-printkey" + +command="/usr/bin/tcpserver" +command_args="-HRDl0 ${TINYSSH_IP:-0.0.0.0} ${TINYSSH_PORT:-22} + ${TINYSSHD} ${TINYSSH_OPTS:--l -v} ${TINYSSH_KEYDIR}" +command_background=yes +pidfile="/run/${RC_SVCNAME}.pid" +start_stop_daemon_args="${SSD_OPTS}" + +depend() { + use net +} + +start_pre() { + if [ "${RC_CMD}" != "restart" ]; then + checkpath -d "${TINYSSH_CONFDIR}" + if ! ${PRINTKEY} "${TINYSSH_KEYDIR}" >/dev/null 2>&1; then + ${MAKEKEY} "${TINYSSH_KEYDIR}" || return 1 + fi + fi +} diff --git a/net-misc/tinyssh/files/tinyssh.service b/net-misc/tinyssh/files/tinyssh.service new file mode 100644 index 000000000000..f0fe93be778b --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh.service @@ -0,0 +1,9 @@ +[Unit] +Description=TinySSH Per-Connection Daemon +Documentation=https://tinyssh.org +After=tinyssh-makekey.service + +[Service] +ExecStart=/usr/sbin/tinysshd /etc/tinyssh/keys +StandardInput=socket +StandardError=journal diff --git a/net-misc/tinyssh/files/tinyssh.socket b/net-misc/tinyssh/files/tinyssh.socket new file mode 100644 index 000000000000..9ca2b16b3fa4 --- /dev/null +++ b/net-misc/tinyssh/files/tinyssh.socket @@ -0,0 +1,13 @@ +[Unit] +Description=TinySSH service (socket-activated) +Documentation=https://tinyssh.org +Wants=tinyssh-makekey.service + +[Socket] +ListenStream=%i +Accept=true +KeepAlive=true +IPTOS=low-delay + +[Install] +WantedBy=sockets.target diff --git a/net-misc/tinyssh/metadata.xml b/net-misc/tinyssh/metadata.xml new file mode 100644 index 000000000000..3c123417d9f8 --- /dev/null +++ b/net-misc/tinyssh/metadata.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>contact@hacktivis.me</email> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag> + </use> + <upstream> + <remote-id type="github">janmojzis/tinyssh</remote-id> + <bugs-to>https://github.com/janmojzis/tinyssh/issues</bugs-to> + </upstream> + <longdescription lang="en"> +Features + + easy auditable - TinySSH has less than 100000 words of code + no dynamic memory allocation - TinySSH has all memory statically allocated (less than 1MB) + simple configuration - TinySSH can’t be misconfigured + reusing code - TinySSH is reusing libraries from CurveCP implementation + reusing software - TinySSH is using tcpserver/systemd socket/inetd for TCP connection + limited amount of features - TinySSH doesn’t have features such: SSH1 protocol, compression, … + no older cryptographic primitives - rsa, dsa, classic diffie-hellman, hmac-md5, hmac-sha1, 3des, arcfour, … + no copyright restrictions - TinySSH is in the public domain (see the licence) + no dependency on OpenSSL - TinySSH has its own crypto library compatible with NaCl, Libsodium + speed - TinySSH can be also compiled using high-speed NaCl library instead of internal. + +Security features + + cryptographic library (minimum 128-bit security, side-channel attack resistant, state-of-the-art crypto, …) + public-key authentication only (no password or hostbased authentication) + +Crypto primitives + + State-of-the-art crypto: ssh-ed25519, curve25519-sha256@libssh.org, chacha20-poly1305@openssh.com + Older standard: ecdsa-sha2-nistp256, ecdh-sha2-nistp256, aes256-ctr, hmac-sha2-256 removed in version 20190101 + Postquantum crypto: sntrup4591761x25519-sha512@tinyssh.org, chacha20-poly1305@openssh.com + </longdescription> +</pkgmetadata> diff --git a/net-misc/tinyssh/tinyssh-20240101-r1.ebuild b/net-misc/tinyssh/tinyssh-20240101-r1.ebuild new file mode 100644 index 000000000000..442fb8e5f171 --- /dev/null +++ b/net-misc/tinyssh/tinyssh-20240101-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd toolchain-funcs + +DESCRIPTION="A small SSH server with state-of-the-art cryptography" +HOMEPAGE="https://tinyssh.org" +if [[ "${PV}" == "99999999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/janmojzis/tinyssh.git" +else + SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="CC0-1.0" +SLOT="0" + +IUSE="+sodium" + +DEPEND=" + sodium? ( dev-libs/libsodium:= ) +" +RDEPEND=" + ${DEPEND} + sys-apps/ucspi-tcp +" + +PATCHES=( + "${FILESDIR}/tinyssh-20240101_c99.patch" + "${FILESDIR}/tinyssh-20240101_conf_cflags.patch" +) + +src_prepare() { + # Use make-tinysshcc.sh script, which has no tests and doesn't execute + # binaries. See https://github.com/janmojzis/tinyssh/issues/2 + sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die + + default +} + +src_compile() { + tc-export PKG_CONFIG + + if use sodium + then + emake \ + CC="$(tc-getCC)" \ + LIBS="$("${PKG_CONFIG}" --libs libsodium)" \ + CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium)" \ + LDFLAGS="${LDFLAGS}" + else + emake CC="$(tc-getCC)" + fi +} + +src_install() { + dosbin build/bin/tinysshd{,-makekey} + dobin build/bin/tinysshd-printkey + doman man/* + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + + systemd_newunit "${FILESDIR}/${PN}.service" "${PN}@.service" + systemd_newunit "${FILESDIR}/${PN}.socket" "${PN}@.socket" + systemd_dounit "${FILESDIR}/${PN}-makekey.service" +} + +pkg_postinst() { + einfo "TinySSH is in beta stage, and ready for production use." + einfo "See https://tinyssh.org for more information." +} diff --git a/net-misc/tinyssh/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-99999999.ebuild new file mode 100644 index 000000000000..4b288ff014ec --- /dev/null +++ b/net-misc/tinyssh/tinyssh-99999999.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd toolchain-funcs + +DESCRIPTION="A small SSH server with state-of-the-art cryptography" +HOMEPAGE="https://tinyssh.org" +if [[ "${PV}" == "99999999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/janmojzis/tinyssh.git" +else + SRC_URI="https://github.com/janmojzis/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="CC0-1.0" +SLOT="0" + +IUSE="+sodium" + +DEPEND=" + sodium? ( dev-libs/libsodium:= ) +" +RDEPEND=" + ${DEPEND} + sys-apps/ucspi-tcp +" + +src_prepare() { + # Leave optimization level to user CFLAGS + sed -i 's/-Os -fomit-frame-pointer -funroll-loops//g' ./conf-cc || die + + # Use make-tinysshcc.sh script, which has no tests and doesn't execute + # binaries. See https://github.com/janmojzis/tinyssh/issues/2 + sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die + + default +} + +src_compile() { + tc-export PKG_CONFIG + + if use sodium + then + emake \ + CC="$(tc-getCC)" \ + LIBS="$("${PKG_CONFIG}" --libs libsodium)" \ + CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium)" \ + LDFLAGS="${LDFLAGS}" + else + emake CC="$(tc-getCC)" + fi +} + +src_install() { + dosbin build/bin/tinysshd{,-makekey} + dobin build/bin/tinysshd-printkey + doman man/* + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + + systemd_newunit "${FILESDIR}/${PN}.service" "${PN}@.service" + systemd_newunit "${FILESDIR}/${PN}.socket" "${PN}@.socket" + systemd_dounit "${FILESDIR}/${PN}-makekey.service" +} + +pkg_postinst() { + einfo "TinySSH is in beta stage, and ready for production use." + einfo "See https://tinyssh.org for more information." +} diff --git a/net-misc/tipcutils/Manifest b/net-misc/tipcutils/Manifest index e8165037a46b..b59aded47dec 100644 --- a/net-misc/tipcutils/Manifest +++ b/net-misc/tipcutils/Manifest @@ -1 +1,2 @@ DIST tipcutils-2.0.3.tar.gz 166337 BLAKE2B 70a06e0f71550123da9b10cc9330e89e2f0722614f00ab93d229baa78f189b3ae03a9aa70722245886e6dee4b9ebf9f95b9ecc06c4c552096afdf54cf28fab0c SHA512 7f07b4729dbd2c0c93cd69ffe6d2d082cd10f8de8bda335555548d14bd6287229da3686d288be3c10024cc6b607e6e4be983716f734f2d049352f924409511ec +DIST tipcutils_3.0.6.tgz 84464860 BLAKE2B ff1422a651b74eb74351691510ef9f71453f48c713fae3da5239c4775e3d9c9c65621210827fc4fad6bdd1b794b8f20f550aeb3c600652de2c9e288312bfcc47 SHA512 b17f9d8ebd9a7b1134aacde3a2d8d99247c07dd1cab1be51ad7ba354e7384e50ec1bde02e338cb600746226209f0398ee9b2375fcd73191bdb75723bc66af606 diff --git a/net-misc/tipcutils/tipcutils-2.0.3.ebuild b/net-misc/tipcutils/tipcutils-2.0.3.ebuild index 11ef103ecf46..02ececd6a08d 100644 --- a/net-misc/tipcutils/tipcutils-2.0.3.ebuild +++ b/net-misc/tipcutils/tipcutils-2.0.3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)" -HOMEPAGE="http://tipc.sourceforge.net" -SRC_URI="mirror://sourceforge/tipc/${P}.tar.gz" +HOMEPAGE="https://tipc.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/tipc/${P}.tar.gz" LICENSE="|| ( BSD-2 GPL-2 )" SLOT="0" diff --git a/net-misc/tipcutils/tipcutils-3.0.6.ebuild b/net-misc/tipcutils/tipcutils-3.0.6.ebuild new file mode 100644 index 000000000000..07f286dd8ddd --- /dev/null +++ b/net-misc/tipcutils/tipcutils-3.0.6.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)" +HOMEPAGE="https://tipc.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/tipc/${P/-/_}.tgz" +S="${WORKDIR}"/${PN} + +LICENSE="|| ( BSD-2 GPL-2 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/libdaemon:= + net-libs/libmnl:= +" +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-2.6.39 +" + +src_configure() { + CONFIG_SHELL="${BROOT}"/bin/bash econf +} + +src_compile() { + emake clean + emake +} diff --git a/net-misc/trurl/Manifest b/net-misc/trurl/Manifest new file mode 100644 index 000000000000..316593446d28 --- /dev/null +++ b/net-misc/trurl/Manifest @@ -0,0 +1 @@ +DIST trurl-0.7.tar.gz 36624 BLAKE2B a63e8ec7f0b57006b5fa7a1d2ade1284dc2076474ef0425574ecb9b452c49d9a6148461a97e760287340d67a924612c1eb1fe188b6597b8147f818c18681190f SHA512 9ecccd9b688d7bddba760bbd408a1b864d5818b2c538904662ab81b13bca6226d03a4d209c74841c83ee368e656243e92bc7f7be876dbd5c1736b7fc2c3f82d6 diff --git a/net-misc/trurl/files/trurl-0.7-fix-makefile.patch b/net-misc/trurl/files/trurl-0.7-fix-makefile.patch new file mode 100644 index 000000000000..f1ecb28d3aaa --- /dev/null +++ b/net-misc/trurl/files/trurl-0.7-fix-makefile.patch @@ -0,0 +1,21 @@ +See https://github.com/curl/trurl/pull/158#issuecomment-1512397801. +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,6 @@ + TARGET = trurl + OBJS = trurl.o +-LDLIBS = $$(curl-config --libs) +-CFLAGS = $$(curl-config --cflags) -W -Wall -Wshadow -Werror -pedantic -g ++LDLIBS = $(shell curl-config --libs) + MANUAL = trurl.1 + + PREFIX ?= /usr/local +@@ -12,7 +11,7 @@ INSTALL ?= install + PYTHON3 ?= python3 + + $(TARGET): $(OBJS) +- $(CC) $(OBJS) -o $(TARGET) $(LDLIBS) $(LDFLAGS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) -Wall $(shell curl-config --cflags) $(LDFLAGS) $(OBJS) -o $(TARGET) $(LDLIBS) + + trurl.o:trurl.c version.h + diff --git a/net-misc/realtek-r8152/metadata.xml b/net-misc/trurl/metadata.xml index 8ac26ba5990d..9c4ccfbaf759 100644 --- a/net-misc/realtek-r8152/metadata.xml +++ b/net-misc/trurl/metadata.xml @@ -2,7 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> + <email>sam@gentoo.org</email> + <name>Sam James</name> </maintainer> + <upstream> + <remote-id type="github">curl/trurl</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/trurl/trurl-0.7.ebuild b/net-misc/trurl/trurl-0.7.ebuild new file mode 100644 index 000000000000..2a3befe7c83d --- /dev/null +++ b/net-misc/trurl/trurl-0.7.ebuild @@ -0,0 +1,52 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit toolchain-funcs python-any-r1 + +DESCRIPTION="Command line tool for URL parsing and manipulation" +HOMEPAGE="https://curl.se/trurl/ https://daniel.haxx.se/blog/2023/04/03/introducing-trurl/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/curl/trurl" + inherit git-r3 +else + SRC_URI="https://github.com/curl/trurl/archive/refs/tags/${P}.tar.gz" + S="${WORKDIR}"/${PN}-${P} + + KEYWORDS="~amd64 ~arm ~arm64" +fi + +LICENSE="curl" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +# Older curls may work but not all features will be present +DEPEND=">=net-misc/curl-7.81.0" +RDEPEND="${DEPEND}" +BDEPEND="test? ( ${PYTHON_DEPS} )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.7-fix-makefile.patch +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_compile() { + tc-export CC + + default +} + +src_test() { + emake PYTHON3="${EPYTHON}" test +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install +} diff --git a/net-misc/trurl/trurl-9999.ebuild b/net-misc/trurl/trurl-9999.ebuild new file mode 100644 index 000000000000..2a3befe7c83d --- /dev/null +++ b/net-misc/trurl/trurl-9999.ebuild @@ -0,0 +1,52 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit toolchain-funcs python-any-r1 + +DESCRIPTION="Command line tool for URL parsing and manipulation" +HOMEPAGE="https://curl.se/trurl/ https://daniel.haxx.se/blog/2023/04/03/introducing-trurl/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/curl/trurl" + inherit git-r3 +else + SRC_URI="https://github.com/curl/trurl/archive/refs/tags/${P}.tar.gz" + S="${WORKDIR}"/${PN}-${P} + + KEYWORDS="~amd64 ~arm ~arm64" +fi + +LICENSE="curl" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +# Older curls may work but not all features will be present +DEPEND=">=net-misc/curl-7.81.0" +RDEPEND="${DEPEND}" +BDEPEND="test? ( ${PYTHON_DEPS} )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.7-fix-makefile.patch +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_compile() { + tc-export CC + + default +} + +src_test() { + emake PYTHON3="${EPYTHON}" test +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install +} diff --git a/net-misc/tuba/Manifest b/net-misc/tuba/Manifest new file mode 100644 index 000000000000..16968ac79828 --- /dev/null +++ b/net-misc/tuba/Manifest @@ -0,0 +1,2 @@ +DIST Tuba-0.6.3.gh.tar.gz 1124191 BLAKE2B b5a7107c94d9adf89fc02224891c12b71fc2b640e962006fbfcf1d0673e5f3f73b11423b6d66e8952e2aef122ade6a57607cced5d4707bd91193157fd561ce11 SHA512 b987b9b8434a0abd086a3197154b27bd4a0bca69df07bcec26c59a2da51cf447943e7a05a83529a99670f2b1b7ea1a7dce1da39148844d23706940f3a0a423d8 +DIST Tuba-0.7.2.gh.tar.gz 1388074 BLAKE2B 6785225612db57592f351d2e0937b9578f4861230e999190f64b1068f344624ad41e69afcb199913c0a8e5b5eadb1438b7c6c48746b3582e1978afe6e09cde32 SHA512 bbabadbf2131233a737d6ccded50fde0af44330c7a69d1e0688a6ef42fe548826cacbe714a61df78dbe5afe867940b1dbae868efc3dfae707342b9f7ce5a9835 diff --git a/net-misc/youtube-dl/metadata.xml b/net-misc/tuba/metadata.xml index 3844b2945c05..a577af22922b 100644 --- a/net-misc/youtube-dl/metadata.xml +++ b/net-misc/tuba/metadata.xml @@ -5,9 +5,7 @@ <email>mgorny@gentoo.org</email> <name>Michał Górny</name> </maintainer> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> - <stabilize-allarches/> + <upstream> + <remote-id type="github">GeopJR/tuba</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/tuba/tuba-0.6.3.ebuild b/net-misc/tuba/tuba-0.6.3.ebuild new file mode 100644 index 000000000000..4f85b302be9c --- /dev/null +++ b/net-misc/tuba/tuba-0.6.3.ebuild @@ -0,0 +1,72 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2-utils meson optfeature vala + +MY_P=${P^} +DESCRIPTION="Browse the Fediverse (GTK client)" +HOMEPAGE=" + https://tuba.geopjr.dev/ + https://github.com/GeopJr/Tuba/ +" +SRC_URI=" + https://github.com/GeopJr/Tuba/archive/v${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-3 CC-BY-SA-4.0" +SLOT="0" +KEYWORDS="amd64 arm64" + +# TODO: optional dep on libspelling-1 +DEPEND=" + app-crypt/libsecret[introspection,vala] + >=dev-libs/glib-2.76.0:2 + >=dev-libs/json-glib-1.4.4[introspection] + >=dev-libs/libgee-0.8.5:0.8[introspection] + dev-libs/libxml2 + >=gui-libs/gtk-4.11.3:4[gstreamer,introspection] + >=gui-libs/libadwaita-1.4:1[introspection,vala] + >=gui-libs/gtksourceview-5.6.0:5[introspection,vala] + net-libs/libsoup:3.0[introspection,vala] +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + $(vala_depend) + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + # disable calling updaters (see pkg_post*) + -Ddistro=true + ) + + vala_setup + meson_src_configure +} + +src_install() { + meson_src_install + dosym dev.geopjr.Tuba /usr/bin/tuba +} + +pkg_postinst() { + optfeature "WebP image support" gui-libs/gdk-pixbuf-loader-webp + + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/net-misc/tuba/tuba-0.7.2.ebuild b/net-misc/tuba/tuba-0.7.2.ebuild new file mode 100644 index 000000000000..ddb73ceb06b5 --- /dev/null +++ b/net-misc/tuba/tuba-0.7.2.ebuild @@ -0,0 +1,73 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2-utils meson optfeature vala + +MY_P=${P^} +DESCRIPTION="Browse the Fediverse (GTK client)" +HOMEPAGE=" + https://tuba.geopjr.dev/ + https://github.com/GeopJr/Tuba/ +" +SRC_URI=" + https://github.com/GeopJr/Tuba/archive/v${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-3 CC-BY-SA-4.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +# TODO: optional dep on libspelling-1 +DEPEND=" + app-crypt/libsecret[introspection,vala] + >=dev-libs/glib-2.76.0:2 + dev-libs/icu:= + >=dev-libs/json-glib-1.4.4[introspection] + >=dev-libs/libgee-0.8.5:0.8[introspection] + dev-libs/libxml2 + >=gui-libs/gtk-4.13.4:4[gstreamer,introspection] + >=gui-libs/libadwaita-1.5:1[introspection,vala] + >=gui-libs/gtksourceview-5.6.0:5[introspection,vala] + net-libs/libsoup:3.0[introspection,vala] +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + $(vala_depend) + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + # disable calling updaters (see pkg_post*) + -Ddistro=true + ) + + vala_setup + meson_src_configure +} + +src_install() { + meson_src_install + dosym dev.geopjr.Tuba /usr/bin/tuba +} + +pkg_postinst() { + optfeature "WebP image support" gui-libs/gdk-pixbuf-loader-webp + + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 79f84d7ca892..debe294b7e46 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1 +1,6 @@ -DIST turbovnc-2.2.6.tar.gz 9022414 BLAKE2B 5baf1d5a9ea488ae1148feb107920d1e2cd2d29af58b6486ac8b7381f07def05d5fbf3a8b231221ef05a8365dd431f0640de0c4fc507475b0c801a53472870c4 SHA512 74fabb7006135853b662e8b6fcfc9b0cf55aa516477106de40587b4513a708c1458ab73f7a51f5f70c4abdc09f1ce13aafdcd56cd039655870a7614169d98af7 +DIST turbovnc-3.0.3.tar.gz 8693682 BLAKE2B cdb10b3f16be542a214e16329914eaf97a5646f96b47da5a738f7c16355284b100af3755f046a6975233c31ce662a939db01aa5825ebcf944e64eacca2f57a2f SHA512 e9cece436f70f2b75683eb8f21ffc985797a36c76efb6829ba5fac75849d1c9f35d636431a0fb28066ed17717800d6d6029f2fda863e650f39d6d64eef1e30de +DIST turbovnc-3.0.3.tar.gz.sig 543 BLAKE2B 14df4d080b587125f82151c457b69324b993b169550e95beec74344705ad77a2c9886deaed59d0c487c8995c34fca1e4004fb4f50b836c3aff373cecd911a6a9 SHA512 0ecc236823c78cb16876f2cc6ac07ec14a099974b0f1ac4d2f45fdc1c53c6adbede924553cc42431cc95a5c4185f1cc9991053d72bb41ddbe1fc8c3f85120489 +DIST turbovnc-3.1.1.tar.gz 9032635 BLAKE2B 84b6d656bcadf310368f4c59e03c25d2997e8264141bf54dc670e76c1f52e4ea63a71670f134643018f9cae76aa20d51d15a4a9f919a25d21abac80fbc0b43db SHA512 d855b5f6aca9db73474d6a63868212a847c472ae01e4d26ea877bccb911d910730409e13183928426ce07a401da38a55fbcb39e411530f993d758e8dbf244cd1 +DIST turbovnc-3.1.1.tar.gz.sig 543 BLAKE2B 2563db72dbca74781b0c2d76867298c400db61bff120e8bd4167c90347c94a26824f7aa252a2ac9fc1b0c101d56caeaceec74155ae5593428ad23a36373e998a SHA512 0dd0bde26bba3fe7ebbbe3c1a0af5f7e223026f140f031ae29405a47dd5d62183f22ea9fd6e1902b23016887503d80b65f77c48759e540ae8969a17046e41c60 +DIST turbovnc-3.1.tar.gz 9031021 BLAKE2B 08a349bec517b36a505145a572905da64055e39c8cdc40a0609aa5976604aa4cb43196584c4bf078ea68094c87818fd611589b3b12d2f81085ed40ea4db0d4bd SHA512 ebcfd2c542542fd266eedf23bd7ce246acc2257b195dd204d474ca658e9ef2dab8bb8731a7ae4d30bf3845b9015c318e19c3b68a1ad6b658287fddbcb4db509b +DIST turbovnc-3.1.tar.gz.sig 543 BLAKE2B 6e6d13e611913abacaedb9251554263713f04f26aaff6a1526b796091f84260b10c156ee302156aac12ad519d9d9a55f059460b13df4fe02a237be37307acf7e SHA512 753a9f77ed851b999a49d22787ee992cae74340afb78a30db25d5cc36d95facce437df0474bf4ef92317ebcfa41e2cb145f3841df39fbb6b3b191ec57fcc0100 diff --git a/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch new file mode 100644 index 000000000000..0769f00ffa56 --- /dev/null +++ b/net-misc/turbovnc/files/turbovnc-3.0-fix-musl-compilation.patch @@ -0,0 +1,20 @@ +See bug https://bugs.gentoo.org/836723 + +The error is this: + +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds': +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known + 1178 | struct ucred peercred; + | ^~~~~~~~ + +--- a/unix/Xvnc/programs/Xserver/os/CMakeLists.txt ++++ b/unix/Xvnc/programs/Xserver/os/CMakeLists.txt +@@ -1,7 +1,7 @@ + include_directories(../render ../../../lib/libsha1) + + add_definitions(-DUNIXCONN -DTCPCONN -DHASXDMAUTH ${ServerOSDefines} -DXDMCP +- -DHAVE_SHA1_IN_LIBSHA1) ++ -DHAVE_SHA1_IN_LIBSHA1 -D_GNU_SOURCE) + if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") + add_definitions(-DLOCALCONN) + elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch b/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch new file mode 100644 index 000000000000..a94c76ddfd24 --- /dev/null +++ b/net-misc/turbovnc/files/turbovnc-3.0.3-java-launcher-32-bit.patch @@ -0,0 +1,15 @@ +Jdk 8 does not need -d32 +Jdk 11+ doesn't recognize it at all, so the viewer doesn't start on x86 + +--- a/unix/vncviewer/vncviewer.in ++++ b/unix/vncviewer/vncviewer.in +@@ -53,8 +53,4 @@ + LD_LIBRARY_PATH=$JAWT_PATH:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH + fi +-if [ "@BITS@" = "32" ]; then +- exec $JAVA -server -d@BITS@ -Djava.library.path=$TVNC_JAVADIR -jar $TVNC_JAVADIR/VncViewer.jar ${1+"$@"} +-else +- exec $JAVA -server -Djava.library.path=$TVNC_JAVADIR -jar $TVNC_JAVADIR/VncViewer.jar ${1+"$@"} +-fi ++exec $JAVA -server -Djava.library.path=$TVNC_JAVADIR -jar $TVNC_JAVADIR/VncViewer.jar ${1+"$@"} diff --git a/net-misc/turbovnc/files/turbovnc-3.0.90-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-3.0.90-fix-musl-compilation.patch new file mode 100644 index 000000000000..2ad9db5117ae --- /dev/null +++ b/net-misc/turbovnc/files/turbovnc-3.0.90-fix-musl-compilation.patch @@ -0,0 +1,20 @@ +See bug https://bugs.gentoo.org/836723 + +The error is this: + +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds': +/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known + 1178 | struct ucred peercred; + | ^~~~~~~~ + +--- a/unix/Xvnc/programs/Xserver/os/CMakeLists.txt ++++ b/unix/Xvnc/programs/Xserver/os/CMakeLists.txt +@@ -1,7 +1,7 @@ + include_directories(../render ../../../lib/libsha1) + + add_definitions(-DUNIXCONN -DTCPCONN -DHASXDMAUTH ${ServerOSDefines} -DXDMCP +- -DHAVE_SHA1_IN_LIBSHA1) ++ -DHAVE_SHA1_IN_LIBSHA1 -D_GNU_SOURCE) + if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") + # This is already defined for Linux + add_definitions(-DHAVE_ABSTRACT_SOCKETS) diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml index b00420add601..5c1cfb86ec9a 100644 --- a/net-misc/turbovnc/metadata.xml +++ b/net-misc/turbovnc/metadata.xml @@ -1,23 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>ceamac.paragon@gmail.com</email> + <maintainer type="person"> + <email>ceamac@gentoo.org</email> <name>Viorel Munteanu</name> </maintainer> <maintainer type="person"> <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <longdescription> TurboVNC is a derivative of VNC (Virtual Network Computing) that is tuned to provide peak performance for 3D and video workloads. By The VirtualGL Project. </longdescription> + <use> + <flag name="server">Build the server (vncserver, Xvnc)</flag> + <flag name="viewer">Build the viewer (vncviewer)</flag> + </use> <upstream> + <remote-id type="sourceforge">turbovnc</remote-id> <remote-id type="github">TurboVNC/turbovnc</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild deleted file mode 100644 index a8390bb0b57c..000000000000 --- a/net-misc/turbovnc/turbovnc-2.2.6.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 cmake java-pkg-opt-2 - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/" -SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+ssl gnutls" - -DEPEND=" - app-arch/bzip2 - media-libs/freetype - >=media-libs/libjpeg-turbo-2.0.0[java?] - sys-libs/zlib - virtual/jdk:1.8 - virtual/opengl - x11-libs/libfontenc - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfont2 - x11-libs/libxkbfile - x11-libs/pixman - ssl? ( - !gnutls? ( dev-libs/openssl:= ) - gnutls? ( net-libs/gnutls:= ) - ) - !net-misc/tigervnc -" -RDEPEND=" - ${DEPEND} - x11-apps/xkbcomp -" - -src_prepare() { - use java && java-pkg-opt-2_src_prepare - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTVNC_SYSTEMX11=ON - -DTVNC_SYSTEMLIBS=ON - -DTVNC_BUILDJAVA=$(usex java) - -DTVNC_BUILDNATIVE=ON - -DXKB_BIN_DIRECTORY=/usr/bin - -DXKB_DFLT_RULES=base - ) - - if use ssl ; then - # We prefer OpenSSL, so default to that if SSL is enabled - if use gnutls ; then - mycmakeargs+=( -DTVNC_USETLS="GnuTLS" ) - else - # Link properly against OpenSSL to ensure - # we catch e.g. ABI change - # (i.e. don't dlopen it) - mycmakeargs+=( - -DTVNC_USETLS="OpenSSL" - -DTVNC_DLOPENSSL=OFF - ) - fi - else - mycmakeargs+=( -DTVNC_USETLS=OFF ) - fi - - if use java ; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - - mycmakeargs+=( - -DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar" - -DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so" - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use java ; then - java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar - make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png - fi - - # Don't install incompatible init script - rm -rf "${ED}"/etc/init.d/ || die - rm -rf "${ED}"/etc/sysconfig/ || die - - find "${ED}/usr/share/man/man1/" -name Xserver.1\* -print0 | xargs -0 rm || die - einstalldocs -} diff --git a/net-misc/turbovnc/turbovnc-3.0.3.ebuild b/net-misc/turbovnc/turbovnc-3.0.3.ebuild new file mode 100644 index 000000000000..8bc1560582eb --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.0.3.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_OPT_USE=viewer +inherit cmake desktop java-pkg-opt-2 verify-sig + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/" +SRC_URI=" + https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz + verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" + +COMMON_DEPEND=" + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-misc/xkeyboard-config + server? ( + media-libs/libjpeg-turbo:= + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/pixman + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] + ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + viewer? ( >=virtual/jre-1.8:* ) +" + +# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 +# but cmake will look for them, so add them here +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans + viewer? ( >=virtual/jdk-1.8:* ) + server? ( + app-arch/bzip2 + media-libs/freetype + x11-libs/libfontenc + ) +" + +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) +" + +PATCHES=( + "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch + "${FILESDIR}"/"${PN}"-3.0.3-java-launcher-32-bit.patch +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vgl-turbovnc.asc + +#879797 - BSD functions +QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy ) + +pkg_pretend() { + if use ssl && ! use server; then + einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused" + fi +} + +src_prepare() { + use viewer && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTVNC_BUILDVIEWER=$(usex viewer) + -DTVNC_BUILDHELPER=$(usex viewer) + -DTVNC_BUILDSERVER=$(usex server) + -DTVNC_BUILDWEBSERVER=$(usex server) + ) + + if use server ; then + mycmakeargs+=( + -DTVNC_SYSTEMLIBS=ON + -DTVNC_SYSTEMX11=ON + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + if use ssl ; then + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=OpenSSL + -DTVNC_DLOPENSSL=OFF + ) + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + fi + + if use viewer ; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use viewer ; then + java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar + make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png + fi + + # Don't install incompatible init script + rm -rf "${ED}"/etc/init.d/ || die + rm -rf "${ED}"/etc/sysconfig/ || die + + # Conflicts with x11-base/xorg-server + find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die + + einstalldocs +} diff --git a/net-misc/turbovnc/turbovnc-3.1.1.ebuild b/net-misc/turbovnc/turbovnc-3.1.1.ebuild new file mode 100644 index 000000000000..a60e961b75ed --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.1.1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_OPT_USE=viewer +inherit cmake desktop java-pkg-opt-2 optfeature verify-sig + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/" +SRC_URI=" + https://github.com/TurboVNC/turbovnc/releases/download/${PV}/turbovnc-${PV}.tar.gz + verify-sig? ( https://github.com/TurboVNC/turbovnc/releases/download/${PV}/turbovnc-${PV}.tar.gz.sig ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" + +COMMON_DEPEND=" + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-misc/xkeyboard-config + server? ( + media-libs/libjpeg-turbo:= + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/pixman + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] + ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + viewer? ( >=virtual/jre-1.8:* ) +" + +# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 +# but cmake will look for them, so add them here +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans + viewer? ( >=virtual/jdk-1.8:* ) + server? ( + app-arch/bzip2 + media-libs/freetype + x11-libs/libfontenc + ) +" + +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) +" + +PATCHES=( + "${FILESDIR}"/"${PN}"-3.0.90-fix-musl-compilation.patch +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vgl-turbovnc.asc + +#879797 - BSD functions +QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy ) + +pkg_pretend() { + if use ssl && ! use server; then + einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused" + fi +} + +src_prepare() { + use viewer && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTVNC_BUILDVIEWER=$(usex viewer) + -DTVNC_BUILDSERVER=$(usex server) + -DTVNC_BUILDWEBSERVER=$(usex server) + ) + + if use server ; then + mycmakeargs+=( + -DTVNC_SYSTEMLIBS=ON + -DTVNC_SYSTEMX11=ON + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + if use ssl ; then + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=OpenSSL + -DTVNC_DLOPENSSL=OFF + ) + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + fi + + if use viewer ; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use viewer ; then + java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar + make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png + fi + + # Don't install incompatible init script + if use server; then + rm -r "${ED}"/etc/init.d/ || die + rm -r "${ED}"/etc/sysconfig/ || die + fi + + # Conflicts with x11-base/xorg-server + find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die + + einstalldocs +} + +pkg_postinst() { + use server && optfeature "dbus support" sys-apps/dbus +} diff --git a/net-misc/turbovnc/turbovnc-3.1.ebuild b/net-misc/turbovnc/turbovnc-3.1.ebuild new file mode 100644 index 000000000000..8046e0e11fb8 --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.1.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_OPT_USE=viewer +inherit cmake desktop java-pkg-opt-2 verify-sig + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/" +SRC_URI=" + https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz + verify-sig? ( https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz.sig/download -> ${P}.tar.gz.sig ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" + +COMMON_DEPEND=" + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-misc/xkeyboard-config + server? ( + media-libs/libjpeg-turbo:= + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/pixman + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] + ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + viewer? ( >=virtual/jre-1.8:* ) +" + +# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 +# but cmake will look for them, so add them here +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans + viewer? ( >=virtual/jdk-1.8:* ) + server? ( + app-arch/bzip2 + media-libs/freetype + x11-libs/libfontenc + ) +" + +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) +" + +PATCHES=( + "${FILESDIR}"/"${PN}"-3.0.90-fix-musl-compilation.patch +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vgl-turbovnc.asc + +#879797 - BSD functions +QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy ) + +pkg_pretend() { + if use ssl && ! use server; then + einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL support is unused" + fi +} + +src_prepare() { + use viewer && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTVNC_BUILDVIEWER=$(usex viewer) + -DTVNC_BUILDSERVER=$(usex server) + -DTVNC_BUILDWEBSERVER=$(usex server) + ) + + if use server ; then + mycmakeargs+=( + -DTVNC_SYSTEMLIBS=ON + -DTVNC_SYSTEMX11=ON + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + if use ssl ; then + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=OpenSSL + -DTVNC_DLOPENSSL=OFF + ) + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + fi + + if use viewer ; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use viewer ; then + java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar + make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png + fi + + # Don't install incompatible init script + if use server; then + rm -r "${ED}"/etc/init.d/ || die + rm -r "${ED}"/etc/sysconfig/ || die + fi + + # Conflicts with x11-base/xorg-server + find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die + + einstalldocs +} diff --git a/net-misc/udpcast/Manifest b/net-misc/udpcast/Manifest index c3f55e7d574d..f3f2c9cc3bf1 100644 --- a/net-misc/udpcast/Manifest +++ b/net-misc/udpcast/Manifest @@ -1 +1 @@ -DIST udpcast-20200328.tar.gz 169252 BLAKE2B df760dea814fabf951a65dc191a88355dec864d9c0f1be99ea60c742862d0b9944e51a45dd462ffce5c4b56a8d94f719796e3c725b42edae8cb9a19b1d3bc147 SHA512 b1ce4f0cade5db6bc69d3a154c354565675f44e97f9e3d90152f9594fd4f17fff2891eb1cb8d73c59e0d24eeb85e485e96b7a64fa9f1b6d2f005c4cece377bc7 +DIST udpcast-20211207.tar.gz 171148 BLAKE2B 96a7b1a30e19a2b83ce2ab7d8491ad430838f1305b83b728e6b43343404440b5a7fa9ee0afd0c00f8203937803a691065af31d7dc51633f26d019955e9ac8ed0 SHA512 89010c781d99a60e335213e88867c9114b51f3d75bd4ebfa38bcd1382e5925be4f316faf8c24ea55b087edb2115e18b5fd3cceac70a65371f91227528d218e89 diff --git a/net-misc/udpcast/files/udpcast-20200328-gentoo.patch b/net-misc/udpcast/files/udpcast-20200328-gentoo.patch deleted file mode 100644 index 529c31f7f7c8..000000000000 --- a/net-misc/udpcast/files/udpcast-20200328-gentoo.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -30,8 +30,7 @@ - - # For additional warnings & checks, add -Wstrict-prototypes -Wshadow to the - # following: --CFLAGS +=-Wall -DBB_FEATURE_UDPCAST_FEC -DUSE_SYSLOG -DUSE_ASSEMBLER -O6 --LDFLAGS +=-s -+CFLAGS +=-Wall -DBB_FEATURE_UDPCAST_FEC -DUSE_SYSLOG - LIBS +=@LIBS@ - - BUSYBOX=../udp-busybox/busybox diff --git a/net-misc/udpcast/files/udpcast-20211207-musl.patch b/net-misc/udpcast/files/udpcast-20211207-musl.patch new file mode 100644 index 000000000000..9b0aaae59032 --- /dev/null +++ b/net-misc/udpcast/files/udpcast-20211207-musl.patch @@ -0,0 +1,33 @@ +https://git.busybox.net/buildroot/tree/package/udpcast/0001-fix-musl-build.patch?id=8d7be66f70cccbaf61e5cb6b2414b9d9ce162f48 + +fix musl build + +Fix the following musl build failure: + +receivedata.c: In function 'findSlice': +receivedata.c:348:2: error: unknown type name 'ptrdiff_t' + 348 | ptrdiff_t pos = slice - clst->slices; + | ^~~~~~~~~ +receivedata.c:17:1: note: 'ptrdiff_t' is defined in header '<stddef.h>'; did you forget to '#include <stddef.h>'? + 16 | #include "fec.h" + +++ |+#include <stddef.h> + 17 | + +Fixes: + - http://autobuild.buildroot.org/results/30208c6f175967fed6de690447a09e0c86547b24 + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +[Upstream status: +https://udpcast.linux.lu/mailman3/hyperkitty/list/udpcast@udpcast.linux.lu/thread/4MBES2CPUSUNIZTC7NXCQYS2GAE4DQSG/] + +--- a/receivedata.c ++++ b/receivedata.c +@@ -1,6 +1,7 @@ + #include <assert.h> + #include <sys/types.h> + #include <unistd.h> ++#include <stddef.h> + #include <stdlib.h> + #include <sys/time.h> + #include <errno.h> + diff --git a/net-misc/udpcast/udpcast-20211207-r1.ebuild b/net-misc/udpcast/udpcast-20211207-r1.ebuild new file mode 100644 index 000000000000..15b71530f31c --- /dev/null +++ b/net-misc/udpcast/udpcast-20211207-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="Multicast file transfer tool" +HOMEPAGE="https://www.udpcast.linux.lu/" +SRC_URI="https://www.udpcast.linux.lu/download/${P}.tar.gz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="hardened" + +BDEPEND="dev-lang/perl" + +PATCHES=( + "${FILESDIR}"/${P}-musl.patch +) + +src_configure() { + # bug #900230 + append-cppflags -DBB_FEATURE_UDPCAST_FEC + + use hardened || append-cppflags -DUSE_ASSEMBLER + + default +} + +src_install() { + default + dodoc *.txt +} diff --git a/net-misc/udpcast/udpcast-20200328.ebuild b/net-misc/udpcast/udpcast-20211207.ebuild index 2a300d7a0be6..9def40a88d4b 100644 --- a/net-misc/udpcast/udpcast-20200328.ebuild +++ b/net-misc/udpcast/udpcast-20211207.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit flag-o-matic DESCRIPTION="Multicast file transfer tool" @@ -13,11 +14,10 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="hardened" -BDEPEND=" - dev-lang/perl -" +BDEPEND="dev-lang/perl" + PATCHES=( - "${FILESDIR}"/${PN}-20200328-gentoo.patch + "${FILESDIR}"/${P}-musl.patch ) src_configure() { diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest index 3e5dc4d4a705..6f35f3e40083 100644 --- a/net-misc/uftp/Manifest +++ b/net-misc/uftp/Manifest @@ -1,2 +1 @@ -DIST uftp-4.10.1.tar.gz 245625 BLAKE2B 23b01758fa5a0387471f8d95b24738d8157801822b8a07a59072eeab81277ceb5283463465ed522af6971d65141712ead3e2206caa286bedece9e0c34a149873 SHA512 9ef4594e0cde2f64970523661fcee07f34600bd4f2ab235c34bde9d20ef1b0312d5e430e1f52ab605c188c42aee4a0384ed02ae9f5e93b3edc062f848a8130bf -DIST uftp-5.0.tar.gz 239651 BLAKE2B 8fcba8c0fc2db2dac941eaff7ebc7f2b25c53dd2e021985a2c1d93c29ce0afb2bd7da79bb5a20e0d45f703837ebb375d07825456edc217abe32ff51665a6e237 SHA512 f76e86559971facd806141fae88c6c47ec8361440044e429126391c6ac17f5f6ec0c79950816f9329cbb85a6be31d0700d18f599ef0b56f8df3ebe03fad4e27a +DIST uftp-5.0.3.tar.gz 240814 BLAKE2B 46a36affb4547c62fcc09bbde5f9b22d1ddce5cf50777f138982de51bb2e681520c9f9bad92b646cd97204de40e01f9782b24329a6eebfeb98fd8e10910786e9 SHA512 edd603cf3ecb363a21365db7b1697ac44d12099c6699cf50c02f4a01ad95a458470308c69446a2d2825c5f4882833c384ad4f658e09ddf80dcab1cb2180f8b54 diff --git a/net-misc/uftp/files/uftp-4.10.1_gcc10.patch b/net-misc/uftp/files/uftp-4.10.1_gcc10.patch deleted file mode 100644 index d25de61465dc..000000000000 --- a/net-misc/uftp/files/uftp-4.10.1_gcc10.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar uftp-4.10.1.orig/proxy.h uftp-4.10.1/proxy.h ---- uftp-4.10.1.orig/proxy.h 2020-02-06 17:30:34.904020513 +0300 -+++ uftp-4.10.1/proxy.h 2020-02-06 17:30:49.214021144 +0300 -@@ -167,8 +167,8 @@ - extern int proxy_type, debug, rcvbuf, dscp, keyfile_count, keyinfo_count; - extern int hb_interval, priority; - extern unsigned int ttl; --char portname[PORTNAME_LEN], out_portname[PORTNAME_LEN]; --int port, out_port; -+extern char portname[PORTNAME_LEN], out_portname[PORTNAME_LEN]; -+extern int port, out_port; - extern union sockaddr_u down_addr; - extern int have_down_fingerprint; - extern uint8_t down_fingerprint[HMAC_LEN]; diff --git a/net-misc/uftp/uftp-4.10.1-r1.ebuild b/net-misc/uftp/uftp-4.10.1-r1.ebuild deleted file mode 100644 index b85e46fc8aa2..000000000000 --- a/net-misc/uftp/uftp-4.10.1-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Encrypted UDP based FTP with multicast" -HOMEPAGE="http://uftp-multicast.sourceforge.net/" -SRC_URI="https://download.sourceforge.net/${PN}-multicast/source-tar/${P}.tar.gz" - -LICENSE="GPL-3-with-openssl-exception" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+server ssl" - -# openssl with EC required, see #644674 -DEPEND="ssl? ( dev-libs/openssl:0=[-bindist(-)] )" -RDEPEND="${DEPEND}" - -# Workaround, see #644670 -RESTRICT=test - -PATCHES=( - "${FILESDIR}/${P}_makefile.patch" - "${FILESDIR}/${P}_gcc10.patch" -) - -src_compile() { - use ssl || local opt="NO_ENCRYPTION=1" - emake CC=$(tc-getCC) $opt uftp uftp_keymgt - use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd -} - -src_install() { - dobin uftp uftp_keymgt - dodoc {Changes,protocol,ReadMe}.txt - doman {uftp,uftp_keymgt}.1 - - if use server ; then - dosbin uftpd uftpproxyd - newinitd "${FILESDIR}/uftpd.init" uftpd - newconfd "${FILESDIR}/uftpd.conf" uftpd - newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd - newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd - doman {uftpd,uftpproxyd}.1 - insinto /etc/logrotate.d - newins "${FILESDIR}/logrotate" uftpd - fi -} - -pkg_postinst() { - if use server ; then - ewarn "Please note, uftpd 4.x server is not backward compatible with" - ewarn "uftp 3.x clients! Please upgrade clients before servers." - fi -} diff --git a/net-misc/uftp/uftp-5.0-r1.ebuild b/net-misc/uftp/uftp-5.0.3.ebuild index 4df140fe4cbc..339a6b7f59d1 100644 --- a/net-misc/uftp/uftp-5.0-r1.ebuild +++ b/net-misc/uftp/uftp-5.0.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -24,8 +24,9 @@ PATCHES=( src_compile() { use ssl || local opt="NO_ENCRYPTION=1" - emake CC=$(tc-getCC) $opt uftp uftp_keymgt - use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd + + emake CC="$(tc-getCC)" ${opt} uftp uftp_keymgt + use server && emake CC="$(tc-getCC)" ${opt} uftpd uftpproxyd } src_install() { diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest index 0e186b02e774..120b6d85e835 100644 --- a/net-misc/unison/Manifest +++ b/net-misc/unison/Manifest @@ -1,2 +1,2 @@ -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 +DIST unison-2.51.5.tar.gz 1385407 BLAKE2B cdad4683518ec9c7c43d9107d8533fa393a68f602782d96ddba345df07b1ef70cc2ebf7dfd205fc7535349553a5e0d3c2931099bde99e5c736bc815ccdd294f8 SHA512 4a31df4d043d2b7552438f9fc2056098b9a35cd1cae1a037083cb56d91ec6fec0c3164de73914ff46cb8821f78c1594f48bf0334a94d9d706cd82ce3a6b70440 +DIST unison-2.53.3.tar.gz 1415490 BLAKE2B 1142419781f5084da7ae8d043897f2f80aa4c3770a1c5cb44f8d7f669f718c41dd7fa6d13069cd95c71842233309eb886f63ab525e5e446ff761ea970de0e794 SHA512 f3fafd5e1a2950a00ed8bcc682036180ea40eff1ccfa1fc671cca49954890a535ee48faf1e8e62002563143e5479b9df1eca1db1caf03dffc50449fb467b8e2b diff --git a/net-misc/unison/unison-2.51.4_rc2.ebuild b/net-misc/unison/unison-2.51.5.ebuild index 2a61c1d85d3a..914cd4876cd3 100644 --- a/net-misc/unison/unison-2.51.4_rc2.ebuild +++ b/net-misc/unison/unison-2.51.5.ebuild @@ -1,31 +1,34 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop xdg-utils DESCRIPTION="Two-way cross-platform file synchronizer" -HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/" +HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/ https://github.com/bcpierce00/unison" SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug doc gtk +ocamlopt threads" -RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0 -# ocaml version so we are sure it has ocamlopt use flag BDEPEND="dev-lang/ocaml:=[ocamlopt?] doc? ( app-text/dvipsk app-text/ghostscript-gpl - dev-texlive/texlive-latex )" + dev-texlive/texlive-latex + dev-tex/hevea + www-client/lynx + )" DEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] )" RDEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) >=app-eselect/eselect-unison-0.4" -DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt ) +DOCS=( CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt ) + +QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}" src_prepare() { default @@ -55,7 +58,7 @@ src_compile() { use ocamlopt || myconf+=( NATIVE=false ) if use doc; then - VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=false docs + VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=true docs fi # Discard cflags as it will try to pass them to ocamlc... @@ -80,10 +83,9 @@ src_install() { make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" "${PN}-${SLOT}" fi - # Waiting for https://github.com/bcpierce00/unison/issues/411 if use doc; then DOCS+=( ../doc/unison-manual.pdf ) - # HTML_DOCS=( "${DISTDIR}/${P}-manual.html" ) + HTML_DOCS=( "../doc/unison-manual.html" ) fi einstalldocs diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild b/net-misc/unison/unison-2.53.3.ebuild index 484fcb308f39..0de016690ac1 100644 --- a/net-misc/unison/unison-2.51.3_p20201127.ebuild +++ b/net-misc/unison/unison-2.53.3.ebuild @@ -1,68 +1,58 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop xdg-utils -MY_COMMIT="4713e608d2f9c998ba4412fee53b94dc9bef98b9" DESCRIPTION="Two-way cross-platform file synchronizer" -HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/" -SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/bcpierce00/unison" +SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug doc gtk +ocamlopt threads" -RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0 -# ocaml version so we are sure it has ocamlopt use flag BDEPEND="dev-lang/ocaml:=[ocamlopt?] doc? ( app-text/dvipsk app-text/ghostscript-gpl dev-texlive/texlive-latex )" -DEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] )" -RDEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] +DEPEND="gtk? ( dev-ml/lablgtk:3=[ocamlopt?] )" +RDEPEND="gtk? ( dev-ml/lablgtk:3=[ocamlopt?] || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) - >=app-eselect/eselect-unison-0.4" + >=app-eselect/eselect-unison-0.4 + >=dev-lang/ocaml-4.08" -S="${WORKDIR}/${PN}-${MY_COMMIT}" - -DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt ) - -src_prepare() { - # https://github.com/bcpierce00/unison/issues/416 - sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die - # https://github.com/bcpierce00/unison/pull/415 - sed -e "/myName/d" -i doc/docs.ml || die - default -} +DOCS=( CONTRIB README ROADMAP.txt TODO.txt ) src_compile() { local myconf if use threads; then - myconf="$myconf THREADS=true" + myconf+=( THREADS=true ) fi if use debug; then - myconf="$myconf DEBUGGING=true" + myconf+=( DEBUGGING=true ) fi if use gtk; then - myconf="$myconf UISTYLE=gtk2" + myconf+=( UISTYLE=gtk3 ) else - myconf="$myconf UISTYLE=text" + myconf+=( UISTYLE=text ) fi - use ocamlopt || myconf="$myconf NATIVE=false" + use ocamlopt || myconf+=( NATIVE=false ) if use doc; then - VARTEXFONTS="${T}/fonts" emake $myconf CFLAGS="" HEVEA=false docs + VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=false docs fi # Discard cflags as it will try to pass them to ocamlc... - emake $myconf CFLAGS="" src + emake "${myconf[@]}" CFLAGS="" src + + emake manpage } src_test() { @@ -77,16 +67,15 @@ src_install() { for binname in unison unison-fsmonitor; do newbin ${binname} ${binname}-${SLOT} done + doman ../man/unison.1 if use gtk; then newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" "${PN}-${SLOT}" fi - # Waiting for https://github.com/bcpierce00/unison/issues/411 if use doc; then DOCS+=( ../doc/unison-manual.pdf ) - # HTML_DOCS=( "${DISTDIR}/${P}-manual.html" ) fi einstalldocs diff --git a/net-misc/unix2tcp/files/unix2tcp-0.8.2-clang16.patch b/net-misc/unix2tcp/files/unix2tcp-0.8.2-clang16.patch new file mode 100644 index 000000000000..a67cc13acb26 --- /dev/null +++ b/net-misc/unix2tcp/files/unix2tcp-0.8.2-clang16.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/870457 +--- a/server.c ++++ b/server.c +@@ -61,2 +61,3 @@ + #include "list.h" ++#include "mylog.h" + #include "unix2tcp.h" +--- a/unix2tcp.c ++++ b/unix2tcp.c +@@ -62,2 +62,3 @@ + #include "list.h" ++#include "mylog.h" + #include "server.h" +--- a/utelnet.c ++++ b/utelnet.c +@@ -23,2 +23,3 @@ + #include <stdio.h> ++#include <stdlib.h> + #ifdef HAVE_SYS_TYPES_H diff --git a/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild b/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild deleted file mode 100644 index 5c2afd689c0c..000000000000 --- a/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="a connection forwarder that converts Unix sockets into TCP sockets" -HOMEPAGE="http://gnu.gds.tuwien.ac.at/directory/all/unix2tcp.html" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~hppa ~ia64 ppc ~s390 x86" - -DOCS=( ChangeLog README ) diff --git a/net-misc/unix2tcp/unix2tcp-0.8.2-r2.ebuild b/net-misc/unix2tcp/unix2tcp-0.8.2-r2.ebuild new file mode 100644 index 000000000000..d35532343648 --- /dev/null +++ b/net-misc/unix2tcp/unix2tcp-0.8.2-r2.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Connection forwarder that converts Unix sockets into TCP sockets" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 arm ~hppa ~ia64 ppc ~s390 x86" + +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch +) + +DOCS=( ChangeLog README ) + +src_prepare() { + default + + eautoreconf #870457 +} diff --git a/net-misc/usbip/Manifest b/net-misc/usbip/Manifest index 9d29974f4086..ece469b60024 100644 --- a/net-misc/usbip/Manifest +++ b/net-misc/usbip/Manifest @@ -1,2 +1 @@ -DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a diff --git a/net-misc/usbip/files/usbip-4.13-fno-common.patch b/net-misc/usbip/files/usbip-4.13-fno-common.patch deleted file mode 100644 index b8ffc40c4b9e..000000000000 --- a/net-misc/usbip/files/usbip-4.13-fno-common.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/libsrc/usbip_common.c -+++ b/libsrc/usbip_common.c -@@ -14,7 +14,7 @@ - int usbip_use_stderr; - int usbip_use_debug; - --extern struct udev *udev_context; -+struct udev *udev_context; - - struct speed_string { - int num; ---- alibsrc/usbip_common.h -+++ b/libsrc/usbip_common.h -@@ -53,6 +53,8 @@ - #define ST_NODEV 0x04 - #define ST_ERROR 0x05 - -+extern struct udev *udev_context; -+ - extern int usbip_use_syslog; - extern int usbip_use_stderr; - extern int usbip_use_debug ; ---- a/libsrc/usbip_host_common.c -+++ b/libsrc/usbip_host_common.c -@@ -23,8 +23,6 @@ - #include "list.h" - #include "sysfs_utils.h" - --struct udev *udev_context; -- - static int32_t read_attr_usbip_status(struct usbip_usb_device *udev) - { - char status_attr_path[SYSFS_PATH_MAX]; ---- a/libsrc/vhci_driver.c -+++ b/libsrc/vhci_driver.c -@@ -15,7 +15,6 @@ - #define PROGNAME "libusbip" - - struct usbip_vhci_driver *vhci_driver; --struct udev *udev_context; - - static struct usbip_imported_device * - imported_device_init(struct usbip_imported_device *idev, char *busid) - diff --git a/net-misc/usbip/usbip-4.13-r2.ebuild b/net-misc/usbip/usbip-4.13-r2.ebuild deleted file mode 100644 index c8099fd53279..000000000000 --- a/net-misc/usbip/usbip-4.13-r2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -ETYPE="sources" -K_NOUSENAME=1 -inherit autotools kernel-2 - -DESCRIPTION="Userspace utilities for a general USB device sharing system over IP networks" -HOMEPAGE="https://www.kernel.org/" -SRC_URI="${KERNEL_URI}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="tcpd" - -RDEPEND=" - >=dev-libs/glib-2.6 - sys-apps/hwdata - >=sys-kernel/linux-headers-3.17 - virtual/libudev - tcpd? ( sys-apps/tcp-wrappers )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/linux-${PV}/tools/usb/${PN}" - -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) - -src_unpack() { - tar xJf "${DISTDIR}"/${A} linux-${PV}/tools/usb/${PN} || die -} - -src_prepare() { - default - # remove -Werror from build, bug #545398 - sed -i 's/-Werror[^ ]* //g' configure.ac || die - - eautoreconf -} - -src_configure() { - econf \ - --disable-static \ - $(use tcpd || echo --without-tcp-wrappers) \ - --with-usbids-dir="${EPREFIX}"/usr/share/hwdata -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client" - elog "machine's kernel config and USBIP_HOST on the server." -} diff --git a/net-misc/usbip/usbip-5.15.ebuild b/net-misc/usbip/usbip-5.15.ebuild index 3fcee65007b6..136f8e4e290d 100644 --- a/net-misc/usbip/usbip-5.15.ebuild +++ b/net-misc/usbip/usbip-5.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,6 +10,7 @@ inherit autotools kernel-2 DESCRIPTION="Userspace utilities for a general USB device sharing system over IP networks" HOMEPAGE="https://www.kernel.org/" SRC_URI="${KERNEL_URI}" +S="${WORKDIR}/linux-${PV}/tools/usb/${PN}" LICENSE="GPL-2" SLOT="0" @@ -22,10 +23,8 @@ RDEPEND=" >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/linux-${PV}/tools/usb/${PN}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_unpack() { tar xJf "${DISTDIR}"/${A} linux-${PV}/tools/usb/${PN} || die @@ -41,8 +40,7 @@ src_prepare() { src_configure() { econf \ - --disable-static \ - $(use tcpd || echo --without-tcp-wrappers) \ + $(usev !tcpd --without-tcp-wrappers) \ --with-usbids-dir="${EPREFIX}"/usr/share/hwdata } diff --git a/net-misc/utelnetd/files/utelnetd-0.1.11-musl-getgt.patch b/net-misc/utelnetd/files/utelnetd-0.1.11-musl-getgt.patch new file mode 100644 index 000000000000..b011e90807c3 --- /dev/null +++ b/net-misc/utelnetd/files/utelnetd-0.1.11-musl-getgt.patch @@ -0,0 +1,14 @@ +Bug: https://bugs.gentoo.org/897954 +--- a/utelnetd.c ++++ b/utelnetd.c +@@ -73,6 +73,10 @@ + #define getpt() posix_openpt(O_RDWR|O_NOCTTY) + #endif + ++#if !defined(__GLIBC__) ++#define getpt() posix_openpt(O_RDWR) ++#endif ++ + #ifdef DEBUG + #define TELCMDS + #define TELOPTS diff --git a/net-misc/utelnetd/utelnetd-0.1.11-r2.ebuild b/net-misc/utelnetd/utelnetd-0.1.11-r2.ebuild deleted file mode 100644 index f5d7e79c6651..000000000000 --- a/net-misc/utelnetd/utelnetd-0.1.11-r2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="A small Telnet daemon, derived from the Axis tools" -HOMEPAGE="http://www.pengutronix.de/software/utelnetd/index_en.html" -SRC_URI="http://www.pengutronix.de/software/utelnetd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86" -IUSE="" - -DEPEND="sys-apps/shadow" - -src_prepare() { - sed -i \ - -e "/(STRIP)/d" \ - -e "/^CC/s:=.*:= $(tc-getCC):" \ - -e "/fomit-frame-pointer/d" \ - Makefile || die - - default -} - -src_install() { - dosbin utelnetd - dodoc ChangeLog README - - newinitd "${FILESDIR}"/utelnetd.initd utelnetd -} diff --git a/net-misc/utelnetd/utelnetd-0.1.11-r3.ebuild b/net-misc/utelnetd/utelnetd-0.1.11-r3.ebuild new file mode 100644 index 000000000000..7c072e0d028a --- /dev/null +++ b/net-misc/utelnetd/utelnetd-0.1.11-r3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Small telnet daemon derived from the Axis tools" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86" + +RDEPEND="sys-apps/shadow" + +src_prepare() { + default + + sed -e "/(STRIP)/d" \ + -e "/^CC/s|=.*|= $(tc-getCC)|" \ + -e "/fomit-frame-pointer/d" \ + -i Makefile || die + + append-cppflags -D_GNU_SOURCE #871195 +} + +src_install() { + dosbin utelnetd + einstalldocs + + newinitd "${FILESDIR}"/utelnetd.initd utelnetd +} diff --git a/net-misc/utelnetd/utelnetd-0.1.11-r4.ebuild b/net-misc/utelnetd/utelnetd-0.1.11-r4.ebuild new file mode 100644 index 000000000000..7e76cfa67170 --- /dev/null +++ b/net-misc/utelnetd/utelnetd-0.1.11-r4.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Small telnet daemon derived from the Axis tools" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86" + +RDEPEND="sys-apps/shadow" + +PATCHES=( + "${FILESDIR}"/${PN}-0.1.11-musl-getgt.patch +) + +src_prepare() { + default + + sed -e "/(STRIP)/d" \ + -e "/^CC/s|=.*|= $(tc-getCC)|" \ + -e "/fomit-frame-pointer/d" \ + -i Makefile || die + + append-cppflags -D_GNU_SOURCE #871195 +} + +src_install() { + dosbin utelnetd + einstalldocs + + newinitd "${FILESDIR}"/utelnetd.initd utelnetd +} diff --git a/net-misc/valve/Manifest b/net-misc/valve/Manifest deleted file mode 100644 index 1520f602d3d5..000000000000 --- a/net-misc/valve/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST valve-1.0.tar.gz 272182 BLAKE2B bc2373569d2f55b5a4d69297b9fb58131bb15fc0d3be538572412267ca642db53e7a337ac44991f4659cb5459ea9f64ca55afee5aaf3e2d64efa871f522b9386 SHA512 116d3c6c400ad523c1c40cf592f56a43e0920ea0b0b2436d8f6185f4664adbc79c30e0cec63ccf922e5998357138a5b50a7e7bb2d9d0b77cbd054d8d1a5ffc12 diff --git a/net-misc/valve/metadata.xml b/net-misc/valve/metadata.xml deleted file mode 100644 index aaab041e8885..000000000000 --- a/net-misc/valve/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>robbat2@gentoo.org</email> -</maintainer> -</pkgmetadata> diff --git a/net-misc/valve/valve-1.0-r1.ebuild b/net-misc/valve/valve-1.0-r1.ebuild deleted file mode 100644 index 5510f27b19f5..000000000000 --- a/net-misc/valve/valve-1.0-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Copy data while enforcing a specified maximum transfer rate" -HOMEPAGE="https://www.fourmilab.ch/webtools/valve/" -SRC_URI="https://www.fourmilab.ch/webtools/valve/${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="test doc" -RESTRICT="!test? ( test )" - -DOCS=( README INSTALL valve.pdf ) - -src_test() { - emake check -} - -src_install() { - dodir /usr/share/man/man1 /usr/bin - emake DESTDIR="${D}" install - use doc && local HTML_DOCS=( index.html logo.png ) - einstalldocs -} diff --git a/net-misc/vconfig/vconfig-1.9.ebuild b/net-misc/vconfig/vconfig-1.9.ebuild index 793ba8451eb0..5fe5ec3d9908 100644 --- a/net-misc/vconfig/vconfig-1.9.ebuild +++ b/net-misc/vconfig/vconfig-1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~ppc ~ppc64 ~riscv sparc x86" IUSE="static" S="${WORKDIR}/${MY_PN}" diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest index 8c5ef64fd5de..60ab1dec5697 100644 --- a/net-misc/vde/Manifest +++ b/net-misc/vde/Manifest @@ -1,2 +1 @@ -DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971 -DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6 +DIST vde-2.3.3.tar.gz 234790 BLAKE2B e3ed7423edc03a6af09967484613c0e2a701f74a4323eeab720cabe9a899120023425527054662ee1dbd207327b7e6dd375bceb4999fd708666df13c08acf348 SHA512 d0495aa700984dcc82f85cf7c8125cc10505a8a077fceec45b7fd2bec9c389966381682842e886469fa49239badd9442403d091c2ae5282685085e8262396387 diff --git a/net-misc/vde/files/vde-2.3.2-fix-inline-funcs-r1.patch b/net-misc/vde/files/vde-2.3.2-fix-inline-funcs-r1.patch deleted file mode 100644 index c1329d0f7207..000000000000 --- a/net-misc/vde/files/vde-2.3.2-fix-inline-funcs-r1.patch +++ /dev/null @@ -1,21 +0,0 @@ -# Sourced from https://raw.githubusercontent.com/OpenMandrivaAssociation/vde2/master/vd2-2.3.2-clang.patch - ---- a/src/vde_switch/fstp.c 2014-10-29 22:54:18.659988435 +0000 -+++ b/src/vde_switch/fstp.c 2014-10-29 22:54:44.912986501 +0000 -@@ -30,14 +30,14 @@ - #ifdef FSTP - #include <fstp.h> - /*********************** sending macro used by FSTP & Core ******************/ --void inline ltonstring(unsigned long l,unsigned char *s) { -+void ltonstring(unsigned long l,unsigned char *s) { - s[3]=l; l>>=8; - s[2]=l; l>>=8; - s[1]=l; l>>=8; - s[0]=l; - } - --unsigned long inline nstringtol(unsigned char *s) { -+unsigned long nstringtol(unsigned char *s) { - return (s[0]<<24)+(s[1]<<16)+(s[2]<<8)+s[3]; - } - diff --git a/net-misc/vde/files/vde-2.3.2-format-security.patch b/net-misc/vde/files/vde-2.3.2-format-security.patch deleted file mode 100644 index d1cfaa58cb2f..000000000000 --- a/net-misc/vde/files/vde-2.3.2-format-security.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/common/cmdparse.c 2017-09-20 18:47:31.662856695 -0400 -+++ b/src/common/cmdparse.c 2017-09-20 18:48:54.008852141 -0400 -@@ -284,13 +284,13 @@ - int i; - for (i=0;i<argc;i++) { - if (i) fprintf(mf," "); -- fprintf(mf,argv[i]); -+ fprintf(mf,"%s",argv[i]); - } - } else { - int num=atoi(t); - while (*t >='0' && *t <= '9') t++; - if (num < argc) -- fprintf(mf,argv[num]); -+ fprintf(mf,"%s",argv[num]); - } - } else - fprintf(mf,"%c",*t); diff --git a/net-misc/vde/files/vde-2.3.2-openssl-1.1.patch b/net-misc/vde/files/vde-2.3.2-openssl-1.1.patch deleted file mode 100644 index b490b93350f4..000000000000 --- a/net-misc/vde/files/vde-2.3.2-openssl-1.1.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 5f2c4c7b67617991af65798a4d177ada90f7e463 Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> -Date: Fri, 2 Sep 2016 19:52:49 +0000 -Subject: [PATCH] vde_cryptcab: compile against openssl 1.1.0 - -Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> ---- - src/vde_cryptcab/cryptcab.c | 30 +++++++++++++++++++----------- - 1 file changed, 19 insertions(+), 11 deletions(-) - -diff --git a/src/vde_cryptcab/cryptcab.c b/src/vde_cryptcab/cryptcab.c -index c5b4474..a2780f1 100644 ---- a/src/vde_cryptcab/cryptcab.c 2011-11-23 16:41:17.000000000 +0000 -+++ b/src/vde_cryptcab/cryptcab.c 2017-03-20 22:54:20.452975075 +0000 -@@ -22,7 +22,7 @@ - exit(1); - } - --static EVP_CIPHER_CTX ctx; -+static EVP_CIPHER_CTX *ctx; - static int ctx_initialized = 0; - static int encryption_disabled = 0; - static int nfd; -@@ -30,6 +30,10 @@ - static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700}; - static int verbose = 0; - -+#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#define EVP_CIPHER_CTX_reset(x) EVP_CIPHER_CTX_cleanup(x) -+#endif -+ - void vc_printlog(int priority, const char *format, ...) - { - va_list arg; -@@ -103,19 +107,21 @@ - } - - if (!ctx_initialized) { -- EVP_CIPHER_CTX_init (&ctx); -+ ctx = EVP_CIPHER_CTX_new (); -+ if (!ctx) -+ return -1; - ctx_initialized = 1; - } - -- EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); -- if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1) -+ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); -+ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1) - { - fprintf (stderr,"error in encrypt update\n"); - olen = -1; - goto cleanup; - } - -- if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1) -+ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1) - { - fprintf (stderr,"error in encrypt final\n"); - olen = -1; -@@ -124,7 +130,7 @@ - olen += tlen; - - cleanup: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_reset(ctx); - return olen; - } - -@@ -138,19 +144,21 @@ - } - - if (!ctx_initialized) { -- EVP_CIPHER_CTX_init (&ctx); -+ ctx = EVP_CIPHER_CTX_new (); -+ if (!ctx) -+ return -1; - ctx_initialized = 1; - } - -- EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); -- if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1) -+ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); -+ if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1) - { - fprintf (stderr,"error in decrypt update\n"); - olen = -1; - goto cleanup; - } - -- if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1) -+ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1) - { - fprintf (stderr,"error in decrypt final\n"); - olen = -1; -@@ -159,7 +167,7 @@ - olen += tlen; - - cleanup: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_reset (ctx); - return olen; - } - diff --git a/net-misc/vde/files/vde-2.3.2-slibtool-support.patch b/net-misc/vde/files/vde-2.3.2-slibtool-support.patch deleted file mode 100644 index 5eeb3a5c9026..000000000000 --- a/net-misc/vde/files/vde-2.3.2-slibtool-support.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d11d9dd8b370016a2d10ffd35c450c9f68e578a5 Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Wed, 17 Mar 2021 15:14:45 -0700 -Subject: [PATCH] build: Only use -module for libraries. - ---- - src/vde_l3/Makefile.am | 9 +++++++-- - src/vde_router/Makefile.am | 2 +- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/vde_l3/Makefile.am b/src/vde_l3/Makefile.am -index 748cb78..855081c 100644 ---- a/src/vde_l3/Makefile.am -+++ b/src/vde_l3/Makefile.am -@@ -1,7 +1,6 @@ -- - moddir = $(pkglibdir)/vde_l3 - --AM_LDFLAGS = -module -avoid-version -export-dynamic -+AM_LDFLAGS = -avoid-version -export-dynamic - AM_LIBTOOLFLAGS = --tag=disable-static - AM_CPPFLAGS = -I$(top_srcdir)/include - -@@ -15,6 +14,12 @@ pfifo_la_SOURCES = pfifo.c vde_buff.h - tbf_la_SOURCES = tbf.c vde_buff.h - bfifo_la_SOURCES = bfifo.c vde_buff.h - -+vde_l3_lib_LDFLAGS = -module -+ -+pfifo_la_LDFLAGS = $(vde_l3_lib_LDFLAGS) -+bfifo_la_LDFLAGS = $(vde_l3_lib_LDFLAGS) -+tbf_la_LDFLAGS = $(vde_l3_lib_LDFLAGS) -+ - pfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la - bfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la - tbf_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la -diff --git a/src/vde_router/Makefile.am b/src/vde_router/Makefile.am -index d872388..d055259 100644 ---- a/src/vde_router/Makefile.am -+++ b/src/vde_router/Makefile.am -@@ -1,7 +1,7 @@ - - moddir = $(pkglibdir)/vde_router - --AM_LDFLAGS = -module -avoid-version -export-dynamic -+AM_LDFLAGS = -avoid-version -export-dynamic - AM_LIBTOOLFLAGS = --tag=disable-static - AM_CPPFLAGS = -I$(top_srcdir)/include - diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml index cb82cdfe97ee..2f9b19bd1a72 100644 --- a/net-misc/vde/metadata.xml +++ b/net-misc/vde/metadata.xml @@ -1,33 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>np-hardass@gentoo.org</email> - <name>Adam Feldman</name> - </maintainer> - <maintainer type="person" proxied="yes"> - <email>mlspamcb@noci.work</email> - <name>Nico Baggus</name> - </maintainer> - <maintainer type="person"> - <email>jmbsvicetto@gentoo.org</email> - <name>Jorge Manuel B. S. Vicetto</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="pcap"> - Enable the pcap-based plugin that allows creating a switch against - a real interface. - </flag> - <flag name="ssl"> - Enable the cryptcab plugin that allows creating an encrypted - virtual cable. - </flag> - </use> - <upstream> - <remote-id type="sourceforge">vde</remote-id> - </upstream> + <!-- maintainer-needed --> + <use> + <flag name="pcap">Enable the pcap-based plugin that allows creating a switch against a real interface.</flag> + </use> + <upstream> + <remote-id type="sourceforge">vde</remote-id> + <remote-id type="github">virtualsquare/vde-2</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/vde/vde-2.3.2-r6.ebuild b/net-misc/vde/vde-2.3.2-r6.ebuild deleted file mode 100644 index 3e9c368a8f50..000000000000 --- a/net-misc/vde/vde-2.3.2-r6.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}2-${PV}" - -DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" -SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" -HOMEPAGE="https://virtualsquare.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc ppc64 x86" -IUSE="pcap selinux ssl static-libs" - -COMMON_DEPS="pcap? ( net-libs/libpcap ) - ssl? ( dev-libs/openssl:0= ) - " -DEPEND="${COMMON_DEPS}" -RDEPEND="${COMMON_DEPS} - acct-group/qemu - selinux? ( sec-policy/selinux-vde )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${P}-format-security.patch" - "${FILESDIR}/${P}-fix-inline-funcs-r1.patch" -) - -src_prepare() { - default - has_version ">=dev-libs/openssl-1.1.0" && eapply "${FILESDIR}/${P}-openssl-1.1.patch" -} - -src_configure() { - econf \ - --disable-python \ - $(use_enable pcap) \ - $(use_enable ssl cryptcab) \ - $(use_enable static-libs static) -} - -src_compile() { - emake -j1 -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die - - newinitd "${FILESDIR}"/vde.init-r1 vde - newconfd "${FILESDIR}"/vde.conf-r1 vde -} - -pkg_postinst() { - einfo "To start vde automatically add it to the default runlevel:" - einfo "# rc-update add vde default" - einfo "You need to setup tap0 in /etc/conf.d/net" - einfo "To use it as an user be sure to set a group in /etc/conf.d/vde" -} diff --git a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild deleted file mode 100644 index 69fb8a181891..000000000000 --- a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -if [[ ${PV} == 9999 ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN" -elif [[ ${PV} = *_p* ]]; then - inherit autotools - MY_PN="vde-2" - COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb" - SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86" - - S="${WORKDIR}/${MY_PN}-${COMMIT}" -else - MY_P="${PN}2-${PV}" - SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" -HOMEPAGE="https://virtualsquare.org" - -LICENSE="GPL-2" -SLOT="0" -# upstream switched to wolfssl -IUSE="pcap selinux static-libs" - -COMMON_DEPS="pcap? ( net-libs/libpcap )" -DEPEND="${COMMON_DEPS}" -RDEPEND="${COMMON_DEPS} - acct-group/qemu - selinux? ( sec-policy/selinux-vde )" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.2-slibtool-support.patch" -) - -# upstream switched to wolfssl -src_prepare() { - default - if [[ ${PV} == 9999 ]] || [[ ${PV} == *_p* ]]; then - eautoreconf - fi -# upstream switched to wolfssl -# has_version ">=dev-libs/openssl-1.1.0" && \ -# eapply "${FILESDIR}/${PN}-2.3.2-openssl-1.1.patch" -} - -src_configure() { - filter-flags -O0 -Os -# upstream switched to wolfssl -# $(use_enable ssl cryptcab) \ - econf \ - --disable-python \ - --disable-cryptcab \ - $(use_enable pcap) \ - $(use_enable static-libs static) -} - -src_compile() { - # https://github.com/virtualsquare/vde-2/issues/6 - emake -j1 -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die - - newinitd "${FILESDIR}"/vde.init-r1 vde - newconfd "${FILESDIR}"/vde.conf-r1 vde -} - -pkg_postinst() { - einfo "To start vde automatically add it to the default runlevel:" - einfo "# rc-update add vde default" - einfo "You need to setup tap0 in /etc/conf.d/net" - einfo "To use it as an user be sure to set a group in /etc/conf.d/vde" -} diff --git a/net-misc/vde/vde-2.3.2_p20191011.ebuild b/net-misc/vde/vde-2.3.2_p20191011.ebuild deleted file mode 100644 index abd8c9c4d9f3..000000000000 --- a/net-misc/vde/vde-2.3.2_p20191011.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -if [[ ${PV} == 9999 ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN" -elif [[ ${PV} = *_p* ]]; then - inherit autotools - MY_PN="vde-2" - COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb" - SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" - - S="${WORKDIR}/${MY_PN}-${COMMIT}" -else - MY_P="${PN}2-${PV}" - SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" -HOMEPAGE="https://virtualsquare.org" - -LICENSE="GPL-2" -SLOT="0" -# upstream switched to wolfssl -IUSE="pcap selinux static-libs" - -COMMON_DEPS="pcap? ( net-libs/libpcap )" -DEPEND="${COMMON_DEPS}" -RDEPEND="${COMMON_DEPS} - acct-group/qemu - selinux? ( sec-policy/selinux-vde )" - -# upstream switched to wolfssl -src_prepare() { - default - if [[ ${PV} == 9999 ]] || [[ ${PV} == *_p* ]]; then - eautoreconf - fi -# upstream switched to wolfssl -# has_version ">=dev-libs/openssl-1.1.0" && \ -# eapply "${FILESDIR}/${PN}-2.3.2-openssl-1.1.patch" -} - -src_configure() { - filter-flags -O0 -Os -# upstream switched to wolfssl -# $(use_enable ssl cryptcab) \ - econf \ - --disable-python \ - --disable-cryptcab \ - $(use_enable pcap) \ - $(use_enable static-libs static) -} - -src_compile() { - # https://github.com/virtualsquare/vde-2/issues/6 - emake -j1 -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die - - newinitd "${FILESDIR}"/vde.init-r1 vde - newconfd "${FILESDIR}"/vde.conf-r1 vde -} - -pkg_postinst() { - einfo "To start vde automatically add it to the default runlevel:" - einfo "# rc-update add vde default" - einfo "You need to setup tap0 in /etc/conf.d/net" - einfo "To use it as an user be sure to set a group in /etc/conf.d/vde" -} diff --git a/net-misc/vde/vde-2.3.3.ebuild b/net-misc/vde/vde-2.3.3.ebuild new file mode 100644 index 000000000000..3b9c43da2dd5 --- /dev/null +++ b/net-misc/vde/vde-2.3.3.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/virtualsquare/vde-2" + inherit git-r3 +elif [[ ${PV} == *_p* ]]; then + MY_COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb" + SRC_URI="https://github.com/virtualsquare/vde-2/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/vde-2-${COMMIT}" +else + MY_P="${PN}2-${PV}" + SRC_URI="https://github.com/virtualsquare/vde-2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/vde-2-${PV}" +fi + +DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" +HOMEPAGE="https://virtualsquare.org/" + +LICENSE="GPL-2" +SLOT="0" +if [[ ${PV} != 9999 ]] ; then + KEYWORDS="amd64 arm64 ~loong ~mips ~ppc ppc64 ~riscv x86" +fi +IUSE="pcap selinux static-libs" + +DEPEND="pcap? ( net-libs/libpcap )" +RDEPEND=" + ${DEPEND} + acct-group/qemu + selinux? ( sec-policy/selinux-vde ) +" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + filter-flags -O0 -Os + + local myeconfargs=( + # Upstream switched to wolfssl, so no SSL support for now + --disable-cryptcab + $(use_enable pcap) + $(use_enable static-libs static) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -type f -delete || die + + newinitd "${FILESDIR}"/vde.init-r1 vde + newconfd "${FILESDIR}"/vde.conf-r1 vde +} + +pkg_postinst() { + einfo "To start vde automatically, add it to the default runlevel:" + einfo "# rc-update add vde default" + einfo "You need to setup tap0 in ${EROOT}/etc/conf.d/net" + einfo "To use it as an user, be sure to set a group in ${EROOT}/etc/conf.d/vde" +} diff --git a/net-misc/vde/vde-9999.ebuild b/net-misc/vde/vde-9999.ebuild index 32de524f78b9..4cacbb0f887b 100644 --- a/net-misc/vde/vde-9999.ebuild +++ b/net-misc/vde/vde-9999.ebuild @@ -1,78 +1,71 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit flag-o-matic +inherit autotools flag-o-matic if [[ ${PV} == 9999 ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN" -elif [[ ${PV} = *_p* ]]; then - inherit autotools - MY_PN="vde-2" - COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb" - SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - - S="${WORKDIR}/${MY_PN}-${COMMIT}" + EGIT_REPO_URI="https://github.com/virtualsquare/vde-2" + inherit git-r3 +elif [[ ${PV} == *_p* ]]; then + MY_COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb" + SRC_URI="https://github.com/virtualsquare/vde-2/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/vde-2-${COMMIT}" else MY_P="${PN}2-${PV}" - SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" - S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/virtualsquare/vde-2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/vde-2-${PV}" fi DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" -HOMEPAGE="https://virtualsquare.org" +HOMEPAGE="https://virtualsquare.org/" LICENSE="GPL-2" SLOT="0" -# upstream switched to wolfssl +if [[ ${PV} != 9999 ]] ; then + KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi IUSE="pcap selinux static-libs" -COMMON_DEPS="pcap? ( net-libs/libpcap )" -DEPEND="${COMMON_DEPS}" -RDEPEND="${COMMON_DEPS} +DEPEND="pcap? ( net-libs/libpcap )" +RDEPEND=" + ${DEPEND} acct-group/qemu - selinux? ( sec-policy/selinux-vde )" + selinux? ( sec-policy/selinux-vde ) +" -# upstream switched to wolfssl src_prepare() { default - if [[ ${PV} == 9999 ]] || [[ ${PV} == *_p* ]]; then - eautoreconf - fi -# upstream switched to wolfssl -# has_version ">=dev-libs/openssl-1.1.0" && \ -# eapply "${FILESDIR}/${PN}-2.3.2-openssl-1.1.patch" + + eautoreconf } src_configure() { filter-flags -O0 -Os -# upstream switched to wolfssl -# $(use_enable ssl cryptcab) \ - econf \ - --disable-python \ - --disable-cryptcab \ - $(use_enable pcap) \ + + local myeconfargs=( + # Upstream switched to wolfssl, so no SSL support for now + --disable-cryptcab + $(use_enable pcap) $(use_enable static-libs static) -} + ) -src_compile() { - # https://github.com/virtualsquare/vde-2/issues/6 - emake -j1 + econf "${myeconfargs[@]}" } src_install() { default - find "${D}" -name '*.la' -type f -delete || die + + find "${ED}" -name '*.la' -type f -delete || die newinitd "${FILESDIR}"/vde.init-r1 vde newconfd "${FILESDIR}"/vde.conf-r1 vde } pkg_postinst() { - einfo "To start vde automatically add it to the default runlevel:" + einfo "To start vde automatically, add it to the default runlevel:" einfo "# rc-update add vde default" - einfo "You need to setup tap0 in /etc/conf.d/net" - einfo "To use it as an user be sure to set a group in /etc/conf.d/vde" + einfo "You need to setup tap0 in ${EROOT}/etc/conf.d/net" + einfo "To use it as an user, be sure to set a group in ${EROOT}/etc/conf.d/vde" } diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest deleted file mode 100644 index 7141f7db469c..000000000000 --- a/net-misc/vinagre/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST vinagre-3.22.0.tar.xz 1574984 BLAKE2B a8e6c7be07816b49f7194ece223a3ee35608736e69c0390e5f67691135706f1e993df53b3e4cb5b1f3d6850ff546444efc477419ca1b5f5ca2fa490124f6c373 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f diff --git a/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch b/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch deleted file mode 100644 index 4f88ab013e10..000000000000 --- a/net-misc/vinagre/files/vinagre-3.20.2-freerdp2.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001 -From: Adam Williamson <awilliam@redhat.com> -Date: Fri, 22 Apr 2016 14:54:09 -0700 -Subject: [PATCH] handle new freerdp pkgconfig name - -freerdp has now changed its pkgconfig name to 'freerdp2' - -https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming -we can build against both 1 and 2, we should handle both names. ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 585c016..362951d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"]) - - # Whether to enable support for RDP. - RDP_DEPS="freerdp x11" -+RDP_2_DEPS="freerdp2 x11" - AC_ARG_ENABLE([rdp], - [AS_HELP_STRING([--disable-rdp], - [Disable Remote Desktop Protocol (RDP) support])]) -@@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"], - [have_rdp=yes - PKG_CHECK_EXISTS(freerdp >= 1.1, - [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])], -- [have_rdp=no])], -+ [PKG_CHECK_EXISTS([$RDP_2_DEPS], -+ [have_rdp=yes -+ RDP_DEPS=$RDP_2_DEPS -+ AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])], - [have_rdp=no]) - - AS_IF([test "x$have_rdp" = "xyes"], --- -2.7.3 - diff --git a/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch b/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch deleted file mode 100644 index 6c22b46b2583..000000000000 --- a/net-misc/vinagre/files/vinagre-3.22.0-freerdp2-2.patch +++ /dev/null @@ -1,117 +0,0 @@ -Fix build issue with freerdp2 - -Gnome-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=765444 -Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=609474 - -diff --git c/plugins/rdp/vinagre-rdp-tab.c i/plugins/rdp/vinagre-rdp-tab.c -index b731f9b20ec910cc..13100de3dc0e07e1 100644 ---- c/plugins/rdp/vinagre-rdp-tab.c -+++ i/plugins/rdp/vinagre-rdp-tab.c -@@ -476,16 +476,17 @@ frdp_drawing_area_draw (GtkWidget *area, - return TRUE; - } - --static void -+static BOOL - frdp_begin_paint (rdpContext *context) - { - rdpGdi *gdi = context->gdi; - - gdi->primary->hdc->hwnd->invalid->null = 1; - gdi->primary->hdc->hwnd->ninvalid = 0; -+ return TRUE; - } - --static void -+static BOOL - frdp_end_paint (rdpContext *context) - { - VinagreRdpTab *rdp_tab = ((frdpContext *) context)->rdp_tab; -@@ -495,7 +496,7 @@ frdp_end_paint (rdpContext *context) - gint x, y, w, h; - - if (gdi->primary->hdc->hwnd->invalid->null) -- return; -+ return TRUE; - - x = gdi->primary->hdc->hwnd->invalid->x; - y = gdi->primary->hdc->hwnd->invalid->y; -@@ -517,6 +518,7 @@ frdp_end_paint (rdpContext *context) - { - gtk_widget_queue_draw_area (priv->display, x, y, w, h); - } -+ return TRUE; - } - - static BOOL -@@ -587,15 +589,7 @@ frdp_post_connect (freerdp *instance) - rdpGdi *gdi; - int stride; - -- gdi_init (instance, --#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ -- !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \ -- FREERDP_VERSION_MINOR >= 2)) -- CLRBUF_24BPP, --#else -- CLRBUF_32BPP, --#endif -- NULL); -+ gdi_init (instance, PIXEL_FORMAT_BGRA32); - gdi = instance->context->gdi; - - instance->update->BeginPaint = frdp_begin_paint; -@@ -934,11 +928,13 @@ frdp_authenticate (freerdp *instance, - return TRUE; - } - --static BOOL -+static DWORD - frdp_certificate_verify (freerdp *instance, -- char *subject, -- char *issuer, -- char *fingerprint) -+ const char *common_name, -+ const char *subject, -+ const char *issuer, -+ const char *fingerprint, -+ BOOL host_mismatch) - { - VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab); - GtkBuilder *builder; -@@ -968,17 +964,20 @@ frdp_certificate_verify (freerdp *instance, - gtk_widget_hide (dialog); - - -- return response == GTK_RESPONSE_YES; -+ return (response == GTK_RESPONSE_YES) ? 1 : 0; - } - - - #if HAVE_FREERDP_1_1 --static BOOL -+static DWORD - frdp_changed_certificate_verify (freerdp *instance, -- char *subject, -- char *issuer, -- char *new_fingerprint, -- char *old_fingerprint) -+ const char *common_name, -+ const char *subject, -+ const char *issuer, -+ const char *new_fingerprint, -+ const char *old_subject, -+ const char *old_issuer, -+ const char *old_fingerprint) - { - VinagreTab *tab = VINAGRE_TAB (((frdpContext *) instance->context)->rdp_tab); - GtkBuilder *builder; -@@ -1023,7 +1022,7 @@ frdp_changed_certificate_verify (freerdp *instance, - gtk_widget_hide (dialog); - - -- return response == GTK_RESPONSE_YES; -+ return (response == GTK_RESPONSE_YES) ? 1 : 0; - } - #endif - diff --git a/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch b/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch deleted file mode 100644 index d23ce4fa59f6..000000000000 --- a/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/plugins/vnc/vinagre-vnc-connection.c -+++ b/plugins/vnc/vinagre-vnc-connection.c -@@ -27,6 +27,8 @@ - #include "vinagre-vnc-connection.h" - #include "vinagre-vala.h" - -+gboolean scaling_command_line; -+ - struct _VinagreVncConnectionPrivate - { - gchar *desktop_name; ---- a/plugins/vnc/vinagre-vnc-connection.h -+++ b/plugins/vnc/vinagre-vnc-connection.h -@@ -26,7 +26,7 @@ - - G_BEGIN_DECLS - --gboolean scaling_command_line; -+extern gboolean scaling_command_line; - - #define VINAGRE_TYPE_VNC_CONNECTION (vinagre_vnc_connection_get_type ()) - #define VINAGRE_VNC_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_VNC_CONNECTION, VinagreVncConnection)) diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml deleted file mode 100644 index c20584016666..000000000000 --- a/net-misc/vinagre/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="ssh">Enable ssh plugin using <pkg>x11-libs/vte</pkg></flag> - <flag name="spice">Enable access to SPICE-enabled virtual machines</flag> - <flag name="telepathy">Enable access to remote desktop via a - <pkg>net-libs/telepathy-glib</pkg> client</flag> - </use> -</pkgmetadata> diff --git a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild deleted file mode 100644 index 97706955cfeb..000000000000 --- a/net-misc/vinagre/vinagre-3.22.0-r3.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 autotools gnome2 linux-info vala - -DESCRIPTION="VNC client for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86" -IUSE="rdp +ssh spice +telepathy zeroconf" - -# cairo used in vinagre-tab -# gdk-pixbuf used all over the place -RDEPEND=" - >=dev-libs/glib-2.32.0:2 - >=x11-libs/gtk+-3.9.6:3 - app-crypt/libsecret - >=dev-libs/libxml2-2.6.31:2 - >=net-libs/gtk-vnc-0.4.3[gtk3(+)] - x11-libs/cairo:= - x11-libs/gdk-pixbuf:2 - x11-themes/hicolor-icon-theme - - rdp? ( >=net-misc/freerdp-1.1:= ) - ssh? ( >=x11-libs/vte-0.20:2.91 ) - spice? ( - app-emulation/spice-protocol - >=net-misc/spice-gtk-0.5[gtk3(+)] ) - telepathy? ( - dev-libs/dbus-glib - >=net-libs/telepathy-glib-0.11.6 ) - zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) -" -DEPEND="${RDEPEND} - $(vala_depend) - app-text/yelp-tools - dev-libs/appstream-glib - >=dev-util/intltool-0.50 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - - gnome-base/gnome-common -" -# gnome-base/gnome-common needed for eautoreconf -pkg_pretend() { - # Needed for VNC ssh tunnel, bug #518574 - CONFIG_CHECK="~IPV6" - check_extra_config -} - -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=765444 - eapply "${FILESDIR}"/${PN}-3.20.2-freerdp2.patch - eapply "${FILESDIR}"/${PN}-3.22.0-freerdp2-2.patch - # https://gitlab.gnome.org/GNOME/vinagre/merge_requests/8 - eapply "${FILESDIR}"/${PN}-3.22.0-gcc10-fno-common.patch - - vala_src_prepare - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_enable rdp) \ - $(use_enable ssh) \ - $(use_enable spice) \ - $(use_with telepathy) \ - $(use_with zeroconf avahi) -} diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest deleted file mode 100644 index 56fb2cd63fb7..000000000000 --- a/net-misc/vino/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST vino-3.22.0-patchset.tar.xz 158480 BLAKE2B fb8b50abde8cb4728410302c1d3a57bc4d344a33ac0bd9f1265fd24eb142dcd52e870845b902c9b63e98134f87873ebf6abfcfcd1efadb72b0cc72b04f9bf4be SHA512 cf96f5dce96d5c060462698c9d8df6f6d94eb9d624cb689c1262830840ed8f3617485f2274832076c273625e92a89732f9c2ae99dbcbf495e5293cf88408064f -DIST vino-3.22.0.tar.xz 768716 BLAKE2B 5c3f6df059f129009bbc97527d1767bc8a29d8cbff5e6f9e89dabc4583ffdae2cf235eec66cbcb5f9e73c9a0a7c05a504e4e90221bf5adfc2ecbbbd518fdc84a SHA512 29b88e151b0b8c69bce1565ae3ec2e788f48c7645429984329fb2d3daaf03cc5ac100abbf70247bf0516c6d03a3b9aeb78d018c8f1bf35fd241919117fd1105f diff --git a/net-misc/vino/files/CVE-2014-6053.patch b/net-misc/vino/files/CVE-2014-6053.patch deleted file mode 100644 index 8830c30f870d..000000000000 --- a/net-misc/vino/files/CVE-2014-6053.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b1bfadcbfd88970c6d48672e2dbcca8713c91411 Mon Sep 17 00:00:00 2001 -From: Nicolas Ruff <nruff@google.com> -Date: Mon, 18 Aug 2014 15:16:16 +0200 -Subject: [PATCH 1/3] Check malloc() return value on client->server - ClientCutText message. Client can send up to 2**32-1 bytes of text, and such - a large allocation is likely to fail in case of high memory pressure. This - would in a server crash (write at address 0). - ---- - server/libvncserver/rfbserver.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c -index a880b53..2615dc3 100644 ---- a/server/libvncserver/rfbserver.c -+++ b/server/libvncserver/rfbserver.c -@@ -853,6 +853,11 @@ rfbProcessClientNormalMessage(rfbClientPtr cl) - msg.cct.length = Swap32IfLE(msg.cct.length); - - str = (char *)malloc(msg.cct.length); -+ if (str == NULL) { -+ rfbLogPerror("rfbProcessClientNormalMessage: not enough memory"); -+ rfbCloseClient(cl); -+ return; -+ } - - if ((n = ReadExact(cl, str, msg.cct.length)) <= 0) { - if (n != 0) --- -2.20.1 - diff --git a/net-misc/vino/files/CVE-2018-7225.patch b/net-misc/vino/files/CVE-2018-7225.patch deleted file mode 100644 index 1b1186b4fe78..000000000000 --- a/net-misc/vino/files/CVE-2018-7225.patch +++ /dev/null @@ -1,64 +0,0 @@ -From d8a663541ef358a13fed2fbb39e7d323454369dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> -Date: Mon, 26 Feb 2018 13:48:00 +0100 -Subject: [PATCH 2/3] Limit client cut text length to 1 MB - -This patch constrains a client cut text length to 1 MB. Otherwise -a client could make server allocate 2 GB of memory and that seems to -be to much to classify it as a denial of service. - -The limit also prevents from an integer overflow followed by copying -an uninitilized memory when processing msg.cct.length value larger -than SIZE_MAX or INT_MAX - sz_rfbClientCutTextMsg. - -This patch also corrects accepting length value of zero (malloc(0) is -interpreted on differnet systems differently). - -CVE-2018-7225 -<https://github.com/LibVNC/libvncserver/issues/218> ---- - server/libvncserver/rfbserver.c | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) - -diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c -index 2615dc3..2224edb 100644 ---- a/server/libvncserver/rfbserver.c -+++ b/server/libvncserver/rfbserver.c -@@ -59,6 +59,9 @@ - #define DEBUGPROTO(x) - #endif - -+/* PRIu32 */ -+#include <inttypes.h> -+ - rfbClientPtr pointerClient = NULL; /* Mutex for pointer events */ - - static void rfbProcessClientProtocolVersion(rfbClientPtr cl); -@@ -852,7 +855,23 @@ rfbProcessClientNormalMessage(rfbClientPtr cl) - - msg.cct.length = Swap32IfLE(msg.cct.length); - -- str = (char *)malloc(msg.cct.length); -+ /* uint32_t input is passed to malloc()'s size_t argument, -+ * to rfbReadExact()'s int argument, to rfbStatRecordMessageRcvd()'s int -+ * argument increased of sz_rfbClientCutTextMsg, and to setXCutText()'s int -+ * argument. Here we impose a limit of 1 MB so that the value fits -+ * into all of the types to prevent from misinterpretation and thus -+ * from accessing uninitialized memory (CVE-2018-7225) and also to -+ * prevent from a denial-of-service by allocating to much memory in -+ * the server. */ -+ if (msg.cct.length > 1<<20) { -+ rfbLog("rfbClientCutText: too big cut text length requested: %" PRIu32 "\n", -+ msg.cct.length); -+ rfbCloseClient(cl); -+ return; -+ } -+ -+ /* Allow zero-length client cut text. */ -+ str = (char *)calloc(msg.cct.length ? msg.cct.length : 1, 1); - if (str == NULL) { - rfbLogPerror("rfbProcessClientNormalMessage: not enough memory"); - rfbCloseClient(cl); --- -2.20.1 - diff --git a/net-misc/vino/files/CVE-2019-15681.patch b/net-misc/vino/files/CVE-2019-15681.patch deleted file mode 100644 index 31bb47ee9b27..000000000000 --- a/net-misc/vino/files/CVE-2019-15681.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d9f3fa0ede556c6a751a8ca6c8bc37e769715233 Mon Sep 17 00:00:00 2001 -From: Christian Beier <dontmind@freeshell.org> -Date: Mon, 19 Aug 2019 22:32:25 +0200 -Subject: [PATCH 3/3] rfbserver: don't leak stack memory to the remote - -Thanks go to Pavel Cheremushkin of Kaspersky for reporting. ---- - server/libvncserver/rfbserver.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c -index 2224edb..ca4f59b 100644 ---- a/server/libvncserver/rfbserver.c -+++ b/server/libvncserver/rfbserver.c -@@ -1565,6 +1565,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len) - rfbServerCutTextMsg sct; - rfbClientIteratorPtr iterator; - -+ memset((char *)&sct, 0, sizeof(sct)); -+ - iterator = rfbGetClientIterator(rfbScreen); - while ((cl = rfbClientIteratorNext(iterator)) != NULL) { - /* Client is not authenticated, ignore. See GNOME bug 678434. */ --- -2.20.1 - diff --git a/net-misc/vino/metadata.xml b/net-misc/vino/metadata.xml deleted file mode 100644 index 117499b97b35..000000000000 --- a/net-misc/vino/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="telepathy">Enable desktop sharing through a telepathy client</flag> -</use> -</pkgmetadata> diff --git a/net-misc/vino/vino-3.22.0-r3.ebuild b/net-misc/vino/vino-3.22.0-r3.ebuild deleted file mode 100644 index 2b7a49e24349..000000000000 --- a/net-misc/vino/vino-3.22.0-r3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -inherit gnome2 systemd - -DESCRIPTION="An integrated VNC server for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/Vino" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="crypt debug gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib" -# bug #394611; tight encoding requires zlib encoding -REQUIRED_USE="jpeg? ( zlib )" - -# cairo used in vino-fb -# libSM and libICE used in eggsmclient-xsmp -RDEPEND=" - >=dev-libs/glib-2.26:2 - >=dev-libs/libgcrypt-1.1.90:0= - >=x11-libs/gtk+-3:3 - - x11-libs/cairo:= - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXtst - x11-libs/pango[X] - - >=x11-libs/libnotify-0.7.0:= - - crypt? ( >=dev-libs/libgcrypt-1.1.90:0= ) - gnome-keyring? ( app-crypt/libsecret ) - jpeg? ( virtual/jpeg:0= ) - ssl? ( >=net-libs/gnutls-2.2.0:= ) - telepathy? ( - dev-libs/dbus-glib - >=net-libs/telepathy-glib-0.18 ) - zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) - zlib? ( sys-libs/zlib:= ) -" -DEPEND="${RDEPEND} - app-crypt/libsecret - dev-util/glib-utils - >=dev-util/intltool-0.50 - gnome-base/gnome-common - virtual/pkgconfig -" -# libsecret is always required at build time per bug 322763 -# eautoreconf needs gnome-common - -PATCHES=( - "${WORKDIR}"/patches/ # Patches from master branch at 2020-02-15 state; needs autoreconf - "${FILESDIR}"/CVE-2014-6053.patch - "${FILESDIR}"/CVE-2018-7225.patch - "${FILESDIR}"/CVE-2019-15681.patch -) - -src_configure() { - gnome2_src_configure \ - $(use_enable ipv6) \ - $(use_with crypt gcrypt) \ - $(usex debug --enable-debug=yes ' ') \ - $(use_with gnome-keyring secret) \ - $(use_with jpeg) \ - $(use_with ssl gnutls) \ - $(use_with telepathy) \ - $(use_with zeroconf avahi) \ - $(use_with zlib) \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" -} diff --git a/net-misc/vmnet/files/vmnet-0.4-Fix-build-with-Clang-16.patch b/net-misc/vmnet/files/vmnet-0.4-Fix-build-with-Clang-16.patch new file mode 100644 index 000000000000..058d2f2d5ddb --- /dev/null +++ b/net-misc/vmnet/files/vmnet-0.4-Fix-build-with-Clang-16.patch @@ -0,0 +1,33 @@ +From 6c4416e8c266c7dc10eb3f3af8f913ace1da84e2 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 28 Oct 2022 17:16:17 +0100 +Subject: [PATCH] Fix build with Clang 16 + +Bug: https://bugs.gentoo.org/871171 +--- a/vmnet.c ++++ b/vmnet.c +@@ -49,12 +49,15 @@ + * to set up the SLIP connection and parse/generated SLIP packets. + */ + ++#define _GNU_SOURCE + #include <errno.h> + #include <fcntl.h> + #include <pwd.h> + #include <signal.h> + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> ++#include <unistd.h> + #include <termios.h> + #include <sys/ioctl.h> + #include <sys/select.h> +@@ -251,7 +254,7 @@ void tty_setup(slipconn *sc) + } + } + +-int slip_setup(slipconn *sc) ++void slip_setup(slipconn *sc) + { + int disc, sencap = 0; + diff --git a/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch b/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch new file mode 100644 index 000000000000..5c4fbb152e9e --- /dev/null +++ b/net-misc/vmnet/files/vmnet-0.4-replace-missing-musl-function.patch @@ -0,0 +1,20 @@ +diff -ru vmnet-0.4.orig/vmnet.c vmnet-0.4/vmnet.c +--- vmnet-0.4.orig/vmnet.c 2024-04-02 08:35:41.521216356 +0000 ++++ vmnet-0.4/vmnet.c 2024-04-02 08:37:34.760604906 +0000 +@@ -50,6 +50,7 @@ + */ + + #define _GNU_SOURCE ++#define _XOPEN_SOURCE 700 + #include <errno.h> + #include <fcntl.h> + #include <pwd.h> +@@ -197,7 +198,7 @@ + int master, slave; + char name[1024]; + +- master = getpt(); ++ master = posix_openpt(O_RDWR); + if (master < 0) { + return 0; + } diff --git a/net-misc/vmnet/vmnet-0.4.ebuild b/net-misc/vmnet/vmnet-0.4-r2.ebuild index 5eaff92b3467..573adbc16276 100644 --- a/net-misc/vmnet/vmnet-0.4.ebuild +++ b/net-misc/vmnet/vmnet-0.4-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic +inherit flag-o-matic toolchain-funcs DESCRIPTION="A simple virtual networking program - SLIP over stdin/out" HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/" @@ -11,24 +11,27 @@ HOMEPAGE="ftp://ftp.xos.nl/pub/linux/vmnet/" # So this might be better but it's a different filename # http://ftp.debian.org/debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz # We use the debian patch anyway -SRC_URI="ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz" +SRC_URI=" + ftp://ftp.xos.nl/pub/linux/${PN}/${P}.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}-1.diff.gz +" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc x86" -IUSE="" RDEPEND="sys-apps/net-tools" -DEPEND=${RDEPEND} +DEPEND="${RDEPEND}" PATCHES=( "${WORKDIR}"/${P/-/_}-1.diff + "${FILESDIR}"/${PN}-0.4-Fix-build-with-Clang-16.patch + "${FILESDIR}"/${PN}-0.4-replace-missing-musl-function.patch ) src_compile() { append-ldflags -Wl,-z,now - emake + emake CC="$(tc-getCC)" } src_install() { diff --git a/net-misc/vmpsd/vmpsd-1.4.ebuild b/net-misc/vmpsd/vmpsd-1.4.ebuild index 242eeee574a7..899cb2c1f2f7 100644 --- a/net-misc/vmpsd/vmpsd-1.4.ebuild +++ b/net-misc/vmpsd/vmpsd-1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="An open-source VLAN management system" HOMEPAGE="http://vmps.sourceforge.net" -SRC_URI="mirror://sourceforge/vmps/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/vmps/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/vncrec/files/vncrec-0.2-clang.patch b/net-misc/vncrec/files/vncrec-0.2-clang.patch new file mode 100644 index 000000000000..ce4936df5a11 --- /dev/null +++ b/net-misc/vncrec/files/vncrec-0.2-clang.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/740826 +--- a/vncpasswd/vncpasswd.c ++++ b/vncpasswd/vncpasswd.c +@@ -86,3 +86,3 @@ + passwd[i] = passwd1[i] = '\0'; +- return; ++ return 0; + } diff --git a/net-misc/vncrec/vncrec-0.2-r2.ebuild b/net-misc/vncrec/vncrec-0.2-r2.ebuild deleted file mode 100644 index 71f1c49f2578..000000000000 --- a/net-misc/vncrec/vncrec-0.2-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="VNC session recorder and player" -HOMEPAGE="http://www.sodan.org/~penny/vncrec/" -SRC_URI="http://www.sodan.org/~penny/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=" - x11-libs/libXaw - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt -" -DEPEND="${RDEPEND} - app-text/rman - x11-base/xorg-proto - x11-misc/gccmakedep - >=x11-misc/imake-1.0.8-r1 -" - -DOCS=( README README.vnc ) - -src_prepare() { - default - - eapply "${FILESDIR}"/${P}-includes.patch - touch vncrec/vncrec.man || die - sed -i Imakefile -e '/make Makefiles/d' || die -} - -src_configure() { - CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die -} - -src_compile() { - emake \ - AR="$(tc-getAR) cq" \ - CC="$(tc-getCC)" \ - RANLIB="$(tc-getRANLIB)" \ - CDEBUGFLAGS="${CFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" \ - World -} diff --git a/net-misc/vncrec/vncrec-0.2-r3.ebuild b/net-misc/vncrec/vncrec-0.2-r3.ebuild new file mode 100644 index 000000000000..5ddfaf0d7f86 --- /dev/null +++ b/net-misc/vncrec/vncrec-0.2-r3.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="VNC session recorder and player" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + app-text/rman + sys-devel/gcc + x11-misc/gccmakedep + >=x11-misc/imake-1.0.8-r1" + +PATCHES=( + "${FILESDIR}"/${P}-includes.patch + "${FILESDIR}"/${P}-clang.patch +) + +src_prepare() { + default + + touch vncrec/vncrec.man || die + sed -i '/make Makefiles/d' Imakefile || die +} + +src_configure() { + # XtErrorHandler usage matches docs (seems right), but headers "may" add + # __attribute__((noreturn)) giving an incompatible type error with clang-16 + # (could alternatively use private _X_NORETURN but this may be fragile). + append-cflags -Wno-error=incompatible-pointer-types #871000 + append-cflags -std=gnu89 # old codebase, incompatible with c2x + + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die +} + +src_compile() { + emake \ + AR="$(tc-getAR) cq" \ + CC="$(tc-getCC)" \ + RANLIB="$(tc-getRANLIB)" \ + CDEBUGFLAGS="${CFLAGS}" \ + EXTRA_LDOPTIONS="${LDFLAGS}" \ + World +} diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild index 91d250b58b94..c38602a82395 100644 --- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild +++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,11 +7,11 @@ inherit toolchain-funcs DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers" HOMEPAGE="http://vncsnapshot.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc x86" +KEYWORDS="~amd64 ~arm64 ppc x86" DEPEND=" sys-libs/zlib diff --git a/net-misc/vrrpd/Manifest b/net-misc/vrrpd/Manifest index 9a753e86eb47..ff0f05077753 100644 --- a/net-misc/vrrpd/Manifest +++ b/net-misc/vrrpd/Manifest @@ -1 +1,2 @@ +DIST vrrpd-1.15.tar.bz2 148430 BLAKE2B 787fa185ce64a0711403718b2627d9d2d8867ef3956090b93196f62d92428e0e02ee4440bc23fda46cdca70ca6693b76ed28a5e469a31e86fa4e36dc25c6a82a SHA512 4e7fa17e01d9b667f538204fbe84decea47ac7d84da8adf2e8e3bcf042d233a704a99347d3d97531993f2693c145ff54fb3ac346ade33f5d99cfbbac405ed784 DIST vrrpd-1.9.tar.gz 542249 BLAKE2B a412559be70791515c6b82639a8e1d5fc33954963fbf00aa3c549434ac0748b9d0ea657b2d02b1a3537a30742c18fe6d6db832a11c23b6989151c5f04c771d05 SHA512 8c719cabbd6a799e4e439dbb698af9d6e24cf2635cfbd71a204b46bd2b65c1384e53f130b663d0fcfc903d89080ff25d9c97ae4cd9f6b2434d5462cf678a306b diff --git a/net-misc/vrrpd/metadata.xml b/net-misc/vrrpd/metadata.xml index f1c67d2187e4..ee849f0e1dd3 100644 --- a/net-misc/vrrpd/metadata.xml +++ b/net-misc/vrrpd/metadata.xml @@ -6,7 +6,7 @@ <name>Robin H. Johnson</name> </maintainer> <upstream> - <remote-id type="github">fredbcode/Vrrpd</remote-id> + <remote-id type="gitlab">fredbcode/Vrrpd</remote-id> <remote-id type="sourceforge">vrrpd</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/vrrpd/vrrpd-1.15.ebuild b/net-misc/vrrpd/vrrpd-1.15.ebuild new file mode 100644 index 000000000000..89e3f7fe5ba8 --- /dev/null +++ b/net-misc/vrrpd/vrrpd-1.15.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Virtual Router Redundancy Protocol Daemon" +HOMEPAGE="https://gitlab.com/fredbcode/Vrrpd/" +GITLAB_SHA1="a318281271973c7430cfa520b540585153454c4b" +SRC_URI="https://gitlab.com/fredbcode/Vrrpd/-/archive/v${PV}/${P}.tar.bz2" + +S="${WORKDIR}/Vrrpd-v${PV}-${GITLAB_SHA1}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_prepare() { + default + + # Don't hardcore GCC + sed -e '/CC=/d' -i Makefile || die + + emake mrproper +} + +src_compile() { + local myemakeargs=( + DBG_OPT="" + MACHINEOPT="${CFLAGS}" + PROF_OPT="${LDFLAGS}" + ) + + emake "${myemakeargs[@]}" +} + +src_install() { + dosbin vrrpd atropos + doman vrrpd.8 + dodoc FAQ Changes TODO scott_example README.md + dodoc doc/* +} diff --git a/net-misc/vrrpd/vrrpd-1.9.ebuild b/net-misc/vrrpd/vrrpd-1.9-r1.ebuild index 6779c96389fa..5aefe0f4576f 100644 --- a/net-misc/vrrpd/vrrpd-1.9.ebuild +++ b/net-misc/vrrpd/vrrpd-1.9-r1.ebuild @@ -1,30 +1,36 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit epatch +EAPI=8 DESCRIPTION="Virtual Router Redundancy Protocol Daemon" HOMEPAGE="http://numsys.eu/vrrp_art.php" SRC_URI="https://github.com/fredbcode/Vrrpd/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/Vrrpd-${PV}" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="sys-devel/gcc" -RDEPEND="" -S="${WORKDIR}/Vrrpd-${PV}" + +PATCHES=( "${FILESDIR}"/vrrpd-1.9-rollup.patch ) src_prepare() { - epatch "${FILESDIR}"/vrrpd-1.9-rollup.patch || die + default + + # Don't hardcore GCC + sed -e '/CC=/d' -i Makefile || die + emake mrproper - #rm -f atropos } src_compile() { - emake DBG_OPT="" MACHINEOPT="${CFLAGS}" PROF_OPT="${LDFLAGS}" + local myemakeargs=( + DBG_OPT="" + MACHINEOPT="${CFLAGS}" + PROF_OPT="${LDFLAGS}" + ) + + emake "${myemakeargs[@]}" } src_install() { diff --git a/net-misc/wakeonlan/metadata.xml b/net-misc/wakeonlan/metadata.xml index bef24d2c2337..9e9742ba819e 100644 --- a/net-misc/wakeonlan/metadata.xml +++ b/net-misc/wakeonlan/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">jpoliv/wakeonlan</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/websocat/Manifest b/net-misc/websocat/Manifest index 291728d1d00b..b7050aeb5f77 100644 --- a/net-misc/websocat/Manifest +++ b/net-misc/websocat/Manifest @@ -1,249 +1,211 @@ +DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 +DIST aead-0.4.3.crate 14717 BLAKE2B 304e37cb58ebbd8a0ff8f38eb178afad7860cfeb3f1c719f061f4e15282e3cb133089270a1a2dd9299c4007e1963d373578c7fe4139cb222f05a2d15b2313485 SHA512 c1f700a35c5933acc38ca6aa2cb945c4676a4765802d6021c35631de5ace35390a9dc877c1669cfd8789716a73b0397dfe551c32f50774683b0b8573b54fbd77 DIST anymap-0.12.1.crate 14298 BLAKE2B a4f5f4f18263e0a6d5b67ac8fbb56cf410534a0fc3e670d57a3275d0efe318c98b9b594f0be44dd7ac9fd08cda1d05733489290884af25f76ea981e0ae61ad60 SHA512 88fbca9ff7482ecd338f9cd9a025499ed98b47eaa89ca8dcd1ccfb013b6c9ebe7a8eca5d7c873eb716c320af7ccda01f6d4c26bb333c8ff434416416ee64a774 -DIST arc-swap-0.4.3.crate 48193 BLAKE2B 4335a97b50f1adb2de484202373b004770a8d4c43eb34193e96953d9a926af5370ed288b30c0b0998e023decd4c76484766f20608d03fc7a0b40112748f737be SHA512 3e5ec14c30c2a061dde5bf1b61ffa753745d1b0fc31081c3a52e3c6b83593f790ce7c25d25bc35a50768a31e8f4dcbe63dd12a1606d2d6939f0096a5bdb6c877 +DIST argon2-0.4.1.crate 28834 BLAKE2B ce5aea2b60a5417b51c02eba16cedf1c0b8e5da8ea06c9ecdff6135f60b63fff56350d77c5b7503b1ea2483e53558f44a535f80ea71876cf816e00ca6a18ff3d SHA512 32dc18c92e73d85baccec4c7650f558574280b85e173bcde639c1a91bef1320bc19a77d6f716f1e3237ad0156a773009c0f0d004c092579c7f82fa3827ba81b4 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 -DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925 -DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b +DIST autocfg-0.1.8.crate 6621 BLAKE2B 15afc4b27028f542b6977bcf19cc75f7e47df1f4e241e43d858bf451a659a2e937e0a3c1c8918d4fba6d1f66e47ba2f2e329023f3dcaff182e048e9e4f783825 SHA512 d6156e0a8701f38c20b693380ed1ac5b15f84bc87c5ae0541483b9b387e6118d8673d8e5da5f4eee4d736c777e923d3fba7f61589a49c353170a708a709d8db5 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535 DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb -DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b +DIST base64ct-1.5.2.crate 28206 BLAKE2B 1059855de932f0d17c39c05f0b38a01e314284d16bf5fcf7b3627a51ab0aef210fb1c6f6f5b84aac7492769b51de8c235139de77e3f92a6b4a792669d8943236 SHA512 29d704441942d65bb0ce4c6940bab9c803cb79cbdd4118e0cecbe23aea9597b5770271c83ad7d5d9ef6608162807de2711f9f12aba8757f0d93638849de21b10 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST blake2-0.10.4.crate 46804 BLAKE2B 694e81198aa92d610a189056558b77765f8231a2dbde4e861396edb57398af30e10c6bfd8bb0b62c2013d4874b5442d3df8857499d0f5fff640649224ac4663a SHA512 ea6fde4969d66de70e0689da8c76efd37c8f70b9f1d1894d5c1e497a980b011cac75ac650170b7f0face9f85f0c35d05e136dcf823e1cbe7df3db58b72c6fa4b +DIST block-buffer-0.10.3.crate 10465 BLAKE2B 32f0089971bb759244b73a75bdbbeb2d24f0422e92ceb0ae0afe3c698e3fabb371112a2eba3dab16a3859420d492c0ac984bfbb25e59e0c31951501cc652aab7 SHA512 e29faab70f8f2965a58089728274ec34bc97d681526687868c9cb1a2c145db00717f97e77b79a04fa52bd76817d796e104b509cd2a3163085b214f8eb68ac04f DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa -DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250 -DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538 -DIST cc-1.0.41.crate 48185 BLAKE2B 7fb7eba2079aed5bc7775e9e8585f9b1267066bf51cf7aa9f5ad25789f7b57021a457d2811f705d4e6bd0f38d033cea1c6be23894929df8df9f3bf1b2dcb6a20 SHA512 3a39bd28e16c3e7715e0588fb9eaef6b83075e68c1ad7aa0969d89baac1e2753f9e68b56492bf5df5b1a4882fd1b6a1df97ce559149873efacd5aa209a0bf352 -DIST cc-1.0.71.crate 57452 BLAKE2B e49f68bb602b0649ee3c4e7b22b7a49eebc4501a1105961ad361f00718de1f2f2f998cd93b9984d8d50d4418a86348fbabbb3bcefd7d0fa3acf812f32cf654c8 SHA512 c3c94bdba52f97ccc18ef6f71b0c70e30d89ea981541bdaf19758b765732ab572161534fe944d3ec6a9d5aa72e21583245554be86251c9ba236cc7d1aed19383 +DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 -DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 -DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf +DIST chacha20-0.8.2.crate 30716 BLAKE2B ddf2d375d46b3a6d0ae2bb1215d1de1af04e29e6deeef08b71886ab8060f047cbb973ef5b2e7f11cfd7c692fe601efc0087b29a18b0101b8cfcf6b34f91be2c0 SHA512 2718dfc786b3d4fe1cb6817f09c5f174fd3649e7a2eeb8218e2355b3ee59f08b6e81e8f6830e683f9ddabd8ac55628d470b5f5159045106e8a597e39f359139b +DIST chacha20poly1305-0.9.1.crate 68379 BLAKE2B 47580ca5562b50a8785cf33c5bf58600e7bb795aad1b6985f7c7cefc63f8be40032cb71711c22a1c2d97a2126041b51f17289c98801ef39b40b2593b9a115569 SHA512 d41c347ada6ff99c5fc7f389ea422a5fd7059679d35d4728df360e90a59e66254f6fae2611edae3c012316fea5570166b7db6c3fd88a52d0500a5222bbdc238a +DIST cipher-0.3.0.crate 12756 BLAKE2B a572b0140512b7512d496f2706cdfaedb680d47a283e3db8b4be97418585ed988929a3beed44012e8a9d9728cbc21f00b78bcbe376bbf57614d54ea07e4daf4c SHA512 8f0094c7786160730825cff21ca838f52801783f1f4f66755b0771595963b8b99fc926265ff502c66b94a2e6703d592d42bbed96ebf8d3a690bd5e731f0f5c4f +DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c -DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632 -DIST core-foundation-0.9.2.crate 26857 BLAKE2B 9090a489f2d3cf8cbe59472530470dea0ae9e1a0838207424953be812586aae013f9f6cafc4ecbe68be302f4ca208d8c892c87b5736dadddffd6d739e6427934 SHA512 9f68929963fdeb16954e6642f27173fa5d08d39e835d74f03e18d7cb23e9077572d712e7c9afc8ab0be377fd1d845625986d0a905eb6d55331027be2a25d4f9a -DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07 +DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82 -DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551 +DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e +DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 DIST crossbeam-deque-0.7.4.crate 19868 BLAKE2B a9cb1bba32df38980da7a4042610e514ede6f6ba15abd08629aa28b4a70e8c96030eacddf438df0701c4aea8c07cbdb088ad88b1fef24880a50d234160f44123 SHA512 ebc8bb09a46cb9cd999d8abc034b21016510a086282436aa73416b456ec7893b1c70339e05dab45cdb93bef4435939b0d95826f74bdcbb077e5ff31d15377da2 -DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892 DIST crossbeam-epoch-0.8.2.crate 39283 BLAKE2B eaad3cff833fb3672c93f6f0f4ca7073c709f9ea489c034da5fb2dab2da0676d493300c66bc746c8372369815aac3eec2ab9cb875dd9464cb59ae25c4ef4c6c9 SHA512 7406e92a768dee07c8d13b0fefd658e9eebfd3e89c782c4690740353c0de920013c345d6c112a78a2014396cc837ce4fdbf845dfcfacfd7a57172f483bb9b8e4 DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444 DIST crossbeam-queue-0.2.3.crate 14753 BLAKE2B 1dc60d5a48672f26f0c3afd0b14efc943fe9aea8fc9b10dc1e551a489a178899f1a82c0bc8bebf8511e112711ebb26170d1f76f9caaf06556bbe8b74242e97b6 SHA512 f53385dea0a2b0830372ee11b9d393022f501a79631a15696d641a812939faad62b61112f9da9dda381fe69ecc3c91462fad95f329eddb002aa941110297cd85 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5 -DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3 -DIST derivative-1.0.3.crate 39909 BLAKE2B cf76a6a2a82917a09dac420057fa27d405aca3cc4403548633d4ed4f2fb2b8428feb1d76e15f64ca7d8e773b103739a2387495d3fbf9528abba23dfd52c0fc72 SHA512 897bac6fd81555684cecd7afc2a3b6546917562a7637ac0ea4833ab7d74c382383b3452fd554d8ed13a0cc150d9f4484e0c956c16a65404bfef866fc7bf5f0eb +DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f DIST derivative-1.0.4.crate 42508 BLAKE2B 9996bf596e7646a242acac394c9ec2f5be20b49ce3cc257c26d51fd676740c46114005b05d270e31235f59916ad90238cfc5d30728b5e114b908c74974254f55 SHA512 b6dd82e4ebacc5df58302d2baa8d47eb12aa6d87bb3fb9ef125bce17e163e5a6d921e99e88d9ac91fed402a912e80ff92067a9d6236a8e52f6f8e8435f790623 +DIST digest-0.10.5.crate 19503 BLAKE2B a73ef5f7b85869f8f6e2bd1c83f88f155ffab8ae1c687018ddd12f5806385a2664c163101aec84d4c20647a8bfd04095aa997e088a3f56e2664adabff1c5614f SHA512 3542fc0322a8b10dbc229ae83475a0df5f9beee4f879eacab1fda53a7b61136df2961265472ae66d896681bd17f8a68148b25827733bd782c6bae05d2f307951 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055 DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893 -DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844 +DIST fastrand-1.8.0.crate 11369 BLAKE2B 93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406 SHA512 82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1 +DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386 -DIST futures-0.1.29.crate 158346 BLAKE2B 943336cf753166f852f9dcbeb8e0b76d1d26cf6d688449a99f9f1885912cbc79327115514ad93d28bbdf1b8a91b2d22f8f62d7e5f5feb61f3024e9a749e11da5 SHA512 16b16ff65c75cc565c5364406f5d9c0d120a07a520f6ea2dc86aaf4644b9ad6fb32bc021b44fb7c74246cb7a700b3df3bfa813908541eec079bd7eb7beee0200 DIST futures-0.1.31.crate 157731 BLAKE2B bd1c51f7b5c6018547d1aee3ec550fa55ca955b48c04c8e9e91e5aa944540fa69fe590d2296085d7e772c7aaac37dce00624323bd6e31f92af269dcdbf30d511 SHA512 4be7199261201ef4dcdac5a5a237a70eee33d8fad9a81f76d739f4fc7ad39c87fb2f4719ed7e7a7bc5773c5b51196e4aa4ced5375292198c8d89a03f1692b341 -DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8 DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8 -DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925 -DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d -DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6 +DIST generic-array-0.14.6.crate 15889 BLAKE2B 7beac5446f5da4d077598af43c238eb7e71a12b0b91e6be5dbfc1ca33dc21d128fc93c9c8b18caac4b88830c8c8a643f2033acaca1d9a9f3d95329d042276156 SHA512 254e6fb6658f083f26e022916795c9ebfac241b9df2d811aac8316b17e1375e1c5aa54d72f1bf6c2627a88484a7df4b14eca231c90578e9aa3d9997047fa0f20 +DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a -DIST hermit-abi-0.1.3.crate 6741 BLAKE2B 0a7edada6e7c834fdd20b804237d29558b9b413ab99b538de5647e485d36864749fba6b8f46b4a6de4c620cdaa2d711bcc6759b53f8d57438ec5c9b78da71ea8 SHA512 ca85d69192ddd2c1cf0f12d6abc7eaa70a71956df5b55aaf1d3780c6e40207c33bb188a92a5f4769478c4ce13bd93cfd6b4134a21e245781b4ab4e3cb3eabe87 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 -DIST http-0.1.19.crate 101834 BLAKE2B d3f557e34c93235353e170b472c37cc4de1c3814833205a8e8f1f747cbbe170bb94ec50bf0c62f8a539c518d5f163e34d30584e2680c5efcb94f3c70b0a75a0f SHA512 d24574664c9e6b766584b21c84df942110cdcf1afbe8a0ee242ebd030c431679b91265db76c439c4b5e931947fa507097d8df68e3b4fd9ca04139808bed25f76 DIST http-0.1.21.crate 103053 BLAKE2B 78b888c4aeb641399bdf5696b53b596041b3d7236fb9596b6d6676f98563fbe8cda4d3f6fd5837d852b4235c862c42303977be5f092adfc00df1fe3634e0e859 SHA512 edb1ef74c8f73c89dc7b0ebc83a6c5985ee6b1223001403d1b8c1b2c3ffa3556c80df7f28575620c8145a35dc3846b05a263dbeafb3c62547c0f17c3ac6c82ab DIST http-bytes-0.1.0.crate 11513 BLAKE2B 50ac2039bbecdd17ee3057850dfcedd3999bc628053338935cadd7dc4f2d8d85cbc1ac4d4bdb7caceb64e2c113746691d18b3144cd0573b2224cfa774001c257 SHA512 c800062d0a12710c6101f2d4cb6363b999613a4d092baed5ebbfcfcf0d51ee042be9b48967ac61fb4624e95fea2b4acd4b4b5fb67461fe5c06e3e388051fdbeb -DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457 -DIST httparse-1.5.1.crate 26758 BLAKE2B c2f17a601b54032c1898b88feb836ec380465b5305e240d9466760aea85bc709ed873d1677714acba0d493d27fa5f5288931cb7d62f240e50e2d6b84d4e72046 SHA512 70eec6bec5927e272d7cbd09472a14b0f33d153498d5e1894c0853bfd35981c0d249a799c3f4acc01b8499c29519a49d81efb755bdbce124e55f73eb75cf8592 +DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f DIST hyper-0.10.16.crate 113115 BLAKE2B 9276328c07d6bee7fc172d8104b6e8f30f0b0fd441937d2f4cb94e54c076a47e32db6a7c90827995c6c5c63e535d2cc6e597d52bca2bede17d117f038d971435 SHA512 22a9c31c490b002c8daf085536abec24cb01c0d63a16e6d153eb3cb165a7338d2109d6f88fa8d343942e2c6d7928d3c5ba62575a404b0dd7811f57e423eca4d9 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a +DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158 -DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b DIST language-tags-0.2.2.crate 12754 BLAKE2B ea59a130fa723b1537e451d5a51914391fc0d375d40df1d8b3ccda64819e918332e344585523d3ba61bb0394899fc1663cf7a452aafd4a7e694f8d70627f1bc1 SHA512 54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 -DIST libc-0.2.105.crate 554066 BLAKE2B e8e3113ee326c02355c700ce5f16b3e037cd576cdaaa68b2b9eb1d3ab1d56083f0aa43e7ad6adfd62fb154e39de5038eae1ce43b0d283e294bd6d5454bce6077 SHA512 3e6c196dffb108c67e59bfad157e6fc2dd7e65453da562456aab68d00fea8e1ffb8c552bcbc99b6f60e74a29b3e6609747f47db6598379cdd5873d3a7c0a67ee -DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40 -DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde +DIST libc-0.2.133.crate 603256 BLAKE2B 00139eb8ec3921b961c20e9334e7b2fefe87d03df22c77b213491c07d93be193d991a814efa20c91cd5eab93fe392ef511ae4cec497bd5c41372d5aad1c31dde SHA512 526561652d77d5f61fa52dd9fe02a46a5f66289ec0aff5b2464311c3a90972c3ced0a84dbc901fa99a0fe35ef36af890bb7de40b9c6b7b7dce7fe8a1a738ed7b DIST lock_api-0.3.4.crate 18750 BLAKE2B 1aa7cb716efa665df7b09ee8d95c9fe0ef7ec108d89348e413e78e3af4d6274a49530ac03d5438a503a7c6dcfe20973c1c040d79b6cf228c5a15696a1caa4a8c SHA512 1517ec7cb1f9012da78be866e026be40465cc9befbbfff4a5f644ec19653baab6b171323c3fb8ef218df4a7bc4b305e42a6b9d6849654d0542a1c2dc8fe11fd8 +DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990 DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f -DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc -DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b -DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590 +DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434 -DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c +DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa DIST memoffset-0.5.6.crate 7382 BLAKE2B 42ebb93b567b339822201e31830971c32452b3d6681787c6969360c8db54912ae511580d8c899a3b9cb7f2fba98099c8df4c17534b97e4f4b1902d9251296527 SHA512 6df8952d41f60fa0993fbc85d112a15c1f6ecfef66da29ebdab71f40cd8ee8722400693b6ea023344f1b5dc351cbe828f465a8cabd150377a62948cedeb5db6b DIST mime-0.2.6.crate 6719 BLAKE2B e9c859193c3360dc6a779640c4323129171a3e7f0ef07007b0cf8f38e9a745ac4f252ff7d2dda5a67348a98447e25d04f1909cae289db8c8e959dde6b118dc18 SHA512 30e0cd95c8961ddce61759fa2c7273dfd37d490f96a5715d558c6c7775457560268309c3ad1222ff8150beab8f328b3a958dc05729d9550233d3efa0a1e13137 -DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24ce0a5b0716d89c0e254bfdf3a7d4e591ab70474dd9bdb92a48be9d74ff4d7beb3ae158accedcf780525cc SHA512 a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097 +DIST miniz_oxide-0.5.4.crate 53485 BLAKE2B 8836697bdc3707f89fa869e6b09a36ee4d83ce2ae0a53bc7b06bbad70ed7ac25f8f67d841f3f611f6756d891f0eddb0abf7fcaf87570f8ab32220f113583ea6d SHA512 589dac16ca9c2f94e6fa92b68bcf51d140f46562cbb3a1b791b75c59feae51da5ec16042604bbd6bcb7d7f0c7f75e98ea1af8cf42d177133a5eaa86429cf3114 DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c -DIST mio-named-pipes-0.1.6.crate 14766 BLAKE2B a372fc2f2393917811bd56c35cfe6616b879e59b220c7a56b92caaf1d68227ea2b388f0507b696b738c7e470041e84ec86e422066738a3cc5c52ac90c9c057ce SHA512 02e33e7b2d33eba7865ddb158bbf5e72b8eebf728e4f06831d71db431d9e444307f42ca490ea2d9a0388fab1734e1ef4dda99127036e58fabd1f7186221a3b61 DIST mio-named-pipes-0.1.7.crate 15140 BLAKE2B 5e19ee9baaac61efa0c683f46acec94dbb5a932a6012370976e444d265f71b7dc168c9de838389c5fd492c5bdb15dbc1f8e8956640b11fe5b4e3e09a5b7f12ea SHA512 bd78651d89c292c792c108ab5d199da436ad62097c0fa1563523b8fd5a3c7dc0a7a948df38a4ad05a8e97d7f30652de6ef15d9f0be9157653de11c790ed25c90 -DIST mio-uds-0.6.7.crate 14389 BLAKE2B b01fbe5ba2e2f58d2bc513ef577c70890ab0a556313dc8e980d4f51d4622be9180215e2e9655e3f02aced40823bdf69b94a8b63c6b2624e28cd24fb5dd89b0c4 SHA512 fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04 DIST mio-uds-0.6.8.crate 11496 BLAKE2B e52d131f292c7c09fa116ec5c760d50e8389c27fd7b79a4418f0222ae124fba0e5943b5494866e9db75407ab9f6b1a9c7aa7fdf2c4d601e8c785dacd8166f6da SHA512 b6c752ae9f25c37fc7e23e06a8843089c5291d60e53a6e9093eed1d8baf64c9e0ff14bb2ea1c0c8815b00026b28fefab2aa34104bdbce7e99549786d0f507a73 -DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72 DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba -DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699 -DIST native-tls-0.2.3.crate 29087 BLAKE2B 0304db852e3b1261a791a5a8aba5dc6fd2e13bc32e6ade5ab0f58403583ea45324a4ae4359061c2a9137cc7f127404ef663702a22fe64f2489691de71eafc914 SHA512 9964d627c922261ea730076a2c8447784e0ceebd8e6218f5a61093021f10682c2fa25815c10711831b7d41c84b7c77cc1128a663669058882b0af6d70ac0bc09 -DIST native-tls-0.2.8.crate 24956 BLAKE2B e5b130b717c04e3d9413d6cf45986b67060f31793e2825585b8e4026e73927340ee9edd5f5f2d6750200bc9eb0a4b8fbabe0a1578d6a8ea17208f2fb28d2a201 SHA512 3648272b1c2f10c3eb9c7121c20a26da149efcf248187522fe07fde9b506a2b687e8bde8e09c0f8f74d19db5b84ea98b19b177c6daf38bf8a0c3ec05907006a7 -DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9 +DIST native-tls-0.2.10.crate 28590 BLAKE2B c2dda4aab348cf0fe436bbece790ceac9d1b5425555aa40d09a5560058a22a931843e905ccf9e8cbbcda87ac7a7a4146b77ba369f6f7d7043598ea0088140feb SHA512 1cc30c3e16e103e49d585d017fb09962798d33dc4186a5dd3a28f224d3645e8301d4f5cab9b667a27dee88a49233b69974b41ee4aec2bb32ae0745e27b92b352 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec -DIST num_cpus-1.11.0.crate 11776 BLAKE2B 00d57b8a05807837fefc6596463d6bd3e7815833189142b361f932fc25c78c7910c6d6c37ba43a56201f4ee0f3a27ee9ade7d00f22dc05974aba683273f5e8eb SHA512 b2a04b41c3f9aced42e23fa16db872afbb0a456b22b967e98826d22b4866da066633903d4a29d6e4af810513238062846c82e38989c74aee4607255c09929468 -DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f -DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827 +DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9 +DIST once_cell-1.15.0.crate 31460 BLAKE2B ae4481883865abe6a684d63520fb2e91b64d6ccdd0374464200015640122bd68b8a769309773226c8a31d0119f450ee821a2bd35c346fd86adb4474ea7c28fcf SHA512 934a7c3631e9ca4fa78d9577b6672ca0b2f926a8d6c3be9542b906c5968033446f98f76ae6f368a1a5b92ab9064c31a57d74ab6d2097108029a7ea951541ff7e DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40 -DIST openssl-0.10.25.crate 185164 BLAKE2B 17cc67db6e4188d111f75f52fa03da910c86ae79d8211f6fa252d04c064ec90a1008efd2d69e0c8a54719d3d547a783bb6950c9bb0525840c31efe45bfe9c7b0 SHA512 db7a8af332c8db921cd07f778bb591a5d013d98848e1772cf5b9550562a5ae55e6459047f4b3263f813dc9a0b8f0bd302ad86dc620b71339bce3136f7daed029 -DIST openssl-0.10.37.crate 207283 BLAKE2B 638eddca70c6dd94197455aff3fc089a3f6d203603efab9522759de67dd2b13c81a68fc47e4cd7b129478acc0d9290de47231c266df8024abe2a0ba159bf82d4 SHA512 bc1644215d0cba6da273fb03c9f18cb3a70af31b7db430eab2cfec630743c035c15a01e95313314b84e515502c87b4c707caf8e1f916476e703122b4d128cd4f -DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a -DIST openssl-probe-0.1.4.crate 7066 BLAKE2B 656434ec1d34466e903e5c69289a277d14623aa7bd8a7c19bea974c7de57fcec9b2b4ed212f37d7f7b90fbf02a486a8ac7f7c318cfb3b3930e54e276103154b9 SHA512 c5d4ffcc6faf009b38dc715ec85fd75b3e3b0c0293041ea26071bb6d19d8d018a43ec166bf79ef1c7a126cf783bd4a7121d5dfcbed36db5ebf0fe4decb198f17 -DIST openssl-src-111.16.0+1.1.1l.crate 5095644 BLAKE2B 5c0f1e5348d283355a61d2479dbef138de71cbc459f406bb6765923fd15b7a47e529567e1f10fddf56f3c6d9d1dd9358b671adb465b4f9dad3b7382a6c4df1c6 SHA512 de5723f7745fc3d445856a7e8afa0e1053afeb63d11a13973c772ff94eec9d09a69a593d24d1de0cba289eccd14a079683af554ce5752ea32e7e76c40fe78cf2 -DIST openssl-sys-0.9.52.crate 45059 BLAKE2B 3c82ea9c70d9e3c7b0959bdef835f6cbfaef89cdab7128fb0cc2fa008eabd5451ffc0495f41c6f0c252364e3826d4cb9fc3f0efc687cbef39c9a7f184a5349ab SHA512 4e0f5b4905d0ee2effa0fe5f44f15496b92cdc91c2abd9ee8a05249f1c1a7a579ab292bd3eb11d279689ce74344d8cca981b41f461b8c61ae33bece1c0446e16 -DIST openssl-sys-0.9.68.crate 54900 BLAKE2B 7a42c1479b68535be636156444e69ff7422cbd8fab522120a1b86e056121a4761287a8a81b6c21bcd25d8fba04dcc40ccb99b1388836f6c79bb1a800109f24c9 SHA512 74bb8e9270bbb97e4ddb9446bc2d5825cf51b04dd7a7e30b23dd5aa01315ff6972aa48c5370822a87c871f029b247ecf34c19d75b00c954de548f51b8118e700 -DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba -DIST parking_lot-0.7.1.crate 32670 BLAKE2B 46faa97dd3e3e5625fc40de75eb75f17512ba63ff5ef3ee380fc549bc08b3a119a91622cc67014b9c072ae0f5ab05b10f52c24486fc03633d850ce22812dfe4f SHA512 d83d3c457e15ffce500d4fc82d0b9840ea2ed36d43d4eca841b05b0a9ee73ff6fcce07ccc3a6f0d06d950d7beff85db0c3d13dc1461adfef390d6b3d85367bed +DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae +DIST openssl-0.10.41.crate 219460 BLAKE2B 363832d3d358514d6d5c97d6e7f7d56b84b33655c3df318b38e0ebaa3e19b84f94aa600347a8cd8f1682accf24a6de342c585e3449f8f8889fe5ac40cc4a5441 SHA512 2ac24fb9b29f8ec3f54944277df924925a0b9a9e4f8a604f8efb0039794520e99520bc28d53355ba4224e69484dfd93265cd174c6463159837f316aae5a9789d +DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd +DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c +DIST openssl-src-111.22.0+1.1.1q.crate 5103224 BLAKE2B 3d437377cc0a320e852721af6baf119b8e9bb3f461b7fca45e510e2b8e76086a52809c359e2bb2ceeab789c44d8d8ee7a8eef9b521202fb96704e90c5a291e03 SHA512 edecb0d0115b8db74447bab4c347761c2ce88436fa2d17ffce938258f7d4d6533995f2029f5466ea730d833dd3ac86e637ed846736184584846411b36f7f242b +DIST openssl-sys-0.9.75.crate 60028 BLAKE2B 1e4b3733d3309a1157c16a236728aeaf48b1b0ea448643416747343fbb96af86c8035ae0cf4170038b4521c88842f42a2379fd733f92fc9742e7c2d837eccecc SHA512 14985af6224bf1b6aae0fbd22c09e6b8ce7b9a6ace0970b1b45fc0e8c700e6a4bcb6b1883e3c78dbeafa02a18d4a84f537a952460d3f0baac3135d1f994af13a +DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c DIST parking_lot-0.9.0.crate 35170 BLAKE2B 3de9050c5dbbc7a0b98a5cad05dd485142bb2a22e65216a20f6e87deb6d124b4502cdb3837dbdc992ff5ea62c67e1545bab269237988832d365fba265149d245 SHA512 148da5edc08da3b27bfcc94a1c0578f228ccfbdf7a7a6f3aa73ac34e290d795f4169553bc7c2b20227e095e8ac75446db51979b595e4d77fa7c76f743138a331 -DIST parking_lot_core-0.4.0.crate 26817 BLAKE2B f8a733cd6e14a2ad40adf498a3aa23bf3ad06e788f440bb435c544e5ff9750dab963ce4fc673014e54a851ed541975116f18f102f935e21912fc5b65a6aaef19 SHA512 25c0389e9d3d88725398fb304d3a4c20a3da0bf0d67f12c7cdca38f8068dc6ea7b57341579136cf4792cbb92fd64dd33cd91412463f4df8902e1b8c87ca08d08 DIST parking_lot_core-0.6.2.crate 30598 BLAKE2B 048e87b1a785da927afc368290c2e1dd762d98239d862a1aad4850d9498b91e8d64c399bfda0586c23f02fd8839723af1d5e2ef3e714cd932ac11a111b978543 SHA512 5de5d9cac290d7d6e6a3e1fbba2784cce8b4ed163481e1cc6ec36498884b5e3cf0225c718551289be164d1a4e192de390201a083560898e4a42a4068661c0689 +DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df +DIST password-hash-0.4.2.crate 26099 BLAKE2B 3f211d467d43960c1d767111c679d2ee7ca004a14946409e37b4e8ea46848100095bd43ac5d4e4ab31828e6fc09e67eb0b40e677dffb086f711668c4918c8bcb SHA512 f6b7da81fa172ed37229894c426965182be1a445ccaba4351b91ce43ff1ab8cacd205b321721df49dd43ba17dc6a77e9b7cccc3a0c396572aa7ad642af44926d DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9 -DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc -DIST pkg-config-0.3.22.crate 16145 BLAKE2B 346b67a2000eb91ea8867e5a861c87a7728909d6b20dd00c9b4571d89e5308a108906fc80fe3a2d014fff0411d9bb30fcde224abf8f4aaf37164107861083bdc SHA512 435b9d99a1975692db3efb3bd0e92899c43ba4003aecc4859dc71cd2175521973d5cbe1be06fc3b40af2a7bbe1b0a845be73586c0cd96dc218bc4fc7dce11107 -DIST ppv-lite86-0.2.15.crate 22002 BLAKE2B 3f967f112ba799f18a3f897c944ea656994abdc7c912868023de90d3885a87d9544159c44b6aeeffd83c1fe0172e326bed4044c2d199ca899da4f8420629736c SHA512 6dac73153d244cca97ea00e429f783a7d03b48f10ee450cf6f8d77581010b28be5048f53322b0c888b425b5085f440b6ea90599ea00c55c641de6e29da42f0b3 -DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d +DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8 +DIST poly1305-0.7.2.crate 31868 BLAKE2B afbc7d84f3f67276d1da7d2b1b00d23de35b6b46205e8a4309aa9f1a2abc582cb09b63b28773daffe45074bd250ec77b54923ef8fd422918625179c99b7d410d SHA512 4fff82358985b564b7ee76626854d67221740b6f8540754939899ad3c773809182eaf3e4a2fb697ab382c4a6643116cfbc4756a5a2662eda240625e879e10cdd +DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0 +DIST proc-macro2-1.0.43.crate 41512 BLAKE2B da0577094cb0b8b419f3160bab6342f97865b01337be4cd7a344d4dea98fc2f8905dd05a56427792379f59565a25f8e16cfe4a37edb3bf77bf2e703f27953fdb SHA512 3139c668dbf593afeb77b970c77edc70f7b46b42d80f1d0e30773dedb14ab98c9eeca0dc953bc940610954860fbce663174ea6c270b8711db45aef4d57f3b910 +DIST prometheus-0.13.2.crate 81623 BLAKE2B dd1411ba2521e3f0bd705bf8e164acb93e809d0850f2c7001ea0f40e24269050f5fc5107fa8b5c0613b0304f2c64a4782b2392eb3833865d0497e056d6411fa8 SHA512 9c0282fce8b053a1ee8f2253b885a843b37982a7f261f4533ec0dddd006b9439ef55c3cda1efdb3433abf9ed9d1d7584b3aaf98f67a2706730c459de214002ae +DIST prometheus-metric-storage-0.5.0.crate 7129 BLAKE2B 366653e1306c0a32fbb68aefb3ee30099d700e0b92f2795b01ea4bab49e8cf60055765363124386e48597aae20138b25e15967b90e80bbd4cfec6584ece39426 SHA512 08f2479de155acf03c8f8a7e4fba7035a7652cb906aa504b56bfea168dfe70f8f3c398c489d9e92f9dc7a48c8a320b9f2ac5372019b4f32341e9b2a4b778bb87 +DIST prometheus-metric-storage-derive-0.5.0.crate 3719 BLAKE2B 4ed22782a0e09ad68935a4b1bf9df82b1c151766f02a0372cbff0028c2ef747152d20ada17d3bc693b8dd0cd5db3ee8030a4c73d6f50b1c0ab8f276eefb6f540 SHA512 35d3af8a68c65c435f94f3173ad1b2d117b87df7b889fac20c49c0137120c898c6f9bfc066efa73fa8fc8f13ab6cc8e604b1d36a4ce55d984a8fdbc2c8574e2a DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e +DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 -DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c -DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e +DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b -DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028 -DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf -DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87 +DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f -DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0 -DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5 DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 -DIST readwrite-0.1.1.crate 2307 BLAKE2B 1df2d3df987384653d75e18358aefea5ccdc975096eb2f7c8a6aaa5818f42b8ba00890b5534fe07026c09ce705e9a85e29a47b52e2d3e4ccb1f3ca36c07a1dbe SHA512 5699553f350fbcb27a7f045f2157f7a34c5cbf498f0760dbd1c54564f9dfe6a5fe05ea086a54a9e175da294c3b2729c65786d62211dc7d0dcce5477e73788dba DIST readwrite-0.1.2.crate 6872 BLAKE2B e1626076fa42000faa6e12cf32e76f9feac00aba6f88024a786945ed0549819bf402dab1cebfab5fb325f901885d39e58a942f00331a7da47ce36f893dde46fa SHA512 f043f8176e202075dbecda73782fecf644d7246b7df9ba194d6caaf42a25f93941ca3a6bca4d2870357314e2a19c7f837de682763e167756247e1a96a0e8c22f -DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184 -DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92 -DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd +DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72 -DIST schannel-0.1.16.crate 39153 BLAKE2B f06cb0dcb3d93ac1debf396b23faf5df2b87ce98732ccf5c0ef78af0c36fc9825f2b716f0a5772dc71cd2b2e6ecb477a81c2dbfb6bbd4f84bf3d1187dd7cf187 SHA512 11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b -DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0 -DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719 -DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37 +DIST schannel-0.1.20.crate 41579 BLAKE2B a7924b4bf0f130e2aa4668cad3c7112e39e028fdcb04259c6926fac4875f8061a9148da5f001dc49051310ed8e6ab341da0990ccf0a7cbd4dccce8da54c1ca46 SHA512 19f217fd4571a0d0fcf52060a8639e0ce7114719aa23fb0aa2ab5a531e8f8be0a21af55ef45c8da804101e5a62f15669e66fe005c4cd5bb24def09f1b4afe059 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d -DIST security-framework-0.3.3.crate 49844 BLAKE2B fae140b05d3ba618cc1072673913860a298e5592f4909533463083736ff75d9f1a9deecc1665732dd675fe76e8cff316c1723ad5d2dfdbd044e4c1f979b59749 SHA512 6234ab31093cacfc8d98ce91c29a030cb06eb48c2a22feb9c0e5a29824c95805ec36edd6e1c66fbf5014f70b94a66aac31e8f69c069784d25b361c7fb7c22cb3 -DIST security-framework-2.4.2.crate 64857 BLAKE2B 7ad2311ec2ab1ebe8aca0b55a5b6b1dc328ad294818896224e950cbedf39cdda3e130395c5c2dbc64ccd3fa5603d028a2c0890c38c4a18dba4a25bd22cf66380 SHA512 de4480e4bf70148cdcaaf3a9c0e52ab061cea452b3209918fbda693faa7feb8c2df56ac29139bfea74969b8f62ba3ab2b3da38654e35aedf62fdddcec420998b -DIST security-framework-sys-0.3.3.crate 9554 BLAKE2B 851c1c7e7d972b9f74d7278fc501c3894ffa0fea31954fdd2ef5e070c28c080cce04d35acfbdec9871c4544b218ad420ebd42bf6f426142046d805ea99dadc27 SHA512 a78a9affbdff5c44e63e555970748724a4cf1fb1e47a6a5645294f70b2c0960d3ef93d3289c3695d5de31c8f7a9b093e3ffb801a1631b474b5ac68e0b68bfe22 -DIST security-framework-sys-2.4.2.crate 12821 BLAKE2B b1731747e2525aa3aad02be4da8076f6e25d33faf54b431e84c0bd072ca236c682ed492621a7aef725d0c1bd20a5f35ef01d0d518b06fa7bdfd2417b081f4cf6 SHA512 d2f35545223f1ec671f9265017c393a6219cd1ac551ec7b3bea6f90ac9e79cd9d9f7232fe7fca5f0c093b3f549925571d5a4f0b702f29a1e992e038446f48bd9 +DIST security-framework-2.7.0.crate 72601 BLAKE2B 593b08ee9c393d49e7ba9264705d91f969f006a944a855995761c7e00d0c97b3653350f9165649b774bc3c9f9f564307298951cc1b03ff47aa4d0fae501eb513 SHA512 7bbc52a951b328ac25a65dd5d69d173b566f18ee62158a98e2d2d4fb8c51c8dc9930bd78f9cc2ad4eb2fffa1bbb4eda3941a37ef1b545b78f3a39bc480056307 +DIST security-framework-sys-2.6.1.crate 17717 BLAKE2B 5951228dab98af742825a30584e38aafb096d1580375c960feb1ccce7163c6e42802fba4212f556ea8b8b09b1b40bdeec0bcf4af1d7eb4b05fbd271aa3a4cd01 SHA512 7315c0d67d2e792932cd6634cbb9da5021c8d9a1a1e96b9d92c6718d73be3aafbc5613cb355fa1a3d1860f13c62e829bc220b43ad18d739ea1b5aece0cab470a DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd -DIST signal-hook-0.1.11.crate 22255 BLAKE2B 09fe7f44808822e98c7fd1469a23e8f27da9fb2c8e17e118ce601b6b72c62398feb53e150c2916587a5b4a875e4972c5f5c3f52776cb4e3279a19faab4b3bd89 SHA512 852d2dc03ea4346a2f04ff553092e40d158e5ecf9b48b29167a0d2563bf64ae20fb56c8fee0aad963cf3aee136895d84acdc25b27d556d8babe134867f8e8d13 -DIST signal-hook-registry-1.1.1.crate 13795 BLAKE2B b87991a154d29d2bcd5ca64462eaba92edc7ed881e18ec0485fe3b6cf459da0499b236aa7daa3e8c714d45e59f7986f5e753ba1fd76ee348da2614c9c483af89 SHA512 3947e3249861ef50d2261080dd47fb400fded19d5c8555c4bc65f10ededc7102c6eb26a299de961308310a9856d2a757d7a981a24e3bafa0cec72b55b515fba7 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d -DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661 -DIST slab-0.4.5.crate 15888 BLAKE2B da43a90a8c1e8b8e0d353751cfac036076be56421f80ca5c911f6e30fd19f43e2ab50be7163f22b2e9785286941d62f036a6778b62f2c9f640f48501276eec78 SHA512 9ab2db11b5da437148486a7da44f06eae2572a735764711145738f9da66b1ccbb8b974ebe3600d1ff7a6ddf07d1fa9dd04c9207c4ba54eaa8311c41d317182ca +DIST slab-0.4.7.crate 16647 BLAKE2B f567cc822e7b84f64a0b0372c22a0463d260871455a33df025808a0476dcbbd4e051a117d8896d96d6d3d0655b7c296cd691ca22edc54486440f4e2e0f5d1e1b SHA512 659a9ca3323fc2cd236f6cb9eb6feeae8a1f5fa046fa239a34cd7a5ab8a7eadb9e5977e8d5cc41e9138900dd7c75ebc0601480771c5fdd2e084ee76619b82521 DIST slab_typesafe-0.1.3.crate 5980 BLAKE2B 8ac675c6c313c13d2f8fc88b44c41314578c0c990335dae8f216daafc3cb0b122042cb54b65b4ca8264c0c6bdb3b6d07edac479f615f23fafc3417d7d6f4115a SHA512 f2dbece513c795f7fac857dfc060034bf61d0d51bb1891566d9c36be97308562033251c11e422020f67bc04bcd9111148f434b55051f69b9ea0d79b072cc410e -DIST smallvec-0.6.13.crate 22760 BLAKE2B 83e573aadf1742122bbe1897bee09867d9225624474cf8c9a1bdd087a8e69eecf9567e8bdd2bcecdc8cc08f5f4c4f081bcf718ab062ee399c9a09b7f8c54948f SHA512 497e1a77414d545b44f099a69529c6c9a8be8cbc80a84bdc9e85428263518e6949b81498b9ce6ab2795508b1c3beb5e7e5aaa3623bbed2c041f8c3f4a0adfe33 DIST smallvec-0.6.14.crate 22855 BLAKE2B 5f96c825c57ee6ab80bc13469793dc7ee780cd856e614c6cc0c747e1cd43fd5e27b589652610198e7757252bb6fb25905f616ea82fb9d8a9ffd5c8cd394b4f49 SHA512 4ba563b542922523566efbe0aac9df499c694bea9ba8ba14a74026d516e02f1fa8f542774b8044150a8e27f01a4b1c71c5280b5a82f61d5b45f022ed223f3977 +DIST smallvec-1.9.0.crate 28396 BLAKE2B b04100f0a8db9e7c34a425e665242772c9857c5a4c5f34468a3f1b14f669d5cd21de2d54dc5295a22f52032370e8e989fc61cea3f4e6574ccca5be639c645e74 SHA512 e7158393d4257564eeb8fa53a630fdfc13edb33f3c555e41606edcfdbe9189e5c59c25d255dd21d02d4abad1ab2931e21744ec6c2f91ad4db66f87e748a45e56 DIST smart-default-0.3.0.crate 6297 BLAKE2B b2e782a64802595b94c6e36b7365b4353ee0a16c5f9477d0222c9862991ebc6841d0f0ceb1dc671da139afe190fc15f3b1c0ece2fc62c897b4a351fee5523072 SHA512 022bfb5321d01cbcca95eb30bfe75bb80bc0f48538cd6434c5ae89252289e3f1daff0a7cd46532ad936f8714544451ac3138a0c3507e9de689dafbe396afd34d -DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c -DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4 DIST structopt-0.2.16.crate 26165 BLAKE2B 3609dffe30adc12dd30b3acf6bc1722841ad0823f3199569c616b6cf9502a3b89def471571bdeddff4dbe1722e3b595de3c5b18408b4f4f2015a2db0b51bb517 SHA512 3154f168dabdb6476989970e75d43c8d730f73b567171c0d3bedaa1549ffa13dc543c28b25174efdbb90637b972e9e857dbf2422b95fb55ed9dabbde069e191e DIST structopt-derive-0.2.16.crate 12951 BLAKE2B 7b7eddb8854a5bc47b8d91103b2bceaab9057b553c72c4ee6c995dd4392cc9594124cc00562115bc0250b87499f8b8480fb34d8be1434bc55a668a79cfda6c75 SHA512 7ede89d104af3e57e9a78eae16cc8644622b1e83f8ea852ed3cad2e03d3ccb50e5fbd0f3f73cdc32b51bab6607b9b65266012fc7294d48ca0a234875c816a301 +DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7 -DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 -DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a +DIST syn-1.0.100.crate 236691 BLAKE2B 0e604e48b2e9498f2de290ea0c7249d03a2e7c388f920c5f671a861770c96a5d72958fb5efde45490c0fad0f5ba34a25927e5ae1a538062feee509b0d8629ebd SHA512 20fbac3fa505bb2bafebdb35e3581434240629d8554433ccdfa1ef8cc4b74e31ca0355d47abf7081e983d222b14e08c5a806922e5490a7c19d5a6bdc2ffcffde +DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a -DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83 -DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25 -DIST tinyvec-1.5.0.crate 42745 BLAKE2B 24d6f60d08b53e067ef783db4f6e51a9edd9f73fa9e3511791c1c00a861c6676f18043127351ecfc49771a760eeb7db53b584ee882dee6bdaefe5e6ba5053cda SHA512 b4d1624965ed6b7e8ea45d80fd7332b5733d7b5e78f8167d13c9b9e8eaf3c586268c2f88ea0c51211808def997f8e751214e3de757b19076807adf7aca8aba82 +DIST thiserror-1.0.35.crate 18451 BLAKE2B 5ffe5fba8734291cd5304285ef327e4af2f2e2d9c7272d878ac2d3235761deeb789cfe55752b5876bb7949b02f2483ddc8749ce85f2241385249b5a4c479cf79 SHA512 2a55a0cb831cbec2529132a4d230360ba8f89f55b46d1116bb7a3461e92141d58935ff83b6d6e3c8eb99b690752f9aad2281c99dc9b3a242b3cf349d32d61912 +DIST thiserror-impl-1.0.35.crate 15433 BLAKE2B af40ee4a29ae92c02bd7681ff9c3f434462056a7386b3b8d7b370d1fff2235f0b674ed9c282daf48cab760cd6232962593ddd1afdb6de2f40092a42e0fd9ff0f SHA512 8669781bc8165126274813653ec9ccbce2df18f6549415571e5db28f64b7715e11ac3f87128769e14b6b49535aaf6964db6a382e0ac482c35fe983b88f9fb1cc +DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf +DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873 DIST tk-listen-0.2.1.crate 14268 BLAKE2B c8381e66ad43a7649da2f84170ae45a4d04ddd7a9f10e085fd537edafc3a7ab5c3697f092e8fddabd92307c6757c8b8ddf1fd33c2479c375b812d99aba9517dd SHA512 134240c0cb3255c77aceed3e88ad95d63df8a0c2df1436925579dcc78c2ae9efeb1045a5f295c09e87d5c8e8aa8a5961fda411ff345ae74b8292f58884bf7344 DIST tokio-0.1.22.crate 70031 BLAKE2B 44a6d1ff8bbedfea304e4f44b5c4bf998876a632adfe611c3d851aa64ad092b7b0150c2b39ebeae8bb34cca6824922300bb3fb762cce6b5a1fcfa852ed8d86f1 SHA512 d92b8527bbeec84bb306686a7d29b705c36b59e9c0995154ed95d483c84952c838691f8c11615f481abb6c4fba470ba8968860a74a88b77dd67ccf659bf4e4e1 -DIST tokio-codec-0.1.1.crate 7617 BLAKE2B 868f45ddaa16cef0ec7143ae7d25d422fa4fd7fe59bc99a7ae4b97f700dd6418610b917a880f1fa5c939799168d8c31901d7186a0195c7b72bd130a01c787b7a SHA512 9c868545e8adc234a51b81966836b786019181ea25907bf14887ce26ed1cf5866f5df8898bbf6bb7c8d3626f145ce0465d3a79050d53f8dcffe98f71886f9044 DIST tokio-codec-0.1.2.crate 7850 BLAKE2B 68e196f0cfe2742f5bd6a4074eafb7cc83d80622f51743e9cda367c8fb26bcf3a6a10772963e75f86c3ef054270f22a13e58a3455ee316145b111a2d6ad00053 SHA512 69bb3a0ea81fc8437fd57c2ee533f0674770182207576e463c8a5859956175a4619500b832863cae9ba9d0d09d76c33441c7b3e929896a61304b25c9d2dd6c94 -DIST tokio-current-thread-0.1.6.crate 19339 BLAKE2B c3fe401178089864fe59286566b84a325d8a4101b0b72dda11fefef945d5e14b5e6b6c7de7d87cf222f0ea3d1c95aa65f2c43fe37c2e766f8d70da66c7d060ec SHA512 321d8b99ea18827400a6b7899755eea5a8299e53985f5640a6fd82bf6c3c5c45c68e9d125666968976d05be407d6c15401380870adc231233cc532eb979353f6 DIST tokio-current-thread-0.1.7.crate 19690 BLAKE2B 1a6ccb40e59095df2e4ece5be501027a9975297c8606cbf107e8a365529d175415d1738e6770c31b586685fa0e573b6c4eade68fc83b1e01d89c2e22a3741e28 SHA512 4458eecddf552cc63dfb877976cdaa2060f8fd82a9cb6667f8fb3507aeffef4f3db38d649de55bd784f98828a12bc066d35e96c60ca07a42cf8f16a5fd7d58ea DIST tokio-executor-0.1.10.crate 12191 BLAKE2B 9efed875a669cc842d298d2ea5ec310a008707f5ec4b796d68fbcaa3ff47c3484630306116d6d36c71f4461869e63a11dd498cb680013f5a3c2a9a46fff9763f SHA512 e2101de6130d09c1a0cf750ea49f605db2933ee4d96943e111d550816ba6a67e4d662e0ba5fb548ae62d582b665239b27b8478f2364b6c46d038dbde8cc41754 -DIST tokio-executor-0.1.8.crate 11775 BLAKE2B 0cef2a4848f624ef8c3a450b06d8530ca64be193980cf1cf6f4c1c74b6602e9e0f47ac070caded410a843938d2c3defe8696e4a27329d42d04ca9cb4f6d7811c SHA512 b6340dfa0cb67da1b00288b3250cfa4f0b55907d3448768f99a7cfcd46ebd1155c84cd35659d740501f0575e9c5b660a2f769335acc14da7dd5cea59b10b6334 DIST tokio-file-unix-0.5.1.crate 11181 BLAKE2B 42feb87903ce66953b7ff70c73ada3131342727046d0eeaaacdc46e47e2d27f59e2ec8443123e7fadef0461221cf0d922adfac10e17eeb402f235041adc5656c SHA512 7f40a8a90b26185058f13127d4361d50c9e78c78854821be79a899d45df0fa2a42f889623f9e0dee1824ea917086b42f90b84ac761f414e110413cfe65e7d766 -DIST tokio-fs-0.1.6.crate 16102 BLAKE2B 4b31d365a898ad0fb20c6ae315aa60236d6423357997e34a5069597d72b146d7528a7ab974ff2e7f62d60c46461c1bd6c4b74208f61b2452088c4d8f9bf63aaa SHA512 8a123bdee5f2a6cacbe68f25baa5810a7686fefef8262b0a6b67e217ca6594a585dca52de581d33f4b71725bf03e003dc500f75ace88dba5cda00a52ce544279 DIST tokio-fs-0.1.7.crate 20881 BLAKE2B 08d22887c990149cd3aeefc3a9aef949124a2c3cb9edb5ec2b76a01b90f85a22226417f75319f92514d812b752ff7090854188e64d2c1af8cf8c773b7a97a8e5 SHA512 3a1023dd9537164c61ba07b4759d05136165274efed6cbb7bf868ccabc311353b0e221137d2be643970f4d710bff20251104344a7542a08ac3d60ef502624d2f -DIST tokio-io-0.1.12.crate 33555 BLAKE2B 5646f1d0c226d223fdbf648d95cd690ad6f755c5dfa9a6bc4d5fe4b5df634029db6178d852d3a4c2d481d06eec763985186753088157557871e5ba6e8aa650af SHA512 57c675ade48f2885ab8f42dac7297bf4bc5f7abef2302f7964dc145ce29d503c09e3ff890de01aedcf0c860fe22d2161f9837d658457695b6205e601fac74149 DIST tokio-io-0.1.13.crate 33665 BLAKE2B 4e9c6bda0d391ae685dfc89cc0137fc44b31a4a788f730ab632b73d92ab55dad871d68b03ae0899cba9f96e402f88a60d4b8be5d484947b8982a39e473e5b8ae SHA512 608341311f4bda9617634a2623033900bde1d6b9fc89ae52131838f033bdbdf8704114193d8409ea0e10bd53d6f7ab63d47e17b7abb41d3f8865ab36fd0532ef DIST tokio-named-pipes-0.1.0.crate 7055 BLAKE2B 3864a722160dc7f77c6cceb3c9cbc97f406873810163a3060419ab48d0c5e93542d6d7fdebab8ecc0d2f2169cb823d49d3c12b9537d8b0b7298f96e67a61fed0 SHA512 59726719949fbfbc9bd079ab0ffaed0b3ba570d4bbb8b1bc7fba83ef716423ac44ba43a95fd5cf7e625ea73a6da7c3723a42ccacfb530df3a06124d42926a604 -DIST tokio-process-0.2.4.crate 24856 BLAKE2B 7626c0800d53524679f36ddfaf70bb4245070ccf49e3fa5167b142258e201fd3cdef44561d24dcc0dc72e3ec5261970e58195296098f2c8675438b2bbe0f20a3 SHA512 a2018350db00f11499bbdd91a98ace58353a8363c464f11a4f517f9b63fb59113e963861bf61b34ca1f01184f31e501ed6e4133fa39852a2eb3246956cf9812f DIST tokio-process-0.2.5.crate 23688 BLAKE2B 555f3ffee5ccc574ea19a07c558af0ab735447695ed654cd94476387658c065ee8749883e716f07e11b75231aadbd28fc14ef1ec93d09b18086e9bb6398a2789 SHA512 aa22040bb26d23abab955903a7973020c596b07744d1d53c6b5ab425314dc96a03ccd0128ed5f531f0cb3202e64ab00976523b359c5bd8a863ba947f64b21d87 DIST tokio-reactor-0.1.12.crate 21058 BLAKE2B c1a1842aeccc0d3f74dc4e588c485d326f74b652b8f504bf20cdd69c42dcf937c49bbd0c149f8da428dd12f5d8a1715bd39ad76d3b71f1e414c663093a437d26 SHA512 2db454c63f8965345997685baa9e4f1e7d2fad1c0087e7d79bcbdc5bf0176703de49c50180689db5f797aff6794748e01a28877d46f58cf453d7a4fe17d3f791 -DIST tokio-reactor-0.1.9.crate 20657 BLAKE2B 433b1302ab41d1c028c1fa726b796d41484526400801df2375de04faa1699cece0d55717f8ba4fc292d33fbc7fb343f766c1d474a36e36d72947bc7572e27a24 SHA512 134c78b449646f1b7cf9dc87de0f39ebfdb894103e0271a2b5115320add04de02aa1899206f332f111a9471f1f54776fe89e3ff879648fa206100b2be12e24e1 -DIST tokio-signal-0.2.7.crate 15122 BLAKE2B af992448564696dbbcc01d85aa88f247e6e480dc95ea9d9a720dbeb3fb7ea4aec23639f4c43f67bb0302dc0a34d21ca1245dffc72bf28753e488fcb29ada60df SHA512 60cc31f9ea58853498dd19d858a7ec72bbccb0255c7d7f316b55c7e4aa21291f5609611ce5ccd2751d505417d8a3860d7374d6377916cbacf52a18c649448d9f DIST tokio-signal-0.2.9.crate 19789 BLAKE2B b5fa30d457327031871150bc251cc1850b43b716ce650803d3a58ec130e885ed2e8ad901d955ea95af6a9dacada13321feae845374552f7ce504f09f2f7e5ffe SHA512 afdd91454c2da8f0b2fce65ffcf35dbb2f73cb5552f63fbb6e8bf1e125d9026840cf1ec895a91a4c69997ada17ab6abfa8aa43217c07d18591ab375aa49da180 DIST tokio-stdin-stdout-0.1.5.crate 6661 BLAKE2B 1279776134a9e46de5a45c0561b95154fd55b0c965e00f5422000bf7a2fff94447aa504b57318e2a80dccdacfc6f0bed3582208278384e0808e2f8454712ef37 SHA512 f37d52b667243220fd44400bfd659721559d673bfe934a717abf59da35478192732127e0fbd33863754211a45777b548e90e32d18fbb9f84b147181d39251bd2 -DIST tokio-sync-0.1.7.crate 41666 BLAKE2B 80a29da76709a7d2ca7c1c2bb1a18e25218ded0383006f5be2f518c1abdbb476974709c16111b42820050e66f75bc3498a1bb835cfcefb76be302d5977476ab3 SHA512 041803a7e6056c7c3a0218e754a7ac2104ebe2ac9953a7ad7f0dfe6fa9c8f23cdefec0941912df3bef11ed129e85a13206279e3ed0d88424b18b367c2494b973 DIST tokio-sync-0.1.8.crate 41830 BLAKE2B 20e61e5e5360f54446ad60de050a4156d3e975f4e246f51b308ea1def48c51f8f1b28fcfd81362b00e0f6f9c40382abb71a4c9e799e81cfd7b0c7b085c42cc27 SHA512 b3665476629ecc8d513d53169beebe090818c6b76ca99f0a508c730bde0ca3c49b828942fc3b9d76fa9cad1b6766237e18a329607ca2314c7ad4b343dd785371 -DIST tokio-tcp-0.1.3.crate 12629 BLAKE2B 16a2763eeb2b65edd07f9b998535812efaa25584bfed5fd66fb1b2952893fa3ed330f597032b4140daf9635ba4f49e77aeabc2cea82c997dfc971bd97fa4f5d0 SHA512 ae42facabed1589764a8e4f789dabf5c7adfb3a67880a8bb6d7b0b6c082302a84b6acd8ec5f444dc59284407acad61518d60818eaeb34f874380f9593d540336 DIST tokio-tcp-0.1.4.crate 12745 BLAKE2B b11b76b94ac5fee26c83537d9c169fa775539c90703fd9ae2c5565c99bbb56305c474710a3b90ed2e8cc2010ac00de77023ecc04e5cb4a653d7b5e0f0e21e23d SHA512 e33168e12ab9cf448f75ccc1662f54b287db0961dd472da3a86f400d6b80159cce290b9a4b948d216b86284e5bd61c14db8750fc2d0ac16d3937418c1260d2f4 -DIST tokio-threadpool-0.1.16.crate 53347 BLAKE2B 801de9f2caa5da692eb8366bbaec870c00aa949c80ef5ea95fb651c46af22df9ebd41f2b826294b80121fa69a36695b9a47b4b66f0e61bed329254f88357ed64 SHA512 b767b2364a50d6fdba3eb049698a561f1a76b32a585dc5fe7101f8bed97145a81460a37c346a3b2e99c0a5cfe960795793cfa3ccf3f8324b2ab6b193247c55da DIST tokio-threadpool-0.1.18.crate 54825 BLAKE2B b1c202bb8aa453f3af56d82713c175dbe0b3b2c1a8efd8ba849b0afb243f48a4f76b994095e4c490b37710d6a1c33eab2f1a2dddcfe15bd9887ad8bfa9c76f8b SHA512 163aea96e536f670e5536c728b159da52585805a721a18ee42e9324320df4e93a9baa5b31072e5a12af7cfe3968bb57f0a5864e17a758f66e71e31f7f02d7b27 -DIST tokio-timer-0.2.11.crate 37578 BLAKE2B e9dd19db8bbba5edf74f7354d4d5e489780b5dbf009be095e7f00bb9e2276e10ebb643605beb6ffb035d1a7a0cfb23eede14e5ebdd228ee05ad9244ac3d1273d SHA512 2bb534417425b88dd1b90231cffb89a8ab97512f1ea9e26cd4afeab5f3aa691433062f093a6789222d1892532a9cf29e1016fc668ce2939536f89e0441740d57 DIST tokio-timer-0.2.13.crate 37873 BLAKE2B 0a1c1e07b941919dc5d1c1a425ba84d6d954b52932933e521fe5e8c76f36c9c2bef9b93eb710e79490c3082519f385f7737454ed884fc7d11ca92ca44b4fe5ca SHA512 9813e5e74cf210eb3fc29268483da32272852c79b23d4b09ad7ee012687c910848b9b8fa5638d4d71cf62d2722f29093f2324ccd4f2e65db5c111ed6f9142d04 DIST tokio-tls-0.2.1.crate 16354 BLAKE2B 120f2839ba7e4666dbd75db26b52eb5fe6498ced7f7b46708699ec0cd42624b0b504b2503a72b5ba0c75c64c1062967813c13d964ac79e7cd94f3e1cff2cf6d0 SHA512 d657d331ac14b98738fd828acfe543fc2ead7f57a6c35380de55863369a8302b55b7356b75db67baf894749a26956e05abd4499bb453708aebaba6456712ae12 -DIST tokio-udp-0.1.5.crate 11529 BLAKE2B 4782a2d75852bcc972f7049e40f3f56927052a27e912f3126903a1438ab4be8b949d223baf4d30c68ceb1c9d1f14a3a0f85d58d4f9c08236beb189cfde4a753d SHA512 24b5eba25117ba3344d90329134f15be8631d1d9bae06a94f4df7f05b1bf6e1b309b776a0f2685fff2b7567a80331450a2027cb4bd264dbd5fd202913db6055f DIST tokio-udp-0.1.6.crate 11677 BLAKE2B 6a2e871f385be1fb7bc597fc00a20f0086e7fbdb0b5fd2785e3bb3c01d5c41f0b1c46b29d9735f5a0176e1560225346a4ae394b7552d4d5668277ca7053b82b3 SHA512 404d2418c2e78c5e693514b181a782cd41d313f62b29186b9f30796d5fa48d7d223156d665dab39fded5b7ff5c2a47c0d08ae320b003063aa22112bc8857f62a -DIST tokio-uds-0.2.5.crate 11808 BLAKE2B 03f37a5f68479955176d1df673c43d6e3d77a84025620fd83bfeee6439046a1c1b62bc9606164690ac21da5fab8de12cbd534664481c3d530d0ec178ad9c4e46 SHA512 964648b9ada5e072ce90bb7a20deed48a517a0e4c6b808b1fb8440755efdc35269b5a30ad312a5e228603e8f1f8d4b8e2f19f4aab10f75ea5b569ad402bfeb61 DIST tokio-uds-0.2.7.crate 11942 BLAKE2B 5c74cf32de1c047f75175fbff9af0cadda1a74673f5b2e3b2e652ef5724f0d428b9caade0c474411c5308559103972e19344adc97822f930d1dd31edb048d1db SHA512 c06818507ebbfc53c34b7afffe5b16c682749371a9dd7db9fffb3800b5d63fdd1d7e646bdb0c84c3b86228f86c54d2b95f61942cdcf087c9f5a1491fcb764102 DIST traitobject-0.1.0.crate 1957 BLAKE2B 0ce6e870f29a7a67e8e8db7516dba85ba4a15fbeabca4c44b655778f9a012a525c671cb3d6841477642f7ec4157cf5c8ed754169b44cef708da988000549e9fc SHA512 aa23140652ecb3397ea989da0c2c58da88d22a816a2bb9fbd90db4299b773275d20a68411d8d300d2fefb2b508f561978c12b95f88d178f9401fe2230f9f795f DIST typeable-0.1.2.crate 901 BLAKE2B cf5fede9fe91f61df1b99b346ebd56145519f2121d027b72f1ccfa9cc24752c80dcc20166327d9ee751c5b344186a36d0f1a119e0b7f941de9739559557c2578 SHA512 336083ea6c8cc64fce1cf14443b1afa955a71302cc0a2023e3c52aeadbf3832c59aa8b8ae0c87d3062658cb7c98e9f79dfac9db7f5831642075ae8f9c0bbebc9 -DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea -DIST typenum-1.14.0.crate 40518 BLAKE2B ff6d77c28e41cddc1956619bca522f4ae5680cedf313d4a12a4d40f191f85ed10d673a32bdd811d7774a01a1b9b5adf9990269ae230737237249faad16ba7070 SHA512 e9739a24936563e9471213060d53d970f8cbbdd163892a22e98f1972d10861009ca1eb568c3bb5d1d78299482372fbe7e6bf42ec8f4f5f30df0a7446933a312c +DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288 DIST unicase-1.4.2.crate 3907 BLAKE2B 0800a061c30d4d32e36ba0f07045e8d6073eb1fc492c3e4130e9a08e9e3fcc0c4f971bc928a2bd35590d51a9c432b34a5f2e95fad41b3e89d1e357787c55a6a3 SHA512 f92ceb4b9b4757a813fcf23949c8a9770e5169aec19d43c7ea9c3b49b365a2d4ef619255693b5dc30b974e6fe5bed857fa0743caec0ad88abd5b5c80df96fcac -DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e -DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf -DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f -DIST unicode-normalization-0.1.9.crate 89492 BLAKE2B 75fc4a6ba6ae3d9e72380eafd50a727ec049f986a58dedd4854a086af844966701463ef8940fa477685096ed2961e2f044d6a308fc3bccc3046bc92554b7a94f SHA512 f1a96c0687d6394fed55e400183bc37a8f0ab4dc2568eb114f86dda3f504fd9768bf58e1ac87f2ff732dc58041de2f2cb8d9b65faf767243830ddd159ae36d81 -DIST unicode-segmentation-1.5.0.crate 90262 BLAKE2B d13421cfca9e7de0d538dbbc3e44be67abcc3147b847db90d473bbccbfb813788b1cb7ada4f8acfd5646cf83c82bbc47832da893aa06313250ce5f483bffa8b0 SHA512 9f9dfaa6692fbf8dc3f2c22815f79a0eb887eb4706dda9469999826a46999942eec44a608a27858221642fad1591ea9cd5162857c0cc673b45bf648d9ea9b7c4 -DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495 -DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 -DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4 +DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5 +DIST unicode-ident-1.0.4.crate 35491 BLAKE2B b92d4f09ec86fe1e0b403b8cb0787989c313f29e6b24961fc2ca046ee5e3b50f43f49469a290880412dd37fc1b46cbeb9123e9636e1f39e425f722a5aa44ad08 SHA512 db41d5c3f72cfaf654b4c250e18ac0ac077a816fd582f1548ed384653f467c15f85fcfbbb4ed2f9e8182587181abf1db14059d50f3e43b60434ddf38c8f65d89 +DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c +DIST unicode-segmentation-1.10.0.crate 93893 BLAKE2B f0604ca03586726b878f7884a639554037816ae01965fbb97b4998fbbd12e614f2af50065a59c834448413418a56b198b016e685ef9509513e8994a5c063da40 SHA512 e6a1baacb557a5a7ed7ff780c542c5947eb473763eb2a6018cb1e0a1abb9f4bf3f8073610e4897393f15df076f6657a0f162a5c5bb7ed5f3b3fd832e533a522c +DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d +DIST universal-hash-0.4.1.crate 8503 BLAKE2B 2cb981f8c1b9337f69e4b6672c69c01515009e8bbfaf5236f7db6cea4f3467938be75b4a1aac69433d18ce09361c52bbe99face153417f5105c4ffd050bb2c39 SHA512 fa582c789b462d8b9cf069fe82de47bad5e3a4d88d83d58c82a54fcfe56f44c24a6a63374e050d89162700510e8c87eb74430be30e1da9dbe4a4b6bb80a684e1 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172 -DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362 -DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7 -DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0 -DIST websocat-1.6.0.crate 100266 BLAKE2B a96c5924c61339f4136b69346fdcbfab84a4c3fa21a9b5172434544b7b381c498938972a28bb009f0ff6d8a80eda10199cb5b089ab6911ea4bc9e5ed7f6b7d92 SHA512 6baf95e922891b8bd601768a4193dd9e219339a1a68f6f3280186c2907df54d5239413a09bf8ee48f7faba0e0d62fef6e09a3b871dd48ece831dde8f8a0111f7 -DIST websocat-1.9.0.crate 91763 BLAKE2B e728d67e86fbb2b529508a3cbdcf85a09ad7676126d8edc2b03280ae6c0ee298bc444d849caa930bc8d079b492c412be2ef258ccd4f33309e04ba14f1c6e1348 SHA512 b22955d4de2d966a9196f2ffa13566ac8b1f0a25b0fd62553a512ed572c74f7907a87e517d58bdd3f27fcf4a98c63ae7205d4d42443a2be8dbb3760affbee166 -DIST websocket-0.26.2.crate 63281 BLAKE2B 2392a1e73a932323db224240f386a739f287ea3fc085c0b1d71dbdc3bb2b3f38b3de456701a2e816623de60b8feb0b80c133e439481152c1e67caf986c7185da SHA512 eb732830ca62cb3e90e2fcce54fa00cc7ed9d85be0fc77df8caab2656ce123d35b6c4c0fe9985a18dd080121bd7bdfde82594cb80cec6f72676e4f9829455212 -DIST websocket-base-0.26.2.crate 18804 BLAKE2B c0bbd98ae3fb3cc3b3776f435ca2849edeba0a19ec9567fed83f6608fc4be033ea1a3f28cdac95ecdccb320584c3d91e40a512bb5159f057cd5da6ba97cd4481 SHA512 a4c543fcf5845e4c3191b48f888d55a3ccc8f711f50b76fc64835514604b937f311df454a588cf4ea7b79e40510e6322177dc6e3dc45de091642e03fdeef1cf1 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST websocat-1.11.0.crate 102374 BLAKE2B 29399053a7c5cf398bd83dd9b52604819d9cddf5138483362e6fc39dabc03b39f56191975ffb147e6cd5433070cbb3c98644396d34565c41b3d173e3b84355f3 SHA512 867faf0645a81c8a8924147865507485efaf7cc2ceb850a4b1e93cfbff06b4318324e1ac37b7316c52444a70f32de529bb8584626cca94411a31c4794d1cea7a +DIST websocat-1.12.0-crates.tar.xz 24777476 BLAKE2B 39d3162438d4941db1de46f0a904ea0d7557c5da377679c1310215e5d6a05f062b601512f56acc9161fc6cdd306c9e41d16bd7c7db14c9da2c73fcc6fb0fd377 SHA512 c3e471b92ef7a2cd30e8627c53436c8e49ef061c7e939be1583c5fc66718580798328f9d453676e79807284309873f5c82dcc6d8b3f263f71596c57de38cb9a2 +DIST websocat-1.12.0.tar.gz 165961 BLAKE2B e83675c1bd421add00a3a2409b51e98edacb52c018b3f617cc78808e14d8a2af0a7ce9d6db1a6ebc740a6c620213e70fb3dda91c2f8a9bcd9e93d05c8043b313 SHA512 043e175d557fee92d381ed1f1aa510056e1d59d0bd25c8f1cc9bf78c3ef59e9e76c5ac283f6bf4e8c9563365cd57deaf5e6f3b0040e6d680a9e8dc80ad931610 +DIST websocket-0.26.5.crate 61982 BLAKE2B 5bad2852a59a606f1202ecff500cbadd141982fb66eb51f87b91dd832335b5cf088af5608e0ec4cdea2425c53c58871532106a5d8c8a22e9702524278239fda3 SHA512 6489f639430a7c496e2b3502a110777cf275fce29b9ef1a67f083042846b767c7c1b74cd112ee604ca5e17de23033a28f3d79d56fd27ba9c1a103d2d307ce584 +DIST websocket-base-0.26.5.crate 19281 BLAKE2B 73ce88556b3d13a02829b97a578844545efe74cc5fabec1ad71ad9ec4f42ab2dab19117961e9354915f3ef33aebfc60d32a1c6174aa73444bd191835132d9322 SHA512 dc1ba64b54427a81debbf64bb171fca718951f3449159828c142d55d4564201b290dac83979fde530a02d274e309fcf14659b62e63dfae013ddfb37bbb3539e8 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe -DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001 +DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf +DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5 +DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737 +DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865 +DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f +DIST zeroize-1.5.7.crate 18861 BLAKE2B 5f203d91aae732b928e2acd02656a486f0f930b8daea96b927552f5790862489d83c7bd48b0c7c62a3273e7a04833a16149ce489847f17fbb037e88922d359a2 SHA512 e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9 diff --git a/net-misc/websocat/websocat-1.11.0.ebuild b/net-misc/websocat/websocat-1.11.0.ebuild new file mode 100644 index 000000000000..fe290f266303 --- /dev/null +++ b/net-misc/websocat/websocat-1.11.0.ebuild @@ -0,0 +1,254 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + adler-1.0.2 + aead-0.4.3 + anymap-0.12.1 + argon2-0.4.1 + atty-0.2.14 + autocfg-0.1.8 + autocfg-1.1.0 + base64-0.9.3 + base64-0.10.1 + base64ct-1.5.2 + bitflags-1.3.2 + blake2-0.10.4 + block-buffer-0.7.3 + block-buffer-0.10.3 + block-padding-0.1.5 + byte-tools-0.3.1 + byteorder-1.4.3 + bytes-0.4.12 + cc-1.0.73 + cfg-if-0.1.10 + cfg-if-1.0.0 + chacha20-0.8.2 + chacha20poly1305-0.9.1 + cipher-0.3.0 + clap-2.34.0 + cloudabi-0.0.3 + core-foundation-0.9.3 + core-foundation-sys-0.8.3 + cpufeatures-0.2.5 + crc32fast-1.3.2 + crossbeam-deque-0.7.4 + crossbeam-epoch-0.8.2 + crossbeam-queue-0.1.2 + crossbeam-queue-0.2.3 + crossbeam-utils-0.6.6 + crossbeam-utils-0.7.2 + crypto-common-0.1.6 + derivative-1.0.4 + digest-0.8.1 + digest-0.10.5 + env_logger-0.6.2 + fake-simd-0.1.2 + fastrand-1.8.0 + flate2-1.0.24 + fnv-1.0.7 + foreign-types-0.3.2 + foreign-types-shared-0.1.1 + fuchsia-cprng-0.1.1 + fuchsia-zircon-0.3.3 + fuchsia-zircon-sys-0.3.3 + futures-0.1.31 + generic-array-0.12.4 + generic-array-0.14.6 + getrandom-0.2.7 + heck-0.3.3 + hermit-abi-0.1.19 + hex-0.4.3 + http-0.1.21 + http-bytes-0.1.0 + httparse-1.8.0 + hyper-0.10.16 + idna-0.1.5 + instant-0.1.12 + iovec-0.1.4 + itoa-0.4.8 + kernel32-sys-0.2.2 + language-tags-0.2.2 + lazy_static-1.4.0 + libc-0.2.133 + lock_api-0.3.4 + lock_api-0.4.9 + log-0.3.9 + log-0.4.17 + matches-0.1.9 + maybe-uninit-2.0.0 + memchr-2.5.0 + memoffset-0.5.6 + mime-0.2.6 + miniz_oxide-0.5.4 + mio-0.6.23 + mio-named-pipes-0.1.7 + mio-uds-0.6.8 + miow-0.2.2 + miow-0.3.7 + native-tls-0.2.10 + net2-0.2.37 + num_cpus-1.13.1 + once_cell-1.15.0 + opaque-debug-0.2.3 + opaque-debug-0.3.0 + openssl-0.10.41 + openssl-macros-0.1.0 + openssl-probe-0.1.5 + openssl-src-111.22.0+1.1.1q + openssl-sys-0.9.75 + parking_lot-0.9.0 + parking_lot-0.12.1 + parking_lot_core-0.6.2 + parking_lot_core-0.9.3 + password-hash-0.4.2 + percent-encoding-1.0.1 + pkg-config-0.3.25 + poly1305-0.7.2 + ppv-lite86-0.2.16 + proc-macro2-0.4.30 + proc-macro2-1.0.43 + prometheus-0.13.2 + prometheus-metric-storage-0.5.0 + prometheus-metric-storage-derive-0.5.0 + quote-0.6.13 + quote-1.0.21 + rand-0.6.5 + rand-0.8.5 + rand_chacha-0.1.1 + rand_chacha-0.3.1 + rand_core-0.3.1 + rand_core-0.4.2 + rand_core-0.6.4 + rand_hc-0.1.0 + rand_isaac-0.1.1 + rand_jitter-0.1.4 + rand_os-0.1.3 + rand_pcg-0.1.2 + rand_xorshift-0.1.1 + rdrand-0.4.0 + readwrite-0.1.2 + redox_syscall-0.1.57 + redox_syscall-0.2.16 + remove_dir_all-0.5.3 + rustc_version-0.2.3 + safemem-0.3.3 + schannel-0.1.20 + scopeguard-1.1.0 + security-framework-2.7.0 + security-framework-sys-2.6.1 + semver-0.9.0 + semver-parser-0.7.0 + sha-1-0.8.2 + signal-hook-registry-1.4.0 + slab-0.4.7 + slab_typesafe-0.1.3 + smallvec-0.6.14 + smallvec-1.9.0 + smart-default-0.3.0 + structopt-0.2.16 + structopt-derive-0.2.16 + subtle-2.4.1 + syn-0.15.44 + syn-1.0.100 + tempfile-3.3.0 + textwrap-0.11.0 + thiserror-1.0.35 + thiserror-impl-1.0.35 + time-0.1.44 + tinyvec-1.6.0 + tinyvec_macros-0.1.0 + tk-listen-0.2.1 + tokio-0.1.22 + tokio-codec-0.1.2 + tokio-current-thread-0.1.7 + tokio-executor-0.1.10 + tokio-file-unix-0.5.1 + tokio-fs-0.1.7 + tokio-io-0.1.13 + tokio-named-pipes-0.1.0 + tokio-process-0.2.5 + tokio-reactor-0.1.12 + tokio-signal-0.2.9 + tokio-stdin-stdout-0.1.5 + tokio-sync-0.1.8 + tokio-tcp-0.1.4 + tokio-threadpool-0.1.18 + tokio-timer-0.2.13 + tokio-tls-0.2.1 + tokio-udp-0.1.6 + tokio-uds-0.2.7 + traitobject-0.1.0 + typeable-0.1.2 + typenum-1.15.0 + unicase-1.4.2 + unicode-bidi-0.3.8 + unicode-ident-1.0.4 + unicode-normalization-0.1.22 + unicode-segmentation-1.10.0 + unicode-width-0.1.10 + unicode-xid-0.1.0 + universal-hash-0.4.1 + url-1.7.2 + vcpkg-0.2.15 + version_check-0.1.5 + version_check-0.9.4 + wasi-0.10.0+wasi-snapshot-preview1 + wasi-0.11.0+wasi-snapshot-preview1 + websocat-1.11.0 + websocket-0.26.5 + websocket-base-0.26.5 + winapi-0.2.8 + winapi-0.3.9 + winapi-build-0.1.1 + winapi-i686-pc-windows-gnu-0.4.0 + winapi-x86_64-pc-windows-gnu-0.4.0 + windows-sys-0.36.1 + windows_aarch64_msvc-0.36.1 + windows_i686_gnu-0.36.1 + windows_i686_msvc-0.36.1 + windows_x86_64_gnu-0.36.1 + windows_x86_64_msvc-0.36.1 + ws2_32-sys-0.2.1 + zeroize-1.5.7 +" + +inherit cargo + +DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions" +HOMEPAGE="https://github.com/vi/websocat" +SRC_URI="$(cargo_crate_uris ${CRATES})" +LICENSE="MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 ISC Unlicense" +SLOT="0" +KEYWORDS="~amd64" +IUSE="ssl" +RESTRICT+=" test" + +RDEPEND=" + ssl? ( + dev-libs/openssl:0= + ) +" +DEPEND=" + ${RUST_DEPEND} + ${RDEPEND} +" +QA_FLAGS_IGNORED="/usr/bin/websocat" + +src_configure() { + local myfeatures=( + $(usex ssl ssl '') + seqpacket + signal_handler + tokio-process + unix_stdio + ) + cargo_src_configure --no-default-features +} + +src_install() { + cargo_src_install + dodoc *.md +} diff --git a/net-misc/websocat/websocat-1.12.0.ebuild b/net-misc/websocat/websocat-1.12.0.ebuild new file mode 100644 index 000000000000..52fc47b607b2 --- /dev/null +++ b/net-misc/websocat/websocat-1.12.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES="" + +inherit cargo + +DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions" +HOMEPAGE="https://github.com/vi/websocat" +SRC_URI=" + https://github.com/vi/websocat/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~arthurzam/distfiles/net-misc/${PN}/${P}-crates.tar.xz + ${CARGO_CRATE_URIS}" + +LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT + Unicode-DFS-2016 +" +SLOT="0" +KEYWORDS="~amd64" +IUSE="ssl" +RESTRICT+=" test" + +RDEPEND=" + ssl? ( + dev-libs/openssl:0= + ) +" +DEPEND=" + ${RUST_DEPEND} + ${RDEPEND} +" +QA_FLAGS_IGNORED="/usr/bin/websocat" + +src_configure() { + local myfeatures=( + $(usex ssl ssl '') + seqpacket + signal_handler + tokio-process + unix_stdio + ) + cargo_src_configure --no-default-features +} + +src_install() { + cargo_src_install + dodoc *.md +} diff --git a/net-misc/websocat/websocat-1.6.0-r2.ebuild b/net-misc/websocat/websocat-1.6.0-r2.ebuild deleted file mode 100644 index 81f1b7eb669a..000000000000 --- a/net-misc/websocat/websocat-1.6.0-r2.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -anymap-0.12.1 -arc-swap-0.4.3 -autocfg-0.1.7 -base64-0.10.1 -base64-0.9.3 -bitflags-1.2.1 -block-buffer-0.7.3 -block-padding-0.1.5 -byte-tools-0.3.1 -byteorder-1.3.2 -bytes-0.4.12 -c2-chacha-0.2.3 -cc-1.0.41 -cfg-if-0.1.9 -clap-2.33.0 -cloudabi-0.0.3 -core-foundation-0.6.4 -core-foundation-sys-0.6.2 -crossbeam-deque-0.7.2 -crossbeam-epoch-0.8.0 -crossbeam-queue-0.1.2 -crossbeam-utils-0.6.6 -crossbeam-utils-0.7.0 -derivative-1.0.3 -digest-0.8.1 -env_logger-0.6.2 -fake-simd-0.1.2 -fnv-1.0.6 -foreign-types-0.3.2 -foreign-types-shared-0.1.1 -fuchsia-cprng-0.1.1 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -futures-0.1.29 -generic-array-0.12.3 -getrandom-0.1.13 -heck-0.3.1 -hermit-abi-0.1.3 -http-0.1.19 -http-bytes-0.1.0 -httparse-1.3.4 -hyper-0.10.16 -idna-0.1.5 -iovec-0.1.4 -itoa-0.4.4 -kernel32-sys-0.2.2 -language-tags-0.2.2 -lazy_static-1.4.0 -libc-0.2.65 -lock_api-0.1.5 -log-0.3.9 -log-0.4.8 -matches-0.1.8 -maybe-uninit-2.0.0 -memoffset-0.5.3 -mime-0.2.6 -mio-0.6.19 -mio-named-pipes-0.1.6 -mio-uds-0.6.7 -miow-0.2.1 -miow-0.3.3 -native-tls-0.2.3 -net2-0.2.33 -num_cpus-1.11.0 -opaque-debug-0.2.3 -openssl-0.10.25 -openssl-probe-0.1.2 -openssl-sys-0.9.52 -owning_ref-0.4.0 -parking_lot-0.7.1 -parking_lot_core-0.4.0 -percent-encoding-1.0.1 -pkg-config-0.3.17 -ppv-lite86-0.2.6 -proc-macro2-0.4.30 -quote-0.6.13 -rand-0.6.5 -rand-0.7.2 -rand_chacha-0.1.1 -rand_chacha-0.2.1 -rand_core-0.3.1 -rand_core-0.4.2 -rand_core-0.5.1 -rand_hc-0.1.0 -rand_hc-0.2.0 -rand_isaac-0.1.1 -rand_jitter-0.1.4 -rand_os-0.1.3 -rand_pcg-0.1.2 -rand_xorshift-0.1.1 -rdrand-0.4.0 -readwrite-0.1.1 -redox_syscall-0.1.56 -remove_dir_all-0.5.2 -rustc_version-0.2.3 -safemem-0.3.3 -schannel-0.1.16 -scopeguard-0.3.3 -scopeguard-1.0.0 -security-framework-0.3.3 -security-framework-sys-0.3.3 -semver-0.9.0 -semver-parser-0.7.0 -sha-1-0.8.2 -signal-hook-0.1.11 -signal-hook-registry-1.1.1 -slab-0.4.2 -slab_typesafe-0.1.3 -smallvec-0.6.13 -smart-default-0.3.0 -socket2-0.3.11 -stable_deref_trait-1.1.1 -structopt-0.2.16 -structopt-derive-0.2.16 -syn-0.15.44 -tempfile-3.1.0 -textwrap-0.11.0 -time-0.1.42 -tk-listen-0.2.1 -tokio-0.1.22 -tokio-codec-0.1.1 -tokio-current-thread-0.1.6 -tokio-executor-0.1.8 -tokio-file-unix-0.5.1 -tokio-fs-0.1.6 -tokio-io-0.1.12 -tokio-process-0.2.4 -tokio-reactor-0.1.9 -tokio-signal-0.2.7 -tokio-stdin-stdout-0.1.5 -tokio-sync-0.1.7 -tokio-tcp-0.1.3 -tokio-threadpool-0.1.16 -tokio-timer-0.2.11 -tokio-tls-0.2.1 -tokio-udp-0.1.5 -tokio-uds-0.2.5 -traitobject-0.1.0 -typeable-0.1.2 -typenum-1.12.0 -unicase-1.4.2 -unicode-bidi-0.3.4 -unicode-normalization-0.1.9 -unicode-segmentation-1.5.0 -unicode-width-0.1.5 -unicode-xid-0.1.0 -url-1.7.2 -vcpkg-0.2.7 -version_check-0.1.5 -wasi-0.7.0 -websocat-1.6.0 -websocket-0.26.2 -websocket-base-0.26.2 -winapi-0.2.8 -winapi-0.3.8 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 -" - -inherit cargo - -DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions" -HOMEPAGE="https://github.com/vi/websocat" -SRC_URI="$(cargo_crate_uris ${CRATES})" -LICENSE="MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 ISC Unlicense" -SLOT="0" -KEYWORDS="~amd64" -IUSE="ssl" - -RDEPEND=" - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND=" - ${RUST_DEPEND} - ${RDEPEND} -" -QA_FLAGS_IGNORED="/usr/bin/websocat" - -src_configure() { - local myfeatures=( - $(usex ssl ssl '') - seqpacket - signal_handler - tokio-process - unix_stdio - ) - cargo_src_configure --no-default-features -} - -src_install() { - cargo_src_install - dodoc *.md -} diff --git a/net-misc/websocat/websocat-1.9.0.ebuild b/net-misc/websocat/websocat-1.9.0.ebuild deleted file mode 100644 index a37d8b31324f..000000000000 --- a/net-misc/websocat/websocat-1.9.0.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -anymap-0.12.1 -atty-0.2.14 -autocfg-0.1.7 -autocfg-1.0.1 -base64-0.9.3 -base64-0.10.1 -bitflags-1.3.2 -block-buffer-0.7.3 -block-padding-0.1.5 -byteorder-1.4.3 -bytes-0.4.12 -byte-tools-0.3.1 -cc-1.0.71 -cfg-if-0.1.10 -cfg-if-1.0.0 -clap-2.33.3 -cloudabi-0.0.3 -core-foundation-0.9.2 -core-foundation-sys-0.8.3 -crossbeam-deque-0.7.4 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.1.2 -crossbeam-queue-0.2.3 -crossbeam-utils-0.6.6 -crossbeam-utils-0.7.2 -derivative-1.0.4 -digest-0.8.1 -env_logger-0.6.2 -fake-simd-0.1.2 -fnv-1.0.7 -foreign-types-0.3.2 -foreign-types-shared-0.1.1 -fuchsia-cprng-0.1.1 -fuchsia-zircon-0.3.3 -fuchsia-zircon-sys-0.3.3 -futures-0.1.31 -generic-array-0.12.4 -getrandom-0.2.3 -heck-0.3.3 -hermit-abi-0.1.19 -hex-0.4.3 -httparse-1.5.1 -http-0.1.21 -http-bytes-0.1.0 -hyper-0.10.16 -idna-0.1.5 -iovec-0.1.4 -itoa-0.4.8 -kernel32-sys-0.2.2 -language-tags-0.2.2 -lazy_static-1.4.0 -libc-0.2.105 -lock_api-0.3.4 -log-0.3.9 -log-0.4.14 -matches-0.1.9 -maybe-uninit-2.0.0 -memoffset-0.5.6 -mime-0.2.6 -miow-0.2.2 -miow-0.3.7 -mio-0.6.23 -mio-named-pipes-0.1.7 -mio-uds-0.6.8 -native-tls-0.2.8 -net2-0.2.37 -num_cpus-1.13.0 -once_cell-1.8.0 -opaque-debug-0.2.3 -openssl-0.10.37 -openssl-probe-0.1.4 -openssl-src-111.16.0+1.1.1l -openssl-sys-0.9.68 -parking_lot-0.9.0 -parking_lot_core-0.6.2 -percent-encoding-1.0.1 -pkg-config-0.3.22 -ppv-lite86-0.2.15 -proc-macro2-0.4.30 -quote-0.6.13 -rand-0.6.5 -rand-0.8.4 -rand_chacha-0.1.1 -rand_chacha-0.3.1 -rand_core-0.3.1 -rand_core-0.4.2 -rand_core-0.6.3 -rand_hc-0.1.0 -rand_hc-0.3.1 -rand_isaac-0.1.1 -rand_jitter-0.1.4 -rand_os-0.1.3 -rand_pcg-0.1.2 -rand_xorshift-0.1.1 -rdrand-0.4.0 -readwrite-0.1.2 -redox_syscall-0.1.57 -redox_syscall-0.2.10 -remove_dir_all-0.5.3 -rustc_version-0.2.3 -safemem-0.3.3 -schannel-0.1.19 -scopeguard-1.1.0 -security-framework-2.4.2 -security-framework-sys-2.4.2 -semver-0.9.0 -semver-parser-0.7.0 -sha-1-0.8.2 -signal-hook-registry-1.4.0 -slab-0.4.5 -slab_typesafe-0.1.3 -smallvec-0.6.14 -smart-default-0.3.0 -structopt-0.2.16 -structopt-derive-0.2.16 -syn-0.15.44 -tempfile-3.2.0 -textwrap-0.11.0 -time-0.1.43 -tinyvec-1.5.0 -tinyvec_macros-0.1.0 -tk-listen-0.2.1 -tokio-0.1.22 -tokio-codec-0.1.2 -tokio-current-thread-0.1.7 -tokio-executor-0.1.10 -tokio-file-unix-0.5.1 -tokio-fs-0.1.7 -tokio-io-0.1.13 -tokio-named-pipes-0.1.0 -tokio-process-0.2.5 -tokio-reactor-0.1.12 -tokio-signal-0.2.9 -tokio-stdin-stdout-0.1.5 -tokio-sync-0.1.8 -tokio-tcp-0.1.4 -tokio-threadpool-0.1.18 -tokio-timer-0.2.13 -tokio-tls-0.2.1 -tokio-udp-0.1.6 -tokio-uds-0.2.7 -traitobject-0.1.0 -typeable-0.1.2 -typenum-1.14.0 -unicase-1.4.2 -unicode-bidi-0.3.7 -unicode-normalization-0.1.19 -unicode-segmentation-1.8.0 -unicode-width-0.1.9 -unicode-xid-0.1.0 -url-1.7.2 -vcpkg-0.2.15 -version_check-0.1.5 -wasi-0.10.2+wasi-snapshot-preview1 -websocat-1.9.0 -websocket-0.26.2 -websocket-base-0.26.2 -winapi-0.2.8 -winapi-0.3.9 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -ws2_32-sys-0.2.1 -" - -inherit cargo - -DESCRIPTION="Command-line client for WebSockets, like netcat, with socat-like functions" -HOMEPAGE="https://github.com/vi/websocat" -SRC_URI="$(cargo_crate_uris ${CRATES})" -LICENSE="MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 ISC Unlicense" -SLOT="0" -KEYWORDS="~amd64" -IUSE="ssl" - -RDEPEND=" - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND=" - ${RUST_DEPEND} - ${RDEPEND} -" -QA_FLAGS_IGNORED="/usr/bin/websocat" - -src_configure() { - local myfeatures=( - $(usex ssl ssl '') - seqpacket - signal_handler - tokio-process - unix_stdio - ) - cargo_src_configure --no-default-features -} - -src_install() { - cargo_src_install - dodoc *.md -} diff --git a/net-misc/websocketd/Manifest b/net-misc/websocketd/Manifest index c1cddbe5df0f..15c492f59ac6 100644 --- a/net-misc/websocketd/Manifest +++ b/net-misc/websocketd/Manifest @@ -1,3 +1,2 @@ -DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a -DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip 73861 BLAKE2B ab1760636aad8ffa0aceb1720b6221debe9ddc6ef0c50d180cf5eb30d19a746acbe07ba3bb83047d7595a7e3060370c63ae6288fd2c57fa66a49e36492fc93da SHA512 6261d3ef4f67e239ad3a2d5b3a6b7b05254f6596ee7e9410c1e80de1b42047642286b2c0239b62ee769fbd2319c5aaeae595a1b9beb69abdd85504b53108bac8 +DIST websocketd-0.4.1-deps.tar.xz 109852 BLAKE2B 984d4a5af172199c21fafad064ff137e65ce7d66db9977ea4f9b74b147e7e41ddb7fe45d1211d03ea83c7ecf8b23fddce86cb8dce2e6d3e7e85dd0ea0b9e9387 SHA512 73c60a6b8f892a61c4bc2313c52742c36ea9cbf250948b1c23903d67c1e103848741cf6997d0c1f201056bc8d7c65f5e35a8c9f3ab9dbb04fb4b3995895a6a15 DIST websocketd-0.4.1.tar.gz 46366 BLAKE2B 8b2fd1b63736cb47363e512044cb22a6eaa726c471289dbd1a6b77733d64b3023eddadd47a82357aec4bcbe097ce2b90806284f4483a36d2cf446d4eef66c224 SHA512 8535637bdf8fecbc4340606b6096672420126c32ed9e68944593f577e6307c810caf654e76f7077bf119d6273c6eec4c4c21eb21bfd805d0b8f5549c626460e4 diff --git a/net-misc/websocketd/websocketd-0.4.1.ebuild b/net-misc/websocketd/websocketd-0.4.1.ebuild index a611fd44e054..b8920a74a1cd 100644 --- a/net-misc/websocketd/websocketd-0.4.1.ebuild +++ b/net-misc/websocketd/websocketd-0.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,20 +7,13 @@ inherit go-module EGIT_COMMIT="v${PV}" ARCHIVE_URI="https://github.com/joewalnes/websocketd/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" -DESCRIPTION="Like inetd, but for WebSockets." +DESCRIPTION="Like inetd, but for WebSockets" HOMEPAGE="https://github.com/joewalnes/websocketd" SLOT="0" LICENSE="BSD-2" - -EGO_SUM=( -"github.com/gorilla/websocket v1.4.0" -"github.com/gorilla/websocket v1.4.0/go.mod" -) - -go-module_set_globals SRC_URI=" ${ARCHIVE_URI} - ${EGO_SUM_SRC_URI} + https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz " src_compile() { diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 4f427713655a..677e1a06ba9e 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,2 +1,4 @@ -DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712 -DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d +DIST wget-1.21.4.tar.gz 5059591 BLAKE2B ced6fb9a20343d41e4d8e0c8f171c60535847504fa4c32abc81d104a1594dc7b7c97b5b301836e31dacc7a0f2155c0a2e70e42ff60dc3fa471deb1dad33ba736 SHA512 7a1539045174f6b97ab6980811c2ac1799edc20db72987b5ba9b1710cffb19669a7736813d15c8da3aa2d4a384246ff946b77ecb0baeb6fd3e12ae591f1bf6a3 +DIST wget-1.21.4.tar.gz.sig 854 BLAKE2B 162c4f358e781bbfb0fa73910191c29dd411f48c9b2c8e8fe00a12741153e624955393d769aa7311b03115d04b6b946a84b636f643d7cdc8c8cd81387b9cf143 SHA512 72603493c2d799dca08700175a2010d8736fd6d3cb9bea3987db8814e9f133ab0fbd1477892115f7fbbd1a7d4d416ec370bdbff6dbe8f00d1eea84f0c4f8d84b +DIST wget-1.24.5.tar.gz 5182521 BLAKE2B d33274d599f91384c2a7db0b145ec6b315cf87cbbd02026d686a79220e3f15ca9ad0f9d8b507895f6c8486b7ac2ae5fa5c9ea010e883b6eec68d3aba038b02de SHA512 572aa54717e51a9eb9959e127c7afb696645088f32ff7df2cfe9d243957e34ee235e98988fa94649df023d2e3d62b6973e8c9f2eb92beba820dd96d5de2a950d +DIST wget-1.24.5.tar.gz.sig 854 BLAKE2B 67c084cb8dcbe6184c58203afe11c7426be1f190a6073a68aa658f8480f7046786eb70e47fed4c45b86ea1fda0812a401f530dafd9be816d33d46d54b90223d2 SHA512 f819dc43a466682ace38e8537698e3c7c3919203f77373bdaea1b63ead40c4d3663590209dfeb6187d98edd00e30848a3abd5735795fb47878924f1d9b2ee10d diff --git a/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch b/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch new file mode 100644 index 000000000000..9f75dc471a16 --- /dev/null +++ b/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch @@ -0,0 +1,50 @@ +https://bugs.gentoo.org/930060 +https://gitlab.com/gnuwget/wget/-/issues/19 +https://gitlab.com/gnuwget/wget/-/merge_requests/39 + +From 5f0aa59239c36fc945b94d8ab91562d56e5bf776 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 16 Apr 2024 03:18:40 +0100 +Subject: [PATCH] Fix libproxy build with --disable-debug + +The definition of debug_logprintf in src/log.c is guarded by ENABLE_DEBUG +(although its prototype is unconditionally available in src/log.h). + +The uses of debug_logprintf in src/retr.c aren't guarded by ENABLE_DEBUG. + +Use the DEBUGP macro which is designed for this purpose. + +* src/retr.c (getproxy): Use DEBUGP macro. + +Fixes: https://gitlab.com/gnuwget/wget/-/issues/19 +Copyright-paperwork-exempt: Yes +--- a/src/retr.c ++++ b/src/retr.c +@@ -1498,21 +1498,21 @@ getproxy (struct url *u) + pxProxyFactory *pf = px_proxy_factory_new (); + if (!pf) + { +- debug_logprintf ("Allocating memory for libproxy failed"); ++ DEBUGP (("Allocating memory for libproxy failed")); + return NULL; + } + +- debug_logprintf ("asking libproxy about url '%s'\n", u->url); ++ DEBUGP (("asking libproxy about url '%s'\n", u->url)); + char **proxies = px_proxy_factory_get_proxies (pf, u->url); + if (proxies) + { + if (proxies[0]) + { +- debug_logprintf ("libproxy suggest to use '%s'\n", proxies[0]); ++ DEBUGP (("libproxy suggest to use '%s'\n", proxies[0])); + if (strcmp (proxies[0], "direct://") != 0) + { + proxy = xstrdup (proxies[0]); +- debug_logprintf ("libproxy setting to use '%s'\n", proxy); ++ DEBUGP (("libproxy setting to use '%s'\n", proxy)); + } + } + +-- +GitLab diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml index 8df2cebe3bd8..bc5cb81f4837 100644 --- a/net-misc/wget/metadata.xml +++ b/net-misc/wget/metadata.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> - </maintainer> -<use> - <flag name="cookie_check">Enable cookie checks via <pkg>net-libs/libpsl</pkg></flag> - <flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg></flag> - <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag> - <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag> -</use> -<upstream> - <remote-id type="cpe">cpe:/a:gnu:wget</remote-id> -</upstream> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <use> + <flag name="cookie-check">Enable cookie checks via <pkg>net-libs/libpsl</pkg></flag> + <flag name="libproxy">Support for automatic proxy configuration management through <pkg>net-libs/libproxy</pkg>.</flag> + <flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg></flag> + <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag> + <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:gnu:wget</remote-id> + <remote-id type="gitlab">gnuwget/wget</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/wget/wget-1.21.1.ebuild b/net-misc/wget/wget-1.21.4.ebuild index dfd4fce484b8..049f4deee21f 100644 --- a/net-misc/wget/wget-1.21.1.ebuild +++ b/net-misc/wget/wget-1.21.4.ebuild @@ -1,32 +1,38 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{10..11} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wget.asc +inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig DESCRIPTION="Network utility to retrieve files from the WWW" HOMEPAGE="https://www.gnu.org/software/wget/" SRC_URI="mirror://gnu/wget/${P}.tar.gz" +SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.sig )" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" -REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" +REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" -# Force a newer libidn2 to avoid libunistring deps. #612498 +# * Force a newer libidn2 to avoid libunistring deps. #bug #612498 +# * Metalink can use gpgme automagically (so let's always depend on it) +# for signed metalink resources. LIB_DEPEND=" - cookie_check? ( net-libs/libpsl ) + cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) - metalink? ( media-libs/libmetalink ) + metalink? ( + app-crypt/gpgme + media-libs/libmetalink + ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( - gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) - !gnutls? ( dev-libs/openssl:0=[static-libs(+)] ) + gnutls? ( net-libs/gnutls:=[static-libs(+)] ) + !gnutls? ( dev-libs/openssl:=[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) @@ -35,21 +41,23 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND=" ${RDEPEND} static? ( ${LIB_DEPEND} ) - test? ( - ${PYTHON_DEPS} - dev-lang/perl - dev-perl/HTTP-Daemon - dev-perl/HTTP-Message - dev-perl/IO-Socket-SSL - ) " BDEPEND=" app-arch/xz-utils + dev-lang/perl + sys-apps/texinfo virtual/pkgconfig nls? ( sys-devel/gettext ) + test? ( + ${PYTHON_DEPS} + >=dev-perl/HTTP-Daemon-6.60.0 + dev-perl/HTTP-Message + dev-perl/IO-Socket-SSL + ) + verify-sig? ( >=sec-keys/openpgp-keys-wget-20230511 ) " -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) +DOCS=( AUTHORS MAILING-LIST NEWS README ) pkg_setup() { use test && python-any-r1_pkg_setup @@ -57,17 +65,7 @@ pkg_setup() { src_prepare() { default - - # revert some hack that breaks linking, bug #585924 - if [[ ${CHOST} == *-darwin* ]] \ - || [[ ${CHOST} == *-solaris* ]] \ - || [[ ${CHOST} == *-uclibc* ]] \ - || [[ ${CHOST} == *-cygwin* ]] \ - ; then - sed -i \ - -e 's/^ LIBICONV=$/:/' \ - configure || die - fi + sed -i -e "s:/usr/local/etc:${EPREFIX}/etc:g" doc/{sample.wgetrc,wget.texi} || die } src_configure() { @@ -75,12 +73,6 @@ src_configure() { # the included gnutls -- force ioctl.h to include this header [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 - if [[ ${CHOST} == *-darwin* ]] ; then - # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html - # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html - append-cppflags '-D__nonnull\(X\)=' - fi - if use static ; then append-ldflags -static tc-export PKG_CONFIG @@ -90,8 +82,9 @@ src_configure() { # There is no flag that controls this. libunistring-prefix only # controls the search path (which is why we turn it off below). # Further, libunistring is only needed w/older libidn2 installs, - # and since we force the latest, we can force off libunistring. #612498 + # and since we force the latest, we can force off libunistring. # bug #612498 local myeconfargs=( + ac_cv_libunistring=no --disable-assert --disable-pcre --disable-rpath @@ -105,24 +98,13 @@ src_configure() { $(use_enable pcre pcre2) $(use_enable ssl digest) $(use_enable ssl opie) - $(use_with cookie_check libpsl) - $(use_with idn libidn) + $(use_with cookie-check libpsl) + $(use_enable idn iri) $(use_with metalink) $(use_with ssl ssl $(usex gnutls gnutls openssl)) $(use_with uuid libuuid) $(use_with zlib) ) - ac_cv_libunistring=no \ - econf "${myeconfargs[@]}" -} -src_install() { - default - - sed -i \ - -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ - "${ED}"/etc/wgetrc \ - "${ED}"/usr/share/man/man1/wget.1 \ - "${ED}"/usr/share/info/wget.info \ - || die + econf "${myeconfargs[@]}" } diff --git a/net-misc/wget/wget-1.21.2.ebuild b/net-misc/wget/wget-1.24.5.ebuild index 27f69c718b3b..54b301085c55 100644 --- a/net-misc/wget/wget-1.21.2.ebuild +++ b/net-misc/wget/wget-1.24.5.ebuild @@ -1,32 +1,39 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wget.asc +inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig DESCRIPTION="Network utility to retrieve files from the WWW" HOMEPAGE="https://www.gnu.org/software/wget/" SRC_URI="mirror://gnu/wget/${P}.tar.gz" +SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.sig )" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" -REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="cookie-check debug gnutls idn ipv6 libproxy metalink nls ntlm pcre +ssl static test uuid zlib" +REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" -# Force a newer libidn2 to avoid libunistring deps. #612498 +# * Force a newer libidn2 to avoid libunistring deps. #bug #612498 +# * Metalink can use gpgme automagically (so let's always depend on it) +# for signed metalink resources. LIB_DEPEND=" - cookie_check? ( net-libs/libpsl ) + cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) - metalink? ( media-libs/libmetalink ) + libproxy? ( net-libs/libproxy ) + metalink? ( + app-crypt/gpgme + media-libs/libmetalink + ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( - gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) - !gnutls? ( dev-libs/openssl:0=[static-libs(+)] ) + gnutls? ( net-libs/gnutls:=[static-libs(+)] ) + !gnutls? ( dev-libs/openssl:=[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) @@ -35,21 +42,30 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND=" ${RDEPEND} static? ( ${LIB_DEPEND} ) - test? ( - ${PYTHON_DEPS} - dev-lang/perl - dev-perl/HTTP-Daemon - dev-perl/HTTP-Message - dev-perl/IO-Socket-SSL - ) " BDEPEND=" app-arch/xz-utils + dev-lang/perl + sys-apps/texinfo virtual/pkgconfig nls? ( sys-devel/gettext ) + test? ( + ${PYTHON_DEPS} + >=dev-perl/HTTP-Daemon-6.60.0 + dev-perl/HTTP-Message + dev-perl/IO-Socket-SSL + ) + verify-sig? ( >=sec-keys/openpgp-keys-wget-20240415 ) " -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) +DOCS=( AUTHORS MAILING-LIST NEWS README ) + +# gnulib FPs +QA_CONFIG_IMPL_DECL_SKIP=( unreachable MIN alignof static_assert ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.24.5-libproxy-no-debug.patch +) pkg_setup() { use test && python-any-r1_pkg_setup @@ -57,25 +73,7 @@ pkg_setup() { src_prepare() { default - - # revert some hack that breaks linking, bug #585924 - if [[ ${CHOST} == *-darwin* ]] \ - || [[ ${CHOST} == *-solaris* ]] \ - || [[ ${CHOST} == *-uclibc* ]] \ - || [[ ${CHOST} == *-cygwin* ]] \ - ; then - sed -i \ - -e 's/^ LIBICONV=$/:/' \ - configure || die - fi - - if [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -le 17 ]] ; then - # Fix older Darwin inline definition problem - # fixed upstream - # https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=29d79d473f52b0ec58f50c95ef782c66fc0ead21 - sed -i -e '/define _GL_EXTERN_INLINE_STDHEADER_BUG/s/_BUG/_DISABLE/' \ - src/config.h.in || die - fi + sed -i -e "s:/usr/local/etc:${EPREFIX}/etc:g" doc/{sample.wgetrc,wget.texi} || die } src_configure() { @@ -92,8 +90,9 @@ src_configure() { # There is no flag that controls this. libunistring-prefix only # controls the search path (which is why we turn it off below). # Further, libunistring is only needed w/older libidn2 installs, - # and since we force the latest, we can force off libunistring. #612498 + # and since we force the latest, we can force off libunistring. # bug #612498 local myeconfargs=( + ac_cv_libunistring=no --disable-assert --disable-pcre --disable-rpath @@ -107,24 +106,14 @@ src_configure() { $(use_enable pcre pcre2) $(use_enable ssl digest) $(use_enable ssl opie) - $(use_with cookie_check libpsl) - $(use_with idn libidn) + $(use_with cookie-check libpsl) + $(use_enable idn iri) + $(use_enable libproxy) $(use_with metalink) $(use_with ssl ssl $(usex gnutls gnutls openssl)) $(use_with uuid libuuid) $(use_with zlib) ) - ac_cv_libunistring=no \ - econf "${myeconfargs[@]}" -} -src_install() { - default - - sed -i \ - -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ - "${ED}"/etc/wgetrc \ - "${ED}"/usr/share/man/man1/wget.1 \ - "${ED}"/usr/share/info/wget.info \ - || die + econf "${myeconfargs[@]}" } diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest index 6477a0cf4793..4a20781ad84d 100644 --- a/net-misc/wget2/Manifest +++ b/net-misc/wget2/Manifest @@ -1,2 +1,2 @@ -DIST wget2-1.99.2.tar.gz 3173906 BLAKE2B 1fc63de32725d0d980469cc730d17035a01ccb432a91fe24c37e06017c2604a4ef6d8474e76eb757c3a22cc61ea6c70e26af40dffc474a87f8bbdb2a8deced7c SHA512 c2c687124a2463d6a0397cd7dbbc5e475ba815e8d7e13a4b71b529e6be03c9f7dbe5f358702e929ed36034f6fffc698f3b1c5ac486a35e2b00ee6f135060ad7f -DIST wget2-2.0.0.tar.gz 3565643 BLAKE2B 8792950942c88aceed41aa1d00b2c39d55e057795d0f68e8bfe9a1da548161aa49eaa82d13e8ea3e14cccee4423d41f9643baff1007361c26464b10683a8ef88 SHA512 59be98a43057220f4eb4314d0876990c21bbc2606a82444e03282ca55d6de18a382fb75b3fcbb1e7f5a5930cd9a81c6c73cdac2ffba3932b55816fb8140c00eb +DIST wget2-2.0.1.tar.gz 3780748 BLAKE2B cc28c58ab59c28540259545d60b19d6c513725e856fce02690e40ab0818d213bd656de704bd6310650af7190d7d3265fee859eebab326ad441f7351213fce6d3 SHA512 7a4afebf87ecda9e7e2d1fb2861c220875a96bab7c7ead6397c7ac11b6effae80d80f71b57a58d6b91a6c849b9a9fd974ce620d3050f677dd0fc4bc05358b27e +DIST wget2-2.1.0.tar.gz 3867884 BLAKE2B 4bde0b8d8d703f863db10dccdcafe9c93923a6861b973607f7ec2c06fa68921561b41eb049e59ccab4f0abafe5017e15d4131d684ad47b4fa4f6ac38c8772ed2 SHA512 ae1fc267b1c2ee182ee59f0fc34fef238326a20f1ea1c15be6db2c16b70d49e89f61ca937d3e64d214f73ef9646ba4318782ac4210db51bd3d89c55ce4406872 diff --git a/net-misc/wget2/files/gnulib-autoconf270.patch b/net-misc/wget2/files/gnulib-autoconf270.patch deleted file mode 100644 index b0cfe0e8663e..000000000000 --- a/net-misc/wget2/files/gnulib-autoconf270.patch +++ /dev/null @@ -1,22 +0,0 @@ -X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blobdiff_plain;f=m4%2Fstd-gnu11.m4;h=b5ab8abed0288b1197fe9f49dcf6aeb6b503ddf3;hp=db833d820f3b5b26e0f218ef87daf4fc1be54f2d;hb=a3b3fc85e3e632374811b27cb2111e50fa177e36;hpb=c6b798d3754a4ee18c3e5e0fff4310105d7894b2 - -diff --git a/m4/std-gnu11.m4 b/m4/std-gnu11.m4 -index db833d8..b5ab8ab 100644 ---- a/m4/std-gnu11.m4 -+++ b/m4/std-gnu11.m4 -@@ -6,6 +6,8 @@ - # This implementation will be obsolete once we can assume Autoconf 2.70 - # or later is installed everywhere a Gnulib program might be developed. - -+m4_version_prereq([2.70], [], [ -+ - - # Copyright (C) 2001-2020 Free Software Foundation, Inc. - -@@ -822,3 +824,6 @@ dnl Tru64 N/A (no support) - dnl with extended modes being tried first. - [[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl - ])# _AC_PROG_CXX_CXX11 -+ -+ -+])# m4_version_prereq diff --git a/net-misc/wget2/files/wget2-1.99.2-autoconf270.patch b/net-misc/wget2/files/wget2-1.99.2-autoconf270.patch deleted file mode 100644 index f4f3dc192638..000000000000 --- a/net-misc/wget2/files/wget2-1.99.2-autoconf270.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 580af869093cfda6bc8a9d5901850354a16b3666 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Fri, 25 Dec 2020 18:55:34 +0100 -Subject: [PATCH] * configure.ac: Use AC_CONFIG_MACRO_DIR only once - -This fixes #547 (autotools 2.70 is more restrictive). -Reported by: Gabriele Balducci ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7e29b8cba..0a4dc05b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,7 +100,6 @@ AC_CONFIG_FILES([include/wget/wgetver.h]) - - AC_CONFIG_SRCDIR([src/wget.c]) - AC_CONFIG_HEADERS([config.h]) --AC_CONFIG_MACRO_DIR([m4]) - - # Non-verbose make - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) --- -GitLab - diff --git a/net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch b/net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch deleted file mode 100644 index 8835171bb61c..000000000000 --- a/net-misc/wget2/files/wget2-1.99.2-avoid_bashisms.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 60b50a9076c06933f7255afc8df0733a4311f767 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Thu, 29 Oct 2020 23:05:18 +0100 -Subject: [PATCH] * configure.ac: Fix configure.ac bashisms - -Reported-by: Brian Inglis - -Backported to 1.99.2 release -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - configure.ac | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ab3d9fdf..4cc5eff2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -350,13 +350,13 @@ if test "$enable_doc" = yes; then - if test -n "$DOXYGEN" || test -n "$PANDOC"; then - LIBWGET_DOCS_INFO="yes (found:" - if test -n "$DOXYGEN"; then -- LIBWGET_DOCS_INFO+=" Doxygen)" -+ LIBWGET_DOCS_INFO="$LIBWGET_DOCS_INFO Doxygen)" - else - LIBWGET_DOCS_INFO="no" - fi - WGET2_DOCS_INFO="yes (found:" - if test -n "$PANDOC"; then -- WGET2_DOCS_INFO+=" Pandoc)" -+ WGET2_DOCS_INFO="$WGET2_DOCS_INFO Pandoc)" - else - WGET2_DOCS_INFO="no" - fi -@@ -440,7 +440,7 @@ PKG_PROG_PKG_CONFIG - - AC_ARG_WITH(ssl, AS_HELP_STRING([--with-ssl], [Use SSL/TLS with specified library. Options: 'gnutls' (default), 'openssl', 'wolfssl' or 'none']), with_ssl=$withval, with_ssl=gnutls) - --AS_IF([test "x$with_ssl" == "xgnutls"], [ -+AS_IF([test "x$with_ssl" = "xgnutls"], [ - PKG_CHECK_MODULES([GNUTLS], [gnutls], [ - with_gnutls=yes - LIBS="$GNUTLS_LIBS $LIBS" -@@ -452,16 +452,16 @@ AS_IF([test "x$with_ssl" == "xgnutls"], [ - [with_gnutls=no; AC_MSG_WARN(*** GNUTLS was not found. You will not be able to use HTTPS. Fallback to libnettle for hashing and checksumming.)]) - ]) - -- AS_IF([test "x$with_gnutls" == xyes], [ -+ AS_IF([test "x$with_gnutls" = xyes], [ - AC_SEARCH_LIBS(gnutls_hash, gnutls, [with_gnutls_hash=yes]) -- AS_IF([test "x$with_gnutls_hash" == xyes], -+ AS_IF([test "x$with_gnutls_hash" = xyes], - [AC_CHECK_HEADERS([gnutls/crypto.h], [], [], [#include <gnutls/gnutls.h>])]) - AC_CHECK_HEADERS([gnutls/ocsp.h]) - AC_CHECK_FUNCS(gnutls_srp_server_get_username gnutls_transport_get_int) - ]) - ]) - --AS_IF([test "x$with_ssl" == "xopenssl"], [ -+AS_IF([test "x$with_ssl" = "xopenssl"], [ - PKG_CHECK_MODULES([OPENSSL], [openssl], [ - with_openssl=yes - LIBS="$OPENSSL_LIBS $LIBS" -@@ -474,7 +474,7 @@ AS_IF([test "x$with_ssl" == "xopenssl"], [ - ]) - ]) - -- AS_IF([test "x$with_openssl" == xyes], [ -+ AS_IF([test "x$with_openssl" = xyes], [ - AC_CHECK_HEADERS([openssl/ssl.h]) - AC_CHECK_HEADERS([openssl/x509_vfy.h]) - AC_CHECK_FUNCS(SSL_new X509_STORE_add_lookup) -@@ -846,9 +846,9 @@ AC_CONFIG_FILES([Makefile - AC_OUTPUT - - # Check if expected TLS library was found and print it --AS_IF([test "x$with_ssl" == xwolfssl && test "x$with_wolfssl" == xno], [ssl_enabled="(not found)"], -- [test "x$with_ssl" == xopenssl && test "x$with_openssl" == xno], [ssl_enabled="(not found)"], -- [test "x$with_ssl" == xgnutls && test "x$with_gnutls" == xno], [ssl_enabled="(not found)"], -+AS_IF([test "x$with_ssl" = xwolfssl && test "x$with_wolfssl" = xno], [ssl_enabled="(not found)"], -+ [test "x$with_ssl" = xopenssl && test "x$with_openssl" = xno], [ssl_enabled="(not found)"], -+ [test "x$with_ssl" = xgnutls && test "x$with_gnutls" = xno], [ssl_enabled="(not found)"], - []) - - AC_MSG_NOTICE([Summary of build options: --- -2.30.0 - diff --git a/net-misc/wget2/files/wget2-1.99.2-remove_ldconfig_call.patch b/net-misc/wget2/files/wget2-1.99.2-remove_ldconfig_call.patch deleted file mode 100644 index 6953b7314b63..000000000000 --- a/net-misc/wget2/files/wget2-1.99.2-remove_ldconfig_call.patch +++ /dev/null @@ -1,25 +0,0 @@ -From eb2aefb01868e91f2e1252ddd1bcdb9c075e5b49 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Sun, 8 Mar 2020 21:46:15 +0100 -Subject: [PATCH] Don't run ldconfig by default - -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - Makefile.am | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 979ad1b1..5bc6f6ce 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -75,7 +75,3 @@ fuzz-coverage: clean clean-lcov - check-local: - $(AM_V_at)$(MAKE) -s syntax-check >/dev/null - $(AM_V_at)$(srcdir)/contrib/check_options $(srcdir)/docs/wget2.md $(builddir)/src/wget2$(EXEEXT) -- --# ppl often forget to run ldconfig after an install, so let's do it here --install-exec-hook: -- $(AM_V_at)$(LDCONFIG) || : --- -2.25.1 - diff --git a/net-misc/wget2/files/wget2-2.0.1-stdint.patch b/net-misc/wget2/files/wget2-2.0.1-stdint.patch new file mode 100644 index 000000000000..984cf52c1fc0 --- /dev/null +++ b/net-misc/wget2/files/wget2-2.0.1-stdint.patch @@ -0,0 +1,24 @@ +From 96fda91da2df356a7e0897187822e27125a3e40b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> +Date: Mon, 22 May 2023 19:56:35 +0200 +Subject: * libwget/decompressor.c: Explicitly include stdint.h before lzlib.h + +--- + libwget/decompressor.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libwget/decompressor.c b/libwget/decompressor.c +index 53ed884..69ce5dd 100644 +--- a/libwget/decompressor.c ++++ b/libwget/decompressor.c +@@ -60,6 +60,7 @@ + #endif + + #ifdef WITH_LZIP ++#include <stdint.h> + #include <lzlib.h> + #endif + +-- +cgit v1.1 + diff --git a/net-misc/wget2/files/wget2-fix-build-issues-with-clang-16.patch b/net-misc/wget2/files/wget2-fix-build-issues-with-clang-16.patch new file mode 100644 index 000000000000..ca671879a1e3 --- /dev/null +++ b/net-misc/wget2/files/wget2-fix-build-issues-with-clang-16.patch @@ -0,0 +1,28 @@ +https://gitlab.com/gnuwget/wget2/-/merge_requests/523 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Mon, 29 May 2023 08:34:33 +0000 +Subject: [PATCH] libwget/thread.c: Fix build issues with clang-16 + +With clang 16, specially on with musl libc, it would result in an +incompatible pointer to integer conversion error. As clang 16 has made a +few options default, including -Wincompatible-function-pointer-types. +This patch fixes that error. + +First discovered on Gentoo's musl llvm profile. Please refer +https://bugs.gentoo.org/898058. + +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/libwget/thread.c ++++ b/libwget/thread.c +@@ -289,7 +289,7 @@ int wget_thread_join(wget_thread *thread) + */ + wget_thread_id wget_thread_self(void) + { +- return gl_thread_self(); ++ return (wget_thread_id) gl_thread_self(); + } + + /** +-- +2.40.1 + diff --git a/net-misc/wget2/metadata.xml b/net-misc/wget2/metadata.xml index 5c9152ae45cd..42dea7a13704 100644 --- a/net-misc/wget2/metadata.xml +++ b/net-misc/wget2/metadata.xml @@ -2,16 +2,15 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> </maintainer> <use> - <flag name="brotli">Enable support for brotli compression</flag> <flag name="gpgme">Build <pkg>app-crypt/gpgme</pkg> backend</flag> - <flag name="http2">Enable HTTP/2.0 support via <pkg>net-libs/nghttp2</pkg></flag> - <flag name="lzip">Enable <pkg>app-arch/lzip</pkg> support</flag> <flag name="openssl">Enable crypto support via <pkg>dev-libs/openssl</pkg></flag> <flag name="psl">Use public suffix list via <pkg>net-libs/libpsl</pkg></flag> - <flag name="valgrind">Depend on <pkg>dev-util/valgrind</pkg> for test suite</flag> </use> + <upstream> + <remote-id type="gitlab">gnuwget/wget2</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/wget2/wget2-1.99.2.ebuild b/net-misc/wget2/wget2-2.0.1-r4.ebuild index bf81f1f8ebb8..56d044188f55 100644 --- a/net-misc/wget2/wget2-1.99.2.ebuild +++ b/net-misc/wget2/wget2-2.0.1-r4.ebuild @@ -1,19 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -inherit autotools +EAPI=8 DESCRIPTION="GNU Wget2 is a file and recursive website downloader" HOMEPAGE="https://gitlab.com/gnuwget/wget2" SRC_URI="mirror://gnu/wget/${P}.tar.gz" -LICENSE="GPL-3" +# LGPL for libwget +LICENSE="GPL-3+ LGPL-3+" SLOT="0/0" # subslot = libwget.so version -KEYWORDS="~amd64 ~x86" -IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzma openssl pcre psl +ssl test valgrind xattr zlib" -REQUIRED_USE="valgrind? ( test )" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test xattr zlib" RDEPEND=" brotli? ( app-arch/brotli ) @@ -26,12 +24,13 @@ RDEPEND=" ) ) gpgme? ( - app-crypt/gpgme + app-crypt/gpgme:= dev-libs/libassuan dev-libs/libgpg-error ) http2? ( net-libs/nghttp2 ) idn? ( net-dns/libidn2:= ) + lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils ) pcre? ( dev-libs/libpcre2 ) psl? ( net-libs/libpsl ) @@ -41,47 +40,39 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) - valgrind? ( dev-util/valgrind ) + doc? ( app-text/doxygen[dot] ) " RESTRICT="!test? ( test )" PATCHES=( - # Upstream attempts to be "smart" by calling ldconfig in - # install-exec-hook - "${FILESDIR}"/${PN}-1.99.2-remove_ldconfig_call.patch - - # Fixes from upstream - "${FILESDIR}"/${P}-avoid_bashisms.patch - "${FILESDIR}"/${P}-autoconf270.patch - "${FILESDIR}"/gnulib-autoconf270.patch + "${FILESDIR}"/${PN}-fix-build-issues-with-clang-16.patch + "${FILESDIR}"/${P}-stdint.patch ) -src_prepare() { - default - eautoreconf -} - src_configure() { local myeconfargs=( --disable-static + --disable-valgrind-tests --with-plugin-support --with-ssl="$(usex ssl $(usex gnutls gnutls openssl) none)" --without-libidn --without-libmicrohttpd $(use_enable doc) - $(use_enable valgrind valgrind-tests) $(use_enable xattr) $(use_with brotli brotlidec) $(use_with bzip2) $(use_with gpgme) $(use_with http2 libnghttp2) $(use_with idn libidn2) + $(use_with lzip) $(use_with lzma) $(use_with pcre libpcre2) $(use_with psl libpsl) $(use_with zlib) + + # Avoid calling ldconfig + LDCONFIG=: ) econf "${myeconfargs[@]}" } @@ -89,7 +80,16 @@ src_configure() { src_install() { default - doman docs/man/man{1/*.1,3/*.3} + if [[ ${PV} == *9999 ]] ; then + if use doc ; then + local mpage + for mpage in $(find docs/man -type f -regextype grep -regex ".*\.[[:digit:]]$") ; do + doman ${mpage} + done + fi + else + doman docs/man/man{1/*.1,3/*.3} + fi find "${D}" -type f -name '*.la' -delete || die rm "${ED}"/usr/bin/${PN}_noinstall || die diff --git a/net-misc/wget2/wget2-2.0.0.ebuild b/net-misc/wget2/wget2-2.1.0.ebuild index facb07871d08..745aa97146f8 100644 --- a/net-misc/wget2/wget2-2.0.0.ebuild +++ b/net-misc/wget2/wget2-2.1.0.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="GNU Wget2 is a file and recursive website downloader" HOMEPAGE="https://gitlab.com/gnuwget/wget2" SRC_URI="mirror://gnu/wget/${P}.tar.gz" -LICENSE="GPL-3" +# LGPL for libwget +LICENSE="GPL-3+ LGPL-3+" SLOT="0/0" # subslot = libwget.so version -KEYWORDS="~amd64 ~x86" -IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test valgrind xattr zlib" -REQUIRED_USE="valgrind? ( test )" +KEYWORDS="~amd64 ~arm64 ~loong ~x86" +IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test xattr zlib" RDEPEND=" brotli? ( app-arch/brotli ) @@ -24,7 +24,7 @@ RDEPEND=" ) ) gpgme? ( - app-crypt/gpgme + app-crypt/gpgme:= dev-libs/libassuan dev-libs/libgpg-error ) @@ -40,8 +40,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) - valgrind? ( dev-util/valgrind ) + doc? ( app-text/doxygen[dot] ) " RESTRICT="!test? ( test )" @@ -49,19 +48,19 @@ RESTRICT="!test? ( test )" src_configure() { local myeconfargs=( --disable-static + --disable-valgrind-tests --with-plugin-support --with-ssl="$(usex ssl $(usex gnutls gnutls openssl) none)" --without-libidn --without-libmicrohttpd $(use_enable doc) - $(use_enable valgrind valgrind-tests) $(use_enable xattr) $(use_with brotli brotlidec) $(use_with bzip2) $(use_with gpgme) $(use_with http2 libnghttp2) $(use_with idn libidn2) - $(use_with lzip lz) + $(use_with lzip) $(use_with lzma) $(use_with pcre libpcre2) $(use_with psl libpsl) @@ -76,7 +75,16 @@ src_configure() { src_install() { default - doman docs/man/man{1/*.1,3/*.3} + if [[ ${PV} == *9999 ]] ; then + if use doc ; then + local mpage + for mpage in $(find docs/man -type f -regextype grep -regex ".*\.[[:digit:]]$") ; do + doman ${mpage} + done + fi + else + doman docs/man/man{1/*.1,3/*.3} + fi find "${D}" -type f -name '*.la' -delete || die rm "${ED}"/usr/bin/${PN}_noinstall || die diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-9999.ebuild index c35c06da76fa..088e948a5a9b 100644 --- a/net-misc/wget2/wget2-9999.ebuild +++ b/net-misc/wget2/wget2-9999.ebuild @@ -1,21 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit autotools git-r3 DESCRIPTION="GNU Wget2 is a file and recursive website downloader" HOMEPAGE="https://gitlab.com/gnuwget/wget2" -if [[ "${PV}" == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git" -else - SRC_URI="mirror://gnu/wget/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi -LICENSE="GPL-3" +EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git" + +# LGPL for libwget +LICENSE="GPL-3+ LGPL-3+" SLOT="0/0" # subslot = libwget.so version -IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzma openssl pcre psl +ssl test valgrind xattr zlib" -REQUIRED_USE="valgrind? ( test )" +KEYWORDS="" +IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test xattr zlib" RDEPEND=" brotli? ( app-arch/brotli ) @@ -28,12 +26,13 @@ RDEPEND=" ) ) gpgme? ( - app-crypt/gpgme + app-crypt/gpgme:= dev-libs/libassuan dev-libs/libgpg-error ) http2? ( net-libs/nghttp2 ) idn? ( net-dns/libidn2:= ) + lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils ) pcre? ( dev-libs/libpcre2 ) psl? ( net-libs/libpsl ) @@ -43,57 +42,52 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) - valgrind? ( dev-util/valgrind ) + doc? ( app-text/doxygen[dot] ) " RESTRICT="!test? ( test )" src_unpack() { - if [[ "${PV}" == *9999 ]] ; then - git-r3_src_unpack + git-r3_src_unpack - # We need to mess with gnulib :-/ - EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \ - EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \ - git-r3_src_unpack - else - default - fi + # We need to mess with gnulib :-/ + EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \ + EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \ + git-r3_src_unpack } src_prepare() { default - if [[ "${PV}" == *9999 ]] ; then - local bootstrap_opts=( - --gnulib-srcdir=../gnulib - --no-bootstrap-sync - --copy - --no-git - --skip-po - ) - AUTORECONF="/bin/true" \ - LIBTOOLIZE="/bin/true" \ - sh ./bootstrap "${bootstrap_opts[@]}" || die - eautoreconf - fi + + local bootstrap_opts=( + --gnulib-srcdir=../gnulib + --no-bootstrap-sync + --copy + --no-git + --skip-po + ) + AUTORECONF="/bin/true" \ + LIBTOOLIZE="/bin/true" \ + sh ./bootstrap "${bootstrap_opts[@]}" || die + eautoreconf } src_configure() { local myeconfargs=( --disable-static + --disable-valgrind-tests --with-plugin-support --with-ssl="$(usex ssl $(usex gnutls gnutls openssl) none)" --without-libidn --without-libmicrohttpd $(use_enable doc) - $(use_enable valgrind valgrind-tests) $(use_enable xattr) $(use_with brotli brotlidec) $(use_with bzip2) $(use_with gpgme) $(use_with http2 libnghttp2) $(use_with idn libidn2) + $(use_with lzip) $(use_with lzma) $(use_with pcre libpcre2) $(use_with psl libpsl) @@ -108,7 +102,16 @@ src_configure() { src_install() { default - doman docs/man/man{1/*.1,3/*.3} + if [[ ${PV} == *9999 ]] ; then + if use doc ; then + local mpage + for mpage in $(find docs/man -type f -regextype grep -regex ".*\.[[:digit:]]$") ; do + doman ${mpage} + done + fi + else + doman docs/man/man{1/*.1,3/*.3} + fi find "${D}" -type f -name '*.la' -delete || die rm "${ED}"/usr/bin/${PN}_noinstall || die diff --git a/net-misc/whatmask/whatmask-1.2-r1.ebuild b/net-misc/whatmask/whatmask-1.2-r1.ebuild index e9eb3e5d7adf..9493fbfef60a 100644 --- a/net-misc/whatmask/whatmask-1.2-r1.ebuild +++ b/net-misc/whatmask/whatmask-1.2-r1.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit toolchain-funcs +EAPI=8 -DESCRIPTION="little C program to compute different subnet mask notations" +inherit autotools + +DESCRIPTION="Little C program to compute different subnet mask notations" HOMEPAGE="http://www.laffeycomputer.com/whatmask.html" SRC_URI="http://downloads.laffeycomputer.com/current_builds/${PN}/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~hppa ppc sparc x86" -DOCS=( AUTHORS ChangeLog INSTALL NEWS README ) - -src_configure() { - tc-export CC +src_prepare() { default + + eautoreconf #874393 } diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest index e565248a23e7..b12bcc0f261d 100644 --- a/net-misc/whois/Manifest +++ b/net-misc/whois/Manifest @@ -1 +1,2 @@ -DIST whois-5.5.10.tar.gz 102555 BLAKE2B 9f1236ceeaea839e5f2a33aa63b39fa7e0566eeb4d2131b88b47dd62f037639a5860719a645d9cc2d0707faa1e86c9822634dda37e1a7a8d3b31a78cf34ecce2 SHA512 5ee92c15146353e77dddcbeddb6e704e0c42d29b8c0ff899ecce80f8e39903e8c796daec7f3de3f197d382f88e7cd4abd470463ea6c13a01347d0cd15d99af28 +DIST whois-5.5.20.tar.gz 109648 BLAKE2B 17b6a795ac517a81cde44530df3e835cccc020a1750ab28d50551a7bd08d132aa10768ff146b0a7943a8348cc7f3f3f7096262caf1d91fbb2d3610ae9f6473e8 SHA512 1d602ec817411a36b3d175e34f166c06186639f4eeea145751decc45372953df40fc76b57c7589d93c49ab0be1276459dffc6424a4344ddbca23f35a9f492fc7 +DIST whois-5.5.21.tar.gz 109621 BLAKE2B b1cf42f1a60e5009e5882f154432d5974f45c1bf89d8b36b73f6e5f55ff2dba02e8ca7900926d2824200f5422d5e9f00abde524d4e2d8a25ba37376cc2e8d04a SHA512 4f3ffbd875df89e910aa9d20616f2d04e773d3e5cd0c5d0262dca481fd6228214033b854ac4eebe078cfde14ab90429d826f24ce6c21ec14cfe8ad56e78ae6e9 diff --git a/net-misc/whois/whois-5.5.10-r1.ebuild b/net-misc/whois/whois-5.5.20.ebuild index 633807559d48..1d4f43bab411 100644 --- a/net-misc/whois/whois-5.5.10-r1.ebuild +++ b/net-misc/whois/whois-5.5.20.ebuild @@ -1,25 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs +inherit bash-completion-r1 toolchain-funcs -MY_P="${P/-/_}" -DESCRIPTION="improved Whois Client" +MY_P=${P/-/_} +DESCRIPTION="Improved Whois Client" HOMEPAGE="https://github.com/rfc1036/whois" -if [[ "${PV}" == *9999 ]] ; then + +if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/rfc1036/whois.git" else #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" + #S="${WORKDIR}"/${PN} + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi + LICENSE="GPL-2" SLOT="0" IUSE="iconv idn nls xcrypt" -RESTRICT="test" #59327 RDEPEND=" iconv? ( virtual/libiconv ) @@ -43,6 +46,7 @@ PATCHES=( src_prepare() { default + if use nls ; then sed -i -e 's:#\(.*pos\):\1:' Makefile || die else @@ -58,21 +62,20 @@ src_configure() { :; } # expected no-op src_compile() { unset HAVE_ICONV HAVE_LIBIDN + use iconv && export HAVE_ICONV=1 use idn && export HAVE_LIBIDN=1 use xcrypt && export HAVE_XCRYPT=1 + tc-export CC + emake CFLAGS="${CFLAGS} ${CPPFLAGS}" } src_install() { - emake BASEDIR="${ED}" prefix=/usr install + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install + insinto /etc doins whois.conf dodoc README debian/changelog - - if [[ ${USERLAND} != "GNU" ]]; then - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die - mv "${ED}"/usr/bin/{whois,mdwhois} || die - fi } diff --git a/net-misc/whois/whois-5.5.21.ebuild b/net-misc/whois/whois-5.5.21.ebuild new file mode 100644 index 000000000000..b5be510bfed5 --- /dev/null +++ b/net-misc/whois/whois-5.5.21.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 toolchain-funcs + +MY_P=${P/-/_} +DESCRIPTION="Improved Whois Client" +HOMEPAGE="https://github.com/rfc1036/whois" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rfc1036/whois.git" +else + #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" + SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + #S="${WORKDIR}"/${PN} + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="iconv idn nls xcrypt" + +RDEPEND=" + iconv? ( virtual/libiconv ) + idn? ( net-dns/libidn2:= ) + nls? ( virtual/libintl ) + xcrypt? ( >=sys-libs/libxcrypt-4.1:= ) + !xcrypt? ( virtual/libcrypt:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + >=dev-lang/perl-5 + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.7.2-config-file.patch + "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch + "${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch +) + +src_prepare() { + default + + if use nls ; then + sed -i -e 's:#\(.*pos\):\1:' Makefile || die + else + sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die + + # don't generate po files when nls is disabled (bug #419889) + sed -i -e '/^all:/s/ pos//' \ + -e '/^install:/s/ install-pos//' Makefile || die + fi +} + +src_configure() { :; } # expected no-op + +src_compile() { + unset HAVE_ICONV HAVE_LIBIDN + + use iconv && export HAVE_ICONV=1 + use idn && export HAVE_LIBIDN=1 + use xcrypt && export HAVE_XCRYPT=1 + + tc-export CC + + emake CFLAGS="${CFLAGS} ${CPPFLAGS}" +} + +src_install() { + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install + + insinto /etc + doins whois.conf + dodoc README debian/changelog +} diff --git a/net-misc/whois/whois-9999.ebuild b/net-misc/whois/whois-9999.ebuild index 350b7b60b378..d50f25c71f08 100644 --- a/net-misc/whois/whois-9999.ebuild +++ b/net-misc/whois/whois-9999.ebuild @@ -1,25 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs +inherit bash-completion-r1 toolchain-funcs -MY_P="${P/-/_}" -DESCRIPTION="improved Whois Client" +MY_P=${P/-/_} +DESCRIPTION="Improved Whois Client" HOMEPAGE="https://github.com/rfc1036/whois" -if [[ "${PV}" == *9999 ]] ; then + +if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/rfc1036/whois.git" else #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + #S="${WORKDIR}"/${PN} + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi + LICENSE="GPL-2" SLOT="0" IUSE="iconv idn nls xcrypt" -RESTRICT="test" #59327 RDEPEND=" iconv? ( virtual/libiconv ) @@ -43,6 +46,7 @@ PATCHES=( src_prepare() { default + if use nls ; then sed -i -e 's:#\(.*pos\):\1:' Makefile || die else @@ -58,21 +62,20 @@ src_configure() { :; } # expected no-op src_compile() { unset HAVE_ICONV HAVE_LIBIDN + use iconv && export HAVE_ICONV=1 use idn && export HAVE_LIBIDN=1 use xcrypt && export HAVE_XCRYPT=1 + tc-export CC + emake CFLAGS="${CFLAGS} ${CPPFLAGS}" } src_install() { - emake BASEDIR="${ED}" prefix=/usr install + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" BASHCOMPDIR="$(get_bashcompdir)" install + insinto /etc doins whois.conf dodoc README debian/changelog - - if [[ ${USERLAND} != "GNU" ]]; then - mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die - mv "${ED}"/usr/bin/{whois,mdwhois} || die - fi } diff --git a/net-misc/wol/files/wol-0.7.1-Fix-config.h-test-consumption.patch b/net-misc/wol/files/wol-0.7.1-Fix-config.h-test-consumption.patch new file mode 100644 index 000000000000..897517a97f44 --- /dev/null +++ b/net-misc/wol/files/wol-0.7.1-Fix-config.h-test-consumption.patch @@ -0,0 +1,35 @@ +From 1c16d04a3fc03a5f4c0cd54ff6f207de1062e9bd Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 25 Oct 2022 13:54:04 +0100 +Subject: [PATCH] Fix config.h test consumption + +Bug: https://bugs.gentoo.org/874420 +--- a/lib/ether.h ++++ b/lib/ether.h +@@ -35,7 +35,7 @@ + + #include "magic.h" + +-#if !HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET && !HAVE_STRUCT_ETHER_ADDR_OCTET ++#if !defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) && !defined(HAVE_STRUCT_ETHER_ADDR_OCTET) + + struct + ether_addr +@@ -45,7 +45,7 @@ ether_addr + + #define ETHER_ADDR_OCTET ether_addr_octet + +-#else /* HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET || HAVE_STRUCT_ETHER_ADDR_OCTET */ ++#else /* defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) || defined(HAVE_STRUCT_ETHER_ADDR_OCTET) */ + + #if HAVE_STRUCT_ETHER_ADDR_OCTET + #define ETHER_ADDR_OCTET octet +@@ -55,7 +55,7 @@ ether_addr + #define ETHER_ADDR_OCTET ether_addr_octet + #endif /* HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET */ + +-#endif /* !HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET && !HAVE_STRUCT_ETHER_ADDR_OCTET */ ++#endif /* !defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) && !defined(HAVE_STRUCT_ETHER_ADDR_OCTET) */ + + + #if !defined(HAVE_ETHER_HOSTTON) diff --git a/net-misc/wol/files/wol-0.7.1-Fix-malloc-detection.patch b/net-misc/wol/files/wol-0.7.1-Fix-malloc-detection.patch new file mode 100644 index 000000000000..6f783e9cfaed --- /dev/null +++ b/net-misc/wol/files/wol-0.7.1-Fix-malloc-detection.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/874420 + +From bcf98fe9a674a3784ad1a4f8eecc3b31a7b209a9 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 25 Oct 2022 14:00:23 +0100 +Subject: [PATCH] Fix malloc detection + +--- a/m4/getline.m4 ++++ b/m4/getline.m4 +@@ -18,6 +18,7 @@ AC_DEFUN([AM_FUNC_GETLINE], + # include <stdio.h> + # include <sys/types.h> + # include <string.h> ++# include <stdlib.h> + int main () + { /* Based on a test program from Karl Heuer. */ + char *line = NULL; +--- a/m4/malloc.m4 ++++ b/m4/malloc.m4 +@@ -14,6 +14,7 @@ AC_DEFUN([jm_FUNC_MALLOC], + + AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc, + [AC_TRY_RUN([ ++ #include <stdlib.h> + char *malloc (); + int + main () +--- a/m4/realloc.m4 ++++ b/m4/realloc.m4 +@@ -14,7 +14,8 @@ AC_DEFUN([jm_FUNC_REALLOC], + + AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc, + [AC_TRY_RUN([ +- char *realloc (); ++ #include <stdlib.h> ++ void *realloc(void *ptr, size_t size); + int + main () + { diff --git a/net-misc/wol/files/wol-0.7.1-linux-headers.patch b/net-misc/wol/files/wol-0.7.1-linux-headers.patch new file mode 100644 index 000000000000..e381d2a31a6a --- /dev/null +++ b/net-misc/wol/files/wol-0.7.1-linux-headers.patch @@ -0,0 +1,11 @@ +--- a/src/magic.c ++++ b/src/magic.c +@@ -142,7 +142,7 @@ magic_assemble (struct magic *magic_buf, const char *mac_str, + } + + for (j = 0; j < MAC_LEN; ++j) +- m[j] = ea.ETHER_ADDR_OCTET[j]; ++ m[j] = ea.ether_addr_octet[j]; + } + + /* accommodate the packet chunk's size to the packet type */ diff --git a/net-misc/wol/files/wol-0.7.1-musl.patch b/net-misc/wol/files/wol-0.7.1-musl.patch index c7c0dc6028ca..3b9098554370 100644 --- a/net-misc/wol/files/wol-0.7.1-musl.patch +++ b/net-misc/wol/files/wol-0.7.1-musl.patch @@ -15,3 +15,48 @@ +# endif #endif /* not GETLINE_H_ */ +--- a/lib/realloc.c ++++ b/lib/realloc.c +@@ -20,21 +20,15 @@ + #if HAVE_CONFIG_H + # include <config.h> + #endif +-#undef realloc + +-#include <sys/types.h> +- +-char *malloc (); +-char *realloc (); ++#include <stdlib.h> + + /* Change the size of an allocated block of memory P to N bytes, + with error checking. If N is zero, change it to 1. If P is NULL, + use malloc. */ + + char * +-rpl_realloc (p, n) +- char *p; +- size_t n; ++rpl_realloc (char *p, size_t n) + { + if (n == 0) + n = 1; +--- a/lib/xmalloc.c ++++ b/lib/xmalloc.c +@@ -20,15 +20,7 @@ + #endif + + #include <sys/types.h> +- +-#if STDC_HEADERS +-# include <stdlib.h> +-#else +-void *calloc (); +-void *malloc (); +-void *realloc (); +-void free (); +-#endif ++#include <stdlib.h> + + #if ENABLE_NLS + # include <libintl.h> diff --git a/net-misc/wol/wol-0.7.1-r2.ebuild b/net-misc/wol/wol-0.7.1-r4.ebuild index 4c9eb1184f11..612394b1d861 100644 --- a/net-misc/wol/wol-0.7.1-r2.ebuild +++ b/net-misc/wol/wol-0.7.1-r4.ebuild @@ -1,22 +1,36 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs +inherit autotools toolchain-funcs DESCRIPTION="Implements Wake On LAN (Magic Paket) functionality in a small program" HOMEPAGE="http://ahh.sourceforge.net/wol/" -SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/ahh/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" IUSE="nls" -PATCHES=( "${FILESDIR}/${P}-musl.patch" ) +PATCHES=( + "${FILESDIR}/${P}-musl.patch" + "${FILESDIR}/${P}-Fix-config.h-test-consumption.patch" + "${FILESDIR}/${P}-Fix-malloc-detection.patch" + "${FILESDIR}/${P}-linux-headers.patch" +) + +src_prepare() { + default + + # bug #874420 + eautoreconf +} src_configure() { + export jm_cv_func_working_{re,m}alloc=yes + local myeconfargs=( --disable-rpath $(use_enable nls) diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest index bd6176fde979..5d5aff6c7a1c 100644 --- a/net-misc/wput/Manifest +++ b/net-misc/wput/Manifest @@ -1 +1,3 @@ DIST wput-0.6.2.tgz 368510 BLAKE2B bf59720e220d837354aff7d90bf06dcf54df4adf10c53ca844cb18dc6f327793ebd5dce7beecc76b43ddccfe273435a1eca918ab2272145dc8bf47293f601004 SHA512 e1d0fb8570cbda44c97215ee1a021a9867f2e91323b3d7f7df1d7fd68a1b2aba40a7f3068e5e85e8c736b1dba1fba62df375af99e3fb96cd0fd414b139c641bd +DIST wput_0.6.2+git20130413-11.debian.tar.xz 15976 BLAKE2B 4f1facab61d22544855ce49875357c8d67d6eab013cf73cb8507a334c07b1f9e9391e342347eeafdb26b62a4156d4a0a4e2967198662ad66ef8ebb35ed2c9bf8 SHA512 d80e727edee34bd0f9b40b14c0ed1bfd2ec456542445fd38c487f06d47ca210d785e911a71d455d335b9e3940a5cfc19cc7202d93501b0b0f4f3a1e6f6a5fc0a +DIST wput_0.6.2+git20130413.orig.tar.bz2 257503 BLAKE2B a5386f5de3e8df23d814b3a7ebba1725bcb75f0a61bd26ea402053bd11d717ae5bdd1c1bc9e43d4f4a61f55a91d9222fffe62988b869b68c206c46bfd89cf28b SHA512 f8bb23f60ae008ecd18ec7f891fc17fe8d2b3550d7788c591067e48af00c934f2c3b2e5d07234fc25bcf6cb94464710ff0309151e9ad6dd734f5a30c3fdab06f diff --git a/net-misc/wput/files/wput-0.6.2_p20130413_p11-exit-not-found-musl.patch b/net-misc/wput/files/wput-0.6.2_p20130413_p11-exit-not-found-musl.patch new file mode 100644 index 000000000000..e92fb092dbd0 --- /dev/null +++ b/net-misc/wput/files/wput-0.6.2_p20130413_p11-exit-not-found-musl.patch @@ -0,0 +1,9 @@ +Bug: https://bugs.gentoo.org/898060 +--- a/src/memdbg.c ++++ b/src/memdbg.c +@@ -1,4 +1,5 @@ + #include <stdio.h> ++#include <stdlib.h> + #include <malloc.h> + #include <fcntl.h> + #ifndef WIN32 diff --git a/net-misc/wput/files/wput-0.6.2_p20130413_p11-no-compress-manpages.patch b/net-misc/wput/files/wput-0.6.2_p20130413_p11-no-compress-manpages.patch new file mode 100644 index 000000000000..cc0c6e8e1b8b --- /dev/null +++ b/net-misc/wput/files/wput-0.6.2_p20130413_p11-no-compress-manpages.patch @@ -0,0 +1,39 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -10,7 +10,6 @@ bindir=@bindir@ + all clean: + cd po && $(MAKE) $(MAKEDEFS) $@ + cd src && $(MAKE) $(MAKEDEFS) $@ +- cd doc && $(MAKE) $(MAKEDEFS) $@ + + win-clean: + cd src && $(MAKE) $(MAKEDEFS) $@ +@@ -20,9 +20,9 @@ install: all + install -m0755 -d $(destdir)$(bindir) + install -m0755 -d $(destdir)$(mandir) + install -m0755 wput $(destdir)$(bindir) +- install -m0644 doc/wput.1.gz $(destdir)$(mandir) ++ install -m0644 doc/wput.1 $(destdir)$(mandir) + cd $(destdir)$(bindir) && ln -s wput wdel +- install -m0644 doc/wdel.1.gz $(destdir)$(mandir) ++ install -m0644 doc/wdel.1 $(destdir)$(mandir) + @echo "----------------" + @echo "Wput and Wdel installed. See 'wput/wdel -h' or 'man wput/wdel' for" + @echo "usage information." +@@ -34,6 +34,6 @@ install: all + uninstall: + rm -f $(destdir)$(bindir)/wput + rm -f $(destdir)$(bindir)/wdel +- rm -f $(destdir)$(mandir)/wput.1.gz +- rm -f $(destdir)$(mandir)/wdel.1.gz ++ rm -f $(destdir)$(mandir)/wput.1 ++ rm -f $(destdir)$(mandir)/wdel.1 + +--- a/doc/Makefile ++++ /dev/null +@@ -1,5 +0,0 @@ +-all: +- gzip < wput.1 > wput.1.gz +- gzip < wdel.1 > wdel.1.gz +-clean: +- rm -f wput.1.gz wdel.1.gz diff --git a/net-misc/wput/files/wput-0.6.2_p20130413_p11-xopen_source-strdup.patch b/net-misc/wput/files/wput-0.6.2_p20130413_p11-xopen_source-strdup.patch new file mode 100644 index 000000000000..e2426d3fc25f --- /dev/null +++ b/net-misc/wput/files/wput-0.6.2_p20130413_p11-xopen_source-strdup.patch @@ -0,0 +1,14 @@ +ftp-ls.c:319:22: error: call to undeclared library function 'strdup' with type 'char *(const char *)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + cur.linkto = xstrdup (p + 4); + ^ +--- a/src/ftp-ls.c ++++ b/src/ftp-ls.c +@@ -29,7 +29,7 @@ file, but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. */ + + #include "config.h" +-#define _XOPEN_SOURCE ++#define _XOPEN_SOURCE 600 + #include <time.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/net-misc/wput/wput-0.6.2.ebuild b/net-misc/wput/wput-0.6.2.ebuild index b9fa842bf3ab..b721e93da415 100644 --- a/net-misc/wput/wput-0.6.2.ebuild +++ b/net-misc/wput/wput-0.6.2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP" -HOMEPAGE="http://wput.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +HOMEPAGE="https://wput.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" IUSE="debug nls ssl" diff --git a/net-misc/wput/wput-0.6.2_p20130413_p11-r1.ebuild b/net-misc/wput/wput-0.6.2_p20130413_p11-r1.ebuild new file mode 100644 index 000000000000..ab922fa168dc --- /dev/null +++ b/net-misc/wput/wput-0.6.2_p20130413_p11-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP" +HOMEPAGE="https://wput.sourceforge.net/" + +if [[ ${PV} == *_p* ]] ; then + MY_PV=$(ver_cut 1-3) + SRC_URI=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5).orig.tar.bz2" + SRC_URI+=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5)-$(ver_cut 7).debian.tar.xz" + S="${WORKDIR}"/${PN}-${MY_PV}+git$(ver_cut 5) +else + SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-${MY_PV}.tgz" +fi + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ppc ~sparc x86" +IUSE="debug ssl" + +RDEPEND="ssl? ( net-libs/gnutls:= )" +DEPEND="${RDEPEND}" +# Debian's patches to fix spelling means need gettext to regenerate +# It's so common that it's not really worth the 'touch' dance to avoid it +# or conditional patching. +BDEPEND="sys-devel/gettext" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.2_p20130413_p11-xopen_source-strdup.patch + "${FILESDIR}"/${PN}-0.6.2_p20130413_p11-no-compress-manpages.patch + "${FILESDIR}"/${PN}-0.6.2_p20130413_p11-exit-not-found-musl.patch +) + +src_prepare() { + eapply $(sed -e "s:^:${WORKDIR}/debian/patches/:" "${WORKDIR}"/debian/patches/series) + default + + eautoreconf +} + +src_configure() { + local myconf=( + --enable-g-switch=no + --enable-nls + + $(usev debug '--enable-memdbg=yes') + $(use_with ssl) + ) + + econf "${myconf[@]}" +} diff --git a/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild b/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild new file mode 100644 index 000000000000..44e3ab8667a5 --- /dev/null +++ b/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP" +HOMEPAGE="https://wput.sourceforge.net/" + +if [[ ${PV} == *_p* ]] ; then + MY_PV=$(ver_cut 1-3) + SRC_URI=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5).orig.tar.bz2" + SRC_URI+=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5)-$(ver_cut 7).debian.tar.xz" + S="${WORKDIR}"/${PN}-${MY_PV}+git$(ver_cut 5) +else + SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-${MY_PV}.tgz" +fi + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ppc ~sparc x86" +IUSE="debug ssl" + +RDEPEND="ssl? ( net-libs/gnutls:= )" +DEPEND="${RDEPEND}" +# Debian's patches to fix spelling means need gettext to regenerate +# It's so common that it's not really worth the 'touch' dance to avoid it +# or conditional patching. +BDEPEND="sys-devel/gettext" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.2_p20130413_p11-xopen_source-strdup.patch + "${FILESDIR}"/${PN}-0.6.2_p20130413_p11-no-compress-manpages.patch +) + +src_prepare() { + eapply $(sed -e "s:^:${WORKDIR}/debian/patches/:" "${WORKDIR}"/debian/patches/series) + default + + eautoreconf +} + +src_configure() { + local myconf=( + --enable-g-switch=no + --enable-nls + + $(usev debug '--enable-memdbg=yes') + $(use_with ssl) + ) + + econf "${myconf[@]}" +} diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild index a799f42b4c5e..0a22d37a1810 100644 --- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild +++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sigmavirus24/${PN}/archive/${PV}.tar.gz -> ${P}.gh.t LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv sparc x86" IUSE="" RDEPEND="virtual/ssh @@ -21,13 +21,14 @@ RDEPEND="virtual/ssh x11-libs/libXt" DEPEND="${RDEPEND}" BDEPEND="app-text/rman + sys-devel/gcc >=x11-misc/imake-1.0.8-r1" src_configure() { econf --libexecdir=/usr/"$(get_libdir)"/misc \ --disable-installing-app-defaults CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die "xmkmf failed" + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die "xmkmf failed" } src_compile() { diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest index 451425b8871e..79e5b123b893 100644 --- a/net-misc/x2goclient/Manifest +++ b/net-misc/x2goclient/Manifest @@ -1 +1,2 @@ DIST x2goclient-4.1.2.2.tar.gz 2576404 BLAKE2B 2a29f73516282af119cc4ea0a511c29156cdb71564adcdbf307f60298b87c2a7eee0ca121a3e165a63c110130c2704b49b90b3b9abc6a39b6105b1f22ac5afd0 SHA512 85e6db6a34629512be64376883c205d8bf0696c4697cf216970b57a91ffe68dcf7f38bfda0d396c104602f6991b596c5fb0934e75fa4a93f7d0e41c2b3f5ac4d +DIST x2goclient-4.1.2.3.tar.gz 2582072 BLAKE2B ee167d7f8b293220ce5d9a315dc11997ba9cf8bc5c9840155888ddbf816d18a39553659ccd363619f6198d1e7ebadc9932327082ddfc2bb83970df61ada86778 SHA512 1bd59efaaf560bf36dad979cbb67cf90df13943688e1259e86d441ba17677d523ad1f69061d2f65b0ca8eee9e7d00ee242e95c555b4446d72f37acef70a9b435 diff --git a/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.2-r1.ebuild index 313291619a0b..4c7734b4d5fb 100644 --- a/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild +++ b/net-misc/x2goclient/x2goclient-4.1.2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,15 +6,16 @@ EAPI=7 inherit desktop qmake-utils xdg DESCRIPTION="The X2Go Qt client" -HOMEPAGE="http://www.x2go.org" -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" +HOMEPAGE="https://wiki.x2go.org/doku.php" +SRC_URI="https://code.x2go.org/releases/source/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" IUSE="ldap" -COMMON_DEPEND="dev-qt/qtcore:5 +DEPEND=" + dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 @@ -23,11 +24,10 @@ COMMON_DEPEND="dev-qt/qtcore:5 >=net-libs/libssh-0.7.5-r2 net-print/cups x11-libs/libXpm - ldap? ( net-nds/openldap )" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5" -RDEPEND="${COMMON_DEPEND} + ldap? ( net-nds/openldap:= )" +RDEPEND="${DEPEND} net-misc/nx" +BDEPEND="dev-qt/linguist-tools:5" CLIENT_BUILD="${WORKDIR}"/${P}.client_build PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build diff --git a/net-misc/x2goclient/x2goclient-4.1.2.3.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.3.ebuild new file mode 100644 index 000000000000..8738dcc0114d --- /dev/null +++ b/net-misc/x2goclient/x2goclient-4.1.2.3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop qmake-utils xdg + +DESCRIPTION="The X2Go Qt client" +HOMEPAGE="https://wiki.x2go.org/doku.php" +SRC_URI="https://code.x2go.org/releases/source/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ldap" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + >=net-libs/libssh-0.7.5-r2 + net-print/cups + x11-libs/libXpm + ldap? ( net-nds/openldap:= )" +RDEPEND="${DEPEND} + net-misc/nx" +BDEPEND="dev-qt/linguist-tools:5" + +CLIENT_BUILD="${WORKDIR}"/${P}.client_build +PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build + +src_prepare() { + default + + if ! use ldap; then + sed -e "s/-lldap//" -i x2goclient.pro || die + sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die + fi +} + +src_configure() { + eqmake5 "${S}"/x2goclient.pro +} + +src_install() { + dobin ${PN} + + local size + for size in 16 32 48 64 128 ; do + doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png + done + newicon -s scalable res/img/x2go-logos/x2go-logo.svg ${PN}.svg + + insinto /usr/share/pixmaps + doins res/img/icons/${PN}.xpm + + domenu desktop/${PN}.desktop + doman man/man?/* +} diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest index 9db8eab3f331..a363e09ccb25 100644 --- a/net-misc/x2goserver/Manifest +++ b/net-misc/x2goserver/Manifest @@ -1 +1,3 @@ DIST x2goserver-4.1.0.3.tar.gz 141581 BLAKE2B 79401a146e8a18451d6521f4b9556b2f22746bd752f39dc45764bacca085f2bb66a92327aaeb292979ce43ffbde24541e492cec814f1f8a535614cbdc2dc3ebd SHA512 9d7257dd454bfedca9e3ef1b07bc38b540cb833fae4535f2225a1f0bfea93c0f04c638d411b57c50e7170106a5ae1d7f41c19f043832129a7a9460dcfd34c56a +DIST x2goserver-4.1.0.5.tar.gz 178386 BLAKE2B b45e0ea9cbfc81afabf1160ecf4513a3cdacda40b02c692cc04a0012f37441edd4c7074e467809aa2b0ad3eae24cae1982413b5e90d1657a0b6e6e6c56224025 SHA512 b0413fe54d1f93031480f954d2e482e4bb93393fbd49516e5c89101d38f33ca6019080ad42622ae986717ebe85fbdca230db2d69e45cc9684a79e62d9f885bd8 +DIST x2goserver-4.1.0.6.tar.gz 178638 BLAKE2B 8a7f97169a36a7ef2704b97c1b62818a41c254fd221c8dc506573bda012172ceea9544eadd1a8481f86bf2b806e4abeafd3fa37c0075cd574c5239aa9b4643c3 SHA512 3c82ae5bd86dd938bedc70aa01d2d9123d749a36396f44100a7a94e58e5dba2d347fc967691fe0978b55e42b7fb90ddd065eafaba88dc6faee83c14645447e1b diff --git a/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3-r2.ebuild index 78bc8c8e9fb2..9fefa7ac2dc3 100644 --- a/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild +++ b/net-misc/x2goserver/x2goserver-4.1.0.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,8 +30,8 @@ RDEPEND="acct-user/x2gouser media-fonts/font-cursor-misc media-fonts/font-misc-misc[nls] >=net-misc/nx-3.5.99.14 - net-misc/openssh >=sys-apps/iproute2-4.3.0 + virtual/openssh x11-apps/xauth x11-apps/xhost x11-apps/xwininfo diff --git a/net-misc/x2goserver/x2goserver-4.1.0.5.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.5.ebuild new file mode 100644 index 000000000000..9d7bbf319cdd --- /dev/null +++ b/net-misc/x2goserver/x2goserver-4.1.0.5.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles toolchain-funcs xdg + +DESCRIPTION="The X2Go server" +HOMEPAGE="http://www.x2go.org" +SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+fuse postgres +sqlite" + +REQUIRED_USE="|| ( postgres sqlite )" + +DEPEND="virtual/perl-ExtUtils-MakeMaker" +RDEPEND="acct-user/x2gouser + acct-user/x2goprint + dev-lang/perl:= + dev-perl/Capture-Tiny + dev-perl/Config-Simple + dev-perl/File-BaseDir + dev-perl/File-ReadBackwards + dev-perl/File-Which + dev-perl/Switch + dev-perl/Try-Tiny + media-fonts/font-cursor-misc + media-fonts/font-misc-misc[nls] + >=net-misc/nx-3.5.99.14 + >=sys-apps/iproute2-4.3.0 + virtual/openssh + x11-apps/xauth + x11-apps/xhost + x11-apps/xwininfo + fuse? ( net-fs/sshfs ) + postgres? ( dev-perl/DBD-Pg ) + sqlite? ( dev-perl/DBD-SQLite )" + +src_prepare() { + default + # Do not compress man pages by default + sed '/^[[:space:]]*gzip.*man/d' -i */Makefile || die +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + LIBDIR="/usr/$(get_libdir)/x2go" \ + PREFIX=/usr +} + +src_install() { + emake \ + DESTDIR="${D}" \ + LIBDIR="/usr/$(get_libdir)/x2go" \ + NXLIBDIR="/usr/$(get_libdir)/nx" \ + PREFIX=/usr \ + install + + fowners root:x2goprint /usr/bin/x2goprint + fperms 2755 /usr/bin/x2goprint + fperms 0750 /etc/sudoers.d + fperms 0440 /etc/sudoers.d/x2goserver + dosym ../../usr/share/applications /etc/x2go/applications + + newinitd "${FILESDIR}"/${PN}.init x2gocleansessions + systemd_dounit "${FILESDIR}"/x2gocleansessions.service +} + +pkg_postinst() { + tmpfiles_process x2goserver.conf + xdg_pkg_postinst + + if use sqlite ; then + if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then + elog "To use sqlite and update your existing database, run:" + elog " # x2godbadmin --updatedb" + else + elog "To use sqlite and create the initial database, run:" + elog " # x2godbadmin --createdb" + fi + + fi + + if use postgres ; then + elog "To use a PostgreSQL database, more information is availabe here:" + elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql" + fi + + elog "For password authentication, you need to enable PasswordAuthentication" + elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)" + elog "An init script was installed for x2gocleansessions" +} diff --git a/net-misc/x2goserver/x2goserver-4.1.0.6.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.6.ebuild new file mode 100644 index 000000000000..9d7bbf319cdd --- /dev/null +++ b/net-misc/x2goserver/x2goserver-4.1.0.6.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles toolchain-funcs xdg + +DESCRIPTION="The X2Go server" +HOMEPAGE="http://www.x2go.org" +SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+fuse postgres +sqlite" + +REQUIRED_USE="|| ( postgres sqlite )" + +DEPEND="virtual/perl-ExtUtils-MakeMaker" +RDEPEND="acct-user/x2gouser + acct-user/x2goprint + dev-lang/perl:= + dev-perl/Capture-Tiny + dev-perl/Config-Simple + dev-perl/File-BaseDir + dev-perl/File-ReadBackwards + dev-perl/File-Which + dev-perl/Switch + dev-perl/Try-Tiny + media-fonts/font-cursor-misc + media-fonts/font-misc-misc[nls] + >=net-misc/nx-3.5.99.14 + >=sys-apps/iproute2-4.3.0 + virtual/openssh + x11-apps/xauth + x11-apps/xhost + x11-apps/xwininfo + fuse? ( net-fs/sshfs ) + postgres? ( dev-perl/DBD-Pg ) + sqlite? ( dev-perl/DBD-SQLite )" + +src_prepare() { + default + # Do not compress man pages by default + sed '/^[[:space:]]*gzip.*man/d' -i */Makefile || die +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + LIBDIR="/usr/$(get_libdir)/x2go" \ + PREFIX=/usr +} + +src_install() { + emake \ + DESTDIR="${D}" \ + LIBDIR="/usr/$(get_libdir)/x2go" \ + NXLIBDIR="/usr/$(get_libdir)/nx" \ + PREFIX=/usr \ + install + + fowners root:x2goprint /usr/bin/x2goprint + fperms 2755 /usr/bin/x2goprint + fperms 0750 /etc/sudoers.d + fperms 0440 /etc/sudoers.d/x2goserver + dosym ../../usr/share/applications /etc/x2go/applications + + newinitd "${FILESDIR}"/${PN}.init x2gocleansessions + systemd_dounit "${FILESDIR}"/x2gocleansessions.service +} + +pkg_postinst() { + tmpfiles_process x2goserver.conf + xdg_pkg_postinst + + if use sqlite ; then + if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then + elog "To use sqlite and update your existing database, run:" + elog " # x2godbadmin --updatedb" + else + elog "To use sqlite and create the initial database, run:" + elog " # x2godbadmin --createdb" + fi + + fi + + if use postgres ; then + elog "To use a PostgreSQL database, more information is availabe here:" + elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql" + fi + + elog "For password authentication, you need to enable PasswordAuthentication" + elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)" + elog "An init script was installed for x2gocleansessions" +} diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest index e69f10cf0b7e..11c6350d5b95 100644 --- a/net-misc/xmrig/Manifest +++ b/net-misc/xmrig/Manifest @@ -1,4 +1,2 @@ -DIST xmrig-6.15.2.tar.gz 1743179 BLAKE2B eabbdb6d901c5b64162e502e5cef131ee8edcec9a93b090067b2cc498227c158aeadff34b505800908b3a5f60b5db70812d1c5aa8330ec73de80b9376d679f74 SHA512 17e8f5bbbd1ce1bd834db0a9d1cae2635390a62ae370c9ab2fada1cde2d49dffde12da7b4c7ab0d61e9b9776067c760b9bb936ac8440c6b825de3e5850559a9c -DIST xmrig-6.15.3.tar.gz 1744681 BLAKE2B 18ef0f9e0e496bded7fe860218871fc3b321d8cd9182c6694d62115d36383c2854e7b0daac09800ee5b69a1ceac5f7d6cb43695acb40b2f7fc9bfcd8e7fa9a76 SHA512 8c20e2a89405cb7fb3763b6184f6db9dbbdb6628e6d5d3cb62c35d87aa4c54daab5efe8682ed0f0ec3bb6577af0d0e5f41f2f864d52eee41081449e372649a2a -DIST xmrig-6.16.0.tar.gz 2413469 BLAKE2B c7aded1f438613025286ae9047f7c3a0297f12730995acf3d412f567b850434c6663fa9c849d8c0a1169a4057e925644fbfeff11b502324c8512fdeaf0f365d6 SHA512 6b998410e36eb2e1f2b1c8cefc1faa232c96f0165b1766a97c83c0550fd1b8f3c1cf892245f951f9fda068e9a6d32c30552512668675e12b5d6b011d65d95745 -DIST xmrig-6.16.1.tar.gz 2417592 BLAKE2B a74e7b4393f2d3af7bbea114261f4878c3edf09653bdacdaed02a261dc49ab34a9e0169897dde9e3f2e89bbebd3b302d158874e9db7ce2ae07984d6463a3465d SHA512 f4475018ad05a5cb55d814527db273d9b0260e3fde29d572a4762acdd3db58aa0baabfea9c549fb9239c2b076c32b6956227d789ca6aaa62524b3c381617f205 +DIST xmrig-6.21.1.tar.gz 2416545 BLAKE2B 72ecdfc8c999aee91aef4f540211c5d5a6f1992c76211162a623e89391cedfcc2d5540f291d9915ee4180b83f58ef7f2eb1e3aff8dee49c72f41f90878d7ef62 SHA512 a9267708e61084db7116381adb2256a04c30eba0c84b571764cc73ccafc9276f55b6665529eb7b9c1785d582d0d280ced6ee7ca88a5e98f9bbdef2a9176a9794 +DIST xmrig-6.21.3.tar.gz 2426720 BLAKE2B 11563169e51402313399109860e04dd13dfc9911504db571968d6a97112990ebb68a3019da836a4ac19a589c94ab4b5f2ebcbadce59452c278ea923e8abf475a SHA512 91e92f61e385b75715b0b00fcb772bf997f3db19ef47f43c4bda3662aec6276273551ac915a7a6eeef253deb8da5b0ec0b45e02f0b84211ab8f0f5a37f34c87e diff --git a/net-misc/xmrig/metadata.xml b/net-misc/xmrig/metadata.xml index c01c676279c9..daf9832980db 100644 --- a/net-misc/xmrig/metadata.xml +++ b/net-misc/xmrig/metadata.xml @@ -1,14 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>matt@offtopica.uk</email> - <name>Matt Smith</name> - </maintainer> - <maintainer type="person" proxied="yes"> - <email>telans@posteo.de</email> - <name>James Beddek</name> - </maintainer> <maintainer type="person"> <email>candrews@gentoo.org</email> <name>Craig Andrews</name> @@ -24,9 +16,6 @@ <flag name="hwloc"> Use <pkg>sys-apps/hwloc</pkg> for CPU affinity support </flag> - <flag name="opencl"> - Enable OpenCL support - </flag> </use> <upstream> <remote-id type="github">xmrig/xmrig</remote-id> diff --git a/net-misc/xmrig/xmrig-6.16.0.ebuild b/net-misc/xmrig/xmrig-6.16.0.ebuild deleted file mode 100644 index 2639977e5a05..000000000000 --- a/net-misc/xmrig/xmrig-6.16.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake systemd - -DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner" -HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64" -fi - -LICENSE="Apache-2.0 GPL-3+ MIT" -SLOT="0" -IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl" - -DEPEND=" - dev-libs/libuv:= - hwloc? ( sys-apps/hwloc:= ) - opencl? ( virtual/opencl ) - ssl? ( dev-libs/openssl:= ) -" -RDEPEND=" - ${DEPEND} - !arm64? ( sys-apps/msr-tools ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.12.2-nonotls.patch -) - -src_prepare() { - if ! use donate ; then - sed -i 's/1;/0;/g' src/donate.h || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1) - -DWITH_HWLOC=$(usex hwloc) - -DWITH_TLS=$(usex ssl) - -DWITH_OPENCL=$(usex opencl) - -DWITH_CUDA=OFF - ) - - cmake_src_configure -} - -src_install() { - default - keepdir /etc/xmrig - systemd_dounit "${FILESDIR}"/xmrig.service - dobin "${BUILD_DIR}/xmrig" - dobin "${S}/scripts/enable_1gb_pages.sh" - dobin "${S}/scripts/randomx_boost.sh" -} diff --git a/net-misc/xmrig/xmrig-6.16.1.ebuild b/net-misc/xmrig/xmrig-6.16.1.ebuild deleted file mode 100644 index 2639977e5a05..000000000000 --- a/net-misc/xmrig/xmrig-6.16.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake systemd - -DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner" -HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64" -fi - -LICENSE="Apache-2.0 GPL-3+ MIT" -SLOT="0" -IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl" - -DEPEND=" - dev-libs/libuv:= - hwloc? ( sys-apps/hwloc:= ) - opencl? ( virtual/opencl ) - ssl? ( dev-libs/openssl:= ) -" -RDEPEND=" - ${DEPEND} - !arm64? ( sys-apps/msr-tools ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.12.2-nonotls.patch -) - -src_prepare() { - if ! use donate ; then - sed -i 's/1;/0;/g' src/donate.h || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1) - -DWITH_HWLOC=$(usex hwloc) - -DWITH_TLS=$(usex ssl) - -DWITH_OPENCL=$(usex opencl) - -DWITH_CUDA=OFF - ) - - cmake_src_configure -} - -src_install() { - default - keepdir /etc/xmrig - systemd_dounit "${FILESDIR}"/xmrig.service - dobin "${BUILD_DIR}/xmrig" - dobin "${S}/scripts/enable_1gb_pages.sh" - dobin "${S}/scripts/randomx_boost.sh" -} diff --git a/net-misc/xmrig/xmrig-6.15.2.ebuild b/net-misc/xmrig/xmrig-6.21.1.ebuild index 0e1b2b59f3ec..b6cc3de16350 100644 --- a/net-misc/xmrig/xmrig-6.15.2.ebuild +++ b/net-misc/xmrig/xmrig-6.21.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake systemd +inherit cmake flag-o-matic systemd toolchain-funcs DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner" HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig" @@ -22,7 +22,7 @@ IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl" DEPEND=" dev-libs/libuv:= - hwloc? ( sys-apps/hwloc:= ) + hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= ) " @@ -44,6 +44,13 @@ src_prepare() { } src_configure() { + # JIT broken with FORTIFY_SOURCE=3 + # Bug #913420 + if tc-enables-fortify-source; then + filter-flags -D_FORTIFY_SOURCE=3 + append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + fi + local mycmakeargs=( -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1) -DWITH_HWLOC=$(usex hwloc) diff --git a/net-misc/xmrig/xmrig-6.15.3.ebuild b/net-misc/xmrig/xmrig-6.21.3.ebuild index 2639977e5a05..2061563b6ac5 100644 --- a/net-misc/xmrig/xmrig-6.15.3.ebuild +++ b/net-misc/xmrig/xmrig-6.21.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake systemd @@ -22,7 +22,7 @@ IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl" DEPEND=" dev-libs/libuv:= - hwloc? ( sys-apps/hwloc:= ) + hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= ) " diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild index 2639977e5a05..2061563b6ac5 100644 --- a/net-misc/xmrig/xmrig-9999.ebuild +++ b/net-misc/xmrig/xmrig-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake systemd @@ -22,7 +22,7 @@ IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl" DEPEND=" dev-libs/libuv:= - hwloc? ( sys-apps/hwloc:= ) + hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= ) " diff --git a/net-misc/yandex-disk/Manifest b/net-misc/yandex-disk/Manifest index 15a4c7579773..1794e9fd8e28 100644 --- a/net-misc/yandex-disk/Manifest +++ b/net-misc/yandex-disk/Manifest @@ -1,2 +1,2 @@ -DIST yandex-disk-0.1.5.1039-1.fedora.i386.rpm 4556176 BLAKE2B 5ade043c21a13e678ca11b3074fb1392b99f461ef5a7bd7205b3d6ea984b20dec0ba086adb8b881eaf52888f04cf371dd63ce73432c3f82f31c895e03f31f073 SHA512 3c323e6aaa5fa669ef7efa80e4b899cd732a6b29235d81f635dce67d0ff59dafd01da8d9ea7b040242882f0e5e153f7cd623f4b993dfc390bc0a18d2811c1719 -DIST yandex-disk-0.1.5.1039-1.fedora.x86_64.rpm 4743384 BLAKE2B 626a7e921567640b88d33fd426cc230bb92846a252b0960c51da9367f300b8622104db14c8788749e0f5cb484dffd9c9407994568449be769c24d2730cd0936a SHA512 9128d59f426de44b8c953d61ad07ffe886b5e864c5f20ba7ab1a69a47ab3269e5d4e39f4b92675f0ccaea43db1711184892a5e3178694bc453bc96e932045fa9 +DIST yandex-disk-0.1.6.1080-1.fedora.i386.rpm 4613067 BLAKE2B 1d893b0420d6146aea7d10d4603c28fccd6e6c93eb3c6c414d5c91b3ebd77dd770fc20445b5c0e5892994a32d9fdfa18d3aa5cc011be3894381e63b833b76630 SHA512 68f8952556b822d1de0b99827f4667257caab8ff3c744c280da682d7bf9647877dcbad5547946f92d230bd8dd27b50f5695e5af6cdd6c8c4ed20ca22cbe5e914 +DIST yandex-disk-0.1.6.1080-1.fedora.x86_64.rpm 4799367 BLAKE2B cc0fabe1479c0c66b06dd7fab943de32e1ad9477b3c03bc39c0859ba5b802bad8909d721b5fc2445943e86213bcc9ce68bf5f37eb6c151d5c211243176ae126c SHA512 d0845a825b1d4db773947c1101fa6aee38df43167486e4fae1d2db1e7fc7a49326882848eb742b069b3b2f6c1e9d617f6203dd8a3f67dd136dfa1f7bc1c8bfea diff --git a/net-misc/yandex-disk/metadata.xml b/net-misc/yandex-disk/metadata.xml index a3862b8ec2fc..115e9d64a669 100644 --- a/net-misc/yandex-disk/metadata.xml +++ b/net-misc/yandex-disk/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.6.1080_p1.ebuild index 1943426e7658..03cbfb1d044d 100644 --- a/net-misc/yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild +++ b/net-misc/yandex-disk/yandex-disk-0.1.6.1080_p1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit bash-completion-r1 rpm diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest index f36ff77770ea..f1653a0dc033 100644 --- a/net-misc/you-get/Manifest +++ b/net-misc/you-get/Manifest @@ -1,3 +1 @@ -DIST you-get-0.4.1525.tar.gz 164972 BLAKE2B 4ac50572a2714d523f4f3a53c0f7329b07faf88a3c22b26bac5b440383bd6d540854d9966c0b10c25b0c207d4e29c6dd09a06c55c68dbed13ba673c29f5f4eaa SHA512 2d9bc2e66da39dbe0146ad4ff88dd1b45ce17a2208b82196c96a36ed1f4a0a86ade274b3c7b8cf683cf46d69f813caed1e24f58a3a7677a29f1999707da9a5ba -DIST you-get-0.4.1527.tar.gz 164994 BLAKE2B 5bdabefefa92d9fc8a6d7a0f97a4aa7f1e15161f3f8add7e5392ad2994abb0dc082a68301de0d0979a9158515788695413e3d5b1c343b51209b8a3bf22343aab SHA512 9543d49e1b6aadfc6e9af57457a567aa8a804efc255c86fecfbc90c150b9ad1231d38730735ad9cf075312e4ba83f4f3bd71f088d14b8928f7e6951535029f8c -DIST you-get-0.4.1545.tar.gz 165835 BLAKE2B 171aa72dd7d6dc2b9cb1e88262571e92fdc7c253ab0662b9e0278cdf7a5cb3344fa0f8f3c83a2b000f06a796c54d8860327773f398d43eb2c38b26a2446bab39 SHA512 b8ca69737296cf6b1129f14fc1fa840b977ecec9dbe65b2f59c42fb003b5897806f649821326502917783262e7f59f9b77e6a28d218f40b1c32c4e0d7eaa746d +DIST you-get-0.4.1650.tar.gz 152169 BLAKE2B c1ba09a0bfd339703f269d1c53406f70762dab2f974ea43b1bf26890ccf267d5852e298ddab2db7a9ed32a52e2aed2691851cefed73089111414056b74a10b1a SHA512 cb87f4c981631945d521b43585d291d35e67e85a17bdc567d775274700ef346c63c391b2c38f7a7e60de4ba9b5daa7aab3d6202d03147ae0d2c09b5b8c06bb3c diff --git a/net-misc/you-get/files/you-get-python3.12.patch b/net-misc/you-get/files/you-get-python3.12.patch new file mode 100644 index 000000000000..c48b3e7e19d7 --- /dev/null +++ b/net-misc/you-get/files/you-get-python3.12.patch @@ -0,0 +1,39 @@ +Subject: [PATCH] Use importlib instead of imp + +Fix the deprecated warning. +Ref: https://stackoverflow.com/a/67692/3342190 +Bug: https://bugs.gentoo.org/929733 +--- + setup.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 24dc9fb2..78a8e832 100755 +--- a/setup.py ++++ b/setup.py +@@ -5,7 +5,8 @@ PACKAGE_NAME = 'you_get' + + PROJ_METADATA = '%s.json' % PROJ_NAME + +-import os, json, imp ++import os, json ++import importlib.util + here = os.path.abspath(os.path.dirname(__file__)) + proj_info = json.loads(open(os.path.join(here, PROJ_METADATA), encoding='utf-8').read()) + try: +@@ -13,7 +14,11 @@ try: + except: + README = "" + CHANGELOG = open(os.path.join(here, 'CHANGELOG.rst'), encoding='utf-8').read() +-VERSION = imp.load_source('version', os.path.join(here, 'src/%s/version.py' % PACKAGE_NAME)).__version__ ++version_spec = importlib.util.spec_from_file_location( ++ 'version', os.path.join(here, 'src/%s/version.py' % PACKAGE_NAME)) ++version = importlib.util.module_from_spec(version_spec) ++version_spec.loader.exec_module(version) ++VERSION = version.__version__ + + from setuptools import setup, find_packages + setup( +-- +2.44.0 + diff --git a/net-misc/you-get/you-get-0.4.1525.ebuild b/net-misc/you-get/you-get-0.4.1525.ebuild deleted file mode 100644 index a0cb7ef0a1e3..000000000000 --- a/net-misc/you-get/you-get-0.4.1525.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="Utility to download media contents from the web" -HOMEPAGE="https://you-get.org" -SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - media-video/ffmpeg -" diff --git a/net-misc/you-get/you-get-0.4.1527.ebuild b/net-misc/you-get/you-get-0.4.1527.ebuild deleted file mode 100644 index 93636c539412..000000000000 --- a/net-misc/you-get/you-get-0.4.1527.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="Utility to download media contents from the web" -HOMEPAGE="https://you-get.org" -SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - media-video/ffmpeg -" diff --git a/net-misc/you-get/you-get-0.4.1545.ebuild b/net-misc/you-get/you-get-0.4.1650-r1.ebuild index c89a16365906..9a7a13985df3 100644 --- a/net-misc/you-get/you-get-0.4.1545.ebuild +++ b/net-misc/you-get/you-get-0.4.1650-r1.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=setuptools + inherit distutils-r1 DESCRIPTION="Utility to download media contents from the web" HOMEPAGE="https://you-get.org" -SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz" +SRC_URI="https://github.com/soimort/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RESTRICT="test" PROPERTIES="test_network" @@ -21,4 +23,6 @@ RDEPEND=" media-video/ffmpeg " +PATCHES=( "${FILESDIR}/${PN}-python3.12.patch" ) + distutils_enable_tests unittest diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest deleted file mode 100644 index dcf1041ec7b5..000000000000 --- a/net-misc/youtube-dl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST youtube-dl-2021.06.06.tar.gz 3336227 BLAKE2B f30252927ddd79062995ec78d45854e1723fe561ca34777fb0a337750bf09c76da8c205af63869c68c6bc09bfe8f6de1d3f5ee240914ae871bb7920076d8d16c SHA512 7b4d453723d03c3fde46451277d5c44be01469ed1b414ce94e782d6228c132c982835805207222862d0d7b8ba162157196f976400fd15cea7ea513e3595aeea3 diff --git a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild deleted file mode 100644 index f22b67f5220c..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -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() { - if ! has_version media-video/ffmpeg; then - elog "${PN} works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need media-video/ffmpeg." - elog "On some sites - most notably YouTube - videos can be retrieved in" - elog "a higher quality format without sound. ${PN} will detect whether" - elog "ffmpeg is present and automatically pick the best option." - fi - if ! has_version media-video/rtmpdump; then - elog - elog "Videos or video formats streamed via RTMP protocol can only be" - elog "downloaded when media-video/rtmpdump is installed." - fi - if ! has_version media-video/mplayer && ! has_version media-video/mpv; then - elog - elog "Downloading MMS and RTSP videos requires either media-video/mplayer" - elog "or media-video/mpv to be installed." - fi - if ! has_version media-video/atomicparsley; then - elog - elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails" - elog "from the metadata into the resulting MP4/M4A files." - fi -} diff --git a/net-misc/youtube-dl/youtube-dl-9999.ebuild b/net-misc/youtube-dl/youtube-dl-9999.ebuild deleted file mode 100644 index 6ea8ff1593c3..000000000000 --- a/net-misc/youtube-dl/youtube-dl-9999.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1 - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" -EGIT_REPO_URI="https://github.com/ytdl-org/${PN}.git" - -LICENSE="public-domain" -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 -} - -src_compile() { - distutils-r1_src_compile - - emake youtube-dl.{bash-completion,fish,zsh} -} - -python_test() { - emake offlinetest -} - -python_install_all() { - # no manpage because it requires pandoc to generate - - 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() { - if ! has_version media-video/ffmpeg; then - elog "${PN} works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need media-video/ffmpeg." - elog "On some sites - most notably YouTube - videos can be retrieved in" - elog "a higher quality format without sound. ${PN} will detect whether" - elog "ffmpeg is present and automatically pick the best option." - fi - if ! has_version media-video/rtmpdump; then - elog - elog "Videos or video formats streamed via RTMP protocol can only be" - elog "downloaded when media-video/rtmpdump is installed." - fi - if ! has_version media-video/mplayer && ! has_version media-video/mpv; then - elog - elog "Downloading MMS and RTSP videos requires either media-video/mplayer" - elog "or media-video/mpv to be installed." - fi - if ! has_version media-video/atomicparsley; then - elog - elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails" - elog "from the metadata into the resulting MP4/M4A files." - fi -} diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest index 586a90deb92c..e8ac4115a402 100644 --- a/net-misc/youtube-viewer/Manifest +++ b/net-misc/youtube-viewer/Manifest @@ -1 +1 @@ -DIST youtube-viewer-3.9.6.tar.gz 259715 BLAKE2B df6ec66ac63e8d2c815fdb507f3e2aa168c61dda2005908131e9074e54b0a4bb23dcd23ba47b6daba0d022c3b387d03ce8f67e6f3d42b3b182a3ead82965c328 SHA512 205cb691325c7cc09b981a1e04c3267e59016dc5f300cf929cf41693d5b10e61b06a021c8bf5d14415551440f9d9d433edb2ac53f4698b7f3ad811ae0045b70e +DIST youtube-viewer-3.10.1.tar.gz 263735 BLAKE2B 319c0d1f3342fc4988215e70205e6a0c627cfd7f4edfa61788474621859ae72ba6e5212818c3bb95d0a15345575dec049be7240861b03d4d62b9ef95873a908a SHA512 629601ea912258873eb2c5ad4b527eb45f733847611fc2424fcb038758fda06c3bd730b14781d9e091c0b6a1d9fd637ad15a08079f68469edfe7d83124408242 diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml index 24f114d5e4d3..8fbfda7cbeeb 100644 --- a/net-misc/youtube-viewer/metadata.xml +++ b/net-misc/youtube-viewer/metadata.xml @@ -15,7 +15,6 @@ </upstream> <use> <flag name="gtk">Install the gtk3 GUI</flag> - <flag name="gtk2">Use the old gtk2 GUI instead of the gtk3 one</flag> </use> <longdescription lang="en"> Youtube Viewer is a CLI application dedicated for searching and diff --git a/net-misc/youtube-viewer/youtube-viewer-3.9.6.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.10.1.ebuild index b4cd505eca6a..ff42b9681d3b 100644 --- a/net-misc/youtube-viewer/youtube-viewer-3.9.6.ebuild +++ b/net-misc/youtube-viewer/youtube-viewer-3.10.1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +DIST_TEST="do" inherit desktop optfeature perl-module xdg-utils DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer" @@ -63,7 +64,7 @@ pkg_postinst() { optfeature "local cache support" dev-perl/LWP-UserAgent-Cached optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth - optfeature "live streams support" net-misc/youtube-dl + optfeature "live streams support" net-misc/yt-dlp elog elog "Check the configuration file in ~/.config/youtube-viewer/" elog "and configure your video player backend." diff --git a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild index 408761565f06..e1d6d21ad3ba 100644 --- a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild +++ b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +DIST_TEST="do" inherit desktop optfeature perl-module git-r3 xdg-utils DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer" -HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html" +HOMEPAGE="https://github.com/trizen/youtube-viewer" SRC_URI="" EGIT_REPO_URI="https://github.com/trizen/${PN}.git" -LICENSE="|| ( Artistic GPL-1+ )" +LICENSE="|| ( Artistic-2 GPL-1+ )" SLOT="0" KEYWORDS="" -IUSE="gtk gtk2" - -REQUIRED_USE="gtk2? ( gtk )" +IUSE="gtk" RDEPEND=" dev-perl/Data-Dump @@ -40,9 +39,8 @@ RDEPEND=" ) || ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] ) || ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )" -DEPEND="dev-perl/Module-Build" - -SRC_TEST="do" +DEPEND="${RDEPEND}" +BDEPEND="dev-perl/Module-Build" src_configure() { local myconf @@ -67,7 +65,7 @@ pkg_postinst() { optfeature "local cache support" dev-perl/LWP-UserAgent-Cached optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth - optfeature "live streams support" net-misc/youtube-dl + optfeature "live streams support" net-misc/yt-dlp elog elog "Check the configuration file in ~/.config/youtube-viewer/" elog "and configure your video player backend." diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest index 615580448985..99b82cb37b28 100644 --- a/net-misc/yt-dlp/Manifest +++ b/net-misc/yt-dlp/Manifest @@ -1,2 +1,3 @@ -DIST yt-dlp-2021.10.22.tar.gz 2010916 BLAKE2B fb8f789c74df06dcd672d00ac16eb7cbf466755c3fa607acdd21dd9a9ef2af158a5272f88656133078bd50585506b65cf3b3c03236726de954ccfa0b6c1195fc SHA512 2b590703f8d4f9454b50983019aca8046205234bd98cac4da73a6688eae177a19ef641e486aea92d86197ee7ad6c564c65f9b9496d623c00bdcc349817d5b1f8 -DIST yt-dlp-2021.11.10.1.tar.gz 2042241 BLAKE2B c4542edce26931a8753002a5cf0fda46549dd9b79709fc595c0c807837b07242d5d7a7fa19cc4f64cf7b7fc5803c4937185d68f4593250f9fa21155d5a24ee92 SHA512 54a371d70b7b82349a184b26201fca12fabbc9a107dc199347c412062776d63879d22955d76726df61bc40ec594a7179a997e4679c683673c8c0dd41f62b16f6 +DIST yt-dlp-2024.04.09.tar.gz 5589808 BLAKE2B ada1c3be28c4615a96b4fef9d39144b49548e97be6fab003596f11db905efa2607ea3d62ba529aee8391320bf4e3cd3c9367a5eab0439822fd98407fde2807fb SHA512 5eada1c6a3d656c4f70552824a59ed677ecc102e1a2c3475a12fccff78ea267d7391e778060d708bf0aca1bdf92f4bf413785e0cd65b43259535577e92755556 +DIST yt-dlp-2024.05.26.tar.gz 5638226 BLAKE2B 277353a6751b9f20ef4ad9dfc8aa318be665e5620d365d0a6e54b01455471bdc7a7e169c00df22061660c9ea427702343ae77757575694e7cecac2a4e043219e SHA512 7cf17e566ccbdaa9a0e6303de2fe2cf91a1829321b0a323e638d27a9fc143949bc5b3b82a8764c9fa673a864b76930b53da7c9de2ecc0bfc07d6bade4238161f +DIST yt-dlp-2024.05.27.tar.gz 5638920 BLAKE2B 467c6fb9e4c53e97d72338293e46983e471ca69e4fae97d23423d0aa003c98e91676f6c5e1af53d92b6c8f534cacc3d1d897161b043e52614324a0eb21b0e96b SHA512 ca2ddd04abb9ca3861584f6cbf827e21cbf9771394f059f2d8a0fc8874036dc9ae2bd0ad8a7bb350d1a042c1988aaeb3fef476f76ecc61710351c6a428aa95bc diff --git a/net-misc/yt-dlp/metadata.xml b/net-misc/yt-dlp/metadata.xml index 1fbaa63f2ecb..27010be612e8 100644 --- a/net-misc/yt-dlp/metadata.xml +++ b/net-misc/yt-dlp/metadata.xml @@ -2,15 +2,12 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> - <maintainer type="person"> <email>ionen@gentoo.org</email> <name>Ionen Wolkens</name> </maintainer> <stabilize-allarches/> <upstream> <remote-id type="github">yt-dlp/yt-dlp</remote-id> + <remote-id type="pypi">yt-dlp</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild b/net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild deleted file mode 100644 index e4e5268e2804..000000000000 --- a/net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="youtube-dl fork with additional features and fixes" -HOMEPAGE="https://github.com/yt-dlp/yt-dlp" -SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" - -RDEPEND=" - dev-python/keyring[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/websockets[${PYTHON_USEDEP}] - media-libs/mutagen[${PYTHON_USEDEP}] - media-video/ffmpeg" - -distutils_enable_tests pytest - -python_test() { - epytest -m 'not download' -} - -python_install_all() { - dodoc README.md Changelog.md supportedsites.md - doman yt-dlp.1 - - dobashcomp completions/bash/yt-dlp - - insinto /usr/share/fish/vendor_completions.d - doins completions/fish/yt-dlp.fish - - insinto /usr/share/zsh/site-functions - doins completions/zsh/_yt-dlp - - rm -r "${ED}"/usr/share/doc/yt_dlp || die -} diff --git a/net-misc/yt-dlp/yt-dlp-2021.11.10.1-r1.ebuild b/net-misc/yt-dlp/yt-dlp-2021.11.10.1-r1.ebuild deleted file mode 100644 index 88bf8090cd8a..000000000000 --- a/net-misc/yt-dlp/yt-dlp-2021.11.10.1-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 distutils-r1 optfeature - -DESCRIPTION="youtube-dl fork with additional features and fixes" -HOMEPAGE="https://github.com/yt-dlp/yt-dlp" -SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" - -RDEPEND=" - dev-python/pycryptodome[${PYTHON_USEDEP}] - !net-misc/youtube-dl" - -distutils_enable_tests pytest - -python_test() { - epytest -m 'not download' -p no:markdown -} - -python_install() { - distutils-r1_python_install - - local sitedir=$(python_get_sitedir) - dosym yt_dlp "${sitedir#${EPREFIX}}"/youtube_dl -} - -python_install_all() { - dodoc README.md Changelog.md supportedsites.md - doman yt-dlp.1 - - dobashcomp completions/bash/yt-dlp - - insinto /usr/share/fish/vendor_completions.d - doins completions/fish/yt-dlp.fish - - insinto /usr/share/zsh/site-functions - doins completions/zsh/_yt-dlp - - rm -r "${ED}"/usr/share/doc/yt_dlp || die - - newbin - youtube-dl <<-EOF - #!/usr/bin/env sh - exec yt-dlp --compat-options youtube-dl "\${@}" - EOF -} - -pkg_postinst() { - optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg - has_version media-video/atomicparsley || # allow fallback but don't advertise - optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen - - if [[ ! ${REPLACING_VERSIONS} ]] || - ver_test ${REPLACING_VERSIONS} -lt 2021.10.22-r2; then - elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed' - elog 'as "youtube-dl". This is strictly for compatibility and it is' - elog 'recommended to use "yt-dlp" directly, it may be removed in the future.' - fi -} diff --git a/net-misc/yt-dlp/yt-dlp-2024.04.09.ebuild b/net-misc/yt-dlp/yt-dlp-2024.04.09.ebuild new file mode 100644 index 000000000000..f811e455142d --- /dev/null +++ b/net-misc/yt-dlp/yt-dlp-2024.04.09.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..12} ) +inherit bash-completion-r1 distutils-r1 optfeature wrapper + +DESCRIPTION="youtube-dl fork with additional features and fixes" +HOMEPAGE="https://github.com/yt-dlp/yt-dlp/" +SRC_URI=" + https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz + -> ${P}.tar.gz +" +S="${WORKDIR}/${PN}" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos" + +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] + !net-misc/youtube-dl[-yt-dlp(-)] +" + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare + + # adjust pycryptodome and drop optional dependencies (bug #828466) + sed -Ei pyproject.toml \ + -e 's/("pycryptodome)x/\1/' \ + -e '/"(brotli.*|certifi|mutagen|requests|urllib3|websockets)/d' || die +} + +python_test() { + local EPYTEST_DESELECT=( + # fails with FEATURES=network-sandbox + test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout + # fails with FEATURES=distcc, bug #915614 + test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\] + ) + + epytest -m 'not download' +} + +python_install_all() { + dodoc README.md Changelog.md supportedsites.md + doman yt-dlp.1 + + dobashcomp completions/bash/yt-dlp + + insinto /usr/share/fish/vendor_completions.d + doins completions/fish/yt-dlp.fish + + insinto /usr/share/zsh/site-functions + doins completions/zsh/_yt-dlp + + rm -r "${ED}"/usr/share/doc/yt_dlp || die + + make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl" +} + +pkg_postinst() { + optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg + has_version media-video/atomicparsley || # allow fallback but don't advertise + optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen + optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage + + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed' + elog 'as "youtube-dl". This is strictly for compatibility and it is' + elog 'recommended to use "yt-dlp" directly, it may be removed in the future.' + fi +} diff --git a/net-misc/yt-dlp/yt-dlp-2024.05.26.ebuild b/net-misc/yt-dlp/yt-dlp-2024.05.26.ebuild new file mode 100644 index 000000000000..4ab548574b58 --- /dev/null +++ b/net-misc/yt-dlp/yt-dlp-2024.05.26.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..13} ) +inherit bash-completion-r1 distutils-r1 optfeature wrapper + +DESCRIPTION="youtube-dl fork with additional features and fixes" +HOMEPAGE="https://github.com/yt-dlp/yt-dlp/" +SRC_URI=" + https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz + -> ${P}.tar.gz +" +S="${WORKDIR}/${PN}" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos" + +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] + !net-misc/youtube-dl[-yt-dlp(-)] +" + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare + + # adjust pycryptodome and drop optional dependencies (bug #828466) + sed -Ei pyproject.toml \ + -e 's/("pycryptodome)x/\1/' \ + -e '/"(brotli.*|certifi|mutagen|requests|urllib3|websockets)/d' || die +} + +python_test() { + local EPYTEST_DESELECT=( + # fails with FEATURES=network-sandbox + test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout + # fails with FEATURES=distcc, bug #915614 + test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\] + ) + + epytest -m 'not download' +} + +python_install_all() { + dodoc README.md Changelog.md supportedsites.md + doman yt-dlp.1 + + dobashcomp completions/bash/yt-dlp + + insinto /usr/share/fish/vendor_completions.d + doins completions/fish/yt-dlp.fish + + insinto /usr/share/zsh/site-functions + doins completions/zsh/_yt-dlp + + rm -r "${ED}"/usr/share/doc/yt_dlp || die + + make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl" +} + +pkg_postinst() { + optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg + has_version media-video/atomicparsley || # allow fallback but don't advertise + optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen + optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage + + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed' + elog 'as "youtube-dl". This is strictly for compatibility and it is' + elog 'recommended to use "yt-dlp" directly, it may be removed in the future.' + fi +} diff --git a/net-misc/yt-dlp/yt-dlp-2024.05.27.ebuild b/net-misc/yt-dlp/yt-dlp-2024.05.27.ebuild new file mode 100644 index 000000000000..68214ba4c2eb --- /dev/null +++ b/net-misc/yt-dlp/yt-dlp-2024.05.27.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..13} ) +inherit bash-completion-r1 distutils-r1 optfeature wrapper + +DESCRIPTION="youtube-dl fork with additional features and fixes" +HOMEPAGE="https://github.com/yt-dlp/yt-dlp/" +SRC_URI=" + https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz + -> ${P}.tar.gz +" +S="${WORKDIR}/${PN}" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos" + +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] + !net-misc/youtube-dl[-yt-dlp(-)] +" + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare + + # adjust pycryptodome and drop optional dependencies (bug #828466) + sed -Ei pyproject.toml \ + -e 's/("pycryptodome)x/\1/' \ + -e '/"(brotli.*|certifi|mutagen|requests|urllib3|websockets)/d' || die +} + +python_test() { + local EPYTEST_DESELECT=( + # fails with FEATURES=network-sandbox + test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout + # fails with FEATURES=distcc, bug #915614 + test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\] + ) + + epytest -m 'not download' +} + +python_install_all() { + dodoc README.md Changelog.md supportedsites.md + doman yt-dlp.1 + + dobashcomp completions/bash/yt-dlp + + insinto /usr/share/fish/vendor_completions.d + doins completions/fish/yt-dlp.fish + + insinto /usr/share/zsh/site-functions + doins completions/zsh/_yt-dlp + + rm -r "${ED}"/usr/share/doc/yt_dlp || die + + make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl" +} + +pkg_postinst() { + optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg + has_version media-video/atomicparsley || # allow fallback but don't advertise + optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen + optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage + + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed' + elog 'as "youtube-dl". This is strictly for compatibility and it is' + elog 'recommended to use "yt-dlp" directly, it may be removed in the future.' + fi +} diff --git a/net-misc/yt-dlp/yt-dlp-9999.ebuild b/net-misc/yt-dlp/yt-dlp-9999.ebuild new file mode 100644 index 000000000000..37b84428acd0 --- /dev/null +++ b/net-misc/yt-dlp/yt-dlp-9999.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..13} ) +inherit bash-completion-r1 distutils-r1 git-r3 optfeature wrapper + +DESCRIPTION="youtube-dl fork with additional features and fixes" +HOMEPAGE="https://github.com/yt-dlp/yt-dlp/" +EGIT_REPO_URI="https://github.com/yt-dlp/yt-dlp.git" + +LICENSE="Unlicense" +SLOT="0" +IUSE="man" + +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] + !net-misc/youtube-dl[-yt-dlp(-)] +" +BDEPEND=" + man? ( virtual/pandoc ) +" + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare + + # adjust pycryptodome and drop optional dependencies (bug #828466) + sed -Ei pyproject.toml \ + -e 's/("pycryptodome)x/\1/' \ + -e '/"(brotli.*|certifi|mutagen|requests|urllib3|websockets)/d' || die +} + +python_compile() { + # generate missing files in live, not in compile_all nor prepare + # given need lazy before compile and it needs a usable ${PYTHON} + emake completions lazy-extractors $(usev man yt-dlp.1) + + "${EPYTHON}" devscripts/update-version.py || die + + distutils-r1_python_compile +} + +python_test() { + local EPYTEST_DESELECT=( + # fails with FEATURES=network-sandbox + test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout + # fails with FEATURES=distcc, bug #915614 + test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\] + ) + + epytest -m 'not download' +} + +python_install_all() { + dodoc README.md Changelog.md supportedsites.md + use man && doman yt-dlp.1 + + dobashcomp completions/bash/yt-dlp + + insinto /usr/share/fish/vendor_completions.d + doins completions/fish/yt-dlp.fish + + insinto /usr/share/zsh/site-functions + doins completions/zsh/_yt-dlp + + make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl" +} + +pkg_postinst() { + optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg + has_version media-video/atomicparsley || # allow fallback but don't advertise + optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen + optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage + + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed' + elog 'as "youtube-dl". This is strictly for compatibility and it is' + elog 'recommended to use "yt-dlp" directly, it may be removed in the future.' + fi +} diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest new file mode 100644 index 000000000000..7971dc2aff2a --- /dev/null +++ b/net-misc/ytfzf/Manifest @@ -0,0 +1 @@ +DIST ytfzf-2.6.2.tar.gz 3279051 BLAKE2B d2517915e3025bf32b5db4a17f6afe218cd1693e611a76627a87193f0403e86d021c58717f627191b5979142799e6c4d0d3f9864812d8dc3d22f9a28fe379eaf SHA512 9c2d6d6fbd6a21385531523401c113b681d8fd3e3bc0f6566730e0de55a4e70a4d86bebced7cdf472cb145cc1247b79b25ba502ec7a79aee0d89ad816ba434ef diff --git a/net-misc/ytfzf/metadata.xml b/net-misc/ytfzf/metadata.xml new file mode 100644 index 000000000000..153b2385848c --- /dev/null +++ b/net-misc/ytfzf/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> + </maintainer> + <stabilize-allarches/> + <use> + <flag name="minimal">Skip all optional dependencies (may no longer work out-of-the-box and require custom setting up)</flag> + <flag name="thumbnails">Pull <pkg>media-gfx/ueberzugpp</pkg> or <pkg>media-gfx/ueberzug</pkg> for viewing thumbnails (default method when using -t)</flag> + </use> + <upstream> + <remote-id type="github">pystardust/ytfzf</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/ytfzf/ytfzf-2.6.2.ebuild b/net-misc/ytfzf/ytfzf-2.6.2.ebuild new file mode 100644 index 000000000000..9d4d962ea69d --- /dev/null +++ b/net-misc/ytfzf/ytfzf-2.6.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature + +DESCRIPTION="Posix script to find and watch youtube videos from the terminal" +HOMEPAGE="https://github.com/pystardust/ytfzf/" +SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="minimal +thumbnails" + +RDEPEND=" + app-misc/jq + net-misc/curl[ssl] + app-alternatives/awk + !minimal? ( + app-shells/fzf + media-video/mpv[lua] + net-misc/yt-dlp + thumbnails? ( + || ( + media-gfx/ueberzugpp + media-gfx/ueberzug + ) + ) + ) +" + +src_compile() { :; } + +src_install() { + local emakeargs=( + DESTDIR="${D}" + PREFIX="${EPREFIX}"/usr + DOCDIR="${EPREFIX}"/usr/share/doc/${PF} + ) + + emake "${emakeargs[@]}" addons doc install + einstalldocs + + rm -r "${ED}"/usr/share/licenses || die +} + +pkg_postinst() { + optfeature "external menu support" x11-misc/dmenu + optfeature "desktop notifications" x11-libs/libnotify + + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog "Note that ${PN} supports many methods to display menus/thumbnails." + elog "This ebuild primarily covers defaults and major features, additional" + elog "dependencies may be needed for others. Set USE=minimal if want full" + elog "control over optional dependencies (e.g. fzf is optional if use dmenu)." + fi +} diff --git a/net-misc/ytmdl/Manifest b/net-misc/ytmdl/Manifest new file mode 100644 index 000000000000..782f9f3833f9 --- /dev/null +++ b/net-misc/ytmdl/Manifest @@ -0,0 +1,2 @@ +DIST ytmdl-2023.11.26.gh.tar.gz 1120208 BLAKE2B 145f8e24305f4978f1ed0655e5511c6b17b94ea23301309c31bbafaec60b2184216ef0866aed478eda95763ab4ec0cd43eac176acf849871e58c3505b09ea231 SHA512 df8ed294f0092d4078fba8b64abcd2524e0d8331a42dfee6e1869e3a418cf2d54f95d7c300d83e4392295ea4116ec989d418b0292b0895ef474bf93338a980e7 +DIST ytmdl-2024.04.14.gh.tar.gz 1120264 BLAKE2B 018942cb9fa2534d225ba66e73e6b117581ce86cdc13b9bd3a39475dcde76d57fa97731264e3bf54863e0ab613a93861d51d7f0c678d332f029446cfaaa75820 SHA512 2d8b2e2189c6f0483dd32466f98281d8f173ad5d8a717ff9d828a7b08fc7f6313f108fb11da4b18ae66336c754c1c00f14010fe823c0a182387578db01795760 diff --git a/net-misc/ytmdl/files/ytmdl-2023.11.26-data_files.patch b/net-misc/ytmdl/files/ytmdl-2023.11.26-data_files.patch new file mode 100644 index 000000000000..63568fc43739 --- /dev/null +++ b/net-misc/ytmdl/files/ytmdl-2023.11.26-data_files.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -52,7 +52,7 @@ for dirname, filename in file_map: + data_files.append((dirname, [filename])) + + params = { +- 'data_files': data_files, ++ 'data_files': [], + } + + diff --git a/net-misc/ytmdl/metadata.xml b/net-misc/ytmdl/metadata.xml new file mode 100644 index 000000000000..13eb5cd029c2 --- /dev/null +++ b/net-misc/ytmdl/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/deepjyoti30/ytmdl/issues/</bugs-to> + <remote-id type="github">deepjyoti30/ytmdl</remote-id> + <remote-id type="pypi">ytmdl</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/ytmdl/ytmdl-2023.11.26-r1.ebuild b/net-misc/ytmdl/ytmdl-2023.11.26-r1.ebuild new file mode 100644 index 000000000000..0ec4e506c4fb --- /dev/null +++ b/net-misc/ytmdl/ytmdl-2023.11.26-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) + +inherit bash-completion-r1 distutils-r1 edo + +DESCRIPTION="Simple app to get songs from youtube in mp3 format" +HOMEPAGE="https://ytmdl.deepjyoti30.dev/ + https://github.com/deepjyoti30/ytmdl/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/deepjyoti30/${PN}.git" +else + SRC_URI="https://github.com/deepjyoti30/${PN}/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz" + + KEYWORDS="amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + >=net-misc/yt-dlp-2022.3.8.2[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/ffmpeg-python[${PYTHON_USEDEP}] + dev-python/itunespy[${PYTHON_USEDEP}] + dev-python/musicbrainzngs[${PYTHON_USEDEP}] + dev-python/pyDes[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + dev-python/simber[${PYTHON_USEDEP}] + dev-python/spotipy[${PYTHON_USEDEP}] + dev-python/unidecode[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] + dev-python/youtube-search-python[${PYTHON_USEDEP}] + dev-python/ytmusicapi[${PYTHON_USEDEP}] + media-libs/mutagen[${PYTHON_USEDEP}] + net-misc/downloader-cli[${PYTHON_USEDEP}] +" + +PATCHES=( "${FILESDIR}/${PN}-2023.11.26-data_files.patch" ) + +python_compile() { + distutils-r1_python_compile + + edo "${EPYTHON}" ./utils/completion.py +} + +src_install() { + distutils-r1_src_install + + newbashcomp "${PN}.bash" "${PN}" +} diff --git a/net-misc/ytmdl/ytmdl-2024.04.14.ebuild b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild new file mode 100644 index 000000000000..0d06867b5465 --- /dev/null +++ b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit bash-completion-r1 distutils-r1 edo + +DESCRIPTION="Simple app to get songs from youtube in mp3 format" +HOMEPAGE="https://ytmdl.deepjyoti30.dev/ + https://github.com/deepjyoti30/ytmdl/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/deepjyoti30/${PN}.git" +else + SRC_URI="https://github.com/deepjyoti30/${PN}/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz" + + KEYWORDS="amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + >=net-misc/yt-dlp-2022.3.8.2[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/ffmpeg-python[${PYTHON_USEDEP}] + dev-python/itunespy[${PYTHON_USEDEP}] + dev-python/musicbrainzngs[${PYTHON_USEDEP}] + dev-python/pyDes[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + dev-python/simber[${PYTHON_USEDEP}] + dev-python/spotipy[${PYTHON_USEDEP}] + dev-python/unidecode[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] + dev-python/youtube-search-python[${PYTHON_USEDEP}] + dev-python/ytmusicapi[${PYTHON_USEDEP}] + media-libs/mutagen[${PYTHON_USEDEP}] + net-misc/downloader-cli[${PYTHON_USEDEP}] +" + +PATCHES=( "${FILESDIR}/${PN}-2023.11.26-data_files.patch" ) + +python_compile() { + distutils-r1_python_compile + + edo "${EPYTHON}" ./utils/completion.py +} + +src_install() { + distutils-r1_src_install + + newbashcomp "${PN}.bash" "${PN}" +} diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest index ef28aee21f0b..682ee60d68a0 100644 --- a/net-misc/zerotier/Manifest +++ b/net-misc/zerotier/Manifest @@ -1,2 +1,454 @@ -DIST zerotier-1.6.3.tar.gz 16020606 BLAKE2B d958ac3276b34b0b99dcce7178ca08a7ac398831172103bb26ddb32814f9043103c9cde6e55853a20d090c1b239746c65cd70de3b9e498dc174baaf6ca403a66 SHA512 56052a9cd50f2a754ba8979fec9b7ba6caf54d83582428b1b43d8b54e5caf388adccbb955fcb9c3fd5b3d7ebde7663023ca4a9a3805b877c3063fa72e23cbed0 -DIST zerotier-1.6.4.tar.gz 16021448 BLAKE2B b45219c2e54f3e789fb970fc8cd9d26ce6175c9737f02838efd11c07223ca49c10480935319292e609cb24bef46aaf7f5eebc8335e84af642d25e87ea5a8e163 SHA512 b1cd96cdc76cfd7929016382bc4a373a88d468010134cd65efbe32fc23e1cb56e0306f84ae10b3ad6d65e7a3fa6aebe79ec6c019840123f770bbc6fe2152723c +DIST addr2line-0.20.0.crate 39558 BLAKE2B 1f66fcb361161599a87f874a3bf28a05614e235488d02205d4c8e207ae193280949ad957fd0eb383a49f4c1bc287569454d3c6872ed6e31c081e6fd03f8d460e SHA512 f9794772a31dd01096b168b4b4ffe311d4850c69fd77dd72c1e532a94ef7b23c31cccb9033848822521510f1fcc2ad0fdd824cf7efb9ed43828dc0165165b319 +DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b +DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 +DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d +DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c +DIST allocator-api2-0.2.16.crate 59025 BLAKE2B fda69b52435a7243eb19bc55914a1961e59dbad5ac12c40db39cccdf7a99c742da59c3ef160350808698db24b91e0ce655cd1acedbbcbe20c717604aae23ea5e SHA512 e1eb0df6b44b62115795ebf772f81e9ac0b6d273afd81659dbddb7eb6628b6e5ef6a60ea21413e79ee638afb72e6872ba83a075f6324daf93f2f1eda48daff2f +DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077 +DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191 +DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671 +DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa +DIST anyhow-1.0.81.crate 45142 BLAKE2B 9b8678c5336fe5fd2823c58eae827f7aba726e12fb6edfa958c6e3b38a96dc3310bc8d044ee2e9db0bc611548f0be9a7b664b75321bd0b8a7e168d27dd3d7e78 SHA512 3d328c6b45a4780cfb6fc8daa5581cb5e45b230cb5f55837b0fcc8331c8d53630950c281115c06b21e655821a46d360c4aa667cbb24e87f3a534206361b08af5 +DIST async-stream-0.3.5.crate 11916 BLAKE2B d79804d7310d1f47d7848007518e0b0e0f0724f2589a20478eda3ab1a1db8775c5aea494688c69437046accd10eaec789b244451e84a19e489f071519b50d2fa SHA512 d34ab46a9e18bdf35fe0e58808fadf422dd50246cedf48110b3273be17939678d2cb5b61fae9da176bc2c2b373933821e912fc395627f7a6fed1d2c43bc66c9d +DIST async-stream-impl-0.3.5.crate 4173 BLAKE2B e7c0d2371299af6fe9983adf4f8cbb6402ceaa5f9d286f124362332a4016404069c362176dd3b71061027b0768ac1f772b3e5e38809b870411f4590126a74ca6 SHA512 3725216119cf4cc78d433e2f8a8df9bfb7a3f046e4a8346bbe76e91b23686dfcbdb7cd182765e12d606ed0e3391477c43652a025597de9120170fd0b1151d204 +DIST async-trait-0.1.78.crate 29593 BLAKE2B e46d11867e564eadfd6cccb994878c911c0c8a33caf799ea0a0900a3e9ffda91d7989c64a2c1ef4953a7f8b27a744976434a6673c131716607cc672f1ccc1333 SHA512 67c33065f1702fa4a3abe979650938d954cab93029f7e6c9b4b70b549a7f2ae3d6691a07a36cd7a64854603fa86c9eba5410bcad06881b4ea28453e38c781ef4 +DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST axum-0.6.20.crate 146227 BLAKE2B 24592e684de9b7c0b06b9871028dd6ed14b9a2ed259076b50b12a2376e93b8fc028831a94bc748eb6c66dce49978987d3655fc30313daccb0ddf92919fa9da00 SHA512 e0ef6bab62d465a607a49c799823133d634d93d7a389fddd2e165fc3895eeb4c544f35e044e3c8f52a21c8421e4e4880982fc0be62de613f98ee571186f55646 +DIST axum-core-0.3.4.crate 21088 BLAKE2B 323888f8dd90f27f6f14a9ca0c1b9f1d81e04336c52eab887ada22d8ff2dfaaeab191635f45706c4246c73cdb32078b3c01481a5df888db402c29279fafb0434 SHA512 e09e65e478db742c26115b417970cbcff81bbdf75b37ac3c7b5b0b99e953d21de05884a50377238ab788ae3afea40388c59daea45fd03cce8fcb861c7cabb0ef +DIST backoff-0.4.0.crate 26738 BLAKE2B 6d62814f41be3e53c83f19ef5c9dbd2bbe31460dd70300aba3cd8942a4b3fe8aae9a9882a955d10bc3140f80149750707d0ce5a048dc869cd081375f75ed650e SHA512 efb63e0a6bdd28509d8e7fe5f0acc5c8088c075a6e3c3d198ef9410edd39ece1df83db1f561d5859344d8d89f80c86d2921a8ad38c1809b7d81e39a3218012f9 +DIST backtrace-0.3.68.crate 79891 BLAKE2B 38ec5881bdd8f2ee55db9da423e030603a6ad0b50edeb37e0899ca781bbc9f54fdd00e4f27f8589cc34ceaefac05f26fdcdf693cc08d9d06a2811783ba7c5c2a SHA512 4c4e5d47154e64d2192a6358d0861097e31b5a53d5863b03dd38562dccda7cbec584e006ce29563cadfd03b0031ed7a16fa43328f515cc66a296048c9a2f5d89 +DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244 +DIST base16ct-0.2.0.crate 10240 BLAKE2B a8097674e84bb85fa72ea752d71446fc39e695fea9acc0f98178bb4e6569180f9acb4c7a9820708359d1c4733b57af6448015cce83f8c610985e6d2f7858fc33 SHA512 efe7c810102646733cb24c5cab62bd58d797e77b117d0fa5d651c34630f77de4d768fb99c981af5968393734bc32a2c1944a719f9f1a192b5062c0af8bb3413a +DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b +DIST base64-0.21.2.crate 76389 BLAKE2B 6da080dfc31c5b2ebdbfd336be6e71373918f9388c85649133363a60ee1647b6ad67c7dfd461b6ee842c3633e40593b6ac2f313585b3e8e07dbd690739f433f9 SHA512 3f85bdf846e2f8a2e0f2335749bab58c904479a29311143580f1de42455799d04606dedbf64d355af580d77867d7b895e1078463c7cc5a5fbd9ded9d7cbf3559 +DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9 +DIST base64ct-1.6.0.crate 28870 BLAKE2B 60fbd9958f2519f293db2cd86add5160b51ff4f98718591b3e65d866e8bb176670ceecd5f6e365ff3ff488bf813860bf65d375a2159dd28b25e276e027303c4a SHA512 e3a267dce49257b6990d8d0842299d75b49a9af635082dfee25e314f5ab9067b339c877a4c7b012a1eaf9a84a7f8ddf0173c6f9d8695be81b8b4db03df66c92c +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bitflags-2.4.0.crate 36954 BLAKE2B 1d6cfeb0a17dc53a6249a83c8c7ad7c102985ffcfd7f7f76506889684235e78fe489d23b5a5f9018f0bd526a38d6b1449784c62322fb01f4bb507c0af8bd545c SHA512 0c3d6667abea48811a792749702136ee3db97518b33bc4c7d35737505bf56315e0e5810deeea28b7a1b540ec0e21bd319ba0b3c5c4aef0ba8ed5499ffdfd9b0c +DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9 +DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb +DIST bumpalo-3.13.0.crate 82114 BLAKE2B 62a930b165e853aeeb40558079f570c75ed13ff5e8436d99309dc6252aa28ae69d327c4b438913d6c7543bc156f2714f0c1e80d759ea0d44babe24ef0f268ac0 SHA512 419368d6ca37474c2867751fe5706d0c747326bebce323d571cfc07ee0f022d8e8a7ef5692091b0fa804995b081998dafc55da19a53e51135a767bc0afdb9605 +DIST bumpalo-3.15.4.crate 85028 BLAKE2B 9ec98f430fef4e9b59e61d413b3703430f91bc818f3294aea7416cf8a35e0606357bb5b4d1edebe590f07fb614f832da16016c8530ff39ca853aff1d1369cc60 SHA512 59ca9f8e6b74bdd95b9b4ad1bff3bf4be46dacedeb1eea6196a65dfb0ca7b60e86ab6c25d0f91dae3caecd17ab73c48f953be0bc24bdc0ceaaf4c1726b9ffdc8 +DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f +DIST bytes-1.4.0.crate 58080 BLAKE2B 99a9d343424e04649bd209bf2a6c3a089a6cc9fdb799968f8c3a711189328e4499df2e09cc6a2a8ce05d2cc668149b364cf30cb3b09e96e21d50a39519c2f49f SHA512 502c63b9fdcd36ed28ede55a63cd359dc7b28658ecd43020511d17d48d7c34e45aa8ff7e4b17770f12197451040c2b724fe68d2aa3ab4f81c9171d052f2aa000 +DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3 +DIST cbindgen-0.20.0.crate 183277 BLAKE2B 51529b21879e3a3212fbb951b3bdd5c8c396dce53e9dbe568bfe1e752caf3060bc784909cb4b37a6e6e80d357d5a8e2bab8d10d4470563358407bceb814bb7fc SHA512 83c2b0da580f0a2fc9a74922f3c44d0e73ce0d1de8b5a3f5819c7fcf1c481df1ff0346e84c5b4c199a9364542c85fb81ece4e1deca3a6f12231a4478f76a7c02 +DIST cc-1.0.82.crate 67879 BLAKE2B 3b06cbe1516d4fe8291e1543b09d32d39a135c2352e545b64bc69fc82a40128a9b1291f20bd4cac6a3c37d9466093f8b63cae20663ad517bd7dbc380bfa87ee7 SHA512 27810ea12401635b0122e5b3a71367a52ca7040f196cb30f709e0b8ec0e717aeb8a89ef4e891b1c7c88f7cc8a1c35e55db132b728b0c499e0b683d5b803a671f +DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST chrono-0.4.26.crate 191501 BLAKE2B eae49ee247607995c28463b8c3e2119497141e69d19a756c408f2b72d94bea39397ea2d0d3cd2ccbf1348ef973dd8bae6d29a0d0590e8dd34633f365a9170adb SHA512 2b66faf4d8374cfb0485710ceb2c9c1ce63aa6f9670e405a0810af4aca01c57d8dcd198a1f4cad498d5efd89e00003ba1b4f0bab599422af4f9bd6fb74494c47 +DIST chrono-0.4.35.crate 234267 BLAKE2B 92552b9c8fb40160de9ee62ed8c5bea12bf8bae393caf91c1c64596d6b2efd09dce94355fb757ed46eaf4a13d27ee3ebb43af91e2d8c26df1f9a9f429869f319 SHA512 aed8bc3298c8f8dd8146c6a919610b6dda52c038a28b56c837a21590e41fda605cd466dc1b85e407f365e116d741cb82afbeff5d29f95f3f5bce4a62abf80812 +DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8 +DIST const-oid-0.9.6.crate 45382 BLAKE2B ac27c689784fbb1f486cec1c17502c8738ce3d7d1b579391a151cb0f0a6a0c8335e474d0a517c59230fcac74317396f20ac15d66e2f6685780be01dab197fd96 SHA512 b871d3b4326c4828b1c1d7a3e968315fa320e0b52e97081a95617ded0dc5b93d42b3f79ad26ff3b58a4835dcc442473f3965c2b60026412ad6aacc0c23e9f399 +DIST convert_case-0.4.0.crate 8098 BLAKE2B cd038a7b0d52a9e183a96cbd548a8deefbe0c60d6aea15d7c6f92a4bbf991444d401b5cd3c944f3d37019e7e3db2a648e321402e13803768556f32c08ec00084 SHA512 e17e92b94b030e39f368ef0dd0288dbb45f77c8ce3034c1a6fd2fd43f38cf10a1af5aa7bebdfb447c335d9593c32dde7262e13f97c271c419c6106cf47dc01e1 +DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072 +DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33 +DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6 +DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100 +DIST cpufeatures-0.2.12.crate 12837 BLAKE2B 5b518c58c548d9116f94cefc2214fe2faf87c3aaf3fffbb0bf4085f75372cf7fc5144bc3f827101a3a14a51363d06d8075db94ff5ed853ab2ccffaf597728093 SHA512 52742595702fc3371d4126fb355f3d7a6da514a94e43170f1db041cc6c560027f92115eab7846131dba1018ca5c72003ae36f945c1de88d57a0e7f66331623c6 +DIST cpufeatures-0.2.9.crate 11895 BLAKE2B 1e369466bce2ddf7be6bbe219997628223a3a114914e5ed44b44f3fb6d6a084fbb47cc50ecb109287b074e159c675ae89356cb68cd843b41b502ebe824febca0 SHA512 88235b7d7152f4578a321ebc4f83f69070206b2acaf0e6331b52e1a6633e96edc787f9a409ac2e2799106a259166a302150fa4ddc88352b7739d50ac6ca9038f +DIST crossbeam-channel-0.5.12.crate 90515 BLAKE2B 5a302e58411d99d52630cd154f4f642ec925af3330ced9456a16e417e2e43a37dc2b2288ccc88137a75e682e7b10ab2979f1f90c0bd42ceca8fa84c700b7dd0d SHA512 e17b0e41901b2b41e89913a0a50cd1eaacbf64cd07f454605a85781b8b1373c35bedd16ccf6b24029404a3171e0d670fc2b1474a6448d0feb40ba0e41f99019c +DIST crossbeam-queue-0.3.11.crate 15581 BLAKE2B 91b9797f985af06c854c38b8124cb67864bdb47979d2e253928678118515fbc1257108c7102bad66e1f65fd6f324a93749dde86b4ea28f3bb5a16491f3f56ed2 SHA512 c6007307ef9d219889e6244805ae759998396e1d0548e3664ce9ab366ea78917dee75251c4265b0e3ef4ab15b5c6d42d6a5e9b286d17ad42ec169e7fcddb8ffe +DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9 +DIST crypto-bigint-0.5.5.crate 83384 BLAKE2B f688f22331b4b3620299ae9b50aa9ba6e1b2c7a4ae55e4236f7ccb8ddee4f61950ee0332b6b67005bad505434f3be74b1a0caa426036dde94162289c6926c8d4 SHA512 04668d432b4169154934d55b8ab14f708e59f70a70704b56cd72ceaca460e15589965aa92a22bef20b32ce637a423cc6e1a8819dfba38a32353bd749f7126021 +DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f +DIST curve25519-dalek-4.1.2.crate 305477 BLAKE2B 7553435f9d431739793feeb503a542619dd67178bfb0f41fd3d56907e9217f114e68ea78e6d6ad57c746b6e6a281f38023cd9b6f78e39e65725591d0295a9d5a SHA512 a6aa320a16c5a64f1a151717175978df651765d0772bfc2e06590e7656d34ff898e47fe11a5590580340a028b0d3524b1a5e150b37996e3c5774b8bf93c5f3d5 +DIST curve25519-dalek-derive-0.1.1.crate 11723 BLAKE2B 442b0e4fc519f233d3fa46c17c2e25807374360bd6576e97b4ec33e6c2cc228bc917e4e395a1d70aa19be7bae57db36d2c09c4c7d505691b53d5a624db67eb6e SHA512 60861002465d2ba12a6089b31fcd7a75f7a6d77319159d5383f29e857adea8cb7e5c9c0ab6977c8cfa34b60e1012a1a5dec57f637e6a225e60269ff49c25b29b +DIST darling-0.13.4.crate 20895 BLAKE2B 76675c20937450c47c1bda80170140930fc626d27d58b7dad3db33dce2e69457e2262189853141bdabeabf257d05d954f7dc1dbfa344276e05ee6dedfc8a2dab SHA512 7392896b97b80ad24d76a985f4b950668ba351498f48ef0722c783c28d43c4a4828f5f6eba7e754ca554b6662fc419e73bcb65d4b20037285a16e345fec9ef75 +DIST darling-0.20.8.crate 31234 BLAKE2B 13e8ec124715f743486d740241273fa5ff046b5ede86c39ad5413b3e767166dd90e7ba7344a69c1e14991f0572f7ffa24b081ef54236712c5286f211fcfbafd2 SHA512 2b4cf37cf7cce9af8e93f576dcf36b539816e1ee7b8881b5b8480c45e038c97ca2d3a80c54e243d7c6e1ae23782947efaf0d67a37c0d4dc66301c8a86ce0fcc3 +DIST darling_core-0.13.4.crate 52937 BLAKE2B e038aea27b5b56f29cec8874132881ef589c869ffc974427924605b92436ef06f21c7ea748e97d9b719aa7156b3024e788968ac0cc6144d58eeace658b62a08f SHA512 96d431ebfb9d13aaff2c50f7ad7d5ac5e95813fac851e3e1d7739d1fd5b366fda32172829af88cabadb475f83b4500199167ede54bc802ca1e52137cf6c16c0f +DIST darling_core-0.20.8.crate 64442 BLAKE2B bf1844eba6bac260104e2ef310721d3aae7ff222d99b01b9bb66e3c71ab700095af7dd5b3a77043d6751d94af131f02f23bd321fe9d4a7066f93d1fb7c0c605b SHA512 6f2d047758541355b81e43273cd1eb8865624096c951643e6ce777d716e17256528c47fe012f33eeb1f63883ca08f532b1ca52f43394dff82fd1bbf323763751 +DIST darling_macro-0.13.4.crate 1910 BLAKE2B 432adc44108cce6a13adc9ec45ff9b7555eb4c0ac7f1000fdc8f8e9d1bc0ecfeb65b78f81438b097946aed8e37835f82028c1b16c1d466a124998139ae854df1 SHA512 908ea6459110da16e4ec6ac843659664ed4fa3fb2ea9b92274a738ff5994cf81fbb48403db609b9a70f39c3e288da4358ce369c66821122e3a6a0940473da94c +DIST darling_macro-0.20.8.crate 1856 BLAKE2B d7087fa67033c897aae582e5f4d3126e06e024b7db203de7e7513308af7a0ff6ef0584a150c6f30ce434ba6ce4cc2a438f89f024c9d6338198aba3bd15cdd116 SHA512 97d18bb22b79dd95dc5ab23ea7226f9fd2d6e418b7ce9aecd4d43b7a15b37cb91e509607b89eb3a914a5d3dc562b2a292d1343f87f594ab32d41fb583d7cbdc0 +DIST dashmap-5.5.3.crate 24061 BLAKE2B 2bdd62f674e90007a81b76419dd5df1b58c3d9b80bed4324d9e0298355cd66706794c7187c74bd9a6ce119d81ba9400c47aa2729ec923979b0bc081329051e71 SHA512 15079a921d768224defebdf8d5339257c9e94a46d115b37ddfca8eb83718b2448555a8982bcf0381a915d292aff9d271a89d3398d2ae2f396dd581cc6883963a +DIST der-0.7.8.crate 85085 BLAKE2B 062d494ed32f3c97a6ef4999ef050ee07b26a854bc934304588c0b85b1d312478d1ad1812cd303e4e5aca967a2f4f76ef8ac7dea4ab6909e1a534a7dabcd46c4 SHA512 9cc5995cdb99c376cba473d2db476d81c824cc47c1924cf9c58d37a5508e2d01d3f10a009515d2ab456b1577af8de94e195bb315f61516029307ed860bc403dd +DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43 +DIST deranged-0.3.7.crate 14803 BLAKE2B cc856161cb0d1a43d95f1a0f8d15baeab1057cc477b970af8e0483ef8a8b0d06d63b89073f01616c307dd95ecb904828536152ed65df28230e5874d2481140f5 SHA512 b8b2a3154cdafe4fa0f3e2ee05ee71cd438da39a0f73b16ad90cf417148343a6b2f4463f17eeefe03a385545b9524138b679b75aa9acd5f7ee99a36f7e454df4 +DIST derive_builder-0.20.0.crate 36563 BLAKE2B 753f2a7b1ad37e4b0cd94fc032109179f559352d5d754c0258a597c0b5f819e3383a30ed5c9414b24a4b12e917f41c23bc01554727d06f130f4bfceb3a952c51 SHA512 3fb085259b8219d07c88a233c1aa0e586f6c6ec31c302896c3d2900a062a2e27b4211023f544bf139df3f4f6157773f192a96d9f1e980bf1bb7bd2125d5a7605 +DIST derive_builder_core-0.20.0.crate 32579 BLAKE2B 409890428e291f60a22ee0138cdc1a80498c26607e576a93d1d23c9def454c723b2e7a21faf3261dd106d62dff83123ebd76c3de8b2a7e7ff0aa9e700720acb9 SHA512 b4564364bea1c98563c7ec8b0bd99f260cc2b382a3a8f1156d401c57383b815a4a54e3e5f2446ccb2665eae600d6528faddf31d0f65678a3e5274073c2334073 +DIST derive_builder_macro-0.20.0.crate 6308 BLAKE2B daeaf30f4548ce0796df99920515a1e6291faad80ee9aabe6849354a942650b5903c744daad5cbddb4bf8dd87542b773eaa1989783f5e19c69b4db61786edb16 SHA512 1239bccd3f752c641782aa99d14de0ee92431f46be8b98861cc416e304b03dd18ec875f592d94093189b571592d9fb10b322f7dd205f90b84574e37d38869a1c +DIST derive_more-0.99.17.crate 55771 BLAKE2B b290bfbf06119018206be0f8ad4c92508be4cbc443f1a937c38961e207fc3f433d8a87b2b5a17e72aa1735520799540557d9dd9e49e26b8eb7cc80289afd44bd SHA512 0bb5a94e56d35a17ff4deed61c437ba75c9063694032ba98b58be1b072d33f2fb170d51bd262a17ff1beed2110b334528de75d5315ac627202ccb13d8c490baf +DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c +DIST downcast-0.11.0.crate 5976 BLAKE2B 4ca0e66dbd8dbc86920d4184de8b37ab41954cb1560c7727334c990b97ad9544b098f7ce50759d10cac8b9cb955893805aed3bac5849c8b44a965e24d2ac7653 SHA512 11b037a09829e3e93eabff69f02b608725e6e348a191b1b6c8bb044b8d820a6ebf46eaea2f8bf5eb1c156f20d3e97be9b581e1b5fccebbfe76d94157d6bccd53 +DIST dyn-clone-1.0.17.crate 11848 BLAKE2B 1f90492639630036e1e877537328e46ee3fa697d85b2f87c45990d4a51cc900a6f604d077b16575015bbf0a970c26f898226e87e6e2af82d624f5fa565036617 SHA512 b51fee8c4fa3c6b0bc677e9997d4b6921bfee9a11e369eedc649d19eb5d95d7872b533b37fb1ca842c75e714b46afb1231369341c45071db94f09b53e37e03f6 +DIST ecdsa-0.16.9.crate 31406 BLAKE2B f827c0ea9f80555a1c4e37efa3509ef57bcb8c2abbefac29cfd85c3904d82495753bc5917e8e2b8659bd091d73c2d57bc2f6c8477b7d5d44ab858bd3a99229af SHA512 c69f921653a3dd47fede16aa886675c35b082c7b83486a6fea2c39cf2f98535a00263d7f0e68c5593d16b7cbee757ea913060bcaaa4c69884ca6fe2d3b149222 +DIST ed25519-2.2.3.crate 17802 BLAKE2B aff96de3343d0cfba058203e90b6fd2c6cbd24531abca3a37977a1ed2f1eff0f4d4b6decbfcd9759617f381f88eed32d78397e6fa8d310b99b98d603b809de44 SHA512 3bfbfcd7f442dbb6d49860c530525bac60182bc57f6778e4ee097c7ace9c6a9d32ce430339ec15931070a538d3bb1e1f7b1cf572537ffb782bc5551fab49b2b2 +DIST ed25519-dalek-2.1.1.crate 85736 BLAKE2B 77dd4019467da3dfbe574ceb574849ea665ffd8dc91660f6a9b2596fb886400508bc632dac10a06461f35fce5400f27b89b1270514188ab488a952288309beda SHA512 a3e3838a3d4eef726b65a38196e66456f586b7e29cc328eb243bacc5a247b50f10ce76df6259aa102a08ca921f07d0395793088445f36de33f5dc1aae5223ed9 +DIST either-1.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432 +DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177 +DIST elliptic-curve-0.13.8.crate 63198 BLAKE2B 542536886019beb276b587f906c5552d88229eb06364d93db5eb6c93f70555e9e38e4636bda14789e5ba5b54321c0c6da85aa8d584e638fccda107e296c4d8f1 SHA512 64ec7868cfd2350f5a0e9f4fa7e2225b7f5532b8514ed6d5b8a7718f252f94caba4acf51b2471ac59717783289c9f2ab35d47881210ffbdeff08a85f68ef3042 +DIST encoding_rs-0.8.32.crate 1370046 BLAKE2B ca9c15eb521434daef94de5eecefb487e2b4053ac002f0fa24e3ad101b89fd4a19cbc05b2e52a85599a45d50869a5671dca0786254138b7a5e9d5dddd2be712e SHA512 8a695aedf388dc90b039277fb8a88cd0fe157002554ef478b820e962b6fb19f3fecd5940d0720cc820d07c77e64f7415271a119c87b72c740e6e370ee8cc418a +DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc +DIST enum-iterator-2.0.0.crate 7209 BLAKE2B b6ed04b3cddbdf7bb0909c578a251f89bdf46f64461c89561c8648c93a8742cd82ae887d139647551766cb9294504244297fbabf3762ac52c6cb7b2e58c977f0 SHA512 076384a5888c5d78c3681d96438beadcd125a13729a30292630af7b2e4c4b3bdda5dd313da0965f0441f85d6b0cfd4d4f7c10dad22466710b13f5b78659dc6d6 +DIST enum-iterator-derive-1.3.0.crate 5060 BLAKE2B 25d8959179c84c7ca60fb6d77823bc35805dd62eb656903c8b525938e7a5b3e96bb2628794245f187dc65b002c8a1ae4d5b004e5c2d5265a3f98f09617934de0 SHA512 f64cbce1c05ae232d372a6ddabd4f352288d81d1667230024bbc673084bd3b13932bf4b7621d362fd0731e7df09b666b869937acdead5a3ef7c2731cf3d3d99a +DIST enum_dispatch-0.3.12.crate 22400 BLAKE2B c8a3da572bd8fcff5afe8aba87d0b40d5c759ed2c69d8391d61b43bec8de2eff02cfce0de60abbbe821dc103cda41bc4abdeb9de5a0426fcafd2382bc2403eb4 SHA512 576d682255313ea284934a1c9bf80532a1b39a85eb6201b821eefe5fe37576544b28247ed1d27e019e1e664b2e81207fd161dc9d70e2d0e10bfea1071f508dfb +DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 +DIST erased-serde-0.4.4.crate 25664 BLAKE2B 609438362f241b847e5fbbfc9f0aa9184d8f721419db4e3baa7e651608e7e8164b0ba67d3a138da7aa850aa24a69e8ee85d2302605406a6eb57d4302f5e8a962 SHA512 a3fe0c6322da59628f68ae1f8981506de2158a3d5d9175f51e8115c9cae721e68c1552d321cb19174383f00192f3eea0394058a0f857f4c500d716078ef45434 +DIST errno-0.3.2.crate 10424 BLAKE2B 3061d5a5abee015bf41c11ef31dd0f38a738c51992e3bf9f9ec98f67a87b88341c97901211718a5f103b8cf021c875f8fc799fb217ad69fd27371326b5aa40e7 SHA512 b728704f11cfb2bffd421ad39e7bab79b11e548e336e9dd1cfb902bdfbb78a8afb102ae5684fbd6ac4b01b12603a1011a1faa21cfd0702bb25a300364b17ff84 +DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d +DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916 +DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc +DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9 +DIST ff-0.13.0.crate 17688 BLAKE2B c32379ebfea6cadd162dc169e0b413577fd191620f4f2a1c7d18e50ddfbe561ca865bc3e0fee3be287f43f6c9f2982992cbc56629889689bcbbf652e512da80b SHA512 eab19938f5a2cddb0fcc78b0724efd788aab7f17f04c482e0d06acac4d1cef2bcbfc74d6e4b2d9f535f9c955bf39c2153e010bdd2fa72d6d637d44baf8bf5f63 +DIST fiat-crypto-0.2.6.crate 495387 BLAKE2B 2dacb1cb45435a1a4bf577e3ea2623250ea9c30485a934d7afb63dd81ffdd35c411b04f68e206e9747f572c730ae0f5ebbd696dd45673d3b0429ebfa395eb561 SHA512 810cfcf91d959f7fc765295982b69dee141f4a50facf72a2db1832e1216e8166886c5dc6a92b6703deee27f3a64c7e1f91f7f377ddecf0d6f0ba37f7ab1462c3 +DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab +DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 +DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 +DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a +DIST form_urlencoded-1.2.0.crate 8923 BLAKE2B 2408d9bbca582be13febf041262f0e63a3d661dd8fd2a42e9203feb6ff02a94e3eade6b83179fab34448b9913c7924fdf53e0670ae97e550318229432978e33d SHA512 899ddd113a79bdeac12e499f581c5499d1a4b698c75cfc2d6aada5880cd802fc8537ff9ce68eca28374318d66fd70100962105c1e8962868a5732bb86326c104 +DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 +DIST fragile-2.0.0.crate 14668 BLAKE2B 2e589b312d7409a1a550a676303b9b2adf2e28b0d4cd02c7fb22b48a88d1f88a04e55c4405078e2c43b13ccada890a33bcacfe179abd12236c23f219d275c4df SHA512 a48fee7c13ad800142a9ef1f355b2200b904ad9bf97b3601e310bad2b6ad90ea235b9704964c54be1d9c415c9c95fbc5f49e8ba5d7c6ee3488573f3404912608 +DIST futures-0.3.30.crate 53828 BLAKE2B 4e595639500f7147ceb994359ef1656ed096ea679409a5721c05ff84ba439fe4e82563a7cf8dca9aed4cd16b03e89ba1385b0a34feed9d4923871225e131b91e SHA512 98fc67bf1047609c8bb0763c00ab9cb39b6a6d0cb7d993bce4966ddc2492a6578b789e98095981b207ddd73ac4b1dfcd5224b352a0e970eed347537c6fbea43e +DIST futures-channel-0.3.28.crate 32281 BLAKE2B 128709ed9c3f275ee9365135426b626dab7d34a706cb9435a6ee45e2a28f7d2e6702b7bcd8b0788f7171ccc75917f287834a18c8af58b73ec07f46425aecdd97 SHA512 21bcae42859687538a3bbd4a4328b1a176bf8eec3b03f9d341f8ec08e796ada1638c0c3011246995d742e392a3ecf4446ccd2e92ea5426fe658c5f5ad8303b99 +DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c +DIST futures-core-0.3.28.crate 14780 BLAKE2B 551327876d54a6ccd97382679d61afb3e344f7c8e26813ac85779a57850cbb1f54041c82d71a7bfe4a30d1c8d9aeb560d8d4bf5babe7010fb7cf3c36c8ebf3cf SHA512 a21900a68f1a9232c245b160e95896b109315f10719147b4f104e11edb5b59c862555e07aee37a7d4fbedf0f09a02d4ed329f92fa1ad4679db1d7c78ae2865e0 +DIST futures-core-0.3.30.crate 14071 BLAKE2B 76a9fa5aedd0d4ae8dd9db9639839b6b342125759c1b9f9bbf58aacb4ecca316ff1f24ff8f3c15f559ffbf974e4c2cd02a5418cb4c4d7612dac8449c8234eeb8 SHA512 3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4 +DIST futures-executor-0.3.30.crate 17744 BLAKE2B 927abec40eab31251409149179baa95a8d025f9cdb848afa83f95439c4768abbf6da8e2163291a086ea0b83b0b650d1e19cb8e15f70369b70efdc70eb3121f6b SHA512 fa65c038e5eeee695b2673cd65cf7529713bef47da373290595b554bc287267ee5cd015ddeda5a22169cc8828717987364584a91a69685cdbfc0fc779abd764f +DIST futures-io-0.3.28.crate 8910 BLAKE2B 5554e9dd8548be47e7195ae8b223288cc2e765dc9feb703092972ec9e19ade825bc9d7093625a77c7dd2213df59e2c70ada84a84446b5a940c3e62daeb9dd57d SHA512 805177f2677a09d94ce5f010af9244e0e0dc285937e355a836179297c4c912a762f8d96bce57af388502810dcb67a772b7a522f5c6b21be3aa4b7ee46372d402 +DIST futures-io-0.3.30.crate 8910 BLAKE2B c9af4290f45a9fd0839e107fbdfa4abff4f9077ff45b61054670419076f1c4508d7d560d4d86f8cd7ce146e436e531b9f5e0abfed2c4f2406c57be209cfdd498 SHA512 077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2 +DIST futures-macro-0.3.30.crate 11278 BLAKE2B 6311039db4bd31242e4f45bb7c581bec28eec9da850c47ffd9235c4baef5e5f1c72155f49573b2dc942a9cf246949b79c7d35200d04f91a13b0205cbd33d96c0 SHA512 220b5cc61c744617479d7e8ef9888785a17b9bc26c517c9c4445a39e8be21f111f77e53bfb3d143df18dfde23feccee17e349a84b897eb4d86f94d7ae4f714cc +DIST futures-retry-0.6.0.crate 16823 BLAKE2B 6cb1fed86036bbc1a71fa5cd44d3c19c87614b1a6e995ce2e2d0bf7cfb9f40d3b869f4e3a3cdd234a95b7a171c9beece96b3178e76ece44cdf104211a32478b9 SHA512 0f0d80d887858a63c7b355a0c7160a4e846a38193635e67c605435dea927c758d6ee28a24afcb8e1c4e2764a6eb989b83d12d04d4cd3dc58b7f8a8f48a036b64 +DIST futures-sink-0.3.28.crate 7852 BLAKE2B 752286cb15ff37e9bf4c6cc80c8ebfeb229dbaa4e8aea6fa505f1e145e5dec99c4818c8e7ba2bd8a03898350e05bc124a5ad83e28989e282dbc132ed13e7fbf3 SHA512 e3535aaffa42215448d78adcba72f1dc3131598169dbcc8b52b82fe3e74f4b0d5631ab3dd3ac5d4315be890b94d6fd8f53de274ee4815f9abb27d40982c96c07 +DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3 +DIST futures-task-0.3.28.crate 11848 BLAKE2B 79cd7b01d24a5274b0e564edf0f5d041414d9dee02c503f2303958e679db0db3c652c64352052d20bbad7bace078b553f77920e2ae21a948a1c884eeecc663ab SHA512 198f3efa51b1a8492a4151a6e4ef6e7abd09f2f537f5ffc2b8f2cf739718fb9714718226ee1cde7a58d41a2e623445ae64013f02e7f00489320c06292465fa82 +DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d +DIST futures-timer-3.0.3.crate 19739 BLAKE2B b7af71c761197056a6a4db03caa30f31c104de0049c09f52b18b80718ad20c95e0e64bc7a3618c29d1c9a5ef0309379044fdd9c1fee8465930d28b2c58927733 SHA512 c50388e38b45dce2a65a8d7ce56bcd9c3544ae677158c4c10c532136e861c16f0f52df5222a14c0f40ad8e4faf93fde8223affa7fd84d24e95aa6994177e7e76 +DIST futures-util-0.3.28.crate 158510 BLAKE2B 0721356a4947b39cd066dc8a88afa7686b832be269295af3ebff8cd74b42dffe5484399f66e3e11e2b54c2b8e04ee002a9d507eeb5259fbdc00b226e0f94b175 SHA512 0c7dd3701b7ab0a443a56aa64e6d9b6ba7bb9ccba4c05dfe17608df3e2bed1c2fa460a0cb4abb9fb25289d3a776128ffcc4fced75ca73a65d40b18ee2e9a46e4 +DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951 +DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d +DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b +DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee +DIST gimli-0.27.3.crate 287904 BLAKE2B 97ba399c72cde7b11f0a103598747b58b242ebb808c60c037292b992e30d8fc5e212e5620c233e485adbca61cfc433a4697de3ca76c183ed517a93cad4f75c25 SHA512 b3782d510bbfcbcfd8801b4343a6864b91cf954808e935745caaf1b7e7b3f2f94814f1543de9a36a8d4e5c29d08d69be9361aa2b31e7a261d5dc6e7b66ef4ccd +DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25 +DIST governor-0.6.3.crate 131110 BLAKE2B 86fac0f7075a5ea52622a204c3edfad08a48d76b4057d2fa34a8145189f9774a3eb56b559cdbdc33174cf9ecd09002a015d559cc6bff57453c71c1472f7efe16 SHA512 05054fb3a820a21233aa22dfeb91c01f0c9bc92a72d330e0a429161b83982d61ecb3ac8eef52d6cf856a63deae6c6e21dfc140765c1e939d7f7fb23cfd383870 +DIST group-0.13.0.crate 16526 BLAKE2B 099ced5b8d16e6fefc331f2d89aee931ec5900a168dbe31bfbe29bd00304e8525fa5763dbcd60cb19ac6c62c8d77877f2d83e700c7ab18255b08c9b42be60d24 SHA512 359db06bee4cb51ffe799d9c408791e310e72fde3bb3fd447cf97482ebb909af07b43e9b728e3639d5497fc905b650bf00403b3a6b21515e6628c2466e0851e3 +DIST h2-0.3.20.crate 165260 BLAKE2B c8bfa3a762668f981326134e7632168961679bf45ffd5e792edea1f6fc78e2fa9ea3aa93d7961b27f4a1b214583cef0169a9af5a7a5854a870bb71f36f172bb6 SHA512 179a99bf8416cc263795b5c3957c4f722d53474de66c9da1729a0f0748db38f49211f28a065c9a5de23fa4c0da3d40a4ee4f7f182d4c9f601e512c70b1eac450 +DIST h2-0.3.25.crate 167894 BLAKE2B a9937f5c67f3bd3486d7b35bd732bbbcb5dbad3e92b65898bfc79f5846c58ab39cf3ac09c2ffba0cbc99d4fb7269d1fe1d6929cd19d877aa50e83fefcc941248 SHA512 fe12fbc70b7bd5a9039205c6fe22ea106a29aa78a9d5e089768ba159fe5a40af69efd2b701b5f2706fe600b55c77d902ee59c677aae12cffdc80019afab5077c +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356 +DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f +DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 +DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a +DIST hermit-abi-0.3.2.crate 13783 BLAKE2B 43089507a5ca0731a9e9a54fdc8f4dd5f807244797eba5bdcc072c2c2b3761481df65b8cc65900769777d9d21f8345b502cb1915ec36747160e87f179469a661 SHA512 22901ec8976a7c96e93c9e07a2c5d3db49d7af60ce60c7ee6f61c3cbe93190d1f285e737c1c8b2236d540ab14e5d92e42828ec05f1b212332a862baf2b1b57f6 +DIST hermit-abi-0.3.9.crate 16165 BLAKE2B b779f005bd4cb9ba9abe401a0a559a5bbcc44726ac37f53e9c8d1f7218389ec8b48f74d14666261bc4fba4fbe5558cfefae873c49a2312c8c8bd4010b8344064 SHA512 f3a5a51d834a6ad55480b53f7e9cdc73a512ab0cc6c246a6ab1e8bf8f9851a0c8a55982f5bba6cb57b5a03b54870e73b0bab0a79195764c308318394a3ea8045 +DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 +DIST hkdf-0.12.4.crate 171163 BLAKE2B ffa03876879110dcdd3081cdeadc9490534c44763b3b49f1d6a5f4407a7346e6fa1ea18303f429b23adcd23e8898ba8fbf3797f5ef9f7ab7b11499d130311d68 SHA512 a43fe20b7d14fa26b118c6eba2b84219645f65f2ff33fcca679b139ae3e96f72abc1e7a47eb8887aac5afe4e34211434a4eb5a2fdbc014666d82c4af340a4b21 +DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8 +DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1 +DIST http-0.2.12.crate 101964 BLAKE2B c35c2ae5f9494cafdfacefd778b4b6824588e74685fe5204bc6efa87b667d00b28f59cae667115fe45ae332d8542e7a0c2c7c42fdeb302302f89b00cb716f380 SHA512 e32dd4600aae7e26f1d530871815b30fa0b9bf95293005649bd9a7bc4df7f69a1d8de503d1b8873e67a5496e644d0a47db2a0680fa1e9058bee4dcecccebee58 +DIST http-0.2.9.crate 100146 BLAKE2B a720a5ea6e59d1bd4e7b422fdaa30b3b9d72a7533c5e91d1c8ee2b1dcd899309b490479ec578aa3b51f1dddeb5c6510f28136e9fd1f04d2af12d2418261f6c03 SHA512 17bbc886d34f5aa4b56d82a605a54e920a244988085d06e70bc416f8e0edfa3356544f29082b3fbf3dcea18e741ade374375dd82ebe2276fd9a9508735a1e03a +DIST http-body-0.4.5.crate 9242 BLAKE2B decb7a27f123c38afc1f7f36ad570bac6d5513e57334870621477c17e0363a8abe4d6a3360bb1c87707d188be66ff100f42237727304e07d8515c1faaa179d48 SHA512 d01de0747155283331086f2849d1dccc0387feda576f60d84cdd1bc8817ac82ae131c294b5cf9ddabb7ac91bfdef67bc2ea5fcbbb04f41b473d4c5f5b2ac13d5 +DIST http-body-0.4.6.crate 10773 BLAKE2B 828a43f8ec79a7187cd6f5379edd50127cefa8e80e9bc1205e80c567f506f4778387dcb1d2808e68f1b88bfc7e2d6405ddf9ede9403d35584e31bc62db0b7756 SHA512 fd74fcbd25044aefa183e3caad6cde0967cbb00b6d80addec2589d037b752cdafcdfd02d29d38a12b5c7d87cf1cb5e5ed80488057735b9dd73e03904006a5462 +DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f +DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a +DIST hyper-0.14.27.crate 195700 BLAKE2B 4c079a6f99b1da3816c08df3935b5c9c1a3acf878111f4afffe67cbe816975aae0bd49577fa7cdc1bd55ed78dd2328cb1b0cc09064e9bf6caadde91403159912 SHA512 580f2589dc1f938d2563d3fdfd1cb2f1b11278333ac54e813e4dbe50a0e63952546385f057b20eb123516b2f74e19b62a3ed0cd546fdf868f6a5770cd95643a2 +DIST hyper-0.14.28.crate 197204 BLAKE2B b99c91eaf65947642e217d159372750ce57e332675705cabfdcafdcc9ed3cd90130a9c600118c76e167b927a481b2120d0f4b499772e4fa710803abbec5385cf SHA512 deb26e3815e6315dd193c4db22efe1e73e44bc7c1d400bc7654e950bd074a200b7cbb730ca30faac0940c88529fea60d5737a4fc7ccd4fa24c2ecdb2a0b450a7 +DIST hyper-timeout-0.4.1.crate 13805 BLAKE2B 3ef4ba5ed9f9b8187c50a3af20bd88ca2608403ad668252a9db3bf6b0dee7a13c6905c4e9172e0b1b38a72998e03ff933f991b3bf2af161e8789574f7a5b7816 SHA512 dc0b989b4be7e250ebe92856c800117b666c83b93d8217c4e92c63cc84a617b30f1bc5754a071fccc4b03fbb160b9df758f72d87abb5ad59354c6e0a2563e10f +DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e +DIST iana-time-zone-0.1.57.crate 19785 BLAKE2B 2304a63e4d3a477125ed07fccd5a84832f775c4a0fbd60a995e6f1850aaf3f5047c6f70975c9f6334f96def12770d470677e1f536e9817f8ab1df8a312622cfe SHA512 79bc0fe559dce022cd3c15ffc3b6f870c14a40de6d5a61b4a5a6ad28fe7efce82a16ac5102073a3510f3ba683843475f7fb8a4029bbafbc1cc25e48b98ce2fe8 +DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152eea7f07d1f4cb3609ca734ade32a2d6b18fd0164ed831170cdff192cbe48653b2c4eb0903fb6f157292b3b5bf47299bb SHA512 5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722 +DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 +DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9 +DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb +DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST indexmap-2.2.5.crate 81498 BLAKE2B 8914a50344951aad58766fbfebe8780298098e3a7c923287e3a84f6de41e2924a6a3bb3ee91ceae9b5b49654b83ddc7516a4cfa6253584b0657995d7c8f63a89 SHA512 84fbb6e61756d5ff746f6ffb2c3c8552f96d3af205075a381f06df85258c7597ce24b0d193127a797f975a3fddc1fa92110738227babc73a7fa37505331f8d78 +DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 +DIST inventory-0.3.15.crate 13967 BLAKE2B 213ed4450412fd25bd74328389727e7b0c40363f677a156f6d4c1158958c1d000c8fa27b800a517b830f17579e3fe1905fa96cf8de6d384ce8592837923005c1 SHA512 1b7e229e5555e9b08edf1c1658e11831e591fe1f7c10e6160162fad076e89e4ca401b58ac59a76ce8ed4e1f9cd759a073d8d1f937f0190e2892804ce4e0c1f72 +DIST ipnet-2.8.0.crate 27474 BLAKE2B 143208136453b9c97fac5f1166f395dbbf3bdb6185768fcd8e5d4bff867802bb1ae09294d4d7585e26b7726561f84f4a2ce1f6a730c8906d34a5a5c5f50ce8b4 SHA512 18773715f0acad731885e551a402432a6fb29f120575ddde380cd8af8d332acf2b5be4657d1a321ae7a6226fa0ae58feb6ac295b6e4cd255144465c2ea2c0692 +DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54 +DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3 +DIST itertools-0.11.0.crate 125074 BLAKE2B 8e686f176764e92e4da3697eb781e1bc30d6c57ac61d97343b4fc3a48e4febf669d5771fa8620005c620cce52c236760ee2e1bc344cf602e878bc168a2e69cab SHA512 8ece00ba0a7cf481ad4586da24385a6f0b1719b9c3f0c25b9b5b373dd1a0ca7b9687a77cd179853392890b7bf4d31e0356a4e5fd540465b4ac62bd74ef717fd8 +DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68 +DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538 +DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d +DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64 +DIST js-sys-0.3.69.crate 81083 BLAKE2B 529c94cd2289883b3b43a848d47d8ae025ad0909548a38ba93ebc684ed3edafab16842b922da6c8b6be5ba39c36a1c05057dd3dd93fc8936d5dac372937ab8f6 SHA512 506722e6dc13484828a4147d974822ff9d103d9e7db58a48181b0957770d9fc43b97605ced105c5b680d8b2cda5fa1705f605707611cb48ed8a45a96d5f196b9 +DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 +DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e +DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 +DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5 +DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62 +DIST linux-raw-sys-0.4.5.crate 1274380 BLAKE2B e15ca5b63cb994e86a8161e3b6e4bd20da8f574d1a470128f9a209a729ff22c86470f4c2b2a8ccbc1e37d6284b026e0805902645ea4b742425fe34491e519638 SHA512 13c36e03cb5bdb2e9f17622e21eda608057fc9d908bc55a829fdeeb77785094769d4f4b4daf376c5509ceb3abfdb3936f668bd6d5b2fd48e21c5c28b6e597e78 +DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3 +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b +DIST lru-0.12.3.crate 15009 BLAKE2B 2b2587a602409113a7ed61d0dbc44b8b1740e44897bf9273011e6196db64a51e6973436d6bf34df7a1e534cfc0490e0bec4d83c0dcb0f53f640c80b88713974b SHA512 1768ff09e294ad7b0631a4c7cfc1773be57568329901e9c2034b1cffadaca9963180b3bf8194554bad2f9f42f6c5e67d52dc90ba7d75d929cadf31642f4a688a +DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19 +DIST matchit-0.7.3.crate 30372 BLAKE2B fe41094d3de61e12e2612f90bb25ab21a56aed1658766b23e963b7ef1e47a8ec7d3b4804936eb919ee87ed38e8b822a8381417c93330aef51082d89f1843a001 SHA512 c9f22846a23bd208e54015142b4a3aa6f2275c982d667216598b8712616b7178742da6a870c954d3340c075274818919931fc9f06f090a7d6688066629f36bbc +DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa +DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 +DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1 +DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c +DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432 +DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1 +DIST mio-0.8.8.crate 94264 BLAKE2B f70334d3daa8794079c865c5e91d9b32fee2b90af95a6690f7cbe0765818ed9a0f5d539f3390119565c3ed47025979657e30ee2e871760a776829dcddb59783c SHA512 448a05f19a147fe119965f7f1aaf24c2a40ed816ddf2e5c95ba3bdaded5e2812314c64a50dc7baada93bb005b65159cb6597f82a407936885ea376bb128b0c9a +DIST mockall-0.12.1.crate 22845 BLAKE2B b2299c6060b609732b041c66f58437e1a52228016ecef33f9d2d6a9e017b86f35079ef69ec7bf511d4fdec309c60bb4dd9cb2570c7a3e079a37366c5c1a0877f SHA512 8681eb1b1ae2fa00bd2b73269a0b493361d0003da4080da79ff047692c75c34359621923b06906046218acddecb1fd49186fb7b4e752c70657dc9becb8f20c6f +DIST mockall_derive-0.12.1.crate 45330 BLAKE2B 6593becbb7eb3393a8f05ca4d5d6fa8ed9d0ff00c1b53a218b39889a6f8e14259e29334f36b0fa926610296d5f46f17e627284cecf8dcd3689334d589078b394 SHA512 5a99f5f9cc0bb1383edc3d2eebfabbe520436154e39cc4a4556f03826493ba888a54127f40ec70df66cf9c83262cecae3ffab03de9cbdac2716c431e7ccd39b5 +DIST multimap-0.8.3.crate 13518 BLAKE2B 7e00324be2944f3ca38bf02bfe37f47313aa501fc166ec417cd05f11059b14aa761b58f7a737792e2f9488ef5e7825fbb13cbb6ba2ce4935f4c39414fe069730 SHA512 8580982dde6624a0d181cfdf6cc2293c368762b548f32d196fb7a29fb698d1cb743bc2572ca284c6ecd107a632ea2a428fc998c05df164437f2cb470d24d23cd +DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c +DIST no-std-compat-0.4.1.crate 7600 BLAKE2B 28c4c943ba5384ca9fb155a53b981803c87d3cca60e0690f1c6d0f877e7bda79dc679938e625407c7b5e953aeffb921dc7d242b19f4d0fe28a14a7866a681736 SHA512 0e264b0004b735b640e132cfa057472feb12b906ddfc08f1b95bfcb262f6e1286653e92fc6e83df5fc553c06f410cb931cbf80b9a9303ca7f21cd625b82a82e5 +DIST nonzero_ext-0.3.0.crate 15855 BLAKE2B 52d9ebbba73d03147dbfbc7c5ef03ad3865c9d1c06fc5e938df8f2d6ce752a3181b4f92372fd44b75337fb8ae43fc1ad81e8e41ddf41f0aae4ba8b4281a9e283 SHA512 448b0c936d496bf6aa2452788687d6e01db289062b89e9fbc0c4b23013f01acafd651ce260c5099aad799c684081478b2cdb292536a91315b73c8c96cf0b4257 +DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043 +DIST num-bigint-0.4.3.crate 97799 BLAKE2B afe9a08bf20dc974dcea12b5f9dd465e8b399a0cb0a6d0028d08f7f753aa4dfc929710e4dae883e67633d9dda073f995287e5315b1487e8f99f8f23f1f70e581 SHA512 4b38eaa8b51119dbc7cd8a1e177f37ec935ee348b693a93378742e9bfa68fe5f7e5062b7f34638283c23f04d2127451d796d310cd8adb64dc8e865b28708374f +DIST num-bigint-dig-0.8.4.crate 123825 BLAKE2B 9710266116ea15d0e56792b7c8e217931765dcf2377bc05f23bd386625087eb6a7d7aca7b8f0beeb78ace9f280895565a6de3b14ffda7721e35c741ff64b71c0 SHA512 88ea682c5aabc61c0cab9234e31a2dccdb5458d3bc018e1f9ccbbf0a9f09ed0053341e93bc53f65b5bee55bafe71d50bbcd48fd085ac723ef4662e15664925b8 +DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100 +DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735 +DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e336e7cbf47231cb3a7de30dfe263c41c62c586d31f0029459c8c240475cd329b3fce79f355be7643bdccf8d56dcbba SHA512 e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae +DIST num-iter-0.1.44.crate 10249 BLAKE2B 9e70a4ee02e784c5eafb033dd321f70ee92582c2a75871688ad43970a1313ffbcd49c26a8c6787e537f041ac60fd269131e157bb61ff2bef09e5ccfa372b2a09 SHA512 f7cff4e6ceee82aa6de469b9db834a45b50a3b73cb068ea714fe237f74fe4875a33881f3421a71ed31c47dca847e3f3b7e21cdaaec52f0aafe6dfb8927f39f42 +DIST num-traits-0.2.16.crate 50130 BLAKE2B 1101d28cb4dce477657684a068792b94c7008a965e655edbabfeff51cbe6f008450dc6d7e4fc5dc4fe9c3ee8623ed77a7bde83ce2f68e75d618295fe6cebe0a8 SHA512 2ef65e2f6275b1000f611cc4d019b2f4846a8964b54d9b96462da10e3ac9edbf3d1de82e40094c76f7f5205740361b0eb0ced414bcddbaba5955144f728c6f94 +DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc +DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d +DIST oauth2-4.4.1.crate 74263 BLAKE2B 81fcea881aa5495abf35f1e20ea6c3c07ee506853b8847986950cdade01e8eeb5c07aadc4ddd88b6582a70e6289f04a567840fc036f4e61a33ecd6fda9fddc0f SHA512 b546a0de65e9bef2cafc49ed8599b9053debdc7857a02c39ade4b9e330fbd762feb38663a06933fb83cb973175f40ac4c74586819677cd5591b7105f8ec915dc +DIST oauth2-4.4.2.crate 74489 BLAKE2B de597144878fa6e56b349163f01739aac50164ce454dddaf72370423d7d08a1f9d2ee20dd0f158c3ce00bf7dd800bbf91dafec9d7cf35c74cbe9e8bc56692751 SHA512 bf00eb3ab5f5fee1774d45646467c4622b2b032a7c51dc6eb09c45ca58d39888fd16dcc405d847b1ec139b2dce4758f3a3c330ccc727299ccaaf3b1700fd57fc +DIST object-0.31.1.crate 272843 BLAKE2B 1f2e8ce0bfc2f428889df856bf8fcefcdc754d5c9a934a65b65903ed10c143daa1408e97a1f190996ea451541d215d4e4d7a53c5d2c8d9a6c9ffe4ac6513a56c SHA512 e9cc2eb5ba516e4a08cf3fd5f496d05bc74ddbf1846d6b6ad6fd25a689aa315652fc5710be6bc68fdd678673b7ec8d63b4ce999f1fcfd5b281154bc25a915e9c +DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96 +DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c +DIST openidconnect-2.5.1.crate 144854 BLAKE2B e3f985311d22c415597fca6fe0ef2bd9f8387193cc71e40a5e4604a602e68c4226d3098c97160aa500ebcfe349133f0231031850fcc71ef1a205313a9838a9e1 SHA512 0b6519e4f33cf3511ad2a8dc7729ce6bea30af08f2c6ce33088ae9b2d94b9f31d638a894086ddf169e46331e81a253899bef7990872408d11b9db32a8adcbed2 +DIST openidconnect-3.5.0.crate 158713 BLAKE2B 083f98d5499154b41c803aec7c013b9d2336be603fc3cc44fb2ec2e72e840a40be867c9fbf485f8cb4b5a0e5dc900692472adccc609b66535842c151db69b83f SHA512 d5058e8747a1bcce61170a0685044b2dd9ddb3cb8cc20f45038e57844d3ef15503110e255d2e865a9afa15bdc837483715f00b5edb2ce6c2df15a9ed1f49f451 +DIST openssl-0.10.56.crate 262050 BLAKE2B 4821864fc4773944c703c13a532a6813a934cfb393c73c6bfbdcc2ff6a443ddf1c2339af3a4418059bde54130b1419f6f9d26622f1358bafdcb2dd278e13f67b SHA512 6d2b1f1f2a791385a0acfd23d7c48c9600a58396e8bc44919cb8513530f6d1d6ab8b82c15f63a2ce17ce12892e910220d15565c1274f0308abece55bce531f21 +DIST openssl-0.10.64.crate 272306 BLAKE2B a8b618aa403cdb06a7f135cd966775f21c99739365c55aabde2680a6154d03c7d554bfae6c62a069841c70ed82ece6c3f0cd589da8c26022b7022c3c4d79a6d8 SHA512 a1fa9f71cfebbb37ed9d4a902360f2cc95a78f55b5da5d51eef69db38cef016fc03236485158d689ccf054e04937b8cddf88e3f0f31672997fb30c6cac73cbf6 +DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501162e5279efd6af3b74f7a7716c04b6996b306b310f1c045cfa2eff2895314a47ecbb020a817e461c6d77d0bc11e92 SHA512 57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c +DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c +DIST openssl-sys-0.9.101.crate 68568 BLAKE2B ad80cf56a33c71d6889470e4aaa0b314e67f75ac7921a63d87a94becf9203f4980b6e17b230c0954c126ab8df3c499444ab196958fa645ac9248ea8c245fa34a SHA512 33400053919f7fb2298b84bead88d82231640da6db4efe3dd21a837d0ddb50b2bb21be5befe1734bda15107a9e23cc9f8392647413ceb77451bc36034831b684 +DIST openssl-sys-0.9.91.crate 66649 BLAKE2B 9860268bfcfccb688d8bb04fd343fdb3b492afb79af711ade55eabdf32028667c3b7f6892f3167553dfe16b4a5823cea00b59daf7472d8444a9e64f2847e2f70 SHA512 f34b185e86a38156fa75f2acdb3b1d66b6dc6ec281a3ba24e3b822ec749402294d3502ed86e6306deda1e300dc0204660cda61c0af542a4b79a304cda1c420a8 +DIST opentelemetry-0.22.0.crate 67855 BLAKE2B 46e0ee0dcb0ba4f158b56d831b16d446bdb242a6d1ca388f0720a8ca3b9282a63e7981415a7bf23711987e8132b710775da6e6f3e167ec7c470ee749d0f9514a SHA512 0dc2fa9323a8e0ca01f402296ae69d2504541386bbcf0479cac09185a7f6e5568fcfccc02a9581bbd63e41d3616cd184a1bc1b59e924d0fb91f8bd51490b8dfc +DIST ordered-float-2.10.0.crate 15589 BLAKE2B 76561b2ab32b61ae69bef039f5f4636a05533cb8002b894ea18ce776ada1b5911c3067af2318126f359a305d7a9d3844053be62af1cbd2c3c9c1f45443a1cc9c SHA512 cb883ddd723d1bedfe13d16c9546dcb84d17d4fb1c6dc6d632a0c385d80b0b881694b3364a406e5d7f073c5a7e9e80810f343dd1d6f22df6188322b3e89cf77f +DIST ordered-float-2.10.1.crate 16029 BLAKE2B 7c6920160e52e377ba44ff63ac679208dcb3782c1ffb802707c54fd285ec22bebf80edd036753ee13ac3e577b0b7114241dbd9ce5f018d0d6d31ae21df1cde48 SHA512 bc659ff02660a12c4340889ca7ad99d569d8e7b9043d8e8ffae912da0a5049c1a837c7e4eb0a39e5ee3bbba9fdb498af6236e56af6da841c97c2bd4ca4c39090 +DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532 +DIST p256-0.13.2.crate 63434 BLAKE2B 8c0d6997b60299382f1da2b7caa1b0353b787352bc3de9ec7168bf224ff7ca15b2ffa28f99377eb11cb6cec3481e5d28c68042ac88c1cea27e84aa8fff5e0658 SHA512 4105c597346e2bc74ad7b7173d13b3b46cf4a1df87ea1699586cb7d09beb1b9f8d152b2bd0bc6849c69771fe4d320dc15a9e275470923b495971e9aae54b0ca9 +DIST p384-0.13.0.crate 236495 BLAKE2B 240fa9cf7cc066cba64e9c89d78ae65d0f0fff3e875b0175646114784a2eb0083cbdac9e1a17e6de6b3e9a6074b8f318e8d6abfe63b7de432c2d19dfc0fc0091 SHA512 e81451d336b2fd0c1dc3483f1e586b7d4059b3ee7cfc935edca6be1be02d23b1e380859a44d0a6cc6538fbdfbb22cc22b8d3aba11cf90c6fdfd0e8edecdfba17 +DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c +DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032 +DIST pem-rfc7468-0.7.0.crate 24159 BLAKE2B 478d355dd970b9705ebcf44d74d61ae0694db6de16b2018548fda88546f53e35b965ff72d939def399a49fe97d3c8317a10385ace94b3d552797ec64ace1eb8f SHA512 f47d3b6c7c8bf4547916acc2a3d6671f6c1308e74641419c8f1df810d8bd940aba8f94d361e4cbef3eae3b7f11587cd3996a11be3be41d19111abfcde7a9272a +DIST percent-encoding-2.3.0.crate 10196 BLAKE2B 155bb1aaf0db4d22179bbe24b2d312f3d507876436e8ce76dfb59775282c1136a6c2bf5672f4b6bc274e4535acc9e50497c3e20b77aa2490512755c9cc9e6c41 SHA512 54ba129b0f3b43627707be994a281cdb69d5a7bdbc91dfeaa0226cf2834adeff7d2597dca5d11dd48b5731e831acf1284497b251abfebc0618761f98fe3c01cd +DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 +DIST petgraph-0.6.4.crate 185895 BLAKE2B 9ddfb2796c461d2820db8227753113b02024e5dcb694a0bb2826bc1f375f028d8b98a3bd67555485db7fab88eb86043f5b768585dbe0c60703cc655976030a2c SHA512 b5a21572526387af3151dd4f864bd95c94f65eaf0612d96f99926faf646214df205bcc652b98d3b281f2e270779a4c1fdd6a32614ed60b3612e5d594b2bf3f20 +DIST pin-project-1.1.5.crate 54214 BLAKE2B f4adef2c4f5587ab0523e92b7a662c035882237620fc87aa3919bfd360745b587ab84cce3cd0db24f4f15bd358a46af1cfd196c2071836f4d300be998b6bbcf7 SHA512 103e58f1779cd2d6c63053e9448d0f53edc7f08f29540fe0de2dded1dd0b7de50cd62d31ecaf6cf30b1a7f1f5e4728beb2cab3e40dacf8ad5d5a7a6254527578 +DIST pin-project-internal-1.1.5.crate 28280 BLAKE2B fa30a86b1c2d1a66d7e427b04772efb68bfd7c006194dfcc458713b4dfc8c90929e43732e0792a9c33285855857f0979780e854e303322243b7654a120f74ece SHA512 f0c264460bb111ed8d0d3bf57cbb0f6a1adca16500accca4be7e5ec0d292ce6e1319c6b98108c583b85c3211ca1a84a5470f3e31caa63989f52022abafddc032 +DIST pin-project-lite-0.2.12.crate 29073 BLAKE2B ab66a6dad606804eb6121fac25bfbca3ad00e8d80af2e7d1ab38add91c3f76761fd1864f0fb184cb305cd216cc92e81c2f73f0cd2e6f210ede3bde4cbdeff77c SHA512 9d2eb190169819fadece7fcf33d006863ebe2c298066ad97d97ba96ced6229892b4087ec1f364d5c6150cc80b0ded8f431d9d4285adceb5fc9ae1da8e1a6d82e +DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee +DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +DIST pkcs1-0.7.5.crate 35790 BLAKE2B 0cee88bc3406b60d225593b4b01a4eca11d14a916bd589843300f6130729e7926d2af32b9b7d03e98b6934775e30e5627754e7e32e1785f59c8ede36c28ea40d SHA512 a3584ce492116d6e617a733a0d3d5696404aa7b10ae95070313b4a41dbc21d0940850870b711e375ac8b54fdd179b4083d61c48e902e6efd8a3a11cb630076a3 +DIST pkcs8-0.10.2.crate 26360 BLAKE2B a62b5b7386eedba6fcbc4cff2b103b899dbf6179101445283f9076080489129543561af1ad6f09061564f68c28954262e49d0bb3e182f2ce7495e19d6f34bd5e SHA512 87127d51f0e1fe085d46b30394f2a580e857cd64f5c6fe4a3ac3b8871230aa426598dbb007e8bdfd5d729b99a9c0b4d84116f0768886605342d2ed112c51dfa8 +DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a +DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d +DIST platforms-3.3.0.crate 28955 BLAKE2B 3bcccc9a8c0d46513164f4b451af56a001967a8a0e79643ef9e10e3399e77eaab2759f73a68cefce295a8256b0c88382b42756a1303fb5568922fecf7650882e SHA512 289eb7b4070d8b040445f10966cf6edf050ae740f59797476499b44f9391cce904a83f7dc43dfdac7ffd6174e5873605aa8e1e177700f28b9318703b27382156 +DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c +DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029 +DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a +DIST predicates-3.1.0.crate 23090 BLAKE2B 6c51fa390f3335501df604afda47ff1d2a69322d928a1412bcc4829f16c3ff5d345ae52f54d797c9698b0eb7b26495e594d8c21f04fdd77c8119ad4635184adb SHA512 1ee38c715b4b55038497a4a4996e12de91d356d53173d3a034d6a1f56859cb3a4a61a82d016fbefdd6ff291519097ce9cef950547d3d437035cd7093d965dbf0 +DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702 +DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3 +DIST prettyplease-0.2.16.crate 57630 BLAKE2B b3548f37a41d1bf46d58e84297142e8d3addf6134e39c07b7fca809cd2f72004947c31bcf7ee2aeef548bc200dfcb9c888e090d3a96f63289bc15aebe1085075 SHA512 f542640f809de6aa77d34d92d9a4454ef2a92153dba38ab41782d9a3fb73cbae2569c3163c21938b908e666303631ca9393ea1166c7ad5e5970145f26238c79e +DIST primeorder-0.13.6.crate 21296 BLAKE2B 2ba479defa1c26d14f8711f6be5020eee9bb91a39fa7a7c14a93dedc6de920e0ef1c9f6240d308233d0e0d6bce4be9500d0e9cfb01b6c4f9902e0f77a2f97352 SHA512 fdf52b47b36403d5218220b886a3ccec7828731b5a59ea1d48a25fa85de754544fa9c94d51356d2ed904bf2d908bdb4fa87c53e597a3c9f2941d7310f70198ac +DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407 +DIST proc-macro2-1.0.79.crate 47200 BLAKE2B fff8e514d618b8ef60d6a4ca7610607641cb25701fc5e8452e0db5f942a3c38c724acbbfb0474823fe0f4864df07958c1524383e7640105266608f1d5a741368 SHA512 8bfa6fc1022556cbabe0050a37b93c5ef1056ebda9d3dd368e705a7c695df9dfb5cd5adc18ad1eadf7338631ad1d5ed6f63f0adff3616429ef8c50a930b1838f +DIST prometheus-0.13.3.crate 82457 BLAKE2B 555e72573e07a6ba48f44ba4d5c474ae000d6558aea1daf245a4797e854bb641dbf6b6a5462a409a99fc99ccd3ae5fd93a71489d19b04f577ba75f74d64ec73b SHA512 e69d52ff7ee272f86daf288cb8c54daead09cb0105ff02f144e6ccc6f5cbb83e4bc67535fd340c50e2e478b9e1ff340f6f618d62dd4b6e70414e8498217aa0c9 +DIST prost-0.12.3.crate 29461 BLAKE2B 5a0a183ae2d5981463befbd915664a3f3b334151f2d16df898c1999fc3a6470639ba7c701c4fbd02a9283406b922fbeab2558b744988d95e159fcfcde468279a SHA512 08a910897ba623e2773964a016a16f5b40b8f95037825fd6b2160912346ef83522482745ff3a17a77a634867b9dece8d5c10a22ac1cf779e632c5c7501897f24 +DIST prost-build-0.12.3.crate 39018 BLAKE2B 293a521917ab9468a59100df96c943038586097082f3ab040bcbd59a40c8349e59a192d2fe9c549f838db9569232a0d8d5cf0fdd2c555a71be2eb1f954c7c2e9 SHA512 65f69a406d71656b099c7eef8a70412aa06ef7d479aece8eee5edc8ed69a4492ca042a4752ce20f14f96282f6c9c64bff5dd3b974e9b0e88d799c87b60072fe9 +DIST prost-derive-0.12.3.crate 19603 BLAKE2B d11699beba35a1d6ef8ad5af55d97e3f321de796606e904670d394efeaf474f4540af49e2a3878da1ae31b9decd446365223442467b4580da2f5f74564ec18f6 SHA512 ec960fd57d51813f50ba7ab53ee2c67cbe405bda152cc4cbb29a37e2f571aaf97fa07eb1730ab6f338911355f3ec22b10ab17590d0bf8121b7ab48662f47604e +DIST prost-types-0.12.3.crate 42091 BLAKE2B b90a068031f7eef3eccd64eab2404ab431c4b0c731f00939983e9c1c025cfbc3abe47f89473d028b6e512a56598aa3adf1ac56d1aa02f558afcfafe004b865ad SHA512 a2551b6a4aed3801f6bea59d96eb0fc77ede7e65f622642ba6fd1aa8c56aeae41ddc73d46bc3cabea670d03ece1f79f126e5ebedaf9b8d3d51d3aac0778bbcb2 +DIST prost-wkt-0.5.0.crate 9371 BLAKE2B 6f893810902f07bcc6d1c168db12fbff92f1db131c094d56d482939939c9d345f5576babfd9c67e4674c534d8f0ae6ce84683e0f00496945fac5c4f334a103d5 SHA512 060471105440bbc3505aee238c9374369abf3dfbd837a41026802fe7249a00930c2e22f8235d1d289a0959b15be01b0821355fd78dbcc7b24e8e9837de3bc539 +DIST prost-wkt-build-0.5.0.crate 4992 BLAKE2B 1890a72fb7e88f0bf371f227feb2c5875ca04061740923b52145e26238a1751bb1a62219771955fc0afcb5742c68db4b2fb0823212f0e06f29fdd70a207b41a3 SHA512 14cfcf0fa75813623e28114086448135b220669a93ea520c8d724e2d64c39d24e8f7827043a1db4f358ca233537769957e9aa17dc13e38d726b246223771eafb +DIST prost-wkt-types-0.5.0.crate 32317 BLAKE2B 239c2ee45e6a7e2fcf0c52e52f4dc126585a99c2c5459b898c53e8cadbe037c7fc5151594669aeecdfa56f85c4985c0a7e80f21523ffb82deb05d8f3b51b120b SHA512 7cc0a03d7d797c1197e4a2c2ae124b611f4ab45e13fee099944503f896a708e1954afa068c57e500deefec03e113a89298bc6744cb97a26b511e2d68663449f9 +DIST protobuf-2.28.0.crate 167541 BLAKE2B 3db5e11d458f54fe0e121fda6ed4c1949f8fb0488148c48e512e05cdb3ca3e2fea4a0a0e4f22b312eefb75d3bdf0ef30fcf3d865ab5c06caa8d11a8b96f44b32 SHA512 14e87f5e4039eb98d473055634102e7d8f79d294de0e04e0c0423dba6e34abbb28b1f94bc2d96ab16d3e02e770fe876b4c8c3af8835a43a8448514efd0b02312 +DIST quanta-0.12.2.crate 28181 BLAKE2B 9e6b37e84a377588c4a79809ddad4440ed978086e5c66839f75062556a42368e5b16b19655b333e745a1bf34e4e558dea0c8323b64317ab1734e5a66c2b9f790 SHA512 f99b0a62e080fe212acbaa1bbaf9e54c9a321d575c2d494ac9416c85aca2a50aac4478b533e55b5194487fe7a7082450315c32945637e0ff929d46cba1839a61 +DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 +DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 +DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 +DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 +DIST raw-cpuid-11.0.1.crate 108872 BLAKE2B d8434edfc5cd40c82ab4542cd00cff670bee9f9b0d4a95887bed85095963c16a77e1cc5d1992c40f021c0239e0f0e99687a9c2b17a4d801010c2aff19b197fd9 SHA512 f382b4a8d04a2ee930b463915e59bd2127ab53c43629dddc522b5b42266a0155dff03d85a6d1e3d43903af42c11d6f0944f31ef2e265a2ea50a616af5d3a6668 +DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde +DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d +DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d +DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f +DIST regex-automata-0.4.6.crate 617565 BLAKE2B 8f1e2a3cc1d2d50478776281d2bf10164ef441dcf7127994f4a0341ec40588ec8dc1c07fdf9f670da9e61a7753551500b80314df130370b61d2c03c2b2e3135a SHA512 b288e1facae2612f73d3de3fe9fd1af13d337107004f990263abe6277b31b948478ad9c2b807dcafa73fa565e48bdf2113139f5ca67eb73165b7d29e2ee5c9f1 +DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e +DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 +DIST reqwest-0.11.18.crate 154387 BLAKE2B 67f59ce870c0b4797e89ce916fd86f951be3eee8dc1854e8423d1894b0f5be3b2ae3d47b69943dc171ffd43f8ccc603fe1f3968555ebac2e6ffd4025f299b502 SHA512 d92a7f1814f853c8065306bef1656a2838e8f4c98ebe2c1d29c182768d723eef7159151aebdcbee19dd4c691e0142b1ebee8771f0806e4659411c3ecc52463c3 +DIST reqwest-0.11.26.crate 162183 BLAKE2B f9ac912ba90500201b58468fafc53ffa3ddf255952afc29413330df77f4fde46fff7ecfa78b2baf302a7daf35fcfb47364bd213c8154d3163115606fb334ba55 SHA512 dd8c6f07356c54806148562a839bb5c71efbf5bf73056688c48d652f41892a90a498a3d85181cbeeec0e62128885959ee31754477e89378be572f63e8f269387 +DIST rfc6979-0.4.0.crate 9140 BLAKE2B 662d967b1d818439e972d19bd251a4e3609c65bae945b4d11c0ff4966e9fcfaecb739d0b63bd767cda6a22e77a52f3386f02cb27c5c76ce9008837c882f8df33 SHA512 fb68114f5f8c1e7b921ed175fc01813531a584b8cb2df1264b72e1925bd66b4c021714b3627fbbcf3fabc26e4d6578c4d246369a0c98049d4058dca4cbabb20f +DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191 +DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358 +DIST ringbuf-0.3.3.crate 28701 BLAKE2B aec4dabef32ba018cde296a3c66d724fd89fd618ace0b25efb9d9b1df74e98f2cddd13cf39631cfc0740cc4750dd3f7b2ccc5b4985a8e89bcd1cea48be227e9b SHA512 3c148bf93d90bab35836263dfdb65c0c29e448bb3c54f3047ca2b3469688f9a5356f2de2aab9da85c50002c911013c0d785e3ef092d1f1a88fb6cde5b3d4c994 +DIST rsa-0.9.6.crate 80048 BLAKE2B 0021065c262a351c3c3e9e63984442e9ff8e739f0f60c79f0eec031fc3ecf928756a0da656a0eeb4bcb94cd6f10ced2326a83666efba3b85b8a518b0aaec3d18 SHA512 0af7737181236f0e5544a83eb41d7e780df1a488b7b782b2c97eb4eab3dd599b86d18adcdc69bb56f9aac548a24dc88806e7bdc32fbc43c33b4d7a9817cfab9c +DIST rust-jwt-61a9291fdeec747c6edf14f4fa0caf235136c168.gh.tar.gz 16422 BLAKE2B 7b62140d4562b3f66ddb4ab8eeaf855f1dfab4f20044c5149a7a33959967eb719ea0f2c7155a198798a78841983e6d13f1ec9d7770e2aa7ab8c08dd82128acf5 SHA512 d67bc5a310363dc2aba1be3833b55f8f79a3def9367adb0f652d91da3a8a18d6ecfc2df705f8e193e79e06436953c05315333f6439d4e31a47b551a37b75d537 +DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247 +DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db +DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960 +DIST rustix-0.38.8.crate 333258 BLAKE2B bea1e7ce55823650f8d3988c78d6668742230bb22e04c9f5122ef8497a9ca8c5454d48bd3d6e9765b90420ebc097b440968ce9c149d78bf201118630bc3fc17e SHA512 835d6ca0e8d3c95eb1f81f95a5edf3b12614bdffedcefe1c66ef47d6035215d2aafd7a45f12d96ecf7b1b7a0f9ba7e5445069060badbba7f1dcc036a40167c4b +DIST rustls-0.22.2.crate 332080 BLAKE2B e384541cb737c17af63b494b13533256ac15692124e64db7c3939e61c1097b5ee9ca96ab3e2336500d2554c9fcd8244e76a4f72d05e0791e16432f37ff8cdf39 SHA512 c25f71a3291420ccc33ad21f2495296d092f7d01365f1ce27c71343d9fb5f50c45024d84fdd25791d7ac9aa0dd53d6b7e25f31f35f9a7e823fac8117560ea6c1 +DIST rustls-native-certs-0.7.0.crate 25071 BLAKE2B c851127d71f5704d251bc687dd9078db0a7f32be1a2b16ed66fba906e3ef2d1767b54ba3076d9373d4aeebd03c37a673255f10c0a4499e8330f9e1fa9beeb801 SHA512 458d3739be07082c7a519e536779b844669f54bcf74353fce307ba468de26ae42e41f26295df4139b81eea9a7c8b39a58fff0f1228e521d5daed761308ed3872 +DIST rustls-pemfile-1.0.4.crate 22092 BLAKE2B 9a776027d6e43a336ecfdd6713d4b1e6642378f81b73c97752563ee1d2cac5b3988afd48c92d25d55f655a6fa248436954aaa0e0bd9c7c679c987ce7df0cc99f SHA512 bc748ee06f2c101d8e54e8c4555e88c5ca824ac7bb0182f8e49bfe1fc66d418d2a3da8e454f3741697f491ad0c7bc8e924a752697023a191c1bb6eb98c48aa37 +DIST rustls-pemfile-2.1.1.crate 26161 BLAKE2B d761c8c0944b4697336ba389e379e9224471d64e61ec3499427615ba99f9eeb38a47b2bf23579bd9445c28b14811028a81fde89308d1552d805f49bda18833a0 SHA512 5acffbcfa1dc50c20f290f2546caf669334de0ade8153cdfc7f8259ec9076808d2d47ce602829ad1369d546d21347965250cd2c4e46e835f29111d11f38aafde +DIST rustls-pki-types-1.3.1.crate 21637 BLAKE2B 7734df5facdf21120d0dba9d6e2c0e30ac36d4368048e89639d53e68d6cb72a03cab08dc64e443f6d5b43c3f25020016bb2010ec8d20c329fb60d6cd93c9134b SHA512 741cf0def113336865320aecde54a56cd5bbc7f3aad6e71dd209b4e38b642f42d0244b6fabf03a55467aa42fc3d1582bfa1fd5fda6402ae2ca11191f21158939 +DIST rustls-webpki-0.102.2.crate 196881 BLAKE2B 783877064d2cfbc9078d33f081b2b1edfe43218184e60a8a3b3917ba0a3ab97a226f677d4bf4addef5d19d29ac63a8268dab5bd3cf973d64df866e3e71492f9d SHA512 697d44daa5e0a8ea2d12aa6f68026eb63a6e1c4420ee92656c9479df77e3f672ca2525442be55ab6183111fe594ac85661647150326223129ec23686792f6014 +DIST rustversion-1.0.14.crate 17261 BLAKE2B db30d01914059a893bdb4c448ed0bf04852085c2d948bfbed8819a1d2317c34133cf609abdd806ad628b86974a9c1ab9d09f79743cb8e13257ef32cd444f49c6 SHA512 466d753c28c4899ab3da3e9f3366f7ecc435d484f51e0c07acfa5f3367af0de27ea3bc75efda22159b4990c976b1466a27e7c31c834c72a87d8234318357454b +DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b +DIST ryu-1.0.17.crate 47537 BLAKE2B 28408e17a4322f1afb6f21bc8d7328c39d07186de4d464f8e9bd63a69757cb4af61b46e558075e14836f310f020ac824d5ffa616fc0a5ffba59b9df0bb66ffc4 SHA512 6dad725c4fb2d3a33ea30107b63cb702eed56bd2f3c16a72265f648f5aaefcd3d5a7b919b1d037af926cc6311bc68ba58c4e0483da2b2e2135c6a7c2d6601af4 +DIST schannel-0.1.22.crate 41642 BLAKE2B ccb512f6c6765e5245dcee607b7886411710aa89d317cbaed2f511f74a927a0083042653e070c9d4b976ec83a74f3f37218f3ecb621781ee367b774596227f68 SHA512 6ec962cbd25f25dcee5e31b5012e61d38b97a7e8651a5439ab4cbc8ab33a0e2ce04fa22e06a82ef8750001c6659937ffd8dccb0cbd6971f68b0c354d0075aaa0 +DIST schannel-0.1.23.crate 41667 BLAKE2B 3f34ecf4cc519f5302f0ab5207907a275c68e6fcbb47630aec4ed5d5f1a1cc7475f6d7a8c22361e9878002f9f54314c1f630ab0c1f77ea309714bdb7ada6c9af SHA512 dfce25e3b8bc09d8dd1fce2783fe02ec83f74697cb24aa212ef9369a628685ba488f821cb3e5f863798e0e59995038c8d748f74b89f7929eb8cfd804d5066b84 +DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb +DIST sdk-core-4840a9c570fa3388e190e20f01f61065d0b7e965.gh.tar.gz 538755 BLAKE2B 066678c0aaa1a3e80731f3c650256cff654e063a2dd1ddba84865ba79f876c00865e1512c78f125a6f399b4468708e62f29ea0f02c22753e4638243e7963d90f SHA512 8be1daeaa1447bc7ad6ef3c22526fab2bd8d469a38dd57ba3ee901fac990ecedf4c028605e86350110f9f29623313eeec48637be7448b29a73a9686fa3671a1e +DIST sec1-0.7.3.crate 17979 BLAKE2B c30d4e617f9c0c21b80f14a7df88a164ad43f4c18fbedc1ec32af41193053e67ff6ea83db54f46c8cd6389d930984120c2a1688662fd8083e0c23bd4995d510b SHA512 be646413d84b39a43a0af478854f47db3b167c2bf1bedf7a58392782c423aaaa38df3b3676f9807a98c6128152295c426edd16d67d62ae7048caa635bf39641e +DIST security-framework-2.9.2.crate 79295 BLAKE2B 96be139f2d2b9bc2fec7805c9e90f19f68fb6cf3f09a879f1d5952b502951900fd6889451c6866e53394859a0f8a842b4a674c4bfa82cd71f48195c0af365475 SHA512 fdc58c1c12ff849af3acf34208411caee50f30b9d55e20ef9d3922ee37664c606abcf90c4b415e5c22498dff2116fe2b2f374a0bd382c837ae7d281cd1a0a54a +DIST security-framework-sys-2.9.1.crate 18284 BLAKE2B f1484b6b691f3616192ab363c81eb3d6279ad0bae6bb7fbc4eadfd9fc6b6bcd5ce42fb8edab1eb8934f40a1d42714eeb8ca3616871e8f80c90318834901e8ca6 SHA512 3118d1e982d94c5fc6e8ad6270ba398da98a042c7a2060eafb3b78a54491091c46529bec30d4f871744431f01b828ba2a795f695cd20d008441839f3c4350462 +DIST semver-1.0.22.crate 30446 BLAKE2B b77a951d959a3685b0373c80b9991a8567f8926d093b23b7b8fab48595b5d565acf7408fbfc8f4d58331f39e316a8068885d28bcd70c1476d1cda436a2dd88b2 SHA512 7dcf9b6a02650d71d6c9ab3c29e44fdef95af296208f26aa7be6fd6e16773e5e5e66418c303a0589d1165df6dbfd46ad6ebf9eb5b3adab25a51f340947b2d949 +DIST serde-1.0.183.crate 77210 BLAKE2B 280e3d253a29b664b4e2d17f41397b17fe22af64417facca42d6ca0c839f1def745380a5402d7a87345bb16f4fdacf9a8c01966579b8c08fb06c05f097a87e68 SHA512 3a27efdff92cb1f6b50449a761efde781af91584b8410fbf5ce37b20005e7d46dc4c750fd1730e15468ea22aac7799421c4e60c74243c65ef7916d3cbadd0ef8 +DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410 +DIST serde-value-0.7.0.crate 10249 BLAKE2B d2d3d687cf490eb0be1910bf82c09334ffe32efc485297ee228363e4dbb536b72e2c37f3d37a5f8fe61af7480fa8975c0a654f761c55e56348082e4605f2288b SHA512 6ca9a73420ca9fb5415730bac4daa30087b1722ed7966ae07f403497b8cab95e1e1da664c0581b9cd170494242d4e01be75e1d5f9b6ce19c538e7323da46bf76 +DIST serde_derive-1.0.183.crate 377265 BLAKE2B 041dff0dd5822b3be992cc65c8d789c86f8dda3a42ac77dc1a6c44cad4412c8c9fbb02f7572cc1ec4e4ca731d5f57a765d30f9357827ecf8210ae7f54c26d8f7 SHA512 c19cd2c9665b88b70a12b972c5b30d9ac6c604c77578bda5d7c6c5dbe01f097c1d6d165f1d73c204768427042b7521f43e40ee295c173e685c9ab1b4c23c8fcb +DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994 +DIST serde_json-1.0.105.crate 146316 BLAKE2B a40b99ac4b5e9aa31a61c4f49f9f4dd9fad94946267a47ac4ba7c1bf3af7122dc410c8984235281b19a917b1fea088615c8e95b4f1aead0957c9e31f2b222599 SHA512 d4203d93ee6e8ffa0d88c21d347196b8d1496d506841273e992c9996019175ed9a965e9401ba63d48589133b13ad9cac6246b7e0143545778b5a090a48a31452 +DIST serde_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436 +DIST serde_path_to_error-0.1.14.crate 16553 BLAKE2B 01c7a43b675f3f4b67d428a9cae221ac85b1762f345503f0c57fe60ba0fc6900b87cdff45733113d9a84a952413dd32e7d052ca029f9cf5501d771330f9b38a9 SHA512 8f0b43d3ddb27c678602a69015ce1bc204e27f41a4b2803e0da4d7d5695390b99831a78d863a3f7283615f56e8563977513821a6581dda426a51c76aa569dfac +DIST serde_path_to_error-0.1.16.crate 16657 BLAKE2B c9064b28677201ead32eaa91f20444251b75e7fc7f512075cd53079fcad54006f531ab4fada27ad7414f57a385441de65def5702d592143916d0106fa8e70182 SHA512 d937e2ef7eb6f58e741f0b1805431fd8cfc583d558fd5b58aa04aefcfc61694503afeca33ad62f6a09b4039555e3199c18d5912b7d5d928120ff631949cfc30e +DIST serde_plain-1.0.1.crate 11135 BLAKE2B a01ffa7c6bef5fc5f9bdfbb1b0e316361a0c7632d184f1770cf0dc9985ee4921105952b56ff27eb799a199bb40e9b70b02357f805c300ad2fdf0120a3a9eb987 SHA512 49193d5fd381fbe3b0ba8dbe2375875e07d5fea9f5e0aff390d4ba54e09aff9c6f140d35e9cd0a796050ebb76efccf4eeea5b8dde4ab6bffb026cf6ae5eb0d7d +DIST serde_plain-1.0.2.crate 11183 BLAKE2B e0273be87eb2a40dfd18ea2414f21dbb4d8d87bc5328908036f5ed86c06216bd981531c546a0c7767b956617f42318a96215464f3d241d0baca2a6d1a11d5503 SHA512 9ddad515cabaaa161ddd0346e59c0b7acbe8290c24a30c1b9147d81e987f4071fb9620eaf7b3a122e8a044d586c2eaeb6fe3c33ab4e93a492a930889aa41a0e9 +DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60 +DIST serde_with-1.14.0.crate 114325 BLAKE2B 5681438f6e9ce0032a0b0bd224dd4ee9680a6b4818a93cd8e7990e2e88b1425f81540de6dfe71f5162b8ea516c44458d5f095f815e86079e3dc011880968c685 SHA512 643183189980641b904fd181a699faeebb95ce1eea4805cad8ac72f32a2d47dd4aaaf146f7489c0a062f7867076860cae1aa73e12cb96d542fb0991231a51923 +DIST serde_with-3.7.0.crate 140905 BLAKE2B fa749055ab1b1f271d46f68a169b18c7e670640e937002ee6f59814c4ed7a7dcee13340ec4a4bc116c57224472f919dad85ac64270441987d3cb0110162d6b05 SHA512 a923993d3ebf1543de6f73e264f436849de6d9a292668ca5508e20c1231b78105307f62140d06bd401fa7001d83a46b56a14f3ad95a2360a55e276ec7b94e142 +DIST serde_with_macros-1.5.2.crate 21426 BLAKE2B c20e198b3657516b30601dcc8d9a1eca54111644f42922ea18542c16ec8084a6b31bd318b1de9da3181ebe9050f58d119a95daea05b375d87ee68def69213bf4 SHA512 4619ce9f35b7659f5641eb3b3891910a7780c76911968b53cdae9fc6b03ca66643157707c67f6ac5d16f657d7f3332671430e828d111d7fc8968683523b93fba +DIST serde_with_macros-3.7.0.crate 30834 BLAKE2B 2da5db01fbbbc9e3ad94531c4947bab966e7284c3867f1bb2520cfad23f5a7f5dabe58b821ecfd8bd1f89041e57ee388910636479faea2506fad232c5c7aeafe SHA512 43d666624e6216de285aa3ff8435bc01bfacb675544f63922d1113c4d1a37e8556c61d19807558e002aa05888f8a5d19e7ff8b339b50c4b9c54f0a2cdfc4e9b0 +DIST sha2-0.10.7.crate 22541 BLAKE2B 918a8f4042c57e4f8931d645ba758f6e7da911d02482c78d6ef3a12e8068e7f3a08526580824ab548628fa7e75bc64f17bb12f1ceb167861a781ab9813eafbd4 SHA512 c33d6bdecaf49d0f60276531e845231425f62d2ec18c4d53c43e49f506a2dcb2548f5866c6642806b6b64f008a481c48920b7b4fc867df7443dc31b44f297fdc +DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785 +DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb +DIST signal-hook-registry-1.4.1.crate 17987 BLAKE2B f1df8bba55c72a506b9210347f9dcac4d158948e73f6d1e60f43340ddfae368aff1bbb6a109af326af47246d9738d49f76d380c52208efc3c6f79ea0acd31f0b SHA512 e83acec2b0083967555f6c659dfaacc32d851a9485c9f6f4b4cf257742ae3ffba8c14708c75f1a5520e9d132ea9e21d6eb65aba492eec481e8492af8b798c5d1 +DIST signature-2.2.0.crate 15531 BLAKE2B c584d9ad52a1ab3cdc129c36cb2ed6dedc40a8d49f7294352a7df8121dc57de78268f15d9ff9ce076abf1dd3c56773daa26ed5ec39c83a600b6a377b51d4db37 SHA512 673a8f6229c795cc8f640fbfe02cd912b41c6359ca23c5ddeb1679f49784b84f109c6c45e6210201c9ca05e441c1be64ce6537e81ccd3589b37be6d0bf50dca7 +DIST siphasher-1.0.1.crate 10351 BLAKE2B 6653898cf0eb071fe83b7c317f93ffb73bd26ed601961173875b26ec8851632599891ec178b7e14318abb9eb98d522db8022deb852af9ad9f6bf38a5a5708e82 SHA512 d230991add51a555af95b30ef104c0e5ed7011fafb92d6ac9ba0f238c8bf4d2fbd39f4b04dbbe960453f8fdd16d3768ba39f39e4877ad453562e689ec8f24a28 +DIST slab-0.4.8.crate 16928 BLAKE2B f20603e1331a767c3f55b56d58bbdb9fc126794a116db128fce6d204122c420e9a65478f9f10a26f86c045dbd55a62556862f4339f3a41419f810bcfa9fd145d SHA512 1d713a217b3816a1e6c230d4bb52c32c90f600e64520f0c339ea8255ee8aefd887d969fa23497f1bd8b2b1f7dcb4b220957889746f04dc3453240b5f28517192 +DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 +DIST slotmap-1.0.7.crate 61390 BLAKE2B 56f7ee840f848f2331bee7d7e31aa66f2185db5b57fc72694e1514b462dab8f673442c36f7b9260d5db7b68a522ca76f7748aab774246bb12c2ecfbfd3e7bb8f SHA512 f130275c506a3d648b5d66acddf7ed88274fc381d8d0101ea5b3ad931069d4ca46b856d75311e95e09a23c009af343c7a4321023bd1d065d3d516a0b4b8a3080 +DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d +DIST socket2-0.4.9.crate 45421 BLAKE2B 19c296b1b42839086793a29234f604a6c94ed1b9d30c4eb1ec695a76acfa266840f482e64b4ee2d5b4520f70849fbaf88984020ac25ec393918b89b2682d2541 SHA512 6cb2aabc409fc7d9942afc2073a36ad8730c06dcdab1866b9d3d72dc55afc643be6a2ca1f38c2e19fbfe782ae584512a1ab357c0f4974f98967a4f489e65331f +DIST socket2-0.5.3.crate 52588 BLAKE2B 03692b67f27530670048db0920e26da4d95373a3aaa81ffe840b09e73a5730e2cec4fa43c25e63db0a6164c67d6fe555b0fcf1c9f7ce6a231d2972f5224a4d50 SHA512 63cb78d66b057587e4b3b50b9c618db1a202102c72b52b79c2e9f9a401dc1c28fe4523a0f6483b38ca8a3d24d1e2fca0b7176d96fef6ec1b922ae7c4afacc324 +DIST socket2-0.5.6.crate 55270 BLAKE2B 10eb32486b9a2908e05ab24620ad7a79243e59c2c2db5a7793f87f32765745b21746423d5b3896ef37d3dc9e76410fba97826cc64cafb7dd45adb485900c2282 SHA512 10f14ce7bcb9fabac56f98bd34ccd6368dcf4ca245ba2df80fe0f1157e177056eeffc6fcfb1d1fea6e89c0eaafb99d8056fbd10101031d3ccabb98950ec563dc +DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267 +DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee +DIST spinning_top-0.3.0.crate 52579 BLAKE2B 752f3c6a341c658f7b6486c572a2bcf294e009df8e347095a9f5bcb6cc7c2be565417c48a33a95e6e9a053f250ac9850f11e8288ac30b291a0147c795b4edb65 SHA512 53290365999d2c4d1304400d7e1b03072f87c1f2ad6efde48ba3b83a45e6d2d71720bb5ba52099b57f6bd5e823ec7727a0c2e2dd092816a46bc5f448b6f29981 +DIST spki-0.7.3.crate 16409 BLAKE2B 6b39144e4e718ce5eb454e21ee89fb936ffd31ec99554b0150fee47bca396bdfe4ef39603ec029d4af4d8c4c3ba2de7f6c549244f8c20114de9b43ff14921681 SHA512 d33a6a7844b33c37628024ccf25c1a631f7a6661595e063049b8c9a9b4edb28f0335397faefc592c6fc5e96378b870ab5dab9b0649c3387577b2370ec8210db9 +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 +DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0 +DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d +DIST syn-2.0.29.crate 241664 BLAKE2B 5b339433249d7ee17b032cc9ecb118169957d91f438619940aeba0003ab0015b01cc6afb00656b5492539a5396325ec16c37e33764b00d6f9b8dc6b5b5e6a9f0 SHA512 a6319ee743a7690c7858da8492ffb6a963d102beba07009e82b08082d33ac8e8ea2675bdfc3ac3684392b3bc3d7f2624983dc508dd8b8f1fb9a57ec8a5b82828 +DIST syn-2.0.53.crate 254828 BLAKE2B 4bbff9a430e12baae231eec35dca4a3130e9977c6272dcad4a25266441959461e6e2b69832492a6895948fada9152abf8630c1d011c93912356397360bfb7b8e SHA512 0c3e40e1af47910b59877246700dd695e2bf03c35e036adb99e9756f8e055c8b3421020fc43f71954aa7adfdc56712d58968f3f39ca2e93c0daedfebd8862b9b +DIST sync_wrapper-0.1.2.crate 6933 BLAKE2B 0ec797ddead298a95bde0a508ae942a4e90943948d3c1e4833fb3ad1cefd3566b7fd1aa0b133d614839707e3f416e3e739099ac73441527213da81b6d1c47d50 SHA512 ca7cd7a6dd242fa420e8dba820117d85b1b11ea6a9fd99c92a5a260f12263cac0c034c9f9fe10090d5830fb5bf5eefc8a5a0d0b5a40f3f809d69e5393693d5c8 +DIST system-configuration-0.5.1.crate 12618 BLAKE2B fa75a24f8db6eafe578bcbf162fcd110ca059c58af24916acd64959b48d8541e0aa95ce2c929a8a50c62e7e8a967de9101640d1da7805fce2f76b7c5c86c4544 SHA512 af77ed5be890e826b9b8f975bd2e63f3905adb24a597069a887ff2a861820f1ed40582b918f35c3d4eb063800e179b93e5acd7d5b48b147e9b16e3cf4c12840f +DIST system-configuration-sys-0.5.0.crate 6730 BLAKE2B e40c4b5e7897cfe30b2fb6daa9b44fe2b83eb2a12d798a1ad8908b51abc735566becb0e001f52f5f8a0d3596f62a9eec631341c3a9cbd132a4f650f988c74b93 SHA512 764168ee5efe1ba82e847ed74a14d1f5f1892735e98657c3ecaafcb4b405d4f779592dfaade252f6a577ca2cfd5cd5e467c0b6326bbdcfa573c3ab01cdc8fc34 +DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39 +DIST tempfile-3.7.1.crate 31817 BLAKE2B 99b5ce19ba7712beb98ad4f2183e6ced3f5677b894a329945ec8fff1635cfec150d1311c60ac4b9c257443577be55d887c7a2cd3e2173f4cdbc9c522a43f9e21 SHA512 b3f59791c1b959eb402970840ccc75c13bdde3e35274f91dd304c2f2ff719c0a24ccfe0ca53bdc3fb8f01060920624ec50232ac2168e30c1a5efcf405989767c +DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062 +DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a +DIST thiserror-1.0.47.crate 18811 BLAKE2B ea2da26fdfbe3d9519942761a9fa8a7c3528a170846c290a111a33420dfbe6c3f114591e3ad101258ea2a01a756ce4710d7b46c01b40011e5ea01cabc37db189 SHA512 fdb128982f0b0a6d83221bfa6b274431a1008a9727c82d55a8cb2770bb85d18842e6b26b90885fc0f00801b157b96de61fdb0f72d98b8092c69181d8ee67cf63 +DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578 +DIST thiserror-impl-1.0.47.crate 15080 BLAKE2B 4b8084ae885160607905333dbac2287576127992eeb58293050c46ccc2abdc1a04f85b07db35846046d9a3e7e94ffc7c8912bab37e4eb9a5290bd55df46d0d02 SHA512 b6b73e9eea058492c45d41a70d5ce491b773f4747e171b794577f996f0ed5d76562338a18105f82a6733e1e37954aced4fca78d5f66c05e6789c15bca5ebffe7 +DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b +DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492 +DIST time-0.3.25.crate 116903 BLAKE2B c3c0a5cb6c4166fea626c3be43c1d22cb26ed03dfed3fc49bb169f0de753ddbf4fe934573e579b2f98fa0779becd54626ae9a692f66de7253a69adae76aecbfe SHA512 a6b63ffcb3d45d9eed7d9c436e9b603d6cf1ad402dfd4542807099c7566d84dbbffde3ae772b2decc90427ba96d5f0b023b1861f47de1f2868d67d3105ed695c +DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116 +DIST time-core-0.1.1.crate 7197 BLAKE2B 9d0be2ef7111a8b66e5c750b2c372627ae4acfb2c68b0c6ed44b3c23bea1cdca4f65b24d2f2027b4d334667b1620019f4cb8c6d9799c1c2c537e6cfe692ab88a SHA512 a29d6619581d3fed73d6bc66a2c18805b80a3d54197feac5ad987a2c31d003bf4fef88a312d5315d2fa5c7d3e509066a65c1732be2ce280cf937bb4eff012e14 +DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52 +DIST time-macros-0.2.11.crate 23738 BLAKE2B c5ed4911259fea3154e85d8f0d39e09ba09e912d98d68718af0ad5feb14e4bdb6f9610de08a3ec5423047b8f1e20eb390b74d3cc034060b5222d73a293c56e45 SHA512 4e03d6875c2ea1dac74f8e5dc52f9e53098cfa65e50287e9a1ff423f8c84f2f617fa374ce018e47da805561410d83f6e2926ea5dc67399ea916644bb7d236467 +DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c +DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c +DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e +DIST tokio-1.32.0.crate 725004 BLAKE2B 80dde8073cdd361c8e05a8ef3b0fed0b4ee56c915ed6c0adde4bc2db487e0dd60a3adafa55aa9a763d37ec992a27208063aeee6a95b594b2e5b02e2bf65da9a0 SHA512 c7a64e08b4584b52c98118dd07316ee3bc0c2b405278f37bce58c512072c20268df66a8ab553e4d3bd3470753899ac3b1df4b9b5411743dc0e092fbc2d9b11a2 +DIST tokio-1.36.0.crate 757286 BLAKE2B be9fccb7c41fa6a48f500509ce7b7ce0e1c831a5ee51772ed10fdf054b5872395d0037864f10da4d8cd160d15e8dd8e2445446de75b8e8613debd01e530fd0b8 SHA512 0687980dd375965647c89cd6f569f74ded6400dbbf73318f02d8221e8f49a03151a4f023fced542cf63197d7bb150ca45417c10dfd91517d10bafe0d329d6848 +DIST tokio-io-timeout-1.2.0.crate 8993 BLAKE2B 52d5c5564c55c8450eef53cb60676d671c2225b2842bcd65380d2aa544d20698f138b5498521862d726e57fde97f6914541b5edeb226a197020205c2acec8cd5 SHA512 861b8b2c7af6ace78ae223fa567f26fd347de92b3e67c788a140a7cf5bc6320926387ec633ac5bf32fc2b0b28b4f3be450b7c4cdc755eba4412eac7c390dcfd8 +DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6 +DIST tokio-native-tls-0.3.1.crate 20676 BLAKE2B 4c752179aab8b4beaa6aa212dc8d9e4a2b7c12be0dbf80406f20f92fd12844a3390e88a1536875596ab44774a67ce35115ca4622f9faa977c80c4261ab4c06ea SHA512 bda2e77671e030a021f628ad760b3fbdc26e7483a5f9ef6c6892ae0fc38b538d52d527805c020d578079896d50fff0bbc036a87cc91604904840d5b7dc181914 +DIST tokio-rustls-0.25.0.crate 30541 BLAKE2B fc85306724dbb91efee7924340e0cbf4557cfeb149cf11dca84e37ca96e6ca54cbe774edaffdaf313da11af98ac03cca23bb7c2ff6ea551f5328a3bf3ee9aa02 SHA512 4e04669ecdd8235edd438075e6b125f6473e117adc2ae13ceaee7668705e81a87f97242253f51dea204fa1bb3b9f8f9f21b587b4edc7c2e58e375f5537ee5f95 +DIST tokio-stream-0.1.15.crate 36284 BLAKE2B e12d50652cb39227da004ce6850413d21294142fff229dede50f2d6736753cce87a6b0d864b0446fd878b4cfbf715ce94a9a7fdde0ca6fceff3d5d5fa402553f SHA512 3e6b0ecedd45fe6333689b9dff06c85a5dd9beae461879278c795782bdad0680c6744cadca9ef64d30abddcf1bc83b04b489768a0777f7c6a621d2ea7cb1328b +DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c +DIST tokio-util-0.7.8.crate 101644 BLAKE2B bfd0b10b2ef7d1264262f78e406aaab07a1e060885dd7d9694b3cc34b6ae9f3d46946bbdc5aa3dbd0f6164973fc3305b20da04f37176250e874b3259860cfe51 SHA512 7b1501dd224b4a6749a5296751d83e6d57bae238a92430c32017813ab82c358086a555fd7d34537cc944c240ba73d4fb94864a5743dca05c138f834d45ee245e +DIST toml-0.5.11.crate 54910 BLAKE2B 9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e SHA512 eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317 +DIST tonic-0.11.0.crate 92841 BLAKE2B 275a8bd25115f0cc7112c315ec1225f7e24cdd56e7517e9bc756f02131a8d65b37f0cabf31e332e6ab2b0b96429f91099baf2f8837b2e53e524c490eb538cbc3 SHA512 37657fdf21a005f709c526691b2d500d9946b7faa161a93add0429d71b55b8969b76b6e8d6cb40ba1fa2aa9d7aff717db35d05b8303c0e11be9592d63bc0f694 +DIST tonic-build-0.11.0.crate 17932 BLAKE2B 772be2f64c3c1ae8f40880e0d43a658834ad5929fdf29946ec5491171f662e4e3218cabb1c023ad6def1a182a9fbb5d36f274eb9bcb01c70c740bc86a809c298 SHA512 3b74b25deb506b9da7cbd869c2f92d5443a3103b14d86b3d54234f2b256823d787a59d1aaab554e598c290b940d488251ce10d967314559ffcef263121fd52c2 +DIST tower-0.4.13.crate 106906 BLAKE2B 6a8f4455dcc69f6c03af703fcfb0e6b214c2ce599611ef78fd41cf411ccf06bdce241e03a1d85d36cfeadc72db9f3d9b7ed94c4fcec466c070f2357ff6e27360 SHA512 592f23eee5efa6a4f0d2ffb0d965da7e0f75a90a4320a0d0dacdd5add66513ae40902d21af2bf683573133ee984866987df2ae8eb8e632cba7a9d196985aff8c +DIST tower-layer-0.3.2.crate 6023 BLAKE2B 3450211e07a40419526cf1afe063c56357dd5add53470a4146ced3d294edeb95dbd645ab46ae0e42e4877dde63b1577adb21d9cf50116c4cfe4165e115d54ea9 SHA512 d5429b40569f67937e752c2d61c39a474af32bea5ba3940dbdf5a4037fde1ef7173cbd8fcdb87d0ea15c01bf84f2d55abd51fefbab2f27aa54e656eb1748c43e +DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005 +DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75 +DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275 +DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0 +DIST tracing-core-0.1.31.crate 61263 BLAKE2B feec046ddd3e04995bfe24defd6ae1187fd7ad78d80d69031178f67ed534e9aa6ab6aaea92dad509f57e220df5f6f025ab8f96bbc957834126f53dcad36580c3 SHA512 66fcd0b4f32de3816b1dcbeda1af26fae0a79d088894637984dc6a0ca65b609f5f166cea376601f6a75f8e3a281da6d4450dc796aa0a7177ad615330237e2bed +DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521 +DIST tracing-log-0.2.0.crate 17561 BLAKE2B 701bdadd40f1343f3c4901bd8dd188f1dbc0afcdf50807bd0f6df7539635e239b5095696872103125a4d4cfec24af6336fce6f3931363dd5be4f53a09fa584f2 SHA512 0c1f060e8ffb9ff24cee7b85cc2d7d42c69b2f7623a7faecd7422b23b11ae8d5c7691e4635bae76861d444c369d9701ccb147904668023642b223e442e3c8285 +DIST tracing-subscriber-0.3.18.crate 196312 BLAKE2B bc2f04da63b0313d26073eb4a39b549ae37701e4dbf1fe06a2483279a03d9dde981f0efea6ceb5cd441ab313bfe7eaf812971c3ca60dfd4b5d9cf0d2eb7bacd4 SHA512 72f91855637aa476f03077d5f523cbc94989d40b12d7328167f88b081869ed096e6370450831f6cd5f0686cae5628f14eed4696c06a2ec75f56808b64445e0c1 +DIST try-lock-0.2.4.crate 4467 BLAKE2B 7afbe36d02ccf31351c7c7ca4415578383bb4d0fbf89ba2c5c7835dbf410326fb0f6cb302baf7c1edccc4b193a2ab8079545fd67f26a74457d116204f3c6e745 SHA512 fbd989589eb0a1fb226de65537d51eceab632603e69710b37708d6109ed09c07333189675d5e560e35cc836e5cd211c726d8ce247186b5ea4529328d46c22632 +DIST try-lock-0.2.5.crate 4314 BLAKE2B e75c6c0d7c975e294e3d723e2fb023067530ad6db3c7bdbe89b9558764606fd1a74f0d1ba787d85266db1912dbeda85408e85646d0f7cb24496d743b7a18c705 SHA512 433db3c52f55d78220db414ef6a7367791dd66eac935f41dcda85ec9200f0eefeab6e8342e70aabe35c300069c0e7b7c4f8d63a2334b52a081cc98416371ef08 +DIST typenum-1.16.0.crate 42477 BLAKE2B acc6dcd4521493c438a8a3d997ab0456fdbff3db66aee9b81ba219714d47522c3ca8fe26f8ce84edfda416ff9a22747caf3ecc9cc4bcd1e7647ac351d5aef407 SHA512 93da3ed62573acbc9d5d31257fb72ae9cfc7d59e4040c1f32d93e8fec94795e1aa20a3bf76ddc64c4b383184306bb2a66e51fd61b64dd4ce46a1bca8238b57b2 +DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508 +DIST typetag-0.2.16.crate 27793 BLAKE2B b177a4c73bd0f61f94ed98195e2e118fd07479d9e13e0feca403c122bbbe6643e505cd49f366c898b8f01790b68d36fbd98dda811253a884923879aa1f1a44f6 SHA512 a62e792dfa09bcb98711f246e7dd8c4a457e1114092199c6f75323ab8c45690479ab5a370ccf0a71fdcf0c6d5c58e884691d3faf852d7d0d67a8f13a0edf78e4 +DIST typetag-impl-0.2.16.crate 9086 BLAKE2B a32f947452001820527f5c60f05cfccfdd96525190779857db19b434bd6d8a9412217a230343736af6131efe7f1af70a1a2b5198e4126efa2f3de4f5ad87c472 SHA512 52a1036f82cc0193b74b16aa43d59d72f259eb669101e3e3a694f509932f706c93d5402bbfc47cff1359ee860af0728a25124ee215c375025c798b9bb4174940 +DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9 +DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8 +DIST unicode-ident-1.0.11.crate 42067 BLAKE2B 3c7cac3d2bf1cbf1cf04716a482f130123e8e6940f7a90a17bc62fca44ac0069688165538f5329b95a72f735b594cfb85e3250738393ffd1b53cb0cd95077d89 SHA512 9682bbee339fb987c9d0bb6a54406d37b28b5c3587372d406402e4341900fec97e3234cd03b5c98b90b6378fd533dc452cac3de90d3ade19c4b09657e4abf6df +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c +DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5 +DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b +DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef +DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b +DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe +DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0 +DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416 +DIST url-2.4.0.crate 75670 BLAKE2B 8cfff1d8ae0b7353ab4f539e2df1f15dde3c75f347c36bc5c4c8ea45a0cfcb31950b073b50acb34a14cd3d7a11b665c3a73a3d070cc590ce740c561f0e6e92d2 SHA512 acef524d2c00d2fd68ec6385ca2a44b740f60724256750d8b0ea609dec7f9d59303069f315f04a5205925a27274ec7709f3818a2237ea0023845e9a12905694c +DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3 +DIST urlencoding-2.1.3.crate 6538 BLAKE2B 65777b0990aa6b3d27a47f36114da8622026ac8946b5ffb6e04172b666ec7244a55c250a7fb626472bb2b636eb32ee945599cee5ce7351c3cef2322366db15ff SHA512 035848d9243ed6a4528377b56edd7f8bcb5f824381b420dc8f5c4bfc3f1246655c54eaa7de0e4aaa7138e0b08fd796b9ace140ab919aed2d94f6952b577386ac +DIST uuid-1.8.0.crate 44043 BLAKE2B 6a5e3008f0399d5606ea4ef51e5932aedf2a02e747b9bee4b4c2c6646cd959a720373c346a734c00554ff0359fe42bdf471dea5029e23a9e70164e20895cacee SHA512 fe254f0bf6b863538ce568405569a4c755b33bce561148661b10985bf4485fa7ee7a6ec650d93656552b3cdead46b2074ebfd45b040edef19cd1648300f68ed5 +DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387 +DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172 +DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST wasm-bindgen-0.2.87.crate 175052 BLAKE2B bf8cf4aa1786ac5c2ba76e80500b5c54313adf9690ef370e60b894401bd1b81416da7bb46b90c014412c96f30f995bd1e52cf7f3a6be1111aea40866e8178396 SHA512 0c3099155ef079d2b91d2d5b135243d687bf865cdd9ae9d97d8cc2eb4c9bf7439b66b28d5b1d7e95048e53be63ed4909b6b3f2427951348de25ca7abb7a03705 +DIST wasm-bindgen-0.2.92.crate 184119 BLAKE2B ca256c686bb3854492bad6afe3cd27dab314561a1ea2e0205579820066b462bacdb2cc01075fb420bd20eb33b03a648ce1ff46feee04d8759ea8aa990ff8232a SHA512 6e46501276c0d4befbf930c816d6ae6c3764e3b5ce0ef4aafa627a6ea371f1a056ecc15970a817e9e9bf51c0a2ffa57df427d758b2d367beb6a474d75b8939a5 +DIST wasm-bindgen-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94 +DIST wasm-bindgen-backend-0.2.92.crate 28348 BLAKE2B 425497aa7a023b70549c55d5a15dfed80877c5503863b186c0a9d11b29551c4606c1cd5961c7dfdeee2eab5662952ad7ad215513e93abe727a33f84b30bd181e SHA512 22e4f5848d62bd1fd55f4f054ea1293e223b3cd6f916bde2523eec10388e733623492c3a3246d61831e696dffdec5d000b95e9aa1217be6e38dd6459872166aa +DIST wasm-bindgen-futures-0.4.37.crate 15193 BLAKE2B 06844bb1ef1b492461e245ac16ed13024c7f3acedd0355aeab11b8e8f32d8b607c5642ac5a41432e72a7d3fc84b6c842929a6609b8e77d7482e273a561506ef8 SHA512 144d321ac7c9f55d94e8a0a6803c2994be763141a757f33c27513fac45b0193d4e4429c899bf1fad25039d56054a0fa381f0171df09c06260532cb06d5407448 +DIST wasm-bindgen-futures-0.4.42.crate 15380 BLAKE2B a20ba9f2bc814d7aac031f1cbaec90289f63893b76c60b536a65af85379771e102d6c3d949a8528328587ac776d7a3b684c12a217f9e186bf10046a1fcb34652 SHA512 0a77203499381b6bc4e9258480d7ef499d9c26b195baf38d0b7b228872f844d24c827cd57c8e2b0176927fd5957428084f53fe80cf60b35b7ba02d02b27a4682 +DIST wasm-bindgen-macro-0.2.87.crate 13897 BLAKE2B 0926975b0328cdd5525820358795b7b68b4ab9dc460715ed84e5d276e76e936057140efb1ba875acf25f3d2862e680f9827bd05cc47560d54f7ec673f30244cb SHA512 af366d8d853b280014cdf5286f3b1f6d7fb0837ce6e359a81cb6f85161537c8e2cd06d7f893c957f5bf1548d34084d33a213670b471937782b56033a23cb15a6 +DIST wasm-bindgen-macro-0.2.92.crate 13835 BLAKE2B 1f2202fdaeb78c32813eaf08b2fbd7aa9c469228386df71b8ffd81a46374e39a7104b79991f702505f9b7e97957fda8574517fbb03e3f9e93098c4d6e1e46be3 SHA512 78d2ddac88a9ca3ca5eef8a7af81cdf2366187a67d844e69f65f6893d1949f9723ab5f2be762c2217a5c21aee2f3dbc2d5d55ef0c9cbf0dec0d52d67a6ba7462 +DIST wasm-bindgen-macro-support-0.2.87.crate 20006 BLAKE2B d32dfc7231e4fbc226586e66063538208f9e299fbf803c4e2d1e1e61b4a22f51cc7509bdd269a44f072f9843a083ee84d2326408fb3211009ce93542c3fdc6ce SHA512 9390aa2767fed1027be168612c424d4c7cd4423addd83b79afd8c67886f66303ca4846e6454302ecc78b47bc62e8ee46849a4c0d3edb98849ce8476901424e33 +DIST wasm-bindgen-macro-support-0.2.92.crate 20092 BLAKE2B 8e274a4053e7afc680740e811c3941478caf5342e2206e3d28cdea9f9514bedbfa4f2b6bc608817306a1c455dd7134b7e17f0f04499f6bfb5302f29b041ac7ae SHA512 92543d2aad0b25798ec20e68832b823610c2c01401088cd9cac1684a86ddd1b567b3e2712acb862060f9c645a0df509b01d9834fd3e13cdaab97960f66d8daa7 +DIST wasm-bindgen-shared-0.2.87.crate 7248 BLAKE2B 0393ce9452119fd5f92836a76b28d3a697f91fb09de39d1af0a2a83e81d48bd4a17f39b48f15ae97edca3e361d4f8fedae8de04173c4ba1711decc73f64000d5 SHA512 cb9ff537554f56fd07052ddc4adc904a57ee64e13298df1dfca58b361ce163c34640e7dd9ed301ec1375f335dfa424230e22638ea7569ceb34aeca4505f6c008 +DIST wasm-bindgen-shared-0.2.92.crate 7263 BLAKE2B e54895486b9a31cc4651b7bb042059cc84421708346c06a9764315ebd4f440a1077520c7d325d6889a690b2c06aa185d40cede2dc4d061b363594cbde20fac31 SHA512 70e3a22731ed8aec428433bf30500eb3f62e3b7f4f1be34d8bb3b6f34f99690fc85d49eb413caecab807064494cfec64242c6a42709dffd638046e370bf86e07 +DIST web-sys-0.3.64.crate 725584 BLAKE2B f650eecc22ca53b75fff06c4117439d8fe9efa486701cb16a0daf76865cd017a9e25ed8c7ae1fc65fa2dd94a12c14bc2e6f9e837b70b47b4ca468bef65a29f82 SHA512 b02b0bc3f1354842b364d2f062ea4f5025edb6e615046750b56a6e2fcacef7e0b46a190eb45e14e590cf297e3ec1a813a81612ac5acfc12d744fe16c5ce041a4 +DIST web-sys-0.3.69.crate 728877 BLAKE2B 9f1678cbddb15f5a37331216a43785c72896f87e8ce62c6b9e69007316ca6eeaa7edbb33b9f2d9bf96c98de2a1e10afe491d8734657b186e2c3905ad1ff19ad9 SHA512 78b79ceb6a47485c766ad660bb8b971ba549424542a020c35c7db64a19f7b161617e464eaea0602f433b6ac4973b8d1a86a56e76dcda179ccea60aef1245347b +DIST which-4.4.2.crate 15953 BLAKE2B 40ca22cd2f625cb035a1d919ed457a300b482c7751dcee4441974c53d56ce13f1f502535e1f7c0746a01981f4de2e2f761c3a255902d6353db1a4c3c62637448 SHA512 2d12aa1d4c2dbc140e39c8f15bd4ee1eeb8e8de71bcdf579479ef4be860fb0839eaf4cdb818addba242d50420f6e08acaf2bfc979a889e092c83644819246fd5 +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 +DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-0.48.0.crate 11864177 BLAKE2B 39c0e4f058f68a829ee08721818a0b04287af20dfe6e03a125b75566b4c8a58b56557d685600f1f9c215811154f9782f12368d42848445d54dcf9bfd6471349d SHA512 7c906f885fa0a730f1cb1ef4e62f5b602a49d44343febe1d38fcd4cbc28e0342766983796042585fe457aa229333558715b6270e378946faa8f398a7ecc2af8c +DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36 +DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed +DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows-targets-0.52.4.crate 6310 BLAKE2B 0393bf3e7f8823edc455055e9977798bd6cdc1e523127cf840ee1b9e36febe40e01dcad9875a06aea283dd55443d02f643d42752103a5ec1de933285fe410b17 SHA512 4b2c26468df54b9801e6badd120dcffc15429fc78a614f45efa16d5fed1a36983198fbb621cc3beb4a4f9f0161ef8ddeca3a5c6a6ac48b5589681936f4d2bf50 +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_gnullvm-0.52.4.crate 433373 BLAKE2B 5678cf2371e4c566b7ff0dd1fabcae92d12ce9f97670524c93fd8c34bf6b09d054e7de2f852302b8d994f52c81015b7cc8a74f529490c7bdd17a3b5d2c88a12e SHA512 dbb914a866873892a8cffecd4ed4977fe6c3fc48a58bb9f88655d86e7f8969cc27e6f5bb7d40eee41ae7d78f6f4be65d46650719321a7697c7b5b99a0f07a5dd +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_aarch64_msvc-0.52.4.crate 828055 BLAKE2B 3088f2f66fc91ad698906315eae7e6c0dd7da5414c28cfa25b24e138fc4a7da40535be09129cd37b8e331d8d6e8c41d0106fba1ef9e5b4ac561140653e9ded4d SHA512 dcc538d0a9c276e7ec415575ec1392bf476219348984d9567f56d5cc7af0f9beeac523a9a6651f763dd4f50f89535a3ea2275d5321ec022c2ee8814e4e84e95b +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_gnu-0.52.4.crate 875736 BLAKE2B 31ee3017a6db246b0d5fc02e10cdb517a69ceac3dbbc9d41b4051f5dfa1196e4a46e7b3f5f90935560c03bb139b897e5dce69989a3698d9c88ebae923e24ef30 SHA512 9d57260744607eb63453040c532bf3693cf3d8d93c56543ee00aa66adf3a71919e72bdef7811f287167403ade893248f189b797a5d2dcb24ef4e6f3d915a88c6 +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_i686_msvc-0.52.4.crate 895530 BLAKE2B 87ec4628472beec8697317662fd599a8ea0ba5a11a0cad6b23f2481f39b3a4e0546d37fade4d715ad06a4798cf7faa6435bafa1e5054105c064cb560468b6025 SHA512 0d5526b21bfb96ab352b5181dcf84ff31007ce338245a374b3b413805239359a689b1a21de56ae998cc13444e40867bc30c4200454b84ef9ffa7117318baef1e +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnu-0.52.4.crate 831627 BLAKE2B 64d29f6e0837be822d89cc8aaea2514382d2c03b33deb5684df1d6b81573b3817add39d99f66181a762fae7c155e60a8c070affe43a0f2e247fb0c5ddcc7afd9 SHA512 96c673fb330af597fc3c71b53b9b66cacc9f3f64f05dc7cfe4a77447b7545280f065df22b7d91a6b7cf681a442d8b71c9d2dd128e76580664d8598c481cbb95e +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_gnullvm-0.52.4.crate 433358 BLAKE2B ffd55fba15ef713bd48caec5ed5f32936e05ac4897b721bd2b041229bc8c7beeca77ca018c3258dcdb09495629aa359d1dadaaf5112d38e7ea54670309d0ddf4 SHA512 f153d86b01e47f17ef08271b69becf7883bab92f96d40cdb1d74432f2bc6a7a65aa4ed931d8f6f4c2679e360bbd8d12037dc2a74a6a444fcaec5e4c784c54c74 +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1 +DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c +DIST winreg-0.50.0.crate 29703 BLAKE2B db9a968ef96cc07bc1088831affc4627e09c7ab8170a54fdf70a599c2d6180a8a9ac46b6304b61fdd2fac96e01bb004ebd8051940300c7b52c5b7b7975732d11 SHA512 2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787 +DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82 +DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d +DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756 +DIST zerotier-1.12.2.tar.gz 12431815 BLAKE2B c67889ce1f2479553382f43d581631686060218d187913931d92da751606246b72763a537fa936d462cdc7b6641ee2d2f4a753cd46398a1a4e6e8ac6a2e19f11 SHA512 75a698dc3755f18a9a8909a231f6d9667edfeb3140e3e4925ebe2e01d2172bd1ac8d1498439e0e9959343a4258bc7f3862d8e6a6eb4f03ebc77e02ef7c074e73 +DIST zerotier-1.14.0.tar.gz 12453099 BLAKE2B 63c7118bdc0cbb1d43fab38a8955067b1587e0a71ad2b25b70186c2636f119b5bc67e5f8e1c8aba95b5926a3e96bf278bb94e05632005176ce5fc8315b90b982 SHA512 ba268dd9773a07c0b0e2346a6316b69b3ba4c346bb3d36b20f0a491591f711d5ac40383c03b72c39b523c087348956deadde51406dd996c1418e12d996a25f7d diff --git a/net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch b/net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch index 802b1a873f58..c0dd5e900269 100644 --- a/net-misc/zerotier/files/zerotier-1.4.6-add-armv7a-support.patch +++ b/net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch @@ -1,6 +1,6 @@ ---- a/make-linux.mk 2019-09-05 11:02:16.000000000 -0700 -+++ b/make-linux.mk 2019-09-27 21:01:21.000000000 -0700 -@@ -195,6 +195,11 @@ +--- a/make-linux.mk ++++ b/make-linux.mk +@@ -203,6 +203,11 @@ ifeq ($(CC_MACH),armv7) override DEFS+=-DZT_NO_TYPE_PUNNING ZT_USE_ARM32_NEON_ASM_CRYPTO=1 endif diff --git a/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch b/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch new file mode 100644 index 000000000000..41a42197c17d --- /dev/null +++ b/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch @@ -0,0 +1,11 @@ +--- a/make-linux.mk ++++ b/make-linux.mk +@@ -70,7 +70,7 @@ else + override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS) + CXXFLAGS?=-O3 -fstack-protector + override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS) +- LDFLAGS=-pie -Wl,-z,relro,-z,now ++ LDFLAGS?=-pie -Wl,-z,relro,-z,now + RUSTFLAGS=--release + endif + diff --git a/net-misc/zerotier/files/zerotier-1.12.2-noexecstack.patch b/net-misc/zerotier/files/zerotier-1.12.2-noexecstack.patch new file mode 100644 index 000000000000..2888577d13ba --- /dev/null +++ b/net-misc/zerotier/files/zerotier-1.12.2-noexecstack.patch @@ -0,0 +1,24 @@ +https://github.com/zerotier/ZeroTierOne/pull/2161 + +From e171384c19bb0c0dfe0368e4f249dd6a30d33748 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Sun, 29 Oct 2023 13:48:07 +0200 +Subject: [PATCH] Append noexecstack to linker flags instead of assembler flags + +* Better compatibility with LLVM toolchain where clang -c doesn't + support the flag, but the linker does. LLD already defaults to + noexecstack, but adding it in the linker phase will avoid errors about + unsupported options. + +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- a/make-linux.mk ++++ b/make-linux.mk +@@ -358,7 +358,7 @@ override CFLAGS+=-fPIC -fPIE + override CXXFLAGS+=-fPIC -fPIE + + # Non-executable stack +-override ASFLAGS+=--noexecstack ++override LDFLAGS+=-Wl,-z,noexecstack + + .PHONY: all + all: one diff --git a/net-misc/zerotier/files/zerotier-1.14.0-respect-ldflags.patch b/net-misc/zerotier/files/zerotier-1.14.0-respect-ldflags.patch new file mode 100644 index 000000000000..12e00b598975 --- /dev/null +++ b/net-misc/zerotier/files/zerotier-1.14.0-respect-ldflags.patch @@ -0,0 +1,24 @@ +https://github.com/zerotier/ZeroTierOne/pull/2162 + +From 55485ad51e5de6a344f7dc7f352df1876fa747ea Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Sun, 29 Oct 2023 14:11:13 +0200 +Subject: [PATCH 1/2] Respect user LDFLAGS + +* Respect user LDFLAGS instead of replacing them. + +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- a/make-linux.mk ++++ b/make-linux.mk +@@ -71,7 +71,7 @@ else + override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS) + CXXFLAGS?=-O3 -fstack-protector + override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS) +- LDFLAGS=-pie -Wl,-z,relro,-z,now ++ LDFLAGS?=-pie -Wl,-z,relro,-z,now + ZT_CARGO_FLAGS=--release + endif + +-- +2.45.1 + diff --git a/net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch b/net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch deleted file mode 100644 index 46e24fd7a928..000000000000 --- a/net-misc/zerotier/files/zerotier-1.4.6-respect-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/make-linux.mk 2019-09-05 11:02:16.000000000 -0700 -+++ b/make-linux.mk 2019-09-27 21:01:21.000000000 -0700 -@@ -77,7 +77,7 @@ - override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS) - CXXFLAGS?=-O3 -fstack-protector -fPIE - override CXXFLAGS+=-Wall -Wno-deprecated -std=c++11 -pthread $(INCLUDES) -DNDEBUG $(DEFS) -- LDFLAGS=-pie -Wl,-z,relro,-z,now -+ LDFLAGS?=-pie -Wl,-z,relro,-z,now - STRIP?=strip - STRIP+=--strip-all - endif diff --git a/net-misc/zerotier/files/zerotier.init b/net-misc/zerotier/files/zerotier.init deleted file mode 100644 index f5f199e17d11..000000000000 --- a/net-misc/zerotier/files/zerotier.init +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run - -ZEROTIERONE_PIDFILE="/var/run/${SVCNAME}.pid" -PN="zerotier-one" -PN_PATH="/usr/sbin/${PN}" - -depend() { - need net -} - -start() { - ebegin "Starting ${PN}" - start-stop-daemon --start \ - --exec "${PN_PATH}" --make-pidfile --pidfile "${ZEROTIERONE_PIDFILE}" --background - eend $? -} - -stop() { - ebegin "Stopping ${PN}" - start-stop-daemon --stop --quiet --pidfile "${ZEROTIERONE_PIDFILE}" - eend $? -} diff --git a/net-misc/zerotier/metadata.xml b/net-misc/zerotier/metadata.xml index 3f46a5a3a1dd..8d51524c8d3c 100644 --- a/net-misc/zerotier/metadata.xml +++ b/net-misc/zerotier/metadata.xml @@ -1,12 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>parona@protonmail.com</email> + <name>Alfred Wingate</name> + </maintainer> + <maintainer type="person" proxied="proxy"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <changelog>https://github.com/zerotier/ZeroTierOne/raw/master/RELEASE-NOTES.md</changelog> <remote-id type="github">zerotier/ZeroTierOne</remote-id> </upstream> -<use> - <flag name="clang">Use Clang compiler instead of GCC</flag> -</use> + <use> + <flag name="sso">Enable support for Single sign-on through zeroidc</flag> + </use> </pkgmetadata> diff --git a/net-misc/zerotier/zerotier-1.12.2.ebuild b/net-misc/zerotier/zerotier-1.12.2.ebuild new file mode 100644 index 000000000000..d380ca84b14c --- /dev/null +++ b/net-misc/zerotier/zerotier-1.12.2.ebuild @@ -0,0 +1,289 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CARGO_OPTIONAL=1 + +CRATES=" + addr2line@0.20.0 + adler@1.0.2 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + ansi_term@0.12.1 + atty@0.2.14 + autocfg@1.1.0 + backtrace@0.3.68 + base64@0.13.1 + base64@0.21.2 + bitflags@1.3.2 + bitflags@2.4.0 + block-buffer@0.10.4 + bumpalo@3.13.0 + bytes@1.4.0 + cbindgen@0.20.0 + cc@1.0.82 + cfg-if@1.0.0 + chrono@0.4.26 + clap@2.34.0 + core-foundation-sys@0.8.4 + core-foundation@0.9.3 + cpufeatures@0.2.9 + crypto-common@0.1.6 + darling@0.13.4 + darling_core@0.13.4 + darling_macro@0.13.4 + deranged@0.3.7 + digest@0.10.7 + either@1.9.0 + encoding_rs@0.8.32 + errno-dragonfly@0.1.2 + errno@0.3.2 + fastrand@2.0.0 + fnv@1.0.7 + foreign-types-shared@0.1.1 + foreign-types@0.3.2 + form_urlencoded@1.2.0 + futures-channel@0.3.28 + futures-core@0.3.28 + futures-io@0.3.28 + futures-sink@0.3.28 + futures-task@0.3.28 + futures-util@0.3.28 + generic-array@0.14.7 + getrandom@0.2.10 + gimli@0.27.3 + h2@0.3.20 + hashbrown@0.12.3 + heck@0.3.3 + hermit-abi@0.1.19 + hermit-abi@0.3.2 + hmac@0.12.1 + http-body@0.4.5 + http@0.2.9 + httparse@1.8.0 + httpdate@1.0.3 + hyper-tls@0.5.0 + hyper@0.14.27 + iana-time-zone-haiku@0.1.2 + iana-time-zone@0.1.57 + ident_case@1.0.1 + idna@0.4.0 + indexmap@1.9.3 + ipnet@2.8.0 + itertools@0.10.5 + itoa@1.0.9 + js-sys@0.3.64 + lazy_static@1.4.0 + libc@0.2.147 + linux-raw-sys@0.4.5 + log@0.4.20 + memchr@2.5.0 + mime@0.3.17 + miniz_oxide@0.7.1 + mio@0.8.8 + native-tls@0.2.11 + num-bigint@0.4.3 + num-integer@0.1.45 + num-traits@0.2.16 + num_cpus@1.16.0 + oauth2@4.4.1 + object@0.31.1 + once_cell@1.18.0 + openidconnect@2.5.1 + openssl-macros@0.1.1 + openssl-probe@0.1.5 + openssl-sys@0.9.91 + openssl@0.10.56 + ordered-float@2.10.0 + percent-encoding@2.3.0 + pin-project-lite@0.2.12 + pin-utils@0.1.0 + pkg-config@0.3.27 + ppv-lite86@0.2.17 + proc-macro2@1.0.66 + quote@1.0.33 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + redox_syscall@0.3.5 + reqwest@0.11.18 + ring@0.16.20 + rustc-demangle@0.1.23 + rustix@0.38.8 + ryu@1.0.15 + schannel@0.1.22 + security-framework-sys@2.9.1 + security-framework@2.9.2 + serde-value@0.7.0 + serde@1.0.183 + serde_derive@1.0.183 + serde_json@1.0.105 + serde_path_to_error@0.1.14 + serde_plain@1.0.1 + serde_urlencoded@0.7.1 + serde_with@1.14.0 + serde_with_macros@1.5.2 + sha2@0.10.7 + slab@0.4.8 + socket2@0.4.9 + socket2@0.5.3 + spin@0.5.2 + strsim@0.10.0 + strsim@0.8.0 + subtle@2.5.0 + syn@1.0.109 + syn@2.0.29 + tempfile@3.7.1 + textwrap@0.11.0 + thiserror-impl@1.0.47 + thiserror@1.0.47 + time-core@0.1.1 + time-macros@0.2.11 + time@0.3.25 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio-native-tls@0.3.1 + tokio-util@0.7.8 + tokio@1.32.0 + toml@0.5.11 + tower-service@0.3.2 + tracing-core@0.1.31 + tracing@0.1.37 + try-lock@0.2.4 + typenum@1.16.0 + unicode-bidi@0.3.13 + unicode-ident@1.0.11 + unicode-normalization@0.1.22 + unicode-segmentation@1.10.1 + unicode-width@0.1.10 + untrusted@0.7.1 + url@2.4.0 + vcpkg@0.2.15 + vec_map@0.8.2 + version_check@0.9.4 + want@0.3.1 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.87 + wasm-bindgen-futures@0.4.37 + wasm-bindgen-macro-support@0.2.87 + wasm-bindgen-macro@0.2.87 + wasm-bindgen-shared@0.2.87 + wasm-bindgen@0.2.87 + web-sys@0.3.64 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows@0.48.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 + winreg@0.10.1 +" + +declare -A GIT_CRATES=( + [jwt]='https://github.com/glimberg/rust-jwt;61a9291fdeec747c6edf14f4fa0caf235136c168;rust-jwt-%commit%' +) + +inherit cargo systemd toolchain-funcs + +DESCRIPTION="A software-based managed Ethernet switch for planet Earth" +HOMEPAGE="https://www.zerotier.com/" +SRC_URI=" + https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz + sso? ( + ${CARGO_CRATE_URIS} + ) +" +S="${WORKDIR}"/ZeroTierOne-${PV} + +LICENSE="BUSL-1.1" +# Crate licenses +LICENSE+=" sso? ( Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016 )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +IUSE="cpu_flags_arm_neon debug sso" + +RDEPEND=" + dev-libs/openssl:= + net-libs/libnatpmp + >=net-libs/miniupnpc-2:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + sso? ( + virtual/rust + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.1-respect-ldflags.patch + "${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch + "${FILESDIR}"/${PN}-1.12.2-noexecstack.patch +) + +DOCS=( README.md AUTHORS.md ) + +src_unpack() { + unpack ${P}.tar.gz + use sso && cargo_src_unpack +} + +src_prepare() { + default + + #1. Dont call cargo, we'll run it with cargo eclass functions + #2. Remove man page compression and install, we'll handle it with ebuild functions + sed -i \ + -e '/ifeq ($(ZT_SSO_SUPPORTED)/,/endif/ { /cargo build/d }' \ + -e '/install:/,/^$/ { /man[0-9]/d }' \ + make-linux.mk || die +} + +src_configure() { + tc-export CXX CC + + use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1 + + use sso && cargo_src_configure +} + +src_compile() { + myemakeargs=( + CXX="${CXX}" + STRIP=: + + # Debug doesnt do more than add preprocessor arguments normally, + # but when rust is used it sets the correct rust directory to link against. + # It would be added by cargo eclass eitherway, so instead of adding REQUIRED_USE + # and patching the makefile its just easier to have it. + ZT_DEBUG="$(usex debug 1 0)" + ZT_SSO_SUPPORTED="$(usex sso 1 0)" + ) + + pushd zeroidc > /dev/null || die + use sso && cargo_src_compile + popd > /dev/null || die + + emake "${myemakeargs[@]}" one +} + +src_test() { + emake "${myemakeargs[@]}" selftest + ./zerotier-selftest || die +} + +src_install() { + default + + newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" + systemd_dounit "${FILESDIR}/${PN}".service + + doman doc/zerotier-{cli.1,idtool.1,one.8} +} diff --git a/net-misc/zerotier/zerotier-1.14.0.ebuild b/net-misc/zerotier/zerotier-1.14.0.ebuild new file mode 100644 index 000000000000..8a00c6b94532 --- /dev/null +++ b/net-misc/zerotier/zerotier-1.14.0.ebuild @@ -0,0 +1,463 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CARGO_OPTIONAL=1 + +CRATES=" + addr2line@0.21.0 + adler@1.0.2 + ahash@0.8.11 + aho-corasick@1.1.2 + allocator-api2@0.2.16 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + ansi_term@0.12.1 + anstyle@1.0.6 + anyhow@1.0.81 + async-stream-impl@0.3.5 + async-stream@0.3.5 + async-trait@0.1.78 + atty@0.2.14 + autocfg@1.1.0 + axum-core@0.3.4 + axum@0.6.20 + backoff@0.4.0 + backtrace@0.3.69 + base16ct@0.2.0 + base64@0.13.1 + base64@0.21.7 + base64ct@1.6.0 + bitflags@1.3.2 + bitflags@2.5.0 + block-buffer@0.10.4 + bumpalo@3.15.4 + byteorder@1.5.0 + bytes@1.5.0 + cbindgen@0.20.0 + cc@1.0.90 + cfg-if@1.0.0 + chrono@0.4.35 + clap@2.34.0 + const-oid@0.9.6 + convert_case@0.4.0 + core-foundation-sys@0.8.6 + core-foundation@0.9.4 + cpufeatures@0.2.12 + crossbeam-channel@0.5.12 + crossbeam-queue@0.3.11 + crossbeam-utils@0.8.19 + crypto-bigint@0.5.5 + crypto-common@0.1.6 + curve25519-dalek-derive@0.1.1 + curve25519-dalek@4.1.2 + darling@0.20.8 + darling_core@0.20.8 + darling_macro@0.20.8 + dashmap@5.5.3 + der@0.7.8 + deranged@0.3.11 + derive_builder@0.20.0 + derive_builder_core@0.20.0 + derive_builder_macro@0.20.0 + derive_more@0.99.17 + digest@0.10.7 + downcast@0.11.0 + dyn-clone@1.0.17 + ecdsa@0.16.9 + ed25519-dalek@2.1.1 + ed25519@2.2.3 + either@1.10.0 + elliptic-curve@0.13.8 + encoding_rs@0.8.33 + enum-iterator-derive@1.3.0 + enum-iterator@2.0.0 + enum_dispatch@0.3.12 + equivalent@1.0.1 + erased-serde@0.4.4 + errno@0.3.8 + fastrand@2.0.1 + ff@0.13.0 + fiat-crypto@0.2.6 + fixedbitset@0.4.2 + fnv@1.0.7 + foreign-types-shared@0.1.1 + foreign-types@0.3.2 + form_urlencoded@1.2.1 + fragile@2.0.0 + futures-channel@0.3.30 + futures-core@0.3.30 + futures-executor@0.3.30 + futures-io@0.3.30 + futures-macro@0.3.30 + futures-retry@0.6.0 + futures-sink@0.3.30 + futures-task@0.3.30 + futures-timer@3.0.3 + futures-util@0.3.30 + futures@0.3.30 + generic-array@0.14.7 + getrandom@0.2.12 + gimli@0.28.1 + governor@0.6.3 + group@0.13.0 + h2@0.3.25 + hashbrown@0.12.3 + hashbrown@0.14.3 + heck@0.3.3 + heck@0.4.1 + hermit-abi@0.1.19 + hermit-abi@0.3.9 + hex@0.4.3 + hkdf@0.12.4 + hmac@0.12.1 + home@0.5.9 + http-body@0.4.6 + http@0.2.12 + httparse@1.8.0 + httpdate@1.0.3 + hyper-timeout@0.4.1 + hyper-tls@0.5.0 + hyper@0.14.28 + iana-time-zone-haiku@0.1.2 + iana-time-zone@0.1.60 + ident_case@1.0.1 + idna@0.5.0 + indexmap@1.9.3 + indexmap@2.2.5 + instant@0.1.12 + inventory@0.3.15 + ipnet@2.9.0 + itertools@0.10.5 + itertools@0.11.0 + itertools@0.12.1 + itoa@1.0.10 + js-sys@0.3.69 + lazy_static@1.4.0 + libc@0.2.153 + libm@0.2.8 + linux-raw-sys@0.4.13 + lock_api@0.4.11 + log@0.4.21 + lru@0.12.3 + matchers@0.1.0 + matchit@0.7.3 + memchr@2.7.1 + mime@0.3.17 + miniz_oxide@0.7.2 + mio@0.8.11 + mockall@0.12.1 + mockall_derive@0.12.1 + multimap@0.8.3 + native-tls@0.2.11 + no-std-compat@0.4.1 + nonzero_ext@0.3.0 + nu-ansi-term@0.46.0 + num-bigint-dig@0.8.4 + num-conv@0.1.0 + num-integer@0.1.46 + num-iter@0.1.44 + num-traits@0.2.18 + num_cpus@1.16.0 + oauth2@4.4.2 + object@0.32.2 + once_cell@1.19.0 + openidconnect@3.5.0 + openssl-macros@0.1.1 + openssl-probe@0.1.5 + openssl-sys@0.9.101 + openssl@0.10.64 + opentelemetry@0.22.0 + ordered-float@2.10.1 + overload@0.1.1 + p256@0.13.2 + p384@0.13.0 + parking_lot@0.12.1 + parking_lot_core@0.9.9 + pem-rfc7468@0.7.0 + percent-encoding@2.3.1 + petgraph@0.6.4 + pin-project-internal@1.1.5 + pin-project-lite@0.2.13 + pin-project@1.1.5 + pin-utils@0.1.0 + pkcs1@0.7.5 + pkcs8@0.10.2 + pkg-config@0.3.30 + platforms@3.3.0 + portable-atomic@1.6.0 + powerfmt@0.2.0 + ppv-lite86@0.2.17 + predicates-core@1.0.6 + predicates-tree@1.0.9 + predicates@3.1.0 + prettyplease@0.2.16 + primeorder@0.13.6 + proc-macro2@1.0.79 + prometheus@0.13.3 + prost-build@0.12.3 + prost-derive@0.12.3 + prost-types@0.12.3 + prost-wkt-build@0.5.0 + prost-wkt-types@0.5.0 + prost-wkt@0.5.0 + prost@0.12.3 + protobuf@2.28.0 + quanta@0.12.2 + quote@1.0.35 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + raw-cpuid@11.0.1 + redox_syscall@0.4.1 + regex-automata@0.1.10 + regex-automata@0.4.6 + regex-syntax@0.6.29 + regex-syntax@0.8.2 + regex@1.10.3 + reqwest@0.11.26 + rfc6979@0.4.0 + ring@0.17.8 + ringbuf@0.3.3 + rsa@0.9.6 + rustc-demangle@0.1.23 + rustc_version@0.4.0 + rustix@0.38.31 + rustls-native-certs@0.7.0 + rustls-pemfile@1.0.4 + rustls-pemfile@2.1.1 + rustls-pki-types@1.3.1 + rustls-webpki@0.102.2 + rustls@0.22.2 + rustversion@1.0.14 + ryu@1.0.17 + schannel@0.1.23 + scopeguard@1.2.0 + sec1@0.7.3 + security-framework-sys@2.9.1 + security-framework@2.9.2 + semver@1.0.22 + serde-value@0.7.0 + serde@1.0.197 + serde_derive@1.0.197 + serde_json@1.0.114 + serde_path_to_error@0.1.16 + serde_plain@1.0.2 + serde_urlencoded@0.7.1 + serde_with@3.7.0 + serde_with_macros@3.7.0 + sha2@0.10.8 + sharded-slab@0.1.7 + signal-hook-registry@1.4.1 + signature@2.2.0 + siphasher@1.0.1 + slab@0.4.9 + slotmap@1.0.7 + smallvec@1.13.1 + socket2@0.5.6 + spin@0.5.2 + spin@0.9.8 + spinning_top@0.3.0 + spki@0.7.3 + strsim@0.10.0 + strsim@0.8.0 + subtle@2.5.0 + syn@1.0.109 + syn@2.0.53 + sync_wrapper@0.1.2 + system-configuration-sys@0.5.0 + system-configuration@0.5.1 + tempfile@3.10.1 + termtree@0.4.1 + textwrap@0.11.0 + thiserror-impl@1.0.58 + thiserror@1.0.58 + thread_local@1.1.8 + time-core@0.1.2 + time-macros@0.2.17 + time@0.3.34 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio-io-timeout@1.2.0 + tokio-macros@2.2.0 + tokio-native-tls@0.3.1 + tokio-rustls@0.25.0 + tokio-stream@0.1.15 + tokio-util@0.7.10 + tokio@1.36.0 + toml@0.5.11 + tonic-build@0.11.0 + tonic@0.11.0 + tower-layer@0.3.2 + tower-service@0.3.2 + tower@0.4.13 + tracing-attributes@0.1.27 + tracing-core@0.1.32 + tracing-log@0.2.0 + tracing-subscriber@0.3.18 + tracing@0.1.40 + try-lock@0.2.5 + typenum@1.17.0 + typetag-impl@0.2.16 + typetag@0.2.16 + unicode-bidi@0.3.15 + unicode-ident@1.0.12 + unicode-normalization@0.1.23 + unicode-segmentation@1.11.0 + unicode-width@0.1.11 + untrusted@0.9.0 + url@2.5.0 + urlencoding@2.1.3 + uuid@1.8.0 + valuable@0.1.0 + vcpkg@0.2.15 + vec_map@0.8.2 + version_check@0.9.4 + want@0.3.1 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.92 + wasm-bindgen-futures@0.4.42 + wasm-bindgen-macro-support@0.2.92 + wasm-bindgen-macro@0.2.92 + wasm-bindgen-shared@0.2.92 + wasm-bindgen@0.2.92 + web-sys@0.3.69 + which@4.4.2 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-core@0.52.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.4 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.4 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.4 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.4 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.4 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.4 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.4 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.4 + winreg@0.50.0 + zerocopy-derive@0.7.32 + zerocopy@0.7.32 + zeroize@1.7.0 +" + +declare -A GIT_CRATES=( + [jwt]='https://github.com/glimberg/rust-jwt;61a9291fdeec747c6edf14f4fa0caf235136c168;rust-jwt-%commit%' + [rustfsm]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/fsm' + [rustfsm_procmacro]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/fsm/rustfsm_procmacro' + [rustfsm_trait]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/fsm/rustfsm_trait' + [temporal-client]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/client' + [temporal-sdk-core-api]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/core-api' + [temporal-sdk-core-protos]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/sdk-core-protos' + [temporal-sdk-core]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/core' + [temporal-sdk]='https://github.com/temporalio/sdk-core;4840a9c570fa3388e190e20f01f61065d0b7e965;sdk-core-%commit%/sdk' +) + +inherit cargo systemd toolchain-funcs + +DESCRIPTION="A software-based managed Ethernet switch for planet Earth" +HOMEPAGE="https://www.zerotier.com/" +SRC_URI=" + https://github.com/zerotier/ZeroTierOne/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + sso? ( + ${CARGO_CRATE_URIS} + ) +" +S="${WORKDIR}"/ZeroTierOne-${PV} + +LICENSE="BUSL-1.1" +# Crate licenses +LICENSE+=" sso? ( Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +IUSE="cpu_flags_arm_neon debug sso" + +RDEPEND=" + dev-libs/openssl:= + net-libs/libnatpmp + >=net-libs/miniupnpc-2:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + sso? ( + virtual/rust + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.14.0-respect-ldflags.patch + "${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch + "${FILESDIR}"/${PN}-1.12.2-noexecstack.patch +) + +DOCS=( README.md AUTHORS.md ) + +src_unpack() { + unpack ${P}.tar.gz + use sso && cargo_src_unpack +} + +src_prepare() { + default + + #1. Dont call cargo, we'll run it with cargo eclass functions + #2. Remove man page compression and install, we'll handle it with ebuild functions + sed -i \ + -e '/ifeq ($(ZT_SSO_SUPPORTED)/,/endif/ { /cargo build/d }' \ + -e '/install:/,/^$/ { /man[0-9]/d }' \ + make-linux.mk || die +} + +src_configure() { + tc-export CXX CC + + use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1 + + use sso && cargo_src_configure +} + +src_compile() { + #TODO: New rusty bit smeeclient isnt built + myemakeargs=( + CXX="${CXX}" + STRIP=: + + # Debug doesnt do more than add preprocessor arguments normally, + # but when rust is used it sets the correct rust directory to link against. + # It would be added by cargo eclass eitherway, so instead of adding REQUIRED_USE + # and patching the makefile its just easier to have it. + ZT_DEBUG="$(usex debug 1 0)" + ZT_SSO_SUPPORTED="$(usex sso 1 0)" + ) + + pushd rustybits/zeroidc > /dev/null || die + use sso && cargo_src_compile + popd > /dev/null || die + + emake "${myemakeargs[@]}" one +} + +src_test() { + emake "${myemakeargs[@]}" selftest + ./zerotier-selftest || die +} + +src_install() { + default + + newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" + systemd_dounit "${FILESDIR}/${PN}".service + + doman doc/zerotier-{cli.1,idtool.1,one.8} +} diff --git a/net-misc/zerotier/zerotier-1.6.3.ebuild b/net-misc/zerotier/zerotier-1.6.3.ebuild deleted file mode 100644 index fc017b010fc9..000000000000 --- a/net-misc/zerotier/zerotier-1.6.3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic llvm systemd toolchain-funcs - -HOMEPAGE="https://www.zerotier.com/" -DESCRIPTION="A software-based managed Ethernet switch for planet Earth" -SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="clang cpu_flags_arm_neon" - -S="${WORKDIR}/ZeroTierOne-${PV}" - -RDEPEND=" - dev-libs/json-glib - net-libs/libnatpmp - net-libs/miniupnpc:= - clang? ( >=sys-devel/clang-6:* )" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.6-respect-ldflags.patch" - "${FILESDIR}/${PN}-1.4.6-add-armv7a-support.patch" -) - -DOCS=( README.md AUTHORS.md ) - -LLVM_MAX_SLOT=11 - -llvm_check_deps() { - if use clang ; then - if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then - ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." - return 1 - fi - - if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then - ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." - return 1 - fi - - einfo "Will use LLVM slot ${LLVM_SLOT}!" - fi -} - -pkg_setup() { - if use clang && ! tc-is-clang ; then - export CC=${CHOST}-clang - export CXX=${CHOST}-clang++ - else - tc-export CXX CC - fi - use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1 -} - -src_compile() { - append-ldflags -Wl,-z,noexecstack - emake CXX="${CXX}" STRIP=: one -} - -src_test() { - emake selftest - ./zerotier-selftest || die -} - -src_install() { - default - # remove pre-zipped man pages - rm "${ED}"/usr/share/man/{man1,man8}/* || die - - newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" - systemd_dounit "${FILESDIR}/${PN}".service - doman doc/zerotier-{cli.1,idtool.1,one.8} -} diff --git a/net-misc/zerotier/zerotier-1.6.4.ebuild b/net-misc/zerotier/zerotier-1.6.4.ebuild deleted file mode 100644 index fc017b010fc9..000000000000 --- a/net-misc/zerotier/zerotier-1.6.4.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic llvm systemd toolchain-funcs - -HOMEPAGE="https://www.zerotier.com/" -DESCRIPTION="A software-based managed Ethernet switch for planet Earth" -SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="clang cpu_flags_arm_neon" - -S="${WORKDIR}/ZeroTierOne-${PV}" - -RDEPEND=" - dev-libs/json-glib - net-libs/libnatpmp - net-libs/miniupnpc:= - clang? ( >=sys-devel/clang-6:* )" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.6-respect-ldflags.patch" - "${FILESDIR}/${PN}-1.4.6-add-armv7a-support.patch" -) - -DOCS=( README.md AUTHORS.md ) - -LLVM_MAX_SLOT=11 - -llvm_check_deps() { - if use clang ; then - if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then - ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." - return 1 - fi - - if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then - ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." - return 1 - fi - - einfo "Will use LLVM slot ${LLVM_SLOT}!" - fi -} - -pkg_setup() { - if use clang && ! tc-is-clang ; then - export CC=${CHOST}-clang - export CXX=${CHOST}-clang++ - else - tc-export CXX CC - fi - use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1 -} - -src_compile() { - append-ldflags -Wl,-z,noexecstack - emake CXX="${CXX}" STRIP=: one -} - -src_test() { - emake selftest - ./zerotier-selftest || die -} - -src_install() { - default - # remove pre-zipped man pages - rm "${ED}"/usr/share/man/{man1,man8}/* || die - - newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" - systemd_dounit "${FILESDIR}/${PN}".service - doman doc/zerotier-{cli.1,idtool.1,one.8} -} diff --git a/net-misc/zssh/metadata.xml b/net-misc/zssh/metadata.xml index c9dd8c72e52c..dc1330571b5a 100644 --- a/net-misc/zssh/metadata.xml +++ b/net-misc/zssh/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">zssh</remote-id> </upstream> diff --git a/net-misc/zssh/zssh-1.5c-r1.ebuild b/net-misc/zssh/zssh-1.5c-r2.ebuild index 352fa1c3cebc..3d3cfc636134 100644 --- a/net-misc/zssh/zssh-1.5c-r1.ebuild +++ b/net-misc/zssh/zssh-1.5c-r2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit toolchain-funcs -DESCRIPTION="An ssh wrapper enabling zmodem up/download in ssh" -HOMEPAGE="http://zssh.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +DESCRIPTION="SSH wrapper enabling zmodem up/download in ssh" +HOMEPAGE="https://zssh.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" @@ -19,8 +19,8 @@ DEPEND="readline? ( sys-libs/readline:0 )" RDEPEND="${DEPEND} - net-misc/openssh - net-dialup/lrzsz" + net-dialup/lrzsz + virtual/openssh" src_prepare() { eapply "${FILESDIR}/${PN}-1.5a-gentoo-include.diff" diff --git a/net-misc/zsync/files/zsync-0.6.2-musl-off_t-fix.patch b/net-misc/zsync/files/zsync-0.6.2-musl-off_t-fix.patch new file mode 100644 index 000000000000..277f23b425cc --- /dev/null +++ b/net-misc/zsync/files/zsync-0.6.2-musl-off_t-fix.patch @@ -0,0 +1,16 @@ +diff --git a/libzsync/sha1.h b/libzsync/sha1.h +index 3946505..8840570 100644 +--- a/libzsync/sha1.h ++++ b/libzsync/sha1.h +@@ -11,9 +11,10 @@ + + #include "config.h" + +-#ifdef HAVE_INTTYPES_H ++#if defined(HAVE_INTTYPES_H) && defined(__GLIBC__) + #include <inttypes.h> + #else ++#include <stdint.h> + #include <sys/types.h> + #endif + diff --git a/net-misc/zsync/metadata.xml b/net-misc/zsync/metadata.xml index 9a154a2d05a2..c14c57dad630 100644 --- a/net-misc/zsync/metadata.xml +++ b/net-misc/zsync/metadata.xml @@ -22,4 +22,7 @@ anyone can download the file, make a .zsync and provide it to other users (this is what I am doing for the moment)." </longdescription> + <upstream> + <remote-id type="github">cph6/zsync</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/zsync/zsync-0.6.2-r2.ebuild b/net-misc/zsync/zsync-0.6.2-r2.ebuild index c99fa2fdbb5d..1c720f6dd78f 100644 --- a/net-misc/zsync/zsync-0.6.2-r2.ebuild +++ b/net-misc/zsync/zsync-0.6.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit autotools ZLIB_PV=1.2.3 ZLIB_P="zlib-${ZLIB_PV}" -DESCRIPTION="Partial/differential file download client over HTTP which uses the rsync algorithm" +DESCRIPTION="Partial/differential file download client over HTTP using the rsync algorithm" HOMEPAGE="http://zsync.moria.org.uk/" SRC_URI=" http://zsync.moria.org.uk/download/${P}.tar.bz2 diff --git a/net-misc/zsync/zsync-0.6.2-r3.ebuild b/net-misc/zsync/zsync-0.6.2-r3.ebuild new file mode 100644 index 000000000000..08e57393fa50 --- /dev/null +++ b/net-misc/zsync/zsync-0.6.2-r3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +ZLIB_PV=1.2.3 +ZLIB_P="zlib-${ZLIB_PV}" + +DESCRIPTION="Partial/differential file download client over HTTP using the rsync algorithm" +HOMEPAGE="http://zsync.moria.org.uk/" +SRC_URI=" + http://zsync.moria.org.uk/download/${P}.tar.bz2 + http://www.gzip.org/zlib/${ZLIB_P}.tar.bz2 + http://www.zlib.net/${ZLIB_P}.tar.bz2" +ZLIB_S="${WORKDIR}/${ZLIB_P}" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.2-musl-off_t-fix.patch +) + +src_prepare() { + default + # Move old zlib-1.2.11 out the way + mv "${S}"/zlib zlib-1.2.11-modified || die + + cd "${ZLIB_S}" || die + # I am not sure how many other zlib patches we will need to port as well + # This covers the security vuln in 1.2.11 + eapply "${FILESDIR}"/${P}-${ZLIB_P}-support.patch + rm Makefile || die + + cd "${S}" || die + cp -a "${ZLIB_S}" "${ZLIB_P}-modified" || die + ln -s "${ZLIB_P}-modified" zlib || die + + eautoreconf +} + +src_install() { + dobin zsync zsyncmake + dodoc NEWS README + doman doc/zsync.1 doc/zsyncmake.1 +} |