- fix conflict in autofs-5.1.6-fix-configure-force-shutdown-check.patch.

autofs-5.1.6-fix-configure-force-shutdown-check.patch

@@ -12,23 +12,19 @@ Signed-off-by: Ian Kent <raven@themaw.net>
  configure.in |    2 +-
  3 files changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/CHANGELOG b/CHANGELOG
+--- autofs-5.1.6.orig/CHANGELOG
-index 09d44998..10ad19e2 100644
++++ autofs-5.1.6/CHANGELOG
---- a/CHANGELOG
+@@ -14,6 +14,7 @@ xx/xx/2020 autofs-5.1.7
-+++ b/CHANGELOG
+ - mount_nfs.c fix local rdma share not mounting.
-@@ -17,6 +17,7 @@ xx/xx/2020 autofs-5.1.7
- - Use PKG_CHECK_MODULES to detect the libxml2 library.
  - fix ldap sasl reconnect problem.
  - samples/ldap.schema fix.
 +- fix configure force shutdown check.
  
  07/10/2019 autofs-5.1.6
  - support strictexpire mount option.
-diff --git a/configure b/configure
+--- autofs-5.1.6.orig/configure
-index a2884397..112238da 100755
++++ autofs-5.1.6/configure
---- a/configure
+@@ -6379,7 +6379,7 @@ else
-+++ b/configure
-@@ -6264,7 +6264,7 @@ else
    enableval=no
  fi
  
@@ -37,11 +33,9 @@ index a2884397..112238da 100755
  
  $as_echo "#define ENABLE_FORCED_SHUTDOWN 1" >>confdefs.h
  
-diff --git a/configure.in b/configure.in
+--- autofs-5.1.6.orig/configure.in
-index 9e211c91..c0fb0d2d 100644
++++ autofs-5.1.6/configure.in
---- a/configure.in
+@@ -404,7 +404,7 @@ AC_ARG_ENABLE(force-shutdown,
-+++ b/configure.in
-@@ -407,7 +407,7 @@ AC_ARG_ENABLE(force-shutdown,
  [  --enable-force-shutdown       enable USR1 signal to force unlink umount of any
  			        busy mounts during shutdown],,
  	enableval=no)