[Pkg-freeipa-devel] [Git][freeipa-team/bind-dyndb-ldap][master] 5 commits: hardcode-version.diff: Hardcode the abi version.
Timo Aaltonen (@tjaalton)
gitlab at salsa.debian.org
Wed Nov 17 19:07:31 GMT 2021
Timo Aaltonen pushed to branch master at FreeIPA packaging / bind-dyndb-ldap
Commits:
770f4b79 by Timo Aaltonen at 2021-11-17T20:55:20+02:00
hardcode-version.diff: Hardcode the abi version.
- - - - -
9575cd8c by Timo Aaltonen at 2021-11-17T20:56:20+02:00
fix-atomics.diff: Set GNUC_ATOMICS.
- - - - -
fabbdaea by Timo Aaltonen at 2021-11-17T20:59:57+02:00
use-isc_result_totext.diff: Migrate to isc_result_totext.
- - - - -
da59687b by Timo Aaltonen at 2021-11-17T21:02:08+02:00
use-dns_name_copy.diff: Use dns_name_copy.
- - - - -
514c04e6 by Timo Aaltonen at 2021-11-17T21:04:43+02:00
fix-typo.diff: Fix a typo.
- - - - -
7 changed files:
- debian/changelog
- + debian/patches/fix-atomics.diff
- + debian/patches/fix-typo.diff
- + debian/patches/hardcode-version.diff
- debian/patches/series
- + debian/patches/use-dns_name_copy.diff
- + debian/patches/use-isc_result_totext.diff
Changes:
=====================================
debian/changelog
=====================================
@@ -2,6 +2,11 @@ bind-dyndb-ldap (11.9-4) UNRELEASED; urgency=medium
* Rebuild against bind9 9.17.19-3. (Closes: #998575, #999463)
* Fix keytab name.
+ * hardcode-version.diff: Hardcode the abi version.
+ * fix-atomics.diff: Set GNUC_ATOMICS.
+ * use-isc_result_totext.diff: Migrate to isc_result_totext.
+ * use-dns_name_copy.diff: Use dns_name_copy.
+ * fix-typo.diff: Fix a typo.
-- Timo Aaltonen <tjaalton at debian.org> Fri, 05 Nov 2021 08:56:07 +0200
=====================================
debian/patches/fix-atomics.diff
=====================================
@@ -0,0 +1,96 @@
+--- a/src/fwd_register.c
++++ b/src/fwd_register.c
+@@ -2,6 +2,8 @@
+ * Copyright (C) 2013-2014 bind-dyndb-ldap authors; see COPYING for license
+ */
+
++#define __GNUC_ATOMICS
++
+ #include <isc/rwlock.h>
+ #include <isc/util.h>
+ #include <dns/name.h>
+--- a/src/ldap_helper.c
++++ b/src/ldap_helper.c
+@@ -6,6 +6,8 @@
+ #define HAVE_TLS 1
+ #define HAVE_THREAD_LOCAL 1
+
++#define __GNUC_ATOMICS
++
+ #include <dns/dyndb.h>
+ #include <dns/diff.h>
+ #include <dns/journal.h>
+--- a/src/rbt_helper.h
++++ b/src/rbt_helper.h
+@@ -5,6 +5,8 @@
+ #ifndef _LD_RBT_HELPER_H_
+ #define _LD_RBT_HELPER_H_
+
++#define __GNUC_ATOMICS
++
+ #include <isc/rwlock.h>
+ #include <dns/rbt.h>
+ #include "util.h"
+--- a/src/zone_register.c
++++ b/src/zone_register.c
+@@ -2,6 +2,8 @@
+ * Copyright (C) 2009-2014 bind-dyndb-ldap authors; see COPYING for license
+ */
+
++#define __GNUC_ATOMICS
++
+ #include <isc/mem.h>
+ #include <isc/rwlock.h>
+ #include <isc/util.h>
+--- a/src/acl.c
++++ b/src/acl.c
+@@ -2,6 +2,8 @@
+ * Copyright (C) 2009-2014 bind-dyndb-ldap authors; see COPYING for license
+ */
+
++#define __GNUC_ATOMICS
++
+ #include "dyndb-config.h"
+
+ #include <isccfg/aclconf.h>
+--- a/src/empty_zones.c
++++ b/src/empty_zones.c
+@@ -1,3 +1,5 @@
++#define __GNUC_ATOMICS
++
+ #include <stdio.h>
+
+ #include <isc/result.h>
+--- a/src/fwd.c
++++ b/src/fwd.c
+@@ -4,6 +4,8 @@
+ * DNS forwarding helpers.
+ */
+
++#define __GNUC_ATOMICS
++
+ #include "dyndb-config.h"
+
+ #include <isccfg/grammar.h>
+--- a/src/ldap_convert.c
++++ b/src/ldap_convert.c
+@@ -2,6 +2,8 @@
+ * Copyright (C) 2009-2015 bind-dyndb-ldap authors; see COPYING for license
+ */
+
++#define __GNUC_ATOMICS
++
+ #include <isc/buffer.h>
+ #include <isc/hex.h>
+ #include <isc/mem.h>
+--- a/src/bindcfg.c
++++ b/src/bindcfg.c
+@@ -4,6 +4,8 @@
+ * Utilities for BIND configuration parsers.
+ */
+
++#define __GNUC_ATOMICS
++
+ #include "dyndb-config.h"
+
+ #include <isc/util.h>
=====================================
debian/patches/fix-typo.diff
=====================================
@@ -0,0 +1,11 @@
+--- a/src/str.h
++++ b/src/str.h
+@@ -17,7 +17,7 @@
+ #define _STR_MEM_FLARG_PASS , file, line
+ #else
+ #define _STR_MEM_FILELINE
+-#define _STR_MEM_FLAG
++#define _STR_MEM_FLARG
+ #define _STR_MEM_FLARG_PASS
+ #endif
+
=====================================
debian/patches/hardcode-version.diff
=====================================
@@ -0,0 +1,34 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -92,30 +92,7 @@ AC_CHECK_LIB([uuid], [uuid_unparse], [],
+
+ AC_LANG(C)
+ # Check version of libdns
+-AC_MSG_CHECKING([libdns version])
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([
+-#include <stdio.h>
+-#include <dns/version.h>
+-],[ printf("%d\n", dns_libinterface) ])], [
+- LIBDNS_VERSION_MAJOR=`./conftest$ac_exeext`
+- AC_DEFINE_UNQUOTED([LIBDNS_VERSION_MAJOR], [$LIBDNS_VERSION_MAJOR],
+- [Define libdns version])], [
+- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+-#include <stdio.h>
+-#include <dns/version.h>
+-]],[[
+- unsigned major, minor, patch, scanned;
+- /* emulate dns_libinterface from minor and patch version */
+- scanned = sscanf(dns_version, "%u.%u.%u", &major, &minor, &patch);
+- printf("%02d%02d\n", minor, patch);
+- return !(scanned == 3 && major == 9);
+- ]])], [
+- LIBDNS_VERSION_MAJOR=`./conftest$ac_exeext`
+- AC_DEFINE_UNQUOTED([LIBDNS_VERSION_MAJOR], [$LIBDNS_VERSION_MAJOR],
+- [Define libdns version])],
+- [AC_MSG_ERROR([Can't obtain libdns version.])])
+-], [AC_MSG_ERROR([Cross compiling is not supported.])]
+-)
++AC_DEFINE_UNQUOTED([LIBDNS_VERSION_MAJOR], [1700], [Define libdns version])
+
+ dnl isc_errno_toresult() was not available in older header files
+ AC_MSG_CHECKING([isc_errno_toresult availability])
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,8 @@
fix-keytab-path.diff
fix-werror-build.diff
0001-Skip-isc_bind9-check-on-BIND-9.16.17.patch
+hardcode-version.diff
+fix-atomics.diff
+use-isc_result_totext.diff
+use-dns_name_copy.diff
+fix-typo.diff
=====================================
debian/patches/use-dns_name_copy.diff
=====================================
@@ -0,0 +1,58 @@
+--- a/src/empty_zones.c
++++ b/src/empty_zones.c
+@@ -239,7 +239,7 @@ empty_zone_search_init(empty_zone_search
+ REQUIRE(dns_name_isabsolute(qname));
+
+ INIT_BUFFERED_NAME(iter->qname);
+- dns_name_copynf(qname, &iter->qname);
++ dns_name_copy(qname, &iter->qname);
+
+ INIT_BUFFERED_NAME(iter->ezname);
+ iter->nextidx = 0;
+--- a/src/ldap_convert.c
++++ b/src/ldap_convert.c
+@@ -138,7 +138,7 @@ dn_to_dnsname(isc_mem_t *mctx, const cha
+ } else if (idx == 1) { /* zone only */
+ if (iszone != NULL)
+ *iszone = true;
+- dns_name_copynf(dns_rootname, &origin);
++ dns_name_copy(dns_rootname, &origin);
+ CHECK(dns_name_fromtext(&name, &name_buf, dns_rootname, 0, NULL));
+ } else if (idx == 2) { /* owner and zone */
+ if (iszone != NULL)
+--- a/src/mldap.c
++++ b/src/mldap.c
+@@ -344,8 +344,8 @@ mldap_dnsname_get(metadb_node_t *node, d
+ CHECK(metadb_rdataset_get(node, dns_rdatatype_rp, &rdataset));
+ dns_rdataset_current(&rdataset, &rdata);
+ CHECK(dns_rdata_tostruct(&rdata, &rp, NULL));
+- dns_name_copynf(&rp.mail, fqdn);
+- dns_name_copynf(&rp.text, zone);
++ dns_name_copy(&rp.mail, fqdn);
++ dns_name_copy(&rp.text, zone);
+
+ cleanup:
+ if (dns_rdataset_isassociated(&rdataset))
+--- a/src/syncptr.c
++++ b/src/syncptr.c
+@@ -402,7 +402,7 @@ sync_ptr_init(isc_mem_t *mctx, dns_zt_t
+ isc_mem_attach(mctx, &ev->mctx);
+ INIT_BUFFERED_NAME(ev->a_name);
+ INIT_BUFFERED_NAME(ev->ptr_name);
+- dns_name_copynf(a_name, &ev->a_name);
++ dns_name_copy(a_name, &ev->a_name);
+ ev->mod_op = mod_op;
+ strncpy(ev->ip_str, ip_str, sizeof(ev->ip_str));
+ ev->ip_str[sizeof(ev->ip_str) - 1] = '\0';
+--- a/src/acl.c
++++ b/src/acl.c
+@@ -306,8 +306,7 @@ acl_configure_zone_ssutable(const char *
+ if (result == ISC_R_NOTFOUND &&
+ match_type == dns_ssumatchtype_subdomain) {
+ CHECK(dns_name_copy(dns_zone_getorigin(zone),
+- dns_fixedname_initname(&fname),
+- &fname.buffer));
++ dns_fixedname_initname(&fname)));
+ }
+ else if (result != ISC_R_SUCCESS)
+ goto cleanup;
=====================================
debian/patches/use-isc_result_totext.diff
=====================================
@@ -0,0 +1,53 @@
+--- a/src/fwd.c
++++ b/src/fwd.c
+@@ -594,7 +594,7 @@ fwd_configure_zone(const settings_set_t
+ lock_state = ISC_R_IGNORE; /* prevent double-unlock */
+ log_debug(5, "%s %s: forwarder table was updated: %s",
+ msg_obj_type, set->name,
+- dns_result_totext(result));
++ isc_result_totext(result));
+
+ /* Handle collisions with automatic empty zones. */
+ if (isconfigured == true)
+--- a/src/ldap_helper.c
++++ b/src/ldap_helper.c
+@@ -1223,7 +1223,7 @@ activate_zone(ldap_instance_t *inst, dns
+ if (result != ISC_R_SUCCESS) {
+ dns_zone_log(toview, ISC_LOG_ERROR,
+ "cannot add zone to view: %s",
+- dns_result_totext(result));
++ isc_result_totext(result));
+ goto cleanup;
+ }
+
+@@ -4068,7 +4068,7 @@ cleanup:
+ "unable to reload invalid zone; "
+ "reload triggered by change in %s: %s",
+ ldap_entry_logname(entry),
+- dns_result_totext(result));
++ isc_result_totext(result));
+ }
+
+ } else if (result != ISC_R_SUCCESS) {
+--- a/src/log.h
++++ b/src/log.h
+@@ -24,7 +24,7 @@
+ log_error("bug in %s(): " fmt, __func__,##__VA_ARGS__)
+
+ #define log_error_r(fmt, ...) \
+- log_error(fmt ": %s", ##__VA_ARGS__, dns_result_totext(result))
++ log_error(fmt ": %s", ##__VA_ARGS__, isc_result_totext(result))
+
+ #define log_error_position(format, ...) \
+ log_error("[%-15s: %4d: %-21s] " format, \
+--- a/src/util.h
++++ b/src/util.h
+@@ -30,7 +30,7 @@ extern bool verbose_checks; /* from sett
+ if (result != ISC_R_SUCCESS) { \
+ if (verbose_checks == true) \
+ log_error_position("check failed: %s", \
+- dns_result_totext(result)); \
++ isc_result_totext(result)); \
+ goto cleanup; \
+ } \
+ } while (0)
View it on GitLab: https://salsa.debian.org/freeipa-team/bind-dyndb-ldap/-/compare/88c775c9dd62492f91290a82b74f67a099d33416...514c04e67e15951026aa1e86b2e4765fb4f68084
--
View it on GitLab: https://salsa.debian.org/freeipa-team/bind-dyndb-ldap/-/compare/88c775c9dd62492f91290a82b74f67a099d33416...514c04e67e15951026aa1e86b2e4765fb4f68084
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20211117/3999bfb0/attachment-0001.htm>
More information about the Pkg-freeipa-devel
mailing list