From 6eff2a94989f09e749ae08f30e153b0ce4e48a04 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 17 Dec 2018 14:13:46 +0100
Subject: [PATCH] opensmtpd: update to 6.4.1p2.

---
 srcpkgs/opensmtpd/patches/smtpctl.patch | 29 -------------------------
 srcpkgs/opensmtpd/template              |  6 ++---
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/opensmtpd/patches/smtpctl.patch

diff --git a/srcpkgs/opensmtpd/patches/smtpctl.patch b/srcpkgs/opensmtpd/patches/smtpctl.patch
deleted file mode 100644
index d3e75e45e44..00000000000
--- a/srcpkgs/opensmtpd/patches/smtpctl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- mk/smtpctl/Makefile.am
-+++ mk/smtpctl/Makefile.am
-@@ -4,6 +4,7 @@ sbin_PROGRAMS=    smtpctl
- 
- smtpctl_SOURCES= $(smtpd_srcdir)/enqueue.c
- smtpctl_SOURCES+=  $(smtpd_srcdir)/parser.c
-+smtpctl_SOURCES+=  $(smtpd_srcdir)/config.c
- smtpctl_SOURCES+=  $(smtpd_srcdir)/log.c
- smtpctl_SOURCES+=  $(smtpd_srcdir)/envelope.c
- smtpctl_SOURCES+=  $(smtpd_srcdir)/queue_backend.c
-@@ -35,7 +36,7 @@
- smtpctl_SOURCES+=  $(smtpd_srcdir)/crypto.c
- endif
- 
--smtpctl_CFLAGS=    -DNO_IO
-+smtpctl_CFLAGS=    -DNO_IO -DCONFIG_MINIMUM
- smtpctl_CFLAGS+= -DPATH_GZCAT=\"$(ZCAT)\" \
-      -DPATH_ENCRYPT=\"$(pkglibexecdir)/encrypt\"
- 
-@@ -79,8 +80,6 @@
-
- install-exec-hook: $(CONFIGFILES) $(MANPAGES)                                 
-        $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8                           
--       chgrp $(SMTPD_QUEUE_USER) $(DESTDIR)$(sbindir)/smtpctl                 
--       chmod 2555 $(DESTDIR)$(sbindir)/smtpctl                                
-        $(INSTALL) -m 644 smtpctl.8.out         $(DESTDIR)$(mandir)/$(mansubdir)8/smtpctl.8
-        $(INSTALL) -m 644 sendmail.8.out        $(DESTDIR)$(mandir)/$(mansubdir)8/sendmail.8
-        $(INSTALL) -m 644 makemap.8.out         $(DESTDIR)$(mandir)/$(mansubdir)8/makemap.8
-
diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index f59c3852a41..1e971ac9c6a 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,6 +1,6 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
-version=6.4.0p2
+version=6.4.1p2
 revision=1
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
@@ -28,7 +28,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD, ISC, MIT"
 homepage="https://www.opensmtpd.org"
 distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz"
-checksum=76afcf7bf1af1fcb9475b937e304b4367bb8fc953c0ea1d43625369635b4faf8
+checksum=b69b84934bcc4893ca334504411cd47f86ea04ac5e971a5746d44c473ac5f732
 
 CFLAGS=-D_DEFAULT_SOURCE
 
@@ -48,8 +48,6 @@ pre_configure() {
 	# XXX get this result.
 	sed -e 's,^\(libevent_major_version\)=.*$,\1=2,' -i configure
 	sed -ri 's,/etc/mail,/etc/smtpd,g' smtpd/smtpd.conf
-	
-	sed -i 's,"/usr/libexec/,&opensmtpd/,g' smtpd/parse.y
 }
 post_install() {
 	for f in newaliases mailq makemap sendmail; do