Date: Wednesday, January 6, 2021 @ 21:07:25 Author: dvzrv Revision: 811379
archrelease: copy trunk to community-x86_64 Added: dnscrypt-proxy/repos/community-x86_64/PKGBUILD (from rev 811378, dnscrypt-proxy/trunk/PKGBUILD) dnscrypt-proxy/repos/community-x86_64/dnscrypt-proxy.install (from rev 811378, dnscrypt-proxy/trunk/dnscrypt-proxy.install) dnscrypt-proxy/repos/community-x86_64/dnscrypt-proxy.service (from rev 811378, dnscrypt-proxy/trunk/dnscrypt-proxy.service) dnscrypt-proxy/repos/community-x86_64/dnscrypt-proxy.socket (from rev 811378, dnscrypt-proxy/trunk/dnscrypt-proxy.socket) Deleted: dnscrypt-proxy/repos/community-x86_64/PKGBUILD dnscrypt-proxy/repos/community-x86_64/dnscrypt-proxy.install dnscrypt-proxy/repos/community-x86_64/dnscrypt-proxy.service dnscrypt-proxy/repos/community-x86_64/dnscrypt-proxy.socket ------------------------+ PKGBUILD | 158 ++++++++++++++++++++++------------------------- dnscrypt-proxy.install | 16 ++-- dnscrypt-proxy.service | 72 ++++++++++----------- dnscrypt-proxy.socket | 32 ++++----- 4 files changed, 136 insertions(+), 142 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-01-06 21:07:15 UTC (rev 811378) +++ PKGBUILD 2021-01-06 21:07:25 UTC (rev 811379) @@ -1,83 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> -# Contributor: Felix Yan <felixonm...@archlinux.org> -# Contributor: Techlive Zheng <techlivezheng at gmail dot com> -# Contributor: peace4all <markspost at rocketmail dot com> - -pkgname=dnscrypt-proxy -pkgver=2.0.44 -pkgrel=1 -pkgdesc="DNS proxy, supporting encrypted DNS protocols such as DNSCrypt v2 and DNS-over-HTTPS" -arch=('x86_64') -url="https://github.com/DNSCrypt/dnscrypt-proxy" -license=('ISC') -depends=('glibc') -makedepends=('git' 'go') -optdepends=('python-urllib3: for generate-domains-blacklist') -install="${pkgname}.install" -backup=("etc/${pkgname}/${pkgname}.toml" - "etc/${pkgname}/blacklist.txt" - "etc/${pkgname}/cloaking-rules.txt" - "etc/${pkgname}/forwarding-rules.txt" - "etc/${pkgname}/ip-blacklist.txt" - "etc/${pkgname}/whitelist.txt" -) -source=("git+https://github.com/jedisct1/${pkgname}#tag=${pkgver}?signed" - "${pkgname}.service" - "${pkgname}.socket" - "${pkgname}-${pkgver}-configuration.patch::https://github.com/dvzrv/dnscrypt-proxy/commit/23baf327e249e2577e7e2f8c25b36fc579caa8c9.patch") -sha512sums=('SKIP' - '49a9e7ab55e3d5a61017ab2d3a9d8baa503a7737b3b23402d1685f3fda2b59c5e08810bb18be30b2f099da7fa8686ce1bb4052cdd705e9397fd40b663bef3f21' - '56a56e87032da9316b392b0613124b0743673041596c717005541ae9b3994c7fc16c02497ea773d321f45d8e0f9ea8fda00783062cef4d5c8277b5b6f7cb10d5' - 'b5d5cdd1391670a99f1817dc0a6f8b30300b43a1db49e1e646e09398deac79117036f1eb07f18cfb96a6718e7bddd3cb380acf1c270adce722de97b979d4d5f5') -validpgpkeys=('54A2B8892CC3D6A597B92B6C210627AABA709FE1') # Frank Denis (Jedi/Sector One) <p...@pureftpd.org - -prepare() { - mv -v "${pkgname}" "${pkgname}-${pkgver}" - cd "$pkgname-$pkgver" - patch -Np1 -i "../${pkgname}-${pkgver}-configuration.patch" - # create empty ip-blacklist.txt - touch "${pkgname}/ip-blacklist.txt" -} - -build() { - cd "$pkgname-$pkgver/${pkgname}" - export CGO_CPPFLAGS="${CPPFLAGS}" - export CGO_CFLAGS="${CFLAGS}" - export CGO_CXXFLAGS="${CXXFLAGS}" - export CGO_LDFLAGS="${LDFLAGS}" - export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" - go build -} - -package() { - cd "$pkgname-$pkgver" - # executable - install -vDm 755 "${pkgname}/${pkgname}" -t "${pkgdir}/usr/bin/" - # configuration - install -vDm 644 "${pkgname}/example-${pkgname}.toml" \ - "${pkgdir}/etc/${pkgname}/${pkgname}.toml" - install -vDm 644 "${pkgname}/example-blacklist.txt" \ - "${pkgdir}/etc/${pkgname}/blacklist.txt" - install -vDm 644 "${pkgname}/example-cloaking-rules.txt" \ - "${pkgdir}/etc/${pkgname}/cloaking-rules.txt" - install -vDm 644 "${pkgname}/example-forwarding-rules.txt" \ - "${pkgdir}/etc/${pkgname}/forwarding-rules.txt" - install -vDm 644 "${pkgname}/ip-blacklist.txt" \ - "${pkgdir}/etc/${pkgname}/ip-blacklist.txt" - install -vDm 644 "${pkgname}/example-whitelist.txt" \ - "${pkgdir}/etc/${pkgname}/whitelist.txt" - # utils - install -vDm 644 utils/generate-domains-blacklists/*.{conf,txt} \ - -t "${pkgdir}/usr/share/${pkgname}/utils/generate-domains-blacklists" - install -vDm 755 utils/generate-domains-blacklists/generate-domains-blacklist.py \ - "${pkgdir}/usr/bin/generate-domains-blacklist" - # systemd service/socket - install -vDm 644 "../${pkgname}."{service,socket} \ - -t "${pkgdir}/usr/lib/systemd/system/" - # license - install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" - # docs - install -vDm 644 {ChangeLog,README.md} \ - -t "${pkgdir}/usr/share/doc/${pkgname}" -} -# vim:set ts=2 sw=2 et: Copied: dnscrypt-proxy/repos/community-x86_64/PKGBUILD (from rev 811378, dnscrypt-proxy/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-01-06 21:07:25 UTC (rev 811379) @@ -0,0 +1,75 @@ +# Maintainer: David Runge <dv...@archlinux.org> +# Contributor: Felix Yan <felixonm...@archlinux.org> +# Contributor: Techlive Zheng <techlivezheng at gmail dot com> +# Contributor: peace4all <markspost at rocketmail dot com> + +pkgname=dnscrypt-proxy +pkgver=2.0.45 +pkgrel=1 +pkgdesc="A flexible DNS proxy, with support for encrypted DNS protocols" +arch=('x86_64') +url="https://github.com/DNSCrypt/dnscrypt-proxy" +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" +) +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/6dc7bcbcaf17bc56bb566f8b3b4fde12abc1d824.patch") +sha512sums=('SKIP' + '49a9e7ab55e3d5a61017ab2d3a9d8baa503a7737b3b23402d1685f3fda2b59c5e08810bb18be30b2f099da7fa8686ce1bb4052cdd705e9397fd40b663bef3f21' + '56a56e87032da9316b392b0613124b0743673041596c717005541ae9b3994c7fc16c02497ea773d321f45d8e0f9ea8fda00783062cef4d5c8277b5b6f7cb10d5' + '980dd07cd68cf4b2ba41460d1946d1c71dc9e8e275556933fbc547961ba92b9e9d2f0409d3e2e97f285c049b1408d84d02a43036421874b6caf7e3be02f1f6c3') +validpgpkeys=('54A2B8892CC3D6A597B92B6C210627AABA709FE1') # Frank Denis (Jedi/Sector One) <p...@pureftpd.org + +prepare() { + 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}" + export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" + go build +} + +package() { + local _config + cd "${pkgname}" + # executable + install -vDm 755 "${pkgname}/${pkgname}" -t "${pkgdir}/usr/bin/" + # config files + 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}" + 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" + # systemd service/socket + install -vDm 644 "../${pkgname}."{service,socket} \ + -t "${pkgdir}/usr/lib/systemd/system/" + # license + install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" + # docs + install -vDm 644 {ChangeLog,README.md} \ + -t "${pkgdir}/usr/share/doc/${pkgname}" +} +# vim:set ts=2 sw=2 et: Deleted: dnscrypt-proxy.install =================================================================== --- dnscrypt-proxy.install 2021-01-06 21:07:15 UTC (rev 811378) +++ dnscrypt-proxy.install 2021-01-06 21:07:25 UTC (rev 811379) @@ -1,7 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 1.9.5-1)" -le 0 ] - then - echo 'The configuration file(s) and setup of dnscrypt-proxy has changed considerably since version 1.x.' - echo 'Please refer to the new upstream information for help!' - fi -} Copied: dnscrypt-proxy/repos/community-x86_64/dnscrypt-proxy.install (from rev 811378, dnscrypt-proxy/trunk/dnscrypt-proxy.install) =================================================================== --- dnscrypt-proxy.install (rev 0) +++ dnscrypt-proxy.install 2021-01-06 21:07:25 UTC (rev 811379) @@ -0,0 +1,9 @@ +post_upgrade() { + if [ "$(vercmp "$2" '1.9.5-1')" -le 0 ]; then + echo 'The configuration file(s) and setup of dnscrypt-proxy has changed considerably since version 1.x.' + echo 'Please refer to the new upstream information for help!' + fi + if [ "$(vercmp "$2" '2.0.45-1')" -le 0 ]; then + echo 'Some of the configuration files have been renamed. Read /usr/share/doc/dnscrypt-proxy/ChangeLog to merge files accordingly.' + fi +} Deleted: dnscrypt-proxy.service =================================================================== --- dnscrypt-proxy.service 2021-01-06 21:07:15 UTC (rev 811378) +++ dnscrypt-proxy.service 2021-01-06 21:07:25 UTC (rev 811379) @@ -1,36 +0,0 @@ -[Unit] -Description=DNSCrypt-proxy client -Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki -Wants=network-online.target nss-lookup.target -Before=nss-lookup.target - -[Service] -AmbientCapabilities=CAP_NET_BIND_SERVICE -CacheDirectory=dnscrypt-proxy -CapabilityBoundingSet=CAP_NET_BIND_SERVICE -DynamicUser=yes -ExecStart=/usr/bin/dnscrypt-proxy --config /etc/dnscrypt-proxy/dnscrypt-proxy.toml -LockPersonality=yes -LogsDirectory=dnscrypt-proxy -MemoryDenyWriteExecute=true -NonBlocking=true -NoNewPrivileges=true -PrivateDevices=true -ProtectControlGroups=yes -ProtectHome=yes -ProtectHostname=yes -ProtectKernelLogs=yes -ProtectKernelModules=yes -ProtectKernelTunables=yes -ProtectSystem=strict -RestrictAddressFamilies=AF_INET AF_INET6 -RestrictNamespaces=true -RestrictRealtime=true -RuntimeDirectory=dnscrypt-proxy -StateDirectory=dnscrypt-proxy -SystemCallArchitectures=native -SystemCallFilter=@system-service @chown -SystemCallFilter=~@resources @privileged - -[Install] -WantedBy=multi-user.target Copied: dnscrypt-proxy/repos/community-x86_64/dnscrypt-proxy.service (from rev 811378, dnscrypt-proxy/trunk/dnscrypt-proxy.service) =================================================================== --- dnscrypt-proxy.service (rev 0) +++ dnscrypt-proxy.service 2021-01-06 21:07:25 UTC (rev 811379) @@ -0,0 +1,36 @@ +[Unit] +Description=DNSCrypt-proxy client +Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki +Wants=network-online.target nss-lookup.target +Before=nss-lookup.target + +[Service] +AmbientCapabilities=CAP_NET_BIND_SERVICE +CacheDirectory=dnscrypt-proxy +CapabilityBoundingSet=CAP_NET_BIND_SERVICE +DynamicUser=yes +ExecStart=/usr/bin/dnscrypt-proxy --config /etc/dnscrypt-proxy/dnscrypt-proxy.toml +LockPersonality=yes +LogsDirectory=dnscrypt-proxy +MemoryDenyWriteExecute=true +NonBlocking=true +NoNewPrivileges=true +PrivateDevices=true +ProtectControlGroups=yes +ProtectHome=yes +ProtectHostname=yes +ProtectKernelLogs=yes +ProtectKernelModules=yes +ProtectKernelTunables=yes +ProtectSystem=strict +RestrictAddressFamilies=AF_INET AF_INET6 +RestrictNamespaces=true +RestrictRealtime=true +RuntimeDirectory=dnscrypt-proxy +StateDirectory=dnscrypt-proxy +SystemCallArchitectures=native +SystemCallFilter=@system-service @chown +SystemCallFilter=~@resources @privileged + +[Install] +WantedBy=multi-user.target Deleted: dnscrypt-proxy.socket =================================================================== --- dnscrypt-proxy.socket 2021-01-06 21:07:15 UTC (rev 811378) +++ dnscrypt-proxy.socket 2021-01-06 21:07:25 UTC (rev 811379) @@ -1,16 +0,0 @@ -[Unit] -Description=DNSCrypt-proxy socket -Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki -Before=nss-lookup.target -Wants=nss-lookup.target network-online.target - -[Socket] -ListenStream=127.0.0.1:53 -ListenDatagram=127.0.0.1:53 -ListenStream=[::1]:53 -ListenDatagram=[::1]:53 -NoDelay=true -DeferAcceptSec=1 - -[Install] -WantedBy=sockets.target Copied: dnscrypt-proxy/repos/community-x86_64/dnscrypt-proxy.socket (from rev 811378, dnscrypt-proxy/trunk/dnscrypt-proxy.socket) =================================================================== --- dnscrypt-proxy.socket (rev 0) +++ dnscrypt-proxy.socket 2021-01-06 21:07:25 UTC (rev 811379) @@ -0,0 +1,16 @@ +[Unit] +Description=DNSCrypt-proxy socket +Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki +Before=nss-lookup.target +Wants=nss-lookup.target network-online.target + +[Socket] +ListenStream=127.0.0.1:53 +ListenDatagram=127.0.0.1:53 +ListenStream=[::1]:53 +ListenDatagram=[::1]:53 +NoDelay=true +DeferAcceptSec=1 + +[Install] +WantedBy=sockets.target