From 00b842d28d4dab3c80a364211591ca75f89c39d3 Mon Sep 17 00:00:00 2001 From: linfeilong Date: Wed, 1 Dec 2021 11:16:29 +0800 Subject: [PATCH] Fix infinite loop when perl is added in BEP_FILE_TIME_LIST --- ...p-when-perl-is-added-in-BEP_FILE_TIM.patch | 53 +++++++++++++++++++ nfs4-acl-tools.spec | 7 ++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-infinite-loop-when-perl-is-added-in-BEP_FILE_TIM.patch diff --git a/0001-Fix-infinite-loop-when-perl-is-added-in-BEP_FILE_TIM.patch b/0001-Fix-infinite-loop-when-perl-is-added-in-BEP_FILE_TIM.patch new file mode 100644 index 0000000..db2a641 --- /dev/null +++ b/0001-Fix-infinite-loop-when-perl-is-added-in-BEP_FILE_TIM.patch @@ -0,0 +1,53 @@ +From bee9daf0008cb7b7b7516090e60a8f52b7d214d7 Mon Sep 17 00:00:00 2001 +From: Wenchao Hao +Date: Wed, 1 Dec 2021 11:10:06 +0800 +Subject: [PATCH] Fix infinite loop when perl is added in BEP_FILE_TIME_LIST + +Makefile specify a rules like following: + +configure include/builddefs include/config.h: aclocal.m4 + autoconf + ./configure \ + ... +Normally, this rule would run recipe for target configure first, and the +include/builddefs and include/config.h would be generated in this target. + +While once perl is added in BEP_FILE_TIME_LIST, this rule run recipe for target +include/builddefs first and cause a infinite loop. + +To fix this issue, splict previous recipe as following to explictly tell make +run configure first + +include/builddefs: configure +include/config.h: configure + +configure: aclocal.m4 + autoconf \ + ./configure \ + ... + +Signed-off-by: Wenchao Hao +Signed-off-by: volcanodragon +--- + Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 5302e11..fa3d93b 100644 +--- a/Makefile ++++ b/Makefile +@@ -59,7 +59,10 @@ else + clean: # if configure hasn't run, nothing to clean + endif + +-$(CONFIGURE): aclocal.m4 ++include/builddefs: configure ++include/config.h: configure ++ ++configure: aclocal.m4 + autoconf + ./configure \ + --prefix=/ \ +-- +1.8.3.1 + diff --git a/nfs4-acl-tools.spec b/nfs4-acl-tools.spec index 43adfb0..fc7dac4 100644 --- a/nfs4-acl-tools.spec +++ b/nfs4-acl-tools.spec @@ -1,6 +1,6 @@ Name: nfs4-acl-tools Version: 0.3.7 -Release: 2 +Release: 3 Summary: The nfs4 ACL tools License: BSD URL: http://www.citi.umich.edu/projects/nfsv4/linux/ @@ -8,6 +8,8 @@ Source0: http://linux-nfs.org/~bfields/nfs4-acl-tools/%{name}-%{version}. BuildRequires: libtool libattr-devel +Patch1: 0001-Fix-infinite-loop-when-perl-is-added-in-BEP_FILE_TIM.patch + %description It contains commandline NFSv4 ACL tools, which deal directly with NFSv4 ACLs. @@ -42,6 +44,9 @@ make DESTDIR=%{buildroot} install %{_mandir}/man*/* %changelog +* Wed Dec 1 2021 volcanodragon - 0.3.7-3 +- DESC: Fix infinite loop when perl is added in BEP_FILE_TIME_LIST + * Fri Jul 30 2021 chenyanpanHW - 0.3.7-2 - DESC: delete -S git from %autosetup, and delete BuildRequires git -- Gitee