diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-09-05 22:24:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-05 22:24:31 +0100 |
commit | 0234a4013e6d1821ab7db449aa7867d7141324a8 (patch) | |
tree | 5ab2ccf666de1127eec29b931b11e63b89b02392 /mail-mta | |
parent | 44a22ab89258383202cae3037c3a5685aa903251 (diff) |
gentoo auto-resync : 05:09:2023 - 22:24:31
Diffstat (limited to 'mail-mta')
-rw-r--r-- | mail-mta/Manifest.gz | bin | 2380 -> 2384 bytes | |||
-rw-r--r-- | mail-mta/opensmtpd/Manifest | 8 | ||||
-rw-r--r-- | mail-mta/opensmtpd/files/opensmtpd-6.8.0_p2-ar.patch | 42 | ||||
-rw-r--r-- | mail-mta/opensmtpd/files/opensmtpd-6.8.0_p2-implicit-function-declaration.patch | 303 | ||||
-rw-r--r-- | mail-mta/opensmtpd/files/opensmtpd-6.8.0_p2-strict-prototypes.patch | 74 | ||||
-rw-r--r-- | mail-mta/opensmtpd/files/smtpd.service | 10 | ||||
-rw-r--r-- | mail-mta/opensmtpd/files/smtpd.socket | 8 | ||||
-rw-r--r-- | mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r2.ebuild | 78 | ||||
-rw-r--r-- | mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r3.ebuild | 91 |
9 files changed, 0 insertions, 614 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz Binary files differindex a15192088c54..fa0a8257a5ec 100644 --- a/mail-mta/Manifest.gz +++ b/mail-mta/Manifest.gz diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest index d0863a8203a5..e76616109c6d 100644 --- a/mail-mta/opensmtpd/Manifest +++ b/mail-mta/opensmtpd/Manifest @@ -1,14 +1,6 @@ -AUX opensmtpd-6.8.0_p2-ar.patch 1071 BLAKE2B ee4ff0e43e12ef15103400306a00640f8ea5624f9deb8143bedd0f9c17e16ba4c1e606649af587ec4c27f504fcc2141f09101ff41fe6c905b7fd473ae9d586f8 SHA512 f8a3622ecf298a3afe6ba7efe7a26492b389224c4b02b44fca1801cd8915b532bbbd69781749b44f6fabf28966653827e465bd214c61a13fe39096d55087e6c0 -AUX opensmtpd-6.8.0_p2-implicit-function-declaration.patch 8704 BLAKE2B 449e089ab5004ddf3f130b0e1da7b5b3c6778b3a9304ed7d1cab498a331aeeec6f1e5d33b86581938945b072d93bd3dfa976eb4f0fec2747811b933851d70767 SHA512 08e3386b0ed06ff71581fd973eef346369d7888da04eea24b6d5cd2d1b8291f2d8e67cfd9b0b7a0d973692e920bb283d78a65bd687a24dd90397ef0b8d385463 -AUX opensmtpd-6.8.0_p2-strict-prototypes.patch 1849 BLAKE2B ea25405b67e9cba989eb7f3ccf1c4658e942d4ca17f0645d83eef69456f769cfd1ea9194fbaa28010aac4037c7bb5008a29aa2e29f4337bca3a56c68de0c2ff4 SHA512 5539a340eb68f1dc68df0d762828e2624838fb1bfd8c34ddda484fef67ee70f938f74af2098a0b8aed63ffdf6c914712416de1e0a2c711195b70aeee7b960e5d AUX smtpd-r1.service 161 BLAKE2B a76a0ef782b55fe831300d231cf591d80977f0e0998a8e7c6d9d41ec296bac212e231e6754ceb76ca75fa20324d58e5af705a3d513d3998d3b371dd4f47bf374 SHA512 20a0ff7d10f96cf43e8e51866230a47ffc0748e4373227c78e3b7bdfc266570de25b87d4a48fce5ea3d257b24daf6d66b3dc23a3543af774f368a2562ca56bd1 AUX smtpd.initd 231 BLAKE2B a4991c9226daa2289cb20238dcee0dad8b4ff83474327649b61c7394e46fc929c7792b885f58bf76769567ad2058134b97e5019b508e2edec108a4bafb9cc2b4 SHA512 e4c8386bd7e8d8171172aa181305a55ca67cba6d4c82d77d8846e1bd3301dd9d118bb39dad6c144677f050194de813e4d83e06ea6dd591d4f07da8c4a1edde37 AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec4ca9b240880ef63da3f27e4fb8b653af4ae413ca42cdeb343e1f4e737b7e6258c0d338223d SHA512 d0574cc732138fefffe3ca78da2d689f0849de70dfd65204c99a98a58b2165eb46b23a1c32b356ea2eaf8abd56a4929c7419b29cec1d6b284e344680bab24086 -AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258 -AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2 -DIST opensmtpd-6.8.0p2.tar.gz 860189 BLAKE2B 603e8516860eddefb1694ea4cb5631cec2df2a19fa3193b25388caf73c41e82d44e57847fc95b5187488cae629542e72ff2d5a17badc15cef1647bdb173d7827 SHA512 48f152b75575146fdd09bdf47123041ea62fefb6e5de33a69826bf91a2126a918f8db1caffadb2f142a1a21de8126d492de88cb65bdf169e61c0b22d3e78d290 DIST opensmtpd-7.3.0p1.tar.gz 849026 BLAKE2B bdb83468df12af2a2b39664a4408acfaf0cd81551074fb3823f7eb1b0d30ce79d812876fcea2ff940ddaac8b1a96700e1f4d2c275beab106fed010b733cff5c2 SHA512 2106de43e4b7435e49df759570ec758672ca8271dc451e30a261c250b41908b6ffe28e571a5f52e2ac14f59af132d1df45b272f8fcafeab04fcfb6bd5db970bb -EBUILD opensmtpd-6.8.0_p2-r2.ebuild 1994 BLAKE2B 07e446b197182c4701e64528daaf0a61e5411eadba9fec22c43b636c97a9ce715e0ab66777f7f492bc12aab57b8b8495f3646f3450de0301d9953d776f1002eb SHA512 18cbc2e958088f35c56be34eb24b68f720097462357363451b03b53e6efc19ce44e36a2ad0964f5c9f4b17286c5d9a74e45c63e8aac40ddf93c60c21705eca23 -EBUILD opensmtpd-6.8.0_p2-r3.ebuild 2323 BLAKE2B 7b6c280a245450a0971e7c6a50c333c44caa5c8bd2e43205c9ea668a11286ce69d7d950c92d9c6c6c576480364a359c55dc06748f928216b90c578b22889d948 SHA512 4081fb57f9154e754fa666464958187e4fbd10bff9dde6d7c59c1f05302c4d4db771cfda6bddd8b7da0366435b7b45f3fa63d8fd6d1d51d04a0d99fb9470525b EBUILD opensmtpd-7.3.0_p1-r1.ebuild 2210 BLAKE2B 66f20c04b1fce33fd76c4cbfb1672441eaf4eaacce69680af51d75f132a85018aa6d589b3089c51df28ce90efcbe7d1a6ba896f6bc3916b0e93876d205d93c07 SHA512 7ed7c7a1b9c93e6c1bee11b980827685ca1fcd9be5677e12fa0ef0f9ecdbdaf90fb30c406c17481db7481249d084f5d3afe4a88496b2eeb614f9180971e130c0 MISC metadata.xml 611 BLAKE2B e258a3369a4edbc89459a79fd1f0fe4ed041674b9755c89fe4caf626d4d6bdc1576c5ec87d934f1d4b7c984383fad545d3515514f1c67f63ea5f9a663fe9ec3e SHA512 98eb88e71040b555e67d51a3ac46b66dfefd1b11d5206d687b3aab7d65143ca3e285446da419bde37657780cda238cc6162927b941811ef15b77cdfa8f16b832 diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.8.0_p2-ar.patch b/mail-mta/opensmtpd/files/opensmtpd-6.8.0_p2-ar.patch deleted file mode 100644 index fbd6ca925945..000000000000 --- a/mail-mta/opensmtpd/files/opensmtpd-6.8.0_p2-ar.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://github.com/OpenSMTPD/OpenSMTPD/pull/1199 -https://bugs.gentoo.org/720782 - -From 92ada4471602fc737113b8dfe1b9b8e8e0aab7e0 Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Tue, 25 Apr 2023 09:13:51 -0700 -Subject: [PATCH] configure: Use AM_PROG_AR - -Automake provides AM_PROG_AR as a standard way of finding ar(1). - -Reference: https://www.gnu.org/software/automake/manual/html_node/Public-Macros.html - -Closes: https://github.com/OpenSMTPD/OpenSMTPD/pull/1177 ---- - configure.ac | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 00450485..5b12b67e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -67,7 +67,7 @@ AC_C_BIGENDIAN - AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_LIBTOOL --AC_PATH_PROG([AR], [ar]) -+AM_PROG_AR - AC_PATH_PROG([CAT], [cat]) - AC_PATH_PROG([CHMOD], [chmod]) - AC_PATH_PROG([CHOWN], [chown]) -@@ -84,11 +84,6 @@ AC_PROG_YACC - - AC_SUBST([ZCAT]) - -- --if test -z "$AR"; then -- AC_MSG_ERROR([*** 'ar' missing, please install or fix your \$PATH ***]) --fi -- - if test -z "$LD"; then - LD=$CC - fi diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.8.0_p2-implicit-function-declaration.patch b/mail-mta/opensmtpd/files/opensmtpd-6.8.0_p2-implicit-function-declaration.patch deleted file mode 100644 index 11af2aa7630c..000000000000 --- a/mail-mta/opensmtpd/files/opensmtpd-6.8.0_p2-implicit-function-declaration.patch +++ /dev/null @@ -1,303 +0,0 @@ -https://github.com/OpenSMTPD/OpenSMTPD/pull/1195 -https://bugs.gentoo.org/727260 -https://bugs.gentoo.org/896050 -https://bugs.gentoo.org/899876 - -From 7abe6305f864113aec4c6fc55cccabdc55959252 Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Thu, 13 Apr 2023 11:04:14 -0700 -Subject: [PATCH] build: Fix -Werror=implicit-function-declaration - -On a system with musl these functions are not available, but they are -found by the build system inside of libbsd instead. However many of the -relevant headers are never incuded resulting in many implicit function -declarations. Additionally clang-16 is more strict about these turning -them into errors. - -* While libbsd contains symbols for inet_net_pton() they do not have any - headers with the function prototype. Upstream has marked this function - for removal since it is now provided in glibc even when musl doesn't - have it. This can be fixed by not looking for inet_net_pton() in libbsd. ---- - configure.ac | 6 +++++- - openbsd-compat/openbsd-compat.h | 4 +++- - usr.sbin/smtpd/aliases.c | 3 +++ - usr.sbin/smtpd/config.c | 6 ++++++ - usr.sbin/smtpd/control.c | 3 +++ - usr.sbin/smtpd/envelope.c | 3 +++ - usr.sbin/smtpd/forward.c | 3 +++ - usr.sbin/smtpd/mail.maildir.c | 1 + - usr.sbin/smtpd/mda.c | 2 ++ - usr.sbin/smtpd/mda_variables.c | 3 +++ - usr.sbin/smtpd/mta_session.c | 3 +++ - usr.sbin/smtpd/parse.y | 3 +++ - usr.sbin/smtpd/smtp_session.c | 2 ++ - usr.sbin/smtpd/ssl.c | 6 ++++++ - usr.sbin/smtpd/table.c | 3 +++ - usr.sbin/smtpd/to.c | 3 +++ - usr.sbin/smtpd/util.c | 3 +++ - 17 files changed, 55 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c215f3bf..cf6fa675 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -119,6 +119,10 @@ AC_SUBST([MANFMT]) - # - AC_CHECK_HEADERS([ \ - arpa/nameser_compat.h \ -+ bsd/stdlib.h \ -+ bsd/string.h \ -+ bsd/unistd.h \ -+ bsd/vis.h \ - crypt.h \ - dirent.h \ - err.h \ -@@ -442,7 +446,7 @@ AC_SEARCH_LIBS([dirname], - ]) - - AC_SEARCH_LIBS([inet_net_pton], -- [resolv bsd], -+ [resolv], - [ - AC_DEFINE([HAVE_INET_NET_PTON], [1], - [Define if you have the inet_net_pton() function.]) -diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h -index dcb643f1..5bebd78b 100644 ---- a/openbsd-compat/openbsd-compat.h -+++ b/openbsd-compat/openbsd-compat.h -@@ -41,7 +41,9 @@ - - #include <sys/queue.h> - #include <sys/tree.h> -+#ifndef HAVE_BSD_VIS_H - #include "bsd-vis.h" -+#endif - - #ifdef HAVE_SYS_TIME_H - #include <sys/time.h> -@@ -67,7 +69,7 @@ size_t strlcpy(char *dst, const char *src, size_t size); - size_t strlcat(char *dst, const char *src, size_t size); - #endif - --#ifndef HAVE_STRMODE -+#if !defined(HAVE_STROMODE) && !defined(HAVE_BSD_STRING_H) - void strmode(int mode, char *p); - #endif - -diff --git a/usr.sbin/smtpd/aliases.c b/usr.sbin/smtpd/aliases.c -index 0f8a5c1e..f66d13e4 100644 ---- a/usr.sbin/smtpd/aliases.c -+++ b/usr.sbin/smtpd/aliases.c -@@ -37,6 +37,9 @@ - #ifdef HAVE_LIBUTIL_H - #include <libutil.h> - #endif -+#ifdef HAVE_BSD_LIBUTIL_H -+#include <bsd/libutil.h> /* needed for fparseln */ -+#endif - - #include "smtpd.h" - #include "log.h" -diff --git a/usr.sbin/smtpd/config.c b/usr.sbin/smtpd/config.c -index 8fe983d6..e1056b1d 100644 ---- a/usr.sbin/smtpd/config.c -+++ b/usr.sbin/smtpd/config.c -@@ -30,9 +30,15 @@ - #include <netdb.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_BSD_STDLIB_H -+#include <bsd/stdlib.h> /* needed for freezero */ -+#endif - #include <limits.h> - #include <string.h> - #include <unistd.h> -+#ifdef HAVE_BSD_UNISTD_H -+#include <bsd/unistd.h> /* needed for setproctitle */ -+#endif - - #include <openssl/ssl.h> - -diff --git a/usr.sbin/smtpd/control.c b/usr.sbin/smtpd/control.c -index dbb2840d..b9f0df88 100644 ---- a/usr.sbin/smtpd/control.c -+++ b/usr.sbin/smtpd/control.c -@@ -40,6 +40,9 @@ - #include <string.h> - #include <time.h> - #include <unistd.h> -+#ifdef HAVE_BSD_UNISTD_H -+#include <bsd/unistd.h> /* needed for getpeereid */ -+#endif - #include <limits.h> - - #include "smtpd.h" -diff --git a/usr.sbin/smtpd/envelope.c b/usr.sbin/smtpd/envelope.c -index 35d98b79..0bb45aae 100644 ---- a/usr.sbin/smtpd/envelope.c -+++ b/usr.sbin/smtpd/envelope.c -@@ -39,6 +39,9 @@ - #include <limits.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_BSD_STDLIB_H -+#include <bsd/stdlib.h> /* needed for strtonum */ -+#endif - #include <string.h> - #include <time.h> - #include <unistd.h> -diff --git a/usr.sbin/smtpd/forward.c b/usr.sbin/smtpd/forward.c -index 7494c6ce..cf8dc6ef 100644 ---- a/usr.sbin/smtpd/forward.c -+++ b/usr.sbin/smtpd/forward.c -@@ -36,6 +36,9 @@ - #ifdef HAVE_LIBUTIL_H - #include <libutil.h> - #endif -+#ifdef HAVE_BSD_LIBUTIL_H -+#include <bsd/libutil.h> /* needed for fparseln */ -+#endif - #include <unistd.h> - #include <limits.h> - -diff --git a/usr.sbin/smtpd/mail.maildir.c b/usr.sbin/smtpd/mail.maildir.c -index fe6adba6..1f613b36 100644 ---- a/usr.sbin/smtpd/mail.maildir.c -+++ b/usr.sbin/smtpd/mail.maildir.c -@@ -34,6 +34,7 @@ - #include <string.h> - #include <time.h> - #include <sysexits.h> -+#include <time.h> - #include <unistd.h> - - #define MAILADDR_ESCAPE "!#$%&'*/?^`{|}~" -diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c -index 5e8fec19..9bc31be6 100644 ---- a/usr.sbin/smtpd/mda.c -+++ b/usr.sbin/smtpd/mda.c -@@ -44,6 +44,8 @@ - #include <limits.h> - #if defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS) - #include <vis.h> -+#elif defined(HAVE_BSD_VIS_H) -+#include <bsd/vis.h> /* needed for strnvis */ - #else - #include "bsd-vis.h" - #endif -diff --git a/usr.sbin/smtpd/mda_variables.c b/usr.sbin/smtpd/mda_variables.c -index b672e492..10cb1cd0 100644 ---- a/usr.sbin/smtpd/mda_variables.c -+++ b/usr.sbin/smtpd/mda_variables.c -@@ -29,6 +29,9 @@ - #include <imsg.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_BSD_STDLIB_H -+#include <bsd/stdlib.h> /* needed for strtonum */ -+#endif - #include <string.h> - #include <unistd.h> - #include <limits.h> -diff --git a/usr.sbin/smtpd/mta_session.c b/usr.sbin/smtpd/mta_session.c -index 327502b7..72f8d29b 100644 ---- a/usr.sbin/smtpd/mta_session.c -+++ b/usr.sbin/smtpd/mta_session.c -@@ -42,6 +42,9 @@ - #include <signal.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_BSD_STDLIB_H -+#include <bsd/stdlib.h> /* needed for strtonum */ -+#endif - #include <string.h> - #include <time.h> - #include <unistd.h> -diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y -index a82f8206..6510936d 100644 ---- a/usr.sbin/smtpd/parse.y -+++ b/usr.sbin/smtpd/parse.y -@@ -50,6 +50,9 @@ - #include <resolv.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_BSD_STDLIB_H -+#include <bsd/stdlib.h> /* needed for strtonum */ -+#endif - #include <string.h> - #include <syslog.h> - #include <unistd.h> -diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c -index e8167fca..8bc877ea 100644 ---- a/usr.sbin/smtpd/smtp_session.c -+++ b/usr.sbin/smtpd/smtp_session.c -@@ -43,6 +43,8 @@ - #include <unistd.h> - #if defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS) - #include <vis.h> -+#elif defined(HAVE_BSD_VIS_H) -+#include <bsd/vis.h> /* needed for strnvis */ - #else - #include "bsd-vis.h" - #endif -diff --git a/usr.sbin/smtpd/ssl.c b/usr.sbin/smtpd/ssl.c -index 97f7b1df..1ef692e5 100644 ---- a/usr.sbin/smtpd/ssl.c -+++ b/usr.sbin/smtpd/ssl.c -@@ -34,7 +34,13 @@ - #include <pwd.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_BSD_STDLIB_H -+#include <bsd/stdlib.h> /* needed for freezero */ -+#endif - #include <string.h> -+#ifdef HAVE_BSD_STRING_H -+#include <bsd/string.h> /* needed for strmode */ -+#endif - #include <unistd.h> - - #include <openssl/ssl.h> -diff --git a/usr.sbin/smtpd/table.c b/usr.sbin/smtpd/table.c -index 6d3292ce..ed3ba6d3 100644 ---- a/usr.sbin/smtpd/table.c -+++ b/usr.sbin/smtpd/table.c -@@ -34,6 +34,9 @@ - #include <imsg.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_BSD_STDLIB_H -+#include <bsd/stdlib.h> /* needed for strtonum */ -+#endif - #include <regex.h> - #include <limits.h> - #include <string.h> -diff --git a/usr.sbin/smtpd/to.c b/usr.sbin/smtpd/to.c -index 81a1bb54..1068b1a9 100644 ---- a/usr.sbin/smtpd/to.c -+++ b/usr.sbin/smtpd/to.c -@@ -43,6 +43,9 @@ - #include <stdarg.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_BSD_STDLIB_H -+#include <bsd/stdlib.h> /* needed for strtonum */ -+#endif - #include <string.h> - #include <time.h> - #include <unistd.h> -diff --git a/usr.sbin/smtpd/util.c b/usr.sbin/smtpd/util.c -index b2b1458c..7b1b5876 100644 ---- a/usr.sbin/smtpd/util.c -+++ b/usr.sbin/smtpd/util.c -@@ -47,6 +47,9 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#ifdef HAVE_BSD_STRING_H -+#include <bsd/string.h> /* needed for strmode */ -+#endif - #include <syslog.h> - #include <time.h> - #include <unistd.h> diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.8.0_p2-strict-prototypes.patch b/mail-mta/opensmtpd/files/opensmtpd-6.8.0_p2-strict-prototypes.patch deleted file mode 100644 index 44736bff5598..000000000000 --- a/mail-mta/opensmtpd/files/opensmtpd-6.8.0_p2-strict-prototypes.patch +++ /dev/null @@ -1,74 +0,0 @@ -https://github.com/OpenSMTPD/OpenSMTPD/pull/1198 - -From 84331a266b7d8d8e469aea8b85d1e493725807ae Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Thu, 13 Apr 2023 11:19:53 -0700 -Subject: [PATCH 1/2] build: Fix -Werror=strict-prototypes - -Clang-16 is more strict about these so make the compiler happy. ---- - usr.sbin/smtpd/bounce.c | 2 +- - usr.sbin/smtpd/ioev.c | 2 +- - usr.sbin/smtpd/mda.c | 4 ++-- - usr.sbin/smtpd/smtpd.c | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/usr.sbin/smtpd/bounce.c b/usr.sbin/smtpd/bounce.c -index bb08f90e..7fb1cf32 100644 ---- a/usr.sbin/smtpd/bounce.c -+++ b/usr.sbin/smtpd/bounce.c -@@ -243,7 +243,7 @@ bounce_timeout(int fd, short ev, void *arg) - } - - static void --bounce_drain() -+bounce_drain(void) - { - struct bounce_message *msg; - struct timeval tv; -diff --git a/usr.sbin/smtpd/ioev.c b/usr.sbin/smtpd/ioev.c -index 747b3a51..3e3e68f4 100644 ---- a/usr.sbin/smtpd/ioev.c -+++ b/usr.sbin/smtpd/ioev.c -@@ -228,7 +228,7 @@ io_frame_leave(struct io *io) - } - - void --_io_init() -+_io_init(void) - { - static int init = 0; - -diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c -index 6a28b923..bd963e54 100644 ---- a/usr.sbin/smtpd/mda.c -+++ b/usr.sbin/smtpd/mda.c -@@ -386,12 +386,12 @@ mda_imsg(struct mproc *p, struct imsg *imsg) - } - - void --mda_postfork() -+mda_postfork(void) - { - } - - void --mda_postprivdrop() -+mda_postprivdrop(void) - { - tree_init(&sessions); - tree_init(&users); -diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c -index 26078c49..830417e6 100644 ---- a/usr.sbin/smtpd/smtpd.c -+++ b/usr.sbin/smtpd/smtpd.c -@@ -353,7 +353,7 @@ parent_send_config_dispatcher(void) - } - - void --parent_send_config_lka() -+parent_send_config_lka(void) - { - log_debug("debug: parent_send_config_ruleset: reloading"); - m_compose(p_lka, IMSG_CONF_START, 0, 0, -1, NULL, 0); - diff --git a/mail-mta/opensmtpd/files/smtpd.service b/mail-mta/opensmtpd/files/smtpd.service deleted file mode 100644 index fd2a65010604..000000000000 --- a/mail-mta/opensmtpd/files/smtpd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=OpenSMTPD -After=network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/smtpd - -[Install] -WantedBy=multi-user.target diff --git a/mail-mta/opensmtpd/files/smtpd.socket b/mail-mta/opensmtpd/files/smtpd.socket deleted file mode 100644 index fb42f8557323..000000000000 --- a/mail-mta/opensmtpd/files/smtpd.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=OpenSMTPD Socket - -[Socket] -ListenStream=/var/run/smtpd.sock - -[Install] -WantedBy=sockets.target diff --git a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r2.ebuild deleted file mode 100644 index a8e71de77b1b..000000000000 --- a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pam systemd - -DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD" -HOMEPAGE="https://www.opensmtpd.org" -SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz" - -LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" -IUSE="berkdb +mta pam split-usr" - -# < openssl 3 for bug #881701 -DEPEND=" - acct-user/smtpd - acct-user/smtpq - <dev-libs/openssl-3:= - elibc_musl? ( sys-libs/fts-standalone ) - sys-libs/zlib - pam? ( sys-libs/pam ) - berkdb? ( sys-libs/db:= ) - dev-libs/libevent:= - app-misc/ca-certificates - net-mail/mailbase - net-libs/libasr - virtual/libcrypt:= - !mail-mta/courier - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/mini-qmail - !mail-mta/msmtp[mta] - !mail-mta/netqmail - !mail-mta/nullmailer - !mail-mta/postfix - !mail-mta/qmail-ldap - !mail-mta/sendmail - !mail-mta/ssmtp[mta] -" -RDEPEND="${DEPEND}" -BDEPEND="app-alternatives/yacc" - -S=${WORKDIR}/${P/_} - -src_configure() { - econf \ - --sysconfdir=/etc/smtpd \ - --with-path-mbox=/var/spool/mail \ - --with-path-empty=/var/empty \ - --with-path-socket=/run \ - --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \ - --with-user-smtpd=smtpd \ - --with-user-queue=smtpq \ - --with-group-queue=smtpq \ - $(use_with pam auth-pam) \ - $(use_with berkdb table-db) -} - -src_install() { - default - newinitd "${FILESDIR}"/smtpd.initd smtpd - systemd_dounit "${FILESDIR}"/smtpd.{service,socket} - use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd - dosym smtpctl /usr/sbin/makemap - dosym smtpctl /usr/sbin/newaliases - if use mta ; then - dodir /usr/sbin - dosym smtpctl /usr/sbin/sendmail - # on USE="-split-usr" system sbin and bin are merged - # so symlink made above will collide with one below - use split-usr && dosym ../sbin/smtpctl /usr/bin/sendmail - mkdir -p "${ED}"/usr/$(get_libdir) || die - ln -s --relative "${ED}"/usr/sbin/smtpctl "${ED}"/usr/$(get_libdir)/sendmail || die - fi -} diff --git a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r3.ebuild b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r3.ebuild deleted file mode 100644 index 718ece238838..000000000000 --- a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r3.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools pam systemd - -DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD" -HOMEPAGE="https://www.opensmtpd.org" -SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz" - -LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="berkdb +mta pam split-usr" - -# < openssl 3 for bug #881701 -DEPEND=" - acct-user/smtpd - acct-user/smtpq - <dev-libs/openssl-3:= - elibc_musl? ( sys-libs/fts-standalone ) - sys-libs/zlib - pam? ( sys-libs/pam ) - berkdb? ( sys-libs/db:= ) - dev-libs/libevent:= - app-misc/ca-certificates - net-mail/mailbase - net-libs/libasr - virtual/libcrypt:= - !mail-mta/courier - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/mini-qmail - !mail-mta/msmtp[mta] - !mail-mta/netqmail - !mail-mta/nullmailer - !mail-mta/postfix - !mail-mta/qmail-ldap - !mail-mta/sendmail - !mail-mta/ssmtp[mta] -" -RDEPEND="${DEPEND}" -BDEPEND="app-alternatives/yacc" - -S=${WORKDIR}/${P/_} - -PATCHES=( - "${FILESDIR}"/${P}-ar.patch #720782 - "${FILESDIR}"/${P}-implicit-function-declaration.patch #727260, 896050, 899876 - "${FILESDIR}"/${P}-strict-prototypes.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --sysconfdir=/etc/smtpd \ - --with-path-mbox=/var/spool/mail \ - --with-path-empty=/var/empty \ - --with-path-socket=/run \ - --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \ - --with-user-smtpd=smtpd \ - --with-user-queue=smtpq \ - --with-group-queue=smtpq \ - --with-libevent="${EPREFIX}/usr/$(get_libdir)" \ - --with-libssl="${EPREFIX}/usr/$(get_libdir)" \ - $(use_with pam auth-pam) \ - $(use_with berkdb table-db) -} - -src_install() { - default - newinitd "${FILESDIR}"/smtpd.initd smtpd - systemd_dounit "${FILESDIR}"/smtpd.{service,socket} - use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd - dosym smtpctl /usr/sbin/makemap - dosym smtpctl /usr/sbin/newaliases - if use mta ; then - dodir /usr/sbin - dosym smtpctl /usr/sbin/sendmail - # on USE="-split-usr" system sbin and bin are merged - # so symlink made above will collide with one below - use split-usr && dosym ../sbin/smtpctl /usr/bin/sendmail - mkdir -p "${ED}"/usr/$(get_libdir) || die - ln -s --relative "${ED}"/usr/sbin/smtpctl "${ED}"/usr/$(get_libdir)/sendmail || die - fi -} |