mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
mail-filter/opensmtpd-filter-dkimsign: update to new src
Signed-off-by: Cédric Krier <cedk@gentoo.org>
This commit is contained in:
@@ -1 +1 @@
|
||||
DIST opensmtpd-filter-dkimsign-0.6.tar.gz 24163 BLAKE2B f82175c6140a1691f5647562619420c57923cc2deadeabc4ac4b78eeaaa9ddaf6b73635034239e148a8532f77b0422ac52d1961a4f3549b6b686698592b71ae0 SHA512 1efab386a020c6a3cbf6059ce0feea539fa62be0990fd8538c4b152fa0c302d7bfffa7c7bb74643c25e47c20250f600f1371d2725dc3178ad103ce585530c0ce
|
||||
DIST opensmtpd-filter-dkimsign-0.6-new.tar.gz 22677 BLAKE2B bb55ee38e495c0cacdfd8d1ecd93eca1d39b939c6be45157346981de98dc2c42eed2afd70d4f0fc61f44c0f112a5054cd2c5cd27246052b309f4a3a4d8710d46 SHA512 723b86f7acbe55d1a1e12f630c562e9c621adb34c5eb3ee7709fd18cef03b916b5035cc338f4b641c26cc1fc56f1e14cf02e47734e4fb22a08fcf23b3dcdde1e
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
commit 07480b90f4ee9246fdc55bbcdd0370c031923420
|
||||
from: Martijn van Duren <martijn@openbsd.org>
|
||||
date: Thu Dec 15 11:16:37 2022 UTC
|
||||
|
||||
Remove HAVE_ED25519 now that we have ED25519 in LibreSSL
|
||||
|
||||
commit - 60e9f82dc81c599272bc0061157850239f54ae10
|
||||
commit + 07480b90f4ee9246fdc55bbcdd0370c031923420
|
||||
blob - 19746f9f6e583080de34e95de1b6cf3d9929833d
|
||||
blob + 058d1919ba16827a0f2c32e04405586ccb316117
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -7,9 +7,6 @@ MANDIR= ${LOCALBASE}/man/man
|
||||
|
||||
SRCS+= main.c mheader.c
|
||||
|
||||
-.ifdef HAVE_ED25519
|
||||
-CFLAGS+= -DHAVE_ED25519
|
||||
-.endif
|
||||
.ifdef LIBCRYPTOPC
|
||||
CRYPT_CFLAGS!= pkg-config --cflags ${LIBCRYPTOPC}
|
||||
CRYPT_LDFLAGS_L!=pkg-config --libs-only-L ${LIBCRYPTOPC}
|
||||
blob - 1f97bd28f4172df60f52b0b2bae40bc4fa0817a0
|
||||
blob + 011d047d5401c07146103693f7b58fc5289bdf94
|
||||
--- a/Makefile.gnu
|
||||
+++ b/Makefile.gnu
|
||||
@@ -7,9 +7,6 @@ MANDIR= ${LOCALBASE}/share/man/man8
|
||||
|
||||
SRCS+= main.c mheader.c
|
||||
|
||||
-ifdef HAVE_ED25519
|
||||
-CFLAGS+= -DHAVE_ED25519
|
||||
-endif
|
||||
ifdef LIBCRYPTOPC
|
||||
CRYPT_CFLAGS!= pkg-config --cflags ${LIBCRYPTOPC}
|
||||
CRYPT_LDFLAGS_L!=pkg-config --libs-only-L ${LIBCRYPTOPC}
|
||||
blob - 2961793635330ed82f566e8870166a7f012e7e7a
|
||||
blob + 8b2d2131ea121f527e174e6b59a4bdde8f844193
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -136,13 +136,11 @@ main(int argc, char *argv[])
|
||||
hashalg = optarg + 4;
|
||||
keyid = EVP_PKEY_RSA;
|
||||
sephash = 0;
|
||||
-#ifdef HAVE_ED25519
|
||||
} else if (strncmp(optarg, "ed25519-", 8) == 0) {
|
||||
hashalg = optarg + 8;
|
||||
cryptalg = "ed25519";
|
||||
keyid = EVP_PKEY_ED25519;
|
||||
sephash = 1;
|
||||
-#endif
|
||||
} else
|
||||
osmtpd_errx(1, "invalid algorithm");
|
||||
break;
|
||||
@@ -696,7 +694,6 @@ dkim_sign(struct osmtpd_ctx *ctx)
|
||||
dkim_errx(message, "Can't finalize signature context");
|
||||
goto fail;
|
||||
}
|
||||
-#ifdef HAVE_ED25519
|
||||
} else {
|
||||
if (EVP_DigestFinal_ex(message->dctx, bdigest,
|
||||
&digestsz) != 1) {
|
||||
@@ -715,7 +712,6 @@ dkim_sign(struct osmtpd_ctx *ctx)
|
||||
dkim_errx(message, "Failed to finalize signature");
|
||||
goto fail;
|
||||
}
|
||||
-#endif
|
||||
}
|
||||
if ((tmp = malloc(linelen)) == NULL) {
|
||||
dkim_err(message, "Can't allocate space for signature");
|
||||
@@ -726,14 +722,12 @@ dkim_sign(struct osmtpd_ctx *ctx)
|
||||
dkim_errx(message, "Failed to finalize signature");
|
||||
goto fail;
|
||||
}
|
||||
-#ifdef HAVE_ED25519
|
||||
} else {
|
||||
if (EVP_DigestSign(message->dctx, tmp, &linelen, bdigest,
|
||||
digestsz) != 1) {
|
||||
dkim_errx(message, "Failed to finalize signature");
|
||||
goto fail;
|
||||
}
|
||||
-#endif
|
||||
}
|
||||
if ((b = malloc((((linelen + 2) / 3) * 4) + 1)) == NULL) {
|
||||
dkim_err(message, "Can't create DKIM signature");
|
||||
@@ -6,8 +6,8 @@ EAPI=8
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="OpenSMTPD filter for signing mail with DKIM"
|
||||
HOMEPAGE="https://imperialat.at/dev/filter-dkimsign/"
|
||||
SRC_URI="https://imperialat.at/releases/filter-dkimsign-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
HOMEPAGE="https://src.imperialat.at/?action=summary&path=filter-dkimsign.git"
|
||||
SRC_URI="https://src.imperialat.at/releases/filter-dkimsign-${PV}.tar.gz -> ${P}-new.tar.gz"
|
||||
S=${WORKDIR}/${P#opensmtpd-}
|
||||
|
||||
LICENSE="BSD"
|
||||
@@ -15,13 +15,10 @@ SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND="
|
||||
mail-filter/libopensmtpd
|
||||
>=mail-filter/libopensmtpd-1
|
||||
dev-libs/openssl
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.6-ed25519.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
Reference in New Issue
Block a user