!13 【Mainline】Revert remove authselect compat package

Merge pull request !13 from yixiangzhike/master

authselect-revert-remove-authselect-compat-package.patch

@@ -0,0 +1,47 @@
+From 9b2b28a314e56f6334b99de9e5345811a6385ca4 Mon Sep 17 00:00:00 2001
+From: yixiangzhike <yixiangzhike007@163.com>
+Date: Thu, 13 Jan 2022 10:58:52 +0800
+Subject: [PATCH]  revert "remove authselect compat package"
+
+---
+ Makefile.am | 15 +--------------
+ 1 file changed, 1 insertion(+), 14 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 9e1ea66..5ceeaca 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,6 +2,7 @@ SUBDIRS= \
+     po \
+     profiles \
+     src/common \
++    src/compat \
+     src/lib \
+     src/cli \
+     src/tests \
+@@ -23,22 +24,8 @@ EXTRA_DIST = \
+     scripts/release-version.sh \
+     scripts/po-linguas.sh \
+     scripts/zanata-hooks.sh \
+-    src/compat/authcompat_ConfigSnippet.py \
+-    src/compat/authcompat_EnvironmentFile.py \
+-    src/compat/authcompat_Options.py \
+-    src/compat/authcompat.py.in.in \
+-    src/compat/Makefile.am \
+-	src/compat/Makefile.in \
+-    src/compat/snippets \
+-    src/compat/snippets/authconfig-krb.conf \
+-    src/compat/snippets/authconfig-sssd.conf \
+     $(NULL)
+ 
+-CLEANFILES = \
+-    src/compat/authcompat.py.in \
+-    src/compat/Makefile \
+-	$(NULL)
+-
+ # Create authselect directories
+ authselect_config_dir=@AUTHSELECT_CONFIG_DIR@
+ authselect_vendor_dir=@AUTHSELECT_VENDOR_DIR@
+-- 
+1.8.3.1
+

authselect.spec

@@ -1,11 +1,13 @@
 Name:          authselect
 Version:       1.2.4
-Release:       1
+Release:       2
 Summary:       A tool to select system authentication and identity sources from a list of supported profiles
 License:       GPLv3+
 URL:           https://github.com/authselect/authselect
 Source0:       https://github.com/authselect/authselect/archive/%{version}/%{name}-%{version}.tar.gz
 
+Patch0:        authselect-revert-remove-authselect-compat-package.patch
+
 BuildRequires: autoconf gettext-devel automake libtool popt-devel libcmocka-devel
 BuildRequires: m4 gcc pkgconfig pkgconfig(popt) po4a asciidoc python3-devel
 BuildRequires: libselinux-devel
@@ -13,9 +15,6 @@ Requires:      grep sed systemd gawk coreutils findutils pam >= 1.3.1
 Obsoletes:     authselect-libs
 Provides:      authselect-libs
 
-Obsoletes:     authselect-compat < 1.2.4
-Obsoletes:     authconfig < 7.0.1-6
-
 %description
 Authselect is designed to be a replacement for authconfig (which is the default tool for this 
 job on Fedora and RHEL based systems) but it takes a different approach to configure the system. 
@@ -33,6 +32,20 @@ users are encouraged to migrate to authselect completely.
 
 %package_help
 
+%package compat
+Summary:       Tool to provide minimum backwards compatibility with authconfig
+Obsoletes:     authconfig < 7.0.1-6
+Provides:      authconfig
+BuildRequires: python3-devel
+Requires:      authselect%{?_isa} = %{version}-%{release}
+Requires:      sed
+
+%description compat
+This package will replace %{_sbindir}/authconfig with a tool that will
+translate some of the authconfig calls into authselect calls. It provides
+only minimum backward compatibility and users are encouraged to migrate
+to authselect completely.
+
 %package devel
 Summary:       Development library files and header files for the authselect tool
 Requires:      authselect%{?_isa} = %{version}-%{release}
@@ -81,12 +94,23 @@ autoreconf -ivf
 %{_libdir}/libauthselect.so
 %{_libdir}/pkgconfig/authselect.pc
 
+%files compat
+%{_sbindir}/authconfig
+%{python3_sitelib}/authselect/
+
 %files help
 %defattr(-,root,root)
 %{_datadir}/doc/authselect/*
 %{_mandir}/*
 
+%posttrans compat
+sed -i -E '/^\w+=$/d' %{_sysconfdir}/security/pwquality.conf.d/10-authconfig-pwquality.conf &> /dev/null
+exit 0
+
 %changelog
+* Fri Jan 14 2021 yixiangzhike <yixiangzhike007@163.com> - 1.2.4-2
+- revert "remove authselect compat package"
+
 * Thu Dec 30 2021 yixiangzhike <yixiangzhike007@163.com> - 1.2.4-1
 - update to 1.2.4