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

2019-09-16 Thread Gaëtan Bisson via arch-commits
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
===
--- PKGBUILD2019-09-16 23:22:53 UTC (rev 510947)
+++ PKGBUILD2019-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
===
--- conf2019-09-16 23:22:53 UTC (rev 510947)
+++ conf2019-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


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

2018-07-27 Thread Gaëtan Bisson via arch-commits
Date: Saturday, July 28, 2018 @ 00:13:23
  Author: bisson
Revision: 363704

fix FS#59162

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

--+
 PKGBUILD |8 
 conf |1 +
 service  |3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-27 23:19:51 UTC (rev 363703)
+++ PKGBUILD2018-07-28 00:13:23 UTC (rev 363704)
@@ -5,7 +5,7 @@
 
 pkgname=unbound
 pkgver=1.7.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='https://unbound.net/'
 license=('custom:BSD')
@@ -12,7 +12,7 @@
 arch=('x86_64')
 makedepends=('expat')
 optdepends=('expat: unbound-anchor')
-depends=('openssl' 'ldns' 'libevent' 'fstrm' 'protobuf-c' 'dnssec-anchors')
+depends=('fstrm' 'openssl' 'protobuf-c' 'libevent' 'ldns' 'dnssec-anchors')
 backup=('etc/unbound/unbound.conf')
 validpgpkeys=('EDFAA3F2CA4E6EB05681AF8E9F6F1C2D7E045F8D')
 source=("https://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"{,.asc}
@@ -25,9 +25,9 @@
 'SKIP'
 '85b8f00881fb93bcce83bdfe3246463a396eb5b352c0d7f5fca32fcb839d22fa'
 '31a573f43287dd7e3678be1680388bfc7d8dee8280eb2443f521a4b349aaa6b6'
-'526ee18a5394073404ee10a67addf9894efa43fa234234562e84a1641d54b556'
+'a8a31511cb3d8c8092f0f9edb8887701eceac0108a177af8486c35a1d3ead601'
 '2746aede36b1f57efdcc370b7643ce31ff9e6acb9a1f62705987b07eaed866a3'
-'07d764f4f42adfba9685c5c7feef81116118f4a1772b118aa3ebbe059e8a513e')
+'ddc0ead682c5035cdd3a29d4ab12936a73573c82c27f14026998a378de56f418')
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"

Modified: conf
===
--- conf2018-07-27 23:19:51 UTC (rev 363703)
+++ conf2018-07-28 00:13:23 UTC (rev 363704)
@@ -1,5 +1,6 @@
 server:
   use-syslog: yes
+  do-daemonize: no
   username: "unbound"
   directory: "/etc/unbound"
   trust-anchor-file: trusted-key.key

Modified: service
===
--- service 2018-07-27 23:19:51 UTC (rev 363703)
+++ service 2018-07-28 00:13:23 UTC (rev 363704)
@@ -5,8 +5,7 @@
 After=network.target
 
 [Service]
-PIDFile=/run/unbound.pid
-ExecStart=/usr/bin/unbound -d
+ExecStart=/usr/bin/unbound
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 


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

2015-01-11 Thread Gaetan Bisson
Date: Sunday, January 11, 2015 @ 22:35:28
  Author: bisson
Revision: 125773

fix FS#43225

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

--+
 PKGBUILD |6 +++---
 conf |3 ++-
 service  |1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-11 21:08:46 UTC (rev 125772)
+++ PKGBUILD2015-01-11 21:35:28 UTC (rev 125773)
@@ -5,7 +5,7 @@
 
 pkgname=unbound
 pkgver=1.5.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
 license=('custom:BSD')
@@ -20,8 +20,8 @@
 'conf')
 sha1sums=('5606c2246e7394bce88cc4f16edbd6b964237ea2'
   '456c91a253f9102e00e4a46a2f1b936aa2e3ed7c'
-  'b543ae6f8b87423bec095fca6b335a9ee43739a8'
-  '5d473ec2943fd85367cdb653fcd58e186f07383f')
+  '63fcc187cec6f262d81600e66c6747285c72ad15'
+  '98515708441cb831890a0b6d1986fd40649646c0')
 
 install=install
 

Modified: conf
===
--- conf2015-01-11 21:08:46 UTC (rev 125772)
+++ conf2015-01-11 21:35:28 UTC (rev 125773)
@@ -1,4 +1,5 @@
 server:
+  use-syslog: yes
   username: unbound
   directory: /etc/unbound
-  use-syslog: yes
+  trust-anchor-file: trusted-key.key

Modified: service
===
--- service 2015-01-11 21:08:46 UTC (rev 125772)
+++ service 2015-01-11 21:35:28 UTC (rev 125773)
@@ -3,6 +3,7 @@
 After=network.target
 
 [Service]
+ExecStartPre=/bin/cp -f /etc/trusted-key.key /etc/unbound/
 PIDFile=/run/unbound.pid
 ExecStart=/usr/bin/unbound -d
 ExecReload=/bin/kill -HUP $MAINPID