From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/, app-forensics/aide/files/
Date: Fri, 11 Mar 2022 12:14:01 +0000 (UTC) [thread overview]
Message-ID: <1647000807.7d395e30e9536dee74451322d0f6daf6635e54af.sam@gentoo> (raw)
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 <itumaykin@gmail.com>
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
next reply other threads:[~2022-03-11 12:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-11 12:14 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-18 0:48 [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/, app-forensics/aide/files/ Sam James
2022-03-11 11:01 Sam James
2021-05-04 8:17 Andreas Sturmlechner
2020-07-16 14:39 Joonas Niilola
2018-03-14 11:12 Michał Górny
2017-05-27 20:59 Michał Górny
2016-01-02 21:05 Manuel Rüger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1647000807.7d395e30e9536dee74451322d0f6daf6635e54af.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox