aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2021-02-09 00:59:34 +0100
committerJakub Jirutka <jakub@jirutka.cz>2021-02-15 15:51:37 +0000
commit9056c8749f838bf5b189bfd1580f90e915b6bf06 (patch)
tree77cfe9a1d965f345a89d541b615ab2684ffd9d51
parent4d9883202e91e53f4624d2762fbe087b040357e3 (diff)
downloadaports-9056c8749f838bf5b189bfd1580f90e915b6bf06.tar.gz
aports-9056c8749f838bf5b189bfd1580f90e915b6bf06.tar.bz2
aports-9056c8749f838bf5b189bfd1580f90e915b6bf06.tar.xz
main/opensmtpd: upgrade to 6.8.0p2
autoconf-decl-checks.patch doesn't seem to be needed. There are no errors or warnings during the build regarding these macros and `#if defined FOO` is used in more places across the code base.
-rw-r--r--main/opensmtpd/APKBUILD10
-rw-r--r--main/opensmtpd/autoconf-decl-checks.patch11
-rw-r--r--main/opensmtpd/smtpd.conf.patch10
3 files changed, 10 insertions, 21 deletions
diff --git a/main/opensmtpd/APKBUILD b/main/opensmtpd/APKBUILD
index 2e8ae18623..9bce49da85 100644
--- a/main/opensmtpd/APKBUILD
+++ b/main/opensmtpd/APKBUILD
@@ -7,8 +7,8 @@
# 6.6.2p1-r0:
# - CVE-2020-7247
pkgname=opensmtpd
-pkgver=6.7.1p1
-pkgrel=1
+pkgver=6.8.0p2
+pkgrel=0
pkgdesc="Secure, reliable, lean, and easy-to configure SMTP server"
url="https://www.opensmtpd.org/"
arch="all"
@@ -22,7 +22,6 @@ source="https://www.opensmtpd.org/archives/opensmtpd-$pkgver.tar.gz
smtpd.initd
smtpd.confd
aliases
- autoconf-decl-checks.patch
smtpd.conf.patch
"
options="suid !check"
@@ -83,9 +82,8 @@ pam() {
amove usr/sbin/smtpd-pam
}
-sha512sums="403952e77b360f42d8dc8ae7cd7faeced831b9e37bffd7c67d338b7208f7471d50f3594c3475a9282d18cb17435efd305ec8c05f89eaeab5d363ddb1c4d54a2e opensmtpd-6.7.1p1.tar.gz
+sha512sums="48f152b75575146fdd09bdf47123041ea62fefb6e5de33a69826bf91a2126a918f8db1caffadb2f142a1a21de8126d492de88cb65bdf169e61c0b22d3e78d290 opensmtpd-6.8.0p2.tar.gz
ec3e3a877f77d55a8f676169ff30feb1467b5ac5b0a3bfa960c54ab3848610ccf819e037d2d2a3b2231ec35989cf1dd03f105a7b5188fc828ee653260532fe1b smtpd.initd
e68fca4a7e0ceda271ad61c5a6592a859789bea9ccb6417258f7a0b45d92163ed6097c208d3fdfb78bf978a6a01b6f3678e047e3ce972b2c521419d54a992e0a smtpd.confd
51d47b34eb3d728daa45f29d6434cc75db28dfa69b6fb3ecd873121df85b296a2d2c81016d765a07778aa26a496e4b29c09a30b82678cf42596a536734b5deca aliases
-37104cc605569f142ceffa902f200e8a7e9e1114ebe5394ed1eac0ed6ce25454e1610270921c45246de8396eee04b7c8ab5a112a231036a6ef14e7e229b264e3 autoconf-decl-checks.patch
-14ff3d4f56aee3a31551ea535c4a5bf9b760f0f11bc269225d7b176d5031294716133cbf4555a92e76cc6e33de89454435562672ddaf1ab365e61085eb1e4d53 smtpd.conf.patch"
+8639757c0190ca96dd32530b5b7e26637dab3204fd3750385eb495964e787157a8d3a084d109709889e5b2ca99f9e51da2192030fdfe9440f431531299a8e103 smtpd.conf.patch"
diff --git a/main/opensmtpd/autoconf-decl-checks.patch b/main/opensmtpd/autoconf-decl-checks.patch
deleted file mode 100644
index c7823879e1..0000000000
--- a/main/opensmtpd/autoconf-decl-checks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/smtpd/to.c
-+++ b/smtpd/to.c
-@@ -210,7 +210,7 @@
- #if HAVE_STRUCT_TM_TM_GMTOFF
- offset = lt->tm_gmtoff;
- tz = lt->tm_zone;
--#elif defined HAVE_DECL_ALTZONE && defined HAVE_DECL_TIMEZONE
-+#elif HAVE_DECL_ALTZONE && HAVE_DECL_TIMEZONE
- offset = lt->tm_isdst > 0 ? altzone : timezone;
- tz = lt->tm_isdst > 0 ? tzname[1] : tzname[0];
- #endif
diff --git a/main/opensmtpd/smtpd.conf.patch b/main/opensmtpd/smtpd.conf.patch
index aa5e4b8635..7161374dee 100644
--- a/main/opensmtpd/smtpd.conf.patch
+++ b/main/opensmtpd/smtpd.conf.patch
@@ -1,8 +1,10 @@
"listen on localhost" and "listen on all" doesn't work on Linux
---- a/smtpd/smtpd.conf
-+++ b/smtpd/smtpd.conf
-@@ -3,11 +3,11 @@
+--- a/usr.sbin/smtpd/smtpd.conf
++++ b/usr.sbin/smtpd/smtpd.conf
+@@ -1,13 +1,11 @@
+-# $OpenBSD: smtpd.conf,v 1.10 2018/05/24 11:40:17 gilles Exp $
+-
# This is the smtpd server system-wide configuration file.
# See smtpd.conf(5) for more information.
@@ -15,5 +17,5 @@
-listen on localhost
+listen on lo
- action "local" mbox alias <aliases>
+ action "local" maildir alias <aliases>
action "relay" relay