[arch-commits] Commit in unbound/trunk (5 files)

[Gaetan Bisson]

    Date: Tuesday, May 14, 2013 @ 10:48:40
  Author: bisson
Revision: 90811

move binaries to /usr/bin, misc cleanup

Added:
  unbound/trunk/conf
    (from rev 90810, unbound/trunk/unbound.conf)
  unbound/trunk/service
    (from rev 90810, unbound/trunk/unbound.service)
Modified:
  unbound/trunk/PKGBUILD
Deleted:
  unbound/trunk/unbound.conf
  unbound/trunk/unbound.service

-----------------+
 PKGBUILD        |   25 +++++++++++--------------
 conf            |    4 ++++
 service         |   12 ++++++++++++
 unbound.conf    |    4 ----
 unbound.service |   12 ------------
 5 files changed, 27 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-14 08:06:07 UTC (rev 90810)
+++ PKGBUILD	2013-05-14 08:48:40 UTC (rev 90811)
@@ -5,47 +5,44 @@
 
 pkgname=unbound
 pkgver=1.4.20
-pkgrel=1
+pkgrel=2
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
-options=('!libtool')
 depends=('openssl' 'ldns')
 makedepends=('expat')
 optdepends=('expat: unbound-anchor')
 backup=('etc/unbound/unbound.conf')
 source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
-        'unbound.service'
-        'unbound.conf')
+        'service'
+        'conf')
 sha1sums=('1752976533be2a4f0c9cdbab9d2cbb67d4f27c43'
-          'a2493cb105ff6aa23d756514badb13b02d37f319'
+          'b543ae6f8b87423bec095fca6b335a9ee43739a8'
           '5d473ec2943fd85367cdb653fcd58e186f07383f')
 
+options=('!libtool')
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
+		--sbindir=/usr/bin \
 		--disable-static \
 		--disable-rpath \
 		--with-conf-file=/etc/unbound/unbound.conf \
-		--with-pidfile=/run/unbound.pid \
-
+		--with-pidfile=/run/unbound.pid
 	make
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -D -m644 ../unbound.conf "${pkgdir}/etc/unbound/unbound.conf"
-	install -D -m644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example"
-	install -D -m644 ../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 ../service "${pkgdir}/usr/lib/systemd/system/unbound.service"
+	install -Dm644 ../conf "${pkgdir}/etc/unbound/unbound.conf"
 }

Copied: unbound/trunk/conf (from rev 90810, unbound/trunk/unbound.conf)
===================================================================
--- conf	                        (rev 0)
+++ conf	2013-05-14 08:48:40 UTC (rev 90811)
@@ -0,0 +1,4 @@
+server:
+  username: "unbound"
+  directory: "/etc/unbound"
+  use-syslog: yes

Copied: unbound/trunk/service (from rev 90810, unbound/trunk/unbound.service)
===================================================================
--- service	                        (rev 0)
+++ service	2013-05-14 08:48:40 UTC (rev 90811)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Unbound DNS Resolver
+After=network.target
+
+[Service]
+PIDFile=/run/unbound.pid
+ExecStart=/usr/bin/unbound -d
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

Deleted: unbound.conf
===================================================================
--- unbound.conf	2013-05-14 08:06:07 UTC (rev 90810)
+++ unbound.conf	2013-05-14 08:48:40 UTC (rev 90811)
@@ -1,4 +0,0 @@
-server:
-  username: "unbound"
-  directory: "/etc/unbound"
-  use-syslog: yes

Deleted: unbound.service
===================================================================
--- unbound.service	2013-05-14 08:06:07 UTC (rev 90810)
+++ unbound.service	2013-05-14 08:48:40 UTC (rev 90811)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Unbound DNS Resolver
-After=network.target
-
-[Service]
-PIDFile=/run/unbound.pid
-ExecStart=/usr/sbin/unbound -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target