From 4fa713e7d015e04951bc5634e3234e2762eb3bff9665c93d66f7d481016b148f Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 24 Jun 2024 13:05:26 +0000 Subject: [PATCH] - bsc#1226850: Drop incorrect econf patch (until time to fix it) Drop shadow-4.16.0-econf.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=180 --- shadow-4.16.0-econf.patch | 13 ------------- shadow.changes | 6 ++++++ shadow.spec | 2 -- 3 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 shadow-4.16.0-econf.patch diff --git a/shadow-4.16.0-econf.patch b/shadow-4.16.0-econf.patch deleted file mode 100644 index 79a630e..0000000 --- a/shadow-4.16.0-econf.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: shadow-4.16.0/lib/getdef.c -=================================================================== ---- shadow-4.16.0.orig/lib/getdef.c -+++ shadow-4.16.0/lib/getdef.c -@@ -482,7 +482,7 @@ static void def_load (void) - */ - def_loaded = true; - -- error = econf_readDirs (&defs_file, vendordir, sysconfdir, "login", "defs", " \t", "#"); -+ error = econf_readConfig (&defs_file, vendordir, sysconfdir, "login", "defs", " \t", "#"); - if (error) { - if (error == ECONF_NOFILE) - return; diff --git a/shadow.changes b/shadow.changes index 83b2ca1..54ab689 100644 --- a/shadow.changes +++ b/shadow.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 24 13:02:56 UTC 2024 - Michael Vetter + +- bsc#1226850: Drop incorrect econf patch (until time to fix it) + Drop shadow-4.16.0-econf.patch + ------------------------------------------------------------------- Wed Jun 19 06:51:45 UTC 2024 - Michael Vetter diff --git a/shadow.spec b/shadow.spec index 8f78e98..8c45080 100644 --- a/shadow.spec +++ b/shadow.spec @@ -48,7 +48,6 @@ Patch3: shadow-login_defs-comments.patch Patch4: shadow-login_defs-suse.patch # PATCH-FIX-SUSE disable_new_audit_function.patch adam.majer@suse.de -- Disable newer libaudit functionality for older distributions. Patch5: disable_new_audit_function.patch -Patch6: shadow-4.16.0-econf.patch BuildRequires: audit-devel > 2.3 BuildRequires: autoconf BuildRequires: automake @@ -117,7 +116,6 @@ Development files for libsubid5. %if 0%{?suse_version} < 1330 %patch -P 5 -p1 %endif -%patch -P 6 -p1 iconv -c -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8 mv -v doc/HOWTO.utf8 doc/HOWTO