From 1cda5aaae19a25dd9afa10a9ed1763ac59640019 Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Mon, 31 Aug 2020 12:47:49 +0800 Subject: [PATCH] - fix conflict in autofs-5.1.6-fix-configure-force-shutdown-check.patch. --- ...6-fix-configure-force-shutdown-check.patch | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/autofs-5.1.6-fix-configure-force-shutdown-check.patch b/autofs-5.1.6-fix-configure-force-shutdown-check.patch index c83b4aa..1380e72 100644 --- a/autofs-5.1.6-fix-configure-force-shutdown-check.patch +++ b/autofs-5.1.6-fix-configure-force-shutdown-check.patch @@ -12,23 +12,19 @@ Signed-off-by: Ian Kent configure.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) -diff --git a/CHANGELOG b/CHANGELOG -index 09d44998..10ad19e2 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -17,6 +17,7 @@ xx/xx/2020 autofs-5.1.7 - - Use PKG_CHECK_MODULES to detect the libxml2 library. +--- autofs-5.1.6.orig/CHANGELOG ++++ autofs-5.1.6/CHANGELOG +@@ -14,6 +14,7 @@ xx/xx/2020 autofs-5.1.7 + - mount_nfs.c fix local rdma share not mounting. - 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 -index a2884397..112238da 100755 ---- a/configure -+++ b/configure -@@ -6264,7 +6264,7 @@ else +--- autofs-5.1.6.orig/configure ++++ autofs-5.1.6/configure +@@ -6379,7 +6379,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 -index 9e211c91..c0fb0d2d 100644 ---- a/configure.in -+++ b/configure.in -@@ -407,7 +407,7 @@ AC_ARG_ENABLE(force-shutdown, +--- autofs-5.1.6.orig/configure.in ++++ autofs-5.1.6/configure.in +@@ -404,7 +404,7 @@ AC_ARG_ENABLE(force-shutdown, [ --enable-force-shutdown enable USR1 signal to force unlink umount of any busy mounts during shutdown],, enableval=no)