summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD20
2 files changed, 21 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5299f0fb7fe4..32373d275da9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = fdns-git
pkgdesc = Firejail DNS-over-HTTPS proxy server - git version
- pkgver = 0.9.69+g3e5c7cd
- pkgrel = 1
+ pkgver = 0.9.69+gd5aa86c
+ pkgrel = 2
url = https://github.com/netblue30/fdns
arch = x86_64
license = GPL2
@@ -17,10 +17,13 @@ pkgbase = fdns-git
backup = etc/fdns/adblocker
backup = etc/fdns/coinblocker
backup = etc/fdns/fp-trackers
+ backup = etc/fdns/phishing
backup = etc/fdns/resolver.seccomp
backup = etc/fdns/servers
backup = etc/fdns/trackers
source = git+https://github.com/netblue30/fdns.git
+ source = openssl3.patch::https://github.com/netblue30/fdns/pull/80.diff
sha256sums = SKIP
+ sha256sums = cc20a0553e6a21fd78a221e2669f40b1fef1310d1643c025787bf88a377e504a
pkgname = fdns-git
diff --git a/PKGBUILD b/PKGBUILD
index 4f542639430c..e54fc9025abc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
_pkgname=fdns
pkgname=${_pkgname}-git
-pkgver=0.9.69+g3e5c7cd
-pkgrel=1
+pkgver=0.9.69+gd5aa86c
+pkgrel=2
pkgdesc="Firejail DNS-over-HTTPS proxy server - git version"
arch=(x86_64)
url="https://github.com/netblue30/fdns"
@@ -12,6 +12,7 @@ backup=(
etc/fdns/adblocker
etc/fdns/coinblocker
etc/fdns/fp-trackers
+ etc/fdns/phishing
etc/fdns/resolver.seccomp
etc/fdns/servers
etc/fdns/trackers
@@ -29,8 +30,10 @@ optdepends=('apparmor: support for apparmor profiles'
'systemd: run fdns as a systemd service')
provides=("$_pkgname")
conflicts=("$_pkgname")
-source=("git+https://github.com/netblue30/fdns.git")
-sha256sums=('SKIP')
+source=("git+https://github.com/netblue30/fdns.git"
+ "openssl3.patch::https://github.com/netblue30/fdns/pull/80.diff")
+sha256sums=('SKIP'
+ 'cc20a0553e6a21fd78a221e2669f40b1fef1310d1643c025787bf88a377e504a')
pkgver() {
cd "$_pkgname"
@@ -40,6 +43,15 @@ pkgver() {
echo "${_version}+${_tag}"
}
+prepare() {
+ cd "$_pkgname"
+ # revert https://github.com/netblue30/fdns/commit/b7b98a1e33d07795a2482ecd23f56157adac71c6
+ # this commit drops all the hardenings from fdns.service and only affects Debian 11
+ git revert --no-commit b7b98a1e33d07795a2482ecd23f56157adac71c6
+ # fix for https://github.com/netblue30/fdns/issues/79
+ patch -Np1 -i ../openssl3.patch
+}
+
build() {
cd "$_pkgname"
./configure --prefix=/usr --enable-apparmor --with-systemd=/usr/lib/systemd/system