[arch-commits] Commit in unbound/trunk (PKGBUILD conf service)

[Gaëtan Bisson]

    Date: Monday, September 16, 2019 @ 23:40:46
  Author: bisson
Revision: 510948

implement FS#61163

Modified:
  unbound/trunk/PKGBUILD
  unbound/trunk/conf
Deleted:
  unbound/trunk/service

----------+
 PKGBUILD |   14 +++++++++-----
 conf     |    1 +
 service  |   13 -------------
 3 files changed, 10 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-16 23:22:53 UTC (rev 510947)
+++ PKGBUILD	2019-09-16 23:40:46 UTC (rev 510948)
@@ -4,7 +4,7 @@
 
 pkgname=unbound
 pkgver=1.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='https://unbound.net/'
 license=('custom:BSD')
@@ -17,7 +17,6 @@
 source=("https://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"{,.asc}
         'sysusers.d'
         'tmpfiles.d'
-        'service'
         'hook'
         'conf')
 sha256sums=('1b55dd9170e4bfb327fb644de7bbf7f0541701149dff3adf1b63ffa785f16dfa'
@@ -24,10 +23,14 @@
             'SKIP'
             '85b8f00881fb93bcce83bdfe3246463a396eb5b352c0d7f5fca32fcb839d22fa'
             '31a573f43287dd7e3678be1680388bfc7d8dee8280eb2443f521a4b349aaa6b6'
-            'a8a31511cb3d8c8092f0f9edb8887701eceac0108a177af8486c35a1d3ead601'
             '2746aede36b1f57efdcc370b7643ce31ff9e6acb9a1f62705987b07eaed866a3'
-            'ddc0ead682c5035cdd3a29d4ab12936a73573c82c27f14026998a378de56f418')
+            '503ad3b11be9856cb42682ff3d51b0a78c9e613f7c8ae8e8cc0c87b86b607c54')
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's/^Type=notify/Type=simple/' -i contrib/unbound.service.in
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure \
@@ -41,6 +44,7 @@
 		--enable-pie \
 		--enable-relro-now \
 		--enable-subnet \
+		--enable-systemd \
 		--enable-tfo-client \
 		--enable-tfo-server \
 		--with-conf-file=/etc/unbound/unbound.conf \
@@ -54,10 +58,10 @@
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
+	install -Dm644 contrib/unbound.service "${pkgdir}/usr/lib/systemd/system/unbound.service"
 	install -Dm644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example"
 	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 ../sysusers.d "${pkgdir}/usr/lib/sysusers.d/unbound.conf"
-	install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/unbound.service"
 	install -Dm644 ../conf "${pkgdir}/etc/unbound/unbound.conf"
 
 	# Trust anchor file available from within unbound's chroot.

Modified: conf
===================================================================
--- conf	2019-09-16 23:22:53 UTC (rev 510947)
+++ conf	2019-09-16 23:40:46 UTC (rev 510948)
@@ -1,4 +1,5 @@
 server:
+  chroot: ""
   use-syslog: yes
   do-daemonize: no
   username: "unbound"

Deleted: service
===================================================================
--- service	2019-09-16 23:22:53 UTC (rev 510947)
+++ service	2019-09-16 23:40:46 UTC (rev 510948)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Unbound DNS Resolver
-Wants=nss-lookup.target
-Before=network-online.target nss-lookup.target
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/unbound
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target