[pkgsrc/trunk]: pkgsrc/security/opendnssec2 Add a patch to fix a bug in the s...

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/57d9c56c939d
branches:  trunk
changeset: 448145:57d9c56c939d
user:      he <he%pkgsrc.org@localhost>
date:      Fri Mar 05 21:17:25 2021 +0000

description:
Add a patch to fix a bug in the sqlite3 conversion script,
so that the salt value gets copied to the new kasp.db.

Bump PKGREVISION.

diffstat:

 security/opendnssec2/Makefile                                                              |   9 +-
 security/opendnssec2/distinfo                                                              |   3 +-
 security/opendnssec2/patches/patch-enforcer_utils_1.4-2.0__db__convert_sqlite__convert.sql |  26 ++++++++++
 3 files changed, 33 insertions(+), 5 deletions(-)

diffs (75 lines):

diff -r 6991cff55b5e -r 57d9c56c939d security/opendnssec2/Makefile
--- a/security/opendnssec2/Makefile     Fri Mar 05 21:14:10 2021 +0000
+++ b/security/opendnssec2/Makefile     Fri Mar 05 21:17:25 2021 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2021/02/21 09:12:48 he Exp $
+# $NetBSD: Makefile,v 1.10 2021/03/05 21:17:25 he Exp $
 #
 
 DISTNAME=      opendnssec-2.1.8
 PKGNAME=       ${DISTNAME:S/opendnssec/opendnssec2/}
+PKGREVISION=   1
 CATEGORIES=    security net
 MASTER_SITES=  https://www.opendnssec.org/files/source/
 
@@ -54,14 +55,14 @@
 MIGRATE_FILES+=                sqlite_convert.sql
 
 SUBST_CLASSES+=                paths
-SUBST_FILES.paths=     ${WRKSRC}/conf/Makefile.in
+SUBST_FILES.paths=     conf/Makefile.in
 SUBST_STAGE.paths=     pre-configure
 SUBST_VARS.paths=      EGDIR
 
 # Prepare files for installation
 SUBST_CLASSES+=                migrate
-SUBST_FILES.migrate+=  ${WRKSRC}/${CONVERT_DIR}/convert_sqlite
-SUBST_FILES.migrate+=  ${WRKSRC}/${CONVERT_DIR}/convert_mysql
+SUBST_FILES.migrate+=  ${CONVERT_DIR}/convert_sqlite
+SUBST_FILES.migrate+=  ${CONVERT_DIR}/convert_mysql
 SUBST_STAGE.migrate=   pre-configure
 SUBST_SED.migrate=     -e 's,SCHEMA=../../src/db/,SCHEMA=./,'
 
diff -r 6991cff55b5e -r 57d9c56c939d security/opendnssec2/distinfo
--- a/security/opendnssec2/distinfo     Fri Mar 05 21:14:10 2021 +0000
+++ b/security/opendnssec2/distinfo     Fri Mar 05 21:17:25 2021 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2021/02/21 09:12:48 he Exp $
+$NetBSD: distinfo,v 1.5 2021/03/05 21:17:25 he Exp $
 
 SHA1 (opendnssec-2.1.8.tar.gz) = d425f79f1378fc78d073097c02faf2b11a7bc2d1
 RMD160 (opendnssec-2.1.8.tar.gz) = ab2500a720a630b807e28c2a156aa3cd67fe17c3
 SHA512 (opendnssec-2.1.8.tar.gz) = 48fa9e1efe54d00bba1c97d42d8680a7b33d90360cbb12e333835384447a9d42ffc6508ee6b455bfa4522907b371d4703068e4fd184fd72ea6d950427029cc1c
 Size (opendnssec-2.1.8.tar.gz) = 1151571 bytes
 SHA1 (patch-conf_Makefile.in) = 83fdf2650bfe63688b072dcb8019d44b62f6f016
+SHA1 (patch-enforcer_utils_1.4-2.0__db__convert_sqlite__convert.sql) = 6f59b2f7031be04dc3f7776cf2ac4807dee4fba7
diff -r 6991cff55b5e -r 57d9c56c939d security/opendnssec2/patches/patch-enforcer_utils_1.4-2.0__db__convert_sqlite__convert.sql
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/opendnssec2/patches/patch-enforcer_utils_1.4-2.0__db__convert_sqlite__convert.sql        Fri Mar 05 21:17:25 2021 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-enforcer_utils_1.4-2.0__db__convert_sqlite__convert.sql,v 1.1 2021/03/05 21:17:25 he Exp $
+
+Fix bug in conversion script so that salt gets carried
+over and not set to "0" in the target kasp.db, something
+OpenDNSSEC will not recover from.
+
+--- enforcer/utils/1.4-2.0_db_convert/sqlite_convert.sql.orig  2021-02-20 21:04:47.000000000 +0000
++++ enforcer/utils/1.4-2.0_db_convert/sqlite_convert.sql
+@@ -222,7 +222,7 @@ SET denialSalt = (
+ WHERE (
+       SELECT salt
+       FROM  REMOTE.policies
+-      WHERE REMOTE.policies.id = policy.id) != null;
++      WHERE REMOTE.policies.id = policy.id) IS NOT NULL;
+ 
+ UPDATE policy
+ SET denialSaltLastChange = (
+@@ -232,7 +232,7 @@ SET denialSaltLastChange = (
+ WHERE (
+       SELECT salt_stamp
+       FROM  REMOTE.policies
+-      WHERE REMOTE.policies.id = policy.id) != null;
++      WHERE REMOTE.policies.id = policy.id) IS NOT NULL;
+ 
+ UPDATE policy
+ SET keysTtl = (