[arch-commits] Commit in stubby/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Friday, April 10, 2020 @ 15:30:20
  Author: archange
Revision: 613113

upgpkg: stubby 0.3.0-1

Upstream switched to CMake, but still some rough edges

Modified:
  stubby/trunk/PKGBUILD

----------+
 PKGBUILD |   50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-10 15:28:24 UTC (rev 613112)
+++ PKGBUILD	2020-04-10 15:30:20 UTC (rev 613113)
@@ -1,39 +1,41 @@
 # Maintainer: Bruno Pagani <archange at archlinux.org> 
 
 pkgname=stubby
-pkgver=0.2.6
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="DNS Privacy stub resolver"
-arch=('x86_64')
+arch=(x86_64)
 url="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby"
-license=('BSD')
-backup=('etc/stubby/stubby.yml')
-depends=('getdns')
-source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/getdnsapi/stubby/archive/v${pkgver}.tar.gz")
-sha256sums=('634b0b9fb8f36416e210fa65800a6c1672bcf9f4f276a042ccf89567ad8ef781')
+license=(BSD)
+backup=(etc/stubby/stubby.yml)
+depends=(getdns libsystemd libyaml)
+makedepends=(cmake)
+source=(https://github.com/getdnsapi/stubby/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
+        stubby-fix-destdir-part1.patch::https://github.com/getdnsapi/stubby/commit/2fec82b1669bb35062ff9029c4b42fb4998fbd44.patch
+        stubby-fix-destdir-part2.patch::https://github.com/getdnsapi/stubby/commit/c4841747a8042dfe2ea43c3c58d07a87e5a5a0ed.patch)
+sha256sums=('b37a0e0ec2b7cfcdcb596066a6fd6109e91a2766b17a42c47d3703d9be41d000'
+            'd8ee3dd5834c214cb2ac5eeafb91af60ceb4fa4bc948d6008198b822ff92848a'
+            'fa5739135f2cbdfa3fe53793f9cf23a487167d882a3df31830f3c87b4e8ecd55')
 
 prepare() {
-    cd ${pkgname}-${pkgver}
-    sed -e 's/^# appdata_dir:/appdata_dir:/g' -e 's:/etc/unbound/getdns-root.key:/etc/trusted-key.key:g' -i stubby.yml.example
+  cd ${pkgname}-${pkgver}
+  sed -e 's/^# appdata_dir:/appdata_dir:/g' -e 's:/etc/unbound/getdns-root.key:/etc/trusted-key.key:g' -i stubby.yml.example
+  patch -p1 -i ../stubby-fix-destdir-part1.patch
+  patch -p1 -i ../stubby-fix-destdir-part2.patch
 }
 
 build() {
-    cd ${pkgname}-${pkgver}
-    autoreconf -vfi
-    ./configure \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var
-    make
+  cmake -B build -S ${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DCMAKE_BUILD_TYPE=Release
+  make -C build
 }
 
 package() {
-    cd ${pkgname}-${pkgver}
-
-    make DESTDIR="${pkgdir}" install
-
-    install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}
-    rmdir "${pkgdir}"/var{/run,}
-
-    install -Dm644 systemd/${pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
+  make -C build DESTDIR="${pkgdir}" install
+  rmdir "${pkgdir}"/var{/run,}
+  cd ${pkgname}-${pkgver}
+  install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -Dm644 systemd/${pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
 }