Date: Wednesday, February 16, 2022 @ 08:32:48 Author: dvzrv Revision: 1133434
upgpkg: dnscrypt-proxy 2.1.1-2: Rebuild to fix issues with log rotation. Fix the SystemCallFilter to allow the @chown system call which allows log rotation: https://bugs.archlinux.org/task/73673 Remove all unneeded quotes and curly braces. Modified: dnscrypt-proxy/trunk/PKGBUILD dnscrypt-proxy/trunk/dnscrypt-proxy.service ------------------------+ PKGBUILD | 77 +++++++++++++++++++++++------------------------ dnscrypt-proxy.service | 3 + 2 files changed, 40 insertions(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-02-16 08:15:28 UTC (rev 1133433) +++ PKGBUILD 2022-02-16 08:32:48 UTC (rev 1133434) @@ -5,44 +5,47 @@ pkgname=dnscrypt-proxy pkgver=2.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A flexible DNS proxy, with support for encrypted DNS protocols" -arch=('x86_64') +arch=(x86_64) url="https://github.com/DNSCrypt/dnscrypt-proxy"; -license=('ISC') -depends=('glibc') -makedepends=('git' 'go') +license=(ISC) +depends=(glibc) +makedepends=(git go) optdepends=('python-urllib3: for generate-domains-blocklist') -install="${pkgname}.install" -backup=("etc/${pkgname}/${pkgname}.toml" - "etc/${pkgname}/allowed-ips.txt" - "etc/${pkgname}/allowed-names.txt" - "etc/${pkgname}/blocked-ips.txt" - "etc/${pkgname}/blocked-names.txt" - "etc/${pkgname}/cloaking-rules.txt" - "etc/${pkgname}/forwarding-rules.txt" +install=$pkgname.install +backup=( + etc/$pkgname/${pkgname}.toml + etc/$pkgname/allowed-ips.txt + etc/$pkgname/allowed-names.txt + etc/$pkgname/blocked-ips.txt + etc/$pkgname/blocked-names.txt + etc/$pkgname/cloaking-rules.txt + etc/$pkgname/forwarding-rules.txt ) -source=("git+https://github.com/dnscrypt/${pkgname}#tag=${pkgver}?signed"; - "${pkgname}.service" - "${pkgname}.socket" - "${pkgname}-${pkgver}-configuration.patch::https://github.com/dvzrv/dnscrypt-proxy/commit/c3b021adcfc564f331ba531c35b4501adfee53d3.patch";) +source=( + git+https://github.com/dnscrypt/$pkgname#tag=$pkgver?signed + $pkgname.service + $pkgname.socket + $pkgname-$pkgver-configuration.patch::https://github.com/dvzrv/dnscrypt-proxy/commit/c3b021adcfc564f331ba531c35b4501adfee53d3.patch +) sha512sums=('SKIP' - '49a9e7ab55e3d5a61017ab2d3a9d8baa503a7737b3b23402d1685f3fda2b59c5e08810bb18be30b2f099da7fa8686ce1bb4052cdd705e9397fd40b663bef3f21' + '5589eddf9d5fda86778ebc91c9e20d8acfdcf86bc1f1a5d34279f33c402f32dc73539c0c0ba6bd74b80617e9abcc49c8c68cc06f171f74c66f2ffc92dfeecd75' '56a56e87032da9316b392b0613124b0743673041596c717005541ae9b3994c7fc16c02497ea773d321f45d8e0f9ea8fda00783062cef4d5c8277b5b6f7cb10d5' '5153386b92ff3540c9e564fa9224a7300e31fe9d0e0a0dd1a262c389e8d115eac549cb863e822c727de52a28d8f2a7a31188d4c793899ae42809f55a0e299b63') validpgpkeys=('54A2B8892CC3D6A597B92B6C210627AABA709FE1') # Frank Denis (Jedi/Sector One) <[email protected] prepare() { - cd "${pkgname}" - patch -Np1 -i "../${pkgname}-${pkgver}-configuration.patch" + cd $pkgname + patch -Np1 -i ../$pkgname-$pkgver-configuration.patch } build() { - cd "${pkgname}/${pkgname}" - export CGO_CPPFLAGS="${CPPFLAGS}" - export CGO_CFLAGS="${CFLAGS}" - export CGO_CXXFLAGS="${CXXFLAGS}" - export CGO_LDFLAGS="${LDFLAGS}" + cd $pkgname/$pkgname + export CGO_CPPFLAGS="$CPPFLAGS" + export CGO_CFLAGS="$CFLAGS" + export CGO_CXXFLAGS="$CXXFLAGS" + export CGO_LDFLAGS="$LDFLAGS" export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" go build } @@ -49,27 +52,23 @@ package() { local _config - cd "${pkgname}" + + cd $pkgname # executable - install -vDm 755 "${pkgname}/${pkgname}" -t "${pkgdir}/usr/bin/" + install -vDm 755 $pkgname/$pkgname -t "$pkgdir/usr/bin/" # config files - install -vDm 644 "${pkgname}/example-${pkgname}.toml" \ - "${pkgdir}/etc/${pkgname}/${pkgname}.toml" + install -vDm 644 $pkgname/example-$pkgname.toml "$pkgdir/etc/$pkgname/$pkgname.toml" for _config in {{allowed,blocked}-{ips,names},{cloaking,forwarding}-rules,captive-portals}.txt; do - install -vDm 644 "${pkgname}/example-${_config}" "${pkgdir}/etc/${pkgname}/${_config}" + install -vDm 644 "$pkgname/example-$_config" "$pkgdir/etc/$pkgname/$_config" done # utils - install -vDm 644 utils/generate-domains-blocklist/*.{conf,txt} \ - -t "${pkgdir}/usr/share/${pkgname}/utils/generate-domains-blocklist" - install -vDm 755 utils/generate-domains-blocklist/generate-domains-blocklist.py \ - "${pkgdir}/usr/bin/generate-domains-blocklist" + install -vDm 644 utils/generate-domains-blocklist/*.{conf,txt} -t "$pkgdir/usr/share/$pkgname/utils/generate-domains-blocklist" + install -vDm 755 utils/generate-domains-blocklist/generate-domains-blocklist.py "$pkgdir/usr/bin/generate-domains-blocklist" # systemd service/socket - install -vDm 644 "../${pkgname}."{service,socket} \ - -t "${pkgdir}/usr/lib/systemd/system/" + install -vDm 644 ../$pkgname.{service,socket} -t "$pkgdir/usr/lib/systemd/system/" # license - install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname" # docs - install -vDm 644 {ChangeLog,README.md} \ - -t "${pkgdir}/usr/share/doc/${pkgname}" + install -vDm 644 {ChangeLog,README.md} -t "$pkgdir/usr/share/doc/$pkgname" } # vim:set ts=2 sw=2 et: Modified: dnscrypt-proxy.service =================================================================== --- dnscrypt-proxy.service 2022-02-16 08:15:28 UTC (rev 1133433) +++ dnscrypt-proxy.service 2022-02-16 08:32:48 UTC (rev 1133434) @@ -29,8 +29,9 @@ RuntimeDirectory=dnscrypt-proxy StateDirectory=dnscrypt-proxy SystemCallArchitectures=native -SystemCallFilter=@system-service @chown +SystemCallFilter=@system-service SystemCallFilter=~@resources @privileged +SystemCallFilter=@chown [Install] WantedBy=multi-user.target
