[Pkg-freeipa-devel] [Git][freeipa-team/bind-dyndb-ldap][master] 6 commits: rules: Add -Wno-uninitialized to CFLAGS.
Timo Aaltonen (@tjaalton)
gitlab at salsa.debian.org
Wed Nov 17 21:25:33 GMT 2021
Timo Aaltonen pushed to branch master at FreeIPA packaging / bind-dyndb-ldap
Commits:
d9da4ead by Timo Aaltonen at 2021-11-17T23:14:21+02:00
rules: Add -Wno-uninitialized to CFLAGS.
- - - - -
db69c28d by Timo Aaltonen at 2021-11-17T23:15:00+02:00
patches: Updated
- - - - -
144820ce by Timo Aaltonen at 2021-11-17T23:19:22+02:00
use-dns_ssuruletype_t.diff: Migrate to dns_ssuruletype_t.
- - - - -
3586b9fa by Timo Aaltonen at 2021-11-17T23:21:18+02:00
define-have-threads-h.diff: Adjust for current bind9.
- - - - -
c06299ae by Timo Aaltonen at 2021-11-17T23:23:32+02:00
drop-serialize.diff: dns_db_serialize is gone.
- - - - -
a1f9ec66 by Timo Aaltonen at 2021-11-17T23:25:00+02:00
releasing package bind-dyndb-ldap version 11.9-4
- - - - -
8 changed files:
- debian/changelog
- + debian/patches/define-have-threads-h.diff
- + debian/patches/drop-serialize.diff
- debian/patches/fix-atomics.diff
- debian/patches/series
- debian/patches/use-dns_name_copy.diff
- + debian/patches/use-dns_ssuruletype_t.diff
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-bind-dyndb-ldap (11.9-4) UNRELEASED; urgency=medium
+bind-dyndb-ldap (11.9-4) unstable; urgency=medium
* Rebuild against bind9 9.17.19-3. (Closes: #998575, #999463)
* Fix keytab name.
@@ -7,8 +7,12 @@ bind-dyndb-ldap (11.9-4) UNRELEASED; urgency=medium
* 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.
+ * rules: Add -Wno-uninitialized to CFLAGS.
+ * use-dns_ssuruletype_t.diff: Migrate to dns_ssuruletype_t.
+ * define-have-threads-h.diff: Adjust for current bind9.
+ * drop-serialize.diff: dns_db_serialize is gone.
- -- Timo Aaltonen <tjaalton at debian.org> Fri, 05 Nov 2021 08:56:07 +0200
+ -- Timo Aaltonen <tjaalton at debian.org> Wed, 17 Nov 2021 23:24:37 +0200
bind-dyndb-ldap (11.9-3) unstable; urgency=medium
=====================================
debian/patches/define-have-threads-h.diff
=====================================
@@ -0,0 +1,11 @@
+--- a/src/ldap_helper.c
++++ b/src/ldap_helper.c
+@@ -4,7 +4,7 @@
+
+ #include "dyndb-config.h"
+ #define HAVE_TLS 1
+-#define HAVE_THREAD_LOCAL 1
++#define HAVE_THREADS_H 1
+
+ #define __GNUC_ATOMICS
+
=====================================
debian/patches/drop-serialize.diff
=====================================
@@ -0,0 +1,39 @@
+--- a/src/ldap_driver.c
++++ b/src/ldap_driver.c
+@@ -13,10 +13,10 @@
+ #include <isc/buffer.h>
+ #include <isc/commandline.h>
+ #include <isc/hash.h>
+-#include <isc/lib.h>
+ #include <isc/mem.h>
+ #include <isc/once.h>
+ #include <isc/refcount.h>
++#include <isc/types.h>
+ #include <isc/util.h>
+
+ #include <dns/db.h>
+@@ -240,16 +240,6 @@ endload(dns_db_t *db, dns_rdatacallbacks
+ return ISC_R_SUCCESS;
+ }
+
+-static isc_result_t
+-serialize(dns_db_t *db, dns_dbversion_t *version, FILE *file)
+-{
+- ldapdb_t *ldapdb = (ldapdb_t *) db;
+-
+- REQUIRE(VALID_LDAPDB(ldapdb));
+-
+- return dns_db_serialize(ldapdb->rbtdb, version, file);
+-}
+-
+ /* !!! This could be required for optimizations (like on-disk cache). */
+ static isc_result_t
+ dump(dns_db_t *db, dns_dbversion_t *version, const char *filename,
+@@ -916,7 +906,6 @@ static dns_dbmethods_t ldapdb_methods =
+ detach,
+ beginload,
+ endload,
+- serialize, /* see dns_db_serialize(), implementation is not mandatory */
+ dump,
+ currentversion,
+ newversion,
=====================================
debian/patches/fix-atomics.diff
=====================================
@@ -94,3 +94,113 @@
#include "dyndb-config.h"
#include <isc/util.h>
+--- a/src/ldap_entry.c
++++ b/src/ldap_entry.c
+@@ -3,6 +3,8 @@
+ */
+ #include <uuid/uuid.h>
+
++#define __GNUC_ATOMICS
++
+ #include <dns/rdata.h>
+ #include <dns/ttl.h>
+ #include <dns/types.h>
+--- a/src/ldap_driver.c
++++ b/src/ldap_driver.c
+@@ -8,6 +8,8 @@
+ #error "Can't compile without dyndb-config.h"
+ #endif
+
++#define __GNUC_ATOMICS
++
+ #include <isc/buffer.h>
+ #include <isc/commandline.h>
+ #include <isc/hash.h>
+--- a/src/lock.c
++++ b/src/lock.c
+@@ -2,6 +2,8 @@
+ * Copyright (C) 2014 bind-dyndb-ldap authors; see COPYING for license
+ */
+
++#define __GNUC_ATOMICS
++
+ #include <isc/task.h>
+ #include <isc/util.h>
+
+--- a/src/metadb.c
++++ b/src/metadb.c
+@@ -4,6 +4,8 @@
+ * Meta-database for information which are not represented in DNS data.
+ */
+
++#define __GNUC_ATOMICS
++
+ #include <isc/mutex.h>
+ #include <isc/util.h>
+
+--- a/src/mldap.c
++++ b/src/mldap.c
+@@ -5,6 +5,8 @@
+ * DNS data.
+ */
+
++#define __GNUC_ATOMICS
++
+ #include <ldap.h>
+ #include <stddef.h>
+ #include <uuid/uuid.h>
+--- a/src/rbt_helper.c
++++ b/src/rbt_helper.c
+@@ -2,6 +2,8 @@
+ * Copyright (C) 2013-2014 bind-dyndb-ldap authors; see COPYING for license
+ */
+
++#define __GNUC_ATOMICS
++
+ #include <isc/util.h>
+ #include <dns/rbt.h>
+
+--- a/src/settings.c
++++ b/src/settings.c
+@@ -2,6 +2,8 @@
+ * Copyright (C) 2009-2014 bind-dyndb-ldap authors; see COPYING for license
+ */
+
++#define __GNUC_ATOMICS
++
+ #include <isc/util.h>
+ #include <isc/mem.h>
+ #include <isc/task.h>
+--- a/src/syncptr.c
++++ b/src/syncptr.c
+@@ -2,6 +2,8 @@
+ * Copyright (C) 2009-2015 bind-dyndb-ldap authors; see COPYING for license
+ */
+
++#define __GNUC_ATOMICS
++
+ #include <ldap.h>
+ #include <arpa/inet.h>
+ #include <sys/socket.h>
+--- a/src/syncrepl.c
++++ b/src/syncrepl.c
+@@ -2,6 +2,8 @@
+ * Copyright (C) 2013-2014 bind-dyndb-ldap authors; see COPYING for license
+ */
+
++#define __GNUC_ATOMICS
++
+ #include <unistd.h>
+
+ #include <isc/condition.h>
+--- a/src/zone.c
++++ b/src/zone.c
+@@ -2,6 +2,8 @@
+ * Copyright (C) 2014-2015 bind-dyndb-ldap authors; see COPYING for license
+ */
+
++#define __GNUC_ATOMICS
++
+ #include <inttypes.h>
+ #include <isc/types.h>
+ #include <isc/util.h>
=====================================
debian/patches/series
=====================================
@@ -6,3 +6,6 @@ fix-atomics.diff
use-isc_result_totext.diff
use-dns_name_copy.diff
fix-typo.diff
+use-dns_ssuruletype_t.diff
+define-have-threads-h.diff
+drop-serialize.diff
=====================================
debian/patches/use-dns_name_copy.diff
=====================================
@@ -46,13 +46,15 @@
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 *
+@@ -305,9 +305,8 @@ acl_configure_zone_ssutable(const char *
+ result = get_fixed_name(stmt, "name", &fname);
if (result == ISC_R_NOTFOUND &&
match_type == dns_ssumatchtype_subdomain) {
- CHECK(dns_name_copy(dns_zone_getorigin(zone),
+- CHECK(dns_name_copy(dns_zone_getorigin(zone),
- dns_fixedname_initname(&fname),
- &fname.buffer));
-+ dns_fixedname_initname(&fname)));
++ dns_name_copy(dns_zone_getorigin(zone),
++ dns_fixedname_initname(&fname));
}
else if (result != ISC_R_SUCCESS)
goto cleanup;
=====================================
debian/patches/use-dns_ssuruletype_t.diff
=====================================
@@ -0,0 +1,64 @@
+--- a/src/acl.c
++++ b/src/acl.c
+@@ -186,14 +186,14 @@ count_list_elements(const cfg_obj_t *lis
+ }
+
+ static isc_result_t ATTR_NONNULLS ATTR_CHECKRESULT
+-get_types(isc_mem_t *mctx, const cfg_obj_t *obj, dns_rdatatype_t **typesp,
++get_types(isc_mem_t *mctx, const cfg_obj_t *obj, dns_ssuruletype_t **typesp,
+ unsigned int *np)
+ {
+ isc_result_t result = ISC_R_SUCCESS;
+ unsigned int i;
+ unsigned int n = 0;
+ const cfg_listelt_t *el;
+- dns_rdatatype_t *types = NULL;
++ dns_ssuruletype_t *types = NULL;
+
+ REQUIRE(obj != NULL);
+ REQUIRE(typesp != NULL && *typesp == NULL);
+@@ -203,7 +203,7 @@ get_types(isc_mem_t *mctx, const cfg_obj
+
+ n = count_list_elements(obj);
+ if (n > 0) {
+- types = isc_mem_get(mctx, n * sizeof(dns_rdatatype_t));
++ types = isc_mem_get(mctx, n * sizeof(*types));
+ }
+ i = 0;
+ for (el = cfg_list_first(obj); el != NULL; el = cfg_list_next(el)) {
+@@ -218,7 +218,7 @@ get_types(isc_mem_t *mctx, const cfg_obj
+ DE_CONST(str, r.base);
+ r.length = strlen(str);
+
+- result = dns_rdatatype_fromtext(&types[i++], &r);
++ result = dns_rdatatype_fromtext(&types[i++].type, &r);
+ if (result != ISC_R_SUCCESS) {
+ log_error("'%s' is not a valid type", str);
+ goto cleanup;
+@@ -231,7 +231,7 @@ get_types(isc_mem_t *mctx, const cfg_obj
+ return result;
+
+ cleanup:
+- SAFE_MEM_PUT(mctx, types, n * sizeof(dns_rdatatype_t));
++ SAFE_MEM_PUT(mctx, types, n * sizeof(*types));
+
+ return result;
+ }
+@@ -290,7 +290,7 @@ acl_configure_zone_ssutable(const char *
+ bool grant;
+ unsigned int match_type;
+ dns_fixedname_t fname, fident;
+- dns_rdatatype_t *types;
++ dns_ssuruletype_t *types;
+ unsigned int n;
+
+ types = NULL;
+@@ -331,7 +331,7 @@ acl_configure_zone_ssutable(const char *
+ dns_fixedname_name(&fname),
+ n, types);
+
+- SAFE_MEM_PUT(mctx, types, n * sizeof(dns_rdatatype_t));
++ SAFE_MEM_PUT(mctx, types, n * sizeof(types));
+ if (result != ISC_R_SUCCESS)
+ goto cleanup;
+
=====================================
debian/rules
=====================================
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+CFLAGS += -Wno-uninitialized
+
%:
dh $@ --builddirectory=build
View it on GitLab: https://salsa.debian.org/freeipa-team/bind-dyndb-ldap/-/compare/514c04e67e15951026aa1e86b2e4765fb4f68084...a1f9ec66602790578bb4bd22adf30be7f709b227
--
View it on GitLab: https://salsa.debian.org/freeipa-team/bind-dyndb-ldap/-/compare/514c04e67e15951026aa1e86b2e4765fb4f68084...a1f9ec66602790578bb4bd22adf30be7f709b227
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/73f367ad/attachment-0001.htm>
More information about the Pkg-freeipa-devel
mailing list