From: "Quentin Retornaz" <gentoo@retornaz.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/libressl:master commit in: mail-filter/opendkim/, mail-filter/opendkim/files/
Date: Sun, 10 Jul 2022 22:52:07 +0000 (UTC) [thread overview]
Message-ID: <1657493462.d800e2954ff4f087ee42605291e0c1e23bfadbee.quentin@gentoo> (raw)
commit: d800e2954ff4f087ee42605291e0c1e23bfadbee
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Jul 7 23:23:33 2022 +0000
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Sun Jul 10 22:51:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=d800e295
mail-filter/opendkim: Remove package
Works with libressl-3.5.x and opendkim-2.10.3-r29::gentoo.
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/libressl/pull/445
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
mail-filter/opendkim/Manifest | 1 -
.../opendkim-2.10.3-define-P-macro-in-libvbr.patch | 40 ---
.../opendkim-2.10.3-fix-libmilter-search.patch | 223 ----------------
.../files/opendkim-2.10.3-lua-pkgconfig-pt2.patch | 51 ----
.../files/opendkim-2.10.3-lua-pkgconfig.patch | 174 ------------
.../opendkim/files/opendkim-2.10.3-openrc.patch | 295 ---------------------
.../files/opendkim-2.10.3-openssl-1.1.1.patch.r2 | 170 ------------
mail-filter/opendkim/metadata.xml | 59 -----
mail-filter/opendkim/opendkim-2.10.3-r17.ebuild | 224 ----------------
mail-filter/opendkim/opendkim-2.10.3-r19.ebuild | 228 ----------------
mail-filter/opendkim/opendkim-2.10.3-r26.ebuild | 248 -----------------
11 files changed, 1713 deletions(-)
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
deleted file mode 100644
index c96ca4b..0000000
--- a/mail-filter/opendkim/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-define-P-macro-in-libvbr.patch b/mail-filter/opendkim/files/opendkim-2.10.3-define-P-macro-in-libvbr.patch
deleted file mode 100644
index bbb4eb8..0000000
--- a/mail-filter/opendkim/files/opendkim-2.10.3-define-P-macro-in-libvbr.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 50a91575cee8d08682f090d2d6bdb4806eccfbcd Mon Sep 17 00:00:00 2001
-From: Wynn Wolf Arbor <wolf@oriole.systems>
-Date: Wed, 10 Jun 2020 09:37:03 +0200
-Subject: [PATCH] Define __P() macro in libvbr
-
-Definitions for this macro have been added throughout the codebase in
-commits 91e7407d, 705948fd, 227fa252, 842c1733, and b730bdc0, but one
-was still missing from libvbr. glibc contains a definition for legacy
-reasons, but other libcs might not. Particularly, the musl libc does not
-contain it, leading to build errors when enabling support for VBR.
-
-Add a definition for __P() to vbr.h to fix this.
----
- libvbr/vbr.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libvbr/vbr.h b/libvbr/vbr.h
-index 4bef1f36..3bcb9212 100644
---- a/libvbr/vbr.h
-+++ b/libvbr/vbr.h
-@@ -12,6 +12,16 @@
- /* system includes */
- #include <sys/types.h>
-
-+#ifdef __STDC__
-+# ifndef __P
-+# define __P(x) x
-+# endif /* ! __P */
-+#else /* __STDC__ */
-+# ifndef __P
-+# define __P(x) ()
-+# endif /* ! __P */
-+#endif /* __STDC__ */
-+
- /* strings */
- #define VBR_ALL "all"
- #define VBR_INFOHEADER "VBR-Info"
---
-2.27.0
-
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-fix-libmilter-search.patch b/mail-filter/opendkim/files/opendkim-2.10.3-fix-libmilter-search.patch
deleted file mode 100644
index 5e03a99..0000000
--- a/mail-filter/opendkim/files/opendkim-2.10.3-fix-libmilter-search.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-From a1371d8c81d5fc22cbc8ea2b1c9eb465e9a8e874 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Fri, 6 Nov 2020 07:40:06 -0500
-Subject: [PATCH] configure.ac: simplify the search for libmilter.
-
-This commit (temporarily?) reverts the --with-milter flag to a boolean,
-disallowing the user to pass it a path. This is done for several reasons:
-
- * There's only one standard major version of libmilter, so people are
- unlikely to have multiple copies of it installed side-by-side. And
- When only one copy is present and usable with "-lmilter", the
- ability to specify a path is redundant.
-
- * The "milter path" was used for both the headers and the library
- itself. As a result, the user was expected to specify something
- like "/usr" as the milter path, whence OpenDKIM would infer that
- the headers live in /usr/include and that the libraries live
- in /usr/<somewhere>. If multiple libraries live in multiple
- somewheres -- as is the case with "lib" and "lib64" on multilib
- systems -- OpenDKIM is prone to guessing incorrectly. In other
- words, the "milter path" mechanism was not fine-grained enough
- to specify the correct library, and this led to link failures
- in some not-too-uncommon cases.
-
- * Headers and libraries in non-standard paths should be handled with
- pkg-config, anyway.
----
- configure.ac | 129 +++++++------------------------------------
- opendkim/Makefile.am | 9 ++-
- 2 files changed, 23 insertions(+), 115 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 828fe53f..8234e588 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -932,120 +932,29 @@ AC_SUBST(LIBCRYPTO_LIBS)
- AC_MSG_CHECKING([for milter library and includes])
- AC_ARG_WITH([milter],
- AS_HELP_STRING([--with-milter],
-- [location of milter includes and library]),
-- [milterpath="$withval"], [milterpath="auto"])
--
--if test x"$enable_filter" = x"no"
--then
-- milterpath="no"
--fi
--
--if test "$milterpath" = "auto" -o "$milterpath" = "yes"
--then
-- milterdirs="/usr/local /opt/local /usr"
-- for d in $milterdirs
-- do
-- if test -f $d/include/libmilter/mfapi.h
-- then
-- milterpath=$d
-- break
-- fi
-- done
--fi
--case "$milterpath" in
-- no)
-- if test x"$enable_filter" = x"yes"
-- then
-- AC_MSG_ERROR([milter is required])
-- fi
-- AC_MSG_RESULT(disabled)
-- ;;
-- auto)
-- AC_MSG_ERROR([milter not found])
-- ;;
-- */*)
-- if ! test -f $milterpath/include/libmilter/mfapi.h
-- then
-- AC_MSG_ERROR([milter includes not found at $milterpath])
-- fi
-- AC_MSG_RESULT([$milterpath])
-- ;;
-- *)
-- AC_MSG_ERROR([milter not found])
-- ;;
--esac
--
--LIBMILTER_INCDIRS=""
--LIBMILTER_LIBDIRS=""
--LIBMILTER_LIBS=""
-+ [whether or not (yes or no) to use libmilter]),
-+ [milterpath="$withval"], [milterpath="no"])
-+
-+AS_IF([test x"$enable_filter" = x"no"],[milterpath="no"])
-+AS_IF([test x"$milterpath" = x"no"], [
-+ AS_IF([test x"$enable_filter" = x"yes"],[
-+ AC_MSG_ERROR([libmilter is required if filtering is enabled])
-+ ])
-+])
-
--if test x"$milterpath" != x"no"
--then
-- LIBMILTER_INCDIRS="-I$milterpath/include"
-+AS_IF([test x"$milterpath" = x"yes"], [
-+ AC_CHECK_HEADER(libmilter/mfapi.h,
-+ [],
-+ AC_MSG_ERROR([libmilter/mfapi.h not found]))
-
-- saved_CC="$CC"
-- saved_CFLAGS="$CFLAGS"
-- saved_CPPFLAGS="$CPPFLAGS"
-- saved_LDFLAGS="$LDFLAGS"
-- saved_LIBS="$LIBS"
-+ AC_SEARCH_LIBS([smfi_register],
-+ [milter],
-+ [LIBMILTER_LIBS="-lmilter"],
-+ AC_MSG_ERROR([libmilter not found]))
-
-- CC="$PTHREAD_CC"
-- LIBS="$outer_LIBS $PTHREAD_LIBS $saved_LIBS"
-- CPPFLAGS="$LIBMILTER_INCDIRS $saved_CPPFLAGS"
-- CFLAGS="$PTHREAD_CFLAGS $saved_CFLAGS"
-- LDFLAGS="$outer_LDFLAGS $PTHREAD_CFLAGS $saved_LDFLAGS"
--
-- breakloop="no"
-- for d in lib lib64 lib/libmilter
-- do
-- unset ac_cv_search_smfi_register
-- LDFLAGS="$outer_LDFLAGS $PTHREAD_CFLAGS -L$milterpath/$d $saved_LDFLAGS"
-- AC_SEARCH_LIBS([smfi_register], [milter],
-- [
-- LIBMILTER_LIBDIRS="-L$milterpath/$d"
-- LIBMILTER_LIBS="-lmilter"
-- breakloop="yes"
-- ])
--
-- AC_CHECK_FUNC([smfi_insheader],
-- AC_DEFINE([HAVE_SMFI_INSHEADER], 1,
-- [Define if libmilter has smfi_insheader()]))
--
-- AC_CHECK_FUNC([smfi_opensocket],
-- AC_DEFINE([HAVE_SMFI_OPENSOCKET], 1,
-- [Define if libmilter has smfi_opensocket()]))
--
-- AC_CHECK_FUNC([smfi_progress],
-- AC_DEFINE([HAVE_SMFI_PROGRESS], 1,
-- [Define if libmilter has smfi_progress()]))
--
-- AC_CHECK_FUNC([smfi_setsymlist],
-- AC_DEFINE([HAVE_SMFI_SETSYMLIST], 1,
-- [Define if libmilter has smfi_setsymlist()]))
--
-- AC_CHECK_FUNC([smfi_version],
-- AC_DEFINE([HAVE_SMFI_VERSION], 1,
-- [Define if libmilter has smfi_version()]))
--
-- if test x"$breakloop" = x"yes"
-- then
-- break
-- fi
-- done
-- if test x"$LIBMILTER_LIBDIRS" = x""
-- then
-- AC_MSG_ERROR([libmilter not found])
-- fi
--
-- CC="$saved_CC"
-- CPPFLAGS="$saved_CPPFLAGS"
-- CFLAGS="$saved_CFLAGS"
-- LDFLAGS="$saved_LDFLAGS"
-- LIBS="$saved_LIBS"
--fi
-+ AC_CHECK_FUNCS([smfi_insheader smfi_opensocket smfi_progress smfi_setsymlist smfi_version])
-+])
-
--AC_SUBST(LIBMILTER_INCDIRS)
--AC_SUBST(LIBMILTER_LIBDIRS)
- AC_SUBST(LIBMILTER_LIBS)
-
- #
-diff --git a/opendkim/Makefile.am b/opendkim/Makefile.am
-index 4aa615c1..e3d1d10e 100644
---- a/opendkim/Makefile.am
-+++ b/opendkim/Makefile.am
-@@ -26,7 +26,7 @@ opendkim_SOURCES = opendkim.c opendkim.h opendkim-ar.c opendkim-ar.h opendkim-ar
- opendkim_CC = $(PTHREAD_CC)
- opendkim_CFLAGS = $(PTHREAD_CFLAGS) $(LIBCRYPTO_CFLAGS) $(COV_CFLAGS)
- opendkim_CPPFLAGS = -I$(srcdir)/../libopendkim $(LIBCRYPTO_CPPFLAGS)
--opendkim_LDFLAGS = $(LIBCRYPTO_LIBDIRS) $(LIBMILTER_LIBDIRS) $(PTHREAD_CFLAGS) $(COV_LDFLAGS)
-+opendkim_LDFLAGS = $(LIBCRYPTO_LIBDIRS) $(PTHREAD_CFLAGS) $(COV_LDFLAGS)
- opendkim_LDADD = ../libopendkim/libopendkim.la $(LIBMILTER_LIBS) $(LIBCRYPTO_LIBS) $(PTHREAD_LIBS) $(COV_LIBADD) $(LIBRESOLV)
- if USE_DB_OPENDKIM
- opendkim_CPPFLAGS += $(LIBDB_INCDIRS)
-@@ -88,7 +88,6 @@ opendkim_CPPFLAGS += -I$(srcdir)/../reprrd
- opendkim_LDADD += ../reprrd/libreprrd.la
- endif
-
--opendkim_CPPFLAGS += $(LIBMILTER_INCDIRS)
- endif
-
- if STATS
-@@ -108,7 +107,7 @@ opendkim_testkey_CFLAGS = $(LIBCRYPTO_CFLAGS) $(COV_CFLAGS) $(PTHREAD_CFLAGS)
- opendkim_testkey_LDFLAGS = $(LIBCRYPTO_LIBDIRS) $(COV_LDFLAGS) $(PTHREAD_CFLAGS)
- opendkim_testkey_LDADD = ../libopendkim/libopendkim.la $(LIBCRYPTO_LIBS) $(LIBRESOLV) $(COV_LIBADD) $(PTHREAD_LIBS)
- if LUA
--opendkim_testkey_CPPFLAGS += $(LIBLUA_INCDIRS) $(LIBMILTER_INCDIRS)
-+opendkim_testkey_CPPFLAGS += $(LIBLUA_INCDIRS)
- opendkim_testkey_LDFLAGS += $(LIBLUA_LIBDIRS)
- opendkim_testkey_LDADD += $(LIBLUA_LIBS)
- endif
-@@ -200,7 +199,7 @@ opendkim_genzone_CPPFLAGS += $(OPENLDAP_CPPFLAGS)
- opendkim_genzone_LDADD += $(OPENLDAP_LIBS)
- endif
- if LUA
--opendkim_genzone_CPPFLAGS += $(LIBLUA_INCDIRS) $(LIBMILTER_INCDIRS)
-+opendkim_genzone_CPPFLAGS += $(LIBLUA_INCDIRS)
- opendkim_genzone_LDFLAGS += $(LIBLUA_LIBDIRS)
- opendkim_genzone_LDADD += $(LIBLUA_LIBS)
- endif
-@@ -250,7 +249,7 @@ opendkim_atpszone_CPPFLAGS += $(OPENLDAP_CPPFLAGS)
- opendkim_atpszone_LDADD += $(OPENLDAP_LIBS)
- endif
- if LUA
--opendkim_atpszone_CPPFLAGS += $(LIBLUA_INCDIRS) $(LIBMILTER_INCDIRS)
-+opendkim_atpszone_CPPFLAGS += $(LIBLUA_INCDIRS)
- opendkim_atpszone_LDFLAGS += $(LIBLUA_LIBDIRS)
- opendkim_atpszone_LDADD += $(LIBLUA_LIBS)
- endif
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig-pt2.patch b/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig-pt2.patch
deleted file mode 100644
index 9e963ec..0000000
--- a/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig-pt2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6dcab8d2e001bb4b91314693affa65e9c1a9adbd Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 22 Dec 2020 19:36:28 -0500
-Subject: [PATCH 1/2] configure.ac: drop lua5.1 pkg-config check.
-
-The official upstream name for the lua pkg-config file is "lua.pc", so
-preferring the name "lua5.1.pc" to the official one can lead to
-problems when both are installed. Specifically, if lua-5.2 is
-installed and its pkg-config file is called "lua.pc", then ./configure
-will still detect (and use!) lua-5.1 if it happens to be installed
-with just the right name.
-
-This was honestly left in only for superstitious reasons, and now it's
-actually causing problems on Gentoo systems that have more than one
-version of Lua installed. So, time to go.
-
-Closes: https://github.com/trusteddomainproject/OpenDKIM/issues/111
----
- configure.ac | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 828fe53f..d3d688ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1517,20 +1517,10 @@ lua_found="no"
-
- if test \( x"$luapath" = x"auto" -o x"$luapath" = x"yes" \) -a x"$PKG_CONFIG" != x""
- then
-- PKG_CHECK_MODULES([LIBLUA], [lua5.1], [
-+ PKG_CHECK_MODULES([LIBLUA], [lua], [
- LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
- lua_found="yes"
-- ],
-- [
-- AC_MSG_WARN([pkg-config for lua5.1 not found, trying lua...])
-- PKG_CHECK_MODULES([LIBLUA], [lua], [
-- LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
-- lua_found="yes"
-- ],
-- [AC_MSG_WARN([pkg-config for lua not found, trying manual search...])]
-- )
-- ]
-- )
-+ ])
- fi
-
- if test \( x"$luapath" = x"yes" -o x"$luapath" = x"auto" \) -a x"$lua_found" = x"no"
---
-2.26.2
-
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig.patch b/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig.patch
deleted file mode 100644
index ee8d576..0000000
--- a/mail-filter/opendkim/files/opendkim-2.10.3-lua-pkgconfig.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 1f1c947a983c49677544ab08dea3ea04869a8caf Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sun, 26 Jan 2020 22:29:16 -0500
-Subject: [PATCH 1/1] configure.ac: check for "lua" with pkg-config in addition
- to "lua5.1".
-
-The upstream Lua pkg-config file is named lua.pc, so unless some
-distribution renames it, OpenDKIM should be looking for "lua"
-and not "lua5.1" in its PKG_CHECK_MODULES call. In any case, we
-should definitely be checking for "lua", so this commit appends it
-to the list of modules we look for. The "lua5.1" module was left
-alone, because I don't know enough of the history to be sure that
-removing it is the right thing to do.
-
-When the call to PKG_CHECK_MODULES fails, OpenDKIM falls back to
-a manual search that looks in /usr/lib, and this can detect 32-bit
-libraries on a 64-bit system. Therefore it is preferable that the
-PKG_CHECK_MODULES call succeed.
-
-In the process of adding this fallback, I realized that some
-additional actions need to be performed in the success branch of
-the existing (and new) PKG_CHECK_MODULES call. The following
-three lines were added,
-
- AC_SEARCH_LIBS([dlopen], [dl])
- AC_SUBST([LUA_MANNOTICE], "")
- AC_DEFINE([USE_LUA], 1, [support for Lua scripting])
-
-to tell various parts of OpenDKIM that we do indeed have Lua support.
-Afterwards, it became clear that those three lines could be factored
-out of *every* lua check, so that has been done as well.
-
-Closes: https://github.com/trusteddomainproject/OpenDKIM/issues/62
-Gentoo-bug: https://bugs.gentoo.org/704556
----
- configure.ac | 45 +++++++++++++++++----------------------------
- 1 file changed, 17 insertions(+), 28 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a478bb83..1d0db41a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1495,12 +1495,20 @@ lua_found="no"
-
- if test \( x"$luapath" = x"auto" -o x"$luapath" = x"yes" \) -a x"$PKG_CONFIG" != x""
- then
-- PKG_CHECK_MODULES([LIBLUA], [lua5.1],
-- [
-- lua_found="yes"
-- LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
-- ],
-- [AC_MSG_WARN([pkg-config for Lua not found, trying manual search...])])
-+ PKG_CHECK_MODULES([LIBLUA], [lua5.1], [
-+ LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
-+ lua_found="yes"
-+ ],
-+ [
-+ AC_MSG_WARN([pkg-config for lua5.1 not found, trying lua...])
-+ PKG_CHECK_MODULES([LIBLUA], [lua], [
-+ LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
-+ lua_found="yes"
-+ ],
-+ [AC_MSG_WARN([pkg-config for lua not found, trying manual search...])]
-+ )
-+ ]
-+ )
- fi
-
- if test \( x"$luapath" = x"yes" -o x"$luapath" = x"auto" \) -a x"$lua_found" = x"no"
-@@ -1515,10 +1523,6 @@ then
- LIBLUA_INCDIRS="-I$d/include/lua51"
- LIBLUA_LIBDIRS="-L$d/lib/lua51"
- LIBLUA_LIBS="-llua -lm"
-- AC_SEARCH_LIBS([dlopen], [dl])
-- AC_DEFINE([USE_LUA], 1,
-- [support for Lua scripting])
-- AC_SUBST([LUA_MANNOTICE], "")
- lua_found="yes"
- break
- elif test -f $d/include/lua52/lua.h
-@@ -1527,10 +1531,6 @@ then
- LIBLUA_INCDIRS="-I$d/include/lua52"
- LIBLUA_LIBDIRS="-L$d/lib/lua52"
- LIBLUA_LIBS="-llua -lm"
-- AC_SEARCH_LIBS([dlopen], [dl])
-- AC_DEFINE([USE_LUA], 1,
-- [support for Lua scripting])
-- AC_SUBST([LUA_MANNOTICE], "")
- lua_found="yes"
- break
- elif test -f $d/include/lua5.1/lua.h
-@@ -1539,10 +1539,6 @@ then
- LIBLUA_INCDIRS="-I$d/include/lua5.1"
- LIBLUA_LIBDIRS="-L$d/lib"
- LIBLUA_LIBS="-llua5.1 -lm"
-- AC_SEARCH_LIBS([dlopen], [dl])
-- AC_DEFINE([USE_LUA], 1,
-- [support for Lua scripting])
-- AC_SUBST([LUA_MANNOTICE], "")
- lua_found="yes"
- break
- elif test -f $d/include/lua5.2/lua.h
-@@ -1551,10 +1547,6 @@ then
- LIBLUA_INCDIRS="-I$d/include/lua5.2"
- LIBLUA_LIBDIRS="-L$d/lib"
- LIBLUA_LIBS="-llua5.2 -lm"
-- AC_SEARCH_LIBS([dlopen], [dl])
-- AC_DEFINE([USE_LUA], 1,
-- [support for Lua scripting])
-- AC_SUBST([LUA_MANNOTICE], "")
- lua_found="yes"
- break
- elif test -f $d/include/lua.h
-@@ -1563,7 +1555,6 @@ then
- LIBLUA_INCDIRS="-I$d/include"
- LIBLUA_LIBDIRS="-L$d/lib"
- LIBLUA_LIBS="-llua -lm"
-- AC_SEARCH_LIBS([dlopen], [dl])
- lua_found="yes"
- break
- fi
-@@ -1588,7 +1579,6 @@ then
- LIBLUA_INCDIRS="-I$luapath/include/lua51"
- LIBLUA_LIBDIRS="-L$luapath/lib/lua51"
- LIBLUA_LIBS="-llua -lm"
-- AC_SEARCH_LIBS([dlopen], [dl])
- lua_found="yes"
- elif test -f $luapath/include/lua52/lua.h
- then
-@@ -1596,7 +1586,6 @@ then
- LIBLUA_INCDIRS="-I$luapath/include/lua52"
- LIBLUA_LIBDIRS="-L$luapath/lib/lua52"
- LIBLUA_LIBS="-llua -lm"
-- AC_SEARCH_LIBS([dlopen], [dl])
- lua_found="yes"
- elif test -f $luapath/include/lua5.1/lua.h
- then
-@@ -1604,7 +1593,6 @@ then
- LIBLUA_INCDIRS="-I$luapath/include/lua5.1"
- LIBLUA_LIBDIRS="-L$luapath/lib"
- LIBLUA_LIBS="-llua5.1 -lm"
-- AC_SEARCH_LIBS([dlopen], [dl])
- lua_found="yes"
- elif test -f $luapath/include/lua5.2/lua.h
- then
-@@ -1612,7 +1600,6 @@ then
- LIBLUA_INCDIRS="-I$luapath/include/lua5.2"
- LIBLUA_LIBDIRS="-L$luapath/lib"
- LIBLUA_LIBS="-llua5.2 -lm"
-- AC_SEARCH_LIBS([dlopen], [dl])
- lua_found="yes"
- elif test -f $luapath/include/lua.h
- then
-@@ -1620,7 +1607,6 @@ then
- LIBLUA_INCDIRS="-I$luapath/include"
- LIBLUA_LIBDIRS="-L$luapath/lib"
- LIBLUA_LIBS="-llua -lm"
-- AC_SEARCH_LIBS([dlopen], [dl])
- lua_found="yes"
- else
- AC_MSG_ERROR(not found at $luapath)
-@@ -1629,6 +1615,9 @@ fi
-
- if test x"$lua_found" = x"yes"
- then
-+ AC_SUBST([LUA_MANNOTICE], "")
-+ AC_DEFINE([USE_LUA], 1, [support for Lua scripting])
-+ AC_SEARCH_LIBS([dlopen], [dl])
- saved_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$outer_CPPFLAGS $LIBLUA_INCDIRS"
- AC_MSG_CHECKING([Lua version])
---
-2.24.1
-
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch b/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch
deleted file mode 100644
index b4700e3..0000000
--- a/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index ee2d21ab..b085b988 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -39,6 +39,52 @@ DISTCLEANFILES = opendkim-@VERSION@.tar.gz
- # though.
- DISTCHECK_CONFIGURE_FLAGS=--enable-vbr --with-lua --enable-stats --with-odbx --with-db --with-openssl=/usr/local --enable-atps --enable-replace_rules
-
-+
-+#
-+# Handle some scripts and configuration files that need @VARIABLE@
-+# replacements here, so that we can share the rules (which are
-+# identical) between all of the targets.
-+#
-+
-+# We want to *build and install* these on the target machine.
-+nodist_doc_DATA = contrib/OpenRC/opendkim.openrc \
-+ contrib/systemd/opendkim.service \
-+ contrib/systemd/opendkim.tmpfiles \
-+ opendkim/opendkim.conf.simple \
-+ opendkim/opendkim.conf.simple-verify
-+
-+# Custom variable to keep the rule below as sane as possible.
-+doc_DATA_intermediate = contrib/OpenRC/opendkim.openrc.in
-+
-+# We want to *ship* these.
-+EXTRA_DIST = contrib/OpenRC/opendkim.openrc.in.in \
-+ contrib/systemd/opendkim.service.in \
-+ contrib/systemd/opendkim.tmpfiles.in \
-+ opendkim/opendkim.conf.simple.in \
-+ opendkim/opendkim.conf.simple-verify.in
-+
-+# The next rule allow us to replace bindir, libdir, etc. within
-+# files. The example is taken from the autoconf documentation and can
-+# be found in the "Installation Directory Variables" section.
-+edit = sed -e 's|@DOMAIN[@]|$(DOMAIN)|g' \
-+ -e 's|@RUNSTATEDIR[@]|$(runstatedir)|g' \
-+ -e 's|@SBINDIR[@]|$(sbindir)|g' \
-+ -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g'
-+
-+# This rule includes EVERY source/intermediate file as a dependency of
-+# EVERY output file, which is clearly wrong, but it may be the best we
-+# can do without duplication. At least it's the right kind of wrong,
-+# and rebuilds too often rather than not often enough.
-+$(nodist_doc_DATA): $(doc_DATA_intermediate) $(EXTRA_DIST) Makefile
-+ rm -f $@ $@.tmp
-+ srcdir=''; \
-+ test -f ./$@.in || srcdir=$(srcdir)/; \
-+ $(edit) $${srcdir}$@.in > $@.tmp
-+ mv $@.tmp $@
-+
-+
-+
-+
- $(DIST_ARCHIVES): distcheck
-
- $(DIST_ARCHIVES).md5: $(DIST_ARCHIVES)
-diff --git a/configure.ac b/configure.ac
-index 76914fd9..a478bb83 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,6 +65,9 @@ AC_PROG_CC_C99
- AM_PROG_CC_C_O
- AC_PROG_LIBTOOL
-
-+# Used by the OpenRC service script, at least.
-+AC_PROG_GREP
-+
- PKG_PROG_PKG_CONFIG
-
- #
-@@ -2628,6 +2631,11 @@ AC_SUBST(SPECCONFIGURE)
- AC_SUBST(SPECREQUIRES)
- AC_SUBST(SPECBUILDREQUIRES)
-
-+# Autoconf 2.70 will support this, and many distros patch it in,
-+# but Autoconf 2.70 hasn't actually been released yet.
-+AS_IF([test -z "${runstatedir}"], [runstatedir='${localstatedir}/run'])
-+AC_SUBST([runstatedir])
-+
- #
- # Finish up
- #
-@@ -2639,6 +2647,7 @@ AC_OUTPUT([ Makefile
- contrib/docs/Makefile
- contrib/init/Makefile
- contrib/init/generic/Makefile
-+ contrib/OpenRC/opendkim.openrc.in
- contrib/init/redhat/Makefile
- contrib/init/redhat/opendkim
- contrib/init/redhat/opendkim-default-keygen
-@@ -2650,8 +2659,6 @@ AC_OUTPUT([ Makefile
- contrib/spec/Makefile
- contrib/spec/opendkim.spec
- contrib/stats/Makefile
-- contrib/systemd/Makefile
-- contrib/systemd/opendkim.service
- libopendkim/opendkim.pc libopendkim/Makefile
- libopendkim/docs/Makefile
- libopendkim/tests/Makefile
-@@ -2664,8 +2671,6 @@ AC_OUTPUT([ Makefile
- opendkim/opendkim-lua.3
- opendkim/opendkim-testkey.8 opendkim/opendkim-stats.8
- opendkim/opendkim-testmsg.8 opendkim/opendkim.conf.5
-- opendkim/opendkim.conf.simple
-- opendkim/opendkim.conf.simple-verify
- opendkim/opendkim-atpszone.8 opendkim/opendkim-spam.1
- opendkim/tests/Makefile
- stats/Makefile stats/opendkim-importstats.8
-diff --git a/contrib/Makefile.am b/contrib/Makefile.am
-index 76df01cd..401130bb 100644
---- a/contrib/Makefile.am
-+++ b/contrib/Makefile.am
-@@ -3,6 +3,6 @@
-
- #AUTOMAKE_OPTIONS = foreign
-
--SUBDIRS = convert docs init ldap lua patches repute spec stats systemd
-+SUBDIRS = convert docs init ldap lua patches repute spec stats
-
- dist_doc_DATA = README
-diff --git a/contrib/OpenRC/opendkim.openrc.in.in b/contrib/OpenRC/opendkim.openrc.in.in
-new file mode 100644
-index 00000000..4b783615
---- /dev/null
-+++ b/contrib/OpenRC/opendkim.openrc.in.in
-@@ -0,0 +1,54 @@
-+#!/sbin/openrc-run
-+# Copyright 1999-2019 Gentoo Authors
-+# Distributed under the terms of the GNU General Public License v2
-+
-+CONFFILE="@SYSCONFDIR@/${RC_SVCNAME}.conf"
-+required_files="${CONFFILE}"
-+
-+command="@SBINDIR@/opendkim"
-+pidfile="@RUNSTATEDIR@/${RC_SVCNAME}.pid"
-+command_args="-P ${pidfile} -x ${CONFFILE}"
-+extra_commands="checkconfig"
-+
-+depend() {
-+ use dns logger net
-+ before mta
-+}
-+
-+checkconfig() {
-+ #
-+ # The opendkim.conf man page says,
-+ #
-+ # For parameters that are Boolean in nature, only the first byte
-+ # of the value is processed... For negative values, the following
-+ # are accepted: "F", "f", "N", "n", "0".'
-+ #
-+ if @GREP@ '^[[:space:]]*Background[[:space:]]\+[FfNn0]' "${CONFFILE}" \
-+ >/dev/null 2>&1; then
-+ eend 1 "${RC_SVCNAME} cannot run in the foreground!"
-+ fi
-+ if ! "${command}" -n "${command_args}"; then
-+ eend 1 "${RC_SVCNAME} configuration check failed"
-+ fi
-+}
-+
-+start_pre() {
-+ # If this isn't a restart, make sure that the user's config isn't
-+ # busted before we try to start the daemon (this will produce
-+ # better error messages than if we just try to start it blindly).
-+ #
-+ # If, on the other hand, this *is* a restart, then the stop_pre
-+ # action will have ensured that the config is usable and we don't
-+ # need to do that again.
-+ if [ "${RC_CMD}" != "restart" ]; then
-+ checkconfig || return $?
-+ fi
-+}
-+
-+stop_pre() {
-+ # If this is a restart, check to make sure the user's config
-+ # isn't busted before we stop the running daemon.
-+ if [ "${RC_CMD}" = "restart" ]; then
-+ checkconfig || return $?
-+ fi
-+}
-diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am
-deleted file mode 100644
-index 2ffc88cc..00000000
---- a/contrib/systemd/Makefile.am
-+++ /dev/null
-@@ -1,3 +0,0 @@
--# Copyright (c) 2013, The Trusted Domain Project. All rights reserved.
--
--dist_doc_DATA = opendkim.service
-diff --git a/contrib/systemd/opendkim.service.in b/contrib/systemd/opendkim.service.in
-index f7665f43..236f8a06 100644
---- a/contrib/systemd/opendkim.service.in
-+++ b/contrib/systemd/opendkim.service.in
-@@ -1,20 +1,28 @@
--# If you are using OpenDKIM with SQL datasets it might be necessary to start OpenDKIM after the database servers.
--# For example, if using both MariaDB and PostgreSQL, change "After=" in the "[Unit]" section to:
--# After=network.target nss-lookup.target syslog.target mariadb.service postgresql.service
-+# If you are using OpenDKIM with SQL datasets, you should start
-+# OpenDKIM after your database server. For example, when using
-+# PostgreSQL, you should create a supplementary ".conf" file in the
-+# appropriate directory containing,
-+#
-+# [Unit]
-+# After=postgresql.service
-+#
-
- [Unit]
- Description=DomainKeys Identified Mail (DKIM) Milter
--Documentation=man:opendkim(8) man:opendkim.conf(5) man:opendkim-genkey(8) man:opendkim-genzone(8) man:opendkim-testadsp(8) man:opendkim-testkey http://www.opendkim.org/docs.html
-+Documentation=man:opendkim(8) \
-+ man:opendkim.conf(5) \
-+ man:opendkim-genkey(8) \
-+ man:opendkim-genzone(8) \
-+ man:opendkim-testkey(8) \
-+ http://www.opendkim.org/docs.html
- After=network.target nss-lookup.target syslog.target
-
- [Service]
- Type=forking
--PIDFile=@localstatedir@/run/opendkim/opendkim.pid
--EnvironmentFile=-@sysconfdir@/sysconfig/opendkim
--ExecStart=@sbindir@/opendkim $OPTIONS
-+ExecStart=@SBINDIR@/opendkim -P @RUNSTATEDIR@/opendkim.pid
-+ExecStartPre=@SBINDIR@/opendkim -P @RUNSTATEDIR@/opendkim.pid -n -f
- ExecReload=/bin/kill -USR1 $MAINPID
--User=opendkim
--Group=opendkim
-+PIDFile=@RUNSTATEDIR@/opendkim.pid
-
- [Install]
- WantedBy=multi-user.target
-diff --git a/contrib/systemd/opendkim.tmpfiles.in b/contrib/systemd/opendkim.tmpfiles.in
-new file mode 100644
-index 00000000..a9118974
---- /dev/null
-+++ b/contrib/systemd/opendkim.tmpfiles.in
-@@ -0,0 +1,5 @@
-+# We allow everyone to read/traverse this directory because if it
-+# contains a local socket, then (for example) your MTA will want to
-+# look in there. Permissions on the socket itself are controlled
-+# by the "UserID" and "UMask" directives in the daemon's configuration.
-+d @RUNSTATEDIR@/opendkim 0755 opendkim opendkim
-diff --git a/opendkim/Makefile.am b/opendkim/Makefile.am
-index 4aa615c1..7d514771 100644
---- a/opendkim/Makefile.am
-+++ b/opendkim/Makefile.am
-@@ -16,9 +16,11 @@ endif
- sbin_PROGRAMS += opendkim-stats
- endif
-
-+
- dist_sbin_SCRIPTS = opendkim-genkey
--dist_doc_DATA = opendkim.conf.sample opendkim.conf.simple \
-- opendkim.conf.simple-verify README.SQL
-+
-+dist_doc_DATA = opendkim.conf.sample README.SQL
-+
-
- if BUILD_FILTER
- sbin_PROGRAMS += opendkim
-diff --git a/opendkim/opendkim.conf.simple-verify.in b/opendkim/opendkim.conf.simple-verify.in
-index 2224b64f..463048ab 100644
---- a/opendkim/opendkim.conf.simple-verify.in
-+++ b/opendkim/opendkim.conf.simple-verify.in
-@@ -17,5 +17,5 @@ Mode v
-
- # ADSPDiscard no
-
--# PidFile /var/run/opendkim/opendkim.pid
-+# PidFile @RUNSTATEDIR@/opendkim.pid
-
-diff --git a/opendkim/opendkim.conf.simple.in b/opendkim/opendkim.conf.simple.in
-index 735b924b..b70bfb46 100644
---- a/opendkim/opendkim.conf.simple.in
-+++ b/opendkim/opendkim.conf.simple.in
-@@ -12,6 +12,12 @@ KeyFile /var/db/dkim/@DOMAIN@.private
-
- Socket inet:8891@localhost
-
-+# To use a local socket instead, specify a path here. The "standard"
-+# location is under @RUNSTATEDIR@/opendkim, and it's best to agree
-+# on that directory so that various init systems can configure its
-+# permissions and ownership automatically.
-+#Socket local:@RUNSTATEDIR@/opendkim/opendkim.sock
-+
- ReportAddress postmaster@@DOMAIN@
- SendReports yes
-
-@@ -25,4 +31,4 @@ SendReports yes
- #
- # PeerList X.X.X.X
-
--# PidFile /var/run/opendkim/opendkim.pid
-+# PidFile @RUNSTATEDIR@/opendkim.pid
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-openssl-1.1.1.patch.r2 b/mail-filter/opendkim/files/opendkim-2.10.3-openssl-1.1.1.patch.r2
deleted file mode 100644
index cc8f48b..0000000
--- a/mail-filter/opendkim/files/opendkim-2.10.3-openssl-1.1.1.patch.r2
+++ /dev/null
@@ -1,170 +0,0 @@
-From FreeBSD: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223568
---- a/configure.ac 2015-05-12 18:43:09 UTC
-+++ b/configure.ac
-@@ -860,26 +860,28 @@ then
- AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
- AC_MSG_ERROR([libcrypto not found]))
-
-- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
-- [
-- if test x"$enable_shared" = x"yes"
-- then
-- AC_MSG_ERROR([Cannot build shared opendkim
-- against static openssl libraries.
-- Configure with --disable-shared
-- to get this working or obtain a
-- shared libssl library for
-- opendkim to use.])
-- fi
-
-- # avoid caching issue - last result of SSL_library_init
-- # shouldn't be cached for this next check
-- unset ac_cv_search_SSL_library_init
-- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
-- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
-- AC_MSG_ERROR([libssl not found]), [-ldl])
-- ]
-- )
-+ AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
-+ [[SSL_library_init();]])],
-+ [od_have_ossl="yes";],
-+ [od_have_ossl="no";])
-+ if test x"$od_have_ossl" = x"no"
-+ then
-+ if test x"$enable_shared" = x"yes"
-+ then
-+ AC_MSG_ERROR([Cannot build shared opendkim
-+ against static openssl libraries.
-+ Configure with --disable-shared
-+ to get this working or obtain a
-+ shared libssl library for
-+ opendkim to use.])
-+ fi
-+
-+ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
-+ AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
-+ AC_MSG_ERROR([libssl not found]), [-ldl])
-+ fi
-
- AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
- AC_DEFINE([HAVE_SHA256], 1,
---- a/libopendkim/tests/Makefile.in 2015-05-12 18:43:48 UTC
-+++ b/libopendkim/tests/Makefile.in
-@@ -1108,8 +1108,10 @@ am__nobase_list = $(am__nobase_strip_setup); \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
- am__base_list = \
-- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\
-+/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\
-+/ /g'
- am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-@@ -4131,16 +4133,19 @@ uninstall-am: uninstall-dist_docDATA
- @LCOV_TRUE@description.txt: $(check_PROGRAMS) $(check_SCRIPTS)
- @LCOV_TRUE@ rm -f $@
- @LCOV_TRUE@ for i in $(check_PROGRAMS); do \
--@LCOV_TRUE@ testname=$${i/t-}; \
--@LCOV_TRUE@ testname=$${testname//-/_}; \
-+@LCOV_TRUE@ testname=$${i#t-}; \
-+@LCOV_TRUE@ testname=$$(echo $${testname} | sed -e 's/-/_/g'); \
- @LCOV_TRUE@ fgrep '***' $$i.c | tail -n 1 | \
--@LCOV_TRUE@ (echo $${testname} ; sed -e 's/[^*]*\*\*\*\(.*\)\\n.*/\t\1\n/g' ) >> $@; \
-+@LCOV_TRUE@ (echo $${testname} ; sed -e 's/[^*]*\*\*\*\(.*\)\\
-+@LCOV_TRUE@.*/ \1\
-+@LCOV_TRUE@/g' ) >> $@; \
- @LCOV_TRUE@ done
- @LCOV_TRUE@ for i in $(check_SCRIPTS); do \
--@LCOV_TRUE@ testname=$${i/t-}; \
--@LCOV_TRUE@ testname=$${testname//-/_}; \
-+@LCOV_TRUE@ testname=$${i#t-}; \
-+@LCOV_TRUE@ testname=$$(echo $${testname} | sed -e 's/-/_/g'); \
- @LCOV_TRUE@ grep '^#' $$i | tail -n 1 | \
--@LCOV_TRUE@ (echo $${testname} ; sed -e 's/^# \(.*\)/\t\1\n/g' ) >> $@; \
-+@LCOV_TRUE@ (echo $${testname} ; sed -e 's/^# \(.*\)/ \1\
-+@LCOV_TRUE@/g' ) >> $@; \
- @LCOV_TRUE@ done
-
- @LCOV_TRUE@description.html: description.txt
---- a/libopendkim/dkim-canon.c 2015-05-11 03:56:13 UTC
-+++ b/libopendkim/dkim-canon.c
-@@ -388,7 +388,7 @@ dkim_canon_header_string(struct dkim_dstring *dstr, dk
- }
-
- /* skip all spaces before first word */
-- while (*p != '\0' && DKIM_ISWSP(*p))
-+ while (*p != '\0' && DKIM_ISLWSP(*p))
- p++;
-
- space = FALSE; /* just saw a space */
---- a/opendkim/tests/Makefile.in 2015-05-12 18:43:49 UTC
-+++ b/opendkim/tests/Makefile.in
-@@ -139,8 +139,10 @@ am__nobase_list = $(am__nobase_strip_setup); \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
- am__base_list = \
-- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\
-+/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\
-+/ /g'
- am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-@@ -1298,14 +1300,16 @@ uninstall-am: uninstall-dist_docDATA
- @LCOV_TRUE@description.txt: $(check_SCRIPTS)
- @LCOV_TRUE@ rm -f $@
- @LCOV_TRUE@ for test in $? ; do \
--@LCOV_TRUE@ testname=$${test/t-}; \
--@LCOV_TRUE@ testname=$${testname//-/_}; \
-+@LCOV_TRUE@ testname=$${test#t-}; \
-+@LCOV_TRUE@ testname=$$(echo $${testname} | sed -e 's/-/_/g'); \
- @LCOV_TRUE@ grep ^# $$test | tail -n 1 | \
--@LCOV_TRUE@ sed -e "s/^#\(.*\)/$${testname}\n\t\1\n/g" >> $@; \
-+@LCOV_TRUE@ sed -e "s/^#\(.*\)/$${testname}\
-+@LCOV_TRUE@ \1\
-+@LCOV_TRUE@/g" >> $@; \
- @LCOV_TRUE@ done
-
- @LCOV_TRUE@description.html: description.txt
--@LCOV_TRUE@ gendesc --output $@ $<
-+@LCOV_TRUE@ gendesc --output $@ $?
-
- @LCOV_TRUE@maintainer-clean-local:
- @LCOV_TRUE@ -rm -rf lcov/[^C]*
---- a/opendkim/opendkim-crypto.c 2013-02-25 21:02:41 UTC
-+++ b/opendkim/opendkim-crypto.c
-@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
- {
- assert(pthread_setspecific(id_key, ptr) == 0);
-
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined (LIBRESSL_VERSION_NUMBER)
-+ OPENSSL_thread_stop();
-+#else
- ERR_remove_state(0);
-+#endif
-
- free(ptr);
-
-@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
- {
- if (crypto_init_done)
- {
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined (LIBRESSL_VERSION_NUMBER)
-+ OPENSSL_thread_stop();
-+#else
- CRYPTO_cleanup_all_ex_data();
- CONF_modules_free();
- EVP_cleanup();
- ERR_free_strings();
- ERR_remove_state(0);
-+#endif
-
- if (nmutexes > 0)
- {
-
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
deleted file mode 100644
index 47cb024..0000000
--- a/mail-filter/opendkim/metadata.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>klondike@gentoo.org</email>
- <name>Francisco Blas Izquierdo Riera</name>
- </maintainer>
- <maintainer type="person">
- <email>mjo@gentoo.org</email>
- <name>Michael Orlitzky</name>
- </maintainer>
- <longdescription>
- A program implementing the Milter API that signs and verifies
- using the DKIM standard. This is a fork of Sendmail's DKIM-milter
- </longdescription>
- <use>
- <flag name="unbound">
- Use the unbound dnssec library to perform DKIM DNS
- queries.
- </flag>
- <flag name="opendbx">
- Use opendbx backend to facilitate dataset driven OpenDKIM
- configuration options like stats, bodylengthdb, etc. against a
- wide variety of database types
- </flag>
- <flag name="sasl">
- Used to authenticate to a LDAP server in various ways if
- required.
- </flag>
- <flag name="ldap">
- Enable openldap as a dataset facilitator or keys, determining
- domains to sign for, and any other dataset that opendkim
- supports.
- </flag>
- <flag name="lua">
- Enables control over signature verification, filtering and
- policy to be controlled by user defined lua scripts.
- </flag>
- <flag name="poll">
- Use poll() instead of select() for the provided asynchronous
- resolver library.
- </flag>
- <flag name="memcached">
- Add support for using <pkg>dev-libs/libmemcached</pkg>
- </flag>
- <flag name="lmdb">
- Add support for using <pkg>dev-db/lmdb</pkg>
- </flag>
- <flag name="querycache">
- Add support for query caching (requires 'berkdb' flag)
- </flag>
- <flag name="stats">
- Add support for statistics (requires 'opendbx' flag)
- </flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">opendkim</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
deleted file mode 100644
index 98b3a26..0000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r17.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools db-use eutils systemd tmpfiles
-
-DESCRIPTION="A milter providing DKIM signing and verification"
-HOMEPAGE="http://opendkim.org/"
-SRC_URI="https://downloads.sourceforge.net/project/opendkim/${P}.tar.gz"
-
-# The GPL-2 is for the init script, bug 425960.
-LICENSE="BSD GPL-2 Sendmail-Open-Source"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
-
-BDEPEND="acct-user/opendkim
- test? ( dev-lang/lua:0= )"
-
-COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
- dev-libs/libbsd
- sys-apps/grep
- ssl? ( dev-libs/openssl:0= )
- berkdb? ( >=sys-libs/db-3.2:* )
- opendbx? ( >=dev-db/opendbx-1.4.0 )
- lua? ( dev-lang/lua:0= )
- ldap? ( net-nds/openldap )
- lmdb? ( dev-db/lmdb )
- memcached? ( dev-libs/libmemcached )
- sasl? ( dev-libs/cyrus-sasl )
- unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root )
- !unbound? ( net-libs/ldns )"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
- acct-user/opendkim
- sys-process/psmisc
- selinux? ( sec-policy/selinux-dkim )"
-
-REQUIRED_USE="sasl? ( ldap )
- stats? ( opendbx )
- querycache? ( berkdb )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${P}-openrc.patch"
- "${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
-)
-
-src_prepare() {
- default
- sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \
- -i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
- || die
- sed -e 's:dist_doc_DATA:dist_html_DATA:' \
- -i libopendkim/docs/Makefile.am \
- || die
- eautoreconf
-}
-
-src_configure() {
- local myconf=()
- if use berkdb ; then
- myconf+=( --with-db-incdir=$(db_includedir) )
- fi
- if use unbound; then
- myconf+=( --with-unbound )
- else
- myconf+=( --with-ldns )
- fi
- if use ldap; then
- myconf+=( $(use_with sasl) )
- fi
-
- # We install the our configuration filed under e.g. /etc/opendkim,
- # so the next line is necessary to point the daemon and all of its
- # documentation to the right location by default.
- myconf+=( --sysconfdir="${EPREFIX}/etc/${PN}" )
-
- econf \
- $(use_with berkdb db) \
- $(use_with opendbx odbx) \
- $(use_with lua) \
- $(use_enable lua rbl) \
- $(use_with ldap openldap) \
- $(use_with lmdb) \
- $(use_enable poll) \
- $(use_enable querycache query_cache) \
- $(use_enable static-libs static) \
- $(use_enable stats) \
- $(use_with memcached libmemcached) \
- "${myconf[@]}" \
- --enable-filter \
- --enable-atps \
- --enable-identity_header \
- --enable-rate_limit \
- --enable-resign \
- --enable-replace_rules \
- --enable-default_sender \
- --enable-sender_macro \
- --enable-vbr \
- --disable-live-testing \
- --with-test-socket="${T}/opendkim.sock"
-}
-
-src_compile() {
- emake runstatedir=/run
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -type f -delete || die
-
- dosbin stats/opendkim-reportstats
-
- newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}"
- systemd_newtmpfilesd "${S}/contrib/systemd/opendkim.tmpfiles" "${PN}.conf"
- systemd_newunit "contrib/systemd/opendkim.service" "${PN}.service"
-
- dodir /etc/opendkim
- keepdir /var/lib/opendkim
-
- # The OpenDKIM data (particularly, your keys) should be read-only to
- # the UserID that the daemon runs as.
- fowners root:opendkim /var/lib/opendkim
- fperms 750 /var/lib/opendkim
-
- # Tweak the "simple" example configuration a bit before installing
- # it unconditionally.
- local cf="${T}/opendkim.conf"
- # Some MTAs are known to break DKIM signatures with "simple"
- # canonicalization [1], so we choose the "relaxed" policy
- # over OpenDKIM's current default settings.
- # [1] https://wordtothewise.com/2016/12/dkim-canonicalization-or-why-microsoft-breaks-your-mail/
- sed -E -e 's:^(Canonicalization)[[:space:]]+.*:\1\trelaxed/relaxed:' \
- "${S}/opendkim/opendkim.conf.simple" >"${cf}" || die
- cat >>"${cf}" <<EOT || die
-
-# The UMask is really only used for the PID file (root:root) and the
-# local UNIX socket, if you're using one. It should be 0117 for the
-# socket.
-UMask 0117
-UserID opendkim
-
-# For use with unbound
-#TrustAnchorFile /etc/dnssec/root-anchors.txt
-EOT
- insinto /etc/opendkim
- doins "${cf}"
-}
-
-pkg_postinst() {
- tmpfiles_process "${PN}.conf"
- if [[ -z ${REPLACING_VERSION} ]]; then
- elog "If you want to sign your mail messages and need some help"
- elog "please run:"
- elog " emerge --config ${CATEGORY}/${PN}"
- elog "It will help you create your key and give you hints on how"
- elog "to configure your DNS and MTA."
-
- elog "If you are using a local (UNIX) socket, then you will"
- elog "need to make sure that your MTA has read/write access"
- elog "to the socket file. This is best accomplished by creating"
- elog "a completely-new group with only your MTA user and the"
- elog "\"opendkim\" user in it. Step-by-step instructions can be"
- elog "found on our Wiki, at https://wiki.gentoo.org/wiki/OpenDKIM ."
- else
- ewarn "The user account for the OpenDKIM daemon has changed"
- ewarn "from \"milter\" to \"opendkim\" to prevent unrelated services"
- ewarn "from being able to read your private keys. You should"
- ewarn "adjust your existing configuration to use the \"opendkim\""
- ewarn "user and group, and change the permissions on"
- ewarn "${ROOT}/var/lib/opendkim to root:opendkim with mode 0750."
- ewarn "The owner and group of the files within that directory"
- ewarn "will likely need to be adjusted as well."
- fi
-}
-
-pkg_config() {
- local selector keysize pubkey
-
- read -p "Enter the selector name (default ${HOSTNAME}): " selector
- [[ -n "${selector}" ]] || selector="${HOSTNAME}"
- if [[ -z "${selector}" ]]; then
- eerror "Oddly enough, you don't have a HOSTNAME."
- return 1
- fi
- if [[ -f "${ROOT}/var/lib/opendkim/${selector}.private" ]]; then
- ewarn "The private key for this selector already exists."
- else
- keysize=1024
- # Generate the private and public keys. Note that opendkim-genkeys
- # sets umask=077 on its own to keep these safe. However, we want
- # them to be readable (only!) to the opendkim user, and we manage
- # that by changing their groups and making everything group-readable.
- opendkim-genkey -b ${keysize} -D "${ROOT}/var/lib/opendkim/" \
- -s "${selector}" -d '(your domain)' && \
- chgrp --no-dereference opendkim \
- "${ROOT}/var/lib/opendkim/${selector}".{private,txt} || \
- { eerror "Failed to create private and public keys."; return 1; }
- chmod g+r "${ROOT}/var/lib/opendkim/${selector}".{private,txt}
- fi
-
- # opendkim selector configuration
- echo
- einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
- einfo " Keyfile /var/lib/opendkim/${selector}.private"
- einfo " Selector ${selector}"
-
- # MTA configuration
- echo
- einfo "If you are using Postfix, add following lines to your main.cf:"
- einfo " smtpd_milters = unix:/run/opendkim/opendkim.sock"
- einfo " non_smtpd_milters = unix:/run/opendkim/opendkim.sock"
- einfo " and read http://www.postfix.org/MILTER_README.html"
-
- # DNS configuration
- einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
- cat "${ROOT}/var/lib/opendkim/${selector}.txt"
- einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
- einfo " http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
-}
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r19.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r19.ebuild
deleted file mode 100644
index 7fa1bbb..0000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r19.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools db-use eutils systemd tmpfiles
-
-DESCRIPTION="A milter providing DKIM signing and verification"
-HOMEPAGE="http://opendkim.org/"
-SRC_URI="https://downloads.sourceforge.net/project/opendkim/${P}.tar.gz"
-
-# The GPL-2 is for the init script, bug 425960.
-LICENSE="BSD GPL-2 Sendmail-Open-Source"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
-
-BDEPEND="acct-user/opendkim
- test? ( dev-lang/lua:0= )"
-
-COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
- dev-libs/libbsd
- sys-apps/grep
- ssl? ( dev-libs/openssl:0= )
- berkdb? ( >=sys-libs/db-3.2:* )
- opendbx? ( >=dev-db/opendbx-1.4.0 )
- lua? ( dev-lang/lua:0= )
- ldap? ( net-nds/openldap )
- lmdb? ( dev-db/lmdb )
- memcached? ( dev-libs/libmemcached )
- sasl? ( dev-libs/cyrus-sasl )
- unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root )
- !unbound? ( net-libs/ldns )"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
- acct-user/opendkim
- sys-process/psmisc
- selinux? ( sec-policy/selinux-dkim )"
-
-REQUIRED_USE="sasl? ( ldap )
- stats? ( opendbx )
- querycache? ( berkdb )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${P}-openrc.patch"
- "${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
- "${FILESDIR}/${P}-lua-pkgconfig.patch"
- "${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
- "${FILESDIR}/${P}-fix-libmilter-search.patch"
-)
-
-src_prepare() {
- default
- sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \
- -i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
- || die
- sed -e 's:dist_doc_DATA:dist_html_DATA:' \
- -i libopendkim/docs/Makefile.am \
- || die
- eautoreconf
-}
-
-src_configure() {
- local myconf=()
- if use berkdb ; then
- myconf+=( --with-db-incdir=$(db_includedir) )
- fi
- if use unbound; then
- myconf+=( --with-unbound )
- else
- myconf+=( --with-ldns )
- fi
- if use ldap; then
- myconf+=( $(use_with sasl) )
- fi
-
- # We install the our configuration filed under e.g. /etc/opendkim,
- # so the next line is necessary to point the daemon and all of its
- # documentation to the right location by default.
- myconf+=( --sysconfdir="${EPREFIX}/etc/${PN}" )
-
- econf \
- $(use_with berkdb db) \
- $(use_with opendbx odbx) \
- $(use_with lua) \
- $(use_enable lua rbl) \
- $(use_with ldap openldap) \
- $(use_with lmdb) \
- $(use_enable poll) \
- $(use_enable querycache query_cache) \
- $(use_enable static-libs static) \
- $(use_enable stats) \
- $(use_with memcached libmemcached) \
- "${myconf[@]}" \
- --enable-filter \
- --with-milter \
- --enable-atps \
- --enable-identity_header \
- --enable-rate_limit \
- --enable-resign \
- --enable-replace_rules \
- --enable-default_sender \
- --enable-sender_macro \
- --enable-vbr \
- --disable-live-testing \
- --with-test-socket="${T}/opendkim.sock"
-}
-
-src_compile() {
- emake runstatedir=/run
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -type f -delete || die
-
- dosbin stats/opendkim-reportstats
-
- newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}"
- systemd_newtmpfilesd "${S}/contrib/systemd/opendkim.tmpfiles" "${PN}.conf"
- systemd_newunit "contrib/systemd/opendkim.service" "${PN}.service"
-
- dodir /etc/opendkim
- keepdir /var/lib/opendkim
-
- # The OpenDKIM data (particularly, your keys) should be read-only to
- # the UserID that the daemon runs as.
- fowners root:opendkim /var/lib/opendkim
- fperms 750 /var/lib/opendkim
-
- # Tweak the "simple" example configuration a bit before installing
- # it unconditionally.
- local cf="${T}/opendkim.conf"
- # Some MTAs are known to break DKIM signatures with "simple"
- # canonicalization [1], so we choose the "relaxed" policy
- # over OpenDKIM's current default settings.
- # [1] https://wordtothewise.com/2016/12/dkim-canonicalization-or-why-microsoft-breaks-your-mail/
- sed -E -e 's:^(Canonicalization)[[:space:]]+.*:\1\trelaxed/relaxed:' \
- "${S}/opendkim/opendkim.conf.simple" >"${cf}" || die
- cat >>"${cf}" <<EOT || die
-
-# The UMask is really only used for the PID file (root:root) and the
-# local UNIX socket, if you're using one. It should be 0117 for the
-# socket.
-UMask 0117
-UserID opendkim
-
-# For use with unbound
-#TrustAnchorFile /etc/dnssec/root-anchors.txt
-EOT
- insinto /etc/opendkim
- doins "${cf}"
-}
-
-pkg_postinst() {
- tmpfiles_process "${PN}.conf"
- if [[ -z ${REPLACING_VERSION} ]]; then
- elog "If you want to sign your mail messages and need some help"
- elog "please run:"
- elog " emerge --config ${CATEGORY}/${PN}"
- elog "It will help you create your key and give you hints on how"
- elog "to configure your DNS and MTA."
-
- elog "If you are using a local (UNIX) socket, then you will"
- elog "need to make sure that your MTA has read/write access"
- elog "to the socket file. This is best accomplished by creating"
- elog "a completely-new group with only your MTA user and the"
- elog "\"opendkim\" user in it. Step-by-step instructions can be"
- elog "found on our Wiki, at https://wiki.gentoo.org/wiki/OpenDKIM ."
- else
- ewarn "The user account for the OpenDKIM daemon has changed"
- ewarn "from \"milter\" to \"opendkim\" to prevent unrelated services"
- ewarn "from being able to read your private keys. You should"
- ewarn "adjust your existing configuration to use the \"opendkim\""
- ewarn "user and group, and change the permissions on"
- ewarn "${ROOT}/var/lib/opendkim to root:opendkim with mode 0750."
- ewarn "The owner and group of the files within that directory"
- ewarn "will likely need to be adjusted as well."
- fi
-}
-
-pkg_config() {
- local selector keysize pubkey
-
- read -p "Enter the selector name (default ${HOSTNAME}): " selector
- [[ -n "${selector}" ]] || selector="${HOSTNAME}"
- if [[ -z "${selector}" ]]; then
- eerror "Oddly enough, you don't have a HOSTNAME."
- return 1
- fi
- if [[ -f "${ROOT}/var/lib/opendkim/${selector}.private" ]]; then
- ewarn "The private key for this selector already exists."
- else
- keysize=1024
- # Generate the private and public keys. Note that opendkim-genkeys
- # sets umask=077 on its own to keep these safe. However, we want
- # them to be readable (only!) to the opendkim user, and we manage
- # that by changing their groups and making everything group-readable.
- opendkim-genkey -b ${keysize} -D "${ROOT}/var/lib/opendkim/" \
- -s "${selector}" -d '(your domain)' && \
- chgrp --no-dereference opendkim \
- "${ROOT}/var/lib/opendkim/${selector}".{private,txt} || \
- { eerror "Failed to create private and public keys."; return 1; }
- chmod g+r "${ROOT}/var/lib/opendkim/${selector}".{private,txt}
- fi
-
- # opendkim selector configuration
- echo
- einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
- einfo " Keyfile /var/lib/opendkim/${selector}.private"
- einfo " Selector ${selector}"
-
- # MTA configuration
- echo
- einfo "If you are using Postfix, add following lines to your main.cf:"
- einfo " smtpd_milters = unix:/run/opendkim/opendkim.sock"
- einfo " non_smtpd_milters = unix:/run/opendkim/opendkim.sock"
- einfo " and read http://www.postfix.org/MILTER_README.html"
-
- # DNS configuration
- einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
- cat "${ROOT}/var/lib/opendkim/${selector}.txt"
- einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
- einfo " http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
-}
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
deleted file mode 100644
index 0cf4eb5..0000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r26.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 lua5-2 )
-
-inherit autotools db-use eutils systemd tmpfiles lua-single
-
-DESCRIPTION="A milter providing DKIM signing and verification"
-HOMEPAGE="http://opendkim.org/"
-SRC_URI="https://downloads.sourceforge.net/project/opendkim/${P}.tar.gz"
-
-# The GPL-2 is for the init script, bug 425960.
-LICENSE="BSD GPL-2 Sendmail-Open-Source"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="berkdb ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats querycache test unbound"
-
-BDEPEND="acct-user/opendkim
- test? ( ${LUA_DEPS} )"
-
-COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
- dev-libs/libbsd
- sys-apps/grep
- ssl? ( dev-libs/openssl:0= )
- berkdb? ( >=sys-libs/db-3.2:* )
- opendbx? ( >=dev-db/opendbx-1.4.0 )
- lua? ( ${LUA_DEPS} )
- ldap? ( net-nds/openldap )
- lmdb? ( dev-db/lmdb )
- memcached? ( dev-libs/libmemcached )
- sasl? ( dev-libs/cyrus-sasl )
- unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root )
- !unbound? ( net-libs/ldns )"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
- acct-user/opendkim
- sys-process/psmisc
- selinux? ( sec-policy/selinux-dkim )"
-
-REQUIRED_USE="sasl? ( ldap )
- stats? ( opendbx )
- querycache? ( berkdb )
- lua? ( ${LUA_REQUIRED_USE} )
- test? ( ${LUA_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${P}-openrc.patch"
- "${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
- "${FILESDIR}/${P}-lua-pkgconfig.patch"
- "${FILESDIR}/${P}-lua-pkgconfig-pt2.patch"
- "${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
- "${FILESDIR}/${P}-fix-libmilter-search.patch"
-)
-
-src_prepare() {
- default
- sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \
- -i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
- || die
- sed -e 's:dist_doc_DATA:dist_html_DATA:' \
- -i libopendkim/docs/Makefile.am \
- || die
-
- # The existing hard-coded path under /tmp is vulnerable to exploits
- # since (for example) a user can create a symlink there to a file
- # that portage will clobber. Reported upstream at,
- #
- # https://github.com/trusteddomainproject/OpenDKIM/issues/113
- #
- sed -e "s:/tmp:${T}:" -i libopendkim/tests/t-testdata.h || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=()
- if use berkdb ; then
- myconf+=( --with-db-incdir=$(db_includedir) )
- fi
- if use unbound; then
- myconf+=( --with-unbound )
- else
- myconf+=( --with-ldns )
- fi
- if use ldap; then
- myconf+=( $(use_with sasl) )
- fi
-
- # We install the our configuration filed under e.g. /etc/opendkim,
- # so the next line is necessary to point the daemon and all of its
- # documentation to the right location by default.
- myconf+=( --sysconfdir="${EPREFIX}/etc/${PN}" )
-
- econf \
- $(use_with berkdb db) \
- $(use_with opendbx odbx) \
- $(use_with lua) \
- $(use_enable lua rbl) \
- $(use_with ldap openldap) \
- $(use_with lmdb) \
- $(use_enable poll) \
- $(use_enable querycache query_cache) \
- $(use_enable static-libs static) \
- $(use_enable stats) \
- $(use_with memcached libmemcached) \
- "${myconf[@]}" \
- --enable-filter \
- --with-milter \
- --enable-atps \
- --enable-identity_header \
- --enable-rate_limit \
- --enable-resign \
- --enable-replace_rules \
- --enable-default_sender \
- --enable-sender_macro \
- --enable-vbr \
- --disable-live-testing \
- --with-test-socket="${T}/opendkim.sock"
-}
-
-src_compile() {
- emake runstatedir=/run
-}
-
-src_test() {
- # Needed for now due to the expected sequencing of the setup/cleanup
- # tests, https://github.com/trusteddomainproject/OpenDKIM/issues/110
- emake -j1 check
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -type f -delete || die
-
- dosbin stats/opendkim-reportstats
-
- newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}"
- systemd_newtmpfilesd "${S}/contrib/systemd/opendkim.tmpfiles" "${PN}.conf"
- systemd_newunit "contrib/systemd/opendkim.service" "${PN}.service"
-
- dodir /etc/opendkim
- keepdir /var/lib/opendkim
-
- # The OpenDKIM data (particularly, your keys) should be read-only to
- # the UserID that the daemon runs as.
- fowners root:opendkim /var/lib/opendkim
- fperms 750 /var/lib/opendkim
-
- # Tweak the "simple" example configuration a bit before installing
- # it unconditionally.
- local cf="${T}/opendkim.conf"
- # Some MTAs are known to break DKIM signatures with "simple"
- # canonicalization [1], so we choose the "relaxed" policy
- # over OpenDKIM's current default settings.
- # [1] https://wordtothewise.com/2016/12/dkim-canonicalization-or-why-microsoft-breaks-your-mail/
- sed -E -e 's:^(Canonicalization)[[:space:]]+.*:\1\trelaxed/relaxed:' \
- "${S}/opendkim/opendkim.conf.simple" >"${cf}" || die
- cat >>"${cf}" <<EOT || die
-
-# The UMask is really only used for the PID file (root:root) and the
-# local UNIX socket, if you're using one. It should be 0117 for the
-# socket.
-UMask 0117
-UserID opendkim
-
-# For use with unbound
-#TrustAnchorFile /etc/dnssec/root-anchors.txt
-EOT
- insinto /etc/opendkim
- doins "${cf}"
-}
-
-pkg_postinst() {
- tmpfiles_process "${PN}.conf"
- if [[ -z ${REPLACING_VERSION} ]]; then
- elog "If you want to sign your mail messages and need some help"
- elog "please run:"
- elog " emerge --config ${CATEGORY}/${PN}"
- elog "It will help you create your key and give you hints on how"
- elog "to configure your DNS and MTA."
-
- elog "If you are using a local (UNIX) socket, then you will"
- elog "need to make sure that your MTA has read/write access"
- elog "to the socket file. This is best accomplished by creating"
- elog "a completely-new group with only your MTA user and the"
- elog "\"opendkim\" user in it. Step-by-step instructions can be"
- elog "found on our Wiki, at https://wiki.gentoo.org/wiki/OpenDKIM ."
- else
- ewarn "The user account for the OpenDKIM daemon has changed"
- ewarn "from \"milter\" to \"opendkim\" to prevent unrelated services"
- ewarn "from being able to read your private keys. You should"
- ewarn "adjust your existing configuration to use the \"opendkim\""
- ewarn "user and group, and change the permissions on"
- ewarn "${ROOT}/var/lib/opendkim to root:opendkim with mode 0750."
- ewarn "The owner and group of the files within that directory"
- ewarn "will likely need to be adjusted as well."
- fi
-}
-
-pkg_config() {
- local selector keysize pubkey
-
- read -p "Enter the selector name (default ${HOSTNAME}): " selector
- [[ -n "${selector}" ]] || selector="${HOSTNAME}"
- if [[ -z "${selector}" ]]; then
- eerror "Oddly enough, you don't have a HOSTNAME."
- return 1
- fi
- if [[ -f "${ROOT}/var/lib/opendkim/${selector}.private" ]]; then
- ewarn "The private key for this selector already exists."
- else
- keysize=1024
- # Generate the private and public keys. Note that opendkim-genkeys
- # sets umask=077 on its own to keep these safe. However, we want
- # them to be readable (only!) to the opendkim user, and we manage
- # that by changing their groups and making everything group-readable.
- opendkim-genkey -b ${keysize} -D "${ROOT}/var/lib/opendkim/" \
- -s "${selector}" -d '(your domain)' && \
- chgrp --no-dereference opendkim \
- "${ROOT}/var/lib/opendkim/${selector}".{private,txt} || \
- { eerror "Failed to create private and public keys."; return 1; }
- chmod g+r "${ROOT}/var/lib/opendkim/${selector}".{private,txt}
- fi
-
- # opendkim selector configuration
- echo
- einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
- einfo " Keyfile /var/lib/opendkim/${selector}.private"
- einfo " Selector ${selector}"
-
- # MTA configuration
- echo
- einfo "If you are using Postfix, add following lines to your main.cf:"
- einfo " smtpd_milters = unix:/run/opendkim/opendkim.sock"
- einfo " non_smtpd_milters = unix:/run/opendkim/opendkim.sock"
- einfo " and read http://www.postfix.org/MILTER_README.html"
-
- # DNS configuration
- einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
- cat "${ROOT}/var/lib/opendkim/${selector}.txt"
- einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
- einfo " http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
-}
reply other threads:[~2022-07-10 22:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1657493462.d800e2954ff4f087ee42605291e0c1e23bfadbee.quentin@gentoo \
--to=gentoo@retornaz.com \
--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