diff options
Diffstat (limited to 'net-misc')
37 files changed, 1045 insertions, 962 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex c201c8fe01da..bf8fcbed0d8c 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest index edc4e96378b2..f04f31dc02ee 100644 --- a/net-misc/apt-cacher-ng/Manifest +++ b/net-misc/apt-cacher-ng/Manifest @@ -6,6 +6,6 @@ AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8c AUX initd-r3 599 BLAKE2B aee4ad69c9aa213ce00062b073c3c02a1f29b96aaa0b2b4573f009846be1f5b0f1bb53089f14c399b6accb73937545820eef5b84a765ed8fff26e79ac543bcfd SHA512 37ea0bc22347afad9e64e038c14552a4609fa95f3c4a4dd0a3938cada1545940f1c76114cf1a46cea41ce4cf524f9e6a2499d7a7770507c20bcb726b8ee9515f AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885 DIST apt-cacher-ng_3.6.3.orig.tar.xz 334620 BLAKE2B 7e77edb966f0732f392a3fb243cda547dca7d4f878e44c6c000491ccb0a3115ad58a553706ef02834d25366b09d24ee6af2dafad76f97cd1978dc5a4d35f3380 SHA512 57d991c71f6d0bb9d43b4645ee7be2fb38ccbf73581206e01b6ca389bd8591d5e9f425350e3aff053527125c95caefe9ab1217dedff812162cf6bd4cdfdef792 -EBUILD apt-cacher-ng-3.6.3_p1-r1.ebuild 2554 BLAKE2B a4fb769215e9a2a371caf53184b5d2d6b9fc37cb2152b44a6a603dcf55125ca8787076d21d49721017061d3b5c1bb87a9c7b24a69aa109cfe3326bb0a8015dce SHA512 a6f4b5678a672885fa4f57bc77ab52113f1228149e747387799ff368472c19140992ef9d008206be8f38587ebd1d62110615d5256b397d03918b56f9b6469f7b -EBUILD apt-cacher-ng-9999.ebuild 2409 BLAKE2B 5f3308a0080fb19fc89f442cce5eb2b5ab21c26c644cca30ab7641a04be8fc2fdd42f1739c02db3cee81a9bb8a0e9834b678c5f03cdfa004d8134a1519b97279 SHA512 160950f774cbb650511f989908c4cf66e2f711138a64046a5f42bc6c965a60611c0b2653184f50506f76fe00521c105086dbe5b4db20479ab9f4c97a724a6c3f +EBUILD apt-cacher-ng-3.6.3_p1-r2.ebuild 2614 BLAKE2B 1f02755ebf1c2c270ef3bc9c1c8f6f0aa0630d4045ddfed294493ece4a9c4f9926d3655a1fe6703eca2d7c80fea710a2cad5e1a28ef7e8cd2557b0f36dabd63d SHA512 b51821cdc6a2eb0eaa0c1b91a68dd48d2afae89bce14d50bfe3c74617a9039a5891897b5d32d5348b769f00882e36a25ef426ce2f03db8791ad4889738fbc087 +EBUILD apt-cacher-ng-9999.ebuild 2571 BLAKE2B a10affa9280d6289bc7e6b64b4eb487be57de5e4339383c5d4620057c87192d156b7c29b2be0118124f0da408c9038a7ad9f2ea4c2d67d3ba4cdcc9902e86fad SHA512 6a68080dd1aae9ae441344bb1057aba4ff02839e058e8219d6551dc5c0f6cd90e1d9c79592424acdd85b2aa175a89ee0160f35d12f36a3740befbdca9149e37d MISC metadata.xml 387 BLAKE2B 8c38c862cf70d31fe8ffe60d978aa80a688e45296f11d257ab7abf56edefbed921660c4fd090daf63c60077d8232e5e2b7e65fd881cb2d623c4804192825b68c SHA512 0bc4487ec77c3511deb9df220cf31bc7dc8cf56bc46da5e23c10aa2234d5119b2283f0294651b18e3a4bec4aa0dcef79e3e777efea9d84e6955abee593f49aab diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r2.ebuild index 4dd1587fad73..f5616939a35b 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r1.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.6.3_p1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake +inherit cmake tmpfiles DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages" HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/ @@ -95,3 +95,7 @@ src_install() { cmake_src_install } + +pkg_postinst() { + tmpfiles_process "${PN}.conf" +} diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild index c69b956cb3c7..317ac95f9c39 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake git-r3 +inherit cmake git-r3 tmpfiles DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages" HOMEPAGE="https://www.unix-ag.uni-kl.de/~bloch/acng/ @@ -13,7 +13,7 @@ EGIT_BRANCH="upstream/sid" LICENSE="BSD-4 ZLIB public-domain" SLOT="0" -IUSE="doc fuse tcpd" +IUSE="doc fuse systemd tcpd" DEPEND="acct-user/apt-cacher-ng acct-group/apt-cacher-ng @@ -22,6 +22,7 @@ DEPEND="acct-user/apt-cacher-ng dev-libs/openssl:0= sys-libs/zlib fuse? ( sys-fs/fuse:0 ) + systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers )" BDEPEND="virtual/pkgconfig" RDEPEND="${DEPEND} @@ -41,10 +42,11 @@ src_prepare() { # 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 -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 } @@ -52,22 +54,21 @@ src_configure() { local mycmakeargs=( "-DHAVE_FUSE_25=$(usex fuse)" "-DHAVE_LIBWRAP=$(usex tcpd)" - # Unconditionally install systemd service file - "-DSDINSTALL=1" + "-DSDINSTALL=$(usex systemd)" ) - 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() { + # README is a symlink to doc/README and README automatically gets + # installed, leading to a broken symlink installed. Fix this by removing + # the symlink then installing the actual README. https://bugs.gentoo.org/770046 + rm README || die + dodoc doc/README + newinitd "${FILESDIR}/initd-r3" "${PN}" newconfd "${FILESDIR}/confd-r2" "${PN}" @@ -93,3 +94,7 @@ src_install() { cmake_src_install } + +pkg_postinst() { + tmpfiles_process "${PN}.conf" +} diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest index f5c2e1320748..f362c039907a 100644 --- a/net-misc/aria2/Manifest +++ b/net-misc/aria2/Manifest @@ -1,3 +1,5 @@ DIST aria2-1.35.0.tar.xz 1534460 BLAKE2B fc207ad0054e211b79ee1c6302c6bf83d0638fd5659d19dbd63d7cfb31101feb7d1a661b989ec42552c9a5c072dd660d2f7203063c3c1e14f53d5ce4c5a3c317 SHA512 82b49cecd61064ae33b4a422a2320d533f54afea8fab0f014072a46afdc05972d2e9c603e843960c097410adf87290df65849f4ee05e047403618ae50db151ef +DIST aria2-1.36.0.tar.xz 1619036 BLAKE2B 7894ec705f6fefdbc6c4844efa8a645b3e7674e36d04535ac96b9daf5098a453d047109bad0db16e6fd656f63a3ec0bab5746e8ba7d549149e2364395a94399f SHA512 8203dbb75274455a78c50dd4f894e631de6931ac889f26896dceed78ec38c98cdbcf07e164744f308f2bfffeae1016beec1bfdbe8cad7f3280d11376aa0c2542 EBUILD aria2-1.35.0.ebuild 5074 BLAKE2B 775f7d972e19016a586fda1f381803908d7f6ba0ab9631b0521653a92171c5e39b427f83f008c50dd33302920aab53aa0aa1e4417991248ff66a3889d0c5b8a2 SHA512 c94f8e082089352bc4bd3a331e485aa8776ec623f31ad29f22726f645c014bed2271ae870df9621e6fce036f0362f021c7c1ddfecf4edcfa4fbc5ded5d08808d +EBUILD aria2-1.36.0.ebuild 5074 BLAKE2B 3ab30487f36fee7c4ddb734056737384e32bf92b416ac618d743666f052a6f84c44bf98879136f86a6fe5697fbc823ce55a48009b51c3450d4f2da005c995cee SHA512 3e07f1105332c7fcc2b8cb93ad6f8eae0a906290314d4a3d8843683b336ee5aab74e1265e24028815ad8d7fdc058d8c095235f1ca41fefb172e892d249e33a9d MISC metadata.xml 1325 BLAKE2B d958c3669bbebc969e706f70ea93d91f2068d19fe117d4112a818f711e0b3d421f35d67ad303ad856d6abf87b3f85ae0be17c487afef9df48f0a47264aa390e8 SHA512 668bea0c2d30e3fb10131a9ea0a9ba860cccfed7d5e810d165cc01d0ae9bb5d49653cba5aabe1cf5eb42bfbc1759198a82bec63e205a2c0dc05e4f93fac0d696 diff --git a/net-misc/aria2/aria2-1.36.0.ebuild b/net-misc/aria2/aria2-1.36.0.ebuild new file mode 100644 index 000000000000..288141a977bc --- /dev/null +++ b/net-misc/aria2/aria2-1.36.0.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 + +DESCRIPTION="A download utility with segmented downloading with BitTorrent support" +HOMEPAGE="https://aria2.github.io/" +SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz" + +LICENSE="GPL-2+-with-openssl-exception" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +SLOT="0" +IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc" +# xmlrpc has no explicit switch, it's turned out by any XML library +# so metalink implicitly forces it on +REQUIRED_USE="?? ( jemalloc tcmalloc ) + metalink? ( xmlrpc )" +RESTRICT="!test? ( test )" + +# Crazy GnuTLS/OpenSSL/etc. logic below: +# 1. Those libraries are used for two purposes: TLS & MD. +# 2. Upstream preferences are: +# 1) gnutls [tls] +# 2) !gnutls? -> openssl [tls+md] +# 3) !openssl? -> nettle [md] +# 4) !openssl? !nettle? -> gcrypt [md] +# 5) !*? -> bundled md routines (we don't use them) +# 3. There's also gmp usage for bittorrent with nettle. +# 4. You can't really control features, just dependencies. +# (we are skipping native Apple/Windows TLS support) +# +# We map this into: +# ssl? -> openssl || (gnutls + (nettle || libgcrypt )) +# !ssl? -> nettle || libgcrypt +RDEPEND="sys-libs/zlib:0= + adns? ( >=net-dns/c-ares-1.5.0:0= ) + jemalloc? ( dev-libs/jemalloc ) + libuv? ( >=dev-libs/libuv-1.13:0= ) + metalink? ( + libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) + !libxml2? ( dev-libs/expat:0= ) ) + sqlite? ( dev-db/sqlite:3= ) + ssh? ( net-libs/libssh2:= ) + ssl? ( + app-misc/ca-certificates + gnutls? ( + >=net-libs/gnutls-1.2.9:0= + nettle? ( + >=dev-libs/nettle-2.4:0= + bittorrent? ( + >=dev-libs/nettle-2.4:0=[gmp] + >=dev-libs/gmp-6:0= + ) + ) + !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) + ) + !gnutls? ( + dev-libs/openssl:0= + ) + ) + !ssl? ( + nettle? ( + >=dev-libs/nettle-2.4:0= + bittorrent? ( + >=dev-libs/nettle-2.4:0=[gmp] + >=dev-libs/gmp-6:0= + ) + ) + !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) + ) + tcmalloc? ( dev-util/google-perftools ) + xmlrpc? ( + libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) + !libxml2? ( dev-libs/expat:0= ) )" + +DEPEND="${RDEPEND} + test? ( >=dev-util/cppunit-1.12.0:0 )" +RDEPEND+=" + nls? ( virtual/libiconv virtual/libintl ) + scripts? ( dev-lang/ruby )" +BDEPEND="app-arch/xz-utils + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +pkg_setup() { + if use scripts && ! use xmlrpc; then + ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc" + ewarn "and aria2mon scripts against the local aria2." + fi +} + +src_prepare() { + default + sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed" + # Fails with USE=bittorrent && FEATURES=network-sandbox + sed -i -E \ + -e '/^@ENABLE_BITTORRENT_TRUE@ LpdMessageDispatcherTest/d' \ + -e '/^@ENABLE_BITTORRENT_TRUE@ LpdMessageReceiverTest/d' \ + test/Makefile.in || die +} + +src_configure() { + local myconf=( + # threads, epoll: check for best portability + + # do not try to compile and run a test LIBXML program + --disable-xmltest + # enable the shared library + --enable-libaria2 + # zlib should always be available anyway + --with-libz + --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" + + # optional features + $(use_enable bittorrent) + $(use_enable metalink) + $(use_enable nls) + $(use_with adns libcares) + $(use_with jemalloc) + $(use_with libuv) + $(use_with sqlite sqlite3) + $(use_with ssh libssh2) + $(use_with tcmalloc) + ) + + # See TLS/MD logic described above deps. + if use ssl && ! use gnutls; then + # 1. if ssl & !gnutls, use openssl and disable gnutls + myconf+=( --without-gnutls --with-openssl ) + else + myconf+=( + # 2. otherwise, disable openssl + --without-openssl + # 3. if ssl & gnutls, use gnutls + $(use_with ssl gnutls) + + # 4. switch between nettle & libgcrypt + $(use_with nettle libnettle) + $(use_with !nettle libgcrypt) + ) + + # 5. if bittorrent is used along with nettle, use libgmp + if use bittorrent && use nettle; then + myconf+=( --with-libgmp ) + else + myconf+=( --without-libgmp ) + fi + fi + + # metalink+xmlrpc := libxml2 / expat + # USE=(metalink || xmlrpc) + # + USE=libxml2 -> libxml2 + # + USE=-libxml2 -> expat + + if use metalink || use xmlrpc; then + myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) ) + else + myconf+=( --without-libexpat --without-libxml2 ) + fi + + # Note: + # - always enable gzip/http compression since zlib should always be available anyway + # - always enable epoll since we can assume kernel 2.6.x + # - other options for threads: solaris, pth, win32 + econf "${myconf[@]}" +} + +src_install() { + default + rm -r "${ED}"/usr/share/doc/${PF}/README{,.html} || die + + dobashcomp doc/bash_completion/aria2c + use scripts && dobin doc/xmlrpc/aria2{mon,rpc} +} + +pkg_postinst() { + if use xmlrpc; then + elog "If you would like to use the additional aria2mon and aria2rpc tools," + elog "you need to have \033[1mdev-lang/ruby\033[0m installed." + fi +} diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 04f117c5703c..c124491b65a9 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -10,6 +10,6 @@ DIST chrony-4.0.tar.gz.asc 195 BLAKE2B 1947a73f35eb5c58f91775d76473210a7b5edff5b DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff SHA512 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a EBUILD chrony-4.0-r2.ebuild 5486 BLAKE2B 5fdde6f20fd5bf52e8d0420a03ba876c8a089e314db34b72bf17ceedc4806ee873b39035ffad654fa3a176a1a377e1b113e3bfec65fc3bf4d1e2eab12bc64685 SHA512 7289a03274c007acf24dcb0060d1bcb961c1d10119af1b7559b13b93bb6c8af3e9d20e4bb38077f58eb427bfe4d9db60bc040d7a1ec1951cb1bfd325bbc2a4e9 -EBUILD chrony-4.1-r1.ebuild 6632 BLAKE2B 5e5de2d3d155e263801c1af8d26dce99a9992cec44d1a834050b29fdf1d61d4ce6fad49fca9066df40865014a731aebeb6c89cf028f7fab1338acfc90b9c8635 SHA512 5f6eb80d2d4edc0244818445eebf1adaa67b3c0ecedfb8f99f8eafa2c5139faafef82dbbb2e56fb2adf14b0b231a9c78cb763ec1559a68fa05ede78b5b4b8a40 -EBUILD chrony-9999.ebuild 6639 BLAKE2B 18ffeb606ea9af800b1690c6853b6436e1b8e3915701a563e6dd0cd8bacc22756c2682a4b845af73acdbf32d8602d003f0450b7997185d4bc563fdf41672545a SHA512 ec524df0d9ed1405baefeb53e471acce91035cdc183b80122c6eddee9c95ffbf452be056f00aff7c7b5805de29b0d75af4ecce89923c99adb2a632675b62c65b +EBUILD chrony-4.1-r1.ebuild 6632 BLAKE2B 26ee75040500664b3c20fb6f9e2f189a95f51095efc1c2844df9d88d59901a6a4b0a891feb4dd7476381e05d7e9f418178555857b701c56581ab475005ad4262 SHA512 56590e49f6db5644d85a9a75b4a3f03bc306694580967746be51ae953e33b43717242b55344bd85598e7023d72f64f4897128172abe7edeb213814f0744799d1 +EBUILD chrony-9999.ebuild 6639 BLAKE2B 0cba522a8f0ef1addaf4c05ac05881ba17fd24b727b9117f31b835680cace7afaac872c1ac84a56d000f68cbf6aeb092c7bb7236b1f3a3a0debeafb10afe10d4 SHA512 5bd344725e7d9704a6f046e9ccbff9fe1ad6d3ebe4af1380b687f493d9e8ca36cd879537c89580d914fac5c55e3663796e7fe8f4361039aae16b5ab969827240 MISC metadata.xml 2299 BLAKE2B f5e8667a5fdeb86395d773eaf6e7d80c2133fe945565d7d6005f156a0a4763f1434ba887627fba63dd0f0a15663d7fa194d91699f6961ad21b9afa40576cd1fd SHA512 370e06edf9df22a327ff8b528f8a810c731af4615d740331ac737af8cbc5af265f7592ec22bf844301c5089185bc4f7de102f87378f85cf276d4f550933e519a diff --git a/net-misc/chrony/chrony-4.1-r1.ebuild b/net-misc/chrony/chrony-4.1-r1.ebuild index bd15590467d1..8bbf54dc2baf 100644 --- a/net-misc/chrony/chrony-4.1-r1.ebuild +++ b/net-misc/chrony/chrony-4.1-r1.ebuild @@ -246,7 +246,7 @@ pkg_postinst() { elog "To enable seccomp in a stricter mode, please modify:" elog "- /etc/conf.d/chronyd for OpenRC" elog "- systemctl edit chronyd for systemd" - elog "By default, we now use -F 2 which is a baseline/minimal filter." elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)" + elog "By default, we now use -F 2 which is a baseline/minimal filter." fi } diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 3f3cc9880058..6051d64c9884 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -246,7 +246,7 @@ pkg_postinst() { elog "To enable seccomp in a stricter mode, please modify:" elog "- /etc/conf.d/chronyd for OpenRC" elog "- systemctl edit chronyd for systemd" - elog "By default, we now use -F 2 which is a baseline/minimal filter." elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)" + elog "By default, we now use -F 2 which is a baseline/minimal filter." fi } diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index f29558506a07..f6b1b00a7cbd 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -3,5 +3,6 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8 DIST curl-7.77.0.tar.xz 2439336 BLAKE2B 433b3179dcf2c3363514b72bf9c54286873d8e5559b33e543ba8f3e7df25a619c5be13a8aacb9361c4464b646af4d1fb214d4de57a17f3de7e8f379777214d13 SHA512 aef92a0e3f8ce8491b258a9a1c4dcea3c07c29b139a1f68f08619caa0295cfde76335d2dfb9cdf434525daea7dd05d8acd22f203f5ccc7735bd317964ec1da76 DIST curl-7.78.0.tar.xz 2440640 BLAKE2B 0422071ce22d38b89652c702989674a2257dd18b05004245c4f2d7494ccdd24b5b52f330629ce6a411a059d5990e8c879cbbdf23d873b881141f9d2b9ad07f7f SHA512 f72e822a0b5e28320ef547c7a441c07f3b4870579a70ab4c428751baba435a1385cb89a22b9ed4b84a7fafecf620f155911e4131e3463ec1bdad80ecde47bb7a EBUILD curl-7.77.0-r2.ebuild 8193 BLAKE2B b95e0408183486856914fa90951fb7aff96a232c8897a4b0acfc1e33b7e307b892d7a0c08cc7288b27eb900ae79f94d029ee939cbb641ed13add64f3f1d8903c SHA512 e190765e6667d59fbd8fe3973623f1dad553e27103addf4448a7cd044005c61d9d779eea54f269deca778c0a99d95d7d4160aa1e5f441770949a78ac6ee9e202 -EBUILD curl-7.78.0-r1.ebuild 7964 BLAKE2B 4269506bdb65576078915cbe90a73f2024b813782176a7ef45b3e0bead1acd414845231310491e6c2b2627b53fb6e0a3d073792a1006c99090084ea91101fe57 SHA512 cabb001f143d6d320eba6423d0ea2356c0afa6bc6afc9df287de9c5827c03774b06836d86d4520572205a7b408becb877071f5d4dd475f5ec36c3e230bcd99bb -MISC metadata.xml 2104 BLAKE2B cd965737bacd5cde978fdcb652559c3c29eee0083bdee82e00cf78055e681571e77a2deaf4ab6ef5a9aba0c33689356fc2299c346c4c1e6b4afda9c675b9f3b1 SHA512 a2e9ba5358d115b18fa089bd222f026a7553505a154e1d865af0cde1004a0a427f58ed38d802815d96453d5d58628aa91d8cd5d082fe059cb1afd4dc9d312052 +EBUILD curl-7.78.0-r1.ebuild 7963 BLAKE2B db7995cb94d314315fad8662637bcaa7cd3f36a69193f599a085e3d5463b220f757f00e6b8e58d13180a5275f76c54ab01f87d735e09af00fbbd998ba19bc660 SHA512 a60ad52af689276ab713b7b897fa587034dc2f7202427d06d0e627514d3d66a9c34bcacedcb380e5e391cc8490d0c7ad73f266454c64a32ffd9ff701c2e57018 +EBUILD curl-7.78.0-r2.ebuild 7979 BLAKE2B 8faca82d3a36197f6809a17fb8ea63f13a406f87dfb23b0131e70d8f2080c21e775f1c0c322d07204eb024377c2c8da8e4ae6232d7d15d0d7abb48b1e7104021 SHA512 d23c0bad557f95e42dae0095cf7180c4e55fb6b616ada4498e125de11cf9a1706a1142a1498bf84bd4014f8bb4b36ceb462d5bb671c42efb1af41d3706166991 +MISC metadata.xml 2151 BLAKE2B cc435ea42d2a07483bda22ff947b84d6a604c6739d7e93c7e5aae24e32427dd874cbb50c6c4b66b6cd5927ae452c4616f697126d43be9389fc64ae4edbc5127b SHA512 7afc9e5c91ef703a7ee8958fe814666d452806837a511afb249b88b02e9cbdccfcc7c51627276060fe38b9ef2145704008b5d215d5b5b6d6edf4d6fe606e2c8f diff --git a/net-misc/curl/curl-7.78.0-r1.ebuild b/net-misc/curl/curl-7.78.0-r1.ebuild index cb5e8f291237..c3e282bb3a10 100644 --- a/net-misc/curl/curl-7.78.0-r1.ebuild +++ b/net-misc/curl/curl-7.78.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" LICENSE="curl" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd" IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" nghttp3 quiche" diff --git a/net-misc/curl/curl-7.78.0-r2.ebuild b/net-misc/curl/curl-7.78.0-r2.ebuild new file mode 100644 index 000000000000..b60388dc3080 --- /dev/null +++ b/net-misc/curl/curl-7.78.0-r2.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 nss ntlm +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd" +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" +IUSE+=" nghttp3 quiche" +IUSE+=" elibc_Winnt" + +# c-ares must be disabled for threads +# only one default ssl provider can be enabled +REQUIRED_USE=" + winssl? ( elibc_Winnt ) + threads? ( !adns ) + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + curl_ssl_winssl + ) + )" + +# lead to lots of false negatives, bug #285669 +RESTRICT="!test? ( test )" + +RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + mbedtls? ( + net-libs/mbedtls:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + openssl? ( + dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + nss? ( + dev-libs/nss:0[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + ) + http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) + nghttp3? ( + net-libs/nghttp3[${MULTILIB_USEDEP}] + net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + ) + quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) + adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + sys-libs/zlib[${MULTILIB_USEDEP}] + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" + +# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 +# rtmp? ( +# media-video/rtmpdump +# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) +# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) +# ) + +# ssl providers to be added: +# fbopenssl $(use_with spnego) + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + test? ( + sys-apps/diffutils + dev-lang/perl + )" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + #myconf+=( --without-default-ssl-backend ) + if use ssl ; then + if use gnutls || use curl_ssl_gnutls; then + einfo "SSL provided by gnutls" + myconf+=( --with-gnutls --with-nettle ) + fi + if use mbedtls || use curl_ssl_mbedtls; then + einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use nss || use curl_ssl_nss; then + einfo "SSL provided by nss" + myconf+=( --with-nss ) + fi + if use openssl || use curl_ssl_openssl; then + einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use winssl || use curl_ssl_winssl; then + einfo "SSL provided by Windows" + myconf+=( --with-winssl ) + fi + + if use curl_ssl_gnutls; then + einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_nss; then + einfo "Default SSL provided by nss" + myconf+=( --with-default-ssl-backend=nss ) + elif use curl_ssl_openssl; then + einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_winssl; then + einfo "Default SSL provided by Windows" + myconf+=( --with-default-ssl-backend=winssl ) + else + eerror "We can't be here because of REQUIRED_USE." + fi + + else + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-crypto-auth + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + $(use_enable ntlm) + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-hidden-symbols + --enable-http-auth + $(use_enable ipv6) + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --disable-sspi + $(use_enable static-libs static) + $(use_enable threads threaded-resolver) + $(use_enable threads pthreads) + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --without-cyassl + --without-fish-functions-dir + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + --without-libpsl + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + $(use_with quiche) + $(use_with rtmp librtmp) + --without-rustls + --without-schannel + --without-secure-transport + --without-spnego + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + ) + + ECONF_SOURCE="${S}" \ + econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # avoid building the client + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use quiche; then + libs+=( "-lquiche" ) + priv+=( "quiche" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "-libtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc +} + +multilib_src_test() { + multilib_is_native_abi && default_src_test +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml index 63231cb33c31..7ab1ec9987ba 100644 --- a/net-misc/curl/metadata.xml +++ b/net-misc/curl/metadata.xml @@ -19,6 +19,7 @@ <flag name="quiche">Enable HTTP/3.0 support using <pkg>net-libs/quiche</pkg></flag> <flag name="metalink">Enable metalink support</flag> <flag name="nss">Enable nss ssl backend</flag> + <flag name="ntlm">Enable ntlm support</flag> <flag name="openssl">Enable openssl ssl backend</flag> <flag name="pop3">Enable Post Office Protocol 3 support</flag> <flag name="progress-meter">Enable the progress meter</flag> diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest index 36009499f32a..8ff50ad341d9 100644 --- a/net-misc/frr/Manifest +++ b/net-misc/frr/Manifest @@ -1,6 +1,9 @@ AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447 +AUX frr-8.0-c-ares.patch 482 BLAKE2B e7a29e165a40737624e234932ca80b07c1ed7c6db2d6972f5e27e727b81e95c39ac7f54e3b1ba19dd0944cbda495ce12c2f884a2fce169f851126e6c88200944 SHA512 d5f2de9c548664668e5bcc9d9a6e2c4b0d2f0e41d73f61c1a09881cec53854de983dea1585d00b0a29be7282925c1e456cf6c2e0b338241c609fa561022d5a63 AUX frr-openrc-v1 7068 BLAKE2B c790c783ea9c289110b1e85aa23a1adccba36122524cde36798f26c31f82e5381eefb3e5e16b497e84a5aa2faf5bf1f59d12fe8f9b7b3c5d0f504c26ce13fb86 SHA512 34e371bb9bb34e494536091a811084d543c18b302489ce0a56ec3e69c805c22d84d7a928e24e17eba5d4fe6d4e33ac847060da95ded5a02975ba2a2e5a568243 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed DIST frr-7.5.1.tar.gz 6746148 BLAKE2B e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d SHA512 cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e +DIST frr-8.0.tar.gz 8195258 BLAKE2B 75d8d4410a5377dae3bf6938c3b095b163ad87776420a16c07d461bb3f635d623de642fa0ae483094788369c9dc6a04d5424107bf60c848ac54756c4bdb20c97 SHA512 fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a EBUILD frr-7.5.1-r4.ebuild 3557 BLAKE2B ea76e974e78d946b0d993bab03f94e05328172e0d86bff1aac865fbd8cacc799710268122c9474ec9618d7c44e00bb258b5f7cde24181e783096348ca6037289 SHA512 c836edeadd95848bbb34d1e281b286246309c09c4ec1784a06ac848cb131d611b257e92a0a992eaa48fdb2ae98d7b30a8a0238b951a73523219554961be15b98 +EBUILD frr-8.0.ebuild 3574 BLAKE2B d936f13e01512991d4bb22e5d3101a23c08b569edd4a4ccaa4cfb9501b28cb3afd886c750311a364da51c564f3b9c878e5f4574cf954e4d661c8d1c9c325bf15 SHA512 dc3f46abfc7bdff106ea19f9a1d56d05aebefcf7fbbf0c3ef53cd0f65b4768d90e19d0393a08a9da5c31eaa8ff2e7ccfdf8f274ce299901314bcd2710b6ec72a MISC metadata.xml 770 BLAKE2B 13813d2c2fc611a87a9d2e516b0fd8fb5f9539339f99837ec08c9ed0ac276f9ee80b0e1afa84d6e52adfde8135b3b6950172faed307ae0dbec423bf1a4acd4bf SHA512 e4989acf1cfaabf52030284acff11ae6408dc8d958286ca1cf68d183526dd6a8379ed7ace5d5348f4e298e792387f3ba0a06dea402d125597aa9032222ff1dcb diff --git a/net-misc/frr/files/frr-8.0-c-ares.patch b/net-misc/frr/files/frr-8.0-c-ares.patch new file mode 100644 index 000000000000..c313006e8630 --- /dev/null +++ b/net-misc/frr/files/frr-8.0-c-ares.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/809728 +--- a/lib/subdir.am ++++ b/lib/subdir.am +@@ -144,7 +144,6 @@ vtysh_scan += \ + lib/log_vty.c \ + lib/nexthop_group.c \ + lib/plist.c \ +- lib/resolver.c \ + lib/routemap.c \ + lib/routemap_cli.c \ + lib/spf_backoff.c \ +@@ -333,6 +332,7 @@ lib_libfrrsnmp_la_SOURCES = \ + if CARES + lib_LTLIBRARIES += lib/libfrrcares.la + pkginclude_HEADERS += lib/resolver.h ++vtysh_scan += lib/resolver.c + endif + + lib_libfrrcares_la_CFLAGS = $(AM_CFLAGS) $(CARES_CFLAGS) diff --git a/net-misc/frr/frr-8.0.ebuild b/net-misc/frr/frr-8.0.ebuild new file mode 100644 index 000000000000..6343f0f45e38 --- /dev/null +++ b/net-misc/frr/frr-8.0.ebuild @@ -0,0 +1,150 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit autotools pam python-single-r1 systemd + +DESCRIPTION="The FRRouting Protocol Suite" +HOMEPAGE="https://frrouting.org/" +SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz" +# FRR tarballs have weird format. +S="${WORKDIR}/frr-${P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + acct-user/frr + dev-libs/json-c:0= + >=net-libs/libyang-2.0.0 + sys-libs/libcap + sys-libs/readline:0= + virtual/libcrypt:= + grpc? ( net-libs/grpc:= ) + nhrp? ( net-dns/c-ares:0= ) + pam? ( sys-libs/pam ) + rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) + snmp? ( net-analyzer/net-snmp:= ) +" +BDEPEND=" + >=dev-util/clippy-${PV} + sys-devel/flex + virtual/yacc + doc? ( dev-python/sphinx ) +" +DEPEND=" + ${COMMON_DEPEND} + test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) +" +RDEPEND=" + ${COMMON_DEPEND} + $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]') + !net-misc/quagga +" + +PATCHES=( + "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch + "${FILESDIR}"/${P}-c-ares.patch +) + +src_prepare() { + default + + python_fix_shebang tools + eautoreconf +} + +src_configure() { + local myconf=( + --disable-static + --with-pkg-extra-version="-gentoo" + --enable-configfile-mask=0640 + --enable-logfile-mask=0640 + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/lib/frr + --sbindir="${EPREFIX}"/usr/lib/frr + --libexecdir="${EPREFIX}"/usr/lib/frr + --sysconfdir="${EPREFIX}"/etc/frr + --localstatedir="${EPREFIX}"/run/frr + --with-moduledir="${EPREFIX}"/usr/lib/frr/modules + --with-clippy="${BROOT}"/usr/bin/clippy + --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples + --enable-user=frr + --enable-group=frr + --enable-vty-group=frr + --enable-multipath=64 + $(use_enable doc) + $(use_enable fpm) + $(use_enable grpc) + $(use_enable ipv6 ospf6d) + $(use_enable ipv6 ripngd) + $(use_enable ipv6 rtadv) + $(use_enable kernel_linux realms) + $(use_enable nhrp nhrpd) + $(usex ospfapi '--enable-ospfclient' '' '' '') + $(use_enable rpki) + $(use_enable snmp) + $(use_enable systemd) + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + + use doc && emake -C doc html +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + + # Install user documentation if asked + use doc && dodoc -r doc/user/_build/html + + # Create configuration directory with correct permissions + keepdir /etc/frr + fowners frr:frr /etc/frr + fperms 775 /etc/frr + + # Create logs directory with the correct permissions + keepdir /var/log/frr + fowners frr:frr /var/log/frr + fperms 775 /var/log/frr + + # Install the default configuration files + insinto /etc/frr + doins tools/etc/frr/vtysh.conf + doins tools/etc/frr/frr.conf + doins tools/etc/frr/daemons + + # Fix permissions/owners. + fowners frr:frr /etc/frr/vtysh.conf + fowners frr:frr /etc/frr/frr.conf + fowners frr:frr /etc/frr/daemons + fperms 640 /etc/frr/vtysh.conf + fperms 640 /etc/frr/frr.conf + fperms 640 /etc/frr/daemons + + # Install logrotate configuration + insinto /etc/logrotate.d + newins redhat/frr.logrotate frr + + # Install PAM configuration file + use pam && newpamd "${FILESDIR}"/frr.pam frr + + # Install init scripts + systemd_dounit tools/frr.service + newinitd "${FILESDIR}"/frr-openrc-v1 frr + + # Conflict files, installed by net-libs/libsmi, bug #758383 + rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die +} diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest index c7bb56f35363..81bd3277ae7b 100644 --- a/net-misc/miniupnpd/Manifest +++ b/net-misc/miniupnpd/Manifest @@ -1,12 +1,10 @@ +AUX miniupnpd-2.2.3-testgetifaddr.patch 630 BLAKE2B d5f10c753f471a8f9d658a7c2cbc71ce5c64bc5cb2faae49e280cbaefe1fd6ce34ff0427d7512520a333a63fa4156df76271781cc1193fcd034e9b60d3b1d241 SHA512 6d87c50a64fffdefc3b251174ffc62ad9c855d248b6771343e6bf3e15f36b109c0b9b7eec3f2f47be12f5aac341c04b19c02e72eb30c38dc841c4e75bd5f21bb AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856 -DIST miniupnpd-2.2.0.tar.gz 249858 BLAKE2B ef216c7703cb9806a3719b247d67c5c844879308eafbef0936fc501305dbdada7b32e6fc212e50ee093c6f5728709da3d2d5114e89de52a124c229c63ee03563 SHA512 ac8bc3c140f369d0f92d203b94a4f73dde682a486c4395cd25aafda3461577b4a2a1d3160cf8bd37fa8520cda4f86cbdaec925b2ef4e9054e7bf10e04a227d3c -DIST miniupnpd-2.2.0.tar.gz.sig 543 BLAKE2B 11778dd70128ece1f80144bb229176c53f3cd89847a8eedd4fe1b75ac55d986ae7c4689edf40f80c4605ba42260bc41f8fd069e99b8c249226ab9e2981d15412 SHA512 5e0e053a2a3ab876da001589677b0f5e3a4df8511ea5185dbbaee9b80928f9cb9705029f1c83bd9d26b144e39721fce1c4c8c33983956b6731ae654bc094063c -DIST miniupnpd-2.2.1.tar.gz 250023 BLAKE2B 67418a8480f7d3ac3d51a9c18fdcce4a85c33ff6c373051e1f9df121b00d936f02038ed0a5a5a848b7b2c145aa08dc1e2b954b211cc79fae1de09075f55a9f21 SHA512 211b608472a72065d892e9197f8bdd8c82e44296bb692244ec5e83ca9b076cbcc3426c806ff27d5e805505b1c82b1a7afd7b4030ddecdb60aa85c37062c10c8a -DIST miniupnpd-2.2.1.tar.gz.sig 543 BLAKE2B fac8c2fd5c50e3201c5fc490d91aed5752bf70297bed101cb3d5ec53d891fdc8f893b3d83e0cf064eb9e9bf16ae9504a849187e18eabc8ed12055574d1e551f5 SHA512 da5b52b1c62bf433a165acf87a64195e27c71c98dfa086cfde19f7b1c4046a62926cca5eb2d10f4260eb1b97c428ba08b4b7fcbf280c2a7009c86279a7563e0f DIST miniupnpd-2.2.2.tar.gz 250649 BLAKE2B d561916ced9b5c58371382fe0bec68cd0771d1dc3b2c7fa7e3701cb2579db69697fbdcd724bea2350abd46381eda1fd257dede6df99f99fa54e423db4ee52717 SHA512 3cc11ad901e93a9879fe07e35a20f8977df466bb402e0270e46d1dbd0b5dc3b5dc22303467d5022103952d7dd789ac590c17d0fa81fc7ec42676b66223d37ee4 DIST miniupnpd-2.2.2.tar.gz.sig 543 BLAKE2B 461a9149c66b0e314a767405024fc7bfb641a20ae36b908dc467c9211660d5cb0753fb3c99fa9d6df35d693a2f6790efb6a325f0005804572eaa78a02b23a482 SHA512 8ffc9901cd992cbd9d0fa4c5e510fe43f748ab4a7c4732cc8f2f685f19b71a3f087a63a39e1dbf081175ac65de34b5c05dc3ef636a805e550a0406119a5904ef -EBUILD miniupnpd-2.2.0.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80 -EBUILD miniupnpd-2.2.1.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80 +DIST miniupnpd-2.2.3.tar.gz 254752 BLAKE2B ebdb8d4ce7dc649ef0243d2d698b9f51cb2006055eb3abb70d9ccc839cb57c7113595ef1b9b5886f55bc458d8260edf95ae6e1964a5d5423f9b0b46e07e02775 SHA512 56b1e93e9576fa412202e1940fcd8b7af57584714c15017bbcec1aa4fa7bba7a6fa5d1136048100d7cce3222f31b38837de1eae344b533164314c858cdf08ef9 +DIST miniupnpd-2.2.3.tar.gz.sig 543 BLAKE2B 3ba2e69cfd7e0a27a746f45e5eb10e573e00c4fc20a7d62b94a2e0b7e4e9ad8779d53df72e31547b78dc6e34676204a4848652e81d1e479a68973e150f51f468 SHA512 9f766f3e94de1fbd458c7bda30cc87892198af7544aa9dc0fa4c6b6a1c9434e4bab6f8583eeccf3ae613da240ad599d750425c507e8138d483710459f31a0b21 EBUILD miniupnpd-2.2.2.ebuild 2096 BLAKE2B 8d0fd68a34e76b77f74160775f8057c68b3c1a4e17b99461626b89fd703f20b9369164fba285c980e14f30028406cf215b0d707ecfe43dc703d1253974d7ae1f SHA512 3bc8158580d5040bfaf6953a6f2019547d8f6f6c7f64f6fb444d5108619c66cb98763d5f72c70fcd05514d185da19632f5435c2b5d7189b8b9f86dafc64d7fea +EBUILD miniupnpd-2.2.3.ebuild 2323 BLAKE2B 8294335fe7030cabfeee6d68bd8ac205965476510e814a9c6d0c7a5d2da6aff42335955a5231761602d09a2595886a9d965b5482d5a4b4b385c01de42f26f757 SHA512 bd5c32e398acf92765f4812040f2b37bf3d412c68723334208ada532e7359eb54458af63c3f81694d5023af8cacec129ac1898412cd710733697bcd9f1501758 MISC metadata.xml 902 BLAKE2B ec10dab38256289a3445ad960eb869fe01ad009e21f77e61ffa4e45cac71120df285461cc3515de395918635b8f76a5448d761f9644172064e1eea79aa926947 SHA512 931799b28d6b7b1676d7ed0b94ce6760b550087785885635cb03c656c20e51c810a75dd8d675e17e5b8fdb87e7909f2a972ba11e168310eef4f58efd0a065135 diff --git a/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch b/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch new file mode 100644 index 000000000000..73e4a87903e8 --- /dev/null +++ b/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch @@ -0,0 +1,14 @@ +diff --git a/miniupnpd/testgetifaddr.sh b/miniupnpd/testgetifaddr.sh +index 7ad56d9..2a26a24 100755 +--- a/testgetifaddr.sh ++++ b/testgetifaddr.sh +@@ -12,7 +12,8 @@ case $OS in + *) + IP="`which ip`" || exit 1 + EXTIF="`LC_ALL=C $IP -4 route | grep 'default' | sed -e 's/.*dev[[:space:]]*//' -e 's/[[:space:]].*//'`" || exit 1 +- EXTIP="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/inet/ { print $2 }' | cut -d "/" -f 1`" ++ EXTIF="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/[0-9]+:/ { print $2; exit 0 }' | cut -d ":" -f 1`" ++ EXTIP="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/inet/ { print $2; exit 0 }' | cut -d "/" -f 1`" + ;; + esac + diff --git a/net-misc/miniupnpd/miniupnpd-2.2.1.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.1.ebuild deleted file mode 100644 index 1c2981def4c4..000000000000 --- a/net-misc/miniupnpd/miniupnpd-2.2.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs verify-sig - -MY_P=${P/_rc/-RC} -DESCRIPTION="MiniUPnP IGD Daemon" -HOMEPAGE="http://miniupnp.free.fr/" -SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz - verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict" - -RDEPEND=" - dev-libs/gmp:0= - sys-apps/util-linux:= - dev-libs/openssl:0= - !nftables? ( - >=net-firewall/iptables-1.4.6:0=[ipv6?] - net-libs/libnfnetlink:= - net-libs/libmnl:= - ) - nftables? ( - net-firewall/nftables - net-libs/libnftnl:= - net-libs/libmnl:= - )" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-apps/lsb-release - verify-sig? ( app-crypt/openpgp-keys-miniupnp )" - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc - -src_configure() { - local opts=( - --vendorcfg - $(usex igd2 '--igd2' '') - $(usex ipv6 '--ipv6' '') - $(usex leasefile '--leasefile' '') - $(usex portinuse '--portinuse' '') - $(usex pcp-peer '--pcp-peer' '') - $(usex strict '--strict' '') - --firewall=$(usex nftables nftables iptables) - ) - - # custom script - ./configure "${opts[@]}" || die - # prevent gzipping manpage - sed -i -e '/gzip/d' Makefile || die -} - -src_compile() { - # By default, it builds a bunch of unittests that are missing wrapper - # scripts in the tarball - emake CC="$(tc-getCC)" STRIP=true miniupnpd -} - -src_install() { - emake PREFIX="${ED}" STRIP=true install - - local confd_seds=() - if use nftables; then - confd_seds+=( -e 's/^iptables_scripts=/#&/' ) - else - confd_seds+=( -e 's/^nftables_scripts=/#&/' ) - fi - if ! use ipv6 || use nftables; then - confd_seds+=( -e 's/^ip6tables_scripts=/#&/' ) - fi - - newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} - newconfd - ${PN} < <(sed "${confd_seds[@]}" \ - "${FILESDIR}"/${PN}-conf.d-r2 || die) -} - -pkg_postinst() { - elog "Please correct the external interface in the top of the two" - elog "scripts in /etc/miniupnpd and edit the config file in there too" -} diff --git a/net-misc/miniupnpd/miniupnpd-2.2.0.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild index 1c2981def4c4..1042f0c2cb80 100644 --- a/net-misc/miniupnpd/miniupnpd-2.2.0.ebuild +++ b/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - +EAPI=8 inherit toolchain-funcs verify-sig MY_P=${P/_rc/-RC} @@ -38,6 +37,17 @@ BDEPEND=" VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc +src_prepare() { + local PATCHES=( + "${FILESDIR}"/${P}-testgetifaddr.patch + ) + + default + + # fails without a default route + sed -i -e 's:EXTIF=.*:EXTIF=lo:' testgetifaddr.sh || die +} + src_configure() { local opts=( --vendorcfg @@ -62,6 +72,10 @@ src_compile() { emake CC="$(tc-getCC)" STRIP=true miniupnpd } +src_test() { + emake CC="$(tc-getCC)" check +} + src_install() { emake PREFIX="${ED}" STRIP=true install diff --git a/net-misc/netkit-talk/Manifest b/net-misc/netkit-talk/Manifest index 98ee5c41ec60..ac09fff159f8 100644 --- a/net-misc/netkit-talk/Manifest +++ b/net-misc/netkit-talk/Manifest @@ -1,6 +1,6 @@ -AUX netkit-talk-0.17-ipv6.diff 1587 BLAKE2B 82947b16ee0a8fbe3622de9109dd3dbb504d6d1c899d3a189220f8cb4721d19e6c86ffebf5c30a3f58c7c2fedeaad8eec4bf3a2b15838173818bf49b96ebf0c6 SHA512 6545182872092864f136f7c5e464435679cf06d5393d587b564cb19930c2a1fc068d737bdc8a4bdcbc8a708c891284d66625ad85efd1d5e60c3cf49abe4215f1 +AUX netkit-talk-0.17-ipv6.patch 1587 BLAKE2B 82947b16ee0a8fbe3622de9109dd3dbb504d6d1c899d3a189220f8cb4721d19e6c86ffebf5c30a3f58c7c2fedeaad8eec4bf3a2b15838173818bf49b96ebf0c6 SHA512 6545182872092864f136f7c5e464435679cf06d5393d587b564cb19930c2a1fc068d737bdc8a4bdcbc8a708c891284d66625ad85efd1d5e60c3cf49abe4215f1 AUX netkit-talk-0.17-time.patch 385 BLAKE2B 5b49b4d562507c6b60911379e0623e17a2c5b25ec6ea1dc5f85c72e67823fac86b6152cde241e9823feb118c7e706b502031c583e216481cda7b5a47804ecbd1 SHA512 4da0417515e8e357cdc3b5b46b3edaa324dba767ae9dea6aa374ac8e4cf835dc0a4766684edc1e2b254840858721558a1e29940ea95ae274b06ded99fbf5499f AUX talk.xinetd 265 BLAKE2B 94381bf30fa51682b9dd272174cd8a3fed94233ff8ec654044419016a3adedbfac4e0db1f86c3851c9f7aa1c63d6e7411def635ecd3aa8cc88ec4d50656985c8 SHA512 f4f29a6e57aa80ffd6acc45b3c4a5bc5086fc6061f8d9bdfbe4fea4f874cedbdd5f85f60e311aa473e53119c16c42289161011699d24b944992aee0aec9ccb1f DIST netkit-ntalk-0.17.tar.gz 37396 BLAKE2B cdc7af27bb5f0b6b1139e3d8b33ecc3d4c661a76ee9de4cca8f5954251a30b5b3dc926ff906a7b51223b1c8590ff99a408ca07642c454bfd095b91fff482dffb SHA512 5a886c0f73179060f926d4af781a6b9d4de7b62562a69db7b93c4fd783ad12b488ee967af18e5a11f98e7f94d659c1688d2a3d4ba4a00bdec31869aa39a321c5 -EBUILD netkit-talk-0.17-r6.ebuild 1190 BLAKE2B 1208a50fecb70771846578d2ede6b46d283a6508ac4f29ea2c13bf18256aac7a2362edc80b5e947bde8a846376d3fd636b3a92e0ed9a697fa31b3bfed1ef655f SHA512 10b96aecbc26594fe8007dc768a9301a2641d07d2383b0d8b6b5417dfa95bb50e928f03b70be7e0070d419d661edb8db881c82160b99e560a54f3d9611a38830 +EBUILD netkit-talk-0.17-r7.ebuild 1166 BLAKE2B 89f48037c69b7ebf8a4cfeb38769f0f72a88c8e943a7ec081ff10c3c09de9ee31bdc73aca9d3d7efe4d7974a46712c2320e480523fc16c731e5d41a1b0652be4 SHA512 dd1ff01f80a58c12bf60b871d7d749b24b6bc397ab0bae26aabaa702a5124e37bb2c0f3fb537d8ef93c951f59aee4b737f74cd457ee3ed236ca948720d7c842e MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.diff b/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.patch index f426bf7dfadf..f426bf7dfadf 100644 --- a/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.diff +++ b/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.patch diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r6.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild index c76f72b34420..585a64aabeab 100644 --- a/net-misc/netkit-talk/netkit-talk-0.17-r6.ebuild +++ b/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit epatch toolchain-funcs +inherit toolchain-funcs MY_P=netkit-ntalk-${PV} -S=${WORKDIR}/netkit-ntalk-${PV} +S="${WORKDIR}"/netkit-ntalk-${PV} DESCRIPTION="Netkit - talkd" HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" @@ -17,19 +17,18 @@ SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="ipv6" -COMMON_DEPEND=">=sys-libs/ncurses-5.2:=" -DEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig -" +DEPEND=">=sys-libs/ncurses-5.2:=" +BDEPEND="virtual/pkgconfig" RDEPEND=" - ${COMMON_DEPEND} + ${DEPEND} virtual/inetd " +PATCHES=( "${FILESDIR}"/${P}-time.patch ) + src_prepare() { - epatch "${FILESDIR}"/${P}-time.patch - use ipv6 && epatch "${FILESDIR}"/${P}-ipv6.diff + default + use ipv6 && eapply "${FILESDIR}"/${P}-ipv6.patch sed -i configure -e '/^LDFLAGS=/d' || die } diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 561b8e7ab5d0..7b6cf224c6ca 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -2,14 +2,10 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4 -DIST NetworkManager-1.30.4.tar.xz 5303420 BLAKE2B c2d81fe03f75f4afd05cac06741d9e7fb0d2892bad30462788a39d9c84afd056614e8f8d3371f15f4de7398cc40a32861814498fc36911c43bbe8e43f5053cde SHA512 ca42907d0c0fc6a981d94798a5e264dd58c7d11576a8dd52c8ef6799334af46848091d872e9cec553714766c51457cbe12c5c2017eaac63abce968823b047624 -DIST NetworkManager-1.32.2.tar.xz 5242372 BLAKE2B d19dbbb86cafd29023e0bd1b3a1ce69580d769d77a993b5e0db6cc526de7b1cce573e74c96483bf88c3a45f3ac7d4831a27d1efb1d8414cc8dd6e5671bdbf4f3 SHA512 9c7891a1106ebf333344818d29810ae182b284d1966760ec79bafa0618378a5ca68d58ec941357328ae8d4a43473f3916d62e4cfa316a46532773326312c0cc1 +DIST NetworkManager-1.32.10.tar.xz 5353296 BLAKE2B af176abd4dd8f725741cc8fde10245606d1b00cb6b11cde11b2e3bce74a33980fdf76fab5c6c769a4275c5168098cb2531a0a03909db8eef5fa502d464d59bd1 SHA512 c4eb9114869efba197c3ec1e99d7d5bc54222d9c7118cf699fe61130952a20376a760b86909290d6312a4a23016d51f9ff90ba8eadbbcda84ce811e441293d8d DIST NetworkManager-1.32.4.tar.xz 5250412 BLAKE2B 6c0931d50a8666f88865d4ca5281e1570dd230156e30bb27822c9ea3d93b3b3b24f336e154787794e7edd7c00296f9f7c5761136cac0c0eacf142a0371cbfe81 SHA512 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684 -DIST NetworkManager-1.32.6.tar.xz 5254712 BLAKE2B 44c3019ba6b04552e67f31e9c069754f627f9f97a9ed110ce662dff033c7e8c009bed55da15cd4df592f0edf2c44f445f2733307f06ffbc4c5a946e05c3f26a3 SHA512 7556e8c3934a83320646336bcaffc010a91258c1ab669596e4b7ece98eb35e1d1ae625bca0de3781638e0a186656de61d554ef8722beea6bc29cdb0c70314b1d DIST NetworkManager-1.32.8.tar.xz 5255076 BLAKE2B 5f1bc55e3b9e6864c05421c8506ac202162deaf5081450e5d50f52699abc2d9bfb6e89b6f48c9874cccdc11fe754a5063a63e830702e211cf178ce7df0d628fb SHA512 328733f3dce9e52e680e464b60112995439f94dfeaea3b6c2082b323e85418483db6c6dc9e43f52176ff7c1291b226db77fe5acab9935dad7735c4397f5e9b83 -EBUILD networkmanager-1.30.4.ebuild 11206 BLAKE2B 2eac583bf5c83f16e7417ebb890155a5386b91550071d2ad819d14a089ecd120a823b53b73eb01da2b212b2eef0095840a0de68bad7c8984aaaf8177ad2b5027 SHA512 5523dc378109cbf5f058a34dbfbdd75891d53f90cbf32d86c0bd15eb16b442082b37b8983ff59ef3f52756bff5472f855471906cc5d9a238d0f5434847a3792a -EBUILD networkmanager-1.32.2.ebuild 11373 BLAKE2B d404928b488ea79a12e278df5e8f822ebd17fff4edef38b4877ff8888e38ebeedeece4eb903f71c838bf15430f1aa1506b46a9658d0938c2379a7b5f8138c62c SHA512 443b1a5471d1af71bb1796e242b1c8b6b21aff1203bf732ad2610e52f316678705157c379a0b925fec7eb016c31e24527f41d6a0bf55e0c720f3ab9f71110a29 +EBUILD networkmanager-1.32.10.ebuild 11698 BLAKE2B e45673bb8ce592470e5ac16f3b567b532ed86cde0410c2c34e76a118a5e273e8474354dd0fec89713910f742471586418da9906d4cfe5029a026a226f8884701 SHA512 50e90563b2a4e5e14ec91c2f6ac5b65272a644a70cf365e2e8fd3ab43742c7ba1133bfa525bbfa63c4b278550dbd996d67c3b2d13c29cd05ba3275a299309f54 EBUILD networkmanager-1.32.4.ebuild 11367 BLAKE2B 3e06b9f6ec8c4d21536e7befee437a2f18abdf86bccbe8ef1151297f14f676141687b38884310ff10039000583d110c5919a58d443e79f8400c82ff1d324bf6c SHA512 61939b3e2e5e55915b59eec4701882a6037d80e9c546bef3ac126eb8a7a732874d1b153b315f2a51514190a8ba6a63dfeff9cf8b7de864d8faa8688aac0e0fba -EBUILD networkmanager-1.32.6.ebuild 11373 BLAKE2B d404928b488ea79a12e278df5e8f822ebd17fff4edef38b4877ff8888e38ebeedeece4eb903f71c838bf15430f1aa1506b46a9658d0938c2379a7b5f8138c62c SHA512 443b1a5471d1af71bb1796e242b1c8b6b21aff1203bf732ad2610e52f316678705157c379a0b925fec7eb016c31e24527f41d6a0bf55e0c720f3ab9f71110a29 EBUILD networkmanager-1.32.8.ebuild 11380 BLAKE2B dcbbed663f29fa55d547ed0bf96ca34c2f3db56b6090d45084d9083254c1e9abd72fd2cff37289d5b2e82477d43ce70556da82b4583b04f9b4ea23c543735856 SHA512 4ac72dd4be5e7a1bdc301fc9c47411001520e3409fc6bfa75621cfffa4a6903c7ae61693ac7d7ba46db1d6e125e7d144e3140c29cb1de1149237b2c6738fa36e -MISC metadata.xml 2062 BLAKE2B 117ea58d66dbedc65d59db38a46aa9e4b5c49bf1699748aa03c52c4b1543c4074f8ebea462ff0ac855f153702201bd14cec246dfd8496f5426bbfa10aad53b88 SHA512 083e9b2ddddf781116e7b337f6cd80278e1bc4ea218d9612feed313ed61cfb6ba531b8be818d80eff7e076bab66b7d7d73d96f58d410c7b3708e02e43e724b97 +MISC metadata.xml 2376 BLAKE2B 677ecb6cdd111c15fd7798a4f769109e49f6c392d0d5e39df9b0d6f5c7835e00eaa748b24e8a0beac0d947d5c3fcdbf30909f19931b47f6821ff11990a70f9d3 SHA512 37c6556fdc6a27bfc84a517eb03dbd01072859ada91552dfe90fcd562c77c2aeaba142a89f6b139926bb5fddb48ce96e9258f6b30203a391c05b92874cff48cd diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml index 70f8a3206ee3..e5c4a40c8ca0 100644 --- a/net-misc/networkmanager/metadata.xml +++ b/net-misc/networkmanager/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo GNOME Desktop</name> </maintainer> <use> + <flag name="concheck">Enable connectivity checking support</flag> <flag name="connection-sharing"> Support connection sharing (uses <pkg>net-dns/dnsmasq</pkg>) </flag> @@ -23,6 +24,10 @@ Use <pkg>net-wireless/iwd</pkg> instead of <pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default </flag> + <flag name="psl"> + Use public suffix list via <pkg>net-libs/libpsl</pkg> + </flag> + <flag name="lto">Build using Link Time Optimizations (LTO)</flag> <flag name="modemmanager"> Enable support for mobile broadband devices using <pkg>net-misc/modemmanager</pkg> @@ -44,6 +49,9 @@ create a symlink to /run/systemd/resolve/stub-resolv.conf. </flag> <flag name="teamd">Enable Teamd control support</flag> + <flag name="tools"> + Build cli tools such as nmcli, nmtui and nm_cloud_setup + </flag> <flag name="wifi">Enable support for wifi and 802.1x security</flag> <flag name="wext"> Enable support for the deprecated Wext (Wireless Extensions) API; needed diff --git a/net-misc/networkmanager/networkmanager-1.30.4.ebuild b/net-misc/networkmanager/networkmanager-1.30.4.ebuild deleted file mode 100644 index e65e736be858..000000000000 --- a/net-misc/networkmanager/networkmanager-1.30.4.ebuild +++ /dev/null @@ -1,345 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME_ORG_MODULE="NetworkManager" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7..9} ) - -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" - -IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - bluetooth? ( modemmanager ) - iwd? ( wifi ) - vala? ( introspection ) - wext? ( wifi ) - || ( nss gnutls ) - ?? ( elogind systemd ) -" - -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86" - -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -COMMON_DEPEND=" - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - policykit? ( >=sys-auth/polkit-0.106 ) - net-libs/libndp[${MULTILIB_USEDEP}] - >=net-misc/curl-7.24 - net-misc/iputils - sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - audit? ( sys-process/audit ) - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dbus,dhcp] - net-firewall/iptables ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - modemmanager? ( >=net-misc/modemmanager-0.7.991:0= - net-misc/mobile-broadband-provider-info ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - !nss? ( gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) - ofono? ( net-misc/ofono ) - ovs? ( dev-libs/jansson ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - resolvconf? ( net-dns/openresolv ) - selinux? ( sys-libs/libselinux ) - systemd? ( >=sys-apps/systemd-209:0= ) - teamd? ( - dev-libs/jansson - >=net-misc/libteam-1.9 - ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/plugdev - || ( - net-misc/iputils[arping(+)] - net-analyzer/arping - ) - wifi? ( - !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) - iwd? ( net-wireless/iwd ) - ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.18 - " -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - introspection? ( - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - dev-lang/perl - dev-libs/libxslt - ) - vala? ( $(vala_depend) ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - if use introspection; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return - fi - if use test; then - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - fi -} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -pkg_setup() { - if use connection-sharing; then - if kernel_is lt 5 1; then - CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" - else - CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" - fi - linux-info_pkg_setup - fi - if use introspection || use test; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - use vala && vala_src_prepare - gnome2_src_prepare - - sed -i \ - -e 's#/usr/bin/sed#/bin/sed#' \ - data/84-nm-drivers.rules \ - || die -} - -multilib_src_configure() { - local myconf=( - --disable-more-warnings - --disable-static - --localstatedir=/var - --with-runstatedir=/run - --disable-lto - --disable-qt - --without-netconfig - --with-dbus-sys-dir=/etc/dbus-1/system.d - $(multilib_native_with nmcli) - --with-udev-dir="$(get_udevdir)" - --with-config-plugins-default=keyfile - --with-iptables=/sbin/iptables - --with-ebpf=yes - $(multilib_native_enable concheck) - --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) - --with-crypto=$(usex nss nss gnutls) - # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option - # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. - # (There is no off switch, and we do not support upower.) - # bug #747358 - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - $(multilib_native_use_with audit libaudit) - $(multilib_native_use_enable bluetooth bluez5-dun) - --without-dhcpcanon - $(use_with dhclient) - $(use_with dhcpcd) - --with-config-dhcp-default=internal - $(multilib_native_use_enable introspection) - $(multilib_native_use_enable ppp) - --without-libpsl - $(multilib_native_use_with modemmanager modem-manager-1) - $(multilib_native_use_with ncurses nmtui) - $(multilib_native_use_with ofono) - $(multilib_native_use_enable ovs) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_with resolvconf) - $(multilib_native_use_with selinux) - $(multilib_native_use_with systemd systemd-journal) - $(multilib_native_use_enable teamd teamdctl) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable vala) - --without-valgrind - $(multilib_native_use_with wifi iwd) - $(multilib_native_use_with wext) - $(multilib_native_use_enable wifi) - ) - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - ln -s "${S}/docs" docs || die - ln -s "${S}/man" man || die - fi - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - local targets=( - libnm/libnm.la - ) - emake "${targets[@]}" - fi -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx emake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - insinto /usr/lib/NetworkManager/conf.d #702476 - doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf - else - local targets=( - install-libLTLIBRARIES - install-libnmincludeHEADERS - install-nodist_libnmincludeHEADERS - install-pkgconfigDATA - ) - emake DESTDIR="${D}" "${targets[@]}" - fi -} - -multilib_src_install_all() { - einstalldocs - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - if use iwd; then - # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir - cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf - [device] - wifi.backend=iwd - EOF - fi - - # Empty - rmdir "${ED}"/var{/lib{/NetworkManager,},} || die -} - -pkg_postinst() { - gnome2_pkg_postinst - systemd_reenable NetworkManager.service - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi - - if use dhclient || use dhcpcd; then - ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" - ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" - ewarn "works for you, and you're happy with, the alternative USE flags can be" - ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" - ewarn "the main.dhcp configuration option to use one of them instead of internal." - fi -} diff --git a/net-misc/networkmanager/networkmanager-1.32.2.ebuild b/net-misc/networkmanager/networkmanager-1.32.10.ebuild index 0ab6357947d6..86e790b61b6d 100644 --- a/net-misc/networkmanager/networkmanager-1.32.2.ebuild +++ b/net-misc/networkmanager/networkmanager-1.32.10.ebuild @@ -6,7 +6,7 @@ GNOME_ORG_MODULE="NetworkManager" VALA_USE_DEPEND="vapigen" PYTHON_COMPAT=( python3_{7..10} ) -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal +inherit gnome.org linux-info meson-multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" @@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" +IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux psl lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -23,50 +23,55 @@ REQUIRED_USE=" iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) - || ( nss gnutls ) + ^^ ( gnutls nss ) ?? ( elogind systemd ) + ?? ( dhclient dhcpcd ) + ?? ( syslog systemd ) " -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 COMMON_DEPEND=" - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - policykit? ( >=sys-auth/polkit-0.106 ) - net-libs/libndp[${MULTILIB_USEDEP}] - >=net-misc/curl-7.24 - net-misc/iputils sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/readline:0= + elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[${MULTILIB_USEDEP}] + sys-apps/dbus + net-libs/libndp + systemd? ( >=sys-apps/systemd-209:0= ) + >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) + selinux? ( sys-libs/libselinux ) audit? ( sys-process/audit ) + teamd? ( + >=dev-libs/jansson-2.7 + >=net-misc/libteam-1.9 + ) + policykit? ( >=sys-auth/polkit-0.106 ) + nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) + gnutls? ( + >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] + ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) + modemmanager? ( + net-misc/mobile-broadband-provider-info + >=net-misc/modemmanager-0.7.991:0= + ) bluetooth? ( >=net-wireless/bluez-5 ) + ofono? ( net-misc/ofono ) + dhclient? ( >=net-misc/dhcp-4[client] ) + dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) + ovs? ( >=dev-libs/jansson-2.7 ) + resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - modemmanager? ( >=net-misc/modemmanager-0.7.991:0= - net-misc/mobile-broadband-provider-info ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - !nss? ( gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) - ofono? ( net-misc/ofono ) - ovs? ( dev-libs/jansson ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - resolvconf? ( net-dns/openresolv ) - selinux? ( sys-libs/libselinux ) - systemd? ( >=sys-apps/systemd-209:0= ) - teamd? ( - dev-libs/jansson - >=net-misc/libteam-1.9 + psl? ( net-libs/libpsl ) + concheck? ( net-misc/curl ) + tools? ( + sys-libs/readline:0= + >=dev-libs/newt-0.52.15 ) " RDEPEND="${COMMON_DEPEND} @@ -82,11 +87,13 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-3.18 - " + net-libs/libndp[${MULTILIB_USEDEP}] +" BDEPEND=" dev-util/gdbus-codegen dev-util/glib-utils - dev-util/gtk-doc-am + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig @@ -97,6 +104,7 @@ BDEPEND=" ) vala? ( $(vala_depend) ) test? ( + >=dev-libs/jansson-2.7 $(python_gen_any_dep ' dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}]') @@ -135,7 +143,6 @@ pkg_pretend() { 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 } @@ -157,8 +164,8 @@ src_prepare() { DOC_CONTENTS="To modify system network connections without needing to enter the root password, add your user account to the 'plugdev' group." + default use vala && vala_src_prepare - gnome2_src_prepare sed -i \ -e 's#/usr/bin/sed#/bin/sed#' \ @@ -167,114 +174,135 @@ 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-nft=/sbin/nft - --with-ebpf=yes - $(multilib_native_enable concheck) - --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) - --with-crypto=$(usex nss nss gnutls) - # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option - # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. - # (There is no off switch, and we do not support upower.) - # bug #747358 - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - $(multilib_native_use_with audit libaudit) - $(multilib_native_use_enable bluetooth bluez5-dun) - --without-dhcpcanon - $(use_with dhclient) - $(use_with dhcpcd) - --with-config-dhcp-default=internal - $(multilib_native_use_enable introspection) - $(multilib_native_use_enable ppp) - --without-libpsl - $(multilib_native_use_with modemmanager modem-manager-1) - $(multilib_native_use_with ncurses nmtui) - $(multilib_native_use_with ofono) - $(multilib_native_use_enable ovs) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_with resolvconf) - $(multilib_native_use_with selinux) - $(multilib_native_use_with systemd systemd-journal) - $(multilib_native_use_enable teamd teamdctl) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable vala) - --without-valgrind - $(multilib_native_use_with wifi iwd) - $(multilib_native_use_with wext) - $(multilib_native_use_enable wifi) + local emesonargs=( + --localstatedir="${EPREFIX}/var" + + -Dsystemdsystemunitdir=$(systemd_get_systemunitdir) + -Dsystem_ca_path=/etc/ssl/certs + -Dudev_dir=$(get_udevdir) + -Ddbus_conf_dir=/usr/share/dbus-1/system.d + -Dkernel_firmware_dir=/lib/firmware + -Diptables=/sbin/iptables + -Dnft=/sbin/nft + -Ddnsmasq=/usr/sbin/dnsmasq + #-Ddnssec_trigger= + + -Ddist_version=${PVR} + $(meson_native_use_bool policykit polkit) + $(meson_native_use_bool policykit config_auth_polkit_default) + -Dmodify_system=true + -Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1 + $(meson_native_use_bool selinux) + $(meson_native_use_bool systemd systemd_journal) + -Dhostname_persist=gentoo + -Dlibaudit=$(multilib_native_usex audit) + + $(meson_native_use_bool wext) + $(meson_native_use_bool wifi) + $(meson_native_use_bool iwd) + $(meson_native_use_bool ppp) + -Dpppd=/usr/sbin/pppd + $(meson_native_use_bool modemmanager modem_manager) + $(meson_native_use_bool ofono) + $(meson_native_use_bool concheck) + $(meson_native_use_bool teamd teamdctl) + $(meson_native_use_bool ovs) + $(meson_native_use_bool tools nmcli) + $(meson_native_use_bool tools nmtui) + $(meson_native_use_bool tools nm_cloud_setup) + $(meson_native_use_bool bluetooth bluez5_dun) + -Debpf=true + + -Dconfig_plugins_default=keyfile + -Difcfg_rh=false + -Difupdown=false + + $(meson_native_use_feature resolvconf) + -Dnetconfig=disable + -Dconfig_dns_rc_manager_default=symlink + + $(meson_feature dhclient) + -Ddhcpcanon=disable + $(meson_feature dhcpcd) + + $(meson_native_use_bool introspection) + $(meson_native_use_bool vala vapi) + $(meson_native_true docs) + -Dtests=$(multilib_native_usex test) + $(meson_native_true firewalld_zone) + -Dmore_asserts=0 + $(meson_use debug more_logging) + -Dvalgrind=no + -Dvalgrind_suppressions= + -Dld_gc=false + $(meson_native_use_bool psl libpsl) + -Dqt=false + + $(meson_use lto b_lto) ) - # 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} ) + if multilib_is_native_abi && use systemd; then + emesonargs+=( -Dsession_tracking_consolekit=false ) + emesonargs+=( -Dsession_tracking=systemd ) + emesonargs+=( -Dsuspend_resume=systemd ) + elif multilib_is_native_abi && use elogind; then + emesonargs+=( -Dsession_tracking_consolekit=false ) + emesonargs+=( -Dsession_tracking=elogind ) + emesonargs+=( -Dsuspend_resume=elogind ) + else + emesonargs+=( -Dsession_tracking_consolekit=false ) + emesonargs+=( -Dsession_tracking=no ) + emesonargs+=( -Dsuspend_resume=auto ) fi - # 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 + if multilib_is_native_abi && use syslog; then + emesonargs+=( -Dconfig_logging_backend_default=syslog ) + elif multilib_is_native_abi && use systemd; then + emesonargs+=( -Dconfig_logging_backend_default=journal ) + else + emesonargs+=( -Dconfig_logging_backend_default=default ) fi - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" -} + if multilib_is_native_abi && use dhclient; then + emesonargs+=( -Dconfig_dhcp_default=dhclient ) + elif multilib_is_native_abi && use dhcpcd; then + emesonargs+=( -Dconfig_dhcp_default=dhcpcd ) + else + emesonargs+=( -Dconfig_dhcp_default=internal ) + fi -multilib_src_compile() { - if multilib_is_native_abi; then - emake + if use nss; then + emesonargs+=( -Dcrypto=nss ) else - local targets=( - src/libnm-client-impl/libnm.la - ) - emake "${targets[@]}" + emesonargs+=( -Dcrypto=gnutls ) + fi + + # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 + if use ppp; then + local PPPD_VER=`best_version net-dialup/ppp` + PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision + emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) fi + + meson_src_configure } multilib_src_test() { if use test && multilib_is_native_abi; then python_setup - virtx emake check + virtx meson_src_test 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[@]}" + meson_src_install + if ! multilib_is_native_abi; then + rm -rf "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} fi } multilib_src_install_all() { - einstalldocs ! use systemd && readme.gentoo_create_doc newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager @@ -296,6 +324,9 @@ multilib_src_install_all() { insinto /usr/share/polkit-1/rules.d/ doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" + insinto /usr/lib/NetworkManager/conf.d #702476 + doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf + if use iwd; then # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf @@ -304,12 +335,14 @@ multilib_src_install_all() { EOF fi + mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die + rmdir "${ED}"/usr/share/doc/NetworkManager || die + # Empty rmdir "${ED}"/var{/lib{/NetworkManager,},} || die } pkg_postinst() { - gnome2_pkg_postinst systemd_reenable NetworkManager.service ! use systemd && readme.gentoo_print_elog diff --git a/net-misc/networkmanager/networkmanager-1.32.6.ebuild b/net-misc/networkmanager/networkmanager-1.32.6.ebuild deleted file mode 100644 index 0ab6357947d6..000000000000 --- a/net-misc/networkmanager/networkmanager-1.32.6.ebuild +++ /dev/null @@ -1,349 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME_ORG_MODULE="NetworkManager" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python3_{7..10} ) - -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" - -IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - bluetooth? ( modemmanager ) - connection-sharing? ( || ( iptables nftables ) ) - iwd? ( wifi ) - vala? ( introspection ) - wext? ( wifi ) - || ( nss gnutls ) - ?? ( elogind systemd ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -# gobject-introspection-0.10.3 is needed due to gnome bug 642300 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -COMMON_DEPEND=" - >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] - policykit? ( >=sys-auth/polkit-0.106 ) - net-libs/libndp[${MULTILIB_USEDEP}] - >=net-misc/curl-7.24 - net-misc/iputils - sys-apps/util-linux[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=virtual/libudev-175:=[${MULTILIB_USEDEP}] - audit? ( sys-process/audit ) - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dbus,dhcp] - iptables? ( net-firewall/iptables ) - nftables? ( net-firewall/nftables ) - ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - modemmanager? ( >=net-misc/modemmanager-0.7.991:0= - net-misc/mobile-broadband-provider-info ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - !nss? ( gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) - ofono? ( net-misc/ofono ) - ovs? ( dev-libs/jansson ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) - resolvconf? ( net-dns/openresolv ) - selinux? ( sys-libs/libselinux ) - systemd? ( >=sys-apps/systemd-209:0= ) - teamd? ( - dev-libs/jansson - >=net-misc/libteam-1.9 - ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/plugdev - || ( - net-misc/iputils[arping(+)] - net-analyzer/arping - ) - wifi? ( - !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) - iwd? ( net-wireless/iwd ) - ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.18 - " -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - introspection? ( - $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - dev-lang/perl - dev-libs/libxslt - ) - vala? ( $(vala_depend) ) - test? ( - $(python_gen_any_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - if use introspection; then - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return - fi - if use test; then - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - fi -} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See https://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_pretend() { - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See https://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -pkg_setup() { - if use connection-sharing; then - if kernel_is lt 5 1; then - CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" - else - CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" - fi - linux-info_pkg_setup - fi - if use introspection || use test; then - python-any-r1_pkg_setup - fi -} - -src_prepare() { - DOC_CONTENTS="To modify system network connections without needing to enter the - root password, add your user account to the 'plugdev' group." - - use vala && vala_src_prepare - gnome2_src_prepare - - sed -i \ - -e 's#/usr/bin/sed#/bin/sed#' \ - data/84-nm-drivers.rules \ - || die -} - -multilib_src_configure() { - local myconf=( - --disable-more-warnings - --disable-static - --localstatedir=/var - --with-runstatedir=/run - --disable-lto - --disable-qt - --without-netconfig - --with-dbus-sys-dir=/etc/dbus-1/system.d - $(multilib_native_with nmcli) - --with-udev-dir="$(get_udevdir)" - --with-config-plugins-default=keyfile - --with-iptables=/sbin/iptables - --with-nft=/sbin/nft - --with-ebpf=yes - $(multilib_native_enable concheck) - --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) - --with-crypto=$(usex nss nss gnutls) - # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option - # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. - # (There is no off switch, and we do not support upower.) - # bug #747358 - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) - $(multilib_native_use_with audit libaudit) - $(multilib_native_use_enable bluetooth bluez5-dun) - --without-dhcpcanon - $(use_with dhclient) - $(use_with dhcpcd) - --with-config-dhcp-default=internal - $(multilib_native_use_enable introspection) - $(multilib_native_use_enable ppp) - --without-libpsl - $(multilib_native_use_with modemmanager modem-manager-1) - $(multilib_native_use_with ncurses nmtui) - $(multilib_native_use_with ofono) - $(multilib_native_use_enable ovs) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_with resolvconf) - $(multilib_native_use_with selinux) - $(multilib_native_use_with systemd systemd-journal) - $(multilib_native_use_enable teamd teamdctl) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable vala) - --without-valgrind - $(multilib_native_use_with wifi iwd) - $(multilib_native_use_with wext) - $(multilib_native_use_enable wifi) - ) - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - ln -s "${S}/docs" docs || die - ln -s "${S}/man" man || die - fi - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - local targets=( - src/libnm-client-impl/libnm.la - ) - emake "${targets[@]}" - fi -} - -multilib_src_test() { - if use test && multilib_is_native_abi; then - python_setup - virtx emake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - insinto /usr/lib/NetworkManager/conf.d #702476 - doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf - else - local targets=( - install-libLTLIBRARIES - install-libnmincludeHEADERS - install-nodist_libnmincludeHEADERS - install-pkgconfigDATA - ) - emake DESTDIR="${D}" "${targets[@]}" - fi -} - -multilib_src_install_all() { - einstalldocs - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - # Provide openrc net dependency only when nm is connected - exeinto /etc/NetworkManager/dispatcher.d - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status - sed -e "s:@EPREFIX@:${EPREFIX}:g" \ - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die - - keepdir /etc/NetworkManager/system-connections - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 - - # Allow users in plugdev group to modify system connections - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" - - if use iwd; then - # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir - cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf - [device] - wifi.backend=iwd - EOF - fi - - # Empty - rmdir "${ED}"/var{/lib{/NetworkManager,},} || die -} - -pkg_postinst() { - gnome2_pkg_postinst - systemd_reenable NetworkManager.service - ! use systemd && readme.gentoo_print_elog - - if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then - ewarn "The ${PN} system configuration file has moved to a new location." - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn - ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf" - fi - - # NM fallbacks to plugin specified at compile time (upstream bug #738611) - # but still show a warning to remember people to have cleaner config file - if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then - if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then - ewarn - ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf" - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." - ewarn - fi - fi - - # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then - ewarn "You have psk-flags=1 setting in above files, you will need to" - ewarn "either reconfigure affected networks or, at least, set the flag" - ewarn "value to '0'." - fi - - if use dhclient || use dhcpcd; then - ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" - ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" - ewarn "works for you, and you're happy with, the alternative USE flags can be" - ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" - ewarn "the main.dhcp configuration option to use one of them instead of internal." - fi -} diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest index 7197f105f760..c5e8801183d4 100644 --- a/net-misc/sslh/Manifest +++ b/net-misc/sslh/Manifest @@ -5,6 +5,7 @@ DIST sslh-1.21.tar.gz 111298 BLAKE2B 46003021292436023c7f2e0d9cbfb283f4ca7497f5d DIST sslh-1.21b.tar.gz 111740 BLAKE2B 5d42eab551e05ac1367da9ae85eac945657e086672712c148ee07c78af5c2a546e696d77081c7282e77c8bef535c186f89d541489f07153bd7ca2d338b341a48 SHA512 59bd33b47b70f82ae1ba3d6ffac3d54897dc6b7343d0d9e3bb8384adc30ac8a44a64e71590a7eecc5a83c2f70712bd79c0eb4ea8eef15ae770633dead9888c5f DIST sslh-1.21c.tar.gz 111895 BLAKE2B 3ec7a4a4f8eb7ec3d22e9630070037ebef7df2cbe3657a38234573ecf4eb9f331914858f703690b094ddc1977cd80b3a5760b94004f35a2ec2c59761f6cd142e SHA512 9446c6afe965684c5d6406ac8917338f57d95f8fbfacd7a51193dd5dbac77e1ed5e39eb8e2575e7025a8612b25e9fba7e64832a48c999f366875217b9328da22 DIST sslh-1.22.tar.gz 147013 BLAKE2B b23f0a9601a7ba5121a6407872aee2d4c26eab934187070ab7ea3f360e815db9681db46b4f9c7f3ad5efe5446a44e0213c1bd791ad38505668b1cb3fa981bdcd SHA512 59bc40778350efbd21f22b66ecf2926ee04987784b1772450f8ce52b8d4a4270cfa307e3c978db70d420a7c3909a2c26df0b2b6127671be90537e40240a42652 +DIST sslh-1.22b.tar.gz 146854 BLAKE2B abeafeb35274b7d7d2b8e86206c3922deb98390da2fe023045c90ef68fe5720294c873ccdf2aa8443cd1521138e0b7dfe44a505a86d50291b4f7e84347499fee SHA512 de5ba0d5f241fb4742813b5ae1a2fcc4b872aa7d9c6acf7105e6c153b3a0b19482cfe28c96aa33a2561b5bfe7da3490a9c0b59d35dbd102f80f7f3b5ab68d52e DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a EBUILD sslh-1.20-r2.ebuild 1929 BLAKE2B 1cc0b4554e89aee8e7cde80da933824674a4ebf926bbc7fbf94186cb06e367ba4422949e20bb90f4dab2d85ad1ad59b613507b37b47df9d905254bdc0f80dea5 SHA512 4a9288d4dea17c0dd6ffab5ea1219b37f77c61675ca61a4baf443119c0543b3fae48c48923fc3b75653ffc01d340c302059d88abd96ae6aa89c3984fdb0d662f EBUILD sslh-1.21-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf @@ -12,5 +13,6 @@ EBUILD sslh-1.21b-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff EBUILD sslh-1.21c-r2.ebuild 1927 BLAKE2B 06fa388b50cf3be10daa60552a92fca375b10ff0a63acef5725e945423e365e9c8827173398cd1eb766ec3c145f967852b1e162a5e7906a7e4b75a60c4f3fbb2 SHA512 fd51f1353e53206b28336f9faee1d97de876dc72259ca866b466175d42841ff59ed52bd654a964c05f078bbb0de0d11ab7e1bd3a0626c235084273fd7e136dcf EBUILD sslh-1.21c-r3.ebuild 1980 BLAKE2B 0155382b36231974ce9d59554b94c5761df0d1bddd87e34c79487ee0d5c5db60f5a64ac5bce9fcb46a930d39bf624c2613556280540322e3fa2a1b12ae043090 SHA512 397c90cd785a4a055a4ea1a0ed6d33d04cefa7a6db219de82af667b42e1195031281804c77f46b0d1bf0910893435e7bc625c13d8597afa2cd021177d455cbdf EBUILD sslh-1.22.ebuild 1885 BLAKE2B 9b1e2a512358f4fa53c2db0f6703a147d647ba3a97034e0213accd3303dccd3474da652af9cf4edb9d5c3c074beada092fbe97d226ad0f015f21445176cf648b SHA512 a9aa19a6abbf360fd7acf25417c26c9f8f235bd2fdfe36f021723e53606d6cca042c80bb7bbec543abf09fdede8541ce8bec35eb708f0b6867a9741f7df7f387 +EBUILD sslh-1.22b.ebuild 1885 BLAKE2B 9b1e2a512358f4fa53c2db0f6703a147d647ba3a97034e0213accd3303dccd3474da652af9cf4edb9d5c3c074beada092fbe97d226ad0f015f21445176cf648b SHA512 a9aa19a6abbf360fd7acf25417c26c9f8f235bd2fdfe36f021723e53606d6cca042c80bb7bbec543abf09fdede8541ce8bec35eb708f0b6867a9741f7df7f387 EBUILD sslh-9999.ebuild 1885 BLAKE2B 9b1e2a512358f4fa53c2db0f6703a147d647ba3a97034e0213accd3303dccd3474da652af9cf4edb9d5c3c074beada092fbe97d226ad0f015f21445176cf648b SHA512 a9aa19a6abbf360fd7acf25417c26c9f8f235bd2fdfe36f021723e53606d6cca042c80bb7bbec543abf09fdede8541ce8bec35eb708f0b6867a9741f7df7f387 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da diff --git a/net-misc/sslh/sslh-1.22b.ebuild b/net-misc/sslh/sslh-1.22b.ebuild new file mode 100644 index 000000000000..9ecf187a6416 --- /dev/null +++ b/net-misc/sslh/sslh-1.22b.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic systemd toolchain-funcs + +DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" +HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" + SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S=${WORKDIR}/${P} +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps systemd tcpd" + +RDEPEND="caps? ( sys-libs/libcap ) + dev-libs/libpcre2:= + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) + >=dev-libs/libconfig-1.5:=" +DEPEND="${RDEPEND} + dev-lang/perl" + +RESTRICT="test" + +src_prepare() { + default + sed -i \ + -e '/MAN/s:| gzip -9 - >:>:' \ + -e '/MAN=sslh.8.gz/s:.gz::' \ + Makefile || die +} + +src_compile() { + # On older versions of GCC, the default gnu89 variant + # will reject within-for-loop initializers, bug #595426 + # Furthermore, we need to use the gnu variant (gnu99) instead + # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro + # to be defined. + append-cflags -std=gnu99 + + emake \ + CC="$(tc-getCC)" \ + USELIBCAP=$(usev caps) \ + USELIBWRAP=$(usev tcpd) \ + USESYSTEMD=$(usev systemd) +} + +src_install() { + dosbin sslh-{fork,select} + dosym sslh-fork /usr/sbin/sslh + + doman ${PN}.8 + + dodoc ChangeLog README.md + + newinitd "${FILESDIR}"/sslh.init.d-3 sslh + newconfd "${FILESDIR}"/sslh.conf.d-2 sslh + + if use systemd; then + # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin + sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die + systemd_newunit scripts/systemd.sslh.service sslh.service + exeinto /usr/lib/systemd/system-generators/ + doexe systemd-sslh-generator + fi +} diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 83a195e09836..579d312f1104 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -2,5 +2,5 @@ AUX wget-1.20.3-gcc10-fno-common.patch 887 BLAKE2B 34b94aa99b2335ade4f6c3e1fbb5b DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712 EBUILD wget-1.20.3-r3.ebuild 3290 BLAKE2B 46ba1c5d99cd2447e168c09affd97bcfb2f7f9842e9f9e70922e0579512e810400a7ee01bcfddf4c757440bb5ff6d39101251d75fb54e375cd4e4315d81cc5e7 SHA512 bfbbcbd088e1cb169d4bceea7dd831f5dcda35502545e55b095befe2dc9359daa2b909ce0e6916732af62bf323beb87db5f4640c247ff83de5695e63f901d9b7 -EBUILD wget-1.21.1.ebuild 3242 BLAKE2B f101a3e797dcf930208f306d0bf8e038839db82f0fa6f400eb365ab2ee62c70d59a0ea83477b2245c51f769a28eabe03f942e24a0f3a6fcf9f44830afb39e7d4 SHA512 d91c29860c2e1d55188f40d787355968df6b283bbc7a21490d376d6b152b420a89c33217dab98a65b9ac1399335b8bdcfc01187bf5b142b7838c6d851ff1a945 +EBUILD wget-1.21.1.ebuild 3474 BLAKE2B 61fa48665cd3fba01a0d83529c3e0087941e2d9fc97732409b27077305be0950fb5bc319a3c65c7bfda4c55ffbb231696dfa0568057829669e9f61fb6a0daa1f SHA512 5c5699eb526c63b185cbc95e94c5f68bd1c2b1c6220627b40d85e0f133a96fe45cf43c888baa97dd544fc37c5b7a07e81e41c66e9950ca8a30de034b94a09b3c MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4 diff --git a/net-misc/wget/wget-1.21.1.ebuild b/net-misc/wget/wget-1.21.1.ebuild index 2d15744b57f8..dfd4fce484b8 100644 --- a/net-misc/wget/wget-1.21.1.ebuild +++ b/net-misc/wget/wget-1.21.1.ebuild @@ -75,6 +75,12 @@ src_configure() { # the included gnutls -- force ioctl.h to include this header [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 + if [[ ${CHOST} == *-darwin* ]] ; then + # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html + # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html + append-cppflags '-D__nonnull\(X\)=' + fi + if use static ; then append-ldflags -static tc-export PKG_CONFIG diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest index c5146fce37bc..19945ceb4a93 100644 --- a/net-misc/wget2/Manifest +++ b/net-misc/wget2/Manifest @@ -5,4 +5,4 @@ AUX wget2-1.99.2-remove_ldconfig_call.patch 768 BLAKE2B 203ad8814f1eba1f671ee4e6 DIST wget2-1.99.2.tar.gz 3173906 BLAKE2B 1fc63de32725d0d980469cc730d17035a01ccb432a91fe24c37e06017c2604a4ef6d8474e76eb757c3a22cc61ea6c70e26af40dffc474a87f8bbdb2a8deced7c SHA512 c2c687124a2463d6a0397cd7dbbc5e475ba815e8d7e13a4b71b529e6be03c9f7dbe5f358702e929ed36034f6fffc698f3b1c5ac486a35e2b00ee6f135060ad7f EBUILD wget2-1.99.2.ebuild 2102 BLAKE2B da8f7c03ff6e86568f14e58f23e8d0cb6656bccaa3cff04ffe7c9b1073d5007c598052ee668f6c6e8eacdf80e47ae62a3e30df0453c8ce74b016be3d965669f3 SHA512 cf9b5acba95447cd0c30130052c2ddd9a5316744749fe873ed86b454ab8dec5d692abcbfd70a7c33d89624385ec01114aa629c6daa30629d4d6d18795d04816a EBUILD wget2-9999.ebuild 2579 BLAKE2B 8428353d808b131ecfa1006f20fc8c8101eb9ad62b9a961583495df938d2bf5c0023db1deebe0e5e2e0c3a012e33ac5ff83a0ebba50ff33d5d3bb7f4b7c4de0c SHA512 ca1f07a9893d2fd42ed32e6c4104509fc2a66b8229966821693365ad07e1d2014fea053fca832dcadba4b9f1164f2647209d3530d0d77d571e987fea7e78d3ae -MISC metadata.xml 652 BLAKE2B 3404cf0ecbba0e6fbb3a1e1d232eb379fbcaf0e5f8d295c439a3d5613496c957daf40816f4bc5047df48e35fa4343f6fd874763e6681532412e9446e5860ee27 SHA512 8d98d6217536cd6a0ea07fdd588fd4f44f82e66c4dd6a8ecccbc58ddd5c4e4a0bef8e282fccc0064a442f5d6131b1475c7b1ef956f4841a990ddbcbf619c55b4 +MISC metadata.xml 735 BLAKE2B 1576145baca52953bb11f3dc62ba91ae020b1307f82c8c0ee41169f9f119db36e3c1db946494d6308cd579d9a911fa0fcd5cefa64f9041970bec9818f26bc821 SHA512 4fb658bde014d80a77cf0532e9dfc24f78fc0e3418d72937ae3ca9ee60508cf945c8812ce189025e808a8994bc82079887dc2a31b91d7254495404b92ffdd3ff diff --git a/net-misc/wget2/metadata.xml b/net-misc/wget2/metadata.xml index c84bc2d35c97..e11e2ca24ca2 100644 --- a/net-misc/wget2/metadata.xml +++ b/net-misc/wget2/metadata.xml @@ -7,10 +7,10 @@ </maintainer> <use> <flag name="brotli">Enable support for brotli compression</flag> - <flag name="gpgme">Build gpgme backend</flag> - <flag name="http2">Enable HTTP/2.0 support</flag> - <flag name="openssl">Enable crypto support via dev-libs/openssl</flag> - <flag name="psl">Use public suffix list via media-libs/libnspsl</flag> - <flag name="valgrind">Depend on dev-util/vagrind for test suite</flag> + <flag name="gpgme">Build <pkg>app-crypt/gpgme</pkg> backend</flag> + <flag name="http2">Enable HTTP/2.0 support via <pkg>net-libs/nghttp2</pkg></flag> + <flag name="openssl">Enable crypto support via <pkg>dev-libs/openssl</pkg></flag> + <flag name="psl">Use public suffix list via <pkg>net-libs/libpsl</pkg></flag> + <flag name="valgrind">Depend on <pkg>dev-util/valgrind</pkg> for test suite</flag> </use> </pkgmetadata> diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest new file mode 100644 index 000000000000..d4646f9ce638 --- /dev/null +++ b/net-misc/yt-dlp/Manifest @@ -0,0 +1,3 @@ +DIST yt-dlp-2021.8.10.tar.gz 1807968 BLAKE2B 664f9f5680c18531bb1c194e6e26a31b6be62894a88c6748bf146fbba79164fec6f5e6db017785daf6c8f5a2c1b7cfc0c2ee6c0d437b9d7bb4e1835eff73650f SHA512 fb321d308e634f6358f046762cc3e827b036083b4764d495bbcef253d06ce445152f4a330c51b5aac1eb3b21a8a345fc791f0fdbdc01089ea2a414b1cd457f20 +EBUILD yt-dlp-2021.8.10.ebuild 1133 BLAKE2B d08de5fd6d20d47c9687c28691225cc3b74d0745d195017afbb3959764a90162b788fb1bee6e6330f6c55a849fc9e53fbd3e51663d01768d1df20ae0719504a0 SHA512 bb5e06e853bbeeacbf7bd2e317d629867761d07d2ba6be8f5099158d30108be754c76b436eeec5d06ad64ab8d9396071ac4df05434690d31e9df9b4f841068c5 +MISC metadata.xml 330 BLAKE2B dce48896e3f03082a2af2ed40059805bdf28c43fbab338839577a8ebe25c1a1f891de7db1444acca7fc5ec9b270f7d2fb1769ad519972a81861b62efc7c456fc SHA512 45bba503be171531626132a8081c599b83178b9f5413f805dc5f626626dd05105fc9884ddd0762d2e16fed0140e74eaa53d6ec58ec9cbc6220d9ca65ef2b556c diff --git a/net-misc/yt-dlp/metadata.xml b/net-misc/yt-dlp/metadata.xml new file mode 100644 index 000000000000..2b132d02ee42 --- /dev/null +++ b/net-misc/yt-dlp/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>slashbeast@gentoo.org</email> + <name>Piotr Karbowski</name> + </maintainer> + <upstream> + <remote-id type="github">yt-dlp/yt-dlp</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-misc/yt-dlp/yt-dlp-2021.8.10.ebuild b/net-misc/yt-dlp/yt-dlp-2021.8.10.ebuild new file mode 100644 index 000000000000..4c0bfc7cd619 --- /dev/null +++ b/net-misc/yt-dlp/yt-dlp-2021.8.10.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 + +DESCRIPTION="A youtube-dl fork with additional features and fixes" +HOMEPAGE="https://github.com/yt-dlp/yt-dlp" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +KEYWORDS="~amd64 ~riscv ~x86" +LICENSE="public-domain" +SLOT="0" + +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] + media-libs/mutagen[${PYTHON_USEDEP}] + dev-python/websockets[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + media-video/ffmpeg + +" + +distutils_enable_tests nose + +python_test() { + # make_lazy_extractors.py tries to rename it out, so fails if it does not exists. + mkdir ytdlp_plugins + epytest -k 'not download' +} + +python_install_all() { + doman yt-dlp.1 + + newbashcomp completions/bash/yt-dlp yt-dlp + + insinto /usr/share/zsh/site-functions + newins completions/zsh/_yt-dlp _yt-dlp + + insinto /usr/share/fish/vendor_completions.d + doins completions/fish/yt-dlp.fish + + distutils-r1_python_install_all + + rm -rf "${ED}"/usr/share/doc/yt_dlp || die +} |