diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 58 |
1 files changed, 40 insertions, 18 deletions
@@ -8,11 +8,13 @@ # Artix version has a sysuser name I do not like # Artix version has less than preferred default lists # Artix version has 1.x migration notice +# Artix version uses censored list names +# Artix version requires network to build pkgname=dnscrypt-proxy -pkgver=2.0.44 -pkgrel=1 -pkgdesc="DNS proxy, supporting encrypted DNS protocols such as DNSCrypt v2 and DNS-over-HTTPS" +pkgver=2.0.45 +pkgrel=2 +pkgdesc="A flexible DNS proxy, with support for encrypted DNS protocols" arch=('x86_64') url="https://github.com/DNSCrypt/dnscrypt-proxy" license=('ISC') @@ -21,15 +23,18 @@ makedepends=('git' 'go') optdepends=('python-urllib3: for generate-domains-blacklist') backup=("etc/${pkgname}/${pkgname}.toml" "etc/${pkgname}/blacklist.txt" + "etc/${pkgname}/captive-portals.txt" "etc/${pkgname}/cloaking-rules.txt" "etc/${pkgname}/forwarding-rules.txt" "etc/${pkgname}/ip-blacklist.txt" + "etc/${pkgname}/ip-whitelist.txt" "etc/${pkgname}/whitelist.txt" ) -source=("git+https://github.com/jedisct1/${pkgname}#tag=${pkgver}?signed" +source=("git+https://github.com/dnscrypt/${pkgname}#tag=${pkgver}?signed" "${pkgname}.sysusers" "${pkgname}.tmpfiles" - "${pkgname}-${pkgver}-configuration.patch::https://github.com/dvzrv/dnscrypt-proxy/commit/23baf327e249e2577e7e2f8c25b36fc579caa8c9.patch" + "${pkgname}-${pkgver}-configuration.patch::https://github.com/dvzrv/dnscrypt-proxy/commit/6dc7bcbcaf17bc56bb566f8b3b4fde12abc1d824.patch" + 'uncensor.patch' 'blacklist.txt' 'cloaking-rules.txt' 'ip-blacklist.txt' @@ -37,7 +42,8 @@ source=("git+https://github.com/jedisct1/${pkgname}#tag=${pkgver}?signed" b2sums=('SKIP' '96acec13d773b80835ed936d8fe585d1843c67a2e70082b9f05e27fd989ace68083d74eec6088a99ca95c19b0f1c52d625197b6ece25c3e8ddac37d7e3d55b5e' '58920d0366de701e03e32bca188b2842e94e0d641eee264e21124338a648b5da7901ff8fde69e85a5945ccf931380796108b1234128c1ea8956c757e706d9147' - '0a31069ccdf58f0cef18caabe761c4c27ececd66fb4b694222d44b0b0d04845311085843c999b6fd77a04886467e3e992a8fe8e511626702cc848ce60d48c546' + 'c1ec6c68b17531a45516c9fc20ee8c8342f26132e9e02b624f959976e6608b9e297c40317ad2c6c3722af3a9476ed2f6ff6680f8db5b1e0dbeba1e99f0e06900' + 'a8cbdddf4771f76d8c9508f08cd07a7882c76863d4f0872866bb7abd3f786d4b4b070e7c378ed3067d7a49063bfc82397072f74c98708f5b4167536a80ccfaf9' 'b691146f2746844bdb79f0c67c565bbce23b978dcb613b9d1ca1d8f62efbbf7d02b3cc442ec0de298cc5f6292823442187dd7efc26b73ff1002edbe9c5f2b8a1' 'c3b2381b1ee3ca77818eec49a564c6f907c178a3ec76f6bbb5bcfa6707b6f6a9f2a7e44be4c8be9db5984de1558bb006efa6e263d48d4d0303abd721e22d63a1' 'c79c1962c253439052ce8cbdaeeebde4c0f5ff01d93dafef8774a1526ad23c59ab603b14ec1ef56d52f88fd0007c60ad7a54b813b3d0a92b325c00a3d28dcd1f' @@ -45,49 +51,65 @@ b2sums=('SKIP' validpgpkeys=('54A2B8892CC3D6A597B92B6C210627AABA709FE1') # Frank Denis (Jedi/Sector One) <pgp@pureftpd.org prepare() { - cd "$pkgname" + cd "${pkgname}" patch -Np1 -i "../${pkgname}-${pkgver}-configuration.patch" + patch -Np1 -i "../uncensor.patch" + # create empty ip-blacklist.txt touch "${pkgname}/ip-blacklist.txt" + # symlink upstream's vendor to src ln -sfv vendor src + ln -sfv vendor ${pkgname}/src + ln -sfv vendor ${pkgname}/vendor rm -v go.mod } build() { cd "$pkgname" + # set GOPATH + export GO111MODULE=off export GOPATH=$(pwd) + #go mod init + cd "$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 + #export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" + + go build -mod=vendor } package() { - cd "$pkgname" + cd "${pkgname}" # executable install -vDm 755 "${pkgname}/${pkgname}" -t "${pkgdir}/usr/bin/" - # configuration + # configuration files install -vDm 644 "${pkgname}/example-${pkgname}.toml" \ "${pkgdir}/etc/${pkgname}/${pkgname}.toml" - install -vDm 644 "${srcdir}/blacklist.txt" \ + install -vDm 644 "${pkgname}/example-blocked-names.txt" \ "${pkgdir}/etc/${pkgname}/blacklist.txt" - install -vDm 644 "${srcdir}/cloaking-rules.txt" \ + install -vDm 644 "${pkgname}/example-blocked-ips.txt" \ + "${pkgdir}/etc/${pkgname}/ip-blacklist.txt" + install -vDm 644 "${pkgname}/example-captive-portals.txt" \ + "${pkgdir}/etc/${pkgname}/captive-portals.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 "${srcdir}/ip-blacklist.txt" \ - "${pkgdir}/etc/${pkgname}/ip-blacklist.txt" - install -vDm 644 "${srcdir}/whitelist.txt" \ + install -vDm 644 "${pkgname}/example-allowed-ips.txt" \ + "${pkgdir}/etc/${pkgname}/ip-whitelist.txt" + install -vDm 644 "${pkgname}/example-allowed-names.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 \ + install -vDm 644 utils/generate-domains-blocklist/*.{conf,txt} \ + -t "${pkgdir}/usr/share/${pkgname}/utils/generate-domains-blacklist" + install -vDm 755 utils/generate-domains-blocklist/generate-domains-blocklist.py \ "${pkgdir}/usr/bin/generate-domains-blacklist" # sysusers.d install -vDm 644 "${srcdir}/${pkgname}.sysusers" \ |