opendnssec-1.4.7-2: updating version

6 files changed, 68 insertions, 95 deletions

diff --git a/pcr/opendnssec/LICENSE b/pcr/opendnssec/LICENSE
deleted file mode 100644
index 5700d408a..000000000
--- a/pcr/opendnssec/LICENSE
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2009 Nominet UK. All rights reserved.
- * Copyright (c) 2010 .SE (The Internet Infrastructure Foundation).
- * Copyright (c) 2009 NLNet Labs.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- *  Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- *  Permission to use, copy, modify, and distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* pkcs11.h
-   Copyright 2006, 2007 g10 Code GmbH
-   Copyright 2006 Andreas Jellinghaus
-
-   This file is free software; as a special exception the author gives
-   unlimited permission to copy and/or distribute it, with or without
-   modifications, as long as this notice is preserved.
-
-   This file is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY, to the extent permitted by law; without even
-   the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-   PURPOSE.  */
\ No newline at end of file
diff --git a/pcr/opendnssec/PKGBUILD b/pcr/opendnssec/PKGBUILD
index 54a880757..001d55f15 100644
--- a/pcr/opendnssec/PKGBUILD
+++ b/pcr/opendnssec/PKGBUILD
@@ -1,48 +1,74 @@
 # Maintainer (Arch): Javier Torres <javitonino [at] gmail [dot] com>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=opendnssec
-pkgver=1.4.0
-pkgrel=4
+pkgver=1.4.7
+pkgrel=2
 pkgdesc="Turn-key solution for DNSSEC (sqlite3)"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="http://www.opendnssec.org/"
 license=('BSD')
-depends=('libxml2' 'ldns' 'sqlite3' 'softhsm')
+groups=()
+depends=('libxml2>=2.6.16' 'ldns>=1.6.16' 'sqlite3>=3.3.9')
+makedepends=()
+optdepends=('softhsm: key storage')
+provides=()
+conflicts=()
+replaces=()
 backup=("etc/opendnssec/conf.xml"
         "etc/opendnssec/kasp.xml"
         "etc/opendnssec/zonelist.xml")
+options=()
 install="opendnssec.install"
-source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        "pid-path.patch"
+changelog=
+source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"
+	"pid-path.patch"
         "ods-signer.service"
-        "ods-enforcer.service")
-sha256sums=('36d4926dcdf351a527ad7600b151ab6cc56d0a472a7eb8871eecd70afef9e101'
-            'SKIP'
-            '1cc1c1ec75a5a5f2c35e019ac6dfd2153fa6f10705dc242aaf6ceb21796097f0'
-            '1a8cdec0e97a33048956268b766da570f8f7a90d05af59e547219f1381832071'
-            '75cecbfb0ece13957a68a5bc39c20a1d69b95373e7473545d70621e1732733d8')
+        "ods-enforcer.service"
+        "opendnssec.tmpfiles")
+noextract=()
 
-prepare() {
+md5sums=('363387b90624acc2e3f6d33fea23c2d3'
+         '471ec859269bc2add2ad6f95539e8c04'
+         'e762cdc2c3f8be40aeff379aa4bade76'
+         'c5464f7be7984bb9a925da0b157eafdf'
+         '69908ba1f46c25e4c34bc91f45bc9660')
+sha1sums=('c8a5808d68a50db8ed7edf806a58f54428ad7aa8'
+          'a8234e007fb56262c450016d4058693b4fb7c98c'
+          '2a4fac3a16fea3f89b281f0933b6920524978d49'
+          'fa28111fdce06c389813ff6ed2d4cae136252488'
+          'f10d783b3e0232fd3beff645a07207c161371d0c')
+sha256sums=('8f757ca9e88d6a6dc8f9b6e46a3da5e3a2881b3311fb91c428bcf906683ac41f'
+            'c16b206258bca7fd0fd4838c23d3a1bd80bc33aaf355f6ccdbfbfb3b4c3a7e8f'
+            '596d238ad219de1c88f79fd26a8b829250bf0512a308b34c11fd231d0b4eb0f4'
+            '75cecbfb0ece13957a68a5bc39c20a1d69b95373e7473545d70621e1732733d8'
+            '28a43d8d5ee512db5425c86bdba9c5832753dce0260291958b1b73253e3ebf55')
+sha384sums=('b99c5cd05eb11167f353a5b95d01e1f2c2cadf9c1e49c04afe99f2b083338589d189b5c651274378a427c278cb7ad7ac'
+            '9fbdf5f5e50c1bddc9d7e0ea3126bb520b00cb3f764878629c86075303226b011e401158751a5d3086e22e8ac8f685e7'
+            '29d68ccca64339ab190518f6c5bffedba71287548634e305a12c98b7744984cc37f6a1748394ca0d96e709dbd520fe19'
+            '0869168e8c5a5064cbac0d2f0afe71539a68785d548752c609759381648b04015fc7c3ed9684aec944a914143c777a66'
+            '5c42366ad7b99d496679b089c1605b3af9060ba737350915439d8ef7bbcfd0f7128c389d256a62754bb79e5ad3e215c2')
+sha512sums=('def2a8e41331bd70f287ea3081a7368144ada92ad5cc9f62d28d3064e34f7c0c84998422d515f5ec9c7e668757e796df8c5446839e24e4a9e2af1357c342c0b2'
+            'd927457d2d7a5343c4480ff34237f49e3829cef65eefd71fb58ce4fa15d8d969126e64c5a59dc02cc7792876f8a5a91cd4de3c5bfe3acc0396663c8c139d7cce'
+            '39068133b3bfd075f3555491096be50ea0973a73ac716abb19faed0aa972ef043a6012491d4c6c208443352a2a508b8ebfbd7273fd84df43b3d6d478e72e7957'
+            'a3700c82e6577bdacbce9cfd749e71e3c749814884ad4e9a1359e97105f9c045dc1472ba231ecb52c23855cacf67874623c8eef715955bfd41239b199d03a0db'
+            'b221eec802ac471cd90908faa252d49ef2d217d6e48262a02490ae99fb64f3b82bc7f2dd2056d6e58b8bb1ca62072d52bffbc2bfd9f4eb794ec2d02275e88899')
+
+
+build() 
+{
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # /var/lib/run -> /run
-  patch -p0 -i "${srcdir}/pid-path.patch"
+
+  # /var/lib/run -> /var/run
+  patch -p0 < "${srcdir}/pid-path.patch"
 
   aclocal
   autoconf
   automake --add-missing
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr \
-              --datarootdir=/usr/share \
-              --localstatedir=/var/lib \
-              --sysconfdir=/etc \
-              --with-pkcs11-softhsm=/usr/lib/libsofthsm.so \
-              --sbindir=/usr/bin
+  ./configure --prefix=/usr --datarootdir=/usr/share --localstatedir=/var/lib --sysconfdir=/etc --with-pkcs11-softhsm=/usr/lib/libsofthsm.so --sbindir=/usr/bin
 
-  # Create the correct (/run/opendnssec) directory
+  # Create the correct (/var/run/opendnssec) directory
   sed -i \
   -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run\/opendnssec/#Removed/" \
   -e "s/\$(INSTALL) -d \$(DESTDIR)\$(localstatedir)\/run/\$(INSTALL) -d \$(DESTDIR)\$(OPENDNSSEC_PID_DIR)/" \
@@ -54,24 +80,24 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  install -d "${pkgdir}/run/opendnssec"
-
   make DESTDIR="${pkgdir}" install
 
-  install -d "${pkgdir}/etc/rc.d"
   install -Dm0644 "${srcdir}/ods-signer.service" \
         "${pkgdir}/usr/lib/systemd/system/ods-signer.service"
   install -Dm0644 "${srcdir}/ods-enforcer.service" \
         "${pkgdir}/usr/lib/systemd/system/ods-enforcer.service"
-  install -Dm0644 "LICENSE" \
-        "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -Dm0644 "enforcer/utils/migrate_adapters_1.sqlite3" \
         "${pkgdir}/usr/share/opendnssec"
+  install -Dm0644 "${srcdir}/opendnssec.tmpfiles" \
+        "${pkgdir}/usr/lib/tmpfiles.d/opendnssec.conf"
+  install -Dm0644 "LICENSE" \
+        "${pkgdir}/usr/share/licenses/opendnssec/LICENSE"
+
+  chown 227:227 "${pkgdir}/etc/opendnssec" -R
+  chown 227:227 "${pkgdir}/var/lib/opendnssec" -R
 
-  chown -R 227:227 "${pkgdir}/etc/opendnssec" \
-                   "${pkgdir}/var/lib/opendnssec" \
-                   "${pkgdir}/run/opendnssec"
   chmod 750 "${pkgdir}/etc/opendnssec" \
-            "${pkgdir}/var/lib/opendnssec" \
-            "${pkgdir}/run/opendnssec"
+            "${pkgdir}/var/lib/opendnssec"
+            
+  rm "${pkgdir}/run" -R
 }
diff --git a/pcr/opendnssec/ods-signer.service b/pcr/opendnssec/ods-signer.service
index 26cc03481..ab723e884 100644
--- a/pcr/opendnssec/ods-signer.service
+++ b/pcr/opendnssec/ods-signer.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=OpenDNSSEC Signer
-After=syslog.target nerwork.target
+After=syslog.target network.target
 
 [Service]
 Type=forking
diff --git a/pcr/opendnssec/opendnssec.install b/pcr/opendnssec/opendnssec.install
index 0c74659ee..184803ba5 100644
--- a/pcr/opendnssec/opendnssec.install
+++ b/pcr/opendnssec/opendnssec.install
@@ -5,6 +5,8 @@ post_install() {
     if [ -z "`grep '^opendnssec:' /etc/passwd`" ]; then
         useradd -u 227 -d /var/lib/opendnssec -g opendnssec -s /bin/false opendnssec
     fi
+    
+    systemd-tmpfiles --create opendnssec.conf
 
     echo ">> You need an HSM implementation (try softhsm)"
 }
diff --git a/pcr/opendnssec/opendnssec.tmpfiles b/pcr/opendnssec/opendnssec.tmpfiles
new file mode 100644
index 000000000..797fcdf52
--- /dev/null
+++ b/pcr/opendnssec/opendnssec.tmpfiles
@@ -0,0 +1 @@
+d /run/opendnssec 0750 opendnssec opendnssec
\ No newline at end of file
diff --git a/pcr/opendnssec/pid-path.patch b/pcr/opendnssec/pid-path.patch
index 122b68e08..09194a128 100644
--- a/pcr/opendnssec/pid-path.patch
+++ b/pcr/opendnssec/pid-path.patch
@@ -1,6 +1,6 @@
 --- Makefile.am	2012-07-17 08:53:51.000000000 +0200
 +++ Makefile.am	2012-11-20 21:56:11.000000000 +0100
-@@ -30,8 +30,8 @@
+@@ -29,8 +29,8 @@
  	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
  	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
  	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
@@ -13,7 +13,7 @@
  	(cd libhsm; $(MAKE) doxygen)
 --- m4/opendnssec_common.m4	2012-11-01 11:56:59.000000000 +0100
 +++ m4/opendnssec_common.m4	2012-11-20 21:52:56.000000000 +0100
-@@ -19,7 +19,7 @@
+@@ -17,7 +17,7 @@
  OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
  OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
  OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"