From a25cc082a26782e5d39ded4559c91ff11bc3c299 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 13 May 2024 00:01:18 +0100 Subject: gentoo auto-resync : 13:05:2024 - 00:01:18 --- net-dns/Manifest.gz | Bin 7862 -> 7862 bytes net-dns/coredns/Manifest | 7 +- net-dns/coredns/coredns-1.11.2.ebuild | 121 ---------------------------------- net-dns/coredns/coredns-1.11.3.ebuild | 108 ++++++++++++++++++++++++++++++ net-dns/coredns/coredns-9999.ebuild | 23 ++----- 5 files changed, 118 insertions(+), 141 deletions(-) delete mode 100644 net-dns/coredns/coredns-1.11.2.ebuild create mode 100644 net-dns/coredns/coredns-1.11.3.ebuild (limited to 'net-dns') diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz index 023c1d4db74a..a2aba8807ad5 100644 Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest index aa02ce8780fb..c4905a0ba3fd 100644 --- a/net-dns/coredns/Manifest +++ b/net-dns/coredns/Manifest @@ -4,10 +4,11 @@ AUX coredns.initd 779 BLAKE2B 355a1b90856f596a10fa4c0ba294cf2d888ff9a5f7b0b71ef4 AUX coredns.logrotated 81 BLAKE2B 7fe70e32133a9470a60834dee5632151ed215e478a9de697dbca3ee553e5a8719bc941251c6a37723625b7c59f10f5050c79edb94ac8d4127561c12813ba6a27 SHA512 c697c08c3b1153ae224a1eeb3521f9ee594de4852bc6ef78d94dc7f6f680517659a653ab5c13ea03918deb79e6654ef11512ba4c90fe06ea4591fefbab876ece AUX coredns.service 516 BLAKE2B a28a1aa078abc4946c67a8d65114fee6a845af2e6338e052ea5fccf217dea7a61b962dc37306dc3250b7b71c498c45c6fadc48412831c9e18ca324201d4b8dda SHA512 53f865f29642ffc77e960cdfa82ca341d33ecb9555991ca0f9abcbe238f050e786519c414ea570f66731e27f770fdd02fece0fb2a64343f0c41c11ed208c47a6 AUX coredns.tmpfiles 42 BLAKE2B 06e6b3be85cc66f5eb126639496dc962cbb3e9b77ca59da1acc4749208212ac24bbc53cd694ce63c579528ca040443a5cb3886ea05baf5b0cceb3f46fe94ff20 SHA512 b6aaf9b399a5c25efbbb4f23d9a0c97af0749adea7a58ae83af8b8220a167778ac8debc0359c75d3ac8b904176ee870523c9101f22e8352b61b2012c9002bab4 -DIST coredns-1.11.2-deps.tar.xz 261482588 BLAKE2B 39e30800ac1fc404dc60f859b929c4a69614b9f0be8937c3fd7b1a872ec1e163ab4f6a313ed7661d2a101318187aaa2419168c0511cf2108c43ada38db0d1e0b SHA512 91282766d10d28d564d14fb20d8d82808507e509c58b7bb1959bb03a2665a287057aa4d547bfc8cc60ff080eea807af1c57d86bf9ff000125ef0642d8557e47f DIST coredns-1.11.2-r1-deps.tar.xz 6547080 BLAKE2B 19a067a5b402ebe3b8a462e534bbdcf9baade4b5f434c6f24fe8ede0cbe623e2d5d8bdf0ffc06954d796441095688f19caa40f2255a2cc56102fdef36d327ac5 SHA512 caf6e0f1c9be4857059244019d6556f907e4f6907a932c201c856355c3e0b86c1752a90a226d5904c511d0db08ce4869cc5d24203bb4b9e2e1be02e725990332 DIST coredns-1.11.2.tar.gz 651994 BLAKE2B 1a7a272756eaf83170e242a573c8a765d6ea7b70fe422d36a87850b600a88287291aa0fe0d49462c34453d4d3c4d33f9497be409379ff8fccc87f41e2195efc1 SHA512 0e90ef4793555bd46aa5ce84cf639c015d1869b407627c69746eb948abff1920f891c45e5f00c0127f23e2c6394c07cc55c1776af840881210f90faa6ec22b40 +DIST coredns-1.11.3-deps.tar.xz 6662680 BLAKE2B 44bc099586cdaffc381141e347c8921596b0b51bf4f82064d2aca562083597672dfe4b0c965f4c6feebbf4711aff07bd7a301b6ecab28233294978ae94df5fbd SHA512 49690bc11816e1bbc0a5f325abe64648ea820fecd25695f19bf9921f0a38786cddf30e4a385306470a27d17af9d09a5ec50025ff241ea9f3b6b346eddc859755 +DIST coredns-1.11.3.tar.gz 653856 BLAKE2B db9efdd1b674f6908ff094866ca5c148e018d7ddae2ae1cc07c13fbf78dcc4e6ed478d2e5946f73d43b8ee6a1924fecd53759e6b9a41935d084fbb1d84b7bb10 SHA512 3ec9296626a2994d1259329e50b032d2972ef8e05bfed742c0ee570414adbfa8f296046b9356ef73d885a1f1c1e3660421762267535ec2d3f357c3064a75d405 EBUILD coredns-1.11.2-r1.ebuild 3160 BLAKE2B c4b5ed9a5277aad2e9d79ca63d40ab2478fab9e5cb1231f474621a281c7f6142af413b1762e0874900dd1969d255dd88a2163efc6d543a424880da1fa37586c6 SHA512 3bac92da0f02cebba5567441a695d66e60cd7df993d6bc9f90bff58b78689c7a36c4e539e1c9074596edb86654e8b732eb78861fbe462ff1afe490d2c784a7eb -EBUILD coredns-1.11.2.ebuild 3159 BLAKE2B 636dba91f7a7309acd487e27bc561fd2c668821c21ad04c607e720f3f4fdb75a97d2c09dc56daba74cecb526ece416cf088388b22783903c80014122eea61770 SHA512 9162c6cd489a5cd54e10dd58428e7595c0f471a2e2e7282c5803af60278166710c1a351f130011f2e2e562ee916c6942c9a81972c6c19f4ec966025d0f7ad36a -EBUILD coredns-9999.ebuild 3072 BLAKE2B c582e3318993aad0e51ae7f310db7425d1b98c7be3830e2450fe5aa3133fc220a3c8efcccabb86a8e8be0fb7dcd59abe99cf368adb2c1c2374cc3af21e282af5 SHA512 b9476241fce9b3198e88fca5800504e958abf47d6b970be505443c398a90d3794e2e9fac1df976f53157da88460b16df8eccf9e80b840c629286eef6015a51c5 +EBUILD coredns-1.11.3.ebuild 2663 BLAKE2B c74ff154bfff0f72c557ab9322fdcc9079ad367ed2a7bbacc2d3bd497f610b4e565ecf555a6541826c3f23e678e59dbe520c50e9ca0959a4766d247f5de4383a SHA512 a007acee479f0ba345efa1e53679e2b5c6ccb690b1e80ec3d987dede65e0769631061afa1bdf82c847d94c4f2bb912a7ad889ac630755fa6674b6727ec60cc09 +EBUILD coredns-9999.ebuild 2712 BLAKE2B f66174da18e2ced3971b77859b8f4e4f1a51c266185ed4a649122ea8af20a2db3c7a8888047488373114dc1cbcff95b1d42a90473b610c1786548cc6777279de SHA512 91ca378310ce84b6b04e0c77d65d20c817fed33df6b9cab44738821a22704c008173b848f646515ba76877151b3c57ef0aed674477e2e05f15777d3d7181b5c1 MISC metadata.xml 1154 BLAKE2B ebdfb6dea854f81e82c8d02fe60a315db893dc395b649bf4f37c2aae90721f1af73ac7a2394ee15964e78154e40580cfc29eb9bdac518514b1314cc55190e657 SHA512 511ecdf71de14a237f0288f817e791dfb81a7abacb53746e32d79c880ba4c5288a86c310fa877b503176c31a737d98329f6c2b6bd1b175ce4ec2a73df6a9fe9d diff --git a/net-dns/coredns/coredns-1.11.2.ebuild b/net-dns/coredns/coredns-1.11.2.ebuild deleted file mode 100644 index 89d7e8f271e2..000000000000 --- a/net-dns/coredns/coredns-1.11.2.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit fcaps go-module multiprocessing systemd tmpfiles toolchain-funcs - -DESCRIPTION="CoreDNS is a DNS server that chains plugins" -HOMEPAGE="https://github.com/coredns/coredns" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/coredns/coredns.git" -else - #SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - # The v1.11.2 tag went missing upstream, so use a previously fetched copy. - SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz" - SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" - KEYWORDS="amd64" -fi - -# main -LICENSE="Apache-2.0" -# deps -LICENSE+=" MIT BSD ISC MPL-2.0 BSD-2" - -SLOT="0" -IUSE="test" -# TODO: debug test failure with deps tarball -RESTRICT="test" - -RDEPEND="acct-user/coredns - acct-group/coredns" - -FILECAPS=( - -m 755 'cap_net_bind_service=+ep' usr/bin/${PN} -) - -src_unpack() { - if [[ ${PV} == *9999* ]]; then - git-r3_src_unpack - go-module_live_vendor - else - go-module_src_unpack - fi -} - -src_prepare() { - default - use test || sed -i -e 's|coredns: $(CHECKS)|coredns:|' Makefile -} - -src_compile() { - # For non-live versions, prevent git operations which causes sandbox violations - # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 - [[ ${PV} != 9999* ]] && export GITCOMMIT='' - - # Mimicking go-module.eclass's GOFLAGS - if use amd64 || use arm || use arm64 || - ( use ppc64 && [[ $(tc-endian) == "little" ]] ) || use s390 || use x86; then - local buildmode="-buildmode=pie" - fi - export BUILDOPTS="-buildvcs=false -modcacherw -v -x -p=$(makeopts_jobs) ${buildmode}" - - default -} - -src_install() { - dobin "${PN}" - einstalldocs - doman man/* - - newinitd "${FILESDIR}"/coredns.initd coredns - newconfd "${FILESDIR}"/coredns.confd coredns - - insinto /etc/coredns/ - newins "${FILESDIR}"/Corefile.example Corefile - - insinto /etc/logrotate.d - newins "${FILESDIR}"/coredns.logrotated coredns - - systemd_dounit "${FILESDIR}"/coredns.service - newtmpfiles "${FILESDIR}"/coredns.tmpfiles "${PN}.conf" -} - -src_test() { - # eclass default '-x' makes tests output unreadable - export GOFLAGS="-v -mod=readonly" - - local known_fail=( - "TestZoneExternalCNAMELookupWithProxy" - "TestMetricsSeveralBlocs" - "TestMetricsAvailable" - "TestMetricsAvailableAfterReload" - "TestMetricsAvailableAfterReloadAndFailedReload" - ) - # concat as '|^Test1$|^Test2$|^Test3...$': - local known_fail_re="$(printf '|^%s$' "${known_fail[@]}")" - # drop '|' in the begining: - known_fail_re="${known_fail_re:1}" - - local working_tests_re="$( - # get list of all test: - { GOFLAGS="-mod=readonly" go test -list . ./... || - die "Can't get list of tests"; } | - # skip "no tests" messages as well as know failures: - grep -v -E " |${known_fail_re}" | - # format a regexp: - sed -z 's/\n/$|^/g' - )" - # drop '|^' in the end: - working_tests_re="^${working_tests_re::-2}" - - go test -race -run "${working_tests_re}" ./... || die "Tests failed" - go test -race -run "${known_fail_re}" ./... || ewarn "Known test failure" -} - -pkg_postinst() { - fcaps_pkg_postinst - tmpfiles_process ${PN}.conf -} diff --git a/net-dns/coredns/coredns-1.11.3.ebuild b/net-dns/coredns/coredns-1.11.3.ebuild new file mode 100644 index 000000000000..7f69279c8135 --- /dev/null +++ b/net-dns/coredns/coredns-1.11.3.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps go-module multiprocessing systemd tmpfiles toolchain-funcs + +DESCRIPTION="CoreDNS is a DNS server that chains plugins" +HOMEPAGE="https://github.com/coredns/coredns" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/coredns/coredns.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" + KEYWORDS="~amd64" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" MIT BSD ISC MPL-2.0 BSD-2" + +SLOT="0" +# TODO: debug test failure with deps tarball +RESTRICT="test" + +RDEPEND="acct-user/coredns + acct-group/coredns" + +FILECAPS=( + -m 755 'cap_net_bind_service=+ep' usr/bin/${PN} +) + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + go-module_live_vendor + else + default + fi +} + +src_prepare() { + [[ ${PV} != 9999* ]] && { ln -sv ../vendor ./ || die ; } + default +} + +src_compile() { + [[ ${PV} == 9999* ]] && local GIT_COMMIT="$(git describe --dirty --always)" + ego build -ldflags="-s -w -X github.com/coredns/coredns/coremain.GitCommit=${GIT_COMMIT}" +} + +src_install() { + dobin "${PN}" + einstalldocs + doman man/* + + newinitd "${FILESDIR}"/coredns.initd coredns + newconfd "${FILESDIR}"/coredns.confd coredns + + insinto /etc/coredns/ + newins "${FILESDIR}"/Corefile.example Corefile + + insinto /etc/logrotate.d + newins "${FILESDIR}"/coredns.logrotated coredns + + systemd_dounit "${FILESDIR}"/coredns.service + newtmpfiles "${FILESDIR}"/coredns.tmpfiles "${PN}.conf" +} + +src_test() { + # eclass default '-x' makes tests output unreadable + export GOFLAGS="-v -mod=readonly" + + local known_fail=( + "TestZoneExternalCNAMELookupWithProxy" + "TestMetricsSeveralBlocs" + "TestMetricsAvailable" + "TestMetricsAvailableAfterReload" + "TestMetricsAvailableAfterReloadAndFailedReload" + ) + # concat as '|^Test1$|^Test2$|^Test3...$': + local known_fail_re="$(printf '|^%s$' "${known_fail[@]}")" + # drop '|' in the begining: + known_fail_re="${known_fail_re:1}" + + local working_tests_re="$( + # get list of all test: + { GOFLAGS="-mod=readonly" go test -list . ./... || + die "Can't get list of tests"; } | + # skip "no tests" messages as well as know failures: + grep -v -E " |${known_fail_re}" | + # format a regexp: + sed -z 's/\n/$|^/g' + )" + # drop '|^' in the end: + working_tests_re="^${working_tests_re::-2}" + + go test -race -run "${working_tests_re}" ./... || die "Tests failed" + go test -race -run "${known_fail_re}" ./... || ewarn "Known test failure" +} + +pkg_postinst() { + fcaps_pkg_postinst + tmpfiles_process ${PN}.conf +} diff --git a/net-dns/coredns/coredns-9999.ebuild b/net-dns/coredns/coredns-9999.ebuild index 52c5778f1173..117795b9f150 100644 --- a/net-dns/coredns/coredns-9999.ebuild +++ b/net-dns/coredns/coredns-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,6 @@ LICENSE="Apache-2.0" LICENSE+=" MIT BSD ISC MPL-2.0 BSD-2" SLOT="0" -IUSE="test" # TODO: debug test failure with deps tarball RESTRICT="test" @@ -35,32 +34,22 @@ FILECAPS=( ) src_unpack() { - if [[ ${PV} == *9999* ]]; then + if [[ ${PV} == 9999* ]]; then git-r3_src_unpack go-module_live_vendor else - go-module_src_unpack + default fi } src_prepare() { + [[ ${PV} != 9999* ]] && { ln -sv ../vendor ./ || die ; } default - use test || sed -i -e 's|coredns: $(CHECKS)|coredns:|' Makefile } src_compile() { - # For non-live versions, prevent git operations which causes sandbox violations - # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 - [[ ${PV} != 9999* ]] && export GITCOMMIT='' - - # Mimicking go-module.eclass's GOFLAGS - if use amd64 || use arm || use arm64 || - ( use ppc64 && [[ $(tc-endian) == "little" ]] ) || use s390 || use x86; then - local buildmode="-buildmode=pie" - fi - export BUILDOPTS="-buildvcs=false -modcacherw -v -x -p=$(makeopts_jobs) ${buildmode}" - - default + [[ ${PV} == 9999* ]] && local GIT_COMMIT="$(git describe --dirty --always)" + ego build -ldflags="-s -w -X github.com/coredns/coredns/coremain.GitCommit=${GIT_COMMIT}" } src_install() { -- cgit v1.2.3