main/opensmtpd: upgrade to 6.6.1p1

2 files changed, 4 insertions, 78 deletions

diff --git a/main/opensmtpd/APKBUILD b/main/opensmtpd/APKBUILD
index 3d032ad131..dc06146394 100644
--- a/main/opensmtpd/APKBUILD
+++ b/main/opensmtpd/APKBUILD
@@ -3,8 +3,8 @@
 # Contributor: Shiz <hi@shiz.me>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=opensmtpd
-pkgver=6.4.2p1
-pkgrel=2
+pkgver=6.6.1p1
+pkgrel=0
 pkgdesc="Secure, reliable, lean, and easy-to configure SMTP server"
 url="http://www.opensmtpd.org"
 arch="all"
@@ -19,7 +19,6 @@ source="https://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz
 	aliases
 	autoconf-decl-checks.patch
 	smtpd.conf.patch
-	musl-compat-freeaddrinfo.patch
 	"
 options="suid !check"
 
@@ -54,12 +53,10 @@ package() {
 	local binary; for binary in mailq newaliases makemap sendmail; do
 		ln -s /usr/sbin/smtpctl "$pkgdir"/usr/sbin/$binary
 	done
-	rmdir "$pkgdir"/usr/bin
 }
 
-sha512sums="45b071523a46c441fd436acee44ea841a88ebe93f6b76284ef948fc97535cf73a2962b9a030bffa288227ab8ef90944755748d0036f919df9493d562c1afb694  opensmtpd-6.4.2p1.tar.gz
+sha512sums="8861c2b3d8560217750482694b007e43226033f31c13efa3e705e8d70a172ee30784ba335587ffc5c27fb356f765c696be7b9055c26bf2cd720cd0aa960861ad  opensmtpd-6.6.1p1.tar.gz
 a53c9854f71e55011566d3c96ce6321e11d00706c4180eb8ec4358b38c97d63cb7fcf3bb3c0b69365a8568a385bdb3ec1bc700d5f4463f8d6695a3d46b283c1d  smtpd.initd
 51d47b34eb3d728daa45f29d6434cc75db28dfa69b6fb3ecd873121df85b296a2d2c81016d765a07778aa26a496e4b29c09a30b82678cf42596a536734b5deca  aliases
 37104cc605569f142ceffa902f200e8a7e9e1114ebe5394ed1eac0ed6ce25454e1610270921c45246de8396eee04b7c8ab5a112a231036a6ef14e7e229b264e3  autoconf-decl-checks.patch
-14ff3d4f56aee3a31551ea535c4a5bf9b760f0f11bc269225d7b176d5031294716133cbf4555a92e76cc6e33de89454435562672ddaf1ab365e61085eb1e4d53  smtpd.conf.patch
-074009ab96caea082c5c39dd548659d46399ece20717313f240be3941ae5c5a7130bccf0de6fd13be3c7253782c5477f631d73124218eecf1ebec747d0318f6d  musl-compat-freeaddrinfo.patch"
+14ff3d4f56aee3a31551ea535c4a5bf9b760f0f11bc269225d7b176d5031294716133cbf4555a92e76cc6e33de89454435562672ddaf1ab365e61085eb1e4d53  smtpd.conf.patch"
diff --git a/main/opensmtpd/musl-compat-freeaddrinfo.patch b/main/opensmtpd/musl-compat-freeaddrinfo.patch
deleted file mode 100644
index da05e19a3e..0000000000
--- a/main/opensmtpd/musl-compat-freeaddrinfo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Gilles Chehade:
-  A recent change in musl's freeaddrinfo() causes it to no longer be
-  NULL-safe and segv when passed a NULL pointer.
-  For the next release, I think the only solution for Alpine is to ship a
-  patch in their package to NULL-protect all freeaddrinfo() calls until
-  we sort out if this is going to stay or be reverted, or at the very
-  least until the next major release if we decide to NULL-protect
-  upstream.
-
-See https://github.com/OpenSMTPD/OpenSMTPD/issues/929#issuecomment-549420229
-
---- a/smtpd/dns.c
-+++ b/smtpd/dns.c
-@@ -115,7 +115,8 @@
- 		*sl = res->ai_addrlen;
- 	}
- 
--	freeaddrinfo(res);
-+	if (res)
-+		freeaddrinfo(res);
- 	return (1);
- }
- 
---- a/smtpd/mail.lmtp.c
-+++ b/smtpd/mail.lmtp.c
-@@ -168,7 +168,8 @@
- 		break;
- 	}
- 
--	freeaddrinfo(res0);
-+	if (res0)
-+		freeaddrinfo(res0);
- 	if (s == -1)
- 		errx(EX_TEMPFAIL, "%s", cause);
- 
---- a/smtpd/parse.y
-+++ b/smtpd/parse.y
-@@ -2397,7 +2397,8 @@
- 		cnt++;
- 	}
- 
--	freeaddrinfo(res0);
-+	if (res0)
-+		freeaddrinfo(res0);
- 	return (cnt);
- }
- 
---- a/smtpd/resolver.c
-+++ b/smtpd/resolver.c
-@@ -334,7 +334,8 @@
- 	m_add_int(s->proc, ar->ar_errno);
- 	m_close(s->proc);
- 
--	freeaddrinfo(ar->ar_addrinfo);
-+	if (ar->ar_addrinfo)
-+		freeaddrinfo(ar->ar_addrinfo);
- 	free(s);
- }
- 
---- a/smtpd/util.c
-+++ b/smtpd/util.c
-@@ -782,7 +782,8 @@
- 		return -1;
- 	}
- 
--	freeaddrinfo(res);
-+	if (res)
-+		freeaddrinfo(res);
- 	return 0;
- }
-