diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | PKGBUILD | 38 | ||||
| -rw-r--r-- | rescached.install | 8 |
5 files changed, 52 insertions, 29 deletions
@@ -1,22 +1,24 @@ pkgbase = rescached-git pkgdesc = Resolver/DNS cache daemon - pkgver = 3.0.2.r0.g5c3f180 + pkgver = 4.4.2.r9.gd35cf24 pkgrel = 1 - url = https://github.com/shuLhan/rescached-go + url = https://git.sr.ht/~shulhan/rescached + install = rescached.install arch = i686 arch = x86_64 arch = armv7h - license = custom:BSD + license = GPL-3.0-or-later makedepends = git - makedepends = go>=1.13 + makedepends = go>=1.20 depends = bash provides = rescached + backup = etc/rescached/block.d/.pgl.yoyo.org + backup = etc/rescached/block.d/.someonewhocares.org + backup = etc/rescached/block.d/.winhelp2002.mvps.org backup = etc/rescached/rescached.cfg - backup = etc/rescached/hosts.d/hosts.block - backup = etc/rescached/localhost.cert.pem - backup = etc/rescached/localhost.key.pem - source = rescached-git::git+https://github.com/shuLhan/rescached-go.git + backup = etc/rescached/localhost.pem + backup = etc/rescached/localhost.pem.key + source = rescached-git::git+https://git.sr.ht/~shulhan/rescached sha1sums = SKIP pkgname = rescached-git - diff --git a/.gitignore b/.gitignore index 71f2839d63a5..feb2a8f86310 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ -libvos/ -pkg/ -rescached-git/ -src/ *.tar *.xz *.zst +/libvos/ +/pkg/ +/rescached-local/ +/rescached-git/ +/src/ @@ -1,10 +1,8 @@ .PHONY: all check release all: - makepkg -sd - -check: - namcap PKGBUILD + makepkg -f release: + namcap PKGBUILD makepkg --printsrcinfo > .SRCINFO @@ -1,37 +1,48 @@ # Maintainer: shulhan <ms@kilabit.info> pkgname=rescached-git -pkgver=3.0.2.r0.g5c3f180 +pkgver=4.4.2.r9.gd35cf24 pkgrel=1 pkgdesc="Resolver/DNS cache daemon" arch=('i686' 'x86_64' 'armv7h') -url="https://github.com/shuLhan/rescached-go" -license=('custom:BSD') +url="https://git.sr.ht/~shulhan/rescached" +license=('GPL-3.0-or-later') depends=('bash') provides=('rescached') +makedepends=('git' 'go>=1.20') -makedepends=('git' 'go>=1.13') +_sourcedir=$pkgname source=( - "$pkgname::git+https://github.com/shuLhan/rescached-go.git" + "$pkgname::git+https://git.sr.ht/~shulhan/rescached" ) +## For testing on local. +#_sourcedir=rescached-local +#source=( +# "$_sourcedir::git+file:///home/ms/go/src/git.sr.ht/~shulhan/rescached#branch=dev" +#) + sha1sums=( 'SKIP' ) backup=( + 'etc/rescached/block.d/.pgl.yoyo.org' + 'etc/rescached/block.d/.someonewhocares.org' + 'etc/rescached/block.d/.winhelp2002.mvps.org' 'etc/rescached/rescached.cfg' - 'etc/rescached/hosts.d/hosts.block' - 'etc/rescached/localhost.cert.pem' - 'etc/rescached/localhost.key.pem' + 'etc/rescached/localhost.pem' + 'etc/rescached/localhost.pem.key' ) +install=rescached.install + pkgver() { - cd "$pkgname" + cd "$_sourcedir" git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { - cd "$pkgname" + cd "$_sourcedir" echo ">>" echo ">> cleaning ..." echo ">>" @@ -40,11 +51,14 @@ build() { echo ">> make ..." echo ">>" unset GOROOT + export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" make || return 1 } package() { - cd "$pkgname" + cd "$_sourcedir" make PREFIX="$pkgdir" install - install -Dm644 $srcdir/$pkgname/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -rf ${pkgdir}/usr/share/rescached/ + install -Dm644 $srcdir/$pkgname/COPYING \ + "${pkgdir}/usr/share/licenses/rescached/COPYING" } diff --git a/rescached.install b/rescached.install new file mode 100644 index 000000000000..f5f23821b798 --- /dev/null +++ b/rescached.install @@ -0,0 +1,8 @@ +## arg 1: the new package version +post_upgrade() { + cat <<EOF +!!! The "/etc/rescached/master.d" directory has been renamed to + "/etc/rescached/zone.d". You should copy the files manually before + restarting the rescached.service. +EOF +} |