commit:     11cb2ae479c8af8c7b88107ff8c8c37d66ebdc39
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  4 07:51:28 2023 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Dec  4 07:53:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11cb2ae4

net-dns/opendnssec: add 2.1.13, drop 2.1.10-r2

Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>

 net-dns/opendnssec/Manifest                        |  2 +-
 .../opendnssec/files/opendnssec-fix-mysql.patch    | 39 ++++++++++++++++++++++
 ...c-2.1.10-r2.ebuild => opendnssec-2.1.13.ebuild} |  5 +--
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index c14ca9969b6a..cc67e3c2f5bf 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1 +1 @@
-DIST opendnssec-2.1.10.tar.gz 1142027 BLAKE2B 
063650744ffd1c6d6d3b702400c9617883394c6794743f7d61bd63f7bdaf688a3f2a80f47612e561a133a5689dad8b5f7392eec69779d1dc5632a121d9a41c8f
 SHA512 
c7fdbf1c3867d7b53ac11ab5cb5e636af4595dbee8d704429c7fb84cc3a6b2082ed490c33aad7747d4ee1a2c580afcf24a260bc3ed29eaf5e9d337004045b82d
+DIST opendnssec-2.1.13.tar.gz 1161140 BLAKE2B 
964a612e191bf5feb09a8b214e3341fbe5fc03c847e22b33bfc64ec7712608fd0f944c3b089901f08d7e3d2a27cb47543b3d5d210de48708192bb87546dacfa3
 SHA512 
5f3926f0f144cf8819895da2ec81fce21e2a05cf0b83dd9174a72ebfdef99badc3bcff2d6685c498485113209e7c73ab9cf55b3e126009ce6cbcc3cde54d6051

diff --git a/net-dns/opendnssec/files/opendnssec-fix-mysql.patch 
b/net-dns/opendnssec/files/opendnssec-fix-mysql.patch
new file mode 100644
index 000000000000..b138892dc232
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-fix-mysql.patch
@@ -0,0 +1,39 @@
+diff -urN opendnssec-2.1.13.orig/enforcer/src/db/db_backend_mysql.c 
opendnssec-2.1.13/enforcer/src/db/db_backend_mysql.c
+--- opendnssec-2.1.13.orig/enforcer/src/db/db_backend_mysql.c  2023-06-26 
13:24:05.000000000 +0200
++++ opendnssec-2.1.13/enforcer/src/db/db_backend_mysql.c       2023-12-04 
08:39:37.685365824 +0100
+@@ -72,7 +72,7 @@
+     db_backend_mysql_bind_t* next;
+     MYSQL_BIND* bind;
+     unsigned long length;
+-    my_bool error;
++    _Bool error;
+     int value_enum;
+ };
+ 
+@@ -270,7 +270,7 @@
+             }
+ 
+             bind->bind = (mysql_bind = &((*statement)->mysql_bind_output[i]));
+-            mysql_bind->is_null = (my_bool*)0;
++            mysql_bind->is_null = (_Bool*)0;
+             mysql_bind->error = &bind->error;
+             mysql_bind->length = &bind->length;
+ 
+@@ -959,7 +959,7 @@
+         }
+ 
+         (*bind)->bind->length = &((*bind)->bind->buffer_length);
+-        (*bind)->bind->is_null = (my_bool*)0;
++        (*bind)->bind->is_null = (_Bool*)0;
+ 
+         switch (db_clause_type(clause)) {
+         case DB_CLAUSE_EQUAL:
+@@ -1079,7 +1079,7 @@
+     }
+ 
+     bind->bind->length = &(bind->bind->buffer_length);
+-    bind->bind->is_null = (my_bool*)0;
++    bind->bind->is_null = (_Bool*)0;
+ 
+     switch (db_value_type(value)) {
+     case DB_TYPE_PRIMARY_KEY:

diff --git a/net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild 
b/net-dns/opendnssec/opendnssec-2.1.13.ebuild
similarity index 98%
rename from net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild
rename to net-dns/opendnssec/opendnssec-2.1.13.ebuild
index 771b0a19985f..6ed5a297adfb 100644
--- a/net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.1.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_P="${P/_}"
 PKCS11_IUSE="+softhsm opensc external-hsm"
@@ -58,6 +58,7 @@ REQUIRED_USE="
 PATCHES=(
        "${FILESDIR}/${PN}-fix-run-dir-2.1.x.patch"
        "${FILESDIR}/${PN}-use-system-trang.patch"
+       "${FILESDIR}/${PN}-fix-mysql.patch"
 )
 
 DOCS=( MIGRATION NEWS )

Reply via email to