commit: 7d395e30e9536dee74451322d0f6daf6635e54af
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 12:13:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 12:13:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d395e30
app-forensics/aide: restore automagic ACL patch
Still needed for 0.17.x, just not master.
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-forensics/aide/{aide-0.17.4.ebuild => aide-0.17.4-r1.ebuild} | 3 ++-
app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch | 2 ++
app-forensics/aide/files/aide-0.17.4-bashism.patch | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app-forensics/aide/aide-0.17.4.ebuild
b/app-forensics/aide/aide-0.17.4-r1.ebuild
similarity index 95%
rename from app-forensics/aide/aide-0.17.4.ebuild
rename to app-forensics/aide/aide-0.17.4-r1.ebuild
index 7666d39604f9..6b3fb2f5f72d 100644
--- a/app-forensics/aide/aide-0.17.4.ebuild
+++ b/app-forensics/aide/aide-0.17.4-r1.ebuild
@@ -43,7 +43,8 @@ A helper script, aideinit, was installed and can be used to
make AIDE
management easier. Please run 'aideinit --help' for more information."
PATCHES=(
- "${FILESDIR}"/aide-0.17.4-bashism.patch
+ "${FILESDIR}"/${PN}-0.16-fix-acl-configure-option.patch
+ "${FILESDIR}"/${PN}-0.17.4-bashism.patch
)
src_prepare() {
diff --git a/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch
b/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch
index a989e379039c..b860b39d73ee 100644
--- a/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch
+++ b/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch
@@ -1,3 +1,5 @@
+Fixes upstream in master but not 0.17.x.
+
commit 3d9746bccbb50809e4c3de90ab5145a17af39aeb
Author: Ilya Tumaykin <[email protected]>
Date: Thu May 25 14:38:02 2017 +0300
diff --git a/app-forensics/aide/files/aide-0.17.4-bashism.patch
b/app-forensics/aide/files/aide-0.17.4-bashism.patch
index 050d218cf1ba..e25463dbf772 100644
--- a/app-forensics/aide/files/aide-0.17.4-bashism.patch
+++ b/app-forensics/aide/files/aide-0.17.4-bashism.patch
@@ -1,6 +1,8 @@
Fixed upstream, so backport to 0.17.4 of
https://github.com/aide/aide/commit/5161886c49060228811eee6da319844ef62dff6d
https://github.com/aide/aide/commit/007eb4f32e8874ce457b4f15d9789c2a9d61731b
+
+Fixed in master but not 0.17.x.
--- a/configure.ac
+++ b/configure.ac
@@ -329,7 +329,7 @@ fi
