From 424d2b443abdc5045b1fc736cb55911147965133 Mon Sep 17 00:00:00 2001 From: Rahil Bhimjiani Date: Thu, 21 Mar 2024 21:26:21 +0530 Subject: net-dns/AdGuardHome: remove 0.107.{43,44} Signed-off-by: Rahil Bhimjiani --- net-dns/AdGuardHome/AdGuardHome-0.107.43.ebuild | 106 ------------------ net-dns/AdGuardHome/AdGuardHome-0.107.44.ebuild | 121 --------------------- net-dns/AdGuardHome/Manifest | 6 - .../AdGuardHome/files/fix-go.mod-0.107.44.patch | 10 -- 4 files changed, 243 deletions(-) delete mode 100644 net-dns/AdGuardHome/AdGuardHome-0.107.43.ebuild delete mode 100644 net-dns/AdGuardHome/AdGuardHome-0.107.44.ebuild delete mode 100644 net-dns/AdGuardHome/files/fix-go.mod-0.107.44.patch (limited to 'net-dns') diff --git a/net-dns/AdGuardHome/AdGuardHome-0.107.43.ebuild b/net-dns/AdGuardHome/AdGuardHome-0.107.43.ebuild deleted file mode 100644 index e1af0c5cb..000000000 --- a/net-dns/AdGuardHome/AdGuardHome-0.107.43.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit fcaps go-module systemd - -DESCRIPTION="Network-wide ads & trackers blocking DNS server like Pi-Hole with web ui" -HOMEPAGE="https://github.com/AdguardTeam/AdGuardHome/" - -SRC_URI=" - https://github.com/AdguardTeam/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/AdguardTeam/${PN}/releases/download/v${PV}/AdGuardHome_frontend.tar.gz -> ${P}-frontend.tar.gz - https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz -" - -# main -LICENSE="GPL-3" -# deps -LICENSE+=" Apache-2.0 BSD BSD-2 MIT ZLIB" - -SLOT="0" -KEYWORDS="~amd64 ~arm64" - -FILECAPS=( - -m 755 'cap_net_bind_service=+eip cap_net_raw=+eip' usr/bin/${PN} -) - -src_prepare() { - default - # move frontend to project directory - rm build/gitkeep && mv ../build ./ || die -} - -src_compile() { - # mimicking https://github.com/AdguardTeam/AdGuardHome/blob/master/scripts/make/go-build.sh - - local MY_LDFLAGS="-s -w" - MY_LDFLAGS+=" -X github.com/AdguardTeam/AdGuardHome/internal/version.version=${PV}" - MY_LDFLAGS+=" -X github.com/AdguardTeam/AdGuardHome/internal/version.channel=release" - MY_LDFLAGS+=" -X github.com/AdguardTeam/AdGuardHome/internal/version.committime=$(date +%s)" - if [ "$(go env GOARM)" != '' ] - then - MY_LDFLAGS+=" -X github.com/AdguardTeam/AdGuardHome/internal/version.goarm=$(go env GOARM)" - elif [ "$(go env GOMIPS)" != '' ] - then - MY_LDFLAGS+=" -X github.com/AdguardTeam/AdGuardHome/internal/version.gomips=$(go env GOMIPS)" - fi - - ego build -ldflags "${MY_LDFLAGS}" -trimpath -} - -src_test() { - - # mimicking https://github.com/AdguardTeam/AdGuardHome/blob/master/scripts/make/go-test.sh - count_flags='--count=1' - cover_flags='--coverprofile=./coverage.txt' - shuffle_flags='--shuffle=on' - timeout_flags="--timeout=30s" - fuzztime_flags="--fuzztime=20s" - readonly count_flags cover_flags shuffle_flags timeout_flags fuzztime_flags - - # race only works when pie is disabled - export GOFLAGS="${GOFLAGS/-buildmode=pie/}" - - # following test is failing without giving any reason. Tried disabling internal/updater internal/whois tests toggling race, but still failing. - # ego test\ - # "$count_flags"\ - # "$cover_flags"\ - # "$shuffle_flags"\ - # --race=1\ - # "$timeout_flags"\ - # ./... - - # mimicking https://github.com/AdguardTeam/AdGuardHome/blob/master/scripts/make/go-bench.sh - ego test\ - "$count_flags"\ - "$shuffle_flags"\ - --race=0\ - "$timeout_flags"\ - --bench='.'\ - --benchmem\ - --benchtime=1s\ - --run='^$'\ - ./... - - # mimicking https://github.com/AdguardTeam/AdGuardHome/blob/master/scripts/make/go-fuzz.sh - ego test\ - "$count_flags"\ - "$shuffle_flags"\ - --race=0\ - "$timeout_flags"\ - "$fuzztime_flags"\ - --fuzz='.'\ - --run='^$'\ - ./internal/filtering/rulelist/\ - ; - -} - -src_install() { - dobin "${PN}" - einstalldocs - - systemd_newunit "${FILESDIR}"/AdGuardHome-0.107.43.service "${PN}".service -} diff --git a/net-dns/AdGuardHome/AdGuardHome-0.107.44.ebuild b/net-dns/AdGuardHome/AdGuardHome-0.107.44.ebuild deleted file mode 100644 index 9d30c74d4..000000000 --- a/net-dns/AdGuardHome/AdGuardHome-0.107.44.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 systemd - -DESCRIPTION="Network-wide ads & trackers blocking DNS server like Pi-Hole with web ui" -HOMEPAGE="https://github.com/AdguardTeam/AdGuardHome/" - -SRC_URI=" - https://github.com/AdguardTeam/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz - web? ( https://github.com/AdguardTeam/${PN}/releases/download/v${PV}/AdGuardHome_frontend.tar.gz -> ${P}-frontend.tar.gz ) -" - -# main -LICENSE="GPL-3" -# deps -LICENSE+=" Apache-2.0 BSD BSD-2 MIT ZLIB" - -SLOT="0" -KEYWORDS="~amd64 ~arm64" - -IUSE="+web" -# RESTRICT="test" - -# see the patch below -BDEPEND=">=dev-lang/go-1.21:=" -BDEPEND+=" app-arch/unzip" - -FILECAPS=( - -m 755 'cap_net_bind_service=+eip cap_net_raw=+eip' usr/bin/${PN} -) - -# otherwise it'll error out saying "update go.mod file" -# Since dev-lang/go-1.21 is stable i think it's safe to update -PATCHES=( - "${FILESDIR}"/fix-go.mod-0.107.44.patch -) - -src_prepare() { - default - # move frontend to project directory - use web && { rm -v build/gitkeep && mv -v ../build ./ || die ; } -} - -src_compile() { - # mimicking https://github.com/AdguardTeam/AdGuardHome/blob/master/scripts/make/go-build.sh - - local MY_LDFLAGS="-s -w" - MY_LDFLAGS+=" -X github.com/AdguardTeam/AdGuardHome/internal/version.version=${PV}" - MY_LDFLAGS+=" -X github.com/AdguardTeam/AdGuardHome/internal/version.channel=release" - MY_LDFLAGS+=" -X github.com/AdguardTeam/AdGuardHome/internal/version.committime=$(date +%s)" - if [ "$(go env GOARM)" != '' ] - then - MY_LDFLAGS+=" -X github.com/AdguardTeam/AdGuardHome/internal/version.goarm=$(go env GOARM)" - elif [ "$(go env GOMIPS)" != '' ] - then - MY_LDFLAGS+=" -X github.com/AdguardTeam/AdGuardHome/internal/version.gomips=$(go env GOMIPS)" - fi - - ego build -ldflags "${MY_LDFLAGS}" -trimpath -v=1 -x=1 -} - -src_test() { - - # mimicking https://github.com/AdguardTeam/AdGuardHome/blob/master/scripts/make/go-test.sh - count_flags='--count=1' - cover_flags='--coverprofile=./coverage.txt' - shuffle_flags='--shuffle=on' - timeout_flags="--timeout=30s" - fuzztime_flags="--fuzztime=20s" - readonly count_flags cover_flags shuffle_flags timeout_flags fuzztime_flags - - # race only works when pie is disabled - export GOFLAGS="${GOFLAGS/-buildmode=pie/}" - - # following test is failing without giving any reason. Tried disabling internal/updater internal/whois tests toggling race, but still failing. - # ego test\ - # "$count_flags"\ - # "$cover_flags"\ - # "$shuffle_flags"\ - # --race=1\ - # "$timeout_flags"\ - # ./... - - # mimicking https://github.com/AdguardTeam/AdGuardHome/blob/master/scripts/make/go-bench.sh - ego test\ - "$count_flags"\ - "$shuffle_flags"\ - --race=0\ - "$timeout_flags"\ - --bench='.'\ - --benchmem\ - --benchtime=1s\ - --run='^$'\ - ./... - - # mimicking https://github.com/AdguardTeam/AdGuardHome/blob/master/scripts/make/go-fuzz.sh - ego test\ - "$count_flags"\ - "$shuffle_flags"\ - --race=0\ - "$timeout_flags"\ - "$fuzztime_flags"\ - --fuzz='.'\ - --run='^$'\ - ./internal/filtering/rulelist/\ - ; - -} - -src_install() { - dobin "${PN}" - dosym -r /usr/bin/"${PN}" /usr/bin/adguardhome - - einstalldocs - - systemd_newunit "${FILESDIR}"/AdGuardHome-0.107.43.service "${PN}".service -} diff --git a/net-dns/AdGuardHome/Manifest b/net-dns/AdGuardHome/Manifest index cdc5dccb4..9753fd25c 100644 --- a/net-dns/AdGuardHome/Manifest +++ b/net-dns/AdGuardHome/Manifest @@ -1,9 +1,3 @@ -DIST AdGuardHome-0.107.43-deps.tar.xz 104529544 BLAKE2B 4fde3b1e2f85cf85209eb2149c40a5478e4d55cbae90847fafdb5f056b7af2a8234a5880fac6bbed1b62e64d7e849162abbc9e5fef3b262ecea8760fcb21c21c SHA512 44458c3d1d46c7ccf50308227ff765927e1b6d4876065af13004bd0ec2c82c7727e76a81bfc52cf920ea2dee361e5c761db73ed610d04b23568c6e7611301348 -DIST AdGuardHome-0.107.43-frontend.tar.gz 2781809 BLAKE2B 72d42f40a5f671f5dab72a7fcbd77fdfbd58126b67c73fd6e1dbec5f956c017ff64c01cb8c89ec5c72ef2058640e7cea5b93fe1b3c2c7b76edc6de32ab7f4801 SHA512 1c1fd527638c3e35fa21b5738868dae04b41a0bbb04942c94cc36d1dc7f6961bd202c7862fdfffe3ed52039c75b3f358e399c17ccd121e78432ec58fa837f4a0 -DIST AdGuardHome-0.107.43.tar.gz 2227903 BLAKE2B a4811969b2e156a33d6267edeca4be3535e095e8133c6c8d761e132e5f95d21403df37f8ac5567d85994b89ff8912f1799f21f648d6a26a6bf7971d02bd11ffd SHA512 cc9f7602ada6e40ff7c8449bfc1c40fb184c848019ff95b1db46a974f4a72606c587015d440e25094c51cc0b6d01eb68686765d0a92f01752615db63e4527803 -DIST AdGuardHome-0.107.44-deps.tar.xz 115115688 BLAKE2B 198d1f86f24d5d7857eb0bb992ba7be34ee58fa9edd110c2434a59d4dd7cb936acb56175733a86ca847bcf48e99e8960d1a2b38bef072a0151d6b8875b9e13e4 SHA512 a8e77ce8b112f1c1dd6d993fcc8a52c802bf51ce9edc2383137360745f40b95a29c0e913920b17fc9f203286d18bd3ec5813eca0640bff0eb1655e9165c30763 -DIST AdGuardHome-0.107.44-frontend.tar.gz 2784087 BLAKE2B 9c9d1a165bb885d120780f8f35cc38c11d9a0865ee706a33932feba98c13f0b181dbc7fcab10fa16d6654846fe2acf16ccc3aff7aec8b78f44e0092e623f1380 SHA512 0beae751490fb5095e2459b222781d177c4c206d86dc7fcc8a048b03ffcab1896d82cf2b741b9cb94dc817e2c53393ee001a4a182a795f9546d57a8988cebc4d -DIST AdGuardHome-0.107.44.tar.gz 2243237 BLAKE2B f7a7299304f915de2c5e1a673170d480578d68b2b05a15edf7302e3499b55f74dd786b145c5d97a9834c79bf1f7c8e89b5db7ced57b8cea3871cb1415efef51e SHA512 3db00251b9e6567ebe8404c12be2fddaf9d6a924b3d12980a1ab4f7c314089cea68bf1ddbce98702c9f94e1997a717afcb723a9214b3d9a34edcff390b73cb88 DIST AdGuardHome-0.107.45-deps.tar.xz 109986456 BLAKE2B a2b78f368d3fb406cae26c3869fd5c30588373a4c58687e5821c75afe943ada8e7f79f18625cd324e0979b8d11a2964fcfc10fe1ce99750a3abbc0952f5d8880 SHA512 31d6fa1758aaac5039b5310dedd851ca3125eddc183dee33ef8c34af9ba9637fca197d278910854746c24d7dc9fa1628ccca12e38b39b8456879e38e6eefc9e6 DIST AdGuardHome-0.107.45-frontend.tar.gz 2793159 BLAKE2B 361a10477317787e2ed414f92bc3d01724182fe7054be2ce0febc68968a3227b875baa1e3b01aee1374652b22d395128041a23af923cffd437c7a9ead31b622b SHA512 68f1163459673e0213675d195196aaabb564b50640d005ef0664653a2580da6f3fbf84e1c6034119e7f55260b03d61d4513c65e8fd1a00ea5c8a856b2946b822 DIST AdGuardHome-0.107.45.tar.gz 2248687 BLAKE2B 257fbd716d769657c9b40a03f91f7dcaaee5c59788b43c86d1b90120f301cfbbfdf68f547143b6505d5bed70f03e992ca6ca3d86d0b1e9b760d0a21d9a19db89 SHA512 cfbb6eaacde706c9ce1bb632484a8d18a915be9642435fbeff087e9cc8cb8f6c787a244068a2f4cc051750a367558aa7487af7c4c58b88d28b64df7e80b55e09 diff --git a/net-dns/AdGuardHome/files/fix-go.mod-0.107.44.patch b/net-dns/AdGuardHome/files/fix-go.mod-0.107.44.patch deleted file mode 100644 index 1e2d06602..000000000 --- a/net-dns/AdGuardHome/files/fix-go.mod-0.107.44.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module github.com/AdguardTeam/AdGuardHome - --go 1.20 -+go 1.21 - - require ( - github.com/AdguardTeam/dnsproxy v0.63.1 -- cgit v1.2.3-65-gdbad