Date: Tue, 28 Sep 2021 09:23:06 GMT From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9189d5158160 - main - mail/opensmtpd-devel: drop unsupported upstream snapshots before 2021Q4 Message-ID: <202109280923.18S9N6Uu035996@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9189d51581606c2c4b443ea7546141371a1638f3 commit 9189d51581606c2c4b443ea7546141371a1638f3 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2021-09-28 09:20:21 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2021-09-28 09:20:21 +0000 mail/opensmtpd-devel: drop unsupported upstream snapshots before 2021Q4 Move to official releases of mail/opensmtpd Suggested by: mandree --- MOVED | 1 + mail/Makefile | 1 - mail/opensmtpd-devel/Makefile | 80 ---------------------- mail/opensmtpd-devel/distinfo | 3 - .../files/patch-mk_smtpd_Makefile.in | 17 ----- mail/opensmtpd-devel/files/patch-smtpd-rfc2822.c | 19 ----- .../files/patch-smtpd-smtp_session.c | 11 --- mail/opensmtpd-devel/files/patch-src_mda.c | 11 --- mail/opensmtpd-devel/files/pkg-deinstall.in | 14 ---- mail/opensmtpd-devel/files/pkg-install.in | 17 ----- mail/opensmtpd-devel/files/pkg-message.in | 27 -------- mail/opensmtpd-devel/files/smtpd.in | 52 -------------- mail/opensmtpd-devel/pkg-descr | 8 --- mail/opensmtpd-devel/pkg-plist | 15 ---- 14 files changed, 1 insertion(+), 275 deletions(-) diff --git a/MOVED b/MOVED index f901b1180a33..f4ed42c559a6 100644 --- a/MOVED +++ b/MOVED @@ -16487,3 +16487,4 @@ net-mgmt/zabbix52-java||2021-09-19|Has expired: Unsupported by upstream net-mgmt/zabbix52-proxy||2021-09-19|Has expired: Unsupported by upstream net-mgmt/zabbix52-server||2021-09-19|Has expired: Unsupported by upstream devel/py-pyyaml-env-tag|devel/py-pyyaml_env_tag|2021-09-28|Renamed to match upstream naming +mail/opensmtpd-devel|mail/opensmtpd|2021-09-28|Has expired: move to offical releases diff --git a/mail/Makefile b/mail/Makefile index c2ef02e6eb57..32b11f4c9687 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -262,7 +262,6 @@ SUBDIR += opendkim SUBDIR += opendmarc SUBDIR += opensmtpd - SUBDIR += opensmtpd-devel SUBDIR += opensmtpd-extras SUBDIR += opensmtpd-extras-queue-ram SUBDIR += opensmtpd-extras-scheduler-ram diff --git a/mail/opensmtpd-devel/Makefile b/mail/opensmtpd-devel/Makefile deleted file mode 100644 index 853dc6eca28f..000000000000 --- a/mail/opensmtpd-devel/Makefile +++ /dev/null @@ -1,80 +0,0 @@ -# Created by: Ashish SHUKLA <ashish@FreeBSD.org> - -PORTNAME= opensmtpd -PORTVERSION= 201606220754 -DISTVERSIONSUFFIX= p1 -PORTREVISION= 6 -PORTEPOCH= 1 -CATEGORIES= mail -MASTER_SITES= http://www.opensmtpd.org/archives/ \ - http://distfiles.pirateparty.in/ashish/ -PKGNAMESUFFIX= -devel - -MAINTAINER= fluffy@FreeBSD.org -COMMENT= Security- and simplicity-focused SMTP server from OpenBSD - -LICENSE= ISCL -LICENSE_FILE= ${WRKSRC}/LICENSE - -BROKEN_SSL= openssl -BROKEN_SSL_REASON_openssl= Incompatible with Openssl 1.1.x yet - -LIB_DEPENDS= libevent.so:devel/libevent - -OPTIONS_DEFINE= CA_BUNDLE LIBASR MAILERCONF PAM TABLE_DB - -OPTIONS_DEFAULT= CA_BUNDLE PAM TABLE_DB - -CA_BUNDLE_DESC= Install CA bundle for SSL -LIBASR_DESC= Use stable version of libasr -MAILERCONF_DESC= Activate OpenSMTPD in mailer.conf(5) -TABLE_DB_DESC= Build table-db plugin (aliases) - -USES= cpe groff libtool ssl -GNU_CONFIGURE= yes - -CPE_VENDOR= openbsd - -USE_RC_SUBR= smtpd -SUB_FILES= pkg-install pkg-deinstall pkg-message - -CONFLICTS_INSTALL= postfix-[0-9]* sendmail-[0-9]* opensmtpd-[0-9]* - -USERS= _smtpd _smtpq -GROUPS= _smtpd _smtpq - -OPTIONS_SUB= yes - -CA_BUNDLE_CONFIGURE_WITH= path-CAfile=${LOCALBASE}/share/certs/ca-root-nss.crt -CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss - -LIBASR_LIB_DEPENDS= libasr.so:dns/libasr -LIBASR_LIB_DEPENDS_OFF= libasr.so:dns/libasr-devel - -PAM_CONFIGURE_WITH= auth-pam=smtpd -TABLE_DB_CONFIGURE_WITH= table-db - -CONFIGURE_ARGS+= --with-libasr=${LOCALBASE} \ - --with-libevent=${LOCALBASE} \ - --with-libssl=${OPENSSLBASE} \ - --sysconfdir=${PREFIX}/etc/mail/ - -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && \ - ((${OSVERSION} > 1200084 && ${SSL_DEFAULT} == "base") || \ - (${SSL_DEFAULT} == "openssl")) -BROKEN= Incompatible with Openssl 1.1.x yet -.endif - -post-patch: - ${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in - # https://github.com/OpenSMTPD/OpenSMTPD/issues/700 - ${REINPLACE_CMD} -r -e \ - '/SMTPD_VERSION/s/"[^"]+"$$/"${PORTVERSION}${DISTVERSIONSUFFIX}"/' \ - ${WRKSRC}/smtpd/smtpd.h - -post-install-TABLE_DB-on: - @${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap - -.include <bsd.port.post.mk> diff --git a/mail/opensmtpd-devel/distinfo b/mail/opensmtpd-devel/distinfo deleted file mode 100644 index 616c94da5679..000000000000 --- a/mail/opensmtpd-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1466588486 -SHA256 (opensmtpd-201606220754p1.tar.gz) = 4057ab61396b0a9de50fb2087aac3997757fa95f49de5d71db3a8ad49a9ae163 -SIZE (opensmtpd-201606220754p1.tar.gz) = 692879 diff --git a/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in b/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in deleted file mode 100644 index f7d756b35c37..000000000000 --- a/mail/opensmtpd-devel/files/patch-mk_smtpd_Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ ---- mk/smtpd/Makefile.in.orig 2016-06-06 21:03:28 UTC -+++ mk/smtpd/Makefile.in -@@ -1366,13 +1366,7 @@ install-exec-hook: $(CONFIGFILES) $(MANP - $(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)$(sysconfdir)/smtpd.conf.sample - $(INSTALL) -m 644 aliases.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/aliases.5 - $(INSTALL) -m 644 forward.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/forward.5 - $(INSTALL) -m 644 table.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/table.5 diff --git a/mail/opensmtpd-devel/files/patch-smtpd-rfc2822.c b/mail/opensmtpd-devel/files/patch-smtpd-rfc2822.c deleted file mode 100644 index 67952346556e..000000000000 --- a/mail/opensmtpd-devel/files/patch-smtpd-rfc2822.c +++ /dev/null @@ -1,19 +0,0 @@ ---- smtpd/rfc2822.c.orig 2018-05-01 13:33:10.000000000 +0000 -+++ smtpd/rfc2822.c 2018-05-01 13:34:47.931554000 +0000 -@@ -53,4 +53,7 @@ - struct rfc2822_hdr_miss_cb *hdr_miss_cb; -+ -+ if (!rp->in_hdr) -+ goto end; - - TAILQ_FOREACH(hdr_cb, &rp->hdr_cb, next) - if (strcasecmp(hdr_cb->name, rp->header.name) == 0) { -@@ -151,6 +152,8 @@ - return; - - header_callback(rp); -+ -+ missing_headers_callback(rp); - } - - void diff --git a/mail/opensmtpd-devel/files/patch-smtpd-smtp_session.c b/mail/opensmtpd-devel/files/patch-smtpd-smtp_session.c deleted file mode 100644 index 990888bf463d..000000000000 --- a/mail/opensmtpd-devel/files/patch-smtpd-smtp_session.c +++ /dev/null @@ -1,11 +0,0 @@ ---- smtpd/smtp_session.c.orig 2018-05-01 13:35:00.375262000 +0000 -+++ smtpd/smtp_session.c 2018-05-01 13:37:22.637096000 +0000 -@@ -1345,6 +1345,8 @@ - s->dataeom = 1; - if (iobuf_queued(&s->obuf) == 0) - smtp_data_io_done(s); -+ else -+ io_reload(&s->oev); - return; - } - diff --git a/mail/opensmtpd-devel/files/patch-src_mda.c b/mail/opensmtpd-devel/files/patch-src_mda.c deleted file mode 100644 index 3f4e0b1bf9ef..000000000000 --- a/mail/opensmtpd-devel/files/patch-src_mda.c +++ /dev/null @@ -1,11 +0,0 @@ ---- smtpd/mda.c.orig 2016-05-13 02:56:04.000000000 +1000 -+++ smtpd/mda.c 2018-04-26 10:28:45.373358000 +1000 -@@ -274,7 +274,7 @@ - * if any - */ - n = iobuf_fqueue(&s->iobuf, -- "Return-Path: %s\n" -+ "Return-Path: <%s>\n" - "Delivered-To: %s\n", - e->sender, - e->rcpt ? e->rcpt : e->dest); diff --git a/mail/opensmtpd-devel/files/pkg-deinstall.in b/mail/opensmtpd-devel/files/pkg-deinstall.in deleted file mode 100644 index b2701419666c..000000000000 --- a/mail/opensmtpd-devel/files/pkg-deinstall.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -PKGNAME=$1 -TARGET=$2 - -PREFIX=$(echo %%PREFIX%% |sed -e 's,/,\\/,g') - -if [ "$TARGET" = POST-DEINSTALL -a -z "%%MAILERCONF%%" ]; then - sed -e '/[[:space:]]'$PREFIX'\/sbin\/smtpctl/d' \ - -e '/[[:space:]]'$PREFIX'\/libexec\/opensmtpd\/makemap/d' \ - -e 's/^### opensmtpd: //g' -i '' /etc/mail/mailer.conf -fi - -exit 0 diff --git a/mail/opensmtpd-devel/files/pkg-install.in b/mail/opensmtpd-devel/files/pkg-install.in deleted file mode 100644 index b19e4c261d08..000000000000 --- a/mail/opensmtpd-devel/files/pkg-install.in +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -PKGNAME=$1 -TARGET=$2 - -if [ "$TARGET" = POST-INSTALL -a -z "%%MAILERCONF%%" ]; then - sed -e '/^[^#]/s/^/### opensmtpd: /g' -i '' /etc/mail/mailer.conf - cat >>/etc/mail/mailer.conf <<EOF -sendmail %%PREFIX%%/sbin/smtpctl -send-mail %%PREFIX%%/sbin/smtpctl -mailq %%PREFIX%%/sbin/smtpctl -makemap %%PREFIX%%/sbin/smtpctl -newaliases %%PREFIX%%/sbin/smtpctl -EOF -fi - -exit 0 diff --git a/mail/opensmtpd-devel/files/pkg-message.in b/mail/opensmtpd-devel/files/pkg-message.in deleted file mode 100644 index 6000c8988ebb..000000000000 --- a/mail/opensmtpd-devel/files/pkg-message.in +++ /dev/null @@ -1,27 +0,0 @@ -[ -{ type: install - message: <<EOM -If you are upgrading from OpenSMTPD version 5.7.3/201303011853 or earlier, please -follow the procedure below to update the permissions on the OpenSMTPD -spool directories: - - 1. Stop 'smtpd' service: - - # service smtpd stop - - 2. Update permissions: - - # chown -R _smtpq:wheel /var/spool/smtpd/corrupt - # chown -R root:_smtpq /var/spool/smtpd/offline - # chown -R _smtpq:wheel /var/spool/smtpd/purge - # chown -R _smtpq:wheel /var/spool/smtpd/queue - # chown -R _smtpq:wheel /var/spool/smtpd/temporary - # chmod -R 770 /var/spool/smtpd/offline - # chmod -R 700 /var/spool/smtpd/purge - - 3. Start 'smtpd' service: - - # service smtpd start -EOM -} -] diff --git a/mail/opensmtpd-devel/files/smtpd.in b/mail/opensmtpd-devel/files/smtpd.in deleted file mode 100644 index aa1ccb15f9ab..000000000000 --- a/mail/opensmtpd-devel/files/smtpd.in +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -# PROVIDE: smtpd mail -# REQUIRE: LOGIN -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf to enable smtpd: -# smtpd_enable (bool): Set it to "YES" to enable OpenSMTPD. -# Default is "NO". -# smtpd_config (string): Path to OpenSMTPD configuration file. -# Default is "%%PREFIX%%/etc/mail/smtpd.conf" -# smtpd_flags (string): Additional flags to be passed to smtpd. -# Default is "". -# -# - -. /etc/rc.subr - -name="smtpd" -rcvar=smtpd_enable - -start_precmd="smtpd_precmd" -restart_precmd="smtpd_checkconfig" -configtest_cmd="smtpd_checkconfig" -extra_commands="configtest" - -load_rc_config $name - -: ${smtpd_enable:="NO"} -: ${smtpd_config:="%%PREFIX%%/etc/mail/${name}.conf"} -: ${smtpd_procname:="%%PREFIX%%/sbin/${name}"} -: ${smtpd_flags:=""} - -command=${smtpd_procname} -command_args="-f ${smtpd_config} ${command_args}" -required_files="${smtpd_config}" - -procname=${smtpd_procname} -pidfile="/var/run/${name}.pid" - -smtpd_checkconfig() -{ - echo "Performing sanity check on smtpd configuration:" - eval ${command} ${command_args} ${smtpd_flags} -n -} - -smtpd_precmd() -{ - smtpd_checkconfig -} - -run_rc_command "$1" diff --git a/mail/opensmtpd-devel/pkg-descr b/mail/opensmtpd-devel/pkg-descr deleted file mode 100644 index e5239905a243..000000000000 --- a/mail/opensmtpd-devel/pkg-descr +++ /dev/null @@ -1,8 +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. - -This port packages the development snapshots released by OpenSMTPD team. - -WWW: https://www.OpenSMTPD.org/ diff --git a/mail/opensmtpd-devel/pkg-plist b/mail/opensmtpd-devel/pkg-plist deleted file mode 100644 index eab4e70b82e4..000000000000 --- a/mail/opensmtpd-devel/pkg-plist +++ /dev/null @@ -1,15 +0,0 @@ -@sample etc/mail/smtpd.conf.sample -libexec/opensmtpd/encrypt -libexec/opensmtpd/mail.local -%%TABLE_DB%%libexec/opensmtpd/makemap -@(,,2555) sbin/smtpctl -sbin/smtpd -man/man5/aliases.5.gz -man/man5/forward.5.gz -man/man5/smtpd.conf.5.gz -man/man5/table.5.gz -%%TABLE_DB%%man/man8/makemap.8.gz -%%TABLE_DB%%man/man8/newaliases.8.gz -man/man8/sendmail.8.gz -man/man8/smtpctl.8.gz -man/man8/smtpd.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109280923.18S9N6Uu035996>