opendnssec-2.0.4-1: updating version

4 files changed, 57 insertions, 38 deletions

diff --git a/pcr/opendnssec/2.0-migrator.patch b/pcr/opendnssec/2.0-migrator.patch
new file mode 100644
index 000000000..ee2a0ab9d
--- /dev/null
+++ b/pcr/opendnssec/2.0-migrator.patch
@@ -0,0 +1,36 @@
+diff -u 1.4-2.0_db_convert/convert_mysql 1.4-2.0_db_convert2/convert_mysql
+--- enforcer/utils/1.4-2.0_db_convert/convert_mysql	2016-10-14 15:40:13.000000000 +0200
++++ enforcer/utils/1.4-2.0_db_convert/convert_mysql	2016-10-26 19:58:04.107679108 +0200
+@@ -5,7 +5,7 @@
+ # old and new databases live on the same host and are accessable by the same 
+ # user.
+ 
+-SCHEMA=../../src/db/schema.mysql
++SCHEMA=./schema.mysql
+ 
+ DB_IN=""
+ DB_OUT=""
+diff -u 1.4-2.0_db_convert/convert_sqlite 1.4-2.0_db_convert2/convert_sqlite
+--- enforcer/utils/1.4-2.0_db_convert/convert_sqlite	2016-10-14 15:40:13.000000000 +0200
++++ enforcer/utils/1.4-2.0_db_convert/convert_sqlite	2016-10-26 19:57:50.144369310 +0200
+@@ -3,7 +3,7 @@
+ 
+ # This scipt converts a ODS 1.4.9 Sqlite database to ODS 2.0.
+ 
+-SCHEMA=../../src/db/schema.sqlite
++SCHEMA=./schema.sqlite
+ 
+ DB_IN=""
+ DB_OUT=""
+diff -u 1.4-2.0_db_convert/README.md 1.4-2.0_db_convert2/README.md
+--- enforcer/utils/1.4-2.0_db_convert/README.md	2016-10-14 15:40:13.000000000 +0200
++++ enforcer/utils/1.4-2.0_db_convert/README.md	2016-10-26 19:56:58.251123704 +0200
+@@ -35,7 +35,7 @@
+  * sqlite_convert.sql - Contains SQL statements, called by convert_sqlite
+ 
+ call the script like so: `./convert_sqlite -i INPUT -o OUTPUT`. Where INPUT is
+-the kasp.db file commonly found in _/var/opendnssec/kasp.db_. And OUTPUT is a
++the kasp.db file commonly found in _/var/lib/opendnssec/kasp.db_. And OUTPUT is a
+ non-existing file where the new database should go. On success, replace old
+ database file with the new database file or adjust _conf.xml_ accordingly.
+ 
diff --git a/pcr/opendnssec/PKGBUILD b/pcr/opendnssec/PKGBUILD
index 56a291349..f2f1326de 100644
--- a/pcr/opendnssec/PKGBUILD
+++ b/pcr/opendnssec/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=opendnssec
-pkgver=1.4.9
+pkgver=2.0.4
 pkgrel=1
-pkgdesc="Turn-key solution for DNSSEC (sqlite3)"
+pkgdesc="Turn-key solution for DNSSEC"
 arch=('i686' 'x86_64')
 url="http://www.opendnssec.org/"
 license=('BSD')
@@ -23,37 +23,24 @@ install="opendnssec.install"
 changelog=
 source=("http://www.opendnssec.org/files/source/${pkgname}-${pkgver}.tar.gz"
 	"pid-path.patch"
+	"2.0-migrator.patch"
         "ods-signer.service"
         "ods-enforcer.service"
         "opendnssec.tmpfiles")
 noextract=()
 
-md5sums=('7d0c9e54d7ed36c6f6be9636997bea90'
-         '471ec859269bc2add2ad6f95539e8c04'
-         'e762cdc2c3f8be40aeff379aa4bade76'
-         'c5464f7be7984bb9a925da0b157eafdf'
-         '69908ba1f46c25e4c34bc91f45bc9660')
-sha1sums=('08736372058b5f1e5344261b21cf950243d74abb'
-          'a8234e007fb56262c450016d4058693b4fb7c98c'
+sha1sums=('dc80e427b6265d40f87aa8cc541853b46d3e9bf8'
+          'bca51f206c8bd646da78195b10f909ceb2baf233'
+          '04e8bf7504cf728b2c3744d19295a63839dd61ca'
           '2a4fac3a16fea3f89b281f0933b6920524978d49'
           'fa28111fdce06c389813ff6ed2d4cae136252488'
           'f10d783b3e0232fd3beff645a07207c161371d0c')
-sha256sums=('50a157d26d8b9ae370cd7fa52c7c6f43f4c77aeeb5d0fccd6a2e92c7dfc1d88e'
-            'c16b206258bca7fd0fd4838c23d3a1bd80bc33aaf355f6ccdbfbfb3b4c3a7e8f'
+sha256sums=('0eb1a74b9196c0b6d91a7c75a393da80d47dbcb603817d079a9f24c3fae9d8b9'
+            'f09ac11a2c00261f32d85b343fdba87e8ec72f9e7d01a24aa9ade0b8bb88f9d0'
+            '1a7f604364c050f7206ba893d109db5851c60cb5b000bd282ac55b81d8ff14ca'
             '596d238ad219de1c88f79fd26a8b829250bf0512a308b34c11fd231d0b4eb0f4'
             '75cecbfb0ece13957a68a5bc39c20a1d69b95373e7473545d70621e1732733d8'
             '28a43d8d5ee512db5425c86bdba9c5832753dce0260291958b1b73253e3ebf55')
-sha384sums=('e9c9a6169bd533052f273bfcec0c9d3bd9b708052894127d7cfd7a0889bfde35ea2da4fbf23605eafa0f83c27dbb778a'
-            '9fbdf5f5e50c1bddc9d7e0ea3126bb520b00cb3f764878629c86075303226b011e401158751a5d3086e22e8ac8f685e7'
-            '29d68ccca64339ab190518f6c5bffedba71287548634e305a12c98b7744984cc37f6a1748394ca0d96e709dbd520fe19'
-            '0869168e8c5a5064cbac0d2f0afe71539a68785d548752c609759381648b04015fc7c3ed9684aec944a914143c777a66'
-            '5c42366ad7b99d496679b089c1605b3af9060ba737350915439d8ef7bbcfd0f7128c389d256a62754bb79e5ad3e215c2')
-sha512sums=('5cf571750ff205667f5162f28c7575e28f15a7367afce5bb3cd3da080f429c3e0457f597abb76ba260f781a340a4ef78e991252404e694a10a051190d50b5c7f'
-            'd927457d2d7a5343c4480ff34237f49e3829cef65eefd71fb58ce4fa15d8d969126e64c5a59dc02cc7792876f8a5a91cd4de3c5bfe3acc0396663c8c139d7cce'
-            '39068133b3bfd075f3555491096be50ea0973a73ac716abb19faed0aa972ef043a6012491d4c6c208443352a2a508b8ebfbd7273fd84df43b3d6d478e72e7957'
-            'a3700c82e6577bdacbce9cfd749e71e3c749814884ad4e9a1359e97105f9c045dc1472ba231ecb52c23855cacf67874623c8eef715955bfd41239b199d03a0db'
-            'b221eec802ac471cd90908faa252d49ef2d217d6e48262a02490ae99fb64f3b82bc7f2dd2056d6e58b8bb1ca62072d52bffbc2bfd9f4eb794ec2d02275e88899')
-
 
 build() 
 {
@@ -62,6 +49,9 @@ build()
   # /var/lib/run -> /var/run
   patch -p0 < "${srcdir}/pid-path.patch"
 
+  # 1.4 -> 2.0 migrator
+  patch -p0 < "${srcdir}/2.0-migrator.patch"
+
   aclocal
   autoconf
   automake --add-missing
@@ -86,16 +76,15 @@ package() {
         "${pkgdir}/usr/lib/systemd/system/ods-signer.service"
   install -Dm0644 "${srcdir}/ods-enforcer.service" \
         "${pkgdir}/usr/lib/systemd/system/ods-enforcer.service"
-  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"
 
-  #Migration scripts for 1.4.8
-  /usr/bin/install -c -m 644 "enforcer/utils/migrate_1_4_8.mysql" "${pkgdir}/usr/share/opendnssec"
-  /usr/bin/install -c -m 644 "enforcer/utils/migrate_1_4_8.sqlite3" "${pkgdir}/usr/share/opendnssec"
+  # Migration scripts for 2.0
+  cp -r "enforcer/utils/1.4-2.0_db_convert/" "${pkgdir}/usr/share/opendnssec/"
+  install -Dm0644 "enforcer/src/db/schema.mysql" "${pkgdir}/usr/share/opendnssec/1.4-2.0_db_convert/schema.mysql"
+  install -Dm0644 "enforcer/src/db/schema.sqlite" "${pkgdir}/usr/share/opendnssec/1.4-2.0_db_convert/schema.sqlite"
 
   chown 227:227 "${pkgdir}/etc/opendnssec" -R
   chown 227:227 "${pkgdir}/var/lib/opendnssec" -R
diff --git a/pcr/opendnssec/opendnssec.install b/pcr/opendnssec/opendnssec.install
index e9e2eed80..c69a27248 100644
--- a/pcr/opendnssec/opendnssec.install
+++ b/pcr/opendnssec/opendnssec.install
@@ -16,17 +16,11 @@ post_upgrade() {
     post_install $1
     OLD=$(echo $2 | sed "s/\(.*\)\.\(.*\)\.\(.*\)/\1\.\2/g")
     NEW=$(echo $1 | sed "s/\(.*\)\.\(.*\)\.\(.*\)/\1\.\2/g")
-    if [ $OLD != "1.4" -a $NEW == "1.4" ]; then
-        echo ">> NOTICE: UPGRADE TO 1.4"
+    if [ $OLD != "2.0" -a $NEW == "2.0" ]; then
+        echo ">> NOTICE: UPGRADE TO 2.0"
         echo "This update requires upgrading the database"
-        echo "Run /usr/share/opendnssec/migrate_adapters_1.sqlite3 on your kasp database"
-	echo "e.g: sqlite3 kasp.db < /usr/share/opendnssec/migrate_adapters_1.sqlite3"
-    fi
-    if [ $OLD != "1.4.8" -a $NEW == "1.4.8" ]; then
-        echo ">> NOTICE: UPGRADE TO 1.4.8"
-        echo "This update requires upgrading the database"
-        echo "Run /usr/share/opendnssec/migrate_1_4_8.sqlite3 on your kasp database"
-        echo "e.g: sqlite3 kasp.db < /usr/share/opendnssec/migrate_1_4_8.sqlite3"
+	echo "Read /usr/share/opendnssec/1.4-2.0_db_convert/README.md"
+        echo "for instructions on how to convert the DB to the new format"
     fi
 }
 
diff --git a/pcr/opendnssec/pid-path.patch b/pcr/opendnssec/pid-path.patch
index 09194a128..4593aedcb 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
-@@ -29,8 +29,8 @@
+@@ -36,8 +36,8 @@
  	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
  	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
  	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed