On Sun, Mar 06, 2016 at 10:06:11PM +0100, Jeremie Courreges-Anglas wrote: > Matthieu Herrb <matth...@herrb.eu> writes: > > > Hi, > > > > I ended up regenerating existing custom config files using the > > sendmail port, and stumbled into references to the old 'smmsp' > > user/group. So lets patch the installed cf/feature/msp.m4: > > > > ok ? > > ok jca@ > > Note that if you fix msp.m4 then openbsd-submit.mc doesn't need to > override confRUN_AS_USER anymore. > Here's a new patch taking your remark and sthen@'s .
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/sendmail/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- Makefile 19 Jul 2015 02:25:35 -0000 1.13
+++ Makefile 7 Mar 2016 09:04:20 -0000
@@ -7,6 +7,7 @@
DISTNAME = sendmail.${V}
PKGNAME-main = sendmail-${V}
PKGNAME-libmilter = libmilter-${V}
+REVISION-main = 0
FULLPKGNAME-libmilter = libmilter-${V}
FULLPKGPATH-libmilter = mail/sendmail,-libmilter
Index: files/cf/openbsd-submit.mc
===================================================================
RCS file: /cvs/ports/mail/sendmail/files/cf/openbsd-submit.mc,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 openbsd-submit.mc
--- files/cf/openbsd-submit.mc 16 Sep 2014 17:09:32 -0000 1.1.1.1
+++ files/cf/openbsd-submit.mc 7 Mar 2016 09:04:20 -0000
@@ -24,7 +24,6 @@
define(`confDONT_INIT_GROUPS', `True')dnl
define(`confCT_FILE', `-o MAIL_SETTINGS_DIR`'trusted-users')dnl
define(`confTO_IDENT', `0')dnl
-define(`confRUN_AS_USER', `_smmsp')dnl
FEATURE(`use_ct_file')dnl
FEATURE(`accept_unresolvable_domains')dnl
dnl
Index: patches/patch-cf_feature_msp_m4
===================================================================
RCS file: patches/patch-cf_feature_msp_m4
diff -N patches/patch-cf_feature_msp_m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cf_feature_msp_m4 7 Mar 2016 09:04:20 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- cf/feature/msp.m4.orig Wed Mar 5 01:59:45 2014
++++ cf/feature/msp.m4 Mon Mar 7 09:55:28 2016
+@@ -20,7 +20,7 @@ define(`confPRIVACY_FLAGS', `goaway,noetrn,restrictqru
+ define(`confDONT_PROBE_INTERFACES', `True')
+ dnl ---------------------------------------------
+ dnl run as this user (even if called by root)
+-ifdef(`confRUN_AS_USER',,`define(`confRUN_AS_USER', `smmsp')')
++ifdef(`confRUN_AS_USER',,`define(`confRUN_AS_USER', `_smmsp')')
+ ifdef(`confTRUSTED_USER',,`define(`confTRUSTED_USER',
+ `ifelse(index(confRUN_AS_USER,`:'), -1, `confRUN_AS_USER',
+ `substr(confRUN_AS_USER,0,index(confRUN_AS_USER,`:'))')')')
--
Matthieu Herrb
pgpXzBfDmtZV2.pgp
Description: PGP signature
