svn commit: r415877 - in head: . mail/opensmtpd mail/opensmtpd/files
Bernard Spil
brnrd at FreeBSD.org
Thu May 26 07:15:18 UTC 2016
Author: brnrd
Date: Thu May 26 07:15:16 2016
New Revision: 415877
URL: https://svnweb.freebsd.org/changeset/ports/415877
Log:
mail/opensmtpd: Update to 5.9.2
- Update to 5.9.2p1
- Remove usernamelen patch (default 255+1)
- Fix renamed configure args
- Add symlink for makemap (now included in smtpctl)
- Align versioning with other OpenBSD projects
- Add _smtpq group
- Add UPDATING entry for existing installs
- Update pkg-message for existing installs
Reviewed by: adamw, mat
Approved by: adamw, maintainer (implicit)
Differential Revision: D6421
Deleted:
head/mail/opensmtpd/files/patch-usernamelen
Modified:
head/GIDs
head/UPDATING
head/mail/opensmtpd/Makefile
head/mail/opensmtpd/distinfo
head/mail/opensmtpd/files/pkg-message.in
head/mail/opensmtpd/files/smtpd.in
head/mail/opensmtpd/pkg-plist
Modified: head/GIDs
==============================================================================
--- head/GIDs Thu May 26 06:57:58 2016 (r415876)
+++ head/GIDs Thu May 26 07:15:16 2016 (r415877)
@@ -148,6 +148,7 @@ fcron:*:247:
_adsuck:*:253:
_tor:*:256:
_smtpd:*:257:
+_smtpq:*:258:
meta1s:*:260:
meta1q:*:261:
meta1c:*:262:meta1s
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Thu May 26 06:57:58 2016 (r415876)
+++ head/UPDATING Thu May 26 07:15:16 2016 (r415877)
@@ -5,6 +5,26 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20160526:
+ AFFECTS: Users of mail/opensmtpd
+ AUTHOR: brnrd at FreeBSD.org
+
+ Due to changes to the rc-script you must stop smtpd prior to upgrading
+ mail/opensmtpd to version 5.9.2
+
+ # service smtpd stop
+
+ Then upgrade OpenSMTPD to version 5.9.2.
+ Additionally version 5.9.2 changes the file mode bits for two directories.
+ To allow existing installations to start succesfully you must apply the
+ following changes
+
+ # chown -R root:_smtpq /var/spool/smtpd/offline
+ # chmod -R 770 /var/spool/smtpd/offline
+ # chmod -R 700 /var/spool/smtpd/purge
+
+ After applying the changes, the smtpd daemon can succesfully be started.
+
20160525:
AFFECTS: Users of devel/qtcreator
AUTHOR: nolden at kde.org
Modified: head/mail/opensmtpd/Makefile
==============================================================================
--- head/mail/opensmtpd/Makefile Thu May 26 06:57:58 2016 (r415876)
+++ head/mail/opensmtpd/Makefile Thu May 26 07:15:16 2016 (r415877)
@@ -2,13 +2,11 @@
# $FreeBSD$
PORTNAME= opensmtpd
-PORTVERSION= 5.7.3
-PORTREVISION= 2
+PORTVERSION= 5.9.2p1
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://www.opensmtpd.org/archives/ \
http://distfiles.pirateparty.in/ashish/
-DISTNAME= ${PORTNAME}-${PORTVERSION}p2
MAINTAINER= ashish at FreeBSD.org
COMMENT= Security- and simplicity-focused SMTP server from OpenBSD
@@ -31,8 +29,6 @@ TABLE_DB_DESC= Build table-db plugin (a
USES= cpe libtool
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/ \
- --with-mailwrapper --with-ssl-dir=${OPENSSLBASE}
CPE_VENDOR= openbsd
@@ -42,7 +38,7 @@ SUB_FILES= pkg-install pkg-deinstall pkg
CONFLICTS_INSTALL= postfix-[0-9]* sendmail-[0-9]* opensmtpd-devel-[0-9]*
USERS= _smtpd _smtpq
-GROUPS= _smtpd
+GROUPS= _smtpd _smtpq
OPTIONS_SUB= yes
@@ -53,18 +49,27 @@ LIBASRDEVEL_LIB_DEPENDS_OFF= libasr.so:d
LIBASRDEVEL_LIB_DEPENDS= libasr.so:dns/libasr-devel
LIBASRDEVEL_BROKEN= incompatible with libasr-devel
-PAM_CONFIGURE_WITH= pam pam-service=smtpd
-
-TABLE_DB_CONFIGURE_ENABLE= table-db
+PAM_CONFIGURE_WITH= auth-pam=smtpd
+SSL_PORT_VARS= with_openssl_port=yes
+TABLE_DB_CONFIGURE_WITH= table-db
.include <bsd.port.options.mk>
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ! ${PORT_OPTIONS:MSSL_PORT}
+.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000015
WITH_OPENSSL_PORT= yes
.endif
-.if ${PORT_OPTIONS:MSSL_PORT}
-WITH_OPENSSL_PORT= yes
-.endif
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS+= --with-libasr=${LOCALBASE} \
+ --with-libevent=${LOCALBASE} \
+ --with-ssl=${OPENSSLBASE} \
+ --sysconfdir=${PREFIX}/etc/mail/
+
+post-patch:
+ ${REINPLACE_CMD} -e '/chmod 2555/d' ${WRKSRC}/mk/smtpctl/Makefile.in
+
+post-install:
+ @${LN} -sf ${PREFIX}/sbin/smtpctl ${STAGEDIR}${PREFIX}/libexec/opensmtpd/makemap
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/mail/opensmtpd/distinfo
==============================================================================
--- head/mail/opensmtpd/distinfo Thu May 26 06:57:58 2016 (r415876)
+++ head/mail/opensmtpd/distinfo Thu May 26 07:15:16 2016 (r415877)
@@ -1,2 +1,3 @@
-SHA256 (opensmtpd-5.7.3p2.tar.gz) = 0d2973008d0f66bebb84bed516be6c32617735241cc54dd26643529281a8e52b
-SIZE (opensmtpd-5.7.3p2.tar.gz) = 709074
+TIMESTAMP = 1463428051
+SHA256 (opensmtpd-5.9.2p1.tar.gz) = 3522f273c1630c781facdb2b921228e338ed4e651909316735df775d6a70a71d
+SIZE (opensmtpd-5.9.2p1.tar.gz) = 681855
Modified: head/mail/opensmtpd/files/pkg-message.in
==============================================================================
--- head/mail/opensmtpd/files/pkg-message.in Thu May 26 06:57:58 2016 (r415876)
+++ head/mail/opensmtpd/files/pkg-message.in Thu May 26 07:15:16 2016 (r415877)
@@ -1,18 +1,21 @@
-If you are upgrading from OpenSMTPD version 201303011853 or earlier, please
+If you are upgrading from OpenSMTPD version 5.7.3 or earlier, please
follow the procedure below to update the permissions on the OpenSMTPD
spool directories:
1. Stop 'smtpd' service:
- # %%PREFIX%%/etc/rc.d/smtpd stop
+ # %%PREFIX%%/sbin/smtpctl 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:
- # %%PREFIX%%/etc/rc.d/smtpd start
+ # service smtpd start
Modified: head/mail/opensmtpd/files/smtpd.in
==============================================================================
--- head/mail/opensmtpd/files/smtpd.in Thu May 26 06:57:58 2016 (r415876)
+++ head/mail/opensmtpd/files/smtpd.in Thu May 26 07:15:16 2016 (r415877)
@@ -20,7 +20,7 @@
check_process()
{
- /bin/pgrep -j none -f 'smtpd: \[priv\]'
+ /bin/pgrep -j none -f "${smtpd_procname}"
}
name="smtpd"
Modified: head/mail/opensmtpd/pkg-plist
==============================================================================
--- head/mail/opensmtpd/pkg-plist Thu May 26 06:57:58 2016 (r415876)
+++ head/mail/opensmtpd/pkg-plist Thu May 26 07:15:16 2016 (r415877)
@@ -2,7 +2,7 @@ etc/mail/smtpd.conf.sample
libexec/opensmtpd/encrypt
libexec/opensmtpd/mail.local
%%TABLE_DB%%libexec/opensmtpd/makemap
-sbin/smtpctl
+@(,,2555) sbin/smtpctl
sbin/smtpd
%%TABLE_DB%%man/man8/makemap.8.gz
%%TABLE_DB%%man/man8/newaliases.8.gz
More information about the svn-ports-head
mailing list