summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD20
2 files changed, 8 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bc13bd204b94..0f3bd771a2b6 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+g4316b7b
- pkgrel = 4
+ pkgver = 0.9.69+g4164b1f
+ pkgrel = 1
url = https://github.com/netblue30/fdns
arch = x86_64
license = GPL2
@@ -23,9 +23,7 @@ pkgbase = fdns-git
backup = etc/fdns/trackers
source = git+https://github.com/netblue30/fdns.git
source = fdns.hardened.service::https://github.com/netblue30/fdns/raw/39711eac58e60ae2d02052223aabbf22b5379906/etc/fdns.service
- source = openssl3.patch::https://github.com/netblue30/fdns/pull/80.diff
sha256sums = SKIP
sha256sums = e7f1f0d58b3333c5fa10740886967a6acc674c28d2bcfe77356254c1dd6ffc62
- sha256sums = cc20a0553e6a21fd78a221e2669f40b1fef1310d1643c025787bf88a377e504a
pkgname = fdns-git
diff --git a/PKGBUILD b/PKGBUILD
index c9913ac7c7c2..8a1eb3b0a23e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
_pkgname=fdns
pkgname=${_pkgname}-git
-pkgver=0.9.69+g4316b7b
-pkgrel=4
+pkgver=0.9.69+g4164b1f
+pkgrel=1
pkgdesc="Firejail DNS-over-HTTPS proxy server - git version"
arch=(x86_64)
url="https://github.com/netblue30/fdns"
@@ -31,11 +31,9 @@ optdepends=('apparmor: support for apparmor profiles'
provides=("$_pkgname")
conflicts=("$_pkgname")
source=("git+https://github.com/netblue30/fdns.git"
- "fdns.hardened.service::https://github.com/netblue30/fdns/raw/39711eac58e60ae2d02052223aabbf22b5379906/etc/fdns.service"
- "openssl3.patch::https://github.com/netblue30/fdns/pull/80.diff")
+ "fdns.hardened.service::https://github.com/netblue30/fdns/raw/39711eac58e60ae2d02052223aabbf22b5379906/etc/fdns.service")
sha256sums=('SKIP'
- 'e7f1f0d58b3333c5fa10740886967a6acc674c28d2bcfe77356254c1dd6ffc62'
- 'cc20a0553e6a21fd78a221e2669f40b1fef1310d1643c025787bf88a377e504a')
+ 'e7f1f0d58b3333c5fa10740886967a6acc674c28d2bcfe77356254c1dd6ffc62')
pkgver() {
cd "$_pkgname"
@@ -45,12 +43,6 @@ pkgver() {
echo "${_version}+${_tag}"
}
-prepare() {
- cd "$_pkgname"
- # 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
@@ -63,10 +55,10 @@ package() {
# use hardened systemd service
rm -f "${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
- install -Dm644 "${srcdir}/${_pkgname}.hardened.service" \
+ install -D -m 0644 "${srcdir}/${_pkgname}.hardened.service" \
"${pkgdir}/usr/lib/systemd/system/${_pkgname}.service"
# license
- install -Dm644 "${pkgdir}/usr/share/doc/${_pkgname}/COPYING" \
+ install -D -m 0644 "${pkgdir}/usr/share/doc/${_pkgname}/COPYING" \
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
rm -f "${pkgdir}/usr/share/doc/${_pkgname}/COPYING"
}