From a0d864a8658668e8d63e611a5f547390a99624ed Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Sep 07 2018 13:16:32 +0000
Subject: switch to authselect since it replaced authconfig in F28 (RHBZ#1577174)


---

diff --git a/ecryptfs-utils-111-authselect.patch b/ecryptfs-utils-111-authselect.patch
new file mode 100644
index 0000000..52e534d
--- /dev/null
+++ b/ecryptfs-utils-111-authselect.patch
@@ -0,0 +1,12 @@
+diff -Naur old/src/utils/ecryptfs-migrate-home new/src/utils/ecryptfs-migrate-home
+--- old/src/utils/ecryptfs-migrate-home	2018-09-07 12:29:47.600730369 +0200
++++ new/src/utils/ecryptfs-migrate-home	2018-09-07 12:32:07.781704748 +0200
+@@ -101,7 +101,7 @@
+ 	# Check for ecryptfs pam module
+ 	if ! grep -q ecryptfs /etc/pam.d/postlogin
+ 	then
+-		error "You must enable ecryptfs pam module first. It can be enabled by using: authconfig --enableecryptfs --updateall"
++		error "You must enable ecryptfs pam module first. It can be enabled by using: authselect enable-feature with-ecryptfs"
+ 	fi
+ 	# Check free space: make sure we have sufficient disk space
+ 	# available. To make a full copy, we will need at least 2.5x the
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index bb0269f..f2296f8 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -17,7 +17,7 @@ the interface supplied by the %{name} library.
 
 Name: ecryptfs-utils
 Version: 111
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 License: GPLv2+
 URL: https://launchpad.net/ecryptfs
@@ -81,6 +81,9 @@ Patch924: %{name}-111-cve_2016_5224.patch
 # do not crash if no password is available #1339714
 Patch925: %{name}-111-nopasswd.patch
 
+# Authconfig should no longer be used since F28
+Patch926: %{name}-111-authselect.patch
+
 ### patches for general cleanup, should be kept and executed after all others
 # allow building with -Werror
 Patch999: %{name}-75-werror.patch
@@ -161,6 +164,7 @@ pushd %{name}-%{version}
 %patch923 -p1 -b .sudokeyring
 %patch924 -p1 -b .cve_2016_5224
 %patch925 -p1 -b .nopasswd
+%patch926 -p1 -b .authselect
 
 %patch999 -p1 -b .werror
 
@@ -213,7 +217,6 @@ popd
 %make_build -C py3
 %endif
 
-
 %install
 %if %{with python2}
 %make_install -C py2
@@ -263,7 +266,6 @@ for folder in $(find . -name py\* -type d) ; do
 done
 %endif
 
-
 %pre
 groupadd -r -f ecryptfs
 
@@ -271,17 +273,16 @@ groupadd -r -f ecryptfs
 /sbin/ldconfig
 if [ $1 -eq 1 ] ; then 
  # Initial installation 
- authconfig --enableecryptfs --update
+ authselect enable-feature with-ecryptfs >/dev/null 2>&1
 fi
 
 %postun 
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
  # Package removal, not upgrade
- authconfig --disableecryptfs --update
+ authselect disable-feature with-ecryptfs >/dev/null 2>&1
 fi
 
-
 %files -f %{name}.lang
 %license COPYING
 %doc README AUTHORS NEWS THANKS
@@ -362,6 +363,9 @@ fi
 
 
 %changelog
+* Fri Sep 07 2018 Michal Hlavinka <mhlavink@redhat.com> - 111-15
+- switch to authselect since it replaced authconfig in F28 (RHBZ#1577174)
+
 * Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 111-14
 - Rebuild with fixed binutils