opensmtpd: remove, needs a newer version re-importing from wip

this version is broken with current openssl and old and likely insecure.
newer version probably needs something like libretls sitting in front.

12 files changed, 1 insertions, 305 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 67a3318f675..0bc6396548d 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.568 2021/03/18 09:18:17 adam Exp $
+# $NetBSD: Makefile,v 1.569 2021/04/21 09:34:58 nia Exp $
 #
 
 COMMENT=	Electronic mail utilities
@@ -185,7 +185,6 @@ SUBDIR+=	oe2mbx
 SUBDIR+=	offlineimap
 SUBDIR+=	opendkim
 SUBDIR+=	opendmarc
-SUBDIR+=	opensmtpd
 SUBDIR+=	p5-App-Siesh
 SUBDIR+=	p5-Catalyst-View-Email
 SUBDIR+=	p5-Email-Abstract
diff --git a/mail/opensmtpd/DESCR b/mail/opensmtpd/DESCR
deleted file mode 100644
index 5588b3e2b67..00000000000
--- a/mail/opensmtpd/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-OpenSMTPD is a FREE implementation of the server-side SMTP protocol
-as defined by RFC 5321, with some additional standard extensions.
-It allows ordinary machines to exchange e-mails with other systems
-speaking the SMTP protocol.
-
-Started out of dissatisfaction with other implementations, OpenSMTPD
-nowadays is a fairly complete SMTP implementation.
-
-OpenSMTPD is primarily developed by Gilles Chehade, Eric Faurot and
-Charles Longeau; with contributions from various OpenBSD hackers.
diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile
deleted file mode 100644
index 3a99983134c..00000000000
--- a/mail/opensmtpd/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2020/04/24 11:23:08 nia Exp $
-
-VERSION=	5.7.3p2
-DISTNAME=	opensmtpd-${VERSION}
-PKGREVISION=	1
-CATEGORIES=	mail net
-MASTER_SITES=	https://www.opensmtpd.org/archives/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://www.opensmtpd.org/
-COMMENT=	The OpenSMTPD mail transfer agent, a replacement for sendmail
-LICENSE=	isc AND modified-bsd AND 2-clause-bsd
-
-BROKEN=		"Fails to build with OpenSSL 1.1"
-
-CONFLICTS+=		courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
-CONFLICTS+=		esmtp>=1.2 nullmailer-[0-9]* postfix-[0-9]*
-BROKEN_FOR_PLATFORM=	OpenBSD-*-*
-
-BUILD_DEFS+=	VARBASE
-
-USE_LANGUAGES=	c
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config yacc
-USE_TOOLS+=	automake aclocal autoheader autoconf
-
-SMTPD_HOME=	${VARBASE}/chroot/smtpd
-OWN_DIRS=	${SMTPD_HOME}
-
-PKG_GROUPS=		_smtpd _smtpq
-PKG_USERS=		_smtpd:_smtpd _smtpq:_smtpq
-PKG_GECOS._smtpd=	OpenSMTPD pseudo-user
-PKG_HOME._smtpd=	${SMTPD_HOME}
-PKG_GECOS._smtpq=	OpenSMTPD pseudo-user
-PKG_HOME._smtpq=	${SMTPD_HOME}
-
-GNU_CONFIGURE=		yes
-USE_DB185=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-mantype=man
-CONFIGURE_ARGS+=	--with-privsep-path=${SMTPD_HOME}
-CONFIGURE_ARGS+=	--with-ssl-dir=${SSLBASE:Q}
-CONFIGURE_ARGS+=	--enable-table-db
-CONFIGURE_ARGS+=	--without-zlib-version-check
-
-EXAMPLEDIR=	${PREFIX}/share/examples/opensmtpd
-CONF_FILES=	${EXAMPLEDIR}/smtpd.conf ${PKG_SYSCONFDIR}/smtpd.conf
-
-RCD_SCRIPTS=	opensmtpd
-
-SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	${WRKDIR}/mailer.conf
-SUBST_VARS.paths=	PREFIX
-SUBST_STAGE.paths=	pre-configure
-
-SUBST_CLASSES+=			exampledir
-SUBST_STAGE.exampledir=		pre-configure
-SUBST_MESSAGE.exampledir=	Fixing exampledir path
-SUBST_FILES.exampledir=		mk/smtpd/Makefile.am
-SUBST_SED.exampledir+=		-e 's,@EXAMPLE_DIR@,${EXAMPLEDIR},'
-
-post-extract:
-	cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
-
-pre-configure:
-	cd ${WRKSRC} && ${PREFIX}/bin/libtoolize --copy --force
-	cd ${WRKSRC} && ${TOOLS_CMD.aclocal}
-	cd ${WRKSRC} && ${TOOLS_CMD.autoconf}
-	cd ${WRKSRC} && ${TOOLS_CMD.autoheader}
-	cd ${WRKSRC} && ${TOOLS_CMD.automake} --foreign --add-missing --copy
-
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/mailer.conf \
-		${DESTDIR}${EXAMPLEDIR}/mailer.conf
-
-.include "../../databases/db5/buildlink3.mk"
-.include "../../devel/libevent/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../net/libasr/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/opensmtpd/PLIST b/mail/opensmtpd/PLIST
deleted file mode 100644
index 771ba0d6812..00000000000
--- a/mail/opensmtpd/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2016/05/01 05:56:40 mef Exp $
-bin/sendmail
-libexec/opensmtpd/encrypt
-libexec/opensmtpd/mail.local
-man/man5/aliases.5
-man/man5/forward.5
-man/man5/smtpd.conf.5
-man/man5/table.5
-man/man8/makemap.8
-man/man8/newaliases.8
-man/man8/sendmail.8
-man/man8/smtpctl.8
-man/man8/smtpd.8
-sbin/mailq
-sbin/makemap
-sbin/newaliases
-sbin/smtpctl
-sbin/smtpd
-share/examples/opensmtpd/mailer.conf
-share/examples/opensmtpd/smtpd.conf
diff --git a/mail/opensmtpd/distinfo b/mail/opensmtpd/distinfo
deleted file mode 100644
index 8951e3ab09d..00000000000
--- a/mail/opensmtpd/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.6 2016/06/01 11:47:06 wiz Exp $
-
-SHA1 (opensmtpd-5.7.3p2.tar.gz) = 4d1edc5811a80ec26de040227a298a742c494e72
-RMD160 (opensmtpd-5.7.3p2.tar.gz) = 5d6faebea3a303e5effeafbef5def597bfac434e
-SHA512 (opensmtpd-5.7.3p2.tar.gz) = bac0b8d6a6969a5e49a1d45b2c74cb2f3da44d06b12c7162500adf3ca312751020762bc8301075a9d7634d94cf51f978d04fac327f843680646e9e687737c42f
-Size (opensmtpd-5.7.3p2.tar.gz) = 709074 bytes
-SHA1 (patch-configure.ac) = d8aa50afb48abcfb38c9cd7080ba59122aee8ba6
-SHA1 (patch-mk_makemap_Makefile.am) = 51da0f13b1b32b3c364ae638a38d4b33efaf1ec7
-SHA1 (patch-mk_smtpd_Makefile.am) = ebc62819300d3ddd824178c08a5630ca85dc6fdc
-SHA1 (patch-smtpd_queue__fs.c) = f13d1bf1d26544b3c81e5e2c813d2fe5e917b96b
-SHA1 (patch-smtpd_smtp__session.c) = f9c034827519a02b97cadb3c034ad1e84abc805a
diff --git a/mail/opensmtpd/files/mailer.conf b/mail/opensmtpd/files/mailer.conf
deleted file mode 100644
index 0cd17abbb46..00000000000
--- a/mail/opensmtpd/files/mailer.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$NetBSD: mailer.conf,v 1.2 2016/05/01 05:56:40 mef Exp $
-#
-# Use "opensmtpd" replacements 
-#
-sendmail	@PREFIX@/sbin/smtpctl
-send-mail	@PREFIX@/sbin/smtpctl
-mailq		@PREFIX@/sbin/mailq
-makemap         @PREFIX@/sbin/makemap
-newaliases	@PREFIX@/sbin/newaliases
diff --git a/mail/opensmtpd/files/opensmtpd.sh b/mail/opensmtpd/files/opensmtpd.sh
deleted file mode 100644
index 31417bb79df..00000000000
--- a/mail/opensmtpd/files/opensmtpd.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: opensmtpd.sh,v 1.1 2013/11/18 22:50:01 pettai Exp $
-#
-
-# PROVIDE: mail
-# REQUIRE: LOGIN
-#       we make mail start late, so that things like .forward's are not
-#       processed until the system is fully operational
-
-. /etc/rc.subr
-
-name="smtpd"
-rcvar=opensmtpd
-command="@PREFIX@/sbin/${name}"
-required_files="@PKG_SYSCONFDIR@/smtpd.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/opensmtpd/patches/patch-configure.ac b/mail/opensmtpd/patches/patch-configure.ac
deleted file mode 100644
index 4d896ddc774..00000000000
--- a/mail/opensmtpd/patches/patch-configure.ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.3 2016/06/01 11:47:06 wiz Exp $
-
-Add sys/statvfs for NetBSD.
-
---- configure.ac.orig	2016-02-02 07:40:06.000000000 +0000
-+++ configure.ac
-@@ -338,6 +338,7 @@ AC_CHECK_HEADERS([ \
- 	sys/ndir.h \
- 	sys/pstat.h \
- 	sys/statfs.h \
-+	sys/statvfs.h \
- 	sys/time.h \
- 	sys/un.h \
- 	time.h \
-@@ -701,6 +702,7 @@ AC_CHECK_FUNCS([ \
- 	setreuid \
- 	setsid \
- 	sigaction \
-+	snprintf \
- 	socketpair \
- 	strdup \
- 	strerror \
diff --git a/mail/opensmtpd/patches/patch-mk_makemap_Makefile.am b/mail/opensmtpd/patches/patch-mk_makemap_Makefile.am
deleted file mode 100644
index 86c613661a4..00000000000
--- a/mail/opensmtpd/patches/patch-mk_makemap_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-mk_makemap_Makefile.am,v 1.1 2016/05/31 21:33:15 joerg Exp $
-
---- mk/makemap/Makefile.am.orig	2016-05-07 12:20:44.083460074 +0000
-+++ mk/makemap/Makefile.am
-@@ -29,8 +29,7 @@ makemap_CFLAGS=		-DNO_IO
- 
- 
- AM_CPPFLAGS=		-I$(smtpd_srcdir)	\
--			-I$(compat_srcdir)	\
--			-I$(asr_srcdir)
-+			-I$(compat_srcdir)
- 
- LIBCOMPAT=		$(top_builddir)/openbsd-compat/libopenbsd-compat.a
- 
diff --git a/mail/opensmtpd/patches/patch-mk_smtpd_Makefile.am b/mail/opensmtpd/patches/patch-mk_smtpd_Makefile.am
deleted file mode 100644
index 5c3baf10517..00000000000
--- a/mail/opensmtpd/patches/patch-mk_smtpd_Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-mk_smtpd_Makefile.am,v 1.1 2016/05/01 05:56:40 mef Exp $
-
-Install the configuration file in the example directory.
-
---- mk/smtpd/Makefile.am.orig	2016-02-02 07:40:06.000000000 +0000
-+++ mk/smtpd/Makefile.am
-@@ -151,17 +151,16 @@ $(CONFIGFILES): $(CONFIGFILES_IN)
- 
- # smtpd.conf
- # newaliases makemap
-+
-+EXAMPLE_DIR=@EXAMPLE_DIR@
-+
- install-exec-hook: $(CONFIGFILES) $(MANPAGES)
--	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
-+	$(MKDIR_P) $(DESTDIR)$(EXAMPLE_DIR)
- 	$(MKDIR_P) $(DESTDIR)$(bindir)
- 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
- 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
- 
--	@if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then			\
--		$(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \
--	else									\
--		echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \
--	fi
-+	$(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(EXAMPLE_DIR)/smtpd.conf
- 
- 	$(INSTALL) -m 644 aliases.5.out		$(DESTDIR)$(mandir)/$(mansubdir)5/aliases.5
- 	$(INSTALL) -m 644 forward.5.out		$(DESTDIR)$(mandir)/$(mansubdir)5/forward.5
diff --git a/mail/opensmtpd/patches/patch-smtpd_queue__fs.c b/mail/opensmtpd/patches/patch-smtpd_queue__fs.c
deleted file mode 100644
index 62d9ccf3237..00000000000
--- a/mail/opensmtpd/patches/patch-smtpd_queue__fs.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-smtpd_queue__fs.c,v 1.1 2016/05/01 05:56:40 mef Exp $
-
-NetBSD use statvfs, not statfs.
-
---- smtpd/queue_fs.c.orig	2016-02-02 07:40:06.000000000 +0000
-+++ smtpd/queue_fs.c
-@@ -30,6 +30,12 @@
- #ifdef HAVE_SYS_STATFS_H
- #include <sys/statfs.h>
- #endif
-+#ifdef HAVE_SYS_STATVFS_H
-+#include <sys/statvfs.h>
-+#ifdef __NetBSD__
-+#define statfs statvfs
-+#endif
-+#endif
- 
- #include <ctype.h>
- #include <dirent.h>
diff --git a/mail/opensmtpd/patches/patch-smtpd_smtp__session.c b/mail/opensmtpd/patches/patch-smtpd_smtp__session.c
deleted file mode 100644
index 32d32d9564a..00000000000
--- a/mail/opensmtpd/patches/patch-smtpd_smtp__session.c
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-smtpd_smtp__session.c,v 1.1 2016/05/01 05:56:40 mef Exp $
-
-Add a patch to handle long usernames during SMTP authentication,
-e.g. often username exceeds the limit when it contains @host.name
-part.
-
-From FreeBSD's ports.
-
-cf.http://svnweb.freebsd.org/ports?view=revision&revision=394424
-
---- smtpd/smtp_session.c.orig	2016-02-02 07:40:06.000000000 +0000
-+++ smtpd/smtp_session.c
-@@ -84,6 +84,7 @@ enum session_flags {
- 	SF_BADINPUT		= 0x0080,
- 	SF_FILTERCONN		= 0x0100,
- 	SF_FILTERDATA		= 0x0200,
-+	SF_USERTOOLONG		= 0x0400,
- };
- 
- enum message_flags {
-@@ -133,7 +134,7 @@ struct smtp_session {
- 
- 	char			 helo[LINE_MAX];
- 	char			 cmd[LINE_MAX];
--	char			 username[LOGIN_NAME_MAX];
-+	char			 username[LOGIN_NAME_MAX+HOST_NAME_MAX+1];
- 
- 	struct envelope		 evp;
- 
-@@ -986,6 +987,15 @@ smtp_session_imsg(struct mproc *p, struc
- 
- 		s = tree_xpop(&wait_parent_auth, reqid);
- 		strnvis(user, s->username, sizeof user, VIS_WHITE | VIS_SAFE);
-+
-+		if (s->flags & SF_USERTOOLONG) {
-+			log_info("smtp-in: sesson %016"PRIx64
-+				": auth failed because username too long",
-+				s->id);
-+			s->flags &= (~SF_USERTOOLONG);
-+			success = LKA_PERMFAIL;
-+		}
-+
- 		if (success == LKA_OK) {
- 			log_info("smtp-in: session %016"PRIx64
- 			    ": authentication successful for user %s ",
-@@ -1925,7 +1935,7 @@ smtp_rfc4954_auth_plain(struct smtp_sess
- 		user++; /* skip NUL */
- 		if (strlcpy(s->username, user, sizeof(s->username))
- 		    >= sizeof(s->username))
--			goto abort;
-+			s->flags |= SF_USERTOOLONG;
- 
- 		pass = memchr(user, '\0', len - (user - buf));
- 		if (pass == NULL || pass >= buf + len - 2)
-@@ -1965,9 +1975,12 @@ smtp_rfc4954_auth_login(struct smtp_sess
- 
- 	case STATE_AUTH_USERNAME:
- 		memset(s->username, 0, sizeof(s->username));
--		if (base64_decode(arg, (unsigned char *)s->username,
--				  sizeof(s->username) - 1) == -1)
-+		if (base64_decode(arg, (unsigned char *)buf,
-+				  sizeof(buf) - 1) == -1)
- 			goto abort;
-+		if (strlcpy(s->username, buf, sizeof(s->username))
-+		    >= sizeof(s->username))
-+			s->flags |= SF_USERTOOLONG;
- 
- 		smtp_enter_state(s, STATE_AUTH_PASSWORD);
- 		smtp_reply(s, "334 UGFzc3dvcmQ6");