diff options
| -rw-r--r-- | mail-mta/opensmtpd/Manifest | 3 | ||||
| -rw-r--r-- | mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-autoconf.patch | 46 | ||||
| -rw-r--r-- | mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-libressl.patch | 101 | ||||
| -rw-r--r-- | mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-musl.patch | 51 | ||||
| -rw-r--r-- | mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r2.ebuild | 98 | ||||
| -rw-r--r-- | mail-mta/opensmtpd/opensmtpd-6.0.3_p1.ebuild (renamed from mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild) | 24 | ||||
| -rw-r--r-- | mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild (renamed from mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild) | 26 | ||||
| -rw-r--r-- | net-libs/libasr/Manifest | 2 | ||||
| -rw-r--r-- | net-libs/libasr/libasr-1.0.1.201505061057.ebuild | 20 | ||||
| -rw-r--r-- | net-libs/libasr/libasr-1.0.1.ebuild | 16 |
10 files changed, 17 insertions, 370 deletions
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest index 44fdee8bd410..7ade143bda40 100644 --- a/mail-mta/opensmtpd/Manifest +++ b/mail-mta/opensmtpd/Manifest @@ -1 +1,2 @@ -DIST opensmtpd-6.0.2p1.tar.gz 695513 BLAKE2B ad048364943c3abd3e0f40b06bc77831c91b8d1bfe8bc95753a0c5e5add4eacf6288aa7c7613a07979b04c0d34fad4f26e65cba8cbe3a060c9d8dbca734b75e7 SHA512 1e4275795dd2c43174ffa268398a0d9864ce4cb7d370330f7b8c55a9b40e757616bbd280919a409ebde403769e3dea62047857dc2ff98d7ecce660b459c7ff1c +DIST opensmtpd-6.0.3p1.tar.gz 699702 BLAKE2B 49f08e8329adc049a562b6ef7efa4c0a39cbcfe8a158cb905cfc726a7302ffe9833ccfb52041340767d55d0f2ae2087e8eac92b7359016c6c76b4d963a334558 SHA512 e579818a0ddbe637deb5a4e40f43eaf797783903ceac18fd89a57581b135b9e407d424e1a70ff7b4b06a0ee50bafb6e8ab2451371917887904b06ff1b55d320f +DIST opensmtpd-6.4.0p1.tar.gz 718638 BLAKE2B 23c1c286a865efcbd16461ec8930f5325a6e164a58ceb7bbe0feb9088bcf615b7fd7e2eb6820bcde161864c476087b39c289c75ea5ca0b18c46710f9723b3dd7 SHA512 c60dbac857925041769104adae33393f526a328767e19bc78d06e45a13b7dd50f3eefdaa3811b8da330c24a670e98da74e18af5ac486266dade6255a6f3b5135 diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-autoconf.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-autoconf.patch deleted file mode 100644 index d490a9029191..000000000000 --- a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-autoconf.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9370e962bfa1032ab16c48c79977536eae665d75 Mon Sep 17 00:00:00 2001 -From: Freddy DISSAUX <dsx@pouet.bsdsx.fr> -Date: Sat, 17 Sep 2016 08:50:14 +0200 -Subject: [PATCH] Fix expression, as explain in - -https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Generic-Declarations.html#Generic-Declarations - -"Unlike the other `AC_CHECK_*S' macros, when a symbol is not -declared, HAVE_DECL_symbol is defined to `0' instead of -leaving HAVE_DECL_symbol undeclared." ---- - openbsd-compat/defines.h | 2 +- - openbsd-compat/openbsd-compat.h | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/openbsd-compat/defines.h b/openbsd-compat/defines.h -index 0a94d76..bda39e9 100644 ---- a/openbsd-compat/defines.h -+++ b/openbsd-compat/defines.h -@@ -85,7 +85,7 @@ - # define STDERR_FILENO 2 - #endif - --#if defined(HAVE_DECL_O_NONBLOCK) && HAVE_DECL_O_NONBLOCK == 0 -+#if !HAVE_DECL_O_NONBLOCK - # define O_NONBLOCK 00004 /* Non Blocking Open */ - #endif - -diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h -index fd931d0..1ef2925 100644 ---- a/openbsd-compat/openbsd-compat.h -+++ b/openbsd-compat/openbsd-compat.h -@@ -212,11 +212,11 @@ void errc(int, int, const char *, ...); - #define pledge(promises, paths) 0 - #endif - --#ifndef HAVE_DECL_AF_LOCAL -+#if !HAVE_DECL_AF_LOCAL - #define AF_LOCAL AF_UNIX - #endif - --#ifndef HAVE_DECL_WAIT_MYPGRP -+#if !HAVE_DECL_WAIT_MYPGRP - #define WAIT_MYPGRP 0 - #endif - diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-libressl.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-libressl.patch deleted file mode 100644 index e1656b94040c..000000000000 --- a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-libressl.patch +++ /dev/null @@ -1,101 +0,0 @@ -From f948b923873a93472dea9b786cf60a3472b0ddc8 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Wed, 11 Jan 2017 17:35:29 -0600 -Subject: [PATCH] fix compatibility with libressl - -These functions are exported by libcrypto from libressl, due to its -similar OpenBSD compatibility layer, but they are not present in any -header files. Thus, while we can use the existing compiled function, -and do not need to provide our own, we do need to provide the prototype -for it. - -This avoids implicit function declarations and the resulting crashes due -to pointer truncation. - -The patch is based on an equivalent patch for OpenSSH from -https://bugzilla.mindrot.org/show_bug.cgi?id=2465 -Also see -https://github.com/libressl-portable/portable/issues/109 - -Fixes #691 ---- - openbsd-compat/defines.h | 9 --------- - openbsd-compat/openbsd-compat.h | 25 +++++++++++++++---------- - 2 files changed, 15 insertions(+), 19 deletions(-) - -diff --git a/openbsd-compat/defines.h b/openbsd-compat/defines.h -index 2cbfbca..3ffcc81 100644 ---- a/openbsd-compat/defines.h -+++ b/openbsd-compat/defines.h -@@ -422,15 +422,6 @@ typedef uint16_t in_port_t; - #define INET6_ADDRSTRLEN 46 - #endif - --/* -- * Platforms that have arc4random_uniform() and not arc4random_stir() -- * shouldn't need the latter. -- */ --#if defined(HAVE_ARC4RANDOM) && defined(HAVE_ARC4RANDOM_UNIFORM) && \ -- !defined(HAVE_ARC4RANDOM_STIR) --# define arc4random_stir() --#endif -- - #ifndef HAVE_VA_COPY - # ifdef HAVE___VA_COPY - # define va_copy(dest, src) __va_copy(dest, src) -diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h -index a51385b..51f33bb 100644 ---- a/openbsd-compat/openbsd-compat.h -+++ b/openbsd-compat/openbsd-compat.h -@@ -119,20 +119,25 @@ int BSDoptind; /* index into parent argv vector */ - int getpeereid(int , uid_t *, gid_t *); - #endif - --#ifdef HAVE_ARC4RANDOM --# ifndef HAVE_ARC4RANDOM_STIR --# define arc4random_stir() --# endif --#else -+#if !defined(HAVE_ARC4RANDOM) || defined(LIBRESSL_VERSION_NUMBER) - unsigned int arc4random(void); -+#endif -+ -+#if defined(HAVE_ARC4RANDOM_STIR) - void arc4random_stir(void); --#endif /* !HAVE_ARC4RANDOM */ -+#elif defined(HAVE_ARC4RANDOM) || defined(LIBRESSL_VERSION_NUMBER) -+/* Recent system/libressl implementation; no need for explicit stir */ -+# define arc4random_stir() -+#else -+/* openbsd-compat/arc4random.c provides arc4random_stir() */ -+void arc4random_stir(void); -+#endif - --#ifndef HAVE_ARC4RANDOM_BUF -+#if !defined(HAVE_ARC4RANDOM_BUF) || defined(LIBRESSL_VERSION_NUMBER) - void arc4random_buf(void *, size_t); - #endif - --#ifndef HAVE_ARC4RANDOM_UNIFORM -+#if !defined(HAVE_ARC4RANDOM_UNIFORM) || defined(LIBRESSL_VERSION_NUMBER) - uint32_t arc4random_uniform(uint32_t); - #endif - -@@ -174,7 +179,7 @@ int vasprintf(char **, const char *, va_list); - int vsnprintf(char *, size_t, const char *, va_list); - #endif - --#ifndef HAVE_EXPLICIT_BZERO -+#if !defined(HAVE_EXPLICIT_BZERO) || defined(LIBRESSL_VERSION_NUMBER) - void explicit_bzero(void *p, size_t n); - #endif - -@@ -200,7 +205,7 @@ int pidfile(const char *basename); - struct passwd *pw_dup(const struct passwd *); - #endif - --#ifndef HAVE_REALLOCARRAY -+#if !defined(HAVE_REALLOCARRAY) || defined(LIBRESSL_VERSION_NUMBER) - void *reallocarray(void *, size_t, size_t); - #endif - diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-musl.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-musl.patch deleted file mode 100644 index 065fbcdbe1a6..000000000000 --- a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-musl.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2ab442623e689532910b34ff0dbbc2167da02330 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Wed, 11 Jan 2017 17:39:07 -0600 -Subject: [PATCH] fix musl compatibility (missing function prototypes) - -inet_net_pton is already compiled, but no prototype is provided. -res_hnok is provided by the compatibility layer in libasr. - -These fixes avoid warnings about implicit function declaration. - -Fixes #758 ---- - configure.ac | 1 + - openbsd-compat/openbsd-compat.h | 8 ++++++++ - 2 files changed, 9 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 42e092f..e27c514 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -594,6 +594,7 @@ AC_CHECK_FUNCS([ \ - pledge \ - pw_dup \ - reallocarray \ -+ res_hnok \ - setenv \ - setlinebuf \ - setproctitle \ -diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h -index a51385b..5d2e2c2 100644 ---- a/openbsd-compat/openbsd-compat.h -+++ b/openbsd-compat/openbsd-compat.h -@@ -208,10 +208,18 @@ void *reallocarray(void *, size_t, size_t); - void errc(int, int, const char *, ...); - #endif - -+#ifndef HAVE_INET_NET_PTON -+int inet_net_pton(int, const char *, void *, size_t); -+#endif -+ - #ifndef HAVE_PLEDGE - #define pledge(promises, paths) 0 - #endif - -+#ifndef HAVE_RES_HNOK -+int res_hnok(const char *); -+#endif -+ - #if !HAVE_DECL_AF_LOCAL - #define AF_LOCAL AF_UNIX - #endif diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r2.ebuild deleted file mode 100644 index e0657bdfc3f5..000000000000 --- a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator - -DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD" -HOMEPAGE="https://www.opensmtpd.org" -MY_P="${P}" -if [ $(get_last_version_component_index) -eq 4 ]; then - MY_P="${PN}-$(get_version_component_range 4-)" -fi -SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz" - -LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="libressl pam +mta" - -DEPEND="!libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - elibc_musl? ( sys-libs/fts-standalone ) - sys-libs/zlib - pam? ( virtual/pam ) - sys-libs/db:= - dev-libs/libevent - app-misc/ca-certificates - net-mail/mailbase - net-libs/libasr - !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}" - -S=${WORKDIR}/${MY_P/_} - -src_prepare() { - # Use /run instead of /var/run - sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die - epatch "${FILESDIR}"/${P}-autoconf.patch - epatch "${FILESDIR}"/${P}-libressl.patch - epatch "${FILESDIR}"/${P}-musl.patch - epatch_user - eautoreconf -} - -src_configure() { - tc-export AR - AR="$(which "$AR")" econf \ - --with-table-db \ - --with-user-smtpd=smtpd \ - --with-user-queue=smtpq \ - --with-group-queue=smtpq \ - --with-path-socket=/run \ - --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \ - --sysconfdir=/etc/opensmtpd \ - $(use_with pam auth-pam) -} - -src_install() { - default - newinitd "${FILESDIR}"/smtpd.initd smtpd - systemd_dounit "${FILESDIR}"/smtpd.{service,socket} - use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd - dosym /usr/sbin/smtpctl /usr/sbin/makemap - dosym /usr/sbin/smtpctl /usr/sbin/newaliases - if use mta ; then - dodir /usr/sbin - dosym /usr/sbin/smtpctl /usr/sbin/sendmail - dosym /usr/sbin/smtpctl /usr/bin/sendmail - dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail - fi -} - -pkg_preinst() { - enewgroup smtpd 25 - enewuser smtpd 25 -1 /var/empty smtpd - enewgroup smtpq 252 - enewuser smtpq 252 -1 /var/empty smtpq -} - -pkg_postinst() { - einfo - einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps," - einfo "Redis, and many other useful addons and filters are" - einfo "available in the mail-filter/opensmtpd-extras package." - einfo -} diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1.ebuild index 8bbf33ddb9f3..b8e388fa4fe1 100644 --- a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild +++ b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1.ebuild @@ -1,25 +1,22 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator +inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD" HOMEPAGE="https://www.opensmtpd.org" -MY_P="${P}" -if [ $(get_last_version_component_index) -eq 4 ]; then - MY_P="${PN}-$(get_version_component_range 4-)" -fi -SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz" +SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz" LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="libressl pam +mta" DEPEND="!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) + elibc_musl? ( sys-libs/fts-standalone ) sys-libs/zlib pam? ( virtual/pam ) sys-libs/db:= @@ -41,14 +38,7 @@ DEPEND="!libressl? ( dev-libs/openssl:0 ) " RDEPEND="${DEPEND}" -S=${WORKDIR}/${MY_P/_} - -src_prepare() { - # Use /run instead of /var/run - sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die - epatch_user - eautoreconf -} +S=${WORKDIR}/${P/_} src_configure() { tc-export AR diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild index 0c7c96ffc44d..e65261f47d5c 100644 --- a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild +++ b/mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild @@ -1,24 +1,21 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator +inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD" HOMEPAGE="https://www.opensmtpd.org" -MY_P="${P}" -if [ $(get_last_version_component_index) -eq 4 ]; then - MY_P="${PN}-$(get_version_component_range 4-)" -fi -SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz" +SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz" LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="" #~amd64 ~arm ~arm64 ~x86" IUSE="pam +mta" -DEPEND="dev-libs/openssl:0 +DEPEND="dev-libs/libressl + elibc_musl? ( sys-libs/fts-standalone ) sys-libs/zlib pam? ( virtual/pam ) sys-libs/db:= @@ -40,14 +37,7 @@ DEPEND="dev-libs/openssl:0 " RDEPEND="${DEPEND}" -S=${WORKDIR}/${MY_P/_} - -src_prepare() { - # Use /run instead of /var/run - sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die - epatch_user - eautoreconf -} +S=${WORKDIR}/${P/_} src_configure() { tc-export AR diff --git a/net-libs/libasr/Manifest b/net-libs/libasr/Manifest index b4f3dcaf1bba..5df96c3d4914 100644 --- a/net-libs/libasr/Manifest +++ b/net-libs/libasr/Manifest @@ -1,3 +1 @@ -DIST libasr-1.0.1.tar.gz 403110 BLAKE2B e2d4a1b233d9d714198e20c2358ef3dff78c0e86ddebe6cf44c0baecd2fdc54a09bf1424541026886461d5b1d006aaf2d16b567b6f3cd4e87f3fef3d42c43b47 SHA512 94afed300327622e597d3678525b0d30a0a4a812966040a92a7b7b73beebb2209c7e6931cea07841aba745e14cda6df0dea9a7e098a94121768850e1d0e8d5ef DIST libasr-1.0.2.tar.gz 406428 BLAKE2B 527ad44cc4202dd195d6376cfa25b5d8946f24df9c64b91b3468ee961b6d3228f8a3d38c94299e630df7088ae0bf7b16bdb560521124f2a3ee77edb2e67539d0 SHA512 a4825a30130f70a452044c484871ac37459e1c1e6659c4c38dead7d3abbdaecb3517b7accb46586537975fee033857566fd279ecf97ae87dc80bb6bcdd467d3e -DIST libasr-201505061057.tar.gz 405953 BLAKE2B 0beb27054f2410c7f84251de39f9da63f47889e9444cedd83621e05486f40a6f33f1fb27e3f4dbd84e31e9214bbbf2736b1ae5265e8305dccd7afe7707df4ce0 SHA512 f3a5630fea9493c1638de7508cbf4c8d99db8bc5873dd874e48e05378ca551e6982590fb3ede6ea73ed5384eaf8968ebee0919a7c9ea463384d3f94f5c880f16 diff --git a/net-libs/libasr/libasr-1.0.1.201505061057.ebuild b/net-libs/libasr/libasr-1.0.1.201505061057.ebuild deleted file mode 100644 index c5c2c51038e3..000000000000 --- a/net-libs/libasr/libasr-1.0.1.201505061057.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit versionator - -DESCRIPTION="Async Resolver Library from OpenBSD/OpenSMTPD" -HOMEPAGE="https://github.com/OpenSMTPD/libasr" -SRC_URI="https://www.opensmtpd.org/archives/${PN}-$(get_version_component_range 4-).tar.gz" - -LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-$(get_version_component_range 4-)" diff --git a/net-libs/libasr/libasr-1.0.1.ebuild b/net-libs/libasr/libasr-1.0.1.ebuild deleted file mode 100644 index d8319ee927a2..000000000000 --- a/net-libs/libasr/libasr-1.0.1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Async Resolver Library from OpenBSD/OpenSMTPD" -HOMEPAGE="https://github.com/OpenSMTPD/libasr" -SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz" - -LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" |