diff options
Diffstat (limited to 'net-misc')
126 files changed, 2785 insertions, 4659 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex 0b9dbef2826e..be82a0aac662 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest index 9a34ec776281..568a54b3b1c4 100644 --- a/net-misc/anydesk/Manifest +++ b/net-misc/anydesk/Manifest @@ -7,7 +7,9 @@ DIST anydesk-6.0.0-amd64.tar.gz 5195378 BLAKE2B b967e063cff609ff9a93f3946c6f5559 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 EBUILD anydesk-5.5.6-r1.ebuild 2669 BLAKE2B e180bd3ceeec590b6fb302f4ea99ca8abe3a87151cbb6c07a67c460e05f0fc553661b8570caaba52843c4370840655b25f8441c7f220e6264e3a3055350da4a7 SHA512 0ddeb37637e097570c3bc8a3dbbc5fd523ba4c5ee1fa389ddc50c2c834a605c22b86d0d67c259301e04148bee83134457e11c5c6de61f6ded680df53f8a6975e EBUILD anydesk-6.0.0-r1.ebuild 2669 BLAKE2B e180bd3ceeec590b6fb302f4ea99ca8abe3a87151cbb6c07a67c460e05f0fc553661b8570caaba52843c4370840655b25f8441c7f220e6264e3a3055350da4a7 SHA512 0ddeb37637e097570c3bc8a3dbbc5fd523ba4c5ee1fa389ddc50c2c834a605c22b86d0d67c259301e04148bee83134457e11c5c6de61f6ded680df53f8a6975e EBUILD anydesk-6.0.1.ebuild 2675 BLAKE2B 0a7b6b11007f1418533cb5c601f5e5b190135864e58ac1df87861c8e2974050eb53705f61629f301fe83a18f229da6053e2a2ffbf5a88e612716fc7bc82f23bc SHA512 d1f13baff3bdf48ad72f47c29d3a756fc94a6537eccd3fe3a708275ef68147a88051350d1ac9e18946e6f04c0121eea4d123f42455e85402306b78e7d10dec8b +EBUILD anydesk-6.1.0.ebuild 2522 BLAKE2B aaf29b49fce8c4d87599bb3323c7a17bbf11e2dcbfa2b980c197f72ba9d37a0d2519ec5c5626a3753b06a24fe1e7ee14472cae6617612e6a50331761cda9c2b6 SHA512 5c90f3171110e77bf846e9774b63bdbba783fbae7a7a7401c516ede2b0fb5f99ed003c6c4e262b8cdfab22ab0ea341d78c0f03f84cc554abb3a037ab90a5c321 MISC metadata.xml 677 BLAKE2B f5b86851aaa83fc0f0a22739416e5d6fa06e4f8bdd14ed33660219774e1179a9df5e08440e99a3b75f156b72835a6a2c9742ba176828ac6caea9f7d564ebca87 SHA512 824b2ba8de1e03f3089a248226612505b2d0e172443fadc488a45d8f5a4eaa26e8acb8c67f27476dc0d7d8dd8de25950a87225f8495cd1b38c573308c3d1fc3c diff --git a/net-misc/anydesk/anydesk-6.1.0.ebuild b/net-misc/anydesk/anydesk-6.1.0.ebuild new file mode 100644 index 000000000000..84f711fbaf94 --- /dev/null +++ b/net-misc/anydesk/anydesk-6.1.0.ebuild @@ -0,0 +1,112 @@ +# 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 + + elog "For querying information about the host PC AnyDesk calls" + elog "the following commands. Feel free to install them, but it" + elog "should run without as well." + elog + 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/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest index 6bbaabb72816..a25486a436ef 100644 --- a/net-misc/apt-cacher-ng/Manifest +++ b/net-misc/apt-cacher-ng/Manifest @@ -1,12 +1,12 @@ AUX apt-cacher-ng-3.3.1-flags.patch 340 BLAKE2B e9de81bc2a73a24c99fc7f3509d5e94e148e5ec1c4c672c28428aec398344a37b180084f26f7050fc39a92942ffb2a743b87e13dda7b21d9085516c7847e29f7 SHA512 f57cf0f6d74f1326feb2796a92ed22c6e19dcfed923f6c3a130ca82e0a0abd3c7e629ca29eb1512aefd2500e2da75cdffbd32d53c727a1be52ea3d4664f4cceb AUX apt-cacher-ng-3.5-perl-syntax.patch 365 BLAKE2B db71cf58c61ef6192f0d2955f64dbbe89ea580c4dbdd6cabc150f5cdebbf383f916dcfc1379e0caa1792be7dbda18898e71fc7a4f1829ae77160dc4a9ca83a74 SHA512 fe933eac743b13974cd7451f9a8fcbd32d6f779b992aaa07526eb291eeb64dbd48050ec08ae141fee55df2f1c415799073a78236c6fa10d5eb12733e2919ca16 AUX apt-cacher-ng-9999999-flags.patch 660 BLAKE2B 64c1e8ef41841daf8e13b1cc9a0a2fe8839200eb37663069c52e1a2e2ae1f454ed98d802b7dfa6df95c9f3f113badfbf6bc07f3e9aa9b8925e88c87c8a3af9ee SHA512 fb3332380708ec37179de9493193e8c674e38fbd38af00098572fbe1b66184e5c3358640a8f56d8e336582b496e3d0d924761a3dffdc397e98903beb90efa8de -AUX confd-r1 100 BLAKE2B e5f0e9ca77d9d3b30a0a59a755e286a914d1ed81a2afd47ed0fd2563eca81ec9db8e50aa9d34c9e31b1014ecf2db7e85cb055d7a67af494bf88c2ec9b9c13465 SHA512 c58ecc104ab7fa90cbccc1d9f9725c9ddad84bb7225ea3eea56d7874b060ce453e4576ca055e014b9621b9514d95a189915fead2057557fb785d9520d7121831 +AUX confd-r2 452 BLAKE2B 36175fbb8305e43139e0a30aca1840c184972e0c1fe61189634ff38184b905d6ecd372bfa8e13b52babba18da0c8f364a6ba66890d6de96ce6970c7c8ff3b2d2 SHA512 4a7cd8ee8125def9290d2e7a369f76308bcf8faf22eb908c974cedb7206d1d02417636cc14ccec9047bd25d7f4fd0d245189353cb2b0266f8c8122e019460666 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a -AUX initd-r2 1003 BLAKE2B f8e87da524cb10358420de9bc7e76d5b954cdfa70ba54637ca0b4653c1f718eebe77bbc3220003691d7163374f3af0aa4ca8568b76218d7214e2e498c2998f79 SHA512 f57c58074bbe1c35b748f94bf2a8a4aa10f8264e662b61c1178582f16f5e53c38941e9b2c2c0a46718ab8615ff426a887f64fe170da42b7aaaa9bb3c23a0fc00 +AUX initd-r3 599 BLAKE2B aee4ad69c9aa213ce00062b073c3c02a1f29b96aaa0b2b4573f009846be1f5b0f1bb53089f14c399b6accb73937545820eef5b84a765ed8fff26e79ac543bcfd SHA512 37ea0bc22347afad9e64e038c14552a4609fa95f3c4a4dd0a3938cada1545940f1c76114cf1a46cea41ce4cf524f9e6a2499d7a7770507c20bcb726b8ee9515f AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885 -DIST apt-cacher-ng_3.5-1.debian.tar.xz 49916 BLAKE2B c01c96e5cf46fa3b8c46145b34976f3c4a3b545819719a8de517fe53a91d6f65c460bee59d98de750912d7bb9e3416804a088bdf274d74352c35f757cdeb16ea SHA512 8a543f94ef5e206be40070eb757c950ad6915cfbd6cacfadb5bd91070d14b4bb1c3c550823cd088c15335963587cc34d414518ae0013f6561996f855ccf97359 +DIST apt-cacher-ng_3.5-3.debian.tar.xz 49708 BLAKE2B 85092374207a252dcb4ef7b95dc434f81f9b67791e20099dc058022a9a575130070c12827f3fd04640fcec3b44a444fb85d8cea6439d5eaeeb359f263fb05682 SHA512 f690ae69d38b8e9c73ef095e9779364c7c5ccd246b19e8f5ce2edde47861e44c0aedabc75bcf11f5b408e034e52190dc8ed1789b503284f8f68dc1f5e84e1712 DIST apt-cacher-ng_3.5.orig.tar.xz 325260 BLAKE2B 1cf19bd575d4e3d320f73771b31e98977417713d57ceaaccb8b6c0eff7bd5e02c99a0c197ddbc09d14d8f6a70799525dedfe1fbacb00357f65f0c8c4d540bcab SHA512 0bbc78c128d353ec2504f4d898d0ffb339778e98ab9899d48c61c094b15cafd92e430f864c82b66049578f5dd3c9e74fc5c09883231faeddce453be64e6f8954 -EBUILD apt-cacher-ng-3.5_p1-r1.ebuild 2654 BLAKE2B 12fc9530aeced18d71bc4b4a23fd4b5315170d2b499e4354db49ec0e818694245eeed7db8fd36327093d0114dcba175793aebcaf8cb543526df22079166316db SHA512 2cb8a2292d56d00385c6e1566a511574316339e57c94d95aba3140fbf657b3c96275bea75b0c895a06438b9d6f34c75ebb79e6ff65b0b0ad115366aa89b71cb8 -EBUILD apt-cacher-ng-9999999.ebuild 2433 BLAKE2B c0c38e832d015dbefb62d4d661269567dc69e00247913e54155442b28b992d6b49d03489f97454390eecc11ee695eabf1817573c5f13e968a3c845707f729e38 SHA512 d58313380be4cdb7931b9ea5426996ce9b0380c13f474eaacde7aaa8ae448b7690bd41fc79feaf572f1902a69983d7c4fc000956fe05aaa7df8e291635724d36 -MISC metadata.xml 302 BLAKE2B 45d53591d095c3b57ddf3111fb9d214495a84d905b0428c7a9f45108354a82d0c7c84cd86e6e3b9afe5ab183ba49252da7ca6a6edde61558a73d5bb992b60eaf SHA512 f78c942870ae5a99f63f31535853047cc9c1fb5a2d84a8341558fa22c37e2cb07bb604b63a1952750dd0b895458b6b7b514974b0128cb27a33f4c3f69ba0e4fe +EBUILD apt-cacher-ng-3.5_p3.ebuild 2449 BLAKE2B 71da549cdea5abb9a301aeeee78b8c9507d833fbdd545b747f75fab9684f02f8934be2ddbf6de1d66ba82de5ec180fd82a630280b4e452ca674ab02bba7cc814 SHA512 e04544ab9969f7384893efdc68220c0293ebaf38eb7da085b55bbbc154fad4a4d3710f7a283c0ca2021daf70058fe342943d2fd29c1a38a7dc820f715006fbd1 +EBUILD apt-cacher-ng-9999.ebuild 2400 BLAKE2B 79834b1870b720d0bf4d45ebd8914e8a7bd85b0fecb5c3c6a471e1bbcca6bcbcca40000a19850eb7d7aff58b9d294fba196dd64760e06978452b5c8d37a0028b SHA512 135c66bd0e00f46a2f6ba12acde0551a26168219b1843d0e256bc9673bb7fefdcffb824ebcf6fcef348139aa31b13e1f498d572aa166ee848f4102c5d193dca4 +MISC metadata.xml 514 BLAKE2B fc89f43d55b9d0d2250522ffa3704a51e336a9c7ec13b928ec483be4da6cf01edd7ab11bdd6e2ede0b1203eef2682270479e1703822849f50c2ccbc32cc0502f SHA512 fe3e1774feb81e61d22f56d6095d7d6caaaecadccda26812c4677c02470e0a6528c474a53ec73615abd5ecd22d4410991d0ce01b7f1177b92fccfd8cca3cf0a7 diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild deleted file mode 100644 index 362e497b3c1b..000000000000 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake user - -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 -" -LICENSE="BSD-4 ZLIB public-domain" -SLOT="0" -SRC_URI=" - mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz - mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz -" - -KEYWORDS="~amd64 ~x86" -IUSE="doc fuse systemd tcpd" - -COMMON_DEPEND=" - app-arch/bzip2 - app-arch/xz-utils - dev-libs/libevent:= - dev-libs/openssl:0= - sys-libs/zlib - systemd? ( - sys-apps/systemd - ) -" -BDEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl - fuse? ( sys-fs/fuse ) - tcpd? ( sys-apps/tcp-wrappers ) -" -PATCHES=( - "${FILESDIR}"/${PN}-3.3.1-flags.patch - "${FILESDIR}"/${PN}-3.5-perl-syntax.patch - "${WORKDIR}"/debian/patches/debian-changes -) -S=${WORKDIR}/${P/_*} - -pkg_setup() { - # add new user & group for daemon - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} -} - -src_configure() { - local mycmakeargs=() - if use fuse; then - mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) - else - mycmakeargs+=( "-DHAVE_FUSE_25=no" ) - fi - if use tcpd; then - mycmakeargs+=( "-DHAVE_LIBWRAP=yes" ) - else - mycmakeargs+=( "-DHAVE_LIBWRAP=no" ) - fi - if tc-ld-is-gold; then - mycmakeargs+=( "-DUSE_GOLD=yes" ) - else - mycmakeargs+=( "-DUSE_GOLD=no" ) - fi - - cmake_src_configure - - sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die -} - -src_install() { - pushd "${BUILD_DIR}" || die - dosbin ${PN} acngtool - dolib.so libsupacng.so - if use fuse; then - dobin acngfs - fi - popd || die - - newinitd "${FILESDIR}"/initd-r2 ${PN} - newconfd "${FILESDIR}"/confd-r1 ${PN} - - insinto /etc/logrotate.d - newins "${FILESDIR}"/logrotate ${PN} - - doman doc/man/${PN}* - if use fuse; then - doman doc/man/acngfs* - fi - - # Documentation - dodoc doc/README TODO VERSION INSTALL ChangeLog - if use doc; then - dodoc doc/*.pdf - - docinto html - dodoc doc/html/* - - find conf -name '*.gz' -exec gzip -d {} \; || die - docinto examples/conf - dodoc conf/* - fi - - newdoc "${WORKDIR}"/debian/changelog debian.changelog - - # perl daily cron script - dosbin scripts/expire-caller.pl - insinto /etc/cron.daily - newins "${FILESDIR}"/cron.daily ${PN} - - # default configuration - insinto /etc/${PN} - newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf - doins $( echo conf/* | sed 's|conf/acng.conf.in||g' ) - - keepdir /var/log/${PN} - # Some directories must exists - keepdir /var/log/${PN} - fowners -R ${PN}:${PN} \ - /etc/${PN} \ - /var/log/${PN} -} diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild new file mode 100644 index 000000000000..56294639238b --- /dev/null +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p3.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +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 + mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" + +LICENSE="BSD-4 ZLIB public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc fuse tcpd" + +DEPEND="acct-user/apt-cacher-ng + acct-group/apt-cacher-ng + app-arch/bzip2 + dev-libs/libevent:= + dev-libs/openssl:0= + sys-libs/zlib + fuse? ( sys-fs/fuse:0 ) + tcpd? ( sys-apps/tcp-wrappers )" +BDEPEND="virtual/pkgconfig" +RDEPEND="${DEPEND} + dev-lang/perl" + +PATCHES=( + "${FILESDIR}/${PN}-3.3.1-flags.patch" + "${FILESDIR}/${PN}-3.5-perl-syntax.patch" + "${WORKDIR}/debian/patches/debian-changes" +) + +S="${WORKDIR}/${P/_*}" + +src_prepare() { + # Fixup systemd/CMakeLists.txt cmake version requirement + sed -ie "s/2.6/3.1/" systemd/CMakeLists.txt || die + + # Make sure we install everything the same way it used to be after + # switching from mostly custom src_install to relying on build system + # installation + 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 + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + "-DHAVE_FUSE_25=$(usex fuse)" + "-DHAVE_LIBWRAP=$(usex tcpd)" + # Unconditionally install systemd service file + "-DSDINSTALL=1" + ) + + if tc-ld-is-gold; then + mycmakeargs+=( "-DUSE_GOLD=yes" ) + else + mycmakeargs+=( "-DUSE_GOLD=no" ) + fi + + cmake_src_configure + + sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die +} + +src_install() { + newinitd "${FILESDIR}/initd-r3" "${PN}" + newconfd "${FILESDIR}/confd-r2" "${PN}" + + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotate" "${PN}" + + insinto /etc/cron.daily + newins "${FILESDIR}/cron.daily" "${PN}" + + # USE=fuse installs acngfs, don't install manpage without the bin + if use !fuse; then + rm doc/man/acngfs.8 || die + fi + + if use !doc; then + rm -r doc/html || die + fi + + dosbin scripts/expire-caller.pl + + keepdir "/var/log/${PN}" + fowners -R ${PN}:${PN} "/var/log/${PN}" + + cmake_src_install +} diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild new file mode 100644 index 000000000000..eeecc4fa1d9c --- /dev/null +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake git-r3 + +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" +EGIT_REPO_URI="https://salsa.debian.org/blade/apt-cacher-ng.git" +EGIT_BRANCH="upstream/sid" + +LICENSE="BSD-4 ZLIB public-domain" +SLOT="0" +IUSE="doc fuse tcpd" + +DEPEND="acct-user/apt-cacher-ng + acct-group/apt-cacher-ng + app-arch/bzip2 + dev-libs/libevent:= + dev-libs/openssl:0= + sys-libs/zlib + fuse? ( sys-fs/fuse:0 ) + tcpd? ( sys-apps/tcp-wrappers )" +BDEPEND="virtual/pkgconfig" +RDEPEND="${DEPEND} + dev-lang/perl" + +PATCHES=( + "${FILESDIR}/${PN}-3.3.1-flags.patch" + "${FILESDIR}/${PN}-3.5-perl-syntax.patch" +) + +S="${WORKDIR}/${P/_*}" + +src_prepare() { + # Fixup systemd/CMakeLists.txt cmake version requirement + sed -ie "s/2.6/3.1/" systemd/CMakeLists.txt || die + + # Make sure we install everything the same way it used to be after + # switching from mostly custom src_install to relying on build system + # installation + sed -ie "/install/s/LIBDIR/CFGDIR/" conf/CMakeLists.txt || die + sed -ie '/install.*acng\.conf/s/)$/ RENAME '"${PN}"'.conf)/' conf/CMakeLists.txt || die + sed -ie '/file/s/)$/ "*hooks" "backends_debian")/' conf/CMakeLists.txt || die + sed -ie "/INSTALL.*acngtool/s/LIBDIR/CMAKE_INSTALL_SBINDIR/" source/CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + "-DHAVE_FUSE_25=$(usex fuse)" + "-DHAVE_LIBWRAP=$(usex tcpd)" + # Unconditionally install systemd service file + "-DSDINSTALL=1" + ) + + if tc-ld-is-gold; then + mycmakeargs+=( "-DUSE_GOLD=yes" ) + else + mycmakeargs+=( "-DUSE_GOLD=no" ) + fi + + cmake_src_configure + + sed -ie '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die +} + +src_install() { + newinitd "${FILESDIR}/initd-r3" "${PN}" + newconfd "${FILESDIR}/confd-r2" "${PN}" + + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotate" "${PN}" + + insinto /etc/cron.daily + newins "${FILESDIR}/cron.daily" "${PN}" + + # USE=fuse installs acngfs, don't install manpage without the bin + if use !fuse; then + rm doc/man/acngfs.8 || die + fi + + if use !doc; then + rm -r doc/html || die + fi + + dosbin scripts/expire-caller.pl + + keepdir "/var/log/${PN}" + fowners -R ${PN}:${PN} "/var/log/${PN}" + + cmake_src_install +} diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild deleted file mode 100644 index 8ecaae37d3c5..000000000000 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake git-r3 user - -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 -" -LICENSE="BSD-4 ZLIB public-domain" -SLOT="0" -EGIT_REPO_URI="https://salsa.debian.org/blade/apt-cacher-ng.git" -EGIT_BRANCH="upstream/sid" - -KEYWORDS="" -IUSE="doc fuse systemd tcpd" - -COMMON_DEPEND=" - app-arch/bzip2 - app-arch/xz-utils - dev-libs/libevent:= - dev-libs/openssl:0= - sys-libs/zlib - systemd? ( - sys-apps/systemd - ) -" -BDEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl - fuse? ( sys-fs/fuse ) - tcpd? ( sys-apps/tcp-wrappers ) -" -PATCHES=( - "${FILESDIR}"/${PN}-3.5-perl-syntax.patch - "${FILESDIR}"/${PN}-9999999-flags.patch -) -S=${WORKDIR}/${P/_*} - -pkg_setup() { - # add new user & group for daemon - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} -} - -src_configure() { - local mycmakeargs=( - "-DCMAKE_SKIP_BUILD_RPATH=on" - ) - if use fuse; then - mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) - else - mycmakeargs+=( "-DHAVE_FUSE_25=no" ) - fi - if use tcpd; then - mycmakeargs+=( "-DHAVE_LIBWRAP=yes" ) - else - mycmakeargs+=( "-DHAVE_LIBWRAP=no" ) - fi - - cmake_src_configure - - sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die -} - -src_install() { - pushd "${BUILD_DIR}" || die - dosbin ${PN} acngtool - dolib.so libsupacng.so - if use fuse; then - dobin acngfs - fi - popd || die - - newinitd "${FILESDIR}"/initd-r2 ${PN} - newconfd "${FILESDIR}"/confd-r1 ${PN} - - insinto /etc/logrotate.d - newins "${FILESDIR}"/logrotate ${PN} - - doman doc/man/${PN}* - if use fuse; then - doman doc/man/acngfs* - fi - - # Documentation - dodoc doc/README TODO VERSION INSTALL ChangeLog - if use doc; then - dodoc doc/*.pdf - - docinto html - dodoc doc/html/* - - find conf -name '*.gz' -exec gzip -d {} \; || die - docinto examples/conf - dodoc conf/* - fi - - # perl daily cron script - dosbin scripts/expire-caller.pl - insinto /etc/cron.daily - newins "${FILESDIR}"/cron.daily ${PN} - - # default configuration - insinto /etc/${PN} - newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf - doins $( echo conf/* | sed 's|conf/acng.conf.in||g' ) - - keepdir /var/log/${PN} - # Some directories must exists - keepdir /var/log/${PN} - fowners -R ${PN}:${PN} \ - /etc/${PN} \ - /var/log/${PN} -} diff --git a/net-misc/apt-cacher-ng/files/confd-r1 b/net-misc/apt-cacher-ng/files/confd-r1 deleted file mode 100644 index 84b659bc488b..000000000000 --- a/net-misc/apt-cacher-ng/files/confd-r1 +++ /dev/null @@ -1,3 +0,0 @@ -# Additional options that are passed to the Daemon. -DAEMON_OPTS=" -c /etc/apt-cacher-ng " -LOGDIR="" diff --git a/net-misc/apt-cacher-ng/files/confd-r2 b/net-misc/apt-cacher-ng/files/confd-r2 new file mode 100644 index 000000000000..2e2f5c99dd4a --- /dev/null +++ b/net-misc/apt-cacher-ng/files/confd-r2 @@ -0,0 +1,9 @@ +# Additional options that are passed to the Daemon. +APT_CACHER_NG_ARGS="-c /etc/apt-cacher-ng" + +# Specify the network services that correspond to the "BindAddress" +# setting in your apt-cacher-ng.conf. For example, if you bind to +# 127.0.0.1, then this should be set to "net.lo" which provides the +# loopback interface. The default BindAddress listens on all available +# interfaces, for which it suffices to have only one (net.lo) up. +rc_need="net.lo" diff --git a/net-misc/apt-cacher-ng/files/initd-r2 b/net-misc/apt-cacher-ng/files/initd-r2 deleted file mode 100644 index ae9ab7258cc4..000000000000 --- a/net-misc/apt-cacher-ng/files/initd-r2 +++ /dev/null @@ -1,34 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -CACHEDIR="var/cache/${RC_SVCNAME}" -DAEMON="/usr/sbin/${RC_SVCNAME}" -RUNDIR="/var/run/${RC_SVCNAME}" -PIDFILE="${RUNDIR}/${RC_SVCNAME}.pid" -SOCKETFILE="${RUNDIR}/${RC_SVCNAME}.socket" -DAEMON_OPTS="${DAEMON_OPTS} pidfile=${PIDFILE} SocketPath=${SOCKETFILE} foreground=0" - -depend() { - use net -} - -start() { - ebegin "Starting ${RC_SVCNAME}" - checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${RUNDIR}" - checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${CACHEDIR}" - [ -z "${LOGDIR}" ] && checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "/var/log/${RC_SVCNAME}" - start-stop-daemon --start --exec ${DAEMON} \ - --user ${RC_SVCNAME} --group ${RC_SVCNAME} \ - --pidfile ${PIDFILE} \ - -- ${DAEMON_OPTS} - eend $? -} - -stop() { - ebegin "Stopping ${RC_SVCNAME}" - start-stop-daemon --stop --retry 15 --exec ${DAEMON} \ - --pidfile ${PIDFILE} - rm -f ${PIDFILE} - eend $? -} diff --git a/net-misc/apt-cacher-ng/files/initd-r3 b/net-misc/apt-cacher-ng/files/initd-r3 new file mode 100644 index 000000000000..665b0e46bcab --- /dev/null +++ b/net-misc/apt-cacher-ng/files/initd-r3 @@ -0,0 +1,20 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +CACHEDIR="/var/cache/${RC_SVCNAME}" +SOCKETDIR="/run/apt-cacher-ng" +SOCKETFILE="${SOCKETDIR}/${RC_SVCNAME}.socket" + +command="/usr/sbin/apt-cacher-ng" +command_args="SocketPath=${SOCKETFILE} foreground=1 ${APT_CACHER_NG_ARGS}" +command_background="true" +command_user="apt-cacher-ng:apt-cacher-ng" +pidfile="/run/${RC_SVCNAME}.pid" +retry="15" + +start_pre() { + for d in "${SOCKETDIR}" "${CACHEDIR}"; do + checkpath --directory --mode 0755 --owner "${command_user}" "${d}" + done +} diff --git a/net-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml index 569b73d1178f..453387392cc2 100644 --- a/net-misc/apt-cacher-ng/metadata.xml +++ b/net-misc/apt-cacher-ng/metadata.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<use> -<flag name="fuse">Install the <pkg>sys-fs/fuse</pkg> based acngfs, to use a userspace filesystem for the apt cache.</flag> -</use> + <maintainer type="person"> + <email>jchelmert3@posteo.net</email> + <name>John Helmert III</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="fuse">Install the <pkg>sys-fs/fuse</pkg> based acngfs, to use a userspace filesystem for the apt cache.</flag> + </use> </pkgmetadata> diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index 85eafc5ba665..4fb605c3ef0d 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -6,17 +6,11 @@ AUX asterisk-16.15.1-r2-autoconf-2.70.patch 499 BLAKE2B d52c6514d3cd120402298322 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3 -AUX asterisk.tmpfiles.conf 88 BLAKE2B 3c32a8dd17b94d607407a7b201448be69c72f1cbe2c414a72e2e2a49436160edcd79b370df6cd830d37d713ee0083e11b92b8053a7822645db960af9fe97ba2f SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23 AUX asterisk.tmpfiles2.conf 43 BLAKE2B b459348ce0bf46a915b0a64a4961d753bb9610486dc8499e7ff4eb2fab8d1afda59d880057bd4862f12a497d4cba5b025d73f5f510987d349dd46d269a4d1869 SHA512 65e35490966095a7be6f4acb9e338fe94021976860319fd1c13b8d1b19376854f45348e182ce3a6c02d459c6dfeae62236148b7c992ddfaeb0ed55d0d8682e1b AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5 AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38fe88dce5655e36628644e38f07984e305c706b167ec3674eec63933fb889586b78a9386c16bb3765766 SHA512 6c31c7627e30b15a35540d9eabad310841b5f740f8f361fc01630fd6ab389bae02f0d1092ee35e6375b5ae93a7d8d71d03cb06201045d084882177a2ce49a4da DIST asterisk-13.38.1.tar.gz 33705256 BLAKE2B c783ee40880455cee5a60b111f69d95fdc42bd42a598834236e9999d0f2f401548229560e937fa8d842c5d24715d3891e7860f098d35d5630522e7a659123242 SHA512 270b7c8374104b3c2e9999503fa5cab5b465e37ddfa6759c1019fb99b6bb5877fe4505501ac3306a708ce911aeda36d04796f51156312c04fec013dbaa56a57f DIST asterisk-16.15.1.tar.gz 27796648 BLAKE2B 4daa0b121a789d0384d81c3b56951bfd7c919cae3de1d7eaa0ba50f01f428c1d56555838f9ce2b3fe24309b131310c59622ed114cd4f76ac7b06896ceb3da6fc SHA512 5ce6e1301825b142859087ba237b2c1b3e0687cac3fac28f35b043727cac26583697534b2726a65510e50ef27cf373b0c4cef60042f789aa6b875448a5f08914 -DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1 -EBUILD asterisk-13.38.1-r1.ebuild 9456 BLAKE2B dcb95d4a66e3a79ec8493ca92103cba49f87d4a355208cb92602d8d16d81d37fb9d5d6225ad067dfff3eba475f00c7322024d986c12db77967e676a9fa32ede7 SHA512 9c8f127f40b7d87e9721e67d04c7be55101c1bcffcecddf98072cb3eb45e250af74421cbc65565fc70fd71158b9850ec4e2b22485a09842d186bcb6d2432141d -EBUILD asterisk-13.38.1-r2.ebuild 9785 BLAKE2B 17ea2c5a061f396b041592c965e6b56e71c07c3b6632fa9fb649650fbdd4165581a32e8878cf4b3930fd15c0223ba60cb74465a274d7991a50c7e7eed2610754 SHA512 1d38cf39c17cc30adef4ad65d2d809c83dc47b8b3b25f78354c9674d14bd539ef0b7b3d77cd42be102ccfa1d6db294babc34288642517163bdf20de924878152 -EBUILD asterisk-13.38.1.ebuild 9184 BLAKE2B da7b6e6754a5825d1960346d779820aace4450232a728890ef9555e637fb27d5e20312fdef9b0288b09544d3b669636aadf1dfb64f46040435ce64a1029c1538 SHA512 1f9b49e36fccdc32f80f9018e1c5e3c89dd10dc1ca89647fb0c148e0b66286f9bd01484f54290cfc9aa14da4b35ed36c41d2e691e84af9138311322ff60e7c3f -EBUILD asterisk-16.15.1-r1.ebuild 9633 BLAKE2B 5a6dd460244d81b83f943c982008f79071685a547140d9bf1abed4f0b845ee9a416cb510f9d8c5e9b80fa7d1b351a6cfa2cd087672aafc5d552dd78c542268ce SHA512 74187eff38dff704c9f3de4b7a3f82f054b0c90c2aad6882acd8f227840663f7bc97c8845fcdd1301ddee22328e437004554c6c03bafdfa8a911267ec4009e4c -EBUILD asterisk-16.15.1-r2.ebuild 10100 BLAKE2B 1ad9ba65ce8d89ddc53220f30803a4dc0248991b710c0b9d933343abcd63495b711914ecc6f6151cae6830bb39d01cf6dcea3e9fa8dce39c80b0994473422de1 SHA512 d07ada08b13ba033f0e28748084f512a39201ae9271f28fa84da41e9732e978da89d69a8f6f8796a7d0ca20eb3754b0a9dc2ff37b97a695a6a155c88de9a5155 -EBUILD asterisk-16.15.1.ebuild 9363 BLAKE2B beb1386217856dd1f215ff7ba9ea0dedfede09cea00abfff509703fd66dd924f5b2ce0ce8549dea3fdd3ae5349cad2ffde9fc5a110663b3682e6cf9dd24b608a SHA512 cf2bca2b143231e8875ee2a28465c7e3eeefe0d63436d8252fa5246799831ef66faad2c1e82250b5d00864364c78d6e977eb455c79d5a0351104375f59db10d1 +EBUILD asterisk-13.38.1-r2.ebuild 9702 BLAKE2B 81ba7afb1f99975315263405f52cd3e71f46d21862bf2614e708f8d1af37e29b8d6b8204dd36e340f1450d486f16b56262002829512cee47ff375161246aa5ad SHA512 f3b80252833265b52676f6e4ade92f5fa32de79f9cac7044a8bc8dc859f94b8dc605954508ccb04a26848d50cd5e874b402c157c9495c33e38472eaff60232bc +EBUILD asterisk-16.15.1-r2.ebuild 10017 BLAKE2B 03d7e56adc3cdc9a714cfa4c3a4ea5a65d2b46e2f3d33a155b4cd2b4982dec8a0ba3d87f01baed7d3d3523278b4db78aa689bff9945ee3373c4e7a14b2bbb19e SHA512 40ed74f7949862d7cdd98ed7088ee5ad10159bd8ce706ccd8c3f3ac5f0ae7f253a62d0cc67be0fcaef17169ef1d2e2f3edef504d74cd0298bc76387f5a1f9279 MISC metadata.xml 1377 BLAKE2B 4b7f76e4834ff58ed593b7e1141b4781b6dfbfb1fb32ee7a1e4f6a982f1267f2e690409f4d6d7f7ea45d4dc8f93bda274a72d1e39d9034f39ed6386a25382413 SHA512 192b14fc1c15b7a7117ee1653adada3fdc480082d2533662c7e7c8ccd13dce08d4eb0c02413c269f544b93870a1deb60092dee8ea92abfd6ce0a39630a9807d8 diff --git a/net-misc/asterisk/asterisk-13.38.1-r1.ebuild b/net-misc/asterisk/asterisk-13.38.1-r1.ebuild deleted file mode 100644 index 7fd03e6fd84c..000000000000 --- a/net-misc/asterisk/asterisk-13.38.1-r1.ebuild +++ /dev/null @@ -1,308 +0,0 @@ -# Copyright 1999-2020 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 - -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 - https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -IUSE_VOICEMAIL_STORAGE=" - +voicemail_storage_file - voicemail_storage_odbc - voicemail_storage_imap -" -IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp" -IUSE_EXPAND="VOICEMAIL_STORAGE" -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.1-r1-func_lock-fix-races.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 - sys-libs/ncurses:0= - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - calendar? ( - net-libs/neon:= - dev-libs/libical:= - dev-libs/iksemel - ) - caps? ( sys-libs/libcap ) - 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/libogg - media-libs/speex - media-libs/speexdsp - ) - srtp? ( net-libs/libsrtp:0 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - 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="virtual/pkgconfig" - -QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" - -pkg_setup() { - 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 - - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf -} - -src_configure() { - local vmst - - econf \ - LUA_VERSION="${ELUA#lua}" \ - --libdir="/usr/$(get_libdir)" \ - --localstatedir="/var" \ - --with-crypto \ - --with-gsm=internal \ - --with-popt \ - --with-z \ - --with-libedit \ - $(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 NOISE_BUILD=yes menuselect.makeopts - - # Disable BUILD_NATIVE (bug #667498) - _menuselect --disable build_native menuselect.makeopts - - # Broken functionality is forcibly disabled (bug #360143) - _menuselect --disable chan_misdn menuselect.makeopts - _menuselect --disable chan_ooh323 menuselect.makeopts - - # Utility set is forcibly enabled (bug #358001) - _menuselect --enable smsq menuselect.makeopts - _menuselect --enable streamplayer menuselect.makeopts - _menuselect --enable aelparse menuselect.makeopts - _menuselect --enable astman menuselect.makeopts - - # this is connected, otherwise it would not find - # ast_pktccops_gate_alloc symbol - _menuselect --enable chan_mgcp menuselect.makeopts - _menuselect --enable res_pktccops menuselect.makeopts - - # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available - _menuselect --enable pbx_dundi menuselect.makeopts - _menuselect --enable func_aes menuselect.makeopts - _menuselect --enable chan_iax2 menuselect.makeopts - - # SQlite3 is now the main database backend, enable related features - _menuselect --enable cdr_sqlite3_custom menuselect.makeopts - _menuselect --enable cel_sqlite3_custom menuselect.makeopts - - # The others are based on USE-flag settings - _use_select alsa chan_alsa - _use_select bluetooth chan_mobile - _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} - _use_select cluster res_corosync - _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi - _use_select freetds {cdr,cel}_tds - _use_select gtalk chan_motif - _use_select http res_http_post - _use_select iconv func_iconv - _use_select ilbc codec_ilbc format_ilbc - _use_select ldap res_config_ldap - _use_select lua pbx_lua - _use_select mysql app_mysql cdr_mysql res_config_mysql - _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - _use_select oss chan_oss - _use_select postgres {cdr,cel}_pgsql res_config_pgsql - _use_select radius {cdr,cel}_radius - _use_select snmp res_snmp - _use_select span res_fax_spandsp - _use_select speex {codec,func}_speex - _use_select speex format_ogg_speex - _use_select srtp res_srtp - _use_select statsd res_statsd res_{endpoint,chan}_stats - _use_select syslog cdr_syslog - _use_select vorbis format_ogg_vorbis - _use_select xmpp res_xmpp - - # Voicemail storage ... - for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do - if use ${vmst}; then - _menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts - fi - done - - if use debug; then - for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do - _menuselect --enable $o menuselect.makeopts - done - fi -} - -src_compile() { - emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes -} - -src_install() { - local d - - mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die - emake DESTDIR="${ED}" NOISY_BUILD=yes install - - if use radius; then - insinto /etc/radiusclient/ - doins contrib/dictionary.digium - fi - diropts -m 0750 -o root -g asterisk - keepdir /etc/asterisk - emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs - for conffile in "${ED}/etc/asterisk/"* - do - fowners root:root "${conffile#${ED}}" - fperms 0644 "${conffile#${ED}}" - done - - # keep directories - diropts -m 0750 -o asterisk -g root - keepdir /var/lib/asterisk - keepdir /var/spool/asterisk - keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording} - diropts -m 0750 -o asterisk -g asterisk - keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - - newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk - newconfd "${FILESDIR}"/confd-13.32.0 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.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 - if use doc; then - dodoc doc/*.txt - dodoc doc/*.pdf - fi - - # 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. - for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do - keepdir "${d#${ED}}" - done -} - -pkg_postinst() { - if [ -z "${REPLACING_VERSIONS}" ]; then - elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" - elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then - elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" - elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" - fi -} diff --git a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild index 41cf296fe639..628b768ef5e5 100644 --- a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild +++ b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild @@ -9,8 +9,7 @@ inherit autotools linux-info lua-single systemd 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 - https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" +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" diff --git a/net-misc/asterisk/asterisk-13.38.1.ebuild b/net-misc/asterisk/asterisk-13.38.1.ebuild deleted file mode 100644 index 78d862215075..000000000000 --- a/net-misc/asterisk/asterisk-13.38.1.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info systemd - -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 - https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" - -IUSE_VOICEMAIL_STORAGE=" - +voicemail_storage_file - voicemail_storage_odbc - voicemail_storage_imap -" -IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp" -IUSE_EXPAND="VOICEMAIL_STORAGE" -REQUIRED_USE="gtalk? ( xmpp ) - ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} ) - voicemail_storage_odbc? ( odbc ) -" - -PATCHES=( - "${FILESDIR}/${PN}-historic-no-var-run-install.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 - sys-libs/ncurses:0= - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - calendar? ( - net-libs/neon:= - dev-libs/libical:= - dev-libs/iksemel - ) - caps? ( sys-libs/libcap ) - 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? ( dev-lang/lua:0= ) - 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/libogg - media-libs/speex - media-libs/speexdsp - ) - srtp? ( net-libs/libsrtp:0 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - 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="virtual/pkgconfig" - -QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" - -pkg_setup() { - 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 -} - -src_prepare() { - default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf -} - -src_configure() { - local vmst - - econf \ - --libdir="/usr/$(get_libdir)" \ - --localstatedir="/var" \ - --with-crypto \ - --with-gsm=internal \ - --with-popt \ - --with-z \ - --with-libedit \ - $(use_with caps cap) \ - $(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 NOISE_BUILD=yes menuselect.makeopts - - # Disable BUILD_NATIVE (bug #667498) - _menuselect --disable build_native menuselect.makeopts - - # Broken functionality is forcibly disabled (bug #360143) - _menuselect --disable chan_misdn menuselect.makeopts - _menuselect --disable chan_ooh323 menuselect.makeopts - - # Utility set is forcibly enabled (bug #358001) - _menuselect --enable smsq menuselect.makeopts - _menuselect --enable streamplayer menuselect.makeopts - _menuselect --enable aelparse menuselect.makeopts - _menuselect --enable astman menuselect.makeopts - - # this is connected, otherwise it would not find - # ast_pktccops_gate_alloc symbol - _menuselect --enable chan_mgcp menuselect.makeopts - _menuselect --enable res_pktccops menuselect.makeopts - - # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available - _menuselect --enable pbx_dundi menuselect.makeopts - _menuselect --enable func_aes menuselect.makeopts - _menuselect --enable chan_iax2 menuselect.makeopts - - # SQlite3 is now the main database backend, enable related features - _menuselect --enable cdr_sqlite3_custom menuselect.makeopts - _menuselect --enable cel_sqlite3_custom menuselect.makeopts - - # The others are based on USE-flag settings - _use_select alsa chan_alsa - _use_select bluetooth chan_mobile - _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} - _use_select cluster res_corosync - _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi - _use_select freetds {cdr,cel}_tds - _use_select gtalk chan_motif - _use_select http res_http_post - _use_select iconv func_iconv - _use_select ilbc codec_ilbc format_ilbc - _use_select ldap res_config_ldap - _use_select lua pbx_lua - _use_select mysql app_mysql cdr_mysql res_config_mysql - _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - _use_select oss chan_oss - _use_select postgres {cdr,cel}_pgsql res_config_pgsql - _use_select radius {cdr,cel}_radius - _use_select snmp res_snmp - _use_select span res_fax_spandsp - _use_select speex {codec,func}_speex - _use_select speex format_ogg_speex - _use_select srtp res_srtp - _use_select statsd res_statsd res_{endpoint,chan}_stats - _use_select syslog cdr_syslog - _use_select vorbis format_ogg_vorbis - _use_select xmpp res_xmpp - - # Voicemail storage ... - for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do - if use ${vmst}; then - _menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts - fi - done - - if use debug; then - for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do - _menuselect --enable $o menuselect.makeopts - done - fi -} - -src_compile() { - emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes -} - -src_install() { - local d - - mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die - emake DESTDIR="${ED}" NOISY_BUILD=yes install - - if use radius; then - insinto /etc/radiusclient/ - doins contrib/dictionary.digium - fi - diropts -m 0750 -o root -g asterisk - keepdir /etc/asterisk - emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs - for conffile in "${ED}/etc/asterisk/"* - do - fowners root:root "${conffile#${ED}}" - fperms 0644 "${conffile#${ED}}" - done - - # keep directories - diropts -m 0750 -o asterisk -g root - keepdir /var/lib/asterisk - keepdir /var/spool/asterisk - keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording} - diropts -m 0750 -o asterisk -g asterisk - keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - - newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk - newconfd "${FILESDIR}"/confd-13.32.0 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.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 - if use doc; then - dodoc doc/*.txt - dodoc doc/*.pdf - fi - - # 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. - for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do - keepdir "${d#${ED}}" - done -} - -pkg_postinst() { - if [ -z "${REPLACING_VERSIONS}" ]; then - elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" - elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then - elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" - elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" - fi -} diff --git a/net-misc/asterisk/asterisk-16.15.1-r1.ebuild b/net-misc/asterisk/asterisk-16.15.1-r1.ebuild deleted file mode 100644 index 7259961c65f9..000000000000 --- a/net-misc/asterisk/asterisk-16.15.1-r1.ebuild +++ /dev/null @@ -1,313 +0,0 @@ -# Copyright 1999-2020 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 - -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 - https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -IUSE_VOICEMAIL_STORAGE=" - +voicemail_storage_file - voicemail_storage_odbc - voicemail_storage_imap -" -IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp" -IUSE_EXPAND="VOICEMAIL_STORAGE" -REQUIRED_USE="gtalk? ( xmpp ) - lua? ( ${LUA_REQUIRED_USE} ) - ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} ) - voicemail_storage_odbc? ( odbc ) -" - -PATCHES=( - "${FILESDIR}/${PN}-historic-no-var-run-install.patch" - "${FILESDIR}/${PN}-13.38.1-r1-autoconf-lua-version.patch" - "${FILESDIR}/${PN}-13.38.1-r1-func_lock-fix-races.patch" -) - -DEPEND="acct-user/asterisk - acct-group/asterisk - dev-db/sqlite:3 - dev-libs/popt - >=dev-libs/jansson-2.11 - dev-libs/libedit - dev-libs/libxml2:2 - dev-libs/libxslt - sys-apps/util-linux - sys-libs/ncurses:0= - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - calendar? ( - net-libs/neon:= - dev-libs/libical:= - dev-libs/iksemel - ) - caps? ( sys-libs/libcap ) - 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-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? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - unbound? ( net-dns/unbound ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - voicemail_storage_imap? ( virtual/imap-c-client ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${DEPEND} - net-misc/asterisk-core-sounds - net-misc/asterisk-extra-sounds - net-misc/asterisk-moh-opsound - selinux? ( sec-policy/selinux-asterisk ) - syslog? ( virtual/logger )" - -BDEPEND="virtual/pkgconfig" - -QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" - -pkg_setup() { - 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 - - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf -} - -src_configure() { - local vmst - - econf \ - LUA_VERSION="${ELUA#lua}" \ - --libdir="/usr/$(get_libdir)" \ - --localstatedir="/var" \ - --with-crypto \ - --with-gsm=internal \ - --with-popt \ - --with-z \ - --with-libedit \ - --without-jansson-bundled \ - --without-pjproject-bundled \ - $(use_with caps cap) \ - $(use_with lua lua) \ - $(use_with http gmime) \ - $(use_with newt) \ - $(use_with pjproject) \ - $(use_with portaudio) \ - $(use_with ssl) \ - $(use_with unbound) - - _menuselect() { - menuselect/menuselect "$@" || die "menuselect $* failed." - } - - _use_select() { - local state=$(use "$1" && echo enable || echo disable) - shift # remove use from parameters - - while [[ -n $1 ]]; do - _menuselect --${state} "$1" menuselect.makeopts - shift - done - } - - # Blank out sounds/sounds.xml file to prevent - # asterisk from installing sounds files (we pull them in via - # asterisk-{core,extra}-sounds and asterisk-moh-opsound. - >"${S}"/sounds/sounds.xml - - # That NATIVE_ARCH chatter really is quite bothersome - sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" - - # Compile menuselect binary for optional components - emake NOISY_BUILD=yes menuselect.makeopts - - # Disable BUILD_NATIVE (bug #667498) - _menuselect --disable build_native menuselect.makeopts - - # Broken functionality is forcibly disabled (bug #360143) - _menuselect --disable chan_misdn menuselect.makeopts - _menuselect --disable chan_ooh323 menuselect.makeopts - - # Utility set is forcibly enabled (bug #358001) - _menuselect --enable smsq menuselect.makeopts - _menuselect --enable streamplayer menuselect.makeopts - _menuselect --enable aelparse menuselect.makeopts - _menuselect --enable astman menuselect.makeopts - - # this is connected, otherwise it would not find - # ast_pktccops_gate_alloc symbol - _menuselect --enable chan_mgcp menuselect.makeopts - _menuselect --enable res_pktccops menuselect.makeopts - - # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available - _menuselect --enable pbx_dundi menuselect.makeopts - _menuselect --enable func_aes menuselect.makeopts - _menuselect --enable chan_iax2 menuselect.makeopts - - # SQlite3 is now the main database backend, enable related features - _menuselect --enable cdr_sqlite3_custom menuselect.makeopts - _menuselect --enable cel_sqlite3_custom menuselect.makeopts - - # The others are based on USE-flag settings - _use_select alsa chan_alsa - _use_select bluetooth chan_mobile - _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} - _use_select cluster res_corosync - _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi - _use_select freetds {cdr,cel}_tds - _use_select gtalk chan_motif - _use_select http res_http_post - _use_select iconv func_iconv - _use_select ilbc codec_ilbc format_ilbc - _use_select ldap res_config_ldap - _use_select lua pbx_lua - _use_select mysql app_mysql cdr_mysql res_config_mysql - _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - _use_select oss chan_oss - _use_select postgres {cdr,cel}_pgsql res_config_pgsql - _use_select radius {cdr,cel}_radius - _use_select snmp res_snmp - _use_select span res_fax_spandsp - _use_select speex {codec,func}_speex - _use_select speex format_ogg_speex - _use_select srtp res_srtp - _use_select statsd res_statsd res_{endpoint,chan}_stats - _use_select syslog cdr_syslog - _use_select vorbis format_ogg_vorbis - _use_select xmpp res_xmpp - - # Voicemail storage ... - for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do - if use ${vmst}; then - _menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts - fi - done - - if use debug; then - for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do - _menuselect --enable "${o}" menuselect.makeopts - done - fi -} - -src_compile() { - emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes -} - -src_install() { - local d - - mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die - emake DESTDIR="${ED}" NOISY_BUILD=yes install - - if use radius; then - insinto /etc/radiusclient/ - doins contrib/dictionary.digium - fi - diropts -m 0750 -o root -g asterisk - keepdir /etc/asterisk - emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs - for conffile in "${ED}/etc/asterisk/"* - do - fowners root:root "${conffile#${ED}}" - fperms 0644 "${conffile#${ED}}" - done - - # keep directories - diropts -m 0750 -o asterisk -g root - keepdir /var/lib/asterisk - keepdir /var/spool/asterisk - keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording} - diropts -m 0750 -o asterisk -g asterisk - keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - - newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk - newconfd "${FILESDIR}"/confd-13.32.0 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.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 - if use doc; then - dodoc doc/*.txt - dodoc doc/*.pdf - fi - - # 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. - for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do - keepdir "${d#${ED}}" - done -} - -pkg_postinst() { - if [ -z "${REPLACING_VERSIONS}" ]; then - elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" - elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then - elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" - elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" - fi -} diff --git a/net-misc/asterisk/asterisk-16.15.1-r2.ebuild b/net-misc/asterisk/asterisk-16.15.1-r2.ebuild index 8316274ea097..f5718280906d 100644 --- a/net-misc/asterisk/asterisk-16.15.1-r2.ebuild +++ b/net-misc/asterisk/asterisk-16.15.1-r2.ebuild @@ -9,8 +9,7 @@ inherit autotools linux-info lua-single systemd 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 - https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" +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" diff --git a/net-misc/asterisk/asterisk-16.15.1.ebuild b/net-misc/asterisk/asterisk-16.15.1.ebuild deleted file mode 100644 index da613c5156fa..000000000000 --- a/net-misc/asterisk/asterisk-16.15.1.ebuild +++ /dev/null @@ -1,304 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info systemd - -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 - https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -IUSE_VOICEMAIL_STORAGE=" - +voicemail_storage_file - voicemail_storage_odbc - voicemail_storage_imap -" -IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp" -IUSE_EXPAND="VOICEMAIL_STORAGE" -REQUIRED_USE="gtalk? ( xmpp ) - ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} ) - voicemail_storage_odbc? ( odbc ) -" - -PATCHES=( - "${FILESDIR}/${PN}-historic-no-var-run-install.patch" -) - -DEPEND="acct-user/asterisk - acct-group/asterisk - dev-db/sqlite:3 - dev-libs/popt - >=dev-libs/jansson-2.11 - dev-libs/libedit - dev-libs/libxml2:2 - dev-libs/libxslt - sys-apps/util-linux - sys-libs/ncurses:0= - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - bluetooth? ( net-wireless/bluez:= ) - calendar? ( - net-libs/neon:= - dev-libs/libical:= - dev-libs/iksemel - ) - caps? ( sys-libs/libcap ) - 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? ( dev-lang/lua:0= ) - 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? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - unbound? ( net-dns/unbound ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - voicemail_storage_imap? ( virtual/imap-c-client ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${DEPEND} - net-misc/asterisk-core-sounds - net-misc/asterisk-extra-sounds - net-misc/asterisk-moh-opsound - selinux? ( sec-policy/selinux-asterisk ) - syslog? ( virtual/logger )" - -BDEPEND="virtual/pkgconfig" - -QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" - -pkg_setup() { - 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 -} - -src_prepare() { - default - AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf -} - -src_configure() { - local vmst - - econf \ - --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 http gmime) \ - $(use_with newt) \ - $(use_with pjproject) \ - $(use_with portaudio) \ - $(use_with ssl) \ - $(use_with unbound) - - _menuselect() { - menuselect/menuselect "$@" || die "menuselect $* failed." - } - - _use_select() { - local state=$(use "$1" && echo enable || echo disable) - shift # remove use from parameters - - while [[ -n $1 ]]; do - _menuselect --${state} "$1" menuselect.makeopts - shift - done - } - - # Blank out sounds/sounds.xml file to prevent - # asterisk from installing sounds files (we pull them in via - # asterisk-{core,extra}-sounds and asterisk-moh-opsound. - >"${S}"/sounds/sounds.xml - - # That NATIVE_ARCH chatter really is quite bothersome - sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" - - # Compile menuselect binary for optional components - emake NOISY_BUILD=yes menuselect.makeopts - - # Disable BUILD_NATIVE (bug #667498) - _menuselect --disable build_native menuselect.makeopts - - # Broken functionality is forcibly disabled (bug #360143) - _menuselect --disable chan_misdn menuselect.makeopts - _menuselect --disable chan_ooh323 menuselect.makeopts - - # Utility set is forcibly enabled (bug #358001) - _menuselect --enable smsq menuselect.makeopts - _menuselect --enable streamplayer menuselect.makeopts - _menuselect --enable aelparse menuselect.makeopts - _menuselect --enable astman menuselect.makeopts - - # this is connected, otherwise it would not find - # ast_pktccops_gate_alloc symbol - _menuselect --enable chan_mgcp menuselect.makeopts - _menuselect --enable res_pktccops menuselect.makeopts - - # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available - _menuselect --enable pbx_dundi menuselect.makeopts - _menuselect --enable func_aes menuselect.makeopts - _menuselect --enable chan_iax2 menuselect.makeopts - - # SQlite3 is now the main database backend, enable related features - _menuselect --enable cdr_sqlite3_custom menuselect.makeopts - _menuselect --enable cel_sqlite3_custom menuselect.makeopts - - # The others are based on USE-flag settings - _use_select alsa chan_alsa - _use_select bluetooth chan_mobile - _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} - _use_select cluster res_corosync - _use_select curl func_curl res_config_curl res_curl - _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi - _use_select freetds {cdr,cel}_tds - _use_select gtalk chan_motif - _use_select http res_http_post - _use_select iconv func_iconv - _use_select ilbc codec_ilbc format_ilbc - _use_select ldap res_config_ldap - _use_select lua pbx_lua - _use_select mysql app_mysql cdr_mysql res_config_mysql - _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - _use_select oss chan_oss - _use_select postgres {cdr,cel}_pgsql res_config_pgsql - _use_select radius {cdr,cel}_radius - _use_select snmp res_snmp - _use_select span res_fax_spandsp - _use_select speex {codec,func}_speex - _use_select speex format_ogg_speex - _use_select srtp res_srtp - _use_select statsd res_statsd res_{endpoint,chan}_stats - _use_select syslog cdr_syslog - _use_select vorbis format_ogg_vorbis - _use_select xmpp res_xmpp - - # Voicemail storage ... - for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do - if use ${vmst}; then - _menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts - fi - done - - if use debug; then - for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do - _menuselect --enable "${o}" menuselect.makeopts - done - fi -} - -src_compile() { - emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes -} - -src_install() { - local d - - mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die - emake DESTDIR="${ED}" NOISY_BUILD=yes install - - if use radius; then - insinto /etc/radiusclient/ - doins contrib/dictionary.digium - fi - diropts -m 0750 -o root -g asterisk - keepdir /etc/asterisk - emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs - for conffile in "${ED}/etc/asterisk/"* - do - fowners root:root "${conffile#${ED}}" - fperms 0644 "${conffile#${ED}}" - done - - # keep directories - diropts -m 0750 -o asterisk -g root - keepdir /var/lib/asterisk - keepdir /var/spool/asterisk - keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording} - diropts -m 0750 -o asterisk -g asterisk - keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - - newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk - newconfd "${FILESDIR}"/confd-13.32.0 asterisk - - systemd_dounit "${FILESDIR}"/asterisk.service - systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.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 - if use doc; then - dodoc doc/*.txt - dodoc doc/*.pdf - fi - - # 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. - for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do - keepdir "${d#${ED}}" - done -} - -pkg_postinst() { - if [ -z "${REPLACING_VERSIONS}" ]; then - elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" - elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then - elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" - elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" - elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" - fi -} diff --git a/net-misc/asterisk/files/asterisk.tmpfiles.conf b/net-misc/asterisk/files/asterisk.tmpfiles.conf deleted file mode 100644 index 637302a27373..000000000000 --- a/net-misc/asterisk/files/asterisk.tmpfiles.conf +++ /dev/null @@ -1,2 +0,0 @@ -d /var/run/asterisk 0750 asterisk asterisk -d /var/spool/asterisk 0750 asterisk asterisk diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest index c68f213dc96a..7209a6df8f6f 100644 --- a/net-misc/axel/Manifest +++ b/net-misc/axel/Manifest @@ -1,7 +1,7 @@ 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 -EBUILD axel-2.17.10.ebuild 1059 BLAKE2B e30d0a04e6d39c123c72ae51de2db98dc3cb9661010452a699139d40a03216dd788ccaff6e2e57230cedb104bcf992f0b224c62866e61b41afd1bbafdbc3b8c2 SHA512 b1b03f38c0c126b422732ae3cfe278b2270f46e812179aae7c2d2b68ed44fd544af0183291e17ac83474f45f62014ff0d4f6220d79f0ef41251c6e29900a6936 +EBUILD axel-2.17.10.ebuild 1054 BLAKE2B 658b793448fb76f9e1dd5168980de9616db86b0fa3dac0807025b4896740d85bbfa63b2bd258b567fe1999364e9b689fcc4120c48cbb78dbb96e12ffe8c6edc2 SHA512 f0feaf93e68ccd8493f712fc4f3ffac76ec5dd4fc7803075bacb68c300fce48b609134a47b9823631b08a983dc6c8e057270da354d6e7515538378816a5a542d EBUILD axel-2.17.8.ebuild 1054 BLAKE2B 4b125d7d707116374d3c66342a70d174eee139e5f5ba07ef3d9b7bd8d2da2a2c906aceea4b751977c8bedf626d5bdef54b11263140d663f5559cc92b67702b44 SHA512 982df8b1fe6e40cda200318ecb32058c9d31889a8473f7124651353e0897b79729f4d3cd4697957a1047dd3a12890ad492481f3118a2539c3577e95bc7d0dcf9 EBUILD axel-2.17.9.ebuild 1059 BLAKE2B e30d0a04e6d39c123c72ae51de2db98dc3cb9661010452a699139d40a03216dd788ccaff6e2e57230cedb104bcf992f0b224c62866e61b41afd1bbafdbc3b8c2 SHA512 b1b03f38c0c126b422732ae3cfe278b2270f46e812179aae7c2d2b68ed44fd544af0183291e17ac83474f45f62014ff0d4f6220d79f0ef41251c6e29900a6936 MISC metadata.xml 334 BLAKE2B cdc0f78ca802b6c5268d4f3642637af74d419ba07fb07a2a0f0e21dfdc20de3301ee91d7b027b4fff5c1f2eca4dc5cd395dbf916ab7d2bb6cac9ed85b228f5eb SHA512 e23a07690d4d2f1b26e90fb151d1b7afb922649c4989b4f4b8e9dafe3024c9b7dafb6dbfa467731055d605e101cf44d3c17be3d6f6f99629063cc42f8b616449 diff --git a/net-misc/axel/axel-2.17.10.ebuild b/net-misc/axel/axel-2.17.10.ebuild index dad9472d9679..36e4e204eda9 100644 --- a/net-misc/axel/axel-2.17.10.ebuild +++ b/net-misc/axel/axel-2.17.10.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 @@ -11,7 +11,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 ppc ppc64 sparc x86" IUSE="debug libressl nls ssl" CDEPEND=" diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 1eb679fce4fe..6b96caea360c 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -4,6 +4,7 @@ AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 4e441ea854dda077c68f05b420f50 AUX chronyd.conf 390 BLAKE2B a0058c72ae04371aa273d71f01349a00dfc0d66c016e6c2d977b9499e2ded3072942bb21c468ca9263263d55f1cc35cca4a3a72ee058cc31cf982648552bc77d SHA512 6798d40da70921b95430371459a4b276a88c57ec79f99d0efd214770f5fffee5d80d20baf4313f210b6af46c4aafbb038920cd774d6c03ffbb0849229c431bdc AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9 -EBUILD chrony-4.0.ebuild 4280 BLAKE2B 1d5b51c22d9a321172021ba50ac7129a53c119b7e7027c28489596f15b0365422545d9613c001feee05ae1bdc9e5898e334a787ac91aa9d257986e38bf4146b5 SHA512 09ad193ad9f0504137f9d471557354582c093d65ce1b56468f16192d72da3f17c7e5744d893e8e3cdd7ef68a54e4deaa1d36f06421c996cd9c39b2c56a09cfee -EBUILD chrony-9999.ebuild 4287 BLAKE2B d682d68657aab4b753b21963d0276688a16a84ad37dbafff885a7983cf0eb48bb8493251649feabe493be6393eb48fb68a8140b6459f3d224e078f80ae4ee0dd SHA512 044a352a2afa9e875244e9bfbb7b197bb2693c0ddc52e6d88296536fa6c15fa8811f45684ca8c594f2d1150f46e0ef6178e5e7dbedab4c602f56f7bc5cbd2bca -MISC metadata.xml 1936 BLAKE2B 46778f29ab04904ff6aa5212e989d1384f40d1923a04323837845af7563cffcc652047dae4ab8c535dcf1d2986e851c96aad4160cd4910934b3ffc347f473a21 SHA512 1094233e25ad5630cf537888304bbfd16fb8c1da36873025b0b937070733d0adbeebedc4c04383f806f2dc825013f53133fb81cef597afad16874510fa45c10f +EBUILD chrony-4.0-r1.ebuild 5222 BLAKE2B c688ee6af7aaf0a68488510a5f4d739b67bcbf7f6fd013dd5128fbc69cfe0316cb7cd29140c43ef13bea0a6700ba2a724f5229a0a0163e047fe1d8631c6a6149 SHA512 cb668189ca505659c3ef75f6a9838eaca432302075967d6b80cf91e01f87774d60aaa94e99ade646fb8c94db6ed8afcd938c20eb249a8ea9608bafeaee702bee +EBUILD chrony-4.0.ebuild 4324 BLAKE2B c6e4eef917c334681564f974323f503d088fe0aeac43e5c88f302f5e6f29fdb0d45fd2862d768621a23110deb53e907597efb44d361a794b2e37181ae3c19208 SHA512 be89d10a76643ad8c46d005f3ddc49dc60485a7b5954445a7ddc4468c142d31100465c0222231da43f338f621fc11de2bd20ecc42bde43424b85b48f01b84d1f +EBUILD chrony-9999.ebuild 5222 BLAKE2B c688ee6af7aaf0a68488510a5f4d739b67bcbf7f6fd013dd5128fbc69cfe0316cb7cd29140c43ef13bea0a6700ba2a724f5229a0a0163e047fe1d8631c6a6149 SHA512 cb668189ca505659c3ef75f6a9838eaca432302075967d6b80cf91e01f87774d60aaa94e99ade646fb8c94db6ed8afcd938c20eb249a8ea9608bafeaee702bee +MISC metadata.xml 2299 BLAKE2B f5e8667a5fdeb86395d773eaf6e7d80c2133fe945565d7d6005f156a0a4763f1434ba887627fba63dd0f0a15663d7fa194d91699f6961ad21b9afa40576cd1fd SHA512 370e06edf9df22a327ff8b528f8a810c731af4615d740331ac737af8cbc5af265f7592ec22bf844301c5089185bc4f7de102f87378f85cf276d4f550933e519a diff --git a/net-misc/chrony/chrony-4.0-r1.ebuild b/net-misc/chrony/chrony-4.0-r1.ebuild new file mode 100644 index 000000000000..7e6fadddffaa --- /dev/null +++ b/net-misc/chrony/chrony-4.0-r1.ebuild @@ -0,0 +1,210 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd tmpfiles toolchain-funcs + +DESCRIPTION="NTP client and server programs" +HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" +else + SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi + +S="${WORKDIR}/${P/_/-}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+caps +cmdmon debug html ipv6 libedit +nettle nss +ntp +phc +nts pps +refclock +rtc samba +seccomp +sechash selinux libtomcrypt" +# nettle > nss > libtomcrypt in configure +REQUIRED_USE=" + sechash? ( || ( nettle nss libtomcrypt ) ) + nettle? ( !nss ) + nss? ( !nettle ) + libtomcrypt? ( !nettle !nss ) + !sechash? ( !nss ) + !sechash? ( !nts? ( !nettle ) ) + nts? ( nettle ) +" +RESTRICT="test" + +BDEPEND="nettle? ( virtual/pkgconfig )" + +if [[ ${PV} == "9999" ]]; then + # Needed for doc generation in 9999 + BDEPEND+=" virtual/w3m" + REQUIRED_USE+=" html" +fi + +DEPEND=" + caps? ( + acct-group/ntp + acct-user/ntp + sys-libs/libcap + ) + nts? ( net-libs/gnutls:= ) + libedit? ( dev-libs/libedit ) + nettle? ( dev-libs/nettle:= ) + nss? ( dev-libs/nss:= ) + seccomp? ( sys-libs/libseccomp ) + html? ( dev-ruby/asciidoctor ) + pps? ( net-misc/pps-tools ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-chronyd ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch + "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch +) + +src_prepare() { + default + + sed -i \ + -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ + doc/* examples/* || die + + cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die +} + +src_configure() { + if ! use caps; then + sed -i \ + -e 's/ -u ntp//' \ + "${T}"/chronyd.conf examples/chronyd.service || die + fi + + if ! use seccomp; then + sed -i \ + -e 's/ -F 0//' \ + "${T}"/chronyd.conf examples/chronyd.service || die + fi + + tc-export CC PKG_CONFIG + + # Update from time to time with output from "date +%s" + # on a system that is time-synced. + export SOURCE_DATE_EPOCH=1607976314 + + # not an autotools generated script + 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 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) + $(usex libtomcrypt '' --disable-tomcrypt) + --chronysockdir="${EPREFIX}/run/chrony" + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --mandir="${EPREFIX}/usr/share/man" + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc/chrony" + --with-hwclockfile="${EPREFIX}/etc/adjtime" + --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" + ${EXTRA_ECONF} + ) + + # print the ./configure call + echo sh ./configure "${myconf[@]}" >&2 + sh ./configure "${myconf[@]}" || die +} + +src_compile() { + if [[ ${PV} == "9999" ]]; then + # uses w3m + emake -C doc man txt + fi + + emake all docs $(usex html '' 'ADOC=true') +} + +src_install() { + default + + newinitd "${FILESDIR}"/chronyd.init-r2 chronyd + newconfd "${T}"/chronyd.conf chronyd + + insinto /etc/${PN} + newins examples/chrony.conf.example1 chrony.conf + + docinto examples + dodoc examples/*.example* + + newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" + + if use html; then + docinto html + dodoc doc/*.html + fi + + keepdir /var/{lib,log}/chrony + + if use caps; then + # Prepare a directory for the chrony.drift file (a la ntpsec) + # Ensures the environment is sane on new installs + fowners ntp:ntp /var/{lib,log}/chrony + fperms 770 /var/lib/chrony + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony + + systemd_dounit examples/chronyd.service + systemd_dounit examples/chrony-wait.service + systemd_enable_ntpunit 50-chrony chronyd.service +} + +pkg_preinst() { + HAD_CAPS=false + HAD_SECCOMP=false + + if has_version 'net-misc/chrony[caps]' ; then + HAD_CAPS=true + fi + + if has_version 'net-misc/chrony[seccomp]' ; then + HAD_SECCOMP=true + fi + +} + +pkg_postinst() { + tmpfiles_process chronyd.conf + + if [[ -n "${REPLACING_VERSIONS}" ]] ; then + if use caps && ! ${HAD_CAPS} ; then + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" + ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" + ewarn "This is necessary for chrony to drop privileges" + elif ! use caps && ! ${HAD_CAPS} ; then + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" + fi + fi + + if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then + elog "To enable seccomp in enforcing mode, please modify:" + elog "- /etc/conf.d/chronyd for OpenRC" + elog "- systemctl edit chronyd for systemd" + elog "to use -F 1 or -F -1 instead of -F 0 (see man chronyd)" + fi +} diff --git a/net-misc/chrony/chrony-4.0.ebuild b/net-misc/chrony/chrony-4.0.ebuild index efa9bc015ed1..3926d6b0f383 100644 --- a/net-misc/chrony/chrony-4.0.ebuild +++ b/net-misc/chrony/chrony-4.0.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 @@ -6,7 +6,7 @@ EAPI=7 inherit systemd tmpfiles toolchain-funcs DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony.tuxfamily.org/" +HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" if [[ ${PV} == "9999" ]]; then inherit git-r3 diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 9bee3f3276df..7e6fadddffaa 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.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 @@ -6,7 +6,7 @@ EAPI=7 inherit systemd tmpfiles toolchain-funcs DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony.tuxfamily.org/" +HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" if [[ ${PV} == "9999" ]]; then inherit git-r3 @@ -20,8 +20,17 @@ S="${WORKDIR}/${P/_/-}" LICENSE="GPL-2" SLOT="0" -IUSE="+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux" -REQUIRED_USE="sechash? ( nettle )" +IUSE="+caps +cmdmon debug html ipv6 libedit +nettle nss +ntp +phc +nts pps +refclock +rtc samba +seccomp +sechash selinux libtomcrypt" +# nettle > nss > libtomcrypt in configure +REQUIRED_USE=" + sechash? ( || ( nettle nss libtomcrypt ) ) + nettle? ( !nss ) + nss? ( !nettle ) + libtomcrypt? ( !nettle !nss ) + !sechash? ( !nss ) + !sechash? ( !nts? ( !nettle ) ) + nts? ( nettle ) +" RESTRICT="test" BDEPEND="nettle? ( virtual/pkgconfig )" @@ -38,8 +47,10 @@ DEPEND=" acct-user/ntp sys-libs/libcap ) + nts? ( net-libs/gnutls:= ) libedit? ( dev-libs/libedit ) nettle? ( dev-libs/nettle:= ) + nss? ( dev-libs/nss:= ) seccomp? ( sys-libs/libseccomp ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools ) @@ -61,11 +72,6 @@ src_prepare() { -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ doc/* examples/* || die - sed -i \ - -e 's|RELOADDNS||g' \ - -e 's|pkg-config|${PKG_CONFIG}|g' \ - configure || die - cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die } @@ -84,24 +90,30 @@ src_configure() { tc-export CC PKG_CONFIG - # Note: ncurses and nss switches are mentioned in the configure script but - # do nothing + # Update from time to time with output from "date +%s" + # on a system that is time-synced. + export SOURCE_DATE_EPOCH=1607976314 + # not an autotools generated script 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 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) - ${EXTRA_ECONF} + $(usex libtomcrypt '' --disable-tomcrypt) --chronysockdir="${EPREFIX}/run/chrony" --docdir="${EPREFIX}/usr/share/doc/${PF}" --mandir="${EPREFIX}/usr/share/man" @@ -109,8 +121,7 @@ src_configure() { --sysconfdir="${EPREFIX}/etc/chrony" --with-hwclockfile="${EPREFIX}/etc/adjtime" --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - --without-nss - --without-tomcrypt + ${EXTRA_ECONF} ) # print the ./configure call @@ -165,18 +176,35 @@ src_install() { pkg_preinst() { HAD_CAPS=false + HAD_SECCOMP=false - if has_version 'net-misc/chrony[caps]'; then + if has_version 'net-misc/chrony[caps]' ; then HAD_CAPS=true fi + + if has_version 'net-misc/chrony[seccomp]' ; then + HAD_SECCOMP=true + fi + } pkg_postinst() { tmpfiles_process chronyd.conf - if [[ -n ${REPLACING_VERSIONS} ]] && use caps && ! ${HAD_CAPS}; then - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" - ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" - ewarn "This is necessary for chrony to drop privileges" + if [[ -n "${REPLACING_VERSIONS}" ]] ; then + if use caps && ! ${HAD_CAPS} ; then + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" + ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" + ewarn "This is necessary for chrony to drop privileges" + elif ! use caps && ! ${HAD_CAPS} ; then + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" + fi + fi + + if [[ ! ${HAD_SECCOMP} ]] && use seccomp ; then + elog "To enable seccomp in enforcing mode, please modify:" + elog "- /etc/conf.d/chronyd for OpenRC" + elog "- systemctl edit chronyd for systemd" + elog "to use -F 1 or -F -1 instead of -F 0 (see man chronyd)" fi } diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml index 6d7a44f2f91e..e43d78736618 100644 --- a/net-misc/chrony/metadata.xml +++ b/net-misc/chrony/metadata.xml @@ -24,14 +24,18 @@ </longdescription> <use> <flag name="cmdmon">Support for command and monitoring</flag> + <flag name="debug">Get DEBUG_LOG output from chronyd when passing -dd parameter</flag> <flag name="html">Install HTML documentation</flag> - <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for hash functions</flag> + <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for hash functions or nts</flag> + <flag name="nss">Use <pkg>dev-libs/nss</pkg> for hash functions</flag> <flag name="ntp">Support for the Network Time Protocol (NTP)</flag> + <flag name="nts">Support for Network Time Security (NTS). Uses <pkg>net-libs/gnutls</pkg></flag> <flag name="phc">Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface</flag> <flag name="pps">Support for the Linux Pulse Per Second (PPS) interface</flag> <flag name="refclock">Support for reference clocks</flag> <flag name="rtc">Support for the Linux Real Time Clock interface</flag> <flag name="sechash">Enable support for hashes other than MD5</flag> + <flag name="libtomcrypt">Support different hashes via <pkg>dev-libs/libtomcrypt</pkg></flag> </use> <upstream> <remote-id type="cpe">cpe:/a:chrony_project:chrony</remote-id> diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest index c5346ceb6745..2ffe4c7315db 100644 --- a/net-misc/connman/Manifest +++ b/net-misc/connman/Manifest @@ -1,6 +1,9 @@ AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40 DIST connman-1.38.tar.xz 749288 BLAKE2B 3f0ec95c87d9b3bf4f188e2523cb8ed97f462953ed95180fadf98bfe0d01c67a3b73e18e39d616e9299fa0251b9a86afea6161b9e280ae6999eb66e6bd5c4406 SHA512 9c8f77c4dd62763ccb9ea5cc5d285a8a1c51bb09a82eafc73246231557a4f627ae1e5e4a9df5e104457390ebba643349d7d67800a4ee4c17c6dceff192afe8d4 +DIST connman-1.39.tar.xz 755688 BLAKE2B f18018a0c2b58a89e613dba70672c27631ecbb0c0e44c84fe4c9097753aaeb7b278cd3ab0bef9b5e1928c34ee90b287754356e525cc318ecb6347370ee3043b4 SHA512 5bec2830971e34966a7a3a40c505b8a14cf6fa639262d4f1eaeb38f5e602d7a234f7d4f2c4919517b0832664382389e20a59fdb027753cd20059a23589de1764 EBUILD connman-1.38.ebuild 2722 BLAKE2B ed9392bee5e97012fe13b77fd3ed5c50f15dd64aeea641695505c7c4f0d575c949e51e04e21ff801de9d8d8609807593b2d7279a5adc6aa87ac99da16473d654 SHA512 829b20d249c16a550819d00cba1b42afa44895f287c48a47176576280d3d6dd231c446c5bcae91ef662f78d0e0e828429377365482426d2b29115494c9247b70 +EBUILD connman-1.39-r1.ebuild 2751 BLAKE2B 49d7e875a9ae05a837c328296539b0e22453d795609c257ef6783fc98e8319cfec57fa0837e1ee4373a74c81391f8fa1f7a573a776ba126ac7c073391a25001a SHA512 5a6f306112ec1d1110c78ee7abc12e8638b38e770a593672486175ab881f1c89e8f6d4c43e6e26c417971e2c212b4fe526d82d59811fa1b4b2ccb2fb567a9c50 +EBUILD connman-1.39.ebuild 2724 BLAKE2B 2194ac7e5cfb286b471c29a3d324cdecfbb935b687409d64fe10f9a043a4c9dd75c33ae054bdc35500d8c788e7c38b62fd472d92bc77a412a7d45375ebdd9076 SHA512 055695959ce6ce7ecef68ad2efbb8b9d92ed0694494381e94d78381ef641aaeacbd2b3ae07257eb28d92a8dcd78d73f2eddce221710aa7de957e673c1bce8012 EBUILD connman-9999.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da MISC metadata.xml 1302 BLAKE2B b6cea3b784c7f217c5d0befc833fe573ff68f010f9fb1043b11ce9c70473c45b2a9c03d59495e8a04f58e1657ce6a9ca531da9675bdd545493cd1bab8a583ae9 SHA512 3df49e8184d319601df17ff8238404c673026a6953f0a566c7d9134215841dab8cb6a4ec507e2c6467bfbc463678568696828173b80a96a4035a449ff886bb3f diff --git a/net-misc/connman/connman-1.39-r1.ebuild b/net-misc/connman/connman-1.39-r1.ebuild new file mode 100644 index 000000000000..9f5662b9ab43 --- /dev/null +++ b/net-misc/connman/connman-1.39-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +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 ~x86" +fi + +DESCRIPTION="Provides a daemon for managing internet connections" +HOMEPAGE="https://01.org/connman" + +LICENSE="GPL-2" +SLOT="0" + +IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager ++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard +wispr" + +REQUIRED_USE="^^ ( iptables nftables )" +BDEPEND="virtual/pkgconfig" +RDEPEND=">=dev-libs/glib-2.16 + >=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 ) + 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} + >=sys-kernel/linux-headers-2.6.39" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --localstatedir=/var \ + --runstatedir=/run \ + --with-systemdunitdir=$(systemd_get_systemunitdir) \ + --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ + --enable-client \ + --enable-datafiles \ + --enable-loopback=builtin \ + $(use_enable bluetooth bluetooth builtin) \ + $(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) \ + $(use_enable openconnect openconnect builtin) \ + $(use_enable openvpn openvpn builtin) \ + $(use_enable policykit polkit builtin) \ + $(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 +} + +src_install() { + default + dobin client/connmanctl + + if use doc; then + dodoc doc/*.txt + fi + keepdir /usr/lib/${PN}/scripts + keepdir /var/lib/${PN} + newinitd "${FILESDIR}"/${PN}.initd2 ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} + +pkg_postinst() { + tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf +} diff --git a/net-misc/connman/connman-1.39.ebuild b/net-misc/connman/connman-1.39.ebuild new file mode 100644 index 000000000000..bcc06a5beff2 --- /dev/null +++ b/net-misc/connman/connman-1.39.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +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 x86" +fi + +DESCRIPTION="Provides a daemon for managing internet connections" +HOMEPAGE="https://01.org/connman" + +LICENSE="GPL-2" +SLOT="0" + +IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager ++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard +wispr" + +REQUIRED_USE="^^ ( iptables nftables )" +BDEPEND="virtual/pkgconfig" +RDEPEND=">=dev-libs/glib-2.16 + >=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 ) + 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} + >=sys-kernel/linux-headers-2.6.39" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --localstatedir=/var \ + --with-systemdunitdir=$(systemd_get_systemunitdir) \ + --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ + --enable-client \ + --enable-datafiles \ + --enable-loopback=builtin \ + $(use_enable bluetooth bluetooth builtin) \ + $(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) \ + $(use_enable openconnect openconnect builtin) \ + $(use_enable openvpn openvpn builtin) \ + $(use_enable policykit polkit builtin) \ + $(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 +} + +src_install() { + default + dobin client/connmanctl + + if use doc; then + dodoc doc/*.txt + fi + keepdir /usr/lib/${PN}/scripts + keepdir /var/lib/${PN} + newinitd "${FILESDIR}"/${PN}.initd2 ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} + +pkg_postinst() { + tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf +} diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 4dd3b9fc5c43..9992dc7e3a79 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -2,6 +2,8 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 DIST curl-7.74.0.tar.xz 2400972 BLAKE2B bef9e01493994afc933549a78b41065708aeaa9f6f5cdd1dbf2f43bbb03bbc97b17308b8bda5f11599c3cc0c6c77903e6fa6f1310ff874fad902a59566b51e8a SHA512 5d987f0b4d051c9e254f14d4e2a05f7cda9fb0f0ac7b3ca3664a25a51ee5ffe092ee072c0d9a613fcd3f34727d75bba14b70f5500cb110ca818591e071c3e6f4 +DIST curl-7.75.0.tar.xz 2418816 BLAKE2B 74889ede1b57a6685eef0f504d4c261c0b271b36ab3290bfc895efe9a6fffe4bfd433eaae438cd2b54a920671a2ebc2ca5e73bd88f6be40b4f46ef281028f1d8 SHA512 4c2fc6658379b8b93dd50665b70f3000b63d3bcafd2df60b7e651a8edf4735b3decb06c338b84cb22058191aa9f8f4dc85760a42f9987210b59300758304b746 EBUILD curl-7.74.0-r2.ebuild 8757 BLAKE2B 04230b4f348706178adc7d63a63c0b082eb46d1c5a9a7889af69d74fe32fed0308f736f7b87049470e41e2194d9c5277cd1ec7fa7aa21b6e1ba781a43df6f1de SHA512 8b57ee13c05d23b39e30c71383aaa2041f8603e5d46d78719dad303658573596bddd0a4fe9461d5d95fa9b8e90c6fba26d3e3874636dfa410eba8708d9c41d03 -EBUILD curl-7.74.0-r4.ebuild 8241 BLAKE2B ee8f0020a162b2c5d2f0227f2d81a201de9206601d96ac7eef8a969369e9be618d3bd1430a86f0c0a1a8cedba73c74b2d7b3b68e8bf3aeb3e117d22b7daa2dfd SHA512 b4ab766a0e1b0fa7850819dde114ce7f1d2e8f38ddecc56e215acd98335dba974e5714c2a8f0311fc2e527afc8885850aaf2fb68d4843a3e28b205384c82db26 -MISC metadata.xml 2032 BLAKE2B b9406f27a492123f45151d54e34056f26aac11aed12c8c69230f0a41602b42198d102edcdb36d6b890c818fc0b0ccce82b459e376f102d39a096646a17462475 SHA512 c33c12443b4489d36b9506b1a361547d5691bc0a6d997d5ae68869dc8f7936a6418b209bf80f61502c74e6722907c241d269089cb49b7c43a3c086dd52c8c16d +EBUILD curl-7.74.0-r4.ebuild 8113 BLAKE2B fbe25717bdfc5f72378663c6ca5d789ed804f9f781b681021fe673ecbc8b6610529f04e9a85651fef8b06c82a705c90733cd0b0f87f8a230ee542d0476127271 SHA512 80c82de586872712446702ddf9a69971f378ce253ea2511a07a6d0daad756254cc543a64e47034ed4e08099210b06fd2bb432e1269bfbdf62c53c55a9d526a5a +EBUILD curl-7.75.0.ebuild 8131 BLAKE2B 2eea96c28eb050bbce674de4922484b0ee269e7a2da55d964596dead5efafdc9638e102abd7bbb1b59a26ece7f78aa77cbec2feca05ea5d08d6172c3367b62b8 SHA512 a87d56e727c0bf9d9cd819ca9c8290581cd4eda32c1e3f20804845122e7be0a49492aec395048604fc16f9110b0be0c7464528069f7c0a78882e124cbf5c24d3 +MISC metadata.xml 2104 BLAKE2B cd965737bacd5cde978fdcb652559c3c29eee0083bdee82e00cf78055e681571e77a2deaf4ab6ef5a9aba0c33689356fc2299c346c4c1e6b4afda9c675b9f3b1 SHA512 a2e9ba5358d115b18fa089bd222f026a7553505a154e1d865af0cde1004a0a427f58ed38d802815d96453d5d58628aa91d8cd5d082fe059cb1afd4dc9d312052 diff --git a/net-misc/curl/curl-7.74.0-r4.ebuild b/net-misc/curl/curl-7.74.0-r4.ebuild index c7d9410a7e0d..07c50b9ce556 100644 --- a/net-misc/curl/curl-7.74.0-r4.ebuild +++ b/net-misc/curl/curl-7.74.0-r4.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit autotools eutils prefix multilib-minimal +inherit autotools prefix multilib-minimal DESCRIPTION="A Client that groks URLs" HOMEPAGE="https://curl.haxx.se/" @@ -12,12 +12,27 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" LICENSE="curl" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd" +IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd" IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" nghttp3 quiche" IUSE+=" elibc_Winnt" -#lead to lots of false negatives, bug #285669 +# 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}] ) @@ -33,7 +48,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) app-misc/ca-certificates ) openssl? ( - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/openssl:0=[sslv3=,static-libs?,${MULTILIB_USEDEP}] ) nss? ( dev-libs/nss:0[${MULTILIB_USEDEP}] @@ -72,23 +87,7 @@ BDEPEND="virtual/pkgconfig dev-lang/perl )" -# c-ares must be disabled for threads -# only one default ssl provider can be enabled -REQUIRED_USE=" - winssl? ( elibc_Winnt ) - threads? ( !adns ) - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_winssl - ) - )" - -DOCS=( CHANGES README docs/FEATURES.md docs/INTERNALS.md \ - docs/FAQ docs/BUGS.md docs/CONTRIBUTE.md ) +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) MULTILIB_WRAPPED_HEADERS=( /usr/include/curl/curlbuild.h @@ -98,15 +97,18 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/curl-config ) +PATCHES=( + "${FILESDIR}"/${PN}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch +) + src_prepare() { - eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch - eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch - eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch + default sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 - eapply_user eprefixify curl-config.in eautoreconf } @@ -175,72 +177,74 @@ multilib_src_configure() { # 3) --with/without options third. # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + myconf+=( + $(use_enable alt-svc) + --enable-crypto-auth + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-hidden-symbols + --enable-http-auth + $(use_enable ipv6) + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --disable-sspi + $(use_enable static-libs static) + $(use_enable threads threaded-resolver) + $(use_enable threads pthreads) + --disable-versioned-symbols + --without-amissl + --without-bearssl + --without-cyassl + --without-darwinssl + --without-fish-functions-dir + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + $(use_with metalink libmetalink) + $(use_with http2 nghttp2) + --without-libpsl + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + $(use_with quiche) + $(use_with rtmp librtmp) + $(use_with brotli) + --without-schannel + --without-secure-transport + --without-spnego + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + ) + ECONF_SOURCE="${S}" \ - econf \ - $(use_enable alt-svc) \ - --enable-crypto-auth \ - --enable-dict \ - --disable-ech \ - --enable-file \ - $(use_enable ftp) \ - $(use_enable gopher) \ - $(use_enable hsts) \ - --enable-http \ - $(use_enable imap) \ - $(use_enable ldap) \ - $(use_enable ldap ldaps) \ - --disable-ntlm-wb \ - $(use_enable pop3) \ - --enable-rt \ - --enable-rtsp \ - $(use_enable samba smb) \ - $(use_with ssh libssh2) \ - $(use_enable smtp) \ - $(use_enable telnet) \ - $(use_enable tftp) \ - --enable-tls-srp \ - $(use_enable adns ares) \ - --enable-cookies \ - --enable-dateparse \ - --enable-dnsshuffle \ - --enable-doh \ - --enable-hidden-symbols \ - --enable-http-auth \ - $(use_enable ipv6) \ - --enable-largefile \ - --enable-manual \ - --enable-mime \ - --enable-netrc \ - $(use_enable progress-meter) \ - --enable-proxy \ - --disable-sspi \ - $(use_enable static-libs static) \ - $(use_enable threads threaded-resolver) \ - $(use_enable threads pthreads) \ - --disable-versioned-symbols \ - --without-amissl \ - --without-bearssl \ - --without-cyassl \ - --without-darwinssl \ - --without-fish-functions-dir \ - $(use_with idn libidn2) \ - $(use_with kerberos gssapi "${EPREFIX}"/usr) \ - $(use_with metalink libmetalink) \ - $(use_with http2 nghttp2) \ - --without-libpsl \ - $(use_with nghttp3) \ - $(use_with nghttp3 ngtcp2) \ - $(use_with quiche) \ - $(use_with rtmp librtmp) \ - $(use_with brotli) \ - --without-schannel \ - --without-secure-transport \ - --without-spnego \ - --without-winidn \ - --without-wolfssl \ - --with-zlib \ - $(use_with zstd) \ - "${myconf[@]}" + econf "${myconf[@]}" if ! multilib_is_native_abi; then # avoid building the client @@ -280,6 +284,6 @@ multilib_src_configure() { multilib_src_install_all() { einstalldocs - find "${ED}" -type f -name '*.la' -delete - rm -rf "${ED}"/etc/ + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die } diff --git a/net-misc/curl/curl-7.75.0.ebuild b/net-misc/curl/curl-7.75.0.ebuild new file mode 100644 index 000000000000..89cefa1028fd --- /dev/null +++ b/net-misc/curl/curl-7.75.0.ebuild @@ -0,0 +1,290 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools prefix multilib-minimal + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.haxx.se/" +SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" + +LICENSE="curl" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd" +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" +IUSE+=" nghttp3 quiche" +IUSE+=" elibc_Winnt" + +# c-ares must be disabled for threads +# only one default ssl provider can be enabled +REQUIRED_USE=" + winssl? ( elibc_Winnt ) + threads? ( !adns ) + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + curl_ssl_winssl + ) + )" + +# lead to lots of false negatives, bug #285669 +RESTRICT="!test? ( test )" + +RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + mbedtls? ( + net-libs/mbedtls:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + openssl? ( + dev-libs/openssl:0=[sslv3=,static-libs?,${MULTILIB_USEDEP}] + ) + nss? ( + dev-libs/nss:0[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + ) + http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) + nghttp3? ( + net-libs/nghttp3[${MULTILIB_USEDEP}] + net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + ) + quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) + adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + sys-libs/zlib[${MULTILIB_USEDEP}] + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" + +# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 +# rtmp? ( +# media-video/rtmpdump +# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) +# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) +# ) + +# ssl providers to be added: +# fbopenssl $(use_with spnego) + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + test? ( + sys-apps/diffutils + dev-lang/perl + )" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch +) + +src_prepare() { + default + + sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 + sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + #myconf+=( --without-default-ssl-backend ) + if use ssl ; then + if use gnutls || use curl_ssl_gnutls; then + einfo "SSL provided by gnutls" + myconf+=( --with-gnutls --with-nettle ) + fi + if use mbedtls || use curl_ssl_mbedtls; then + einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use nss || use curl_ssl_nss; then + einfo "SSL provided by nss" + myconf+=( --with-nss ) + fi + if use openssl || use curl_ssl_openssl; then + einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use winssl || use curl_ssl_winssl; then + einfo "SSL provided by Windows" + myconf+=( --with-winssl ) + fi + + if use curl_ssl_gnutls; then + einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_nss; then + einfo "Default SSL provided by nss" + myconf+=( --with-default-ssl-backend=nss ) + elif use curl_ssl_openssl; then + einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_winssl; then + einfo "Default SSL provided by Windows" + myconf+=( --with-default-ssl-backend=winssl ) + else + eerror "We can't be here because of REQUIRED_USE." + fi + + else + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-crypto-auth + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-hidden-symbols + --enable-http-auth + $(use_enable ipv6) + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --disable-sspi + $(use_enable static-libs static) + $(use_enable threads threaded-resolver) + $(use_enable threads pthreads) + --disable-versioned-symbols + --without-amissl + --without-bearssl + --without-cyassl + --without-darwinssl + --without-fish-functions-dir + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + $(use_with metalink libmetalink) + $(use_with http2 nghttp2) + --without-libpsl + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + $(use_with quiche) + $(use_with rtmp librtmp) + $(use_with brotli) + --without-schannel + --without-secure-transport + --without-spnego + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + ) + + ECONF_SOURCE="${S}" \ + econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # avoid building the client + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use quiche; then + libs+=( "-lquiche" ) + priv+=( "quiche" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "-libtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml index aeae03a29a9c..63231cb33c31 100644 --- a/net-misc/curl/metadata.xml +++ b/net-misc/curl/metadata.xml @@ -26,6 +26,7 @@ <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> diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest index 8a2715cacd71..1b0fe7b1d8c7 100644 --- a/net-misc/dhcpcd-ui/Manifest +++ b/net-misc/dhcpcd-ui/Manifest @@ -2,5 +2,5 @@ AUX dhcpcd-ui-0.7.7-tinfo.patch 912 BLAKE2B 98d9797abc46573c3d83ca6d9d3c97746f9c DIST dhcpcd-ui-0.7.7.tar.xz 195648 BLAKE2B f382e331326e66d81674579ba018e6f9a6662df9d10fa0cca92808290e5d7621e7861afaa3d9a2c4d05fcc24b619922f8740faeaf4a531701f5d14505636fdf7 SHA512 46f66c16986c248740b2dc8ce0edb663fbd35809d2d21f701588c3736cdafb32b04c57ffbc6f8974841499ab46f6a1084d0a761b290e9d02ea3a9fae36a0ff3d DIST dhcpcd-ui-0.7.8.tar.xz 135028 BLAKE2B f3e79bb00708e2ce2ebb93d917506bb0fb015071b415768c47979d7f2b5e35d6f22bf71a58c43989dedc6561f0a8be738824f06627d2fa0995e335d7ef1925cd SHA512 5f0d2c32c32fc141feca0ab43a531d9b4f45e071a8a1e3ee1923d6394a3e5d6322e6f7e607b91154af4cfee93d649164c7ed3b805731dfc242c3ac367ec156c4 EBUILD dhcpcd-ui-0.7.7-r1.ebuild 1350 BLAKE2B 2242025e46d67967cde0c7619f3bcddc47301d3e59f1c3ff129b4d650af2a94fa4828832e32a512bcd0e44df5f7284a361ce283b463d5aadf66eaf4c0fe0b03b SHA512 c6e730f0d2d7b847b62aebf2171ea849d3fdaf068ef7894bd8b8acf09ec7f5fa4cc77ff89307739f5de34ead6d069bd574dbea761aa81091675119a5a7cd4f5a -EBUILD dhcpcd-ui-0.7.8.ebuild 1347 BLAKE2B 0db376ecc1252412680cc9a61bc1c58fb69aa64eb8a87a53638874c1ce5b0fba93cb8bc08e977790ba7ff159251416679630b119a4de8cde9f93c61b0ab92eeb SHA512 bbc00a4cfa65ad2d1087ffdd6f81d01928e0efe8d034fecffd7da6db84815a0f8989b86c44e95b75f44050948f2de84c02fb1a55496d4d8526d35a62528ff2c2 +EBUILD dhcpcd-ui-0.7.8.ebuild 1269 BLAKE2B 9d3b9877f5a35c65a2a6ca1461fe9a5bca4353ec5ec36db02f39b50fa69928f26bc5018efb3fcba8eabf6ca99653198daac4476837ea0df27c48dda3bd66f45d SHA512 182d54254e36eb0dad0228959ae23f1ca1a702e0a52c711df5829fdf3ee37d38e1efde139b0faa24854aa390f45ac07d26d0c6225ffe3121cb371b61246557c9 MISC metadata.xml 278 BLAKE2B f04208caf75cd1e148b392ed9177f706cab4a373ff62412f46496d7e18430c6cf510e29876b1ef581fc67f561b3e114bcf05ee94920b1e3a10e6554d6cbb2887 SHA512 c7530022ff0aeb201cceabe36c9386e65eeb8ac3fe1fba0c429545408d22203bd972943c7ba8e8058f1d4166d306dfe9a2f3508f07438853b8997ce6bcf43e05 diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild index 755b2b779ad2..c6399302fb9a 100644 --- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild +++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.xz" LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug gtk gtk2 libnotify ncurses qt5" +IUSE="debug gtk libnotify ncurses qt5" REQUIRED_USE="libnotify? ( gtk ) qt5? ( !libnotify )" @@ -24,12 +24,7 @@ DEPEND=" gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 - gtk2? ( - x11-libs/gtk+:2 - ) - !gtk2? ( - x11-libs/gtk+:3 - ) + x11-libs/gtk+:3 ) libnotify? ( x11-libs/libnotify ) ncurses? ( sys-libs/ncurses:0= ) @@ -40,16 +35,16 @@ DEPEND=" media-libs/mesa ) " - RDEPEND="${DEPEND} - >=net-misc/dhcpcd-6.4.4" + >=net-misc/dhcpcd-6.4.4 +" src_configure() { local myeconfargs=( --without-qt $(use_enable debug) $(use_enable libnotify notification) - $(use_with gtk gtk $(usex gtk2 'gtk+-2.0' 'gtk+-3.0')) + $(use_with gtk gtk 'gtk+-3.0') $(use_with ncurses curses) $(use_with qt5 qt) ) diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest index c752c3dfdddb..d93466658a37 100644 --- a/net-misc/dropbox-cli/Manifest +++ b/net-misc/dropbox-cli/Manifest @@ -1,4 +1,5 @@ AUX dropbox-cli-19-completion 161 BLAKE2B efbdc6b2ae9d8b0dbd5ee4ce833a323cb19c181a73e10a1d065b046e4a35db5a10270f55a6805d52f985be75766bdb56516ea787fd71f72609285455de9e85f2 SHA512 b54e326267ab5de72820be006ec02a0bb33286e6e577165cf0ad3ae3015bcd6f568f99a9866299b7ab64519907baa61a611514be067adaab3e11484d83d576df DIST dropbox-cli-2020.03.04.py.xz 14304 BLAKE2B 600378cbacd6e96c16e1c8464261b260f2d8919ef5f361c4f337386d3849294cf8557d44f1c5d4f5682eadb2f15885a16b0a8fa162929665e518801d23ec35cc SHA512 c6c8f2f3fb08818388f5ac812821a1530214ad18d58191b08092852aa953e2947871145b46a4df4debeb629a870e1182a47fd5a8bdf8b22144e686e19ede689a +EBUILD dropbox-cli-2020.03.04-r1.ebuild 721 BLAKE2B 5e1c5977446e37755fb8e469e7706f63e1ecaf393e0aa284cf8df51799687b7b5cde30729e08e211b5917f733fe73ba9128ae5c8de26cc73787e3db45fe3ad2a SHA512 3231e7339c24951dfcf1ca9edfad9f368c091cc4c98f278fcacc7b9588dba30997440b6bc394f6459e5275def1df25a01c15d03c71a8d88636eea7f4ea81051f EBUILD dropbox-cli-2020.03.04.ebuild 718 BLAKE2B 31a79d7496637ac2dc9f0aa532b1d35971089e650bbfd1dd041bb2a48fbf604e2c4a373e2863029ba5d2838171b2c71b5c49bb5056fea15c2abccc0d1b32401c SHA512 88c544821af866e7a93a0fe581e20a088911fbe063bbcd3d05dcb00ec0d9cc4dc2cac69470d7df7fae24ba2681a2a9ba5a4ecdf603383148f1963e58dc3805aa MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396 diff --git a/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild b/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild new file mode 100644 index 000000000000..f0fa39d2b7d8 --- /dev/null +++ b/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit python-r1 bash-completion-r1 + +DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox" +HOMEPAGE="https://www.dropbox.com/" +SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="net-misc/dropbox + ${PYTHON_DEPS} + dev-python/pygpgme[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}]" + +S=${WORKDIR} + +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/Manifest b/net-misc/dropbox/Manifest index 6a3358a9f045..969258bdd181 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -1,13 +1,10 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85 -DIST dropbox-lnx.x86-112.4.321.tar.gz 99004752 BLAKE2B adec5e29703d36ceadcaed1447b03d5edfd2249f06ab295c55c87684bf4b4c9c59a49a59b71158c17908753cb4dac51e17629cc2fb07c4b44d32d094cecae8e5 SHA512 222cb754713233b05fcf918995ca21d5b5663757304d1303534007872ea83e432641fa13b758b21dcd24568b63fd88b3fed1e45d15b0422226040e655796d369 -DIST dropbox-lnx.x86-113.4.507.tar.gz 100113763 BLAKE2B 6340195b5d6d47b077e4a7b335c4c1d3298d6504503fb39bc71e407d7e8e09cd80afaed9df84dd4e7ea875a8adf28279d9d348f54905958034152fd201b4e4cf SHA512 4e74df30a7debd5c8e2aca4a2494178392d6646bc7dd1966a3aa730b43f0759251a046a7e9266ce68f683786ef9998e71718be1769c574019d688b6420f7ee17 DIST dropbox-lnx.x86-114.4.426.tar.gz 100421824 BLAKE2B 1070be0d3607c8f3df0277dcae282bce704578d9c02fd191f32503dc1f152e6861b3945d19b186eda23ac8676b8e7da31050bc954a25e1b33fb4a4098d22f48c SHA512 d64ecd9889ab46c50ee6e2d7978afca3fa34fe3093f68ce2b328e488bb536a61a54c9c835be32765200e382dbaab3d8c025cf185998371793fb202c0998ab5f2 -DIST dropbox-lnx.x86_64-112.4.321.tar.gz 103084021 BLAKE2B 96c15e627434557663712bd6f679efd11b8a6e353757becf1a09830e6f16fb5652159af9601ae1ca84ec397aee277161bcaf1988589b782c43ec433b7ed69a66 SHA512 e22c5595ba5dc90e3fcc958be92ac5fb403f76d8567a03bcfb14e5ea058147f23564de6a2d020a37da4f5a0c34dc85ccbc528bf1f1c683b370899e22f6e652ab -DIST dropbox-lnx.x86_64-113.4.507.tar.gz 103671827 BLAKE2B 32bab397f2a964c63a733bdd5834cae5a872346fd56f539ce55df91755e8d4c9195e77723ca9d345fea5769163d15cd19406d28c9d4ff76b61d45ec77d729b78 SHA512 473282044032bab21e0d24c6987343b1cfdad98a4f608336d6c6af50e613e201ed71d56e5d231252e2eb3df236cdbba7c74ef1b6378fa88b1bce5995113d660d +DIST dropbox-lnx.x86-115.4.601.tar.gz 100133235 BLAKE2B edb1c89215511e4d36d0c2f1fba3f67e73b022efe7f3ff3cae2a85b089532659d2b0e685be5e017125a44897b487c5308225e44a39ced1dd779e0c212efe523c SHA512 bfd74e43bfeb9b65bf6dd84be7148cbca24ef33f16d24a9456eefc713dd3c6f583c0f4c2bd95b8ef13ec0d6a40b7a6b49e45d9c9179f8ee36326a62500119eb6 DIST dropbox-lnx.x86_64-114.4.426.tar.gz 104003045 BLAKE2B f71e9aba191f7258588aeb2cf2459eb0d9311c5c56e711f9b2932b8dfe2070cc0f1a20d3cfc9fc710ad75093e18fa494f9a42a6ff23d3e231e76edd29146612a SHA512 c9d42944e81fdb1ad315c388acdfba4b3da53bf90b6265c8ca030152c39ac0a60e8d064b1c47df7d8ecaca8b0801ad0851a2252d2241580cfc479cbf76e9fc3b -EBUILD dropbox-112.4.321.ebuild 2617 BLAKE2B 4c3c0dff5562ba9d40f10b6b5754a5f4ee8011bc7331a0ad9e2d89997a22e00752c8a062a24a4c49404fd6b2743f814b31e792c25ecbeecd0340a4edf33ddebb SHA512 3a89190dd79b8eb50e33262c3a76fd63476c09c42cdb7026abb72e4fd1eb109c92f0f6c09903af4874cb72c271998ceb21723a6f893fb954eade67c1be860765 -EBUILD dropbox-113.4.507.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d -EBUILD dropbox-114.4.426.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d +DIST dropbox-lnx.x86_64-115.4.601.tar.gz 103710196 BLAKE2B 9e909052c4b1c66f4c691801322c895471754f9081837fd1da47a19abf5be37f564044ebb6b5a9630b9c72033111b96b4575d1e225095d57fa8ce36fca4e7def SHA512 c13ce9651f8b6020a15548ff7446c7d996f50030aea7f9fa53b8c92c65dda3fac9441147ec1694194dc51f9663b3a2f869705048c65449aca1a502d402f37bf3 +EBUILD dropbox-114.4.426.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425 +EBUILD dropbox-115.4.601.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a diff --git a/net-misc/dropbox/dropbox-112.4.321.ebuild b/net-misc/dropbox/dropbox-112.4.321.ebuild deleted file mode 100644 index c4fb56f770ad..000000000000 --- a/net-misc/dropbox/dropbox-112.4.321.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop pax-utils systemd xdg - -DESCRIPTION="Dropbox daemon (pretends to be GUI-less)" -HOMEPAGE="https://www.dropbox.com/" -SRC_URI=" - amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz ) - x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )" - -LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-linux" -IUSE="selinux X" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/.*" -QA_EXECSTACK="opt/dropbox/dropbox" - -BDEPEND="dev-util/patchelf" - -# Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND=" - X? ( - x11-themes/hicolor-icon-theme - ) - selinux? ( sec-policy/selinux-dropbox ) - app-arch/bzip2 - dev-libs/glib:2 - dev-libs/libffi-compat:6 - media-libs/fontconfig - media-libs/freetype - net-misc/wget - sys-libs/zlib - sys-libs/ncurses-compat:5 - virtual/opengl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 -" - -src_unpack() { - unpack ${A} - mkdir -p "${S}" || die - mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die - mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die - rmdir "${S}"/dropbox-lnx.*-${PV}/ || die - rmdir .dropbox-dist || die -} - -src_prepare() { - default - # we supply all of these in RDEPEND - rm -vf libGL.so.1 libX11* libffi.so.6 || die - # some of these do not appear to be used - rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \ - PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \ - wmctrl libdrm.so.2 libpopt.so.0 || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf images || die - fi - patchelf --set-rpath '$ORIGIN' \ - apex._apex.*.so \ - nucleus_python.*.so \ - tprt.*.so \ - || die - pax-mark cm dropbox - mv README ACKNOWLEDGEMENTS "${T}" || die -} - -src_install() { - local targetdir="/opt/dropbox" - - insinto "${targetdir}" - doins -r * - fperms a+x "${targetdir}"/{dropbox,dropboxd} - dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" - - use X && doicon -s 16 -c status "${T}"/status - - make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo" - - newinitd "${FILESDIR}"/dropbox.initd dropbox - newconfd "${FILESDIR}"/dropbox.conf dropbox - systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service" - - dodoc "${T}"/{README,ACKNOWLEDGEMENTS} -} - -pkg_postinst() { - einfo "Warning: while running, dropbox may attempt to autoupdate itself in" - einfo " your user's home directory. To prevent this, run the following as" - einfo " each user who will run dropbox:" - einfo "" - einfo "install -dm0 ~/.dropbox-dist" -} diff --git a/net-misc/dropbox/dropbox-114.4.426.ebuild b/net-misc/dropbox/dropbox-114.4.426.ebuild index a77b20f7a3b2..17ace6762e14 100644 --- a/net-misc/dropbox/dropbox-114.4.426.ebuild +++ b/net-misc/dropbox/dropbox-114.4.426.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" +KEYWORDS="amd64 x86 ~x86-linux" IUSE="selinux X" RESTRICT="mirror strip" diff --git a/net-misc/dropbox/dropbox-113.4.507.ebuild b/net-misc/dropbox/dropbox-115.4.601.ebuild index a77b20f7a3b2..a77b20f7a3b2 100644 --- a/net-misc/dropbox/dropbox-113.4.507.ebuild +++ b/net-misc/dropbox/dropbox-115.4.601.ebuild diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index 0f6a3e074fbf..695d7280e9df 100644 --- a/net-misc/electrum/Manifest +++ b/net-misc/electrum/Manifest @@ -2,4 +2,5 @@ AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff DIST electrum-4.0.9.gh.tar.gz 4435268 BLAKE2B e1dfe319f7b4beffd039164c97d247f5d267d9d99313480bf06f9b748d095b33859cd8ea5dd5a135b38a1a206858e08ce500af8982ef7a6e3b3f7ff0233b9637 SHA512 a9a04163c8d76006ca18e1c50f38cabd7c3d7d75b16c8504627b9eb49bf9dca91800e18a585e7afd0b98fafeeeb821b967bea29928a46d10f65f0abc3fb90887 EBUILD electrum-4.0.9-r1.ebuild 2260 BLAKE2B e3e444bedf6174076d32d72e79328500045d0ae51a1d4b4beb939a4260e876eaec449d7a5ac4eda90ffb339530130e9ecf9932f166b0e7b91bc4de58ffae9f41 SHA512 eff401fec30e5ffa40659fef0e15665211bc09324ff4d3ff0677a3c019d19871b49a54fbe72f4c05d449660e27fcdf9bdc51ec745451d429b72cc644dad65216 +EBUILD electrum-4.0.9-r2.ebuild 2362 BLAKE2B 84a60036ec950f752b64524b811978dd5c55eb09502946eaa290411e8bff057d6c45f7a1fbb947019008e9f5b50b65731658a54aaf952c567c59c6873673dbda SHA512 02b33eeb034a52d310f68fda91327ed13272c7ec2dd7933e381889857b4c3844f50227b384bdc79f1ec09de321aa5b7f928844665711e641515956cfe5459e84 MISC metadata.xml 653 BLAKE2B f58eed53ddc5608c39d763bef2b9543ce30c65a97afe157b84522b1367d19594855c5f8e39424af90c88934938601d98c5877f7d1d081aa5cc5be45cf19044a2 SHA512 a2d76c85cf2e409a1b0aa6449e43e82f1d88a4d7fa72c6282c7f7e55819d13b04dc733e3b297635aca1cb65136822b447feedf76358b948738489f8e0de97ea6 diff --git a/net-misc/electrum/electrum-4.0.9-r2.ebuild b/net-misc/electrum/electrum-4.0.9-r2.ebuild new file mode 100644 index 000000000000..434ffec4d5b6 --- /dev/null +++ b/net-misc/electrum/electrum-4.0.9-r2.ebuild @@ -0,0 +1,97 @@ +# 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 xdg-utils + +DESCRIPTION="User friendly Bitcoin client" +HOMEPAGE="https://electrum.org/" +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 + >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}] + =dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}] + >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] + dev-python/bitstring[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + >=dev-python/dnspython-2[${PYTHON_USEDEP}] + dev-python/pbkdf2[${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.12[${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 + +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 + + # 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 + + 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() { + doicon -s 128 electrum/gui/icons/${PN}.png + dodoc RELEASE-NOTES + distutils-r1_src_install +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest index 9570be679bdb..2ded2c1fb390 100644 --- a/net-misc/endlessh/Manifest +++ b/net-misc/endlessh/Manifest @@ -2,6 +2,6 @@ AUX endlessh-1.1-syslog-help.patch 898 BLAKE2B 97d075e3f0e86f560cc57a2227f15ed88 AUX endlessh.confd 1076 BLAKE2B c25a41bfb71eeaa7b6bdfb4651a1e0d8af91fb1fff6aa1c8edcf31917447d69645d9a00f280d5e7ee88c11c071906d306e916bac72061d5cdcb871f55247752d SHA512 6338bd15f0120936a14aec0b4979fd4422a736e5a5eb7428a5e816cfb0671c24764ba2ce4d6bebfc5488fab18ffd8b02b52f778e0a395891da6352e310135bad AUX endlessh.initd 767 BLAKE2B fdc7a57dbf9812880ee2b95f3d23350375ae960431929c5823647d052eb38fd6d3bfb87e9a3d33356018d117a73ba1a78a855972d7e4e11d35cf3a8910b2473f SHA512 2deb46cfcdf002408933f8e20287c1be3a0deddf41d97229ec30408e769b0c9a5c8575cb3e43939e385a3187def4451b7f20acf1641da403f335d435ebabf322 DIST endlessh-1.1.tar.gz 12844 BLAKE2B 8828739844cb03f67067bb020c3da5b5c6610a195202776da1ae184c0ab02c9f2acef32cc6536bbb80a46242251e3425eed2c70b0d1a90b0e73696ac14babc94 SHA512 7df2463425ad1417a2e328eacfb840aed14727168b83b5adf80cf6c5c98a6fc05f96bba9257b543ef60202a74383e4978e92c4a1b959e35d4ab94e0e5bda14fd -EBUILD endlessh-1.1-r1.ebuild 1335 BLAKE2B 7020443bb021f25668b40d923b792a4de32c25f31da9ce1f3fad3d4455fe0c3ba2ef51d046a080b44ef1a3b2fa67e906ff6658eebf4f00548a4e6afc2b45b332 SHA512 9315012e6770a895ad9a8123e3bd5c04632558c6098df0cd8b468360e0915b4c0d9bfa4d817c2028d36be7e5e228429830807a7edecd896b1d23826ff68f41a8 -EBUILD endlessh-9999.ebuild 1281 BLAKE2B 848c81ceca759839ef436cce8c906392a9265cb43dd04e5adff8c2efc8f9a7879e6fe3b0639375c1ccd79489314427d1ae230e4a4a4a41df94c6767dabb6d97b SHA512 01da5e8c76ca8eb794417162537048156ac2772da596ca1ab75641fc57a64a6c3304b56c6c116dd46ff50dd088265f05c9fa81c49a2e1379fcffc70a90750d43 +EBUILD endlessh-1.1-r1.ebuild 1328 BLAKE2B b7b524612185219a5399517bb2c411bc477ca8593757de59a66efc91e7595248ffb4a54b61842c2d085aa770754cf8b7424bf9ff67896756df15936d54a0a996 SHA512 8f98368d49f23d11fc299c7048ebe108e65ceeb9591265911091008b108d15146638d2d54bad56898663b005f704e7d6331172dfbea7c51631288bdfebed98cf +EBUILD endlessh-9999.ebuild 1274 BLAKE2B 86e33cf561e21d916f1b7d04b9437b3a18e23c609001ebd573b22a2b06936f714b544bec8aca2f0a83508ff134fed56e245c560a972499c4bb1f3abcd2bc20aa SHA512 d47aa21b448bfa5e82b097b0fefc7c3caffadbe88c3a29098ba7b70c001439ee9e83da34f60ee7ef0789b62a028cbc656a5ac7e0b5123f2e5e169bff5f4343af MISC metadata.xml 919 BLAKE2B ab8d02aa829751a4903ac5f0774ea59058604ff0bb3297a910eb8f705c5eb5a663a48bb96f4786aae0b477bf171d63478075f78b06eef5dedd4039100b2a62b4 SHA512 ac33dcf8f76eb84c1b78bebea62ea07e8dfd3c727e6ca37a1cd180841a6dbd4e969922e5fc3cb09883ece3255873e462d9e39980ad01291e06bf817af9644ac4 diff --git a/net-misc/endlessh/endlessh-1.1-r1.ebuild b/net-misc/endlessh/endlessh-1.1-r1.ebuild index eb2ab463fcba..d1022eecb731 100644 --- a/net-misc/endlessh/endlessh-1.1-r1.ebuild +++ b/net-misc/endlessh/endlessh-1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -41,7 +41,7 @@ src_prepare() { -e 's/^PREFIX/PREFIX?/' \ Makefile || die - sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \ + sed -i -e "/^ExecStart=/ s:=/usr/local:=${EPREFIX}/usr:" \ util/endlessh.service || die } diff --git a/net-misc/endlessh/endlessh-9999.ebuild b/net-misc/endlessh/endlessh-9999.ebuild index 45747936cb6c..8d77c61d5a7e 100644 --- a/net-misc/endlessh/endlessh-9999.ebuild +++ b/net-misc/endlessh/endlessh-9999.ebuild @@ -37,7 +37,7 @@ src_prepare() { -e 's/^PREFIX/PREFIX?/' \ Makefile || die - sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \ + sed -i -e "/^ExecStart=/ s:=/usr/local:=${EPREFIX}/usr:" \ util/endlessh.service || die } diff --git a/net-misc/ethertypes/Manifest b/net-misc/ethertypes/Manifest index f49ceaf2ea8f..83cd2c2ad2d8 100644 --- a/net-misc/ethertypes/Manifest +++ b/net-misc/ethertypes/Manifest @@ -1,3 +1,3 @@ DIST ethertypes-0.gz 770 BLAKE2B d3d14fd99da30d5c4b366edc003653089468358323a58afd71770de1432588413d38ddf3c3f77b0b79a90d761e1e9c677efe594b64a995f6acdcda2b92da61f0 SHA512 62a88a76b3c3ce54b7c4b457cfdd7ea0d13e9deeebd485d37cfcbfa1cc1adba4bd82944e8d0a093c07594b88726376ff53bf70f61ca91a90af5550a455fe6643 -EBUILD ethertypes-0.ebuild 587 BLAKE2B 7000f1f1e07cde73fe294673555020f0434876d53448c6503b8994d56083664fa564b2f8b994daff2bb247008fce50996522252996b57ab327d51eb660d4dd7b SHA512 f1a0ea67841c435866cc16048cef061ac96b03a630817274ece5bf7b092eff73e76135d0fb5ffb2c5fe43c1165b750a51c21bfa5ce2f3aa96e76c428043fe8cd +EBUILD ethertypes-0.ebuild 587 BLAKE2B 632f5fa2cef51732a36f612a12770e06222a2028e969969356b639bb5ab735860f554fb780b35e88d6790a8b76ef07c4aac7a5d2cfa1ea31863c2dde331e4162 SHA512 09f97f07e38a68968ff0b7623fe12937c90eacaecc1c86a2bc645ab04dafc5a4df2c16bfd7b83ceca286af22e42e6cd1d99e54c4e7a5db99d20331877e5defa8 MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb diff --git a/net-misc/ethertypes/ethertypes-0.ebuild b/net-misc/ethertypes/ethertypes-0.ebuild index 54aa239f7855..49477fe2b1b6 100644 --- a/net-misc/ethertypes/ethertypes-0.ebuild +++ b/net-misc/ethertypes/ethertypes-0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Maps ethernet frame ids to symbolic names" HOMEPAGE="https://netfilter.org/" diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest index caf6a38fd3d2..7bc855527cde 100644 --- a/net-misc/gerbera/Manifest +++ b/net-misc/gerbera/Manifest @@ -2,7 +2,7 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417 AUX gerbera-1.5.0-incomplete-type-iohandler.patch 801 BLAKE2B 6b0a24b74d1970c98c3b98600c491775d7c9d9c84f601f85319c53d665bad2ee7d41bfa6a933b96eb9cf6204a920ddf836447b52bbcccb4e8b857a66ac7d4481 SHA512 fdc77063b98fd0adda2d93891fa58fe54c2f96a3e8c3904ec64f6daf387169d765fb499e6cf21141b715d8597b66384cd475456876f0fa4a196f9d007f05009d -DIST gerbera-1.6.1.tar.gz 3061089 BLAKE2B 6edd26318da6d69b43d983089bd31c0f77891590fe7094da9c77adb8e91418a11aecf0cc3c8fc602758a7d5aafb6e0f8726c85acfc89dc011c89f2565ede38e9 SHA512 488ce58fb1ef0c5412ba85876e04ecb6a71836f5064f29e9d4e786a4e66226522ca331be0c9c577bba3ea8dad7807ab032a0fe306bec0942e37bbfec25634247 -EBUILD gerbera-1.6.1-r1.ebuild 2384 BLAKE2B 85849a8cd60154faa97a02cdbea3577055b593917b98d497c91e5c2190ee628a5c1b9308e512d92138f74819bd8d3ba72b098095731d8987b5aaab50a8b804a9 SHA512 978c07cb4de189122948cdf0f57960c93580b5a10fd3fa0c2078d68be1fff0ffd722d4f686d3245ee61cacd6bff1e7d36d525bcbc1f155764a41e7c20466a6c2 +DIST gerbera-1.6.4.tar.gz 3060809 BLAKE2B 1ab10a20803adc84162b35f28b35910dfb2454d57a57ef7ebf9d0049c493892fe28aec7ac38e6b492e35319e3c12f4c7750649ce5d9a7e6e4a0bfcbb47e7983a SHA512 82bf58e22b58039cb1f7eb78b6f519507dc3d8eead4aaeb27764c5ed7926c7d069b854fc9050ef69d1d3982bd06f5a4620eedac9a35c91947e8acfa2b2508b30 +EBUILD gerbera-1.6.4.ebuild 2383 BLAKE2B c08200f8772511e87b5ee217d0d773f8767720bbaf05451b7f6c66a5cd5d5748d5ba4bb90e7d7d5b13433dba7d901a48e96a7c7f476db85dd1ee231bec55ae45 SHA512 ce9c73dd12ebbd63bb4883e75b1f8c901218af84ce2a93ace398f2edc18f92f1ce9c1bfa32bfe01d128bb11c20ce72f2afc78cad22e885e93fa00863c5537978 EBUILD gerbera-9999.ebuild 2312 BLAKE2B e14fa49d9f340222dfe2510d529751d2d9768ef0cbb904d5a80c34870e292979041a63ecea9bd73be9b7623d9e76ff9dbb8015a5aa8af36753ff1c262977ae31 SHA512 8b37c17d9506c62a09b27be189b46b1b8e8711e8a4b499625d55c8af336f61b1b8a8eccb24c3d5eb3d7bda9f918fd1a1b2c667b42ae375030ba6fd422f6fbf86 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09 diff --git a/net-misc/gerbera/gerbera-1.6.1-r1.ebuild b/net-misc/gerbera/gerbera-1.6.4.ebuild index 115656d77bf1..5c8e623be8d1 100644 --- a/net-misc/gerbera/gerbera-1.6.1-r1.ebuild +++ b/net-misc/gerbera/gerbera-1.6.4.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 @@ -36,7 +36,7 @@ DEPEND=" lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) + ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest index 2881d84276fe..682086c422b9 100644 --- a/net-misc/gsasl/Manifest +++ b/net-misc/gsasl/Manifest @@ -3,7 +3,7 @@ AUX gsasl-1.8.1-sasl-gss-extra.patch 944 BLAKE2B f48eba6d1b96ab5f7e1cdc5c2220f4a DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c1a31dba1edc632de78a529fc2acf2b5e4df3a7bc9a721c6bdb819aade85d65245dbb14405413b933220454a79 SHA512 8b1dc87e85dbfd0255b3b43c4b7f9c2e896cb03efe4cd4af86393b62fd193665aae4ce59e66db736722e32babfcea6d4f6ddd3c5f069dcc4210f7e9531043e4a DIST gsasl-1.8.0.tar.gz 4914837 BLAKE2B 89cae140bb503556003036a92dfdca1ad7adb6ca46826a7309dcc39aca5a070669f4c24005ddaa1c5f5d4d56451d7a5c5164a4333542b0af1201f3fb210501e8 SHA512 711bd87d27656834ae7e19b22a76db2b1db37dd25999cd303fe8439e23e74e87fd1474c5db1b5f97e9ab75437eeeb6167a752e9191f364f530eeabb6cddda36f DIST gsasl-1.8.1.tar.gz 5774550 BLAKE2B 0144b0d7b2750686f3447a9d154a2d0b7fa5261b614bce74d8fdedaca140f9d964868b57f1a67cf2f5fc446c5715bae3dcdb4e06a7bedc5b66d50fa52f62e93b SHA512 8973f5af12cc17aae76a4a2ea887d17e74e48b1ce896dfd62fde8cb874ed965d77c62d671ff86ce3217158e58a7a521b7fde9ea606f73c3a912a8973f1b204cb -EBUILD gsasl-1.10.0.ebuild 1739 BLAKE2B 907f6b7dec317d608bf4dfc54cafecd7d387a7f22de0a13b7ed94d7f7a00e3c56cde1788269ac0314690a6cfccffc857c6d87a23f16b3f77366a6da182508e06 SHA512 f905bf225e6196a2c3cf71332e5a0050d5d42974706336d7b24acf46b5a4d68a822e71397c901d26162607b57c61a343164483fce0a849f5f415f5b5b9dc66bd -EBUILD gsasl-1.8.0-r1.ebuild 1797 BLAKE2B 5919ec09d3f0c47dd7cb447639d91de50a0bb774e3a74fd30b965d7c6a68c87e46b5cbe4bb249d0acf99e2e5c0afacbfb5a060170933a7681893be6241f77039 SHA512 a445f4165baf5fe2e1f0cdb66e58c0d93173b654a85a4acb72863cdf7c25d96c62710a77db3642de9af7010ec28b946c2f687d92898e4919151c54570a87d217 -EBUILD gsasl-1.8.1.ebuild 1797 BLAKE2B 8793ae17801be1417f1d294dc825a49195483703ee13a29e457dd169c4a3512954187dbe82aee5474a71a65b22e462045ddd29c511dec65d3a8a439feb2ea748 SHA512 2856a453b72e26561d6b0f2bee46829a2af992b0f37fb4c9c41d4c2bdca806c6a00b919a4e3e144a0e14ee62038d29cbc6a4b3a6d0b8dd6680aaa47716137641 +EBUILD gsasl-1.10.0.ebuild 1779 BLAKE2B 416e387229cc0a178d948053793d7f6c010f32cae055900323a5152d1863e706bde9659dabf9ca96559e1c88711366dd7d840cf1b40fa45b74990cd39c21b2e3 SHA512 dba3b09d9e235753231b83ca2689018336c17d063b98ed485a490296df56d29f436a8f4f8f20bb97adcacef745f876522ee722ad69d38b51fea4980543bc6327 +EBUILD gsasl-1.8.0-r1.ebuild 1840 BLAKE2B ee6f2e8631f11e3feeaa08b3536d7398c3dcaac7757a47c26cabe85a677580d1dbf381c61d207600a9499b5b4c22130e38fbf277a6a8e7519bcc64b265994633 SHA512 bb91d61532d7743c7bd97707e24628cbcacbf02accaeeb74af9a0621f0caa014824de4bfd3681cf025d533858883adc1d9b157a024cf7c653cb5b6d25a6d8702 +EBUILD gsasl-1.8.1.ebuild 1840 BLAKE2B cd9a24685a71838e915ddaa90921c5e9f4cc94e487fbf9b86ba33dd0ffa91521a5700f2b0f378c9c7463372320393febc3896814677820343202cd672cdc1fa5 SHA512 dade3867fbf769c5b4dd2cac931f00c1b48c5a8aa9309bdb7f54a22eb78ce354476d42485787a0b35018010fb6eed6edeee5d7ced12fc275d7df7c6acd84fe64 MISC metadata.xml 370 BLAKE2B cb234f93a667fd37ab122fbb8ae0926fd0bacda2d9e4f1e50de9e8793d6ed01f0165e16dd73931114aead2e408b2f019c06cdca7aa41d9e60c9d60cf9f7e9955 SHA512 c528d4a5f51ebcbc5917268964716d667b71e825815bdc0dbd627f1ef676b21312caf442de31e7912ad57f5c908471a7fad1617e129a2902134a081e91bcc4c0 diff --git a/net-misc/gsasl/gsasl-1.10.0.ebuild b/net-misc/gsasl/gsasl-1.10.0.ebuild index abf23f7845da..a9891b41bfc4 100644 --- a/net-misc/gsasl/gsasl-1.10.0.ebuild +++ b/net-misc/gsasl/gsasl-1.10.0.ebuild @@ -5,12 +5,13 @@ 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" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads" DEPEND=" diff --git a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild index a1e9339e1b73..35ba6ca5ea1b 100644 --- a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild +++ b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# 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" diff --git a/net-misc/gsasl/gsasl-1.8.1.ebuild b/net-misc/gsasl/gsasl-1.8.1.ebuild index b98f4c288359..06d078bb87f4 100644 --- a/net-misc/gsasl/gsasl-1.8.1.ebuild +++ b/net-misc/gsasl/gsasl-1.8.1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# 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" diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest index 09013d0cd5f3..737abae5b342 100644 --- a/net-misc/httpie/Manifest +++ b/net-misc/httpie/Manifest @@ -1,5 +1,5 @@ -DIST httpie-2.2.0.tar.gz 1761927 BLAKE2B 3ce8acf4abf9cb189315e07e7f9c8dfc1b0a537696a2c9fd795e8e944c85c1df8e7e13fbaee68d3b93115296ba048e664d31245fe2c6b832123818292b4fac8d SHA512 00c1f34041854319816d7d643a79358723c27a3744f405d629b5361685745bfdd8ce0a0f127cb3d6746e46405d24562625ca37733a5955809d7bfc077ae5c533 DIST httpie-2.3.0.tar.gz 1769401 BLAKE2B e9bb5ca9ebb5fde3bed66ba15c46cccff1f8d5d01841f954fe4d19be92d3282cd3c19e1fc34b42fe1c36798438aa116f5bb91147864be9d8ee37030cb7796e16 SHA512 d0c5b46075892e9d6df76c1e3b430fcd768238c7fbdeda51368dc1bc7c657efc901088ccb7f1e6fc6e4f54dde4c9bcbe626dfa926c8ca1a6bcfd12e522414505 -EBUILD httpie-2.2.0.ebuild 1047 BLAKE2B dab187b07f3c6195f43dade2eb4ffe64e964cd385b5ce736a78c53104e33329aaaa6b3f632d74cb140cf772ddcbc362566c703dc375df90377bbd2e727376fb0 SHA512 be7bb36e2fa694912fa2d889345c76c1e86e583b8a16f0d648fd3334196691936cd100646e3d9974ed3dc13470ffa56d1eb817196239287f32222e5856d8ced1 -EBUILD httpie-2.3.0.ebuild 1581 BLAKE2B d1b7ac93924ee2f29c4edb34b6848900e6a991b0039f74ff6616bc467067be6820b198b279d04f75ec01e35e0b8c59df9d15b23a634642e73ca9e28d315f6d30 SHA512 7dcf0f5f054ad75d62eaed2125caeb1c9a31d0eba8e12663433fb436e3f8813a923a2c7d80bd5ebb5b9efe4b6c1689522be39b6ac9b9d9a7550749f5683c74cd +DIST httpie-2.4.0.tar.gz 1772537 BLAKE2B 111451cc7dc353d5b586554f98ac715a3198f03e74d261944a5f021d2dcc948455500800222b323d182a2a067d0549bda7c318ab3a6c934b9a9beec64aff2db2 SHA512 44cc7ff4fe0f3d8c53a7dd750465f6b56c36f5bbac06d22b760579bd60949039e82313845699669a659ec91adc69dbeac22c06ddd63af64e6f2e0edecf3e732a +EBUILD httpie-2.3.0.ebuild 1580 BLAKE2B d21fdd15e5656af0a54d13652cdcd7c6ff4e8eb57875fe6c5200b496172d399ee566998d1d75be36fafd1e0504005e750ebab8437c7283eebf26b7a51e2e4baa SHA512 39e169d6673a8c120ee64efce8957550d43fdac6cf5fc31554ba23d69e4feda2da355d8f7dd67869e0c51b4de09ea5996f53fd238b0a957e0b876d293235640e +EBUILD httpie-2.4.0.ebuild 1579 BLAKE2B 2ee916321ac4fb4e0bacc3477b142bf1f3579a636fb9bf84ee0031f7c4bcb6e0874da3b9f1009bbaa8a83b8e4546895ba0a4b0a61a09626300efd5fe3dde67a4 SHA512 0e05c02df76810f03817fa0964474cbb6cdf7f3dffba71f911871fa58094128f4637f88e0e2018ffb183202f54666d617e00769574926118faf53b7ffdbba7a2 MISC metadata.xml 749 BLAKE2B cb920766146fcc33952835a6e2fff7aeb12dff221655b53550a5158679639256529d51165dc25697ceac13113c6b34e3b174f75fb34e448c0d3121790324c06b SHA512 c3da003a8f72ab4df475211a13c35d83b0cbae2883fa7babecc3325c16ad967f80c25e6c28b35d1a120dba627a82ff629dde26aae62ad6e86494579e2e3eff3d diff --git a/net-misc/httpie/httpie-2.3.0.ebuild b/net-misc/httpie/httpie-2.3.0.ebuild index aa283a907f97..fb68e7636b15 100644 --- a/net-misc/httpie/httpie-2.3.0.ebuild +++ b/net-misc/httpie/httpie-2.3.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.ta LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/net-misc/httpie/httpie-2.2.0.ebuild b/net-misc/httpie/httpie-2.4.0.ebuild index 213ab2c2d83f..ee9d95b77935 100644 --- a/net-misc/httpie/httpie-2.2.0.ebuild +++ b/net-misc/httpie/httpie-2.4.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# 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} ) +PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="ssl(+)" inherit bash-completion-r1 distutils-r1 @@ -15,22 +15,41 @@ SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.ta LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/requests-2.22.0[${PYTHON_USEDEP}]" -DEPEND="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}] - dev-python/pytest[${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 diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest index 52407bdeb167..36de07cb9684 100644 --- a/net-misc/icaclient/Manifest +++ b/net-misc/icaclient/Manifest @@ -5,11 +5,10 @@ AUX ctxwebhelper.desktop 320 BLAKE2B 877ade9bf35ca53ca81315e7ab6e9854e35d2392ad3 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7 -DIST linuxx64-20.10.0.6.tar.gz 119730020 BLAKE2B 62154534ee83f18ebd71c4f2d247863c028ad34dfea1fc1b182e3dd5ef3296f65a45860a1b613de286e9d1a5ac52f4ea00da92ba221619194608ccd453306112 SHA512 ec16064483c94c3b56caef622c2091e845613bd0926174fd40474f7f74d62a56f3d5dce2398e42b12a7c774b62dfe605ef7c9f7556d14814d902047a35154c68 DIST linuxx64-20.12.0.12.tar.gz 120763336 BLAKE2B 4db068617ce7f47351bf8d0b964f00719705090d7a805eccaca3823648852fa12b894aa2f55d5abc0c6936ee01204bc2967488368797d081f6fd97f1a1cb25b8 SHA512 9bc6fd49dea450269ac9f70c20fa5b6a3fb7812e83005063ce5a32032d02a2283d13fa25e64a426c1b7e7cce717a3c4dd0ce2903a51a12758f7f7c3efb558ae6 -DIST linuxx86-20.10.0.6.tar.gz 109881795 BLAKE2B 0deda5cd800a891a1c15f8e1b6f553b86ee1d90177ddb75460bc6f5a2afe40e9c56cc1427c25ed64ba66741ba0749efc736ea653ea633aefd086a3fb2e34d1d2 SHA512 027658ecc25775d3436a4a02f36a6fc7da766b909d2b21284e3d7f2c658397b4e3e496556eae84f241dca41b155ee2f7088780e5d89e295d641aadae3908cef8 +DIST linuxx64-21.1.0.14.tar.gz 143364053 BLAKE2B 1835d597ebdf392c900862527424b146cf8dfbc8150cf76004a3c94cfb2ecd214b60c974c55110c90b958dc5bfae11c3bc5923aaa88f1840d5714a88b9d15b9f SHA512 817e1318302475a32e1ba718f2a5279ce70b033de1b384fa0ffb7b2a225b1eb788f70b83fd55f5ba9a66a98500c0c30a44bdc06f85f61c84e28cd1cd95a49d32 DIST linuxx86-20.12.0.12.tar.gz 110107767 BLAKE2B 1958eb57622be69edb95ac2c0389f5dd98141bc92899d876b3c4911629c63a3d5b21bb2c7296975a41afbcc321b733fd05a6874ff4b03d79ff3c4aa6a1a44ec9 SHA512 e976ba3c00bbb16aa1039ac510fdb6118c1353e9ba4a67b4ac553896b6b51346d16ae8a569ddfbbc3ab89f89b1759789e2bb88e397611140e5caf11709917d98 -EBUILD icaclient-20.10.0.6.ebuild 4853 BLAKE2B 9bd96d270e9ccba3cd55b9397dd7a35033150cd318e174af9cf89878fed2940930ce7423a7ef12490b6d2cc07015376d3bcdc844f57487c1bedb144ab44e475c SHA512 a06fb2a3732e541bf052d94fbd3684e9fbbc6dfdb74a778c6f3ee90e837b5cd4c2a176156bab322a9b3a8527f5543feb245ea321fe136260bd9a06c42531c204 -EBUILD icaclient-20.12.0.12-r1.ebuild 5257 BLAKE2B c9290b8d671b3f1724f3c9469a6b1cac335c21bc1f7ef61f86f5e598fd7035915772199d9fb11e860f1e3be2a1202470bd8412b1a40d5fb79218c6829eacb226 SHA512 c354868982eabf494d18e184ff0045e9caba639d1bc561098549281d923c62386d7010c280ef411e61880658339c12aea52091c7db25da186ef0033e89556c82 -EBUILD icaclient-20.12.0.12-r2.ebuild 5336 BLAKE2B ba5372eab77e9f407818b50a2c068f53446de00422324de160be3a178d1c624558a0e25333966bcfe47c1d61e93bc6e38025bf3fa776e13506539b1c2ab898b6 SHA512 b8c86453827e697617955954d1a2756a074b641921cfd0cba2bd61edffdda96d1c665e7bb5499d1738abd0137e222bf85ec1018fe64fd20c39184f196b0a846b +DIST linuxx86-21.1.0.14.tar.gz 120010131 BLAKE2B 1e9380509cbbcd1849b0e306224447ad64d86717e636387eb3368eae318921b025029852c5f89a1ab1ca295d1a33ef4741468dcb00f3ffd7d442d8cf3d43a945 SHA512 7e8f6646262b2d59f08ed8a200b7fd71e029066210facba99eeb003c59ec1a543180a8e05d403aecc668b3f992b08198a567fbad86ba3a16b391afb30b453413 +EBUILD icaclient-20.12.0.12-r2.ebuild 5334 BLAKE2B 60e3c38841a6a507c9649e83fe012271f9acf1b88407a8ee411a738a73e4b7b288c136682194fd1f4b4688a84609ad5ee7509deb7857432899351ae02c18c1bb SHA512 9edefe5630ada112037046543cb25aedac3354f413fea1e1e77e96941cccca98ddb56565c5fde1a27036dc8b027194060cb0ac57ee36b2d3cd0762a18971399a +EBUILD icaclient-21.1.0.14.ebuild 5336 BLAKE2B ba5372eab77e9f407818b50a2c068f53446de00422324de160be3a178d1c624558a0e25333966bcfe47c1d61e93bc6e38025bf3fa776e13506539b1c2ab898b6 SHA512 b8c86453827e697617955954d1a2756a074b641921cfd0cba2bd61edffdda96d1c665e7bb5499d1738abd0137e222bf85ec1018fe64fd20c39184f196b0a846b MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e diff --git a/net-misc/icaclient/icaclient-20.10.0.6.ebuild b/net-misc/icaclient/icaclient-20.10.0.6.ebuild deleted file mode 100644 index 57eda077ca0f..000000000000 --- a/net-misc/icaclient/icaclient-20.10.0.6.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# eutils inherit required for make_wrapper call -inherit desktop eutils multilib xdg-utils - -DESCRIPTION="ICA Client for Citrix Presentation servers" -HOMEPAGE="https://www.citrix.com/" -SRC_URI="amd64? ( linuxx64-${PV}.tar.gz ) - x86? ( linuxx86-${PV}.tar.gz )" - -LICENSE="icaclient" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN" -RESTRICT="mirror strip userpriv fetch" - -ICAROOT="/opt/Citrix/ICAClient" - -QA_PREBUILT="${ICAROOT#/}/*" - -RDEPEND=" - dev-libs/atk - dev-libs/glib:2 - dev-libs/libxml2 - dev-libs/openssl-compat:1.0.0 - 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-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/libvorbis - media-libs/speex - net-libs/libsoup:2.4 - net-libs/webkit-gtk:4 - net-misc/curl - net-misc/nx - sys-apps/util-linux - sys-libs/libcxx - sys-libs/libcxxabi - sys-libs/zlib - virtual/krb5 - virtual/jpeg:0 - virtual/libudev - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXinerama - x11-libs/libXmu - x11-libs/libXrender - x11-libs/libXt - x11-libs/pango -" -DEPEND="" - -pkg_nofetch() { - elog "Download the client file ${A} from - https://www.citrix.com/downloads/workspace-app/" - elog "and place it into your DISTDIR directory." -} - -pkg_setup() { - case ${ARCH} in - amd64) - ICAARCH=linuxx64 - ;; - x86) - ICAARCH=linuxx86 - ;; - *) - eerror "Given architecture is not supported by Citrix." - ;; - esac - - S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" -} - -src_prepare() { - default - rm lib/UIDialogLibWebKit.so || die -} - -src_install() { - local bin tmpl dest - - dodir "${ICAROOT}" - - exeinto "${ICAROOT}" - doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord - - 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 - insinto "${dest}" - doins nls/en.UTF-8/eula.txt - done - - insinto "${ICAROOT}" - doins -r usb - - insinto "${ICAROOT}"/config - doins config/* config/.* nls/en/*.ini - for tmpl in {appsrv,wfclient}.template ; do - newins nls/en/${tmpl} ${tmpl/template/ini} - done - touch "${ED}/${ICAROOT}"/config/.server || die - - insinto "${ICAROOT}"/gtk - doins gtk/* - - insinto "${ICAROOT}"/gtk/glade - doins gtk/glade/* - - insinto "${ICAROOT}"/site - doins -r site/* - - dodir "${ICAROOT}"/help - - insinto "${ICAROOT}"/config/usertemplate - doins config/usertemplate/* - - local lang LANGCODES=( en ) - use l10n_de && LANGCODES+=( de ) - use l10n_es && LANGCODES+=( es ) - use l10n_fr && LANGCODES+=( fr ) - use l10n_ja && LANGCODES+=( ja ) - use l10n_zh-CN && LANGCODES+=( zh_CN ) - - for lang in ${LANGCODES[@]} ; do - insinto "${ICAROOT}"/nls/${lang} - doins nls/${lang}/* - - insinto "${ICAROOT}"/nls/$lang/UTF-8 - doins nls/${lang}.UTF-8/* - - insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES - doins nls/${lang}/LC_MESSAGES/* - - insinto "${ICAROOT}"/nls/${lang} - dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8 - - for tmpl in {appsrv,wfclient}.template ; do - cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \ - "${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \ - || die - done - done - - insinto "${ICAROOT}"/nls - dosym en /opt/Citrix/ICAClient/nls/C - - insinto "${ICAROOT}"/icons - doins icons/* - - 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 - pnabrowse - setlog - storebrowse - sunraymac.sh - webcontainer - what - xcapture - ) - - exeinto "${ICAROOT}"/util - for bin in ${util_files[@]} ; do - doexe util/${bin} - done - - # https://bugs.gentoo.org/655922 - dosym gst_play1.0 "${ICAROOT}"/util/gst_play - dosym gst_read1.0 "${ICAROOT}"/util/gst_read - dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so - - doenvd "${FILESDIR}"/10ICAClient - - for bin in configmgr conncenter new_store ; do - make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util - done - - for bin in selfservice wfica ; do - make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}" - done - - dodir /etc/revdep-rebuild/ - echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \ - > "${ED}"/etc/revdep-rebuild/70icaclient - - # 651926 - domenu "${FILESDIR}"/*.desktop -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild b/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild index a92334c81619..d0f5f9638ade 100644 --- a/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild +++ b/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz ) LICENSE="icaclient" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN" RESTRICT="mirror strip userpriv fetch" diff --git a/net-misc/icaclient/icaclient-20.12.0.12-r1.ebuild b/net-misc/icaclient/icaclient-21.1.0.14.ebuild index a54700cb8626..a92334c81619 100644 --- a/net-misc/icaclient/icaclient-20.12.0.12-r1.ebuild +++ b/net-misc/icaclient/icaclient-21.1.0.14.ebuild @@ -229,6 +229,9 @@ src_install() { echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \ > "${ED}"/etc/revdep-rebuild/70icaclient + insinto "${ICAROOT}"/pkginf + newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}" + # 651926 domenu "${FILESDIR}"/*.desktop } diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest index f5724952d133..3b70d0fb7722 100644 --- a/net-misc/igmpproxy/Manifest +++ b/net-misc/igmpproxy/Manifest @@ -1,8 +1,6 @@ AUX igmpproxy.confd 199 BLAKE2B 85902275ecd501bb26f37c91cf135cb34efd8dab8a6b5d85b383bcb8e77570f33c2a9f2a52ba3690b9a4a69bf0df82926571326b9720e274f7cbfd8bb39215c9 SHA512 3c95e98d19b88bed32562e64e4e491ac34da3533acb5cfd39032443688bdfe889e4835544bc358ccd5f7a95356c1eb8013462f3bc4a13e8e083717bfaaba4b5f AUX igmpproxy.initd-r1 337 BLAKE2B 44af8071177be905593ea867b23be08a9b51928158f62c7d62bbae33b59edd23c3b873db29f38eac37c42a9385c223e050fb3ed1e8776472f9fb73533d73200e SHA512 1e4e5d73fe9a734ab7898c2defdef8f9b27c3811109ef8819875a65733c72e48feb683d0001ced759c3195ce30bf31c6af9be7cebf30dd1dcd9141ffbbfe3f53 AUX igmpproxy.service 155 BLAKE2B 7cddd2b54bc632b16ec7ac28665dd752d5e8090741adff7da2d9085b30d7cdd8428d4525bf0ebeabd99663a246a86e45d0958792e04f52e3f798996a5dcabd74 SHA512 e50a6ba9c29e49ff243f3704033a3f4b1167281e6b8270de324a8f8f2646ff063fac0ef90d19196dbf4c8b39e2474e831f1ac2ac35f1a6b85e83e3f9f3d319be -DIST igmpproxy-0.2.1_p20200508.tar.gz 43672 BLAKE2B 886e293a30ec8b0a6bdfee9a7858d6de67b42e71628a604b108909f7eac31cfb129648f6eb8c47cf6aeec4d0a078f5a7a0f4487737b4f9338f727445a4f94dac SHA512 f0929537cac30664ed94231b2b31098dccea53a3e0d5ddfc14ae5ab08fa116438a983d06c17f41d8fec69b94d0c8725eb23525c94813d78310f2f2e3c03bcbf7 DIST igmpproxy-0.3.tar.gz 168403 BLAKE2B 4dd07936074fbd9b3c869851f5b592f1eec33109be78ee5a05b3658c26afb67c30379f7cc66dfa20af276aae0a1c21dbf5c9fd337c853d623b08126324b06561 SHA512 0b1deca544317e2f0b1ff550e5921e8d6f64565f7cd72b6210fc7d3d7c3a301875088687a31ca5a29d310b2931695bd7a77e41dc5685ab7175ea1d41fe9246af -EBUILD igmpproxy-0.2.1_p20200508.ebuild 752 BLAKE2B f2239d6a5230d652b07ff5e7f0321ff7d9a073da365c61a542453d0d8295c1e677ff5bea68319dea2c58f4d94635aa8fbe9ed0572eee47782fdb5538a6afde67 SHA512 30de163b64bc4f5cf4d3a43df562c74eb991c1084c65db0f6d42de893a7f5251f30441f5b48e8b15377330950fa8d0c133f735d53e95291bb878f670f72469f0 -EBUILD igmpproxy-0.3.ebuild 652 BLAKE2B 44e9c3e2becbf6adf63266ed05c5260eeb2ef4e4b50e046278fa485ebefae750c87eae3f8af4a97bbb6572f73defc66de6441d14774e3349b57cb314768d7bcb SHA512 13290e2359b9aa45eda2e4bc7bf345bb89a0afb2ac23d3207e066ab66497412622911b355342d4e243f5a1b5e4e5b11938d45ff25b9c20863d48142c06ce9c58 +EBUILD igmpproxy-0.3.ebuild 650 BLAKE2B 21df318b2e20be37ae06f33cbb45c8e07f70ef1ed6a855c48346e3c6583275b3416e6a2f30dc74e4d744ec955c4536869e5bd26d23bcd859d8a6c8c59a1c5441 SHA512 1ee96802558dd4e056a00a3dd5017ec845244cfface597191481ce3389a3b47d0e18588885e93c3ab1cbc1ed62e8d23be4b0894ff07368d3ae6261839f70df63 MISC metadata.xml 593 BLAKE2B 29de61191b267e0b01464e3cd66e5d1b68deb0feba50b2ae1facb2909a04dbe56e8fb1b9188028bb11ba8fade7f750927e9cc24e2f47bf071fb775a4366deec9 SHA512 326ef6823232e5e8a11e173024a759d969ab190fa3c406063c8f59cdd1a6c33cbe3e1e4c070605e298d7bd3ec4d92c446edcc17dcc3c76660f9391235c1a4721 diff --git a/net-misc/igmpproxy/igmpproxy-0.2.1_p20200508.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.1_p20200508.ebuild deleted file mode 100644 index a25a15192766..000000000000 --- a/net-misc/igmpproxy/igmpproxy-0.2.1_p20200508.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_COMMIT="c3e813a077c26134aa7574b4b271a5ee3d781471" - -inherit autotools linux-info systemd - -DESCRIPTION="A multicast routing daemon which uses IGMP forwarding" -HOMEPAGE="https://github.com/pali/igmpproxy" -SRC_URI="https://github.com/pali/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="amd64 x86" -LICENSE="GPL-2+" -SLOT="0" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE" - -src_prepare() { - default - - eautoreconf -} - -src_install() { - default - - newinitd "${FILESDIR}"/igmpproxy.initd-r1 igmpproxy - systemd_dounit "${FILESDIR}"/"${PN}".service - - newconfd "${FILESDIR}"/igmpproxy.confd igmpproxy -} diff --git a/net-misc/igmpproxy/igmpproxy-0.3.ebuild b/net-misc/igmpproxy/igmpproxy-0.3.ebuild index b0dc2629ed3a..243e6209d79a 100644 --- a/net-misc/igmpproxy/igmpproxy-0.3.ebuild +++ b/net-misc/igmpproxy/igmpproxy-0.3.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="A multicast routing daemon which uses IGMP forwarding" HOMEPAGE="https://github.com/pali/igmpproxy" SRC_URI="https://github.com/pali/${PN}/releases/download/${PV}/${P}.tar.gz" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" LICENSE="GPL-2+" SLOT="0" diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index f0c129ab79d4..27916eb82c12 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -7,9 +7,12 @@ AUX iputils-20200821-getrandom-fallback.patch 1056 BLAKE2B 27cf7f9711f877bc55238 AUX iputils-20200821-install-sbindir.patch 894 BLAKE2B 5947e4d94b802b23ba6160f47bf51208ebf5e056961fe8dee37c67a21dad3e485ebfaca0937089b65514f3c9ac14d0c161c200cdaa17f820e381679eef278214 SHA512 0cf552b0b2770aa061d8edf7a0b1a24ef58c8d1ded4d266224e56644281c9f19c724ee722eb7f35eac9c4a4e493089558a4d961686308a7ded3f776d2fca9553 DIST iputils-20190709.tar.gz 404101 BLAKE2B 38e66366cc13a77b7da1a85afe7245891c6c7069c218bc8d5d0dd3664d07a5c4004aa6fc56c192b90bfacf2e5e103997cd671a236aa0a9932a5818eca1e10744 SHA512 5db18ac49fa46ed810da4d508e78f4baf2d5c07e7f923eb49d005ad8745743d8861e5788b34a7e37fb7261cee7ddfb768b737eee9d200502ea53537142cac6b5 DIST iputils-20200821.tar.gz 504852 BLAKE2B 3ce31554937e28ca3edd204b4b4ba2d11a5eab4ed0d9257cc1f0df38e3ac4d9093f786f308c96c35e1b4909be5de51a0bfb25d890269d9bd7bdd3ea5f612c299 SHA512 4a57c3637cdd9aab2600682774e27370716cbdf1c7ac8ae61bf86c21c08701a5b697792df4aa95309b196eaa74f3cb6b2836a40f04da0e602156e982ac99d8c9 +DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d SHA512 af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066 DIST iputils-manpages-20200821.tar.xz 19200 BLAKE2B 7d139ccac181eb3d74e3dcd2ba28cb906a0002aa4922de3e37771e2063234fa12428fa44bab3b50e43c40576a66d585a7460cf550afbeacd665fc41a3333d11a SHA512 0dd385565c9a15dfce668d637e055004a347056ee56260a4e726e7aa5ba5a6374aea8e9fc848dfe36b7609e5d92cb8c21f3e88f2d63e7cfe299489e41a17dc33 +DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1 EBUILD iputils-20190709-r1.ebuild 4987 BLAKE2B e3eae89daf8659c2b2906f1dd4fa12216b19ac2525fc5e11a7f43fc03794959813442c1a95d5b66dba1adb3850bd8b3022767b677e85e92e116a459cf6c2969a SHA512 e7857644e9f152d1d02e951f113c52bfbd7a21444d8ea302d986cbc777c936a9a687fb7dde8637defe95be71acf19b26bad66b346489db8d01050a795fb4c204 -EBUILD iputils-20200821-r2.ebuild 4416 BLAKE2B 3b6053527978f651a281e431ccb9cd42fa098118696c2a9008b0428784e9e8dd77a3b27154c33b425204c16976cef162b04b4cadb5991d3e24456d21e18a7157 SHA512 3efad2ee4e6a67a3b3be3b0aa2d12e478c35856ad11aad2e8b0bca00311e7af807cf53ffe335c8fce129ad4ecc0d6c18e632af653b510ffe6a95571992f4ef4b -EBUILD iputils-99999999.ebuild 4262 BLAKE2B feecdd0bf22c8d073a0bf7518a331a98ca3f25b3369a0c3b423af8ff6daf4c4cd784bea2b2c3778ad6afaa01945ab847ade6de2387363b49ecb69f9c2884214e SHA512 393681126d1272b16700ff36bd9597d66cc7000255eefc9bb48a4407869119dbdf6060bf57e29eb32279986552bfa10de4fb2a45be8bd495c4af37457fbbd2a3 +EBUILD iputils-20200821-r2.ebuild 4413 BLAKE2B 3e4009f9c2aa6ed1f87891b7c5597bfce620d572228c74bb8120a39104cfa47cb8e5e37e7e6ca0df777409f6ad5a0970887df9bdf0361c9059318bd085f31b75 SHA512 cf08485939b2c4ede19f2760a4cbb7399d67cbad5ef9a29aa38ba3c841633df3e8fd0e4ac61713e8c1c15766fd9950a5c7fa8864b9d6cc6b9189984dcd8913ae +EBUILD iputils-20210202.ebuild 4203 BLAKE2B 5379711947110b3da2765158c848daf9d42bc882fc897f366c1a1e9bc20e32985563e7583dd99cfd8d7a47f155d337daf6a6a1d55df81d076e311e69dc8d61c9 SHA512 0da73cc6802f280955624ad1b83ac945d10a52b0630743a2bd4f5f7b53390439d4676e910c3cafd40f969ad2f470e2f7038a26c2febce5bdfb397899c307e650 +EBUILD iputils-99999999.ebuild 4203 BLAKE2B 5379711947110b3da2765158c848daf9d42bc882fc897f366c1a1e9bc20e32985563e7583dd99cfd8d7a47f155d337daf6a6a1d55df81d076e311e69dc8d61c9 SHA512 0da73cc6802f280955624ad1b83ac945d10a52b0630743a2bd4f5f7b53390439d4676e910c3cafd40f969ad2f470e2f7038a26c2febce5bdfb397899c307e650 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e diff --git a/net-misc/iputils/iputils-20200821-r2.ebuild b/net-misc/iputils/iputils-20200821-r2.ebuild index 5219577cf6b7..fa217aca4c76 100644 --- a/net-misc/iputils/iputils-20200821-r2.ebuild +++ b/net-misc/iputils/iputils-20200821-r2.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="https://github.com/iputils/iputils/archive/s${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" + 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" diff --git a/net-misc/iputils/iputils-20210202.ebuild b/net-misc/iputils/iputils-20210202.ebuild new file mode 100644 index 000000000000..61132b5fea46 --- /dev/null +++ b/net-misc/iputils/iputils-20210202.ebuild @@ -0,0 +1,172 @@ +# 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 depedencies. +# 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 l10n meson 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 libressl nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6" + +BDEPEND="virtual/pkgconfig" + +LIB_DEPEND=" + caps? ( sys-libs/libcap[static-libs(+)] ) + idn? ( net-dns/libidn2:=[static-libs(+)] ) + nls? ( sys-devel/gettext[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=() + +src_prepare() { + default + + l10n_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-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index 9f726630d842..61132b5fea46 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.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 # For released versions, we precompile the man/html pages and store @@ -18,7 +18,7 @@ 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/s${PV}.tar.gz -> ${P}.tar.gz + 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 @@ -59,8 +59,6 @@ if [[ ${PV} == "99999999" ]] ; then " fi -[ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" - PATCHES=() src_prepare() { diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest index 8d04b37535e8..8f55b64b67e8 100644 --- a/net-misc/ipv6calc/Manifest +++ b/net-misc/ipv6calc/Manifest @@ -6,5 +6,5 @@ DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2 EBUILD ipv6calc-1.0.0.ebuild 1546 BLAKE2B 5dbfbd9a1c5954e104ed571625e8b34e3c2901e0695fa832695110e2d11969fc0ca7546ed61569f51af8cc11f1d03b88f6e8470cdbc7ee49cb6937cc37582a20 SHA512 635473dad2289ad635734e063b20838e42d21e67e59bb425bbb40a30b479bfdf094cfb78c465ed3035a20a70df1460c35d068d6841eec786706c8741fea18079 EBUILD ipv6calc-2.1.0.ebuild 1584 BLAKE2B ae3bb846df423a60cbae3b1eeecb3cad8457ae7deb438f66003b3d6b60f7ba2619fbf92b1e0e316e2467069bebfa79a01eff90e49cc0da851b5e8ad21a0e60b9 SHA512 0597cd98ff378014e90500c15a99feac6a1318d70c37211c2303f854e5b39a5994f9c308586f060da60adf18363dea7f2c29ae108bbb8a9b2a8f9f4edcb4f1e9 EBUILD ipv6calc-2.1.1.ebuild 1587 BLAKE2B 1321402a089cd45d8e042f97f1a308dcd812ce556beb927954542bcada2f05775a940d1f746a279a6ae8b9610bc439d84c119402a9d6ef8da7105e83719d39b0 SHA512 a544c4bdb1cccfd97e6887d4ec2dc15e87cb92d8710cc3a5bbc1c5429f20dbc64f67d4488b8eb44ed353d9c521c4404b3463b9a2b8e4e76d966a3f2f4de89f25 -EBUILD ipv6calc-2.2.0.ebuild 1637 BLAKE2B c3cde0645cf2d7421767aa48073e2d894cd8fa1434ec44108e0a80dbb19e0d856e9cc20b2a3d196ad687669f3f98aa0317482aa2f6b4b0c541c7bb0a3f3f10e1 SHA512 0a4e972d25b69772527e0c1450967a323ab0669a1589c6b62f3958c5df88f6a60b1f7bd45ca45b10bb5a5e22cbc92e236737d06b252fc172d49fcd6280f2133a +EBUILD ipv6calc-2.2.0.ebuild 1635 BLAKE2B bcc72456461791fccae520323d0f3cef4187f72c2748b8bb26067c8544ca2bbb26fb724e58b698e2f1563771049e35600afcd0fad323c81394e9c97fc48137de SHA512 f03262a417fde02cb6be8ae8996cb810d9fb8f721f53c9fe262f40d89e7edeecf0b24e0ce74feb7ccbdd27a53f5060da32c1d608827246cbc23600254f3c133b MISC metadata.xml 334 BLAKE2B 78e76af76293fbb24c7ad6bd4f884a67d449c26d4fd7b4ff220a324f5d421c51d56d53800b2116a02777e59c3d6f4a353823c3df31073c9676443c9816fadfe3 SHA512 ef70d2c2da48d173396b2dbb2e13104ca57e7c9ab81150c07c3c166604168984d37934815eb34a4e26c2cadbdbdcaea8983141c6eea6a36b26dfb4e89157ae6e diff --git a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild index e08d33c2a5b3..bfca2214fdc1 100644 --- a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild +++ b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -9,7 +9,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="geoip libressl test" RESTRICT="!test? ( test )" diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest index 61d7110055a6..60452d3cf068 100644 --- a/net-misc/kafka-bin/Manifest +++ b/net-misc/kafka-bin/Manifest @@ -1,5 +1,7 @@ +AUX kafka-connect-distributed.init.d 836 BLAKE2B 983a7eff314d7d09e3d6c01de7187b4b2537afef26143e5f8ec518553dd234940e1397f6217d965e6921b43947f956040cd11a19a9690f966f26f4dcbbd435e2 SHA512 4f999fc28d4f3b7df92d74391041efb17f64b2c4f111a8b2a40a39e50b647f90bc3d363b2b957f8da1fc4ca7fe96c1699f3b09cc0d8ced3b693b091f07dd7697 AUX kafka-zookeeper.init.d 506 BLAKE2B f0e6ab4a15a54363fe31e567805b19a1b18d59238f4f4eff4733432ef48ad0d3352c843290e517a195ca89ee39a8c1793d0fac671689cb51946696b3eb62d90e SHA512 96656e81a296c989fa5dcbab4831b6ca12841ef8e902d32b3100196e0dfc1984ba6d4eb426ade14ef8b4299ea9665753a0af22e8e7f4b7947424d5529d2f7010 AUX kafka.init.d.4 709 BLAKE2B 3fb3d09fb715b4c01396406574c21a2127cc7c73a92927b9add59123fb5cc2d9f97c2dd2c10c212eb3bb723a05ab7575c2443a71baa6063b85ef21dce9426f75 SHA512 1c96854b6fab044e1b415e6e9f16964d1d06dc4070dabead9a1b391a9ab2a4b64120e175f8199afbc1fd2a4ba7f7d319932e0d2b5fb1ef0e8cfe55c68313d1a3 +AUX kafka.init.d.5 792 BLAKE2B 458fe70e6e8460e7291421e411440719224688a6521f2514272c16379d302019630add9fa1cf840cbe398afc1d36d5a19522aefbbbad635d050070cdbd6ae0c3 SHA512 578dbbb51ec12220f51ee4e80ebcfc3d20e0d921b262673505f50010522f9f67998293a6081357fc0f8b6d9e4a7dc306d4e5f45d4099bfee80fd5cd3f2940e8d DIST kafka_2.12-2.0.1.tgz 49446678 BLAKE2B 6d4aa6bd015cb42492364893c3f8ee01b2ce0408097ce5cdf0d3074c1096d30c8eec9926cad6dab31d3b2f26e16ae06173ee25554a8f901632bfde27270a70d3 SHA512 9773a85ef2898b4bae20481df4cfd5488bd195fffd700fcc874a9fa55065f6873f2ee12f46d2f6a6ccb5d5a93ddb7dec19227aef5d39d4f72b545ec63b24bb2f DIST kafka_2.12-2.1.1.tgz 55351618 BLAKE2B a102fa24883ab5d3110aec1367e40c0ed0a437ca776e2532dbddb8a79c6288b8334c30b48072da8b58c693fc765106b6dcd03b6baebf66708021305a2dff2acf SHA512 a2e8168e8de6b45e8fca1f2883f0744d3c5a939b70d8a47a5428b72188501d4c2fc11bc35759f2392680d4e8ecf2fa9d0e518e77fd28393afba22194ad018b10 DIST kafka_2.12-2.2.1.tgz 57054917 BLAKE2B fb69ef12f7480b8b47e511cc9325b622dc1fcc6a265bacfdf1ac03d34ad8f5a3b3242c41386214519423bce1e18d8a90f2e7034e26681fe637c823d0a73f69bb SHA512 b8d828f06dfe59e34c4cfa20c57c8c8b43374f1e7c09f12dfa5433534a380bfe09a6de90fb86a4403939a87ab9c665e2369143c138c71391b01bbb9b384e7ac5 @@ -9,6 +11,8 @@ DIST kafka_2.12-2.4.1.tgz 62358954 BLAKE2B 333b4a1d34c6249efb9984e90c314f4b39bbd DIST kafka_2.12-2.5.0.tgz 61604633 BLAKE2B f73f3a03f245aa82b9ce5a895e7875d5ad9c4006b84c3152cac72322eb18283a1a87d81f255160ff062883737ae9862e160fec0d85160ed3a64f45e47b26db53 SHA512 447a7057bcd9faca98b6f4807bd6019ef73eee90efdc1e7b10005f669e2537a8a190cb8b9c9f4c20db1d95b13d0f0487e9cc560d0759532058439ce7f722c7cd DIST kafka_2.12-2.5.1.tgz 61709988 BLAKE2B 4e6943058fe25da0cc9285e1e8dbe2be2ad2be5ef52d7c12f9007607e34ba1834d192c45e01275e893dca2e8968bdba07510dbd30ccd106e80edaabc0f7c6dba SHA512 91f96f28c016bdaa3fe025f87ace188417a1e594c8e32b7d23a104aa390bc25f5db5897e23cccf00ea7ede3ac20b3028c10363ebe99dcbd7db2cf6237ee7553a DIST kafka_2.13-2.6.0.tgz 65537909 BLAKE2B 883bc22f53ae7882ff2e27a3b9b62967f4718718f8e2ee222debd5f5b36636e00b35ceb60c3fd6924905b88ef96442439198255bb8329cee1cc722364ff0810f SHA512 d884e4df7d85b4fff54ca9cd987811c58506ad7871b9ed7114bbafa6fee2e79f43d04c550eea471f508b08ea34b4316ea1e529996066fd9b93fcf912f41f6165 +DIST kafka_2.13-2.6.1.tgz 65585925 BLAKE2B 639cc9ec9a3b630d01387b1fe4aa12f5e6ba66b751689d48f17af3759fbfc079616a21534eb72bb647cfee0d14ff86757d73e2ee0733d0f69548efceb90be3e3 SHA512 09ec7a39d0e11494ede7d92cf7dfec5b95c6b0218e3b096b731d85ee8c442469e66aaf369a9c6750399719e515ee1bd372d609d6b232e3358e18aa2b57c90e29 +DIST kafka_2.13-2.7.0.tgz 68583422 BLAKE2B 68925221e025c2f380808da672f9ac08c19c21eaf4d3fe732051e02143dbc735082fce55cd40388b980159bfbe8b06666922852492564927c5fcc237bb3f74dc SHA512 f3dd1fd88766d9150d3d395b285bfa75f5b89a835822381490c8428e6e568889054ddb5fada1eb63613a6441989151bc7c7d6cde16a871c6674b909c4edd4e28 EBUILD kafka-bin-2.0.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 EBUILD kafka-bin-2.1.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 EBUILD kafka-bin-2.2.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 @@ -18,4 +22,6 @@ EBUILD kafka-bin-2.4.1.ebuild 1445 BLAKE2B 0dbb9df50a4f0d74f4343392e817618f1b6d3 EBUILD kafka-bin-2.5.0.ebuild 1445 BLAKE2B 0dbb9df50a4f0d74f4343392e817618f1b6d32101264b8193ee337599425d8e68bd198c696af6cb044df57953eafa7af564f51848d55b9bd013038aeb597b4a6 SHA512 6d48acf951772fd99abfa5a7faebcc277e3dcbcb7f03fb45a20787d2f102f781b2b99489ef839fa3bf4f636f64c34ef41dfcb48b9b3cf95d63b4c22affbaa36b EBUILD kafka-bin-2.5.1.ebuild 1445 BLAKE2B 0dbb9df50a4f0d74f4343392e817618f1b6d32101264b8193ee337599425d8e68bd198c696af6cb044df57953eafa7af564f51848d55b9bd013038aeb597b4a6 SHA512 6d48acf951772fd99abfa5a7faebcc277e3dcbcb7f03fb45a20787d2f102f781b2b99489ef839fa3bf4f636f64c34ef41dfcb48b9b3cf95d63b4c22affbaa36b EBUILD kafka-bin-2.6.0.ebuild 1445 BLAKE2B f462939b918172f7dd31dbeaab8ecd9e4480da93ba6f2220597f158019789007ddf686029e12747669e7eae836b79a4f81dd47594d570b55ef054d5479010248 SHA512 1ae04cb30a976b1fb242856c8089e59071dd17f3278176b61d51e180c4cf0d768e9fb3331c18baa3ae32c321e156bb8bc77c5b225aedd909ad3a40521f42da6e -MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6 +EBUILD kafka-bin-2.6.1.ebuild 2083 BLAKE2B 8589755fe6c9c5e702dcd59a386cbb708032b9895de712068506f089462e1e8616ab96dcb501f2a641976996668fbc1ac806b14adf2d36bcac4d5b73ba9483ad SHA512 4279bae4bc6fa1dbf90b7016561691196f0835bbb1902943754da3dc5a5b3bc62224b1f8877fa201c108dc0a7ebeced708695732526a8130f98ff6a97a4d1676 +EBUILD kafka-bin-2.7.0.ebuild 2083 BLAKE2B 8589755fe6c9c5e702dcd59a386cbb708032b9895de712068506f089462e1e8616ab96dcb501f2a641976996668fbc1ac806b14adf2d36bcac4d5b73ba9483ad SHA512 4279bae4bc6fa1dbf90b7016561691196f0835bbb1902943754da3dc5a5b3bc62224b1f8877fa201c108dc0a7ebeced708695732526a8130f98ff6a97a4d1676 +MISC metadata.xml 389 BLAKE2B 335c0cabaf348612feaa741673e778069f02881601f3f5aecba14cac49b065cbbd20fb1247cd035391528dc31c345ace91f43c3a38e7d083f1942a1f67bf6d3f SHA512 21cc10fb914680844252c607b5c401a87783fa4d8b7371358a6cdef8b99fb43f7dad2c9ac31af685490872a99c02941b012440ea07cea306b45303a2359d53ab diff --git a/net-misc/kafka-bin/files/kafka-connect-distributed.init.d b/net-misc/kafka-bin/files/kafka-connect-distributed.init.d new file mode 100644 index 000000000000..0a61c7d017eb --- /dev/null +++ b/net-misc/kafka-bin/files/kafka-connect-distributed.init.d @@ -0,0 +1,28 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="Kafka Connect of Kafka distributed messaging system" + +logfile="/var/log/kafka/connect-distributed.log" + +command="/opt/kafka/bin/connect-distributed.sh" +command_args="/etc/kafka/connect-distributed.properties" +command_background=yes +command_user="kafka:kafka" + +pidfile=/run/kafka-connect-distributed.pid + +start_stop_daemon_args="--stdout $logfile --stderr $logfile +--env CLASSPATH=\"${CLASSPATH}\" +--env KAFKA_LOG4J_OPTS=\"${KAFKA_LOG4J_OPTS}\" +--env KAFKA_OPTS=\"${KAFKA_OPTS}\" +--env KAFKA_JMX_OPTS=\"${KAFKA_JMX_OPTS}\" +--env JMX_PORT=\"${JMX_PORT}\" +--env KAFKA_HEAP_OPTS=\"${KAFKA_HEAP_OPTS}\" +--env KAFKA_JVM_PERFORMANCE_OPTS=\"${KAFKA_JVM_PERFORMANCE_OPTS}\" +" + +depend() { + after kafka +}
\ No newline at end of file diff --git a/net-misc/kafka-bin/files/kafka.init.d.5 b/net-misc/kafka-bin/files/kafka.init.d.5 new file mode 100644 index 000000000000..3ee2aa9797ee --- /dev/null +++ b/net-misc/kafka-bin/files/kafka.init.d.5 @@ -0,0 +1,28 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="Kafka distributed messaging system" + +logfile="/var/log/kafka/kafka.log" + +command="/opt/kafka/bin/kafka-server-start.sh" +command_args="/etc/kafka/server.properties" +command_background=yes +command_user="kafka:kafka" + +pidfile=/run/kafka.pid + +start_stop_daemon_args="--stdout $logfile --stderr $logfile +--env CLASSPATH=\"${CLASSPATH}\" +--env KAFKA_LOG4J_OPTS=\"${KAFKA_LOG4J_OPTS}\" +--env KAFKA_OPTS=\"${KAFKA_OPTS}\" +--env KAFKA_JMX_OPTS=\"${KAFKA_JMX_OPTS}\" +--env JMX_PORT=\"${JMX_PORT}\" +--env KAFKA_HEAP_OPTS=\"${KAFKA_HEAP_OPTS}\" +--env KAFKA_JVM_PERFORMANCE_OPTS=\"${KAFKA_JVM_PERFORMANCE_OPTS}\" +" + +depend() { + after zookeeper kafka-zookeeper +} diff --git a/net-misc/kafka-bin/kafka-bin-2.6.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.6.1.ebuild new file mode 100644 index 000000000000..1e719f68e498 --- /dev/null +++ b/net-misc/kafka-bin/kafka-bin-2.6.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils + +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:1.8" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +S="${WORKDIR}/${MY_P}" +INSTALL_DIR="/opt/${MY_PN}" + +src_prepare() { + sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die + sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die + 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/kafka-bin/kafka-bin-2.7.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.7.0.ebuild new file mode 100644 index 000000000000..1e719f68e498 --- /dev/null +++ b/net-misc/kafka-bin/kafka-bin-2.7.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils + +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:1.8" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +S="${WORKDIR}/${MY_P}" +INSTALL_DIR="/opt/${MY_PN}" + +src_prepare() { + sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die + sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die + 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/kafka-bin/metadata.xml b/net-misc/kafka-bin/metadata.xml index 136eb2b1d753..7be657c43f70 100644 --- a/net-misc/kafka-bin/metadata.xml +++ b/net-misc/kafka-bin/metadata.xml @@ -6,5 +6,6 @@ </maintainer> <use> <flag name="internal-zookeeper">Use bundled local zookeeper instance</flag> + <flag name="connect">Install init for Kafka Connect Distributed mode</flag> </use> </pkgmetadata> diff --git a/net-misc/liveice/Manifest b/net-misc/liveice/Manifest index 61158e5b7fb0..255153731435 100644 --- a/net-misc/liveice/Manifest +++ b/net-misc/liveice/Manifest @@ -1,4 +1,4 @@ -AUX liveice-2000530-build.patch 1014 BLAKE2B ad5654c354de6ab5f17f647ad9ff754f6a658c54b09af6e6d16a3d1ecc83b4eafefc24b10b1e68c3d75c988b0a4910720fb3e8e4cd5c0d9aa9195649dd05abe4 SHA512 d10b1fc45a530f1d4c8bf8de249b6f5bc25370e243b7316ab0314b8f991057c1c677babb760dda8eb6b712cee327f056a7ddeb8d2f7ad9939cd1e869d543a573 +AUX liveice-2000530-build.patch 990 BLAKE2B a1406d01255445b87a10e6bbd89aaf94a94539315304209ec18fdff88c62288323f2f5b5306e42671d02ed13d0d74d28f883a06bddea921572404775d38060f6 SHA512 8004c5d99aebb76b70158abdbc95550d858d74790882be531c7472a349dec104fe7f54a38f616106004385412bda159b01426a0a71606e9c7b1b3e58bcd9cef1 DIST liveice-2000530.tar.gz 85171 BLAKE2B c804a4f64432cba3181e633b9edb4e67f39c18805290bfae290ae78bcb80d865a3106af8cfab40e214a043609d837bc887d0eb50adbaad3f1d2838dd44e4de58 SHA512 6b6b7ed7f4aa2b27e2b97db407554955e332002c059bbf3fbb5c5fe60c1d6aa5cd594d2698524a9b447fc3a81de96fb46945c2386467f1773ff0ba2b10da78e4 -EBUILD liveice-2000530-r2.ebuild 639 BLAKE2B 5bc570e6b28550dcfbb40fae26ed5786874ddb3fa86738745132467569bb16280830152ccb8d27faa087ffc6411345095c999594524304655fc6e9656b7a34ff SHA512 e6e42f65a0f45fe200612770fc34c24dd46564e6a45ce921e64cd0cba46c14d6bf63a3e935c6ad19cf8049e2620dbdf957acceb83e2b5c5b311f2e6258556631 +EBUILD liveice-2000530-r2.ebuild 710 BLAKE2B 87c8a40be04e4f33745fd20cbd41b91196df7ef20ef33a9ff237a8ca387f8588cfd651af4f001117d004b3607f8c590b6acc230ccea71458451282bd5c0301b1 SHA512 4d4c34d96d1ff30a4d246c9b39266a0b704df8c452c16f60cb6ae5fb315f03249aae9ba89bb49db290ff99ba2152f5ff8d67f1543a52af6452bc2925145c81d5 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/liveice/files/liveice-2000530-build.patch b/net-misc/liveice/files/liveice-2000530-build.patch index 14ab084c3d06..e736075c4717 100644 --- a/net-misc/liveice/files/liveice-2000530-build.patch +++ b/net-misc/liveice/files/liveice-2000530-build.patch @@ -1,5 +1,5 @@ ---- liveice/configure.in -+++ liveice/configure.in +--- a/configure.in ++++ b/configure.in @@ -39,6 +39,7 @@ dnl Replace `main' with a function in -lresolv: @@ -8,8 +8,8 @@ dnl Checks for header files. ---- liveice/Makefile.in -+++ liveice/Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -1,6 +1,6 @@ CC = @CC@ CFLAGS = @CFLAGS@ diff --git a/net-misc/liveice/liveice-2000530-r2.ebuild b/net-misc/liveice/liveice-2000530-r2.ebuild index 9b714278e0a2..cc73e827d6ac 100644 --- a/net-misc/liveice/liveice-2000530-r2.ebuild +++ b/net-misc/liveice/liveice-2000530-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Live Source Client For IceCast" HOMEPAGE="http://star.arm.ac.uk/~spm/software/liveice.html" @@ -13,15 +13,13 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 x86" -RDEPEND="media-sound/lame +RDEPEND=" + media-sound/lame media-sound/mpg123" -DEPEND="" +DEPEND="${RDEPEND}" S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}/${P}-build.patch" -) +PATCHES=( "${FILESDIR}"/${P}-build.patch ) src_prepare() { default @@ -29,7 +27,12 @@ src_prepare() { tc-export CC } +src_configure() { + append-flags -fcommon + default +} + src_install() { dobin liveice - dodoc liveice.cfg README.liveice README.quickstart README_new_mixer.txt Changes.txt + dodoc liveice.cfg README.{liveice,quickstart} README_new_mixer.txt Changes.txt } diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index 9af0f86767d0..5d6db44e5242 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -2,7 +2,6 @@ AUX memcached-1.2.2-fbsd.patch 328 BLAKE2B b556c92a194ba7cd9405bbedcaa6b65ce6c3c AUX memcached-1.4.0-fix-as-needed-linking.patch 1557 BLAKE2B 1d0d66a9ec44855215a1d661177e7457b22068c9f1c3b6ca3c2ded25e3eed34eb17a034102fbbdd2fa6670e87ae6b6f05adc826f848a84f7649608e4547ae39a SHA512 a177f82d13b25a1ee13b02852040289a46b08fba750467026ecd8932d12008c7a276ea4b9b166de3d3371f5e7f9a6e0ef8d15315ab1ec9d10928dd7f40090253 AUX memcached-1.4.17-EWOULDBLOCK.patch 506 BLAKE2B e6e7c597dc227f42c0af0cb45d99a802b2bbcf5af3f7bcc1de26305951e0396c879ceb2b651f21b199df0ffabdfcb739626111d0e086d12736603500860453bd SHA512 6ddd823154a384e7502e138528b8d391b9fe203366c56f14ae38ddb6d8b6394fd0297e5fad90cf94f7bc1e7d90e04e0aab17b545fe3f1d2a55f0e2158e9a98dc AUX memcached-1.4.4-as-needed.patch 1135 BLAKE2B b290f928cb0c280742eb95b69e1fdec1ffe6f9d47a5a1e3b676f70d25a675d4b4762a4d69915a81cc0e30036e74254ce08f93b625bc842ae0e4a6d7520798f85 SHA512 16f1ebae169d47836a83857e9da1ba4498b061367979d2ec5d271b91c939b1b5655ced68f37653c8996e41266e2daa64c2ae63d787b54d221ce92d544cea722e -AUX memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch 1470 BLAKE2B 987f8ff094ae43e8fe94458b70f413b994f0125b16987b7aca56bb0847f3c6ff10372cff4a4f12fa651cad72601fef6b4a45cfe0c05036e264f9c53f5846e686 SHA512 c0c139d82762c397cfb86307ab989b3c0a31547e3bccb8b13b4537e78b7f62a4b92aafc60e5cb092098a95038a9f93e8ee6be8702b130fafa11c81112a1fce69 AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034ca92b0e26280cbd99db3c487f57ef8f1d6ebfae49db44852b88018a95f8d2b0e0a1c6ce16bbaa5c0 SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95 diff --git a/net-misc/memcached/files/memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch b/net-misc/memcached/files/memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch deleted file mode 100644 index 527d4607316c..000000000000 --- a/net-misc/memcached/files/memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 63b8e76067523a02a3e0215db1aef0b34edcf708 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Thu, 23 Jan 2020 22:16:36 +0000 -Subject: [PATCH] hash: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` -gcc -g -O2 -pthread -pthread -Wall -Werror -pedantic -Wmissing-prototypes \ - -Wmissing-declarations -Wredundant-decls -o memcached ... -levent -ld: memcached-hash.o:memcached/hash.h:5: - multiple definition of `hash'; memcached-memcached.o:memcached/hash.h:5: first defined here -``` - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Reported-by: Brian Evans -Bug: https://bugs.gentoo.org/706196 -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - hash.c | 2 ++ - hash.h | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/hash.c b/hash.c -index a0c3036..b5ff28a 100644 ---- a/hash.c -+++ b/hash.c -@@ -4,6 +4,8 @@ - #include "jenkins_hash.h" - #include "murmur3_hash.h" - -+hash_func hash; -+ - int hash_init(enum hashfunc_type type) { - switch(type) { - case JENKINS_HASH: -diff --git a/hash.h b/hash.h -index 059d1e2..3b2a984 100644 ---- a/hash.h -+++ b/hash.h -@@ -2,7 +2,7 @@ - #define HASH_H - - typedef uint32_t (*hash_func)(const void *key, size_t length); --hash_func hash; -+extern hash_func hash; - - enum hashfunc_type { - JENKINS_HASH=0, MURMUR3_HASH --- -2.25.0 - diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest index fd150f837503..dcc4b0d742de 100644 --- a/net-misc/mrouted/Manifest +++ b/net-misc/mrouted/Manifest @@ -2,5 +2,5 @@ AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a94 DIST mrouted-3.9.8.tar.bz2 112863 BLAKE2B 4a7defbb1b97be8e452881a689d99742df2878dc9c2613c79e1bdc33af398c2be1b2d21de94e90592877ee5b6aa6b2f0c64948193eda9005c828a6cc84e492c0 SHA512 50abf2271c76b604d1e356ca5c0b62a7f07487f364991502326bbee169c451b43b3dbf01b88340d6b406f16d86a6d6fd9e7bb03c6e76d6af463b46d8423a41f4 DIST mrouted-4.2.tar.gz 292640 BLAKE2B 5d356c7c0132e2dc74e360c5a1761b6e39bcdfcb5306dcd7a8a35f5658139bdd74d92587b7fea248092bd4947b5119987bdf4066676c08c6baa849c1845f905b SHA512 88de66f24210bcf9d8e9ab0d38171c64c7dae2981fb2f81a54be2b08bbe26ff9b26ad5a7ec0fd4d67c2dad00a6df608aa7c1536c897bbc98f6bf223766924131 EBUILD mrouted-3.9.8.ebuild 1081 BLAKE2B f6f973db6a7eb7e1a93998b58c2b8d9948a14682f9f6435fb25efe3f2dbcf44d3bfeb0e48332d3d9d66475f566dde4eaf27b4a5fe6395813a56cf2729a830798 SHA512 cdba5ee8434981a69ffe2b586b6f99febaf5f5ab948e995a458ac828f906e0af41ca5fc9e81268c2a5c312289c579152cf6799da673b73abd477692cd01b5865 -EBUILD mrouted-4.2.ebuild 742 BLAKE2B 832a1d248850915eb6171dd5632f95f93df9beab0726f25f54f7022f7abc85a049cb86fbbfb678a13fa3381e00ab42017d8d20ce04c8d3ba77b77786c5924431 SHA512 2e8058c122d94078ac55c3c4995e201c331c3d5590c0dbca175bdb6534ec63407b2f1336190af6358337416a6752823842a35c830f3a78b8b596973142d28d8e +EBUILD mrouted-4.2.ebuild 740 BLAKE2B 13641fc77a4cbc4d870faefb3bbe8a0175e866ce701abfb302762235268ab3af5d7f42ae0c10f6dd8756d496d4db228ed42419f897d8497ee9d81bd7bb3c5c2d SHA512 19f242e0e9858b1e40262aebed2dca772b96bbb07bafdc340b93b3c574587f862c28d3b049c1cd97b40e5a9238d7bd039182684d7e8c2d1badad128b2cd7bac7 MISC metadata.xml 350 BLAKE2B c177ffe2f3f3c6192b293561683d2bfea170030dbe31004c6d3a253440ba17a82dcdfc4426a0e5fedddbcd56bbd95a6bee3b24431efba133c1b1c0c0db821917 SHA512 19085d3b736466a73795c3f1ecf39b039453702c220a58ffcdbdd6425c94b9a6c4aa8339a7447a7430c158e06f9030c138417362b3de43b01dedd95401a16099 diff --git a/net-misc/mrouted/mrouted-4.2.ebuild b/net-misc/mrouted/mrouted-4.2.ebuild index 47de037fe009..6b2a90fd9b63 100644 --- a/net-misc/mrouted/mrouted-4.2.ebuild +++ b/net-misc/mrouted/mrouted-4.2.ebuild @@ -11,7 +11,7 @@ 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" BDEPEND=" diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest index 959e41e396d0..5c3b0668f731 100644 --- a/net-misc/netifrc/Manifest +++ b/net-misc/netifrc/Manifest @@ -3,8 +3,10 @@ AUX netifrc-0.7.1-dhcpcd_pidfile_location.patch 1580 BLAKE2B c1fa6aeedf5964b41a0 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 EBUILD netifrc-0.7.1-r1.ebuild 2162 BLAKE2B 0cfb264306fdbc6e395db9f7ad812bf4d641ca171b5d03a35075ae42f4088f5792d2ac8774a44e541f6bf5adcddf9638b03c3e793aac032f4385428bbf0779e6 SHA512 4704087f4945899e1e729f12f8517b9e17e9eaf626ba6ef17b28dea54702b759a41b133f49d0f6aef9e782e2a2a84b3b13ef977addb28722c3fd997f3347d2ec EBUILD netifrc-0.7.1-r2.ebuild 2150 BLAKE2B f59f860df7863caae5bb6dccb875ee69f07eadfe8daecc8cd2e6a950f065f066f07851e430206dda368534bf895b9adc140dd1903aefe70df8ff5f467a734e03 SHA512 b84e81bb7e9ccdb1bf0dbe9e120bffc021075ff93adf886d2a9ac6c47ce5cf2c4103dabe3735ea008becb7079fbd056ff418f514739c796f182a4b75f82ac8be EBUILD netifrc-0.7.2.ebuild 2047 BLAKE2B 64858661488665f75d13d3a5ecad330f45ed7dc6716dc7259d70053f618f0839eb25a830651af522223664be04f7e5ddce2ecfd1e0cfaa2d38691c0bd2fd2202 SHA512 fb050a6c9058eb08624c838a5d3ec5c10c0ee1f7fbd08d6a0234ebf3e8be75cef9f781372a6eecea080e6c9ab886054b384fae6b00c59e99973eaf31ee8d3618 +EBUILD netifrc-0.7.3.ebuild 2047 BLAKE2B 64858661488665f75d13d3a5ecad330f45ed7dc6716dc7259d70053f618f0839eb25a830651af522223664be04f7e5ddce2ecfd1e0cfaa2d38691c0bd2fd2202 SHA512 fb050a6c9058eb08624c838a5d3ec5c10c0ee1f7fbd08d6a0234ebf3e8be75cef9f781372a6eecea080e6c9ab886054b384fae6b00c59e99973eaf31ee8d3618 EBUILD netifrc-9999.ebuild 2047 BLAKE2B decbe78b5ac86f957ee27f203b0af14d8e4e022bc326891b5f990849c5817e9fec3a07ad0409fd3619b07a3a3683fbf6c9aef8f0c39f378a7e7276a7a5c6e80a SHA512 0b3d9ea722a45d91a9edc38616ee239910df1c8bf8c5ada1e75f78842c07e89756da519e46132cabd18b705b51c52a3dabfa3ed8ef196e156e34364ec8733a23 MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5 diff --git a/net-misc/netifrc/netifrc-0.7.3.ebuild b/net-misc/netifrc/netifrc-0.7.3.ebuild new file mode 100644 index 000000000000..0e9cf97453c8 --- /dev/null +++ b/net-misc/netifrc/netifrc-0.7.3.ebuild @@ -0,0 +1,70 @@ +# 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 )" + +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/networkmanager/Manifest b/net-misc/networkmanager/Manifest index f7a5851f7c57..04ca52f5b9f9 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -6,14 +6,10 @@ AUX networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch 574 BLAKE2B 17 AUX networkmanager-1.26.4-iwd-fixes-pr640.patch 5730 BLAKE2B e22539fef2e4582ab156decbe26667724de181eb2349f7dcb29c41eaf9f918addb4a6e25a43e8b743e118cab56e3f69cc83e0e8ee777560c227165fad67664b9 SHA512 690d128ac153b2147f13f8596858be6e6120c0a744da1cb5e2dad5ce6ae9518565ab15a9a00612771d153ed5e13d60a42f93fae6b7ba177513c9d1bf0a4d701a AUX networkmanager-1.28.0-dhcpcd9.patch 10608 BLAKE2B fb5512d4b290ae668b41b2d1f387643e8d7c1c235ec255c292e419551c3a67a06463f43293ea75f8dd9700bde2d045e86eafe313384c22609cb8422117ac092f SHA512 7f9a2a3b7f861cc2c8e4b066449e6574ac74227b7a45ae8e9ca79c81a232d292a62216edff0620042f9556193e3841aa8cf5e8ecdbc2edfc9df0751e2d1f5303 DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d788a6e979c2d7f232259e682fdc9e1f5569259731fdbbea65b6e8321561ecb8354b6f7a0b10843eb17cbe6f5937af8d9d898 SHA512 61b6214188a3cd281d0d5a5b8bfc402f8a19d8beaa6a3a2bd85983991cc66d62b2c3785d7ca652373903d53331610cd63a45d94bdb355196d939c48f42be29c1 -DIST NetworkManager-1.26.0.tar.xz 4956796 BLAKE2B 752b6b47387bac5787d06be7f31cc7387798d0c917977c8e72d6d21538a86c167003901d628e596109aec28816f56fd8cd6bf2b46a8d4918a7e6cf1946586550 SHA512 46035fda8f154497ba4a634e4bf7f0a11f579d0d3f4ffdcea7d47ea0bde6dd0183885491f5453255af7b163ae3db4f0c62c3161913a8c30c35b6475887235b6d -DIST NetworkManager-1.26.2.tar.xz 4972240 BLAKE2B f9f0879ad01d7aee8edc28b33a08d903637b0a9c0738d64480394d0298a02e4fa4277f6a14a7fec62eeb7e1ca50646f47d08f735827b5dbe698070669fd558c4 SHA512 4029bf5224523d851a36766376813c7edc85c2fef3600ceaffc0c7e6faadcfebf843a406ee071bdc59c21bceb7bf3de8c87fca6bb2f2116d9eddbb70e11bf517 DIST NetworkManager-1.26.4.tar.xz 5051424 BLAKE2B 53a8fd9f9a061b9ac6b117f431e72b1967cfd2fffb539e0dc9335c37a3a59dc33562e81f7887019c3460f403a95b96e8105b1ae41b00c8488ae12a370a3d82ff SHA512 91e865c83a6ae694c9f6aa50e7f938dfa55bfddac32a6dfb73e6edb34b2539068ff9f83bf662bb2d689bd3c66cf53d7fa015930940cf7bda2d4a16561cf02328 DIST NetworkManager-1.26.6.tar.xz 4975020 BLAKE2B 0c66b307a98e71e31d253a7ad5a3d3ee625c1c66e75a1775b49182e63c7a03fb4175ccc2c5cbe92216d7aac6369158f9601fa27a2045892116684e22e74b5ccd SHA512 f43869473bf625be270e3781a77310a877a8e945df08a6f9e668bb66fe173615e990fd9b3011c1c7b3aa23a9007db99c2f06c67f1185f7547771a816b06caf64 DIST NetworkManager-1.28.0.tar.xz 5129848 BLAKE2B 37dc9cda283dad29a70c85ed41a77844b4f60a9815be4b6780fbefecfeffb644fd67ea65373a1895fd2102f2beec9ad141b6e9a92a1a32de646d64acd4250b62 SHA512 ab0bc39626dc55df4e122ad6e1a8086e1467f44bdd41c4491c752dca3ffb549796e0ac888041f12f661f2f6cf4142d0fce59b5135549e48a0076fafcdc45ca06 EBUILD networkmanager-1.22.10-r12.ebuild 8548 BLAKE2B 5da579ca289ff404eb75807972ccb0e1f9cd04d219e766f4942ca6dd5e83da047bcd94c27e17aefb14b194d3e759a858e1590746ee61ae87bf176d322330f4bc SHA512 f6a6f6885e2c56428c60f6b717a5f5cafe15264280a66b946756da2332f64cffca24ce4d8defc583f07880829a54d098f5435a4b86b912c67bbb17560b910405 -EBUILD networkmanager-1.26.0-r1.ebuild 11206 BLAKE2B bed405e0198dd5dc1e4abe19736e48c0232087f367dfa2fc283ee88b7595749288dca68f13c79056a2e9423b4f99ab6c99572f926de4a67cf8be25221954ddb4 SHA512 6f7c0ceaa385ebd9c8f6529ebee64eab037260ad04f1d91f3f3af4375864e634e63f454c9352e9217f7d8bc4d4aca1697f120dced215b51cfc163ae3c37b8e4d -EBUILD networkmanager-1.26.2-r1.ebuild 11212 BLAKE2B 81cc7347e8d92c5273edeebe4da3bfc5d92886e9332596c7fa2e8265642cd842287b261f28035312425ec996d34937488e0c7d9175f1a5aa319abc2ca460e024 SHA512 2368f94da8a8346b42a065fb3b82e4ca96ff5d0572b7e7f9f9184bf9ab388664c56644ead3083f30f06fd5b5ea95e6e8b40d7802be2896c4590eedf3f3b7f12d EBUILD networkmanager-1.26.4.ebuild 11351 BLAKE2B 0319b3fe3b67c57f48c960a777f272f8ed89cf1f43f454a3303a69214f641e102168f653fb2af88c539df7fd3f591d4fdd87230d9334460fe270d4e741e9c601 SHA512 21cdaf6a2ba186939a201a3f4ccb59d52c4b1d636eb74517b5f57748582ab448844a7edc88242f591c60403d1721b8294a9001b0a9b0f8be89c38a72c0ea58bc EBUILD networkmanager-1.26.6.ebuild 11357 BLAKE2B 9f862a2953a1244c45165be72fc3eb842e30a555048ebbdd0487c5cc7c82c69ff0014a9f760be9c046c5bda37935b8afd9e9c977c0f920b8a15e598b15cd315a SHA512 b5fadbc8153556e16020ea3e4887571ae7c2392f4f243bd3110f8232022b87bb6f1a2c8852d7a9305e0d7d7fcfe5a1ff9573d93d80387a25296a20fb2b69c44f EBUILD networkmanager-1.28.0-r1.ebuild 11257 BLAKE2B 5c328aef0bf1ff84d9b5fc74ed4fcd2912e2be6a384f0ae842a512540344d2b28784d292b272f29ce1c28f304f88077a764acfcb7ce82305f92cee58c9e033b9 SHA512 5eb6c4d37bf9e1e62ce5e5cde5a6ef6319ba1450d200b586e6670d6fd2454a1adeb9de02c0204e7a76352e41c6b190f6137530ca88c99c78520b29fcac50e119 diff --git a/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild deleted file mode 100644 index 0ebe85558ff6..000000000000 --- a/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild +++ /dev/null @@ -1,341 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME_ORG_MODULE="NetworkManager" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7,8} ) - -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" - -IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - bluetooth? ( modemmanager ) - iwd? ( wifi ) - vala? ( introspection ) - wext? ( wifi ) - || ( nss gnutls ) - ?? ( elogind systemd ) -" - -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86" - -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -COMMON_DEPEND=" - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - policykit? ( >=sys-auth/polkit-0.106 ) - net-libs/libndp[${MULTILIB_USEDEP}] - >=net-misc/curl-7.24 - net-misc/iputils - sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - audit? ( sys-process/audit ) - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dbus,dhcp] - net-firewall/iptables ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( net-misc/dhcpcd ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) - 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} - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - >=sys-kernel/linux-headers-3.18 - 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 -} - -multilib_src_configure() { - local myconf=( - --disable-more-warnings - --disable-static - --localstatedir=/var - --with-runstatedir=/run - --disable-lto - --disable-qt - --without-netconfig - --with-dbus-sys-dir=/etc/dbus-1/system.d - $(multilib_native_with nmcli) - --with-udev-dir="$(get_udevdir)" - --with-config-plugins-default=keyfile - --with-iptables=/sbin/iptables - --with-ebpf=yes - $(multilib_native_enable concheck) - --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) - --with-crypto=$(usex nss nss gnutls) - # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option - # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. - # (There is no off switch, and we do not support upower.) - # bug #747358 - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - $(multilib_native_use_with audit libaudit) - $(multilib_native_use_enable bluetooth bluez5-dun) - --without-dhcpcanon - $(use_with dhclient) - $(use_with dhcpcd) - --with-config-dhcp-default=internal - $(multilib_native_use_enable introspection) - $(use_enable json json-validation) - $(multilib_native_use_enable ppp) - --without-libpsl - $(multilib_native_use_with modemmanager modem-manager-1) - $(multilib_native_use_with ncurses nmtui) - $(multilib_native_use_with ofono) - $(multilib_native_use_enable ovs) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_with resolvconf) - $(multilib_native_use_with selinux) - $(multilib_native_use_with systemd systemd-journal) - $(multilib_native_use_enable teamd teamdctl) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable vala) - --without-valgrind - $(multilib_native_use_with wifi iwd) - $(multilib_native_use_with wext) - $(multilib_native_use_enable wifi) - ) - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - ln -s "${S}/docs" docs || die - ln -s "${S}/man" man || die - fi - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - local targets=( - libnm/libnm.la - ) - emake "${targets[@]}" - fi -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx emake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - insinto /usr/lib/NetworkManager/conf.d #702476 - doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf - else - local targets=( - install-libLTLIBRARIES - install-libnmincludeHEADERS - install-nodist_libnmincludeHEADERS - install-pkgconfigDATA - ) - emake DESTDIR="${D}" "${targets[@]}" - fi -} - -multilib_src_install_all() { - einstalldocs - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - if use iwd; then - # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir - cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf - [device] - wifi.backend=iwd - EOF - fi - - # Empty - rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die -} - -pkg_postinst() { - gnome2_pkg_postinst - systemd_reenable NetworkManager.service - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi - - if use dhclient || use dhcpcd; then - ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" - ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" - ewarn "works for you, and you're happy with, the alternative USE flags can be" - ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" - ewarn "the main.dhcp configuration option to use one of them instead of internal." - fi -} diff --git a/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild b/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild deleted file mode 100644 index cfb43afbe2ec..000000000000 --- a/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild +++ /dev/null @@ -1,341 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME_ORG_MODULE="NetworkManager" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7,8} ) - -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" - -IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - bluetooth? ( modemmanager ) - iwd? ( wifi ) - vala? ( introspection ) - wext? ( wifi ) - || ( nss gnutls ) - ?? ( elogind systemd ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -COMMON_DEPEND=" - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - policykit? ( >=sys-auth/polkit-0.106 ) - net-libs/libndp[${MULTILIB_USEDEP}] - >=net-misc/curl-7.24 - net-misc/iputils - sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - audit? ( sys-process/audit ) - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dbus,dhcp] - net-firewall/iptables ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( net-misc/dhcpcd ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) - 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} - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - >=sys-kernel/linux-headers-3.18 - 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 -} - -multilib_src_configure() { - local myconf=( - --disable-more-warnings - --disable-static - --localstatedir=/var - --with-runstatedir=/run - --disable-lto - --disable-qt - --without-netconfig - --with-dbus-sys-dir=/etc/dbus-1/system.d - $(multilib_native_with nmcli) - --with-udev-dir="$(get_udevdir)" - --with-config-plugins-default=keyfile - --with-iptables=/sbin/iptables - --with-ebpf=yes - $(multilib_native_enable concheck) - --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) - --with-crypto=$(usex nss nss gnutls) - # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option - # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. - # (There is no off switch, and we do not support upower.) - # bug #747358 - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - $(multilib_native_use_with audit libaudit) - $(multilib_native_use_enable bluetooth bluez5-dun) - --without-dhcpcanon - $(use_with dhclient) - $(use_with dhcpcd) - --with-config-dhcp-default=internal - $(multilib_native_use_enable introspection) - $(use_enable json json-validation) - $(multilib_native_use_enable ppp) - --without-libpsl - $(multilib_native_use_with modemmanager modem-manager-1) - $(multilib_native_use_with ncurses nmtui) - $(multilib_native_use_with ofono) - $(multilib_native_use_enable ovs) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_with resolvconf) - $(multilib_native_use_with selinux) - $(multilib_native_use_with systemd systemd-journal) - $(multilib_native_use_enable teamd teamdctl) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable vala) - --without-valgrind - $(multilib_native_use_with wifi iwd) - $(multilib_native_use_with wext) - $(multilib_native_use_enable wifi) - ) - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - ln -s "${S}/docs" docs || die - ln -s "${S}/man" man || die - fi - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - local targets=( - libnm/libnm.la - ) - emake "${targets[@]}" - fi -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx emake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - insinto /usr/lib/NetworkManager/conf.d #702476 - doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf - else - local targets=( - install-libLTLIBRARIES - install-libnmincludeHEADERS - install-nodist_libnmincludeHEADERS - install-pkgconfigDATA - ) - emake DESTDIR="${D}" "${targets[@]}" - fi -} - -multilib_src_install_all() { - einstalldocs - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - if use iwd; then - # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir - cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf - [device] - wifi.backend=iwd - EOF - fi - - # Empty - rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die -} - -pkg_postinst() { - gnome2_pkg_postinst - systemd_reenable NetworkManager.service - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi - - if use dhclient || use dhcpcd; then - ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" - ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" - ewarn "works for you, and you're happy with, the alternative USE flags can be" - ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" - ewarn "the main.dhcp configuration option to use one of them instead of internal." - fi -} diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index 414b749b072b..b9790ec1d7d9 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,7 +1,9 @@ AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c301b4be62c495f059c81fcd1f3d8a5a85c579400fd97b86bb057c82bfb790588c9faa6f302a239b1c043ab53530713cb75a88179654c SHA512 c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78586533f51d1cfd6209e263a0a8b94d307028b1afa76004768432a2bee68140602da003ef10133cd166fd3443a0a45ccccabc SHA512 fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462 DIST nextcloud-client-3.1.1.tar.gz 19440799 BLAKE2B ae6ef7fbff4b7b5c9a5728a30558000cd781348dd07aba068af5b123ec629e1661b52cd63b50bf45c593411866bc607dfcc3112713fa2aea3eabfda7ce969614 SHA512 1f60266ff6d413a614261ae8b6c75ba6bc5cdb534f1906039b47cb7d593d12d72013d277dc12c0bfc5c5919322438543736a7cdff056949d80e093538fd04209 +DIST nextcloud-client-3.1.2.tar.gz 19517295 BLAKE2B 75713a892816be515984cef579e09dfb58165bf1e35e73982bd59fb1cce9a0cdcc76a33a9116b85da99174f0ee4f3c425afb380df5a99d65dba82a9c6d5b3553 SHA512 bad05fab6c6d391ed40e7f9b5869f3ab3231bdba1bbb24b7222d9cace0bd96989b0b24757bf0757053a851312265aec5a4ac6f4d1c71d532152aa20ddee838a6 EBUILD nextcloud-client-2.6.5.ebuild 1951 BLAKE2B bbb143e83a235f27cdd65c5cbbeb3b4bf40938a79e9295802f9d892609c5980ccde188d88a1b482295a40be96e856bce9e4d615dbd93cb65aefc4904924216e6 SHA512 0e1567e43e28299f27c633d7c828a1422aeea689f46422fb10a6a80ae02d4b75dec6542460d86d800fdb9c2dfcf4815a2c69575ecc5db8ff9ab3e863ab0120b6 EBUILD nextcloud-client-3.1.1-r1.ebuild 2040 BLAKE2B 2d84e53fda3603204bd8fd87dfd7a85d5cd878988209438514dfa313853b1f9a131de4590781629ca4cff3436656a4c2dcc831a2cc91ebbea73eb4c3544cf0e8 SHA512 2de9f51dae3e56c1e1e6f1ba9cc0947864061789b5ede9955a751a2f865a7a5675ecb605958e6db77bcec9ebea42e381809af7df1e60d02829f420e410b05134 EBUILD nextcloud-client-3.1.1.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425 +EBUILD nextcloud-client-3.1.2.ebuild 2041 BLAKE2B de96cbe1822decdecfbf053e2931d69dcc471009dd11f3115d1553bbe14595bb90b649700bdbe71cab8f857123c3f35f2aacc4d66326d830904b46bf8844e9fa SHA512 e798d0b179a98f9dda74b4f2d47c2a75517591c6d73597a4826d4b0f12926abcb6aa6e16d041e90ee49f85c744ddac36771cc3e9cbf2b3b17244b7fbe0f41b1b MISC metadata.xml 513 BLAKE2B d5a3d3a3faf76e1c3dd481e295deea3ce56d8bca523229e2e68942bc268a09e22221efd27c1dec2decaaf999992600fb0a039ccdd376bbe9a70c55879a09221c SHA512 7b3888d4f38948547620650c253e511772de59d259fb1a9211f88ce2612a6373838820e3827ebda5d2f8ff969ec3851dea30512fd433b87480b27f49da8738fb diff --git a/net-misc/nextcloud-client/nextcloud-client-3.1.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.1.2.ebuild new file mode 100644 index 000000000000..fe942c43a65b --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-3.1.2.ebuild @@ -0,0 +1,90 @@ +# 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 libressl 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 + ) + !libressl? ( >=dev-libs/openssl-1.1.0:0= ) + libressl? ( >=dev-libs/libressl-3.1: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/nx/Manifest b/net-misc/nx/Manifest index 091231432b2b..1964d59d3ae6 100644 --- a/net-misc/nx/Manifest +++ b/net-misc/nx/Manifest @@ -1,3 +1,5 @@ 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 EBUILD nx-3.5.99.25.ebuild 3399 BLAKE2B 8374b0636f45bbce371c9d2c08f0f87b25f85248a216ca3f7213b5a663952407237e8647e4099ba749efc5f114550ef05106ca18a5e502aad8ed7eb3c8233ef0 SHA512 f14f778992a7d4bc75656a99de471505703305f4d1ec66c11ec4694821d5d8f2746aa4a84ec1f9ffd522db230669a67df9dff43d6b16f90b0d2bf0baee55aade +EBUILD nx-3.5.99.26.ebuild 3401 BLAKE2B 3f2c31ca5f62445775437c11f2cf653fe8798b347b692c48fc068819717c28b2d71e10ecf001b902d04fa0302a33755c89f7237d642ba4074915c02418b8d6fc SHA512 02e60d8f07e1a23f520cb629e80947e6911ba9f7db906b1ff10f354aaa263b326d7648819a0e033777ce7e7a41cf7dfa5b8d339f0c2b589a20476339066be4ff MISC metadata.xml 332 BLAKE2B 93930f64047301f8a393899de54a0d9294c7c17385b47fec5a2e402b2904bc88ae697e5b075e1defd723d8d251fd424e790e9b37b94bc48b10b395307e3830fd SHA512 005c90731093f7fc354297e981140415e33785492a1a835a5a5b8b68506d690679d6430ff0b05f6e3ce2ac763ea13cd68a599581a6037f16ac1974e6ad9d54a4 diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild new file mode 100644 index 000000000000..428f571e7e72 --- /dev/null +++ b/net-misc/nx/nx-3.5.99.26.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools 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 ~ppc ~x86" +IUSE="elibc_glibc" + +RDEPEND="dev-libs/libxml2 + >=media-libs/libpng-1.2.8:0= + >=sys-libs/zlib-1.2.3 + virtual/jpeg:* + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXfont2 + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/pixman" + +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/libfontenc + x11-misc/gccmakedep + x11-misc/imake" + +BDEPEND=" + virtual/pkgconfig" + +S="${WORKDIR}/nx-libs-${PV}" + +src_prepare() { + default + + # We want predictable behavior. So let's assume we never + # have quilt installed. + sed 's@which quilt@false@' -i mesa-quilt || die + + # Do not compress man pages by default + sed '/^[[:space:]]*gzip.*man/d' -i Makefile || die + + # run autoreconf in all needed folders + local subdir + for subdir in nxcomp nxdialog nx-X11/lib nxcompshad nxproxy ; do + pushd ${subdir} || die + eautoreconf + popd || die + done +} + +src_configure() { + # From xorg-x11-6.9.0-r3.ebuild + pushd nx-X11 || die + HOSTCONF="config/cf/host.def" + echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF} + echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF} + echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF} + # Respect LDFLAGS + echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF} + echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF} + # Disable SunRPC, #370767 + echo "#define HasSecureRPC NO" >> ${HOSTCONF} + popd || die + + local subdir + for subdir in nxcomp nxdialog nxcompshad nxproxy ; do + pushd ${subdir} || die + econf + popd || die + done + + pushd "nx-X11/lib" || die + econf --disable-poll + popd || die +} + +src_compile() { + # First set up the build environment + emake build-env + + # We replicate the "build-full" make target here because + # we cannot call "make build-full" as it + # - calls autoreconf several times + # - invokes make directly but we prefer our emake + + emake -C nxcomp + emake -C nx-X11/lib + + mkdir -p nx-X11/exports/lib/ || die + local nxlib + for nxlib in libNX_X11.so{,.6{,.3.0}} ; do + ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die + done + + emake -C nxcompshad + + ./mesa-quilt push -a || die + + emake -C nx-X11 BuildDependsOnly + # Parallel make issue resurfaced, upstream working on autotools switch + emake -j1 -C nx-X11 World \ + USRLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/X11" \ + SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + ETCDIR_NX="${EPREFIX}/etc/nxagent" + + emake -C nxproxy +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + NXLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \ + SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + USRLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/X11" \ + ETCDIR_NX="${EPREFIX}/etc/nxagent" \ + install + + # Already provided by mesa & related packages + rm -r "${ED}"/usr/include/GL || die + + # Get rid of libtool files and static libs. + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die +} diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index d2d5155c47c5..806f2544f48e 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -33,27 +33,11 @@ AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391a AUX sshd.service 242 BLAKE2B e77eb1e0adad0641b60a59d243e911e0a6286a87acda25f3e478582068d8a7a2a12ec88e14bf2c01c7f4c2025ce2d2ce1b1273a93c096bc96da47a69878a823e SHA512 77f50c85a2c944995a39819916eb860cfdc1aff90986e93282e669a0de73c287ecb92d550fd118cfcc8ab538eab677e0d103b23cd959b7e8d9801bc37250c39c AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42 AUX sshd_at.service 177 BLAKE2B 0e78184f58cb4c68fb834953fac3ce01f9e39e9eb1a84c03f720205f5b611365c9a48fba445962c06c7e18bdb310cdb9ffe4fc49e95f69608922d224b00c890b SHA512 423120ea2e1ac0b92575ce4eb05347483f902238dc104848e74088f49483c37d30c27364e7fe8599b3e85562159c69284ecf25a4c5394b4cfa18c5c77c6beacd -DIST openssh-8.1_p1-glibc-2.31-patches.tar.xz 1752 BLAKE2B ccab53069c0058be7ba787281f5a1775d169a9dcda6f78742eb8cb3cce4ebe3a4c506c75a8ac142700669cf04b7475e35f6a06a4499d3d076e4e88e4fc59f3e6 SHA512 270d532fc7f4ec10c5ee56677f8280dec47a96e73f8032713b212cfad64a58ef142a7f49b7981dca80cbf0dd99753ef7a93b6af164cad9492fa224d546c27f14 -DIST openssh-8.1p1+x509-12.3.diff.gz 689934 BLAKE2B 57a302a25bec1d630b9c36f74ab490e11c97f9bcbaf8f527e46ae7fd5bade19feb3d8853079870b5c08b70a55e289cf4bf7981c11983973fa588841aeb21e650 SHA512 8d7c321423940f5a78a51a25ad5373f5db17a4a8ca7e85041e503998e0823ad22068bc652e907e9f5787858d45ce438a4bba18240fa72e088eb10b903e96b192 -DIST openssh-8.1p1-sctp-1.2.patch.xz 7672 BLAKE2B f1aa0713fcb114d8774bd8d524d106401a9d7c2c73a05fbde200ccbdd2562b3636ddd2d0bc3eae9f04b4d7c729c3dafd814ae8c530a76c4a0190fae71d1edcd2 SHA512 2bffab0bbae5a4c1875e0cc229bfd83d8565bd831309158cd489d8b877556c69b936243888a181bd9ff302e19f2c174156781574294d260b6384c464d003d566 -DIST openssh-8.1p1.tar.gz 1625894 BLAKE2B d525be921a6f49420a58df5ac434d43a0c85e0f6bf8428ecebf04117c50f473185933e6e4485e506ac614f71887a513b9962d7b47969ba785da8e3a38f767322 SHA512 b987ea4ffd4ab0c94110723860273b06ed8ffb4d21cbd99ca144a4722dc55f4bf86f6253d500386b6bee7af50f066e2aa2dd095d50746509a10e11221d39d925 -DIST openssh-8.2p1+x509-12.4.3.diff.gz 806905 BLAKE2B 8e0f0f3eeb2aafd9fc9e6eca80c0b51ffedbed9dfc46ff73bb1becd28f6ac013407d03107b59da05d9d56edbf283eef20891086867b79efd8aab81c3e9a4a32f SHA512 51117d7e4df2ff78c4fdfd08c2bb8f1739b1db064df65bab3872e1a956c277a4736c511794aa399061058fea666a76ee07bb50d83a0d077b7fa572d02c030b91 -DIST openssh-8.2p1-sctp-1.2.patch.xz 7668 BLAKE2B 717487cffd235a5dfa2d9d3f2c1983f410d400b0d23f71a9b74406ac3d2f448d76381a3b7a3244942bff4e6bdc3bc78d148b9949c78dc297d99c7330179f8176 SHA512 a5fbd827e62e91b762062a29c7bc3bf569a202bdc8c91da7d77566ff8bb958b5b9fb6f8d45df586e0d7ac07a83de6e82996e9c5cdd6b3bf43336c420d3099305 -DIST openssh-8.2p1.tar.gz 1701197 BLAKE2B 8b95cdebc87e8d14f655ed13c12b91b122adf47161071aa81d0763f81b12fe4bc3d409c260783d995307d4e4ed2d16080fd74b15e4dc6dcc5648d7e66720c3ed SHA512 c4db64e52a3a4c410de9de49f9cb104dd493b10250af3599b92457dd986277b3fd99a6f51cec94892fd1be5bd0369c5757262ea7805f0de464b245c3d34c120a -DIST openssh-8.3p1+x509-12.5.1.diff.gz 803054 BLAKE2B ec88959b4e3328e70d6f136f3d5bebced2e555de3ea40f55c535ca8a30a0eed84d177ad966e5bda46e1fc61d42141b13e96d068f5abfd069ae81b131dfb5a66c SHA512 28166a1a1aeff0c65f36263c0009e82cda81fc8f4efe3d11fabd0312d199a4f935476cf7074fbce68787d2fec0fd42f00fef383bf856a5767ce9d0ca6bbc8ef0 -DIST openssh-8.3p1-sctp-1.2.patch.xz 7668 BLAKE2B abbc65253d842c09a04811bdbafc175c5226996cdd190812b47ce9646853cd5c1b21d733e719b481cce9c7f4dc00894b6d6be732e311850963df23b9dc55a0e6 SHA512 4e0cc1707663f902dfbf331a431325da78759cc757a4aaae33e0c7f64f21830ec805168d8ae4d47a65a20c235fa534679e288f922df2b24655b7d1ee9a3bf014 -DIST openssh-8.3p1.tar.gz 1706358 BLAKE2B 0b53d92caa4a0f4cb40eee671ac889753d320b7c8e44df159a81dd8163c3663f07fa648f5dc506fb27d31893acf9701b997598c50bf204acf54172d72825a4d8 SHA512 b5232f7c85bf59ae2ff9d17b030117012e257e3b8c0d5ac60bb139a85b1fbf298b40f2e04203a2e13ca7273053ed668b9dedd54d3a67a7cb8e8e58c0228c5f40 DIST openssh-8.4p1+x509-12.6.diff.gz 857479 BLAKE2B ac8c3e8c1087ca571e5459c9826903410ff2d45de60151d9bd8e59da15805b75752f8f3ffc231c9f8aaa8f2b2c07a97a8296684f885e0d14b54ff5d7bc585588 SHA512 e56516b376ecc3e5464895744ce0616cf4446a891fbd3cbcb090d5f61ebc349d74f9c01e855ccd22e574dbfeec0cb2ba7daf582983010ff991243a6371cc5fe3 DIST openssh-8.4p1-sctp-1.2.patch.xz 7668 BLAKE2B 2e22d2a90723cea9ef958bd989b8c431fcb08b4dc5bfd3ebbf463ca9546dc37acdc185c35ddf3adbb90bde9b3902bf36524a456061a9bcbdef7a76ece79e2ff4 SHA512 90da34b7b86e52df9e0191c99c9d645a4d4671958adebeed46e1149102d4ba8c729eadb79d84fad9feac64aafa0541d2f1f4db8cdfe0af5ba893aac072ef2380 DIST openssh-8.4p1.tar.gz 1742201 BLAKE2B 4b1e60d4962095df045c3a31bbf8af725b1c07324c4aa1f6b9a3ddb7e695c98e9aa01655b268f6fd6a400f511b23be91f6b89d07b14a6a2d92f873efb4d9c146 SHA512 d65275b082c46c5efe7cf3264fa6794d6e99a36d4a54b50554fc56979d6c0837381587fd5399195e1db680d2a5ad1ef0b99a180eac2b4de5637906cb7a89e9ce -DIST openssh-8_1_P1-hpn-AES-CTR-14.20.diff 29935 BLAKE2B 79101c43601e41306c957481c0680a63357d93bededdf12a32229d50acd9c1f46a386cbb91282e9e7d7bb26a9f276f5a675fd2de7662b7cbd073322b172d3bca SHA512 94f011b7e654630e968a378375aa54fa1fde087b4426d0f2225813262e6667a1073814d6a83e9005f97b371c536e462e614bfe726b092ffed8229791592ca221 -DIST openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff 42696 BLAKE2B d8ac7fa1a4e4d1877acdedeaee80172da469b5a62d0aaa43d6ed46c578e7893577b9d563835d89ca2044867fc561ad3f562bf504c025cf4c78421cf3d24397e9 SHA512 768db7cca8839df4441afcb08457d13d32625b31859da527c3d7f1a92d17a4ec81d6987db00879c394bbe59589e57b10bfd98899a167ffed65ab367b1fd08739 -DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e6a9219947da03cecb607f1bc45f0728547f17601a6ce2ec819b6434890efd19ceaf4d20cb98183596ab5ee79e104a52cda7db9cdc SHA512 238f9419efd3be80bd700f6ae7e210e522d747c363c4e670364f5191f144ae3aa8d1b1539c0bf87b3de36743aa73e8101c53c0ef1c6472d209569be389e7814d DIST openssh-8_3_P1-hpn-AES-CTR-14.22.diff 29963 BLAKE2B 19b82f4ff820f52dafaa5b3f09f8a0a67f318771c1c7276b9d37e4a6412052c9c53347f880f2d78981af3830432704b9ad74b375241965326530ae23ec8d74a2 SHA512 49f2778831dc768850870a1755da9cdd7d3bc83fa87069070f5a1d357ce9bdadeb2506c8ff3c6b055708da12a70e9ede7ed0e8a29fcab441abb55c9d483663be DIST openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff 42783 BLAKE2B 10940c35ae6bdc33e58bc9abd9cd7a551d4ca76a175400acb872906805bd04d384f57e81049b183d7d892ce1b5f7a138e197366369fe12e5c9dc1349850b0582 SHA512 c09162b96e0ffadc59c6076507bc843e6f8f2fb372140b84181f5fb2894225b1e05a831d85ba689c35c322b5a99302b9db77c324f978f1a46a16b185b3cb28dd DIST openssh-8_3_P1-hpn-PeakTput-14.22.diff 2012 BLAKE2B 701f46da022e7ecf35b57f41bf5682a37be453c175928d3ff3df09292275e6021f6108a20c02eec9d636e85ee5a8e05b7233ada180edf1209a3dc4b139d58858 SHA512 026f65c62e4c05b69661094d41bf338df608e2a9b23ef95588062e3bd68729733dae32adab783609a6eca810ccdcbddee25e7649a534c9a283a03282f73438bb -EBUILD openssh-8.1_p1-r5.ebuild 16472 BLAKE2B e070e5ea54fbc3a941003a03bfed11b8d2ea79d39687cf7ccacae7b6f23e4b006ae91c149aba9d5247cd47ab8debd19f2e968e1c0d0a50a8e2a921a25bbb9e28 SHA512 fc5030fb70ade22710946b56a19b75f6d0bd5bba43c4748c51877c88e3233983d383468170e8dd115bfe64554b88226560e74b9bf6c8d2c2bd78490ec0165a89 -EBUILD openssh-8.2_p1-r8.ebuild 16898 BLAKE2B 384984351a2916ea1c2b7bc327fb01fe68f6a7590356e5f54e30ea5a046762d3d11d511765a4155102376ba57d5bc163059fb52e2efb927613d113a2f870b366 SHA512 12676c70496c7a88057ef79ba2d8d9b1f817ae487b9d298998427d8008794261a6f2a11dd00a598df9c5a28b29dd69b3fbb47828917cfe6abdf85d8af7f17c2c -EBUILD openssh-8.3_p1-r6.ebuild 17629 BLAKE2B b5b09882a21c914466e69ff8aa6f17cac5f55f42f4e21c766254bc4a4cb38519fa60f58444176280f2cba09825d44ba2c1c40682516a01362b72eec3c0da72ba SHA512 0bf82550094b7c82a4403469730878c62921e553d2af8402d5a6c98039564c50ee004099a2a8d755909ff172a37f20a482ac936967ad3a366be8ab0e1a8b6274 EBUILD openssh-8.4_p1-r3.ebuild 17822 BLAKE2B 33429fc7138dafc13940b6956af610fc15e4d16efd2cc8b318e510365c86c96b73de3961d8506e072ca2972a0e97fa7155af457e310c307d339f451657affbec SHA512 0d37ad65c202611424972d3cb2d5cd43bc57ef2cbf96165fae3a053c45c512c59d060430155292148702df079a60f569e508fdfdccfafc2dbb8fc4c3f2aacb86 MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f diff --git a/net-misc/openssh/openssh-8.1_p1-r5.ebuild b/net-misc/openssh/openssh-8.1_p1-r5.ebuild deleted file mode 100644 index e055a207b9d5..000000000000 --- a/net-misc/openssh/openssh-8.1_p1-r5.ebuild +++ /dev/null @@ -1,471 +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 multilib autotools pam systemd toolchain-funcs - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} -HPN_PV="${PV^^}" - -HPN_VER="14.20" -HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff -) - -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="12.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" - -PATCH_SET="openssh-7.9p1-patches-1.0" - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="https://www.openssh.com/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - https://dev.gentoo.org/~chutzpah/dist/openssh/${P}-glibc-2.31-patches.tar.xz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/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 libressl livecd pam +pie sctp selinux +ssl static test X X509 xmss" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp 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(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - !libressl? ( - || ( - ( - >=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(+)] - ) - libressl? ( dev-libs/libressl: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? ( >=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 "booooo" - 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.1_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 "${FILESDIR}"/${PN}-8.1_p1-tests-2020.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%.*} - eapply "${FILESDIR}"/${P}-X509-$(ver_cut 1-2 ${X509_VER})-tests.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}"/${PN}-8.1_p1-hpn-${HPN_VER}-glue.patch - if use X509; then - # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" - # # X509 and AES-CTR-MT don't get along, let's just drop it - # rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die - eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-${HPN_VER}-X509-glue.patch - fi - use sctp && eapply "${FILESDIR}"/${PN}-8.1_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 - - 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 - - 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) - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 - ) - - # stackprotect is broken on musl x86 and ppc - use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) - - # 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}" SUDO="" \ - 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 - - keepdir /var/empty - - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' -} - -pkg_postinst() { - if has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 has_version "<${CATEGORY}/${PN}-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 ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; 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.2_p1-r8.ebuild b/net-misc/openssh/openssh-8.2_p1-r8.ebuild deleted file mode 100644 index 595226626d73..000000000000 --- a/net-misc/openssh/openssh-8.2_p1-r8.ebuild +++ /dev/null @@ -1,486 +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 multilib autotools pam systemd toolchain-funcs - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} -HPN_PV="8.1_P1" - -HPN_VER="14.20" -HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff -) - -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="12.4.3" 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/hpnssh/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 libressl livecd pam +pie 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 libressl ) ) - 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:=[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - !libressl? ( - || ( - ( - >=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(+)] - ) - libressl? ( dev-libs/libressl: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? ( >=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 "booooo" - fi - - # Make sure people who are using tcp wrappers are notified of its removal. #531156 - if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then - ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" - ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." - fi -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch - eapply "${FILESDIR}"/${PN}-8.2_p1-GSSAPI-dns.patch #165444 integrated into gsskex - eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch - - [[ -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%.*} - eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.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 - eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-libressl.patch - if use X509; then - # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" - # # X509 and AES-CTR-MT don't get along, let's just drop it - # rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die - eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-X509-glue.patch - fi - use sctp && eapply "${FILESDIR}"/${P}-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 - - 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 - - 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) - $(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 - ) - - # stackprotect is broken on musl x86 and ppc - use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) - - # 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}" SUDO="" \ - 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 - - keepdir /var/empty - - 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.3_p1-r6.ebuild b/net-misc/openssh/openssh-8.3_p1-r6.ebuild deleted file mode 100644 index ef9e80ab84f4..000000000000 --- a/net-misc/openssh/openssh-8.3_p1-r6.ebuild +++ /dev/null @@ -1,511 +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 multilib 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.1_P1" - -HPN_VER="14.20" -HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff -) - -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="12.5.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/hpnssh/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 libressl 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 libressl ) ) - 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.4.0:=[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - !libressl? ( - || ( - ( - >=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(+)] - ) - libressl? ( dev-libs/libressl: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? ( >=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 "booooo" - fi - - # Make sure people who are using tcp wrappers are notified of its removal. #531156 - if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then - ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" - ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." - fi -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch - eapply "${FILESDIR}"/${PN}-8.2_p1-GSSAPI-dns.patch #165444 integrated into gsskex - eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch - - # 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 - eapply "${FILESDIR}"/${PN}-8.2_p1-hpn-${HPN_VER}-libressl.patch - if use X509; then - # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" - # # X509 and AES-CTR-MT don't get along, let's just drop it - # rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die - - eapply "${FILESDIR}"/${PN}-8.2_p1-hpn-${HPN_VER}-X509-glue.patch - fi - use sctp && eapply "${FILESDIR}"/${PN}-8.2_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 - - 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 - ) - - # stackprotect is broken on musl x86 and ppc - use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \ - SUDO="" SSH_SK_PROVIDER="" \ - TEST_SSH_UNSAFE_PERMISSIONS=1 \ - emake -k -j1 ${t} </dev/null \ - && passed+=( "${t}" ) \ - || failed+=( "${t}" ) - done - - einfo "Passed tests: ${passed[*]}" - [[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}" - [[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}" -} - -# Gentoo tweaks to default config files. -tweak_ssh_configs() { - local locale_vars=( - # These are language variables that POSIX defines. - # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 - LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME - - # These are the GNU extensions. - # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html - LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE - ) - - # First the server config. - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config - - # Allow client to pass locale environment variables. #367017 - AcceptEnv ${locale_vars[*]} - - # Allow client to pass COLORTERM to match TERM. #658540 - AcceptEnv COLORTERM - EOF - - # Then the client config. - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config - - # Send locale environment variables. #367017 - SendEnv ${locale_vars[*]} - - # Send COLORTERM to match TERM. #658540 - SendEnv COLORTERM - EOF - - if use pam ; then - sed -i \ - -e "/^#UsePAM /s:.*:UsePAM yes:" \ - -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ - -e "/^#PrintMotd /s:.*:PrintMotd no:" \ - -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ - "${ED}"/etc/ssh/sshd_config || die - fi - - if use livecd ; then - sed -i \ - -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ - "${ED}"/etc/ssh/sshd_config || die - fi -} - -src_install() { - emake install-nokeys DESTDIR="${D}" - fperms 600 /etc/ssh/sshd_config - dobin contrib/ssh-copy-id - newinitd "${FILESDIR}"/sshd-r1.initd sshd - newconfd "${FILESDIR}"/sshd-r1.confd sshd - - if use pam; then - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - fi - - tweak_ssh_configs - - doman contrib/ssh-copy-id.1 - dodoc CREDITS OVERVIEW README* TODO sshd_config - use hpn && dodoc HPN-README - use X509 || dodoc ChangeLog - - diropts -m 0700 - dodir /etc/skel/.ssh - - # https://bugs.gentoo.org/733802 - if ! use scp; then - rm "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \ - || die "failed to remove scp" - fi - - keepdir /var/empty - - 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/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest index 9094708c9243..c97875b778ec 100644 --- a/net-misc/owncloud-client/Manifest +++ b/net-misc/owncloud-client/Manifest @@ -1,6 +1,5 @@ -AUX owncloud-client-2.6.3.14058-qt515.patch 470 BLAKE2B 70a1edb2a2ddd277ac9faf759715a5f7c956e4557d96ad30be8f02beb598ec8f87d6b42f8f5c90f4dbc60d86c022af0a63ed7d3fca44b7cef90955423b42e7ec SHA512 78eb25459347a56dd2bc8e4f7a359402cbd0359c9b5137f39939b0dd396f276d6c13663f3ac380055a0137558f5899527b23391242c1a89dadc6f92fd2f5b7f8 DIST ownCloud-2.7.4.2934.tar.xz 14151708 BLAKE2B ad6f3d827a2fdcead6fdc2514696e8fbdb75b2d365c9a09602b95b24c669695e3693167f5da305e27e6fb2266f106b50c578def1d1518730926a10f640defbd9 SHA512 7e04d987751d0b8e29fbe8ba8ae58f38fabd7f5007f7508d001532e595b00f58cce487b1d180928154286ffd6b01db1e6ca0407f7d675e8b101ec4ae8414f2a6 -DIST owncloudclient-2.6.3.14058.tar.xz 21246672 BLAKE2B 15b75c2162d22c22827a057242d783e739837f618c2f65be3edce6b2678aaa13505fd14c4e4088374c240537a999d9aff7758ccb93993e0cbdebb886f735311c SHA512 e2159dc5668f263449e7a9a20ef10c6bb140ea5bd1128a6d3438abce03bc4913bb4eecbacc5160c8018398b6fa75ccfb2a9ab9ad637965e41caebc83994b80b3 -EBUILD owncloud-client-2.6.3.14058.ebuild 1872 BLAKE2B 554174a400aaeb6437ae60011b1ed0cb52a1a8c82bfd0d5dc2b797147d38e029e89d993b68514e3fe3d77cba535bb92625f67729be04a950f5ed9a5d5822a1d1 SHA512 975b7ccf846042d4b32f67760cc409b43ca86d053adbac42d780373374c3eaa4488c3adb1ccd86741dc7fcb0794e2332214c0abbecddf0f142850a1dcdc3fd05 +DIST ownCloud-2.7.5.3180.tar.xz 14154036 BLAKE2B ebee57568b917c1c7dec8f41f172caf53d0bfe4eae5e24ec5c9adbf656bf667769b0ed341a13a899ff6a04cd779d92b145736dce5a4e72055d306b2f08e0a902 SHA512 9e788341c45753eb2d2c62d252cf453259474689fd7d498147e0f4548a9038bd44bdca1539f9617d383853f8f9ca2f24c575667fb96e2a1a4ceec30195d257c2 EBUILD owncloud-client-2.7.4.2934.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b +EBUILD owncloud-client-2.7.5.3180.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b MISC metadata.xml 431 BLAKE2B 9b495fdaa517bd56e7333305fbe7a9447fea599b96a3fe92121d4114812c1e6822b0095f65cee2207a0d2a8a667e4b4e9658d2e6a2a1c2563fe58397a9919b20 SHA512 0f8487e586ea6e6580dfcb816e7b17944cf822978b275b2e8e5f7feffc360bc69230236406a8b95aa5bd1342a14cb763fb39b9e1244d524bfea6d8f5ce831f49 diff --git a/net-misc/owncloud-client/files/owncloud-client-2.6.3.14058-qt515.patch b/net-misc/owncloud-client/files/owncloud-client-2.6.3.14058-qt515.patch deleted file mode 100644 index 57dd20938fc0..000000000000 --- a/net-misc/owncloud-client/files/owncloud-client-2.6.3.14058-qt515.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp ---- owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp 2020-06-12 14:35:04.000000000 +0200 -+++ owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp 2020-06-13 11:18:28.822842347 +0200 -@@ -31,6 +31,7 @@ - #include <QJsonObject> - #ifndef TOKEN_AUTH_ONLY - #include <QPainter> -+#include <QPainterPath> - #endif - - #include "networkjobs.h" diff --git a/net-misc/owncloud-client/owncloud-client-2.6.3.14058.ebuild b/net-misc/owncloud-client/owncloud-client-2.7.5.3180.ebuild index d7df80536b71..4afe35f947d5 100644 --- a/net-misc/owncloud-client/owncloud-client-2.6.3.14058.ebuild +++ b/net-misc/owncloud-client/owncloud-client-2.7.5.3180.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils xdg +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/stable/${P/-}.tar.xz" +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" @@ -34,13 +35,13 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3 RDEPEND="${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND} dev-qt/linguist-tools:5 + kde-frameworks/extra-cmake-modules 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 @@ -48,9 +49,7 @@ DEPEND="${COMMON_DEPEND} RESTRICT="!test? ( test )" -S=${WORKDIR}/${P/-} - -PATCHES=( "${FILESDIR}"/${P}-qt515.patch ) +S=${WORKDIR}/${MY_PN}-${PV} src_prepare() { # Keep tests in ${T} @@ -61,7 +60,7 @@ src_prepare() { cmake_comment_add_subdirectory nautilus popd > /dev/null || die fi - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -69,11 +68,11 @@ src_configure() { -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) + -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) -DBUILD_TESTING=$(usex test) ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index b8d89bfecd6f..d68493b1cc9b 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,4 +1,3 @@ -AUX kernel56.patch 1863 BLAKE2B 8525effb79f50ca818797cb48f3eb225f5e50f7fe156186643c9639c7e30a5f03716b257c357e1f7b090792594025ba0525763a93b481a992822a8cc251c4332 SHA512 e50734adbd76627bccb4f0f08d6d1a3042a72fc7a836aac049c897ce9d7f37c41a0d0f7da1fc158d1ae8c14329ff2967687420bae0c72f7ebf9845f795d24aba DIST r8168-8.048.03.tar.bz2 109351 BLAKE2B f31ef24d42af737a97986f0e46bc6c737c43e8ccfe9fac8386eb9957a5d81620faa62602e1bec15840792785444b1d1bf8bafa2e5878c21f1962c7141d9bb32e SHA512 8da615a96cca413ca172e260c52c9f77a782e4feb466e4a4296ae11d895e9cc56bde0ed8634cc3a7a531a292072b68d19dcbe74d20ad9549266d3ee8e082096f EBUILD r8168-8.048.03-r1.ebuild 922 BLAKE2B bdee0c271494634f06402eb065f65e4e2f3497bb89666666d5eded6536b8c5c82421c55e70bcd3a4b3e1bdcf402733c3cd4e07846522f1023ad59c84bd94754c SHA512 18164bb5f346774ae3407b1eeff38958a3641bce84d8f12f9639ff308425aaf0dc65d8b515e916631c8f04a3ceb28135d6669626b91ebda01fa6987d942a9750 MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f diff --git a/net-misc/r8168/files/kernel56.patch b/net-misc/r8168/files/kernel56.patch deleted file mode 100644 index 23bb3a1856aa..000000000000 --- a/net-misc/r8168/files/kernel56.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- r8168-8.048.00/src/r8168_n.c 2019-11-26 08:32:35.000000000 +0000
-+++ r8168-8.048.00/src/r8168_n.c 2020-03-16 12:34:04.893511463 +0000
-@@ -456,7 +456,13 @@ static void rtl8168_hw_config(struct net
- static void rtl8168_hw_start(struct net_device *dev);
- static int rtl8168_close(struct net_device *dev);
- static void rtl8168_set_rx_mode(struct net_device *dev);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
- static void rtl8168_tx_timeout(struct net_device *dev);
-+#else
-+static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);
-+#endif
-+
- static struct net_device_stats *rtl8168_get_stats(struct net_device *dev);
- static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget);
- static int rtl8168_change_mtu(struct net_device *dev, int new_mtu);
-@@ -1616,12 +1622,21 @@ static int rtl8168_proc_open(struct inod
- return single_open(file, show, dev);
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
- static const struct file_operations rtl8168_proc_fops = {
- .open = rtl8168_proc_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = single_release,
- };
-+#else
-+static const struct proc_ops rtl8168_proc_fops = {
-+ .proc_open = rtl8168_proc_open,
-+ .proc_read = seq_read,
-+ .proc_lseek = seq_lseek,
-+ .proc_release = single_release,
-+};
-+#endif
- #endif
-
- /*
-@@ -27844,7 +27859,11 @@ static void rtl8168_reset_task(struct wo
- }
-
- static void
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0)
- rtl8168_tx_timeout(struct net_device *dev)
-+#else
-+rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)
-+#endif
- {
- struct rtl8168_private *tp = netdev_priv(dev);
- unsigned long flags;
\ No newline at end of file diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest index 9bc6a3094d25..bd6b704fd371 100644 --- a/net-misc/radvd/Manifest +++ b/net-misc/radvd/Manifest @@ -9,5 +9,5 @@ EBUILD radvd-2.17-r1.ebuild 1563 BLAKE2B 3d700ee7f07141534734ad387a018014453a66a EBUILD radvd-2.17-r2.ebuild 1618 BLAKE2B 05259d6d5c99d5cc261e750a99dbaa42bbc96f40cb9e7d601ad0795dfab99fc345910d1be7462704f7c190bcfeb37dec3ffe5439f46cb4c27fe3770f986fe5f7 SHA512 d08531d71eb7129ad205104fa2dd3ef6fbaae3ecc309beab55affbaca4974a6b1b90c3db4891852970fe7260be7d9a8b1d5c816fe4b3dc303d2b118d6802e83f EBUILD radvd-2.18-r1.ebuild 1647 BLAKE2B 364c3fedeeae8a531fd53dfbb7590901c202cf9bd13d36e29301ffc52c93bf2f1bdfaa05936de43b4578ef02a8728a100915af0f04b4639bc435ddc2be195933 SHA512 06a1d255577bfa41b2cf3e56ecf6eeb848c040677c6a47d5f5f34590f211a70b057a77dcd1631ccd21af7301283a2a5d7891d7079916ea548d2d8cdb30feeffc EBUILD radvd-2.18.ebuild 1582 BLAKE2B 9ef9bf5052600be82f8f37378dd11f7097a97056d4bc9fab37b0fa5855f54a225c7b8abdf6a64199d25f927bc04b7b75b091eea3e20938f892631eb0a16b52db SHA512 434ff0f3cd7c313860cbefb866633010f4219811ac501673280180ec7aa3c515b90484e3266b109dc0a37869d8458570a3af2d50e0a15e4174b71500a4eba43f -EBUILD radvd-2.19.ebuild 1647 BLAKE2B 982af1f4c21837c855f74cd15ba829450c6de59c1c49a4285137c284edd1b4acdc21b48dfd91cc23534ef4954528f56080708a331a94c51d624676798a4b7e53 SHA512 2c979af17ef2bb8d8d039a6a3387e9f853da0183e9259e74cde24275bf01dee1d742d64e872fd9a1a457ca0985ca244deb2badb9c02d0132e17cb02b483c7072 +EBUILD radvd-2.19.ebuild 1658 BLAKE2B a64093343538b9f5ab20290ea8d2820141d33a73f383b9cc4b9db1511f2d34819bbd199d37122543b5518a32c59d80e14822b8d85622de4daf546106c97606bf SHA512 231a220b3cdcf1e83af237a45a598e7d48590ba586d7f23197ea921c00b2503423472ea52d8052a1a706b46ff168bb6ccc492848f05d832fc1d64100f76ebd15 MISC metadata.xml 357 BLAKE2B 7a671f4f2fc8439f4fb80a70b5e436e9002464600ce9ad0c9aacdc22d7c3d090e26ac30431d39107ab1081f6238528b91e67d3e1e59a7ba64a85e92c584bc4d8 SHA512 d81daf7b68978a8012b5c5de47074fa35bfcd457f99ef873f0ac46409022d93c41eac5bd7492f7af1b9f7b1bae94da7eb8e6fa537414b6371ca77ba13b70e1c1 diff --git a/net-misc/radvd/radvd-2.19.ebuild b/net-misc/radvd/radvd-2.19.ebuild index f11d60a013da..5c4981d40e93 100644 --- a/net-misc/radvd/radvd-2.19.ebuild +++ b/net-misc/radvd/radvd-2.19.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit systemd user eutils readme.gentoo-r1 toolchain-funcs @@ -15,11 +15,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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 - virtual/pkgconfig test? ( dev-libs/check )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-radvd ) @@ -65,8 +65,8 @@ src_install() { } DISABLE_AUTOFORMATTING=1 -DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf. -See ${ROOT}usr/share/doc/${PF} for an example. +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 diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest index 1a496c6c6927..b358b296bb03 100644 --- a/net-misc/remmina/Manifest +++ b/net-misc/remmina/Manifest @@ -1,4 +1,6 @@ DIST Remmina-v1.4.10.tar.gz 2072202 BLAKE2B 38b6a3cca9b5956a252d4d4433910d46d0d36a2232a2a107b1e556f118f3b1a6d3c02b0bea26a39a52d572c1380dbb5bdac1acd8d6ba07c97b9acc9a64a9142f SHA512 89fed0b0ed17ac1db57a1d9ad33b80f4d17f6cfb4ff7db9b6434d9d4dabf708971e4d93dd573dbf606d1899311e564f159a656223d66bc4a9d7a15a29b5b5963 +DIST Remmina-v1.4.11.tar.gz 2176470 BLAKE2B 1d0923e520716f1cf0d1d153dab6eb3d22ef2fb53b8b51f8cd65672c9a92e7bbcc254915a0a7e269dc478aa2d39a15ab388056dc8c435997c2f0a8f257e589bd SHA512 9b26002451d297e49c63e6ce39a51d434eb18f78b3c2ef8770e2ded319ead4478a4f1ad4d4fefa19ddf3390d740bc34ce27d0c0eb0c24e39a2d792f6f66079b5 EBUILD remmina-1.4.10-r1.ebuild 2532 BLAKE2B 8f81ab82ed4a7376650ffb1f58aa3c585200fdb035c0f45932703d7fa35ddb91bf1d8885825d8938d094429a18f7ff393b7b335d3c2ae7addeaeb409d46f29e8 SHA512 a70677a1ff8074fc13cd340a9ffcdc7569ac8b5fad6cdb77c4c26ab9a323408a4f2a024d1684ae9fde318044cfd1c74439c14af4299122876ab07abf3ce64dfd EBUILD remmina-1.4.10.ebuild 2500 BLAKE2B 966b7a8753277b7b2494582eda605c337a13456afdb907195f730f5cddbbde7701edb6edfadd08383a8cb32134be815fa67bc62ab93628e980bcbef8658189fb SHA512 52b13e1bc91d55a991eb3967b5a676ee82debe3856153058d5ec222d1bc5c59ff04b772ae1439a2b9cbc890d3d9ebdb19ab3cbe7c0086a77d86c392bafa33fc5 +EBUILD remmina-1.4.11.ebuild 2652 BLAKE2B 0103f7a9d0b75622b40d5daeff43e20ccd679bcc6ccaacf2d5772f8b3ea5d70a5c57b534d30437d6123dcbcf08ac1924e24396ea904698f0a6a7836a93ad76f2 SHA512 23caa92477f40deb41e0265625545aaa4797a26b3700007cebcee783af9cb9ec1f30c2afd5dbdb2bf15946660e8ced7b0f324dcfc73ab1875832ac619caf41ff MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346 diff --git a/net-misc/remmina/remmina-1.4.11.ebuild b/net-misc/remmina/remmina-1.4.11.ebuild new file mode 100644 index 000000000000..3ce94b27c5dc --- /dev/null +++ b/net-misc/remmina/remmina-1.4.11.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake optfeature xdg + +MY_P="${PN^}-v${PV}" + +DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client" +HOMEPAGE="https://remmina.org/" +SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf" + +DEPEND=" + app-emulation/spice-protocol + dev-libs/glib:2 + dev-libs/json-glib + dev-libs/libsodium:= + net-libs/libsoup + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libxkbfile + appindicator? ( dev-libs/libappindicator:3 ) + crypt? ( dev-libs/libgcrypt:0= ) + rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] + <net-misc/freerdp-3[X] + cups? ( net-print/cups:= ) ) + gnome-keyring? ( app-crypt/libsecret ) + kwallet? ( kde-frameworks/kwallet ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + spice? ( net-misc/spice-gtk[gtk3] ) + ssh? ( net-libs/libssh:0=[sftp] + x11-libs/vte:2.91 ) + telepathy? ( net-libs/telepathy-glib ) + vnc? ( net-libs/libvncserver[jpeg] ) + webkit? ( net-libs/webkit-gtk:4 ) + zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) +" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +RDEPEND=" + ${DEPEND} + virtual/freedesktop-icon-theme +" + +DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + xdg_environment_reset + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWITH_APPINDICATOR=$(usex appindicator) + -DWITH_GCRYPT=$(usex crypt) + -DWITH_EXAMPLES=$(usex examples) + -DWITH_LIBSECRET=$(usex gnome-keyring) + -DWITH_KF5WALLET=$(usex kwallet) + -DWITH_GETTEXT=$(usex nls) + -DWITH_TRANSLATIONS=$(usex nls) + -DWITH_FREERDP=$(usex rdp) + -DWITH_FREERDP3=OFF + -DWITH_CUPS=$(usex cups) + -DWITH_SPICE=$(usex spice) + -DWITH_LIBSSH=$(usex ssh) + -DWITH_VTE=$(usex ssh) + -DWITH_TELEPATHY=$(usex telepathy) + -DWITH_LIBVNCSERVER=$(usex vnc) + -DWITH_WWW=$(usex webkit) + -DWITH_AVAHI=$(usex zeroconf) + -DWITH_NEWS=$(usex telemetry) + -DWITH_ICON_CACHE=OFF + -DWITH_UPDATE_DESKTOP_DB=OFF + # when this feature is stable, add python eclass usage to optionally enable + -DWITH_PYTHON=OFF + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "To get additional features, some optional runtime dependencies" + elog "may be installed:" + elog "" + optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt] + optfeature "XDMCP support" x11-base/xorg-server[xephyr] +} diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index e029e9198194..e4a649b5bde4 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -6,7 +6,7 @@ DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e9 DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568 SHA512 7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834 EBUILD socat-1.7.3.4.ebuild 1586 BLAKE2B 7dfdd2075cee949d3252488fb60a5d3370bf540463857521a06b5e3fc32ae75195a4383e8dc18673322ef3db9ab2f25209ac638e67e7ad65bc113a3d4285b50b SHA512 716db6a19271e18a9f08386ef2906f55d7c483186e3622fca19075b2fbcbb57c3f22fc7adf62398528b576afff040aa6bef3dbf6d6ccd9f0fc919dc1f9faaa07 -EBUILD socat-1.7.4.1.ebuild 1534 BLAKE2B 1ab55137a27da5a25d6cb8d3ebf72f7b52aa0161a8ade16892fd68d0c6e40922996228050d51d72ce8e13f712574aa85249a550e9e6b3b65eb7e606e6d12a970 SHA512 3e3a47d3e41a8dfa9dda7c625d33d04f34c1a22695ff866db5dcf2234d9e8725a4ce80d241032a991df65d2086a204a660c8695ec1130f3cf245a32a58720fe8 +EBUILD socat-1.7.4.1.ebuild 1530 BLAKE2B b7ff17c6b73340d224bc04d660621d0277380c159446027bba426f87d598ce5400c01385648ca0c434428e18619269c7a4e3d93142fd30d2eb79e372863945fd SHA512 aa3c5397e838a7ee1876330eb52ebc6769ae287e829d165481aac5b4f0e27a4b2dc0919659f8f1dea67531e1ff70b9a385c984aea02026ef085414a89b9ef149 EBUILD socat-2.0.0_beta9.ebuild 1684 BLAKE2B 8b12d6c8f85d1f3d161238100f994c1f85862b1abc0d5759eca22d5e743821d1cccd2e1f505b19faf8ad4d65803fe26fd1a388b8a21802f000ec94d9f145a360 SHA512 5c3c58e869b297dfffded35ff69b6f34574901472196863bd8f29d52e4957129923c2f0738dc0a0b64c6cebbcb421be20ff008561ab53bfc91f543a0f96726d1 EBUILD socat-9999.ebuild 1406 BLAKE2B c68fd7bf03d58f1bd16266304afab4cc73e2e129be5facb7416ed0a765fd198b02a76e5459b4dda831e2c4765c6cd9d4e0669dd024795161f38909c62d882116 SHA512 6ab7b9aa353e917b8aa46f2179bbcff95fa03e1e59ff4a8f68c512cbc8a582d5e288bd79a2a251c47837b60318640a1005392e0ebc72844a08327e41effdcc18 MISC metadata.xml 467 BLAKE2B c95bf4d69aaf5077911ffc97657ec511286dd4f524fa4b9a1d537cba55d6fbc6ed2bdebf5379daa7c340a2f56538a2546971b39e7915baed943b177e7813b781 SHA512 2eb27fc5699059cecf00fa097c2e09440d5efd5a3b851631818d965bbda6767bfcc60a663d24569ab8b89a2e60bac9a5aead5fb3ca52d15e1d250140e7b70514 diff --git a/net-misc/socat/socat-1.7.4.1.ebuild b/net-misc/socat/socat-1.7.4.1.ebuild index 1db0f86eaaf5..b825d44a0c82 100644 --- a/net-misc/socat/socat-1.7.4.1.ebuild +++ b/net-misc/socat/socat-1.7.4.1.ebuild @@ -13,7 +13,7 @@ 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" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="bindist libressl ssl readline ipv6 tcpd" DEPEND=" diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest index cb360ad74dc9..df7fa1893611 100644 --- a/net-misc/suite3270/Manifest +++ b/net-misc/suite3270/Manifest @@ -1,6 +1,3 @@ -AUX suite3270-3.5_p8-tinfo.patch 2733 BLAKE2B ea2d966d5138e33289d803223a4e49f4dc314ed206e5b5dd838e0ae7152a03417bb4b9044f544b8bf729421bb35f723bcb48ee2f58fcfaf27d460f51ed172d73 SHA512 5b748df7b50957746423954bea86b2ce43063b33a0e5ad3d22d93653c4e3dd11494111e46b4c83c45add41dc448c004ddc3b217be23712953682784c79f76564 -DIST suite3270-3.6ga8-src.tgz 3296047 BLAKE2B 98bcee4591c3eea12c7127aa2eeb39613f6f090c041ceab7a7b0f1bf0e946c3048ba2f93eaacf2bbaf04b44ba78a8895f6b7acdcf20baea19a408464f83f4d62 SHA512 88a00bec19ae7be92e5bc0edd6ae1e27bef7fbbf8c3f419efda3ba2b3a0cb5e72693916cd44d50166d5745ce0f9d8497641481cedbb0bb3149567b6f51b1a987 DIST suite3270-4.0ga13-src.tgz 3317494 BLAKE2B 898f279143006e1fc1f470bda3917afe85957de745676dc915f9c94292824ba0e10fc2ccf0a47e307c41e48741a3da7c066c45f63c917295e0522122226b79dd SHA512 bdf9c5d129419c87b45907186e5f158d8623009151357e4d8a3d08ffff2f3729449cead84d005227bfb32968ae363d1a29350692cabe9bf8b71f760eda3f496b -EBUILD suite3270-3.6_p8.ebuild 2126 BLAKE2B 6af9b8a731e933740f3ebf1f260251d7c91806f32bc70f3bf26a914227c7ef7bd9592fb898f1a8e2fbb7eeed0c703cfbd82a2bdbe0973512007f674fc2b8b908 SHA512 6d834fc4455625b414b2b19b509b71dc6a19501ff301fe15acb49c0e0fb632ef5d3ffac10e72e7ea593c00541c4bf0010a526d9c14c6e9ca077d76ef09672a33 -EBUILD suite3270-4.0_p13.ebuild 2049 BLAKE2B 1cfd6fab141ed6e19a3a0f86191e3ea5b1871441b0834df0a910e8868939d853b9a4e18a5bd24f974b1e523f86d3c46c7d11ddb6520c3776e9d69f8891aead47 SHA512 ef537f29d1254d144e833b19b905300a699969330810126e162a8b76307cf9699d3103cb61ff4832ec72dfbccf8cfe19159bbb234b667a574a1e7256edb8883e +EBUILD suite3270-4.0_p13.ebuild 2047 BLAKE2B cc106c4b4dede80f90badd68c15af7a2f50f206b0a379964dd90d3e194ace955c4f4a5d3249e5ffc70f353f1c846e264dd4971611c2d85cfc55d6d8e505947fd SHA512 7d8c5b87687af30241b7fe2d5add68e942eb05225d3d9f3b475d85f36c973ce9a7f7b26f416b5b545bca02fb9b485e63d309d997ed706e2109fe30d3353f1633 MISC metadata.xml 463 BLAKE2B 5035d30c690419dbe52b4caf68981eb40c858f09787189439dda81dd57096276a029201b0ea3eb67840a14552d9c4dcf21eb00003ea530b79b85219cc607c19b SHA512 ef297d66d1c0b2c7ab6f8d0c489f355267124cd1f0cc09d18cf1b2cd33458be4c8e1716e84753ba6e49903a90fb676fb7ae908205672f927656ebd9c11879e45 diff --git a/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch b/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch deleted file mode 100644 index 54be6e0510ce..000000000000 --- a/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch +++ /dev/null @@ -1,87 +0,0 @@ -From a28f70d7fa11907898887706df35c3c3831d901a Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Tue, 10 May 2016 01:12:30 -0400 -Subject: [PATCH] c3270: autolink libtinfo when it exists - -The ncurses libs might split out core funcs into libtinfo. Make sure we -detect & link this when available otherwise the linker might complain the -symbols are missing: -ld: screen.o: undefined reference to symbol 'meta' -/usr/lib64/libtinfo.so.6: error adding symbols: DSO missing from command line -collect2: error: ld returned 1 exit status ---- - c3270/configure.in | 1 + - c3270/configure | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 46 insertions(+) - -diff --git a/c3270/configure.in b/c3270/configure.in -index d9f19e6..8c6d852 100644 ---- a/c3270/configure.in -+++ b/c3270/configure.in -@@ -129,6 +129,7 @@ dnl first, so that objects in them can be used by subsequent libraries. - AC_SEARCH_LIBS(forkpty, util) - AC_CHECK_FUNCS(forkpty) - AC_CHECK_LIB(ncursesw, newterm, , [AC_CHECK_LIB(ncurses, newterm, , [AC_CHECK_LIB(curses, newterm, , [AC_MSG_ERROR(Can't find libncurses or new-enough libcurses)])])]) -+AC_CHECK_LIB(tinfo, meta) - if test "$with_readline" != no; then - AC_CHECK_LIB(readline, rl_initialize) - fi -diff --git a/c3270/configure b/c3270/configure -index bef2dff..9946e83 100755 ---- a/c3270/configure -+++ b/c3270/configure -@@ -4020,6 +4020,51 @@ fi - - fi - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for meta in -ltinfo" >&5 -+$as_echo_n "checking for meta in -ltinfo... " >&6; } -+if ${ac_cv_lib_tinfo_meta+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltinfo $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char meta (); -+int -+main () -+{ -+return meta (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_tinfo_meta=yes -+else -+ ac_cv_lib_tinfo_meta=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_meta" >&5 -+$as_echo "$ac_cv_lib_tinfo_meta" >&6; } -+if test "x$ac_cv_lib_tinfo_meta" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBTINFO 1 -+_ACEOF -+ -+ LIBS="-ltinfo $LIBS" -+ -+fi -+ - if test "$with_readline" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_initialize in -lreadline" >&5 - $as_echo_n "checking for rl_initialize in -lreadline... " >&6; } --- -2.7.4 - diff --git a/net-misc/suite3270/suite3270-3.6_p8.ebuild b/net-misc/suite3270/suite3270-3.6_p8.ebuild deleted file mode 100644 index d8c130a16927..000000000000 --- a/net-misc/suite3270/suite3270-3.6_p8.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -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 eutils font - -DESCRIPTION="Complete 3270 access package" -HOMEPAGE="http://x3270.bgp.nu/" -SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc s390 sparc x86" -IUSE="cjk doc ncurses ssl tcl X" - -RDEPEND="ssl? ( dev-libs/openssl:0= ) - X? ( - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXmu - x11-libs/libXt - ) - ncurses? ( - sys-libs/ncurses:= - sys-libs/readline:0= - ) - tcl? ( dev-lang/tcl:0 )" -DEPEND="${RDEPEND} - X? ( - x11-base/xorg-proto - x11-misc/xbitmaps - app-text/rman - >=x11-apps/mkfontscale-1.2.0 - x11-apps/bdftopcf - )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch -) - -suite3270_makelist() { - echo pr3287 s3270 \ - $(usex ncurses c3270 '') \ - $(usex tcl tcl3270 '') \ - $(usex X x3270 '') -} - -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 - # 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" -} - -src_configure() { - echo "${INSTALL}" - 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} - - local p - for p in $(suite3270_makelist) ; do - cd "${S}/${p}" - docinto ${p} - dodoc README* - use doc && dohtml html/* - done - - 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.0_p13.ebuild b/net-misc/suite3270/suite3270-4.0_p13.ebuild index cd058cd5019a..3c7df279e0b3 100644 --- a/net-misc/suite3270/suite3270-4.0_p13.ebuild +++ b/net-misc/suite3270/suite3270-4.0_p13.ebuild @@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc s390 sparc ~x86" +KEYWORDS="amd64 ppc s390 sparc x86" IUSE="cjk doc ncurses ssl tcl X" RDEPEND="ssl? ( dev-libs/openssl:0= ) diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest index 754f74bfed8d..f47bd1581583 100644 --- a/net-misc/teamviewer/Manifest +++ b/net-misc/teamviewer/Manifest @@ -1,5 +1,8 @@ AUX teamviewerd15.init 282 BLAKE2B eaa5844606cab7942d8117a7f62687f1ba2b3ff5deecf61903d9c01ea5434c8104eceb2e50d1c7a4b93089df53c98fab38da6e6e5f4ee8c18426a7165b9cc465 SHA512 bc2271c1fb360129bf0452950340389e434e420830d7d3f47dcd248151dbbadf798c025d4e47fe311857c070f3dd7b12f0092fa09508f0300963c6e04d8ed7c8 -DIST teamviewer_15.5.3_amd64.tar.xz 13028200 BLAKE2B 12eec74d2e737d8d091fa100f3a6ff56926257ddd7757f649d2acaacac55c29724690a9bc52bef9c9b966692f8d28d352dc5002b815b4b7e3fd535bb1b250105 SHA512 36a758759e1f0ebfc1e7cd559d5326f51704307373a96d4df1fae5d4e467cd638a9d2c7f4d40c7b2ad47ec4fc66e0f5b432596569b2226d92c18abe67ab01b50 -DIST teamviewer_15.5.3_i386.tar.xz 13562544 BLAKE2B 55d16574968943ae5dd52d523b63ceadd1f74ec7a4440dc476e6498bb3c05cda395524af4d4d4b3b1b94eae5ea22b70bc91ee63c27be90986589d7a8ec50393e SHA512 4022d179aedf8050ddb07f6ae44cac1a08f8f3e8a3b2593c2c3d97ba87f02d6b24db0247b173f64f38ed6128b148c025e0941e2695cf5fdbb443768e93dfd797 -EBUILD teamviewer-15.5.3.ebuild 4086 BLAKE2B c3093c33cc700ee4e58cc2e99a133b6fc7234254db8f890ef5a0593910f189a0e3286d8cf7bc4feb0a5335f24960568dd6520bd9959b97fc3fe57420e6743bf6 SHA512 c25d94347c9eee586f117b2a90bf858972d79b9a60e0e9317ad59b2f711e817703ca7f27af4e8e05543188c3dc60fd5c414986612e095581bf8bf7536c720126 +DIST teamviewer_15.14.3_amd64.tar.xz 13216052 BLAKE2B d5fa55609a2bb6257c1fc95ec9dd3f330a4729c2af230600730fed06239b5cf2991733958790e254edb1d83191fd3467ae4b82547b089208799ee264c913506b SHA512 2bdeb5563c48595ed6bbbaa21e3ab63f670da082bcef297052f974c62c15ec085385d055f9be6a6fabaa61aa57d213a8dd0aaa1700f9ff20ad8ced0655684d4f +DIST teamviewer_15.14.3_i386.tar.xz 13733488 BLAKE2B 14def908b2c2e86b49649264b0eab4b15594e15425b98333720f0025a0530cf3e2c350f54b996f6d48a6f44dd368899fec95c38ddeb6b909992fecf80a2bdc46 SHA512 02a2843424a19252546ce0598f0ec52dd4a0d02148e379c944b7976bba794858cc1ca58724bf5b9828b6dd38e3f3989bab8b17d7ca9285596fd450d2ce753668 +DIST teamviewer_15.14.5_amd64.tar.xz 13224544 BLAKE2B 2cefeebce0a4c31ba84e554882400ee65b6a44d7c335125cd25dfd4e9e4aa02b34708d679873a52b31e46c5157ac7d6a89d8b77848453fc7733f8931964202fc SHA512 723a63d9490df367c3f072da9ed79d84e38de60c67ca78c10b01612f48fe1afe0d379b414f898f342ddab336b9689d2f38b76d9ff83654a789e8059b2da886ad +DIST teamviewer_15.14.5_i386.tar.xz 13724612 BLAKE2B 09558e5bc3b5db9ac57a038af14eb56816a5f272a637cfb3f73bfe072836a3011ff14f5e8acdd50889d66a9422fdc0d14f50eccfa908c6e796544d93f30961ed SHA512 5c38cd3106adf69c6b27d8696ff6c3d49a1a1450e317b07af20e7b2c2351102fcd6a0d61a9e1ce1f75968db048461adcb3dd5d5b0cf98b3de94719ccfed93586 +EBUILD teamviewer-15.14.3.ebuild 4057 BLAKE2B d0f1fef8731e318303ed6b1c21b1756f24b2ecbc8946f18189199bae20db2b7581c22467f550f5880194a68a908361990882dfbdf23ad415ab18f0ea92dc2ef9 SHA512 d470a0db96124a5fab21a8a102e8a32139e3eb809e4ac0aadb34a5f97c85636f6eb739fca767ce53f9d7ac71c363b1baa833c87aa2e82282ca2c4b52d756738d +EBUILD teamviewer-15.14.5.ebuild 4057 BLAKE2B d0f1fef8731e318303ed6b1c21b1756f24b2ecbc8946f18189199bae20db2b7581c22467f550f5880194a68a908361990882dfbdf23ad415ab18f0ea92dc2ef9 SHA512 d470a0db96124a5fab21a8a102e8a32139e3eb809e4ac0aadb34a5f97c85636f6eb739fca767ce53f9d7ac71c363b1baa833c87aa2e82282ca2c4b52d756738d MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/net-misc/teamviewer/teamviewer-15.5.3.ebuild b/net-misc/teamviewer/teamviewer-15.14.3.ebuild index d4da70a87a17..4636957e3f98 100644 --- a/net-misc/teamviewer/teamviewer-15.5.3.ebuild +++ b/net-misc/teamviewer/teamviewer-15.14.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 MY_PN=${PN}${PV/\.*} -inherit desktop xdg-utils systemd +inherit desktop systemd xdg DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet" HOMEPAGE="https://www.teamviewer.com" @@ -31,7 +31,7 @@ RDEPEND=" !sys-auth/consolekit " -# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956 +# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956 RESTRICT="bindist mirror" @@ -109,28 +109,28 @@ src_install() { } pkg_postinst() { - xdg_icon_cache_update - - 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?sid=3cc21e5a27935e38975ee85bf03317ae#8332956" -} - -pkg_postrm() { - xdg_icon_cache_update + xdg_pkg_postinst + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + + 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.14.5.ebuild b/net-misc/teamviewer/teamviewer-15.14.5.ebuild new file mode 100644 index 000000000000..4636957e3f98 --- /dev/null +++ b/net-misc/teamviewer/teamviewer-15.14.5.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=${PN}${PV/\.*} +inherit desktop systemd xdg + +DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet" +HOMEPAGE="https://www.teamviewer.com" +SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz ) + x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )" + +LICENSE="TeamViewer MIT" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="" + +DEPEND="sys-apps/sed" +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + sys-apps/dbus + !sys-auth/consolekit +" + +# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956 + +RESTRICT="bindist mirror" + +# Silence QA messages +QA_PREBUILT="opt/${MY_PN}/*" + +S="${WORKDIR}"/teamviewer + +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 -e "/^ExecStart/s/${PN}/${MY_PN}/" \ + -i tv_bin/script/teamviewerd.service || die +} + +src_install() { + local dst="/opt/${MY_PN}" # 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 + + insinto ${dst} + doins -r tv_bin + + # Set permissions for executables and libraries + for exe in $(find tv_bin -type f -executable -or -name '*.so'); do + fperms 755 ${dst}/${exe} + done + + # No slotting here, binary expects this service path + 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 + + for size in 16 24 32 48 256; do + newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png + done + + # Install documents (NOTE: using 'dodoc -r doc' instead of loop will + # have the undesired result of installing subdirectory 'doc' in /usr/ + # share/doc/teamviewer-<version>) + for doc in $(find doc -type f); do + dodoc ${doc} + done + + keepdir /etc/${MY_PN} + dosym ../../etc/${MY_PN} ${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_PN} + dosym ../../var/log/${MY_PN} ${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 ${SLOT}" TeamViewer +} + +pkg_postinst() { + xdg_pkg_postinst + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + + 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/uftp/Manifest b/net-misc/uftp/Manifest index e4d40d60aec2..052b2e6805f1 100644 --- a/net-misc/uftp/Manifest +++ b/net-misc/uftp/Manifest @@ -6,5 +6,7 @@ AUX uftpd.init 518 BLAKE2B b4a98852340d03a5bb8673faff02f7f18a5a27b87d22aebaf1975 AUX uftpproxyd.conf 121 BLAKE2B 82664d638b8a4041a5c18676e46509c3ed20525b7178ada1fa902f41f57a78c5e465b22701bd369e26ea65ebf4fe5834f7b23f4fcebd6d87850ed8fd93e58f40 SHA512 c61441d048ce99a50b5224cea7c4f9f1a2532fff8083a9a71e6099a98cba1fe79b43825188034efd402b47ac28bbe341827cb21872c17550419db36a8da7bb35 AUX uftpproxyd.init 522 BLAKE2B a7a4df565d5dfa2761068adfa3dc440030269cc0d809c892807a2582df36882b2cc489de608ed0baa85f6714d15e7a3ec3f00895324fe1f6a521c3ca8ffd9ccb SHA512 2d69f0b84750cb62fb96b7fc7a042fe54b6f658074f9c4c49a2bf4957507fce333862ae95fd0498e60240490ce44cd299b8fba851d4d7c9a67dcdf1e7f29d7f5 DIST uftp-4.10.1.tar.gz 245625 BLAKE2B 23b01758fa5a0387471f8d95b24738d8157801822b8a07a59072eeab81277ceb5283463465ed522af6971d65141712ead3e2206caa286bedece9e0c34a149873 SHA512 9ef4594e0cde2f64970523661fcee07f34600bd4f2ab235c34bde9d20ef1b0312d5e430e1f52ab605c188c42aee4a0384ed02ae9f5e93b3edc062f848a8130bf +DIST uftp-5.0.tar.gz 239651 BLAKE2B 8fcba8c0fc2db2dac941eaff7ebc7f2b25c53dd2e021985a2c1d93c29ce0afb2bd7da79bb5a20e0d45f703837ebb375d07825456edc217abe32ff51665a6e237 SHA512 f76e86559971facd806141fae88c6c47ec8361440044e429126391c6ac17f5f6ec0c79950816f9329cbb85a6be31d0700d18f599ef0b56f8df3ebe03fad4e27a EBUILD uftp-4.10.1.ebuild 1434 BLAKE2B 9f722def7df49faac8b15fd3cca37ff19764fc6c53bb66dfb913cb1711c0a8c5553d0b4436606fcc7d38a0f499fa247f37cd5bc56de604969915b7e276b4e81e SHA512 3e4d228f59647135a0c56654f5d54af7da10a48d69e356c6bb805397434b2bdd51ec62a68596003f6672cfb62aa75ea981cea2c642bb6b9f6aa7f7b862962e81 -MISC metadata.xml 433 BLAKE2B 0c732cc29ed317b29aa5c7313ebf825e62835325c1c44f1e39bbf2893d40335b3458ddf9263132fc858d28ac8c66876f39bdccbfdc376c87c955e8f09eba7171 SHA512 7e63ff9bed7a90bc94ac2f0441b6f089e5f38d08afb47c5513b09bb6ee2b5fca756a20401d622548c129b540a0b93dba882c38e5ac69dcca9ec72e4c4c9e7686 +EBUILD uftp-5.0.ebuild 1184 BLAKE2B 441fccf9dca907eb63e8fe657b70cb3acc07ebde59700b0858614750ae4ad3636a27bcea88fb73b626a728fcd79af271080e93389fecd2e8864a4c5909b9b72c SHA512 be6161ecb9df30d234ea7a707a61a142a0670cf2cb583b91ba340ee56507b1011e2f516281016eaecb1520ee38c20ea27a020e271dc2cab579e78f0a6a2a9ee0 +MISC metadata.xml 514 BLAKE2B 39860d6c126268a50b05481df28aa9119ac42b6e29e7c985229e4ba7cfb416eafe43e6991e230f716120296ff620e218308bf1412721b5d1c106953422b1e5d6 SHA512 ecdf0ed1d4f620a20a62ad70fd0f6d3ed1bf3313bdc09f1233d589b7e93bac532aef5e84846f4ec5021536f6da6b29b8419dede49acec4ff3b20ea28f6106f9b diff --git a/net-misc/uftp/metadata.xml b/net-misc/uftp/metadata.xml index 2a33d8eedc97..95eaf34a95da 100644 --- a/net-misc/uftp/metadata.xml +++ b/net-misc/uftp/metadata.xml @@ -9,6 +9,9 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> +<upstream> + <remote-id type="sourceforge">uftp-multicast</remote-id> +</upstream> <use> <flag name="server">Install uftp server daemon</flag> </use> diff --git a/net-misc/uftp/uftp-5.0.ebuild b/net-misc/uftp/uftp-5.0.ebuild new file mode 100644 index 000000000000..eb2c9faf0bc3 --- /dev/null +++ b/net-misc/uftp/uftp-5.0.ebuild @@ -0,0 +1,46 @@ +# 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}" + +PATCHES=( + "${FILESDIR}/${PN}-4.10.1_makefile.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 +} diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index ef8242efc061..e487b101bc84 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,6 +1,12 @@ DIST youtube-dl-2021.01.16.tar.gz 3275243 BLAKE2B 970bfff5db0aca7e386027e20f2b4d7e6b7209037820f3e0960f2e19b3b8e0aaf0f62bacb1794a15f359108533cbc396dddea99c84a8c88c13891329d2685326 SHA512 01b73f2e626df69249057ddc205d49dc7d6d16c66f4349fcdde5990615d1d13e0b5db15d65fb35e0c1328f7dc67d1473183228778614ccb7a3c9d27e80a0a38d DIST youtube-dl-2021.01.24.1.tar.gz 3288395 BLAKE2B f0adc4ed7627cfda3b7729afd0e4617c1d78b44b5cb84186251eacdfb54bdd0ad2395253899a1aed1ba708856e872ca0537baf316f08b289140bdacb3976e9d6 SHA512 b5ab1e03f38b5628487fdfa22febd594f87d42c228fcc0b03966205ca3fbc6fa6103388f8736ad22e7d517359823d8ca6cc61aeb80fdd69db06a82d55437bacb +DIST youtube-dl-2021.02.04.1.tar.gz 3274333 BLAKE2B 46f5c332f7346db589cd6d5c0fe649b547e948903f90851d6ead0322ec516300dd65189d781ffd24711336dc1f310920a4c5a6f9d6a1944046e900bcd22ee675 SHA512 b1050ace3adf1811adaa336d5b3574c938bf6fde1163e50b35c8a11bb5c251cf272ca5de3ff8132a44417ea2ced7b611c19e4aaf4dfd12adfeac03afe14df0dc +DIST youtube-dl-2021.02.04.tar.gz 3274222 BLAKE2B 6ec6b4031b8fff7630bbbebcef5795962d7bc6c12a04799f0a04d8b14023e651a06757f918dc6d3c3b6833b7662c742c26dbe68e3f1a35159c0dda49ef6c2f32 SHA512 44dab7016d625235aab244161bfcc959d6fd22cb176ca0fb59f60eb31229da343f0a40c162c37a7e829bfa82fed541b66266d28cd859fc18a78bb1936f3fde22 +DIST youtube-dl-2021.02.10.tar.gz 3277828 BLAKE2B f3bd3874784ada041c86872621a8f5c9e6e2de7ef266fee1962bf4a609b5361baca0e77eed97624fd2f856748fa826ba361bbf242acafdd6b89bc3a36d5f295e SHA512 84de569e5fb691af84e0dca6de5912b99912df2d88b5933740dfa76ce57027b21e1648dd7c8fe71f40839297d670f1a0cefaa3c1fc4d0c6d9beddbd22d0e93ec EBUILD youtube-dl-2021.01.16.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609 -EBUILD youtube-dl-2021.01.24.1.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358 +EBUILD youtube-dl-2021.01.24.1.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609 +EBUILD youtube-dl-2021.02.04.1.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358 +EBUILD youtube-dl-2021.02.04.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358 +EBUILD youtube-dl-2021.02.10.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358 EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B a1f8bf8a72ee78e4f6720b44da5c4f2782d16e6a63a5ac9bea156794492df0568a01de29e0015758668ac8902c510fdbae2855031f3b9f4902bf736753e3b2a3 SHA512 f14c1f7399ceeb6a367ecbdf790d9c99a74f0be93b27f1e140a681c8262739b9201cd12bde472f92e9041db7d3a21049cf646c58453f41f59b3edb77abc73c79 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623 diff --git a/net-misc/youtube-dl/youtube-dl-2021.01.24.1.ebuild b/net-misc/youtube-dl/youtube-dl-2021.01.24.1.ebuild index 9b024e43dbba..d787a3f3be53 100644 --- a/net-misc/youtube-dl/youtube-dl-2021.01.24.1.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2021.01.24.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" S=${WORKDIR}/${PN} LICENSE="public-domain" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" SLOT="0" RDEPEND=" diff --git a/net-misc/youtube-dl/youtube-dl-2021.02.04.1.ebuild b/net-misc/youtube-dl/youtube-dl-2021.02.04.1.ebuild new file mode 100644 index 000000000000..9b024e43dbba --- /dev/null +++ b/net-misc/youtube-dl/youtube-dl-2021.02.04.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python3_{7..9}) + +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 + +DESCRIPTION="Download videos from YouTube.com (and more sites...)" +HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" +SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" +S=${WORKDIR}/${PN} + +LICENSE="public-domain" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +SLOT="0" + +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] +" + +distutils_enable_tests nose + +src_prepare() { + sed -i -e '/flake8/d' Makefile || die + distutils-r1_src_prepare +} + +python_test() { + emake offlinetest +} + +python_install_all() { + doman youtube-dl.1 + + newbashcomp youtube-dl.bash-completion youtube-dl + + insinto /usr/share/zsh/site-functions + newins youtube-dl.zsh _youtube-dl + + insinto /usr/share/fish/vendor_completions.d + doins youtube-dl.fish + + distutils-r1_python_install_all + + rm -r "${ED}"/usr/etc || die + rm -r "${ED}"/usr/share/doc/youtube_dl || die +} + +pkg_postinst() { + elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" + elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" + elog + elog "youtube-dl works fine on its own on most sites. However, if you want" + elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)." + elog "On some sites - most notably YouTube - videos can be retrieved in" + elog "a higher quality format without sound. youtube-dl will detect whether" + elog "ffmpeg is present and automatically pick the best option." + elog + elog "Videos or video formats streamed via RTMP protocol can only be" + elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." + elog + elog "Downloading MMS and RTSP videos requires either mplayer" + elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." + elog + elog "If you want youtube-dl to embed thumbnails from the metadata into the" + elog "resulting MP4 files, consider installing media-video/atomicparsley" +} diff --git a/net-misc/youtube-dl/youtube-dl-2021.02.04.ebuild b/net-misc/youtube-dl/youtube-dl-2021.02.04.ebuild new file mode 100644 index 000000000000..9b024e43dbba --- /dev/null +++ b/net-misc/youtube-dl/youtube-dl-2021.02.04.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python3_{7..9}) + +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 + +DESCRIPTION="Download videos from YouTube.com (and more sites...)" +HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" +SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" +S=${WORKDIR}/${PN} + +LICENSE="public-domain" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +SLOT="0" + +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] +" + +distutils_enable_tests nose + +src_prepare() { + sed -i -e '/flake8/d' Makefile || die + distutils-r1_src_prepare +} + +python_test() { + emake offlinetest +} + +python_install_all() { + doman youtube-dl.1 + + newbashcomp youtube-dl.bash-completion youtube-dl + + insinto /usr/share/zsh/site-functions + newins youtube-dl.zsh _youtube-dl + + insinto /usr/share/fish/vendor_completions.d + doins youtube-dl.fish + + distutils-r1_python_install_all + + rm -r "${ED}"/usr/etc || die + rm -r "${ED}"/usr/share/doc/youtube_dl || die +} + +pkg_postinst() { + elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" + elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" + elog + elog "youtube-dl works fine on its own on most sites. However, if you want" + elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)." + elog "On some sites - most notably YouTube - videos can be retrieved in" + elog "a higher quality format without sound. youtube-dl will detect whether" + elog "ffmpeg is present and automatically pick the best option." + elog + elog "Videos or video formats streamed via RTMP protocol can only be" + elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." + elog + elog "Downloading MMS and RTSP videos requires either mplayer" + elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." + elog + elog "If you want youtube-dl to embed thumbnails from the metadata into the" + elog "resulting MP4 files, consider installing media-video/atomicparsley" +} diff --git a/net-misc/youtube-dl/youtube-dl-2021.02.10.ebuild b/net-misc/youtube-dl/youtube-dl-2021.02.10.ebuild new file mode 100644 index 000000000000..9b024e43dbba --- /dev/null +++ b/net-misc/youtube-dl/youtube-dl-2021.02.10.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=(python3_{7..9}) + +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 + +DESCRIPTION="Download videos from YouTube.com (and more sites...)" +HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" +SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" +S=${WORKDIR}/${PN} + +LICENSE="public-domain" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +SLOT="0" + +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] +" + +distutils_enable_tests nose + +src_prepare() { + sed -i -e '/flake8/d' Makefile || die + distutils-r1_src_prepare +} + +python_test() { + emake offlinetest +} + +python_install_all() { + doman youtube-dl.1 + + newbashcomp youtube-dl.bash-completion youtube-dl + + insinto /usr/share/zsh/site-functions + newins youtube-dl.zsh _youtube-dl + + insinto /usr/share/fish/vendor_completions.d + doins youtube-dl.fish + + distutils-r1_python_install_all + + rm -r "${ED}"/usr/etc || die + rm -r "${ED}"/usr/share/doc/youtube_dl || die +} + +pkg_postinst() { + elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /" + elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :" + elog + elog "youtube-dl works fine on its own on most sites. However, if you want" + elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)." + elog "On some sites - most notably YouTube - videos can be retrieved in" + elog "a higher quality format without sound. youtube-dl will detect whether" + elog "ffmpeg is present and automatically pick the best option." + elog + elog "Videos or video formats streamed via RTMP protocol can only be" + elog "downloaded when rtmpdump (media-video/rtmpdump) is installed." + elog + elog "Downloading MMS and RTSP videos requires either mplayer" + elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed." + elog + elog "If you want youtube-dl to embed thumbnails from the metadata into the" + elog "resulting MP4 files, consider installing media-video/atomicparsley" +} diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest index a959fccc64b3..ee7f584878df 100644 --- a/net-misc/zerotier/Manifest +++ b/net-misc/zerotier/Manifest @@ -6,6 +6,8 @@ AUX zerotier.init-r1 285 BLAKE2B cb30206b6b2fa00e9b77bee83d0ef61bc864146337e06c6 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701 DIST zerotier-1.4.6.tar.gz 13055818 BLAKE2B 46003d9c3ad09e30dbefaa441422ed4570bdbdfb99f2f24fb82246f9e970501d38d96c19dc9771a1d0d30bc49bd8be2b79ebd2e5c8bd85e88b738b29f0a1dcc3 SHA512 72f00602f67190d03ac0c8caa6b79e7f346b10745bdf772c68f77a3a940cdd718d05ec642bc862a6235aab9bd3bfefb0c57571f358ae55f38761f45500f0f189 DIST zerotier-1.6.2.tar.gz 16020599 BLAKE2B 91da6c85f8d3dfd993a9aea9cd2a8b33e560d5475413fde8bef0a69df7d89503a66b1967ac336bd2213f6ffc35e452f665d37ceb8d9ae53cf5e5d4d352775e74 SHA512 8abb31ba8aed4c187a4e88ffe6f536ed7d0fe2421f89ae706eef620cc9508372a089ce9e9579df372e21b6dab271bea91e2d12b424dd85ece8c19885a6caa643 +DIST zerotier-1.6.3.tar.gz 16020606 BLAKE2B d958ac3276b34b0b99dcce7178ca08a7ac398831172103bb26ddb32814f9043103c9cde6e55853a20d090c1b239746c65cd70de3b9e498dc174baaf6ca403a66 SHA512 56052a9cd50f2a754ba8979fec9b7ba6caf54d83582428b1b43d8b54e5caf388adccbb955fcb9c3fd5b3d7ebde7663023ca4a9a3805b877c3063fa72e23cbed0 EBUILD zerotier-1.4.6.ebuild 1802 BLAKE2B 3fa9f53c3568d53c528a20610d58400e3d51ec02d6b6c3781350fddcd133dc8c30aae6f74d4b6a43e06708bc3b71281b60a1c0958b2e1390d0caeb62d5c04d23 SHA512 712437b743c70d5941f72206c0ab9025b85809453ddf5c33e8d18ace4a9771f3c5c861b491758cc2f2b8ee455a50738f7d0b16ac3d87784998ba966f8d56fbb1 EBUILD zerotier-1.6.2.ebuild 1776 BLAKE2B aa98cbb7880d7e034fbd403285202058313586975a9244f7691c77de9c96e60706a90be3e5cf32f9be34922e4e6468a2b7227a866c4298bcd15cf6817f2065d8 SHA512 19be19a84d78d8e3fa979d0cdb2c890e11b078c83b1f6d9e5b667998d9508757796aea75582cb3e29311aaf0dc3f663825dcc0a433782f88954cf1298e10b67f +EBUILD zerotier-1.6.3.ebuild 1776 BLAKE2B aa98cbb7880d7e034fbd403285202058313586975a9244f7691c77de9c96e60706a90be3e5cf32f9be34922e4e6468a2b7227a866c4298bcd15cf6817f2065d8 SHA512 19be19a84d78d8e3fa979d0cdb2c890e11b078c83b1f6d9e5b667998d9508757796aea75582cb3e29311aaf0dc3f663825dcc0a433782f88954cf1298e10b67f MISC metadata.xml 482 BLAKE2B 8aaebdfd4d9a6454f3a426fb472a12e50f64e7cc356795b10175f9a3e3bfc5a181f503d609bb431b9619e73675ffa6e24059452696cdbe6f2d4aeff5f3a8cd11 SHA512 54bdb668f32bc05faee9dca6f29c3648127abe60c5338a4f1cdb71b3812e33314f1e6b691801caeb3fc3e5dfaa8ccc89b9f73469eb964321fc9f983ec669dadc diff --git a/net-misc/zerotier/zerotier-1.6.3.ebuild b/net-misc/zerotier/zerotier-1.6.3.ebuild new file mode 100644 index 000000000000..fdfc4d61007e --- /dev/null +++ b/net-misc/zerotier/zerotier-1.6.3.ebuild @@ -0,0 +1,80 @@ +# 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 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 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} +} |