upgpkg: 0.9.72

2 files changed, 33 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c8e8a9734cb..35e6b3c11410 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = fdns
 	pkgdesc = Firejail DNS-over-HTTPS proxy server
-	pkgver = 0.9.68
-	pkgrel = 2
+	pkgver = 0.9.72
+	pkgrel = 1
 	url = https://github.com/netblue30/fdns
 	arch = x86_64
 	license = GPL2
@@ -11,16 +11,21 @@ pkgbase = fdns
 	optdepends = bash-completion: bash completion
 	optdepends = firejail: seamless integration support
 	optdepends = systemd: run fdns as a systemd service
-	backup = etc/fdns/adblocker
-	backup = etc/fdns/coinblocker
-	backup = etc/fdns/fp-trackers
+	backup = etc/fdns/list.adblocker
+	backup = etc/fdns/list.coinblocker
+	backup = etc/fdns/list.fp-trackers
+	backup = etc/fdns/hosts
+	backup = etc/fdns/list.phishing
 	backup = etc/fdns/resolver.seccomp
 	backup = etc/fdns/servers
-	backup = etc/fdns/trackers
-	source = https://github.com/netblue30/fdns/releases/download/v0.9.68/fdns-0.9.68.tar.xz
-	source = https://github.com/netblue30/fdns/releases/download/v0.9.68/fdns-0.9.68.tar.xz.asc
+	backup = etc/fdns/list.tld-blacklist
+	backup = etc/fdns/list.trackers
+	source = https://github.com/netblue30/fdns/releases/download/v0.9.72/fdns-0.9.72.tar.xz
+	source = https://github.com/netblue30/fdns/releases/download/v0.9.72/fdns-0.9.72.tar.xz.asc
+	source = .hardened.service::https://github.com/netblue30/fdns/raw/39711eac58e60ae2d02052223aabbf22b5379906/etc/fdns.service
 	validpgpkeys = F951164995F5C4006A73411E2CCB36ADFC5849A7
-	sha256sums = e4947548fee32c80ba02f8911b78b60be98ce633239dcd72e71856c7a924cf2d
+	sha256sums = ba0ca0fc0014fccafbf14a727051daa1b7ea0922638356cd752c1f184a24b889
 	sha256sums = SKIP
+	sha256sums = e7f1f0d58b3333c5fa10740886967a6acc674c28d2bcfe77356254c1dd6ffc62
 
 pkgname = fdns
diff --git a/PKGBUILD b/PKGBUILD
index aecd23f427ac..0c8dec40d756 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,22 @@
 # Maintainer: Helle Vaanzinn <glitsj16 at riseup dot net >
 
 pkgname=fdns
-pkgver=0.9.68
-pkgrel=2
+pkgver=0.9.72
+pkgrel=1
 pkgdesc="Firejail DNS-over-HTTPS proxy server"
 arch=(x86_64)
 url="https://github.com/netblue30/fdns"
 license=(GPL2)
 backup=(
-    etc/fdns/adblocker
-    etc/fdns/coinblocker
-    etc/fdns/fp-trackers
+    etc/fdns/list.adblocker
+    etc/fdns/list.coinblocker
+    etc/fdns/list.fp-trackers
+    etc/fdns/hosts
+    etc/fdns/list.phishing
     etc/fdns/resolver.seccomp
     etc/fdns/servers
-    etc/fdns/trackers
+    etc/fdns/list.tld-blacklist
+    etc/fdns/list.trackers
 )
 depends=(
     libseccomp
@@ -24,9 +27,12 @@ optdepends=('apparmor: support for apparmor profiles'
     'firejail: seamless integration support'
     'systemd: run fdns as a systemd service')
 validpgpkeys=('F951164995F5C4006A73411E2CCB36ADFC5849A7')
-source=("https://github.com/netblue30/fdns/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc})
-sha256sums=('e4947548fee32c80ba02f8911b78b60be98ce633239dcd72e71856c7a924cf2d'
-            'SKIP')
+_sd_fdns="${url}/raw/39711eac58e60ae2d02052223aabbf22b5379906/etc/${pkgname}.service"
+source=("${url}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}
+    "${_pkgname}.hardened.service::${_sd_fdns}")
+sha256sums=('ba0ca0fc0014fccafbf14a727051daa1b7ea0922638356cd752c1f184a24b889'
+            'SKIP'
+            'e7f1f0d58b3333c5fa10740886967a6acc674c28d2bcfe77356254c1dd6ffc62')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
@@ -38,6 +44,10 @@ package() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="$pkgdir" install
 
+    # use hardened systemd service
+    rm -f "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
+    install -Dm644 "${srcdir}/${_pkgname}.hardened.service" \
+        "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
     # license
     install -Dm644 "${pkgdir}/usr/share/doc/${pkgname}/COPYING" \
         "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"