svn commit: r401837 - in head: . mail/rmilter

[Vsevolod Stakhov]

Author: vsevolod
Date: Wed Nov 18 00:58:15 2015
New Revision: 401837
URL: https://svnweb.freebsd.org/changeset/ports/401837

Log:
  - Update to 1.6.6
  - Create a separate plist file
  - Add @sample option to the sample file
  - Rename rc script without .sh suffix
  - Switch from postfix user to _rmilter dedicated user
  - Add _rmilter:_rmilter to UIDs/GIDs
  - Add UPDATING entry

Added:
  head/mail/rmilter/pkg-plist   (contents, props changed)
Modified:
  head/GIDs
  head/UIDs
  head/UPDATING
  head/mail/rmilter/Makefile
  head/mail/rmilter/distinfo

Modified: head/GIDs
==============================================================================
--- head/GIDs	Wed Nov 18 00:55:20 2015	(r401836)
+++ head/GIDs	Wed Nov 18 00:58:15 2015	(r401837)
@@ -330,6 +330,7 @@ rcynic:*:994:
 rpkirtr:*:995:
 tarantool:*:996:
 bareos:*:997:
+_rmilter:*:998:
 ebnetd:*:999:
 nogroup:*:65533:
 nobody:*:65534:

Modified: head/UIDs
==============================================================================
--- head/UIDs	Wed Nov 18 00:55:20 2015	(r401836)
+++ head/UIDs	Wed Nov 18 00:58:15 2015	(r401837)
@@ -342,5 +342,6 @@ rcynic:*:994:994::0:0:RPKI validation sy
 rpkirtr:*:995:995::0:0:RPKI router server:/nonexistent:/usr/sbin/nologin
 tarantool:*:996:996::0:0:Tarantool Daemon:/nonexistent:/usr/sbin/nologin
 bareos:*:997:997::0:0:Bareos Daemon:/var/db/bareos:/usr/sbin/nologin
+_rmilter:*:998:998::0:0:Rmilter daemon:/nonexistent:/usr/sbin/nologin
 ebnetd:*:999:999::0:0:EBNETD:/nonexistent:/usr/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Nov 18 00:55:20 2015	(r401836)
+++ head/UPDATING	Wed Nov 18 00:58:15 2015	(r401837)
@@ -5,6 +5,14 @@ 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.
 
+20151118:
+  AFFECTS: users of mail/rmilter
+  AUTHOR: vsevolod at FreeBSD.org
+
+  Rmilter now has switched from user postfix to user _rmilter for security
+  and sanity purposes. You might want to fix the ownership of
+  /var/run/rmilter to user _rmilter and group mail.
+
 20151105:
   AFFECTS: users of deskutils/egroupware
   AUTHOR: danilo at FreeBSD.org

Modified: head/mail/rmilter/Makefile
==============================================================================
--- head/mail/rmilter/Makefile	Wed Nov 18 00:55:20 2015	(r401836)
+++ head/mail/rmilter/Makefile	Wed Nov 18 00:58:15 2015	(r401837)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rmilter
-PORTVERSION=	1.6.5
+PORTVERSION=	1.6.6
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod at FreeBSD.org
@@ -20,9 +20,8 @@ USE_RC_SUBR=	yes
 USES=		cmake:outsource bison
 USE_OPENSSL=	yes
 
-PLIST_FILES=	sbin/rmilter etc/rc.d/rmilter.sh \
-		etc/rmilter.conf.sample \
-		man/man8/rmilter.8.gz
+USERS=		_rmilter
+GROUPS=		_rmilter
 
 CMAKE_ARGS+=	-DENABLE_SPF=ON \
 		-DENABLE_DKIM=ON
@@ -35,10 +34,16 @@ WITH_SENDMAIL_BASE=	yes
 WITHOUT_MILTER_LDFLAGS=	yes
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
+post-patch:
+	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${WRKSRC}/freebsd/rmilter > ${WRKDIR}/rmilter
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/rmilter.sh ${STAGEDIR}${PREFIX}/etc/rc.d/
+	${INSTALL_SCRIPT} ${WRKDIR}/rmilter ${STAGEDIR}${PREFIX}/etc/rc.d/
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/rmilter ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/rmilter.conf.sample ${STAGEDIR}${PREFIX}/etc/
 	${INSTALL_MAN} ${WRKSRC}/doc/rmilter.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
 
+post-stage:
+	${INSTALL} -d ${STAGEDIR}/var/run/rmilter
 .include <bsd.port.post.mk>

Modified: head/mail/rmilter/distinfo
==============================================================================
--- head/mail/rmilter/distinfo	Wed Nov 18 00:55:20 2015	(r401836)
+++ head/mail/rmilter/distinfo	Wed Nov 18 00:58:15 2015	(r401837)
@@ -1,2 +1,2 @@
-SHA256 (vstakhov-rmilter-1.6.5_GH0.tar.gz) = f5486a090e245fe1b35b96535a26145df0274603b849f0c1ee771970173d5e00
-SIZE (vstakhov-rmilter-1.6.5_GH0.tar.gz) = 117661
+SHA256 (vstakhov-rmilter-1.6.6_GH0.tar.gz) = 4e8c3374d0345ae99a3cd8f5965a0c49e1d1dc6bb0aa694c8f1fa2c4b5baf470
+SIZE (vstakhov-rmilter-1.6.6_GH0.tar.gz) = 117565

Added: head/mail/rmilter/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/rmilter/pkg-plist	Wed Nov 18 00:58:15 2015	(r401837)
@@ -0,0 +1,9 @@
+etc/rc.d/rmilter
+ at sample etc/rmilter.conf.sample
+man/man8/rmilter.8.gz
+sbin/rmilter
+ at owner _rmilter
+ at group mail
+ at dir /var/run/rmilter
+ at owner
+ at group