Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package adcli for openSUSE:Factory checked in at 2026-09-18 22:07:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/adcli (Old) and /work/SRC/openSUSE:Factory/.adcli.new.383539 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "adcli" Fri Sep 18 22:07:45 2026 rev:9 rq:1378778 version:0.9.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/adcli/adcli.changes 2026-03-11 20:49:45.636248342 +0100 +++ /work/SRC/openSUSE:Factory/.adcli.new.383539/adcli.changes 2026-09-18 22:08:40.780977549 +0200 @@ -1,0 +2,6 @@ +Fri Sep 18 07:41:51 UTC 2026 - Samuel Cabrero <[email protected]> + +- Add UsrEtc support; (bsc#1279849); Add patch + 0003-Add-UsrEtc-support.patch + +------------------------------------------------------------------- New: ---- 0003-Add-UsrEtc-support.patch ----------(New B)---------- New:- Add UsrEtc support; (bsc#1279849); Add patch 0003-Add-UsrEtc-support.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ adcli.spec ++++++ --- /var/tmp/diff_new_pack.tsvmQ4/_old 2026-09-18 22:08:41.617012587 +0200 +++ /var/tmp/diff_new_pack.tsvmQ4/_new 2026-09-18 22:08:41.619012671 +0200 @@ -39,7 +39,9 @@ Source3: %{name}.keyring Patch1: 0001-enroll-fix-issues-if-default-keytab-is-used.patch Patch2: 0002-Fix-build-with-glibc-2.43.patch +Patch3: 0003-Add-UsrEtc-support.patch BuildRequires: automake +BuildRequires: libtool BuildRequires: libxslt-tools BuildRequires: openldap2-devel BuildRequires: pkgconfig @@ -85,13 +87,15 @@ %autosetup -p1 %build +autoreconf -fiv %configure \ %if %{without selinux} --disable-selinux-support \ %endif --disable-static \ --disable-silent-rules \ - --enable-strict + --enable-strict \ + --with-vendordir=/usr/etc %make_build %install ++++++ 0003-Add-UsrEtc-support.patch ++++++ >From 6c1589a3f04c46b53933427505308c458ec67b6e Mon Sep 17 00:00:00 2001 From: Samuel Cabrero <[email protected]> Date: Wed, 16 Sep 2026 12:54:49 +0200 Subject: [PATCH] Add UsrEtc support New configure option '--with-vendordir' to search for krb5.conf in case $(sysconfdir)/krb5.conf does not exist. Doc: https://en.opensuse.org/openSUSE:Packaging_UsrEtc Doc: https://github.com/uapi-group/specifications/blob/main/specs/configuration_files_specification.md Signed-off-by: Samuel Cabrero <[email protected]> --- configure.ac | 15 +++++++++++++++ tools/tools.c | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/configure.ac b/configure.ac index b0be041..822e4c9 100644 --- a/configure.ac +++ b/configure.ac @@ -201,6 +201,21 @@ AC_ARG_WITH([vendor-error-message], )], []) +# -------------------------------------------------------------------- +# Vendor directory + +AC_ARG_WITH([vendordir], + [AS_HELP_STRING([--with-vendordir=DIR], + [Directory for distribution provided configuration files] + )], + [AS_IF([test "x$withval" != "x" && test "x$withval" != "xyes" && test "x$withval" != "xno"], + [AC_DEFINE_UNQUOTED([VENDOR_DIR], + ["$withval"], + [Directory for distribution provided configuration files])], + [AC_MSG_ERROR([--with-vendordir requires an argument])] + )], + []) + # -------------------------------------------------------------------- # Documentation options diff --git a/tools/tools.c b/tools/tools.c index 444485c..b185346 100644 --- a/tools/tools.c +++ b/tools/tools.c @@ -375,7 +375,21 @@ setup_krb5_conf_directory (adcli_conn *conn) if (stat (krb5_conf, &sb) < 0) { if (errno != ENOENT) warn ("couldn't access file: %s", krb5_conf); +#ifdef VENDOR_DIR + else { + /* Fall-back to the vendor provided configuration file */ + krb5_conf = VENDOR_DIR "/krb5.conf"; + if (stat(krb5_conf, &sb) < 0) { + if (errno != ENOENT) + warn("couldn't access file: %s", krb5_conf); + krb5_conf = NULL; + } else { + _adcli_info("Using vendor provided %s", krb5_conf); + } + } +#else krb5_conf = NULL; +#endif } if (asprintf (&directory, "%s%sadcli-krb5-XXXXXX", parent, -- 2.55.0
