net/uucp will soon use _uucp as unix account, let's reflect this in the
master.cf examples.
ok?
Index: snapshot/Makefile
===================================================================
RCS file: /d/cvs/ports/mail/postfix/snapshot/Makefile,v
retrieving revision 1.299
diff -u -p -r1.299 Makefile
--- snapshot/Makefile 18 Oct 2016 10:22:26 -0000 1.299
+++ snapshot/Makefile 14 Dec 2016 14:38:31 -0000
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.299 2016/10/18 10:22:26 sthen Exp $
VERSION= 3.2-20161008
+REVISION= 0
MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/}
Index: snapshot/patches/patch-conf_master_cf
===================================================================
RCS file: /d/cvs/ports/mail/postfix/snapshot/patches/patch-conf_master_cf,v
retrieving revision 1.8
diff -u -p -r1.8 patch-conf_master_cf
--- snapshot/patches/patch-conf_master_cf 16 Oct 2014 18:27:28 -0000
1.8
+++ snapshot/patches/patch-conf_master_cf 14 Dec 2016 14:37:47 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-conf_master_cf,v 1.8 2014/10/16 18:27:28 brad Exp $
---- conf/master.cf.orig Wed Oct 1 17:47:03 2014
-+++ conf/master.cf Thu Oct 16 13:38:42 2014
+--- conf/master.cf.orig Sat Jan 31 23:54:26 2015
++++ conf/master.cf Wed Dec 14 15:37:43 2016
@@ -9,12 +9,12 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (no) (never) (100)
@@ -83,7 +83,7 @@ $OpenBSD: patch-conf_master_cf,v 1.8 201
#
# ====================================================================
# Interfaces to non-Postfix software. Be sure to examine the manual
-@@ -95,14 +95,14 @@ scache unix - - n - 1
+@@ -95,21 +95,21 @@ scache unix - - n - 1
# Also specify in main.cf: cyrus_destination_recipient_limit=1
#
#cyrus unix - n n - - pipe
@@ -97,6 +97,14 @@ $OpenBSD: patch-conf_master_cf,v 1.8 201
#old-cyrus unix - n n - - pipe
-# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
+# flags=R user=_cyrus argv=/usr/local/libexec/cyrus-imapd/deliver -e -m
${extension} ${user}
+ #
+ # ====================================================================
+ #
+ # See the Postfix UUCP_README file for configuration details.
+ #
+ #uucp unix - n n - - pipe
+-# flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail
($recipient)
++# flags=Fqhu user=_uucp argv=uux -r -n -z -a$sender - $nexthop!rmail
($recipient)
#
# ====================================================================
#
Index: stable/Makefile
===================================================================
RCS file: /d/cvs/ports/mail/postfix/stable/Makefile,v
retrieving revision 1.190
diff -u -p -r1.190 Makefile
--- stable/Makefile 18 Oct 2016 10:22:40 -0000 1.190
+++ stable/Makefile 14 Dec 2016 14:38:20 -0000
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.190 2016/10/18 10:22:40 sthen Exp $
VERSION= 3.1.3
+REVISION= 0
MASTER_SITES= ${MASTER_SITE_POSTFIX:=official/}
Index: stable/patches/patch-conf_master_cf
===================================================================
RCS file: /d/cvs/ports/mail/postfix/stable/patches/patch-conf_master_cf,v
retrieving revision 1.7
diff -u -p -r1.7 patch-conf_master_cf
--- stable/patches/patch-conf_master_cf 9 Apr 2015 19:49:59 -0000 1.7
+++ stable/patches/patch-conf_master_cf 14 Dec 2016 14:01:03 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-conf_master_cf,v 1.7 2015/04/09 19:49:59 sthen Exp $
---- conf/master.cf.orig Wed Oct 1 17:47:03 2014
-+++ conf/master.cf Thu Oct 16 13:38:42 2014
+--- conf/master.cf.orig Sat Jan 31 23:54:26 2015
++++ conf/master.cf Wed Dec 14 15:01:00 2016
@@ -9,12 +9,12 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (no) (never) (100)
@@ -83,7 +83,7 @@ $OpenBSD: patch-conf_master_cf,v 1.7 201
#
# ====================================================================
# Interfaces to non-Postfix software. Be sure to examine the manual
-@@ -95,14 +95,14 @@ scache unix - - n - 1
+@@ -95,21 +95,21 @@ scache unix - - n - 1
# Also specify in main.cf: cyrus_destination_recipient_limit=1
#
#cyrus unix - n n - - pipe
@@ -97,6 +97,14 @@ $OpenBSD: patch-conf_master_cf,v 1.7 201
#old-cyrus unix - n n - - pipe
-# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
+# flags=R user=_cyrus argv=/usr/local/libexec/cyrus-imapd/deliver -e -m
${extension} ${user}
+ #
+ # ====================================================================
+ #
+ # See the Postfix UUCP_README file for configuration details.
+ #
+ #uucp unix - n n - - pipe
+-# flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail
($recipient)
++# flags=Fqhu user=_uucp argv=uux -r -n -z -a$sender - $nexthop!rmail
($recipient)
#
# ====================================================================
#
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
