[Pkg-sssd-devel] [Git][sssd-team/sssd][master] 3 commits: Adapt B-D for ding-libs>=0.7.0
Simon Josefsson (@jas)
gitlab at salsa.debian.org
Sat Mar 7 15:34:46 GMT 2026
Simon Josefsson pushed to branch master at Debian SSSD packaging / sssd
Commits:
1dfe3fcd by Simon Josefsson at 2026-03-07T15:32:01+01:00
Adapt B-D for ding-libs>=0.7.0
- - - - -
cdbf8d3b by Simon Josefsson at 2026-03-07T15:46:49+01:00
Fix FTBFS with ding-libs>=0.7.0 (patch from upstream)
- - - - -
b32eb318 by Simon Josefsson at 2026-03-07T15:47:48+01:00
Update changelog for 2.12.0-3~exp0 release
- - - - -
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/fix-ding-libs-ftbfs.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+sssd (2.12.0-3~exp0) experimental; urgency=medium
+
+ * Team upload
+
+ [ Sam Morris ]
+ * Don't remove subid: lines from nsswitch.conf
+
+ [ Simon Josefsson ]
+ * Adapt B-D for ding-libs>=0.7.0
+ * Fix FTBFS with ding-libs>=0.7.0 (patch from upstream)
+
+ -- Simon Josefsson <simon at josefsson.org> Sat, 07 Mar 2026 15:47:26 +0100
+
sssd (2.12.0-2) unstable; urgency=medium
[ Jonas Jelten ]
=====================================
debian/control
=====================================
@@ -25,14 +25,13 @@ Build-Depends: dpkg-dev (>= 1.22.5),
libc-ares-dev,
libcap-dev,
libcmocka-dev <!nocheck>,
- libcollection-dev,
libcurl4-openssl-dev,
libdbus-1-dev,
libdhash-dev,
libfido2-dev,
libgdm-dev [!s390x !hurd-any],
libglib2.0-dev,
- libini-config-dev,
+ libini-config-dev (>> 0.7.0~),
libjansson-dev,
libjose-dev,
libkeyutils-dev [linux-any],
=====================================
debian/patches/fix-ding-libs-ftbfs.patch
=====================================
@@ -0,0 +1,177 @@
+Forwarded: https://github.com/SSSD/sssd/commit/ade61ef1bac6aa2f6d91a25b39417a93375ed3ed https://github.com/SSSD/sssd/commit/ee42c35db951619aed7545020f6d7c0e0b8c0b8a https://github.com/SSSD/sssd/commit/29a8731d23d67b2e9641ff4e97fa9be15f4a8fe3
+Subject: [PATCH] Fix ding-libs>=0.7.0 FTBFS
+
+diff --git a/src/tools/sssctl/sssctl_config.c b/src/tools/sssctl/sssctl_config.c
+index dcd37863e..b29cef2a5 100644
+--- a/src/tools/sssctl/sssctl_config.c
++++ b/src/tools/sssctl/sssctl_config.c
+@@ -22,7 +22,6 @@
+
+ #include <popt.h>
+ #include <stdio.h>
+-#include <ini_configobj.h>
+
+ #include "util/util.h"
+ #include "util/sss_ini.h"
+diff --git a/src/util/sss_ini.c b/src/util/sss_ini.c
+index 61f8cd786..f20a8148f 100644
+--- a/src/util/sss_ini.c
++++ b/src/util/sss_ini.c
+@@ -28,6 +28,7 @@
+ #include <errno.h>
+ #include <sys/stat.h>
+ #include <talloc.h>
++#include <ini_configobj.h>
+
+ #include "config.h"
+ #include "util/util.h"
+@@ -35,9 +36,6 @@
+ #include "confdb/confdb_setup.h"
+ #include "confdb/confdb_private.h"
+
+-#include "ini_configobj.h"
+-#include "ini_config.h"
+-
+ struct sss_ini {
+ char **error_list;
+ struct ref_array *ra_success_list;
+@@ -48,11 +46,6 @@ struct sss_ini {
+ bool main_config_exists;
+ };
+
+-#define sss_ini_get_sec_list ini_get_section_list
+-#define sss_ini_get_attr_list ini_get_attribute_list
+-#define sss_ini_get_const_string_config_value ini_get_const_string_config_value
+-#define sss_ini_get_config_obj ini_get_config_valueobj
+-
+
+ static void sss_ini_free_error_messages(struct sss_ini *self)
+ {
+@@ -273,8 +266,8 @@ sss_ini_get_ra_error_list(struct sss_ini *self)
+ int sss_ini_get_cfgobj(struct sss_ini *self,
+ const char *section, const char *name)
+ {
+- return sss_ini_get_config_obj(section,name, self->sssd_config,
+- INI_GET_FIRST_VALUE, &self->obj);
++ return ini_get_config_valueobj(section,name, self->sssd_config,
++ INI_GET_FIRST_VALUE, &self->obj);
+ }
+
+ /* Check configuration object */
+@@ -338,7 +331,7 @@ int sss_confdb_create_ldif(TALLOC_CTX *mem_ctx,
+
+ /* Read in the collection and convert it to an LDIF */
+ /* Get the list of sections */
+- sections = sss_ini_get_sec_list(self->sssd_config,
++ sections = ini_get_section_list(self->sssd_config,
+ §ion_count, &ret);
+ if (ret != EOK) {
+ goto error;
+@@ -366,28 +359,28 @@ int sss_confdb_create_ldif(TALLOC_CTX *mem_ctx,
+ sec_dn, rdn);
+ if (!dn) {
+ ret = ENOMEM;
+- free_section_list(sections);
++ ini_free_section_list(sections);
+ goto error;
+ }
+ dn_size = strlen(dn);
+
+ /* Get all of the attributes and their values as LDIF */
+- attrs = sss_ini_get_attr_list(self->sssd_config, sections[i],
+- &attr_count, &ret);
++ attrs = ini_get_attribute_list(self->sssd_config, sections[i],
++ &attr_count, &ret);
+ if (ret != EOK) {
+- free_section_list(sections);
++ ini_free_section_list(sections);
+ goto error;
+ }
+
+ for (j = 0; j < attr_count; j++) {
+ DEBUG(SSSDBG_TRACE_LDB,
+ "Processing attribute [%s]\n", attrs[j]);
+- ret = sss_ini_get_config_obj(sections[i], attrs[j],
+- self->sssd_config,
+- INI_GET_FIRST_VALUE, &obj);
++ ret = ini_get_config_valueobj(sections[i], attrs[j],
++ self->sssd_config,
++ INI_GET_FIRST_VALUE, &obj);
+ if (ret != EOK) goto error;
+
+- const char *value = sss_ini_get_const_string_config_value(obj, &ret);
++ const char *value = ini_get_const_string_config_value(obj, &ret);
+ if (ret != EOK) goto error;
+ if (value && value[0] == '\0') {
+ DEBUG(SSSDBG_CRIT_FAILURE,
+@@ -406,8 +399,8 @@ int sss_confdb_create_ldif(TALLOC_CTX *mem_ctx,
+ dn_size+attr_len+1);
+ if (!tmp_dn) {
+ ret = ENOMEM;
+- free_attribute_list(attrs);
+- free_section_list(sections);
++ ini_free_attribute_list(attrs);
++ ini_free_section_list(sections);
+ goto error;
+ }
+ dn = tmp_dn;
+@@ -420,8 +413,8 @@ int sss_confdb_create_ldif(TALLOC_CTX *mem_ctx,
+ dn_size+1);
+ if (!tmp_dn) {
+ ret = ENOMEM;
+- free_attribute_list(attrs);
+- free_section_list(sections);
++ ini_free_attribute_list(attrs);
++ ini_free_section_list(sections);
+ goto error;
+ }
+ dn = tmp_dn;
+@@ -434,15 +427,15 @@ int sss_confdb_create_ldif(TALLOC_CTX *mem_ctx,
+ ldif_len+dn_size+1);
+ if (!tmp_ldif) {
+ ret = ENOMEM;
+- free_attribute_list(attrs);
+- free_section_list(sections);
++ ini_free_attribute_list(attrs);
++ ini_free_section_list(sections);
+ goto error;
+ }
+ ldif = tmp_ldif;
+ memcpy(ldif+ldif_len, dn, dn_size);
+ ldif_len += dn_size;
+
+- free_attribute_list(attrs);
++ ini_free_attribute_list(attrs);
+ talloc_free(dn);
+ }
+
+@@ -452,7 +445,7 @@ int sss_confdb_create_ldif(TALLOC_CTX *mem_ctx,
+ }
+ ldif[ldif_len] = '\0';
+
+- free_section_list(sections);
++ ini_free_section_list(sections);
+
+ *config_ldif = (const char *)ldif;
+ talloc_free(tmp_ctx);
+@@ -521,7 +514,7 @@ static errno_t check_domain_id_provider(char *cfg_section,
+ "missing in section '%s'.",
+ cfg_section);
+ } else {
+- value = sss_ini_get_const_string_config_value(vo, &ret);
++ value = ini_get_const_string_config_value(vo, &ret);
+ if (ret != EOK) {
+ goto done;
+ }
+diff --git a/src/util/sss_ini.h b/src/util/sss_ini.h
+index 45ede2759..e2197f374 100644
+--- a/src/util/sss_ini.h
++++ b/src/util/sss_ini.h
+@@ -28,6 +28,7 @@
+ #define __SSS_INI_H__
+
+ #include <stdbool.h>
++#include <ref_array.h>
+
+ /**
+ * @brief INI data structure
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
fix-whitespace-test.diff
default-to-socket-activated-services.diff
+fix-ding-libs-ftbfs.patch
View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/compare/af1b3ec2777186be180fbd2675b24d8b685848c4...b32eb318c29fad48db7a50ad0ec8e235391e19de
--
View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/compare/af1b3ec2777186be180fbd2675b24d8b685848c4...b32eb318c29fad48db7a50ad0ec8e235391e19de
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-sssd-devel/attachments/20260307/7854a47a/attachment-0001.htm>
More information about the Pkg-sssd-devel
mailing list