From d0e7e427b315b42d7d97cf0ed4baa3850f9d5d57 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 May 2020 21:24:19 +0200
Subject: [PATCH] opensmtpd: update to 6.7.1p1.

---
 srcpkgs/opensmtpd/patches/sockaddr.patch | 24 ------------------------
 srcpkgs/opensmtpd/template               |  7 +++----
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/opensmtpd/patches/sockaddr.patch

diff --git a/srcpkgs/opensmtpd/patches/sockaddr.patch b/srcpkgs/opensmtpd/patches/sockaddr.patch
deleted file mode 100644
index c5d185c1561..00000000000
--- a/srcpkgs/opensmtpd/patches/sockaddr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Else it smashes the stack when IPv6 is used.
-
---- smtpd/mta_session.c
-+++ smtpd/mta_session.c
-@@ -1811,15 +1811,15 @@
- static void
- mta_connected(struct mta_session *s)
- {
--	struct sockaddr sa_src;
--	struct sockaddr sa_dest;
-+	struct sockaddr_storage sa_src;
-+	struct sockaddr_storage sa_dest;
- 	int sa_len;
- 
- 	log_info("%016"PRIx64" mta connected", s->id);
- 
--	if (getsockname(io_fileno(s->io), &sa_src, &sa_len) == -1)
-+	if (getsockname(io_fileno(s->io), (struct sockaddr *)(void *)&sa_src, &sa_len) == -1)
- 		bzero(&sa_src, sizeof sa_src);
--	if (getpeername(io_fileno(s->io), &sa_dest, &sa_len) == -1)
-+	if (getpeername(io_fileno(s->io), (struct sockaddr *)(void *)&sa_dest, &sa_len) == -1)
- 		bzero(&sa_dest, sizeof sa_dest);
- 
- 	mta_report_link_connect(s,
diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index fb7f4839df9..6871d383260 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
-version=6.7.0p1
-revision=2
+version=6.7.1p1
+revision=1
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run
@@ -27,7 +27,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, ISC, MIT"
 homepage="https://www.opensmtpd.org"
 distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz"
-checksum=c13f5dd7b9cb9421eabb62068537d90b0441cdb3ca2e5c1e753d7aee01b90bb9
+checksum=7478e918b41e734a39ad082df55cb2607f0933a506fab2c3dd3554a95cdf08ca
 provides="smtp-forwarder-0_1 smtp-server-0_1"
 replaces="smtp-forwarder>=0 smtp-server>=0"
 system_accounts="_smtpd _smtpq"
@@ -51,7 +51,6 @@ pre_configure() {
 	sed -ri 's,/etc/mail,/etc/smtpd,g' smtpd/smtpd.conf
 }
 post_install() {
-	rm -f ${DESTDIR}/usr/include/asr.h
 	for f in newaliases mailq makemap sendmail; do
 		ln -s smtpctl ${DESTDIR}/usr/bin/$f
 	done