From 4551b41523452c0d743a71cca34e4dca2ca7538c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 4 Jan 2023 12:06:28 +0000 Subject: gentoo auto-resync : 04:01:2023 - 12:06:28 --- net-dns/Manifest.gz | Bin 8360 -> 8363 bytes net-dns/getdns/Manifest | 3 +- net-dns/getdns/files/getdns-1.7.2-clang16.patch | 55 ++++++++++++++ net-dns/getdns/getdns-1.7.2-r1.ebuild | 95 ++++++++++++++++++++++++ net-dns/getdns/getdns-1.7.2.ebuild | 94 ----------------------- net-dns/smartdns/Manifest | 4 +- net-dns/smartdns/smartdns-38.ebuild | 33 -------- net-dns/smartdns/smartdns-40.ebuild | 33 ++++++++ 8 files changed, 187 insertions(+), 130 deletions(-) create mode 100644 net-dns/getdns/files/getdns-1.7.2-clang16.patch create mode 100644 net-dns/getdns/getdns-1.7.2-r1.ebuild delete mode 100644 net-dns/getdns/getdns-1.7.2.ebuild delete mode 100644 net-dns/smartdns/smartdns-38.ebuild create mode 100644 net-dns/smartdns/smartdns-40.ebuild (limited to 'net-dns') diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz index 30ed1af62363..b78813d8a2b0 100644 Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest index 19ca4b0fb202..6c95d1782976 100644 --- a/net-dns/getdns/Manifest +++ b/net-dns/getdns/Manifest @@ -1,7 +1,8 @@ AUX getdns-1.4.2-stubby.service.patch 568 BLAKE2B f2e605116f924b109bf2cd734c8eb79314aeb02b0e30e2fd8d62117b44a74f20e64b1b527253a09525ad9ab26aa2a64a51940773064de87e295d1831dfe9e51b SHA512 67c88787d48662d5c555cd2cdff5916a2211aaf45a13b41e0a909d703dcbc66cb3de834cc94b7c3d292d16a99d024b07098b4e0bb1c790e48201ca9ffb598bd2 +AUX getdns-1.7.2-clang16.patch 1488 BLAKE2B 992a4f97808880d5ed959cf4f0a04776ba162f5d55dbd56d2c0dc47bcc3e617da2b366b895a7891ed9a3126054272fa0d98277c840c4d853f05c2290b42a5253 SHA512 106db48bb52ff482909b89eaf51781880bf7a60c483b7b7fe8e67bb448038876f2343f21152ae3bd2c9115f133eb094290520f3803da1322d5b59abb85ddfef5 AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c AUX stubby.initd-r2 625 BLAKE2B 83737407d4ba1d64edabd346868e8401438a9b90b7ddea2d11387ca2dd4d27b68b53039dbf83c60d54c63e9e72171421c40ecaefd5b9b6d8bd4a09eb2a6dcb54 SHA512 0149fd219af720102988663f58f730228f8684267daaf279bcb80fbf70aba3d3d8cd41e745af2b3afbae6270259232dcc5bada0f58c935e6157620c06c53f347 AUX stubby.logrotate 90 BLAKE2B 8417a72ee319a12a38b94dcbd38617925539ec4971443097be155012ca7eefadb558c9ea01af03e77f1c28441f06fce73f01c2bfbbe9d305ec56b728b5eb886c SHA512 1dc35b1d0572de915304e632d9b4e6f3017deb3c906d93fad532564d70b961c5595194ac8e11d1888710ff3b5cf9512e1a1a5007d10128dde31875bee8c9e0e0 DIST getdns-1.7.2.tar.gz 702969 BLAKE2B 668a754200b816790f39a772d89c28e14bc5dbd041e07d9e53605ad44d63d6637078b66881c35dda62ed61622142797cc8f0041522e076cf551651fca688053a SHA512 6c4a75a4696c46ec8bd9e9659a93fd81f3490b43da28a4c95f99a766027c7588fc493a8ac51563afb8f975c0e5b77d5ea67014d80e78ee2bb17fba1d1073d19f -EBUILD getdns-1.7.2.ebuild 2201 BLAKE2B b46b9739bc296be74ac64f5063803ad9c488611b9503aa59a0ef9c9ca70d2e37fb88b0bc60491ea7db5c29d9231ac83a44bec6a5718340367376a518b597c722 SHA512 a5d4f28ad002fb7bdc1728586ce8c1e0a1c067c6d0472218d77d41ab510440031a39123acf6cfc531581e9e5f26d4b3200cffefeabbf2136f767e65f473bf686 +EBUILD getdns-1.7.2-r1.ebuild 2235 BLAKE2B 65c98b468e817a7b795149d25d77580d05dff41bc5c17fcdd5bb8e9ac934b057e9276dc5ea726859bc3fa93e73a234994c3eba3788c7fdfcf0afc1fcb501f25d SHA512 399358e287865125e0f19b706021e8e05450751968a30f595c6f0e6b6fa33da438a577ce5e0f96e1660dfffa3d0a1839a67a622ff504031c911b7d0c1a969932 MISC metadata.xml 746 BLAKE2B 95a333115ed09b17a106970bb3a1f20087bb1f50cc7cdd770473d5a8d0c1322e7d53ae0a84e6b89ba6a3b87f7242f8de88ad40e340a387be3ccf30d74d42fa72 SHA512 71f608fd09a7471c8998e407eb92dbe7e31a8fcd766e3192eb08e831950e0eb0fb62c2008a6c4475bb87179c865b1d283f6a70f0f77ab66c12bc1070ed6cd34c diff --git a/net-dns/getdns/files/getdns-1.7.2-clang16.patch b/net-dns/getdns/files/getdns-1.7.2-clang16.patch new file mode 100644 index 000000000000..4b6b58f285a0 --- /dev/null +++ b/net-dns/getdns/files/getdns-1.7.2-clang16.patch @@ -0,0 +1,55 @@ +https://github.com/getdnsapi/getdns/commit/9c076ca34b9569eb60861da9a99f895a49d5a7b4 + +From 9c076ca34b9569eb60861da9a99f895a49d5a7b4 Mon Sep 17 00:00:00 2001 +From: Willem Toorop +Date: Mon, 22 Aug 2022 10:40:35 +0200 +Subject: [PATCH] Issue #526 Some gldns files need stdlib + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -262,6 +262,7 @@ check_include_file(inttypes.h HAVE_INTTYPES_H) + check_include_file(limits.h HAVE_LIMITS_H) + check_include_file(sys/limits.h HAVE_SYS_LIMITS_H) + check_include_file(stdarg.h HAVE_STDARG_H) ++check_include_file(stddef.h HAVE_STDDEF_H) + check_include_file(stdint.h HAVE_STDINT_H) + check_include_file(stdio.h HAVE_STDIO_H) + check_include_file(stdlib.h HAVE_STDLIB_H) +--- a/cmake/include/cmakeconfig.h.in ++++ b/cmake/include/cmakeconfig.h.in +@@ -15,6 +15,7 @@ + #cmakedefine HAVE_LIMITS_H 1 + #cmakedefine HAVE_SYS_LIMITS_H 1 + #cmakedefine HAVE_STDARG_H 1 ++#cmakedefine HAVE_STDDEF_H 1 + #cmakedefine HAVE_STDINT_H 1 + #cmakedefine HAVE_STDIO_H 1 + #cmakedefine HAVE_STDLIB_H 1 +@@ -241,6 +242,10 @@ + # define FD_SETSIZE 1024 + # endif + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + /* the version of the windows API enabled */ + # ifndef WINVER + # define WINVER 0x0600 // 0x0502 +@@ -307,12 +312,11 @@ + #include + #endif + +-#ifdef __cplusplus +-extern "C" { ++#ifdef HAVE_STDLIB_H ++#include + #endif + +-#if STDC_HEADERS +-#include ++#ifdef HAVE_STDDEF_H + #include + #endif + + diff --git a/net-dns/getdns/getdns-1.7.2-r1.ebuild b/net-dns/getdns/getdns-1.7.2-r1.ebuild new file mode 100644 index 000000000000..624b78286187 --- /dev/null +++ b/net-dns/getdns/getdns-1.7.2-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +_SRCURI_P="${P/%_beta1/-beta.1}" + +inherit cmake fcaps systemd tmpfiles + +DESCRIPTION="Modern asynchronous DNS API" +HOMEPAGE="https://getdnsapi.net/" +SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound" + +S="${WORKDIR}/${_SRCURI_P}" + +# https://bugs.gentoo.org/661760 +# https://github.com/getdnsapi/getdns/issues/407 +# (As of 1.7.0, seems to need network) +RESTRICT="test" +#RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/libbsd + dev-libs/libyaml + dev-libs/openssl:= + idn? ( net-dns/libidn2:= ) + gnutls? ( + net-libs/gnutls:0=[dane,openssl] + dev-libs/nettle:0= + ) + libev? ( dev-libs/libev:= ) + libevent? ( dev-libs/libevent:= ) + libuv? ( dev-libs/libuv:= ) + test? ( dev-libs/check ) + >=net-dns/unbound-1.5.9:= +" +RDEPEND=" + ${DEPEND} + stubby? ( + acct-group/stubby + acct-user/stubby + sys-libs/libcap + ) +" +BDEPEND=" + doc? ( app-doc/doxygen ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" + "${FILESDIR}/${P}-clang16.patch" +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_RUNSTATEDIR=/var/run/stubby + -DBUILD_DOXYGEN=$(usex doc) + -DBUILD_GETDNS_QUERY=$(usex getdns-query) + -DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon) + -DBUILD_STUBBY=$(usex stubby) + -DENABLE_STATIC=$(usex static-libs) + -DBUILD_TESTING:BOOL=$(usex test) + -DENABLE_UNBOUND_EVENT_API=$(usex unbound) + -DUSE_GNUTLS=$(usex gnutls) + -DUSE_LIBEV=$(usex libev) + -DUSE_LIBEVENT2=$(usex libevent) + -DUSE_LIBIDN2=$(usex idn) + -DUSE_LIBUV=$(usex libuv) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + if use stubby; then + newinitd "${FILESDIR}"/stubby.initd-r2 stubby + newconfd "${FILESDIR}"/stubby.confd-r1 stubby + insinto /etc/logrotate.d + newins "${FILESDIR}"/stubby.logrotate stubby + systemd_dounit "${S}"/stubby/systemd/stubby.service + dotmpfiles "${S}"/stubby/systemd/stubby.conf + fi +} + +pkg_postinst() { + if use stubby; then + fcaps cap_net_bind_service=ei usr/bin/stubby + tmpfiles_process stubby.conf + fi +} diff --git a/net-dns/getdns/getdns-1.7.2.ebuild b/net-dns/getdns/getdns-1.7.2.ebuild deleted file mode 100644 index 76268cdfdcd1..000000000000 --- a/net-dns/getdns/getdns-1.7.2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -_SRCURI_P="${P/%_beta1/-beta.1}" - -inherit cmake fcaps systemd tmpfiles - -DESCRIPTION="Modern asynchronous DNS API" -HOMEPAGE="https://getdnsapi.net/" -SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound" - -S="${WORKDIR}/${_SRCURI_P}" - -# https://bugs.gentoo.org/661760 -# https://github.com/getdnsapi/getdns/issues/407 -# (As of 1.7.0, seems to need network) -RESTRICT="test" -#RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/libbsd - dev-libs/libyaml - dev-libs/openssl:= - idn? ( net-dns/libidn2:= ) - gnutls? ( - net-libs/gnutls:0=[dane,openssl] - dev-libs/nettle:0= - ) - libev? ( dev-libs/libev:= ) - libevent? ( dev-libs/libevent:= ) - libuv? ( dev-libs/libuv:= ) - test? ( dev-libs/check ) - >=net-dns/unbound-1.5.9:= -" -RDEPEND=" - ${DEPEND} - stubby? ( - acct-group/stubby - acct-user/stubby - sys-libs/libcap - ) -" -BDEPEND=" - doc? ( app-doc/doxygen ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_RUNSTATEDIR=/var/run/stubby - -DBUILD_DOXYGEN=$(usex doc) - -DBUILD_GETDNS_QUERY=$(usex getdns-query) - -DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon) - -DBUILD_STUBBY=$(usex stubby) - -DENABLE_STATIC=$(usex static-libs) - -DBUILD_TESTING:BOOL=$(usex test) - -DENABLE_UNBOUND_EVENT_API=$(usex unbound) - -DUSE_GNUTLS=$(usex gnutls) - -DUSE_LIBEV=$(usex libev) - -DUSE_LIBEVENT2=$(usex libevent) - -DUSE_LIBIDN2=$(usex idn) - -DUSE_LIBUV=$(usex libuv) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - if use stubby; then - newinitd "${FILESDIR}"/stubby.initd-r2 stubby - newconfd "${FILESDIR}"/stubby.confd-r1 stubby - insinto /etc/logrotate.d - newins "${FILESDIR}"/stubby.logrotate stubby - systemd_dounit "${S}"/stubby/systemd/stubby.service - dotmpfiles "${S}"/stubby/systemd/stubby.conf - fi -} - -pkg_postinst() { - if use stubby; then - fcaps cap_net_bind_service=ei usr/bin/stubby - tmpfiles_process stubby.conf - fi -} diff --git a/net-dns/smartdns/Manifest b/net-dns/smartdns/Manifest index 104018dcb029..f75b51b78d8c 100644 --- a/net-dns/smartdns/Manifest +++ b/net-dns/smartdns/Manifest @@ -1,7 +1,7 @@ AUX smartdns.confd 148 BLAKE2B 4ea7db4def275650a2321b42ad22ab95f316fb6371cb814792ba5b47091e472a69d9a13c6a77202dc005116c3e723dbf07d4515a43d69239e71e2ea0cffd85fb SHA512 57a69fe8cb1b1f96a9c1e9c06d1908e4764c0bf4010fcfdd8515dfbbc358ff38b85d28416c7b11a8715623528ff22b3982d287dbf266f6c7ae104e745c5cb068 AUX smartdns.initd 480 BLAKE2B f27c77b95ea13d65eb45d75de831fc2622d7e37cbf517b466e56d38506ad10e283c9a75d74446d3d1329600f3b3b1178ca6169fd7c611e3f8d9aa8bc5b2e8a79 SHA512 66d8b43b01419029162817685c569731eb45dc44128224644e628191bb57cc830d3fdbb9df80d61a52333bba5a763dbefdef7b3be5c164e0bc66cd425ba89e94 DIST smartdns-38.1.tar.gz 522130 BLAKE2B d6e28ece8545d6dc948670ff2bf3e4e842ccec7cf82f2f7ff2a197d5dfd6c244dfdef98c9ee38ffc4016b36f1b54ddc2fc8239e5838269055ed58473712e7462 SHA512 345010a9d4e43403e2ad068a8c6a0b871de8d4c524856c062909db61ac36b20988ae17b15be2f330589f93a7b7d521e885384c93987b81715e42a49798dec598 -DIST smartdns-38.tar.gz 520679 BLAKE2B bab92c56377ebef8f8ccab664a8b289844aebdeef55f8f183db62353ca4f2debf157bdf4098dd2bc3b2fa4ad97364b48bb2e410c9ba7dc2f08a040c5e13cb8ac SHA512 d3421a6b22a22a11316289cfb5102c224b81decf89fd802a6281d7686f72e7ee3fffb5de569d4e09a01b8e9d8f6a5114afc709b90965847fa24fd4579316a80b +DIST smartdns-40.tar.gz 542046 BLAKE2B 33612f46168c4a562880a6ee4099a11f5259bbca1fa4055d3479577e6115934282ccc4d05a90af709da46171934a1ac999b8e3f3d92a1de8a1ce0b9b5b564742 SHA512 d792879b48d05edd016df5ee46eb105dcb21520b08a7d26e28ec1ad890c6a82e21468c717c3bc2fc13b38af12e8883e0007d93488a1549355941f190b175248b EBUILD smartdns-38.1.ebuild 787 BLAKE2B 2165733c98e378a6e4480ee66c3c0d86d95b264b4eea9ccae96efdbc2f51bdd403c169d88c24a7bc867d8d9bcabdb1fa73d09d3bc10d73f12ed5bffc9a7d4157 SHA512 4568a9688c5e8a6e3ab21b2c0326df10c7706d6b9f00b63d924a1844c28a6fc9f23b2d3d5ced13ab09b75a5e7bc524c83c072494f71e784497b9721c7e84fbc5 -EBUILD smartdns-38.ebuild 787 BLAKE2B 2165733c98e378a6e4480ee66c3c0d86d95b264b4eea9ccae96efdbc2f51bdd403c169d88c24a7bc867d8d9bcabdb1fa73d09d3bc10d73f12ed5bffc9a7d4157 SHA512 4568a9688c5e8a6e3ab21b2c0326df10c7706d6b9f00b63d924a1844c28a6fc9f23b2d3d5ced13ab09b75a5e7bc524c83c072494f71e784497b9721c7e84fbc5 +EBUILD smartdns-40.ebuild 792 BLAKE2B 7636bfcd04430c6faf4b7849cde5ffcb32c0dc0d77bdba2994a0932a28ce18ecf51d72d8753d049bdae0b5b420f0e387e4191418a2160356807e111106c904e4 SHA512 48c8c5457aa1d2fbc4bc787709a40036ccbb53549156c1a149cc6d8c21e90bad8f86ffe1117043206f81798aa060a9734a37ec85b271382aec040e41d76bbdd7 MISC metadata.xml 241 BLAKE2B ac22a6a72982cebf268e9d367947dc556420370c70b1f6e26531950f7f2c89734cd293fad93dfea0345fd020a97b8f9304c1362a2ccd6225b22aac1f7b674b17 SHA512 b59cc421f52bc545bc8667dcbf6b4891e29180ef1984596ccc20886071e5f080bed259026c2831c6418131802b93ad945137fe4406d042feb02d9bfdc14c431c diff --git a/net-dns/smartdns/smartdns-38.ebuild b/net-dns/smartdns/smartdns-38.ebuild deleted file mode 100644 index b3addca60631..000000000000 --- a/net-dns/smartdns/smartdns-38.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd -DESCRIPTION="A local DNS server returns the fastest access results" -HOMEPAGE="https://github.com/pymumu/smartdns" -SRC_URI="https://github.com/pymumu/smartdns/archive/refs/tags/Release${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="dev-libs/openssl:0=" -RDEPEND="${DEPEND}" -BDEPEND="" - -S="${WORKDIR}/${PN}-Release${PV}" - -src_prepare() { - default - sed -i -e "/install .*default /d" \ - -e "/install .*init.d /d" Makefile || die -} - -src_install() { - emake DESTDIR="${D}" \ - SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" install - - newconfd "${FILESDIR}"/smartdns.confd smartdns - newinitd "${FILESDIR}"/smartdns.initd smartdns -} diff --git a/net-dns/smartdns/smartdns-40.ebuild b/net-dns/smartdns/smartdns-40.ebuild new file mode 100644 index 000000000000..96243a40fbf5 --- /dev/null +++ b/net-dns/smartdns/smartdns-40.ebuild @@ -0,0 +1,33 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd +DESCRIPTION="A local DNS server returns the fastest access results" +HOMEPAGE="https://github.com/pymumu/smartdns" +SRC_URI="https://github.com/pymumu/smartdns/archive/refs/tags/Release${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="dev-libs/openssl:0=" +RDEPEND="${DEPEND}" +BDEPEND="" + +S="${WORKDIR}/${PN}-Release${PV}" + +src_prepare() { + default + sed -i -e "/install .*default /d" \ + -e "/install .*init.d /d" Makefile || die +} + +src_install() { + emake DESTDIR="${D}" \ + SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" install + + newconfd "${FILESDIR}"/smartdns.confd smartdns + newinitd "${FILESDIR}"/smartdns.initd smartdns +} -- cgit v1.2.3