commit: 5d94f3a89b3f491b078a58f29ba9445d78a06433 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Feb 24 04:37:56 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 24 04:38:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d94f3a8
mail-filter/opensmtpd-filter-dkimsign: fix src_prepare (and patch) The ebuild calls 'eapply_user' in src_prepare rather than 'default' which would do both "eapply on all PATCHES" *and* "eapply_user". The filename in the ebuild also wasn't right. Unfortunately, the patch also couldn't then apply because it has the wrong patch-level, so fixed that too by making it -p1-compliant. Closes: https://bugs.gentoo.org/949031 Fixes: 8fcd2710762948cc3f8ad1b060ec86a43e6c35e6 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/opensmtpd-filter-dkimsign-0.6-ed25519.patch | 12 ++++++------ ...0.6-r1.ebuild => opensmtpd-filter-dkimsign-0.6-r2.ebuild} | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mail-filter/opensmtpd-filter-dkimsign/files/opensmtpd-filter-dkimsign-0.6-ed25519.patch b/mail-filter/opensmtpd-filter-dkimsign/files/opensmtpd-filter-dkimsign-0.6-ed25519.patch index 284264fc151d..691a298aac6d 100644 --- a/mail-filter/opensmtpd-filter-dkimsign/files/opensmtpd-filter-dkimsign-0.6-ed25519.patch +++ b/mail-filter/opensmtpd-filter-dkimsign/files/opensmtpd-filter-dkimsign-0.6-ed25519.patch @@ -8,8 +8,8 @@ commit - 60e9f82dc81c599272bc0061157850239f54ae10 commit + 07480b90f4ee9246fdc55bbcdd0370c031923420 blob - 19746f9f6e583080de34e95de1b6cf3d9929833d blob + 058d1919ba16827a0f2c32e04405586ccb316117 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -7,9 +7,6 @@ MANDIR= ${LOCALBASE}/man/man SRCS+= main.c mheader.c @@ -22,8 +22,8 @@ blob + 058d1919ba16827a0f2c32e04405586ccb316117 CRYPT_LDFLAGS_L!=pkg-config --libs-only-L ${LIBCRYPTOPC} blob - 1f97bd28f4172df60f52b0b2bae40bc4fa0817a0 blob + 011d047d5401c07146103693f7b58fc5289bdf94 ---- Makefile.gnu -+++ Makefile.gnu +--- a/Makefile.gnu ++++ b/Makefile.gnu @@ -7,9 +7,6 @@ MANDIR= ${LOCALBASE}/share/man/man8 SRCS+= main.c mheader.c @@ -36,8 +36,8 @@ blob + 011d047d5401c07146103693f7b58fc5289bdf94 CRYPT_LDFLAGS_L!=pkg-config --libs-only-L ${LIBCRYPTOPC} blob - 2961793635330ed82f566e8870166a7f012e7e7a blob + 8b2d2131ea121f527e174e6b59a4bdde8f844193 ---- main.c -+++ main.c +--- a/main.c ++++ b/main.c @@ -136,13 +136,11 @@ main(int argc, char *argv[]) hashalg = optarg + 4; keyid = EVP_PKEY_RSA; diff --git a/mail-filter/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign-0.6-r1.ebuild b/mail-filter/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign-0.6-r2.ebuild similarity index 89% rename from mail-filter/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign-0.6-r1.ebuild rename to mail-filter/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign-0.6-r2.ebuild index 5fd4d5981ba3..7cdb70348e53 100644 --- a/mail-filter/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign-0.6-r1.ebuild +++ b/mail-filter/opensmtpd-filter-dkimsign/opensmtpd-filter-dkimsign-0.6-r2.ebuild @@ -20,12 +20,12 @@ DEPEND=" " RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-ed25519.patch" + "${FILESDIR}/${PN}-0.6-ed25519.patch" ) src_prepare() { - mv -f Makefile.gnu Makefile - eapply_user + default + mv -f Makefile.gnu Makefile || die } src_compile() {
