Date: Mon, 3 Apr 2000 20:01:47 -0400 (EDT) From: yds@dppl.com To: FreeBSD-gnats-submit@freebsd.org Cc: torstenb@FreeBSD.org Subject: ports/17777: [PATCH] Postfix port to consistently use INSTALL_* macros Message-ID: <20000404000147.3041696D9@paris.dppl.com>
next in thread | raw e-mail | index | archive | help
>Number: 17777
>Category: ports
>Synopsis: [PATCH] Postfix port to consistently use INSTALL_* macros
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 3 17:10:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Yarema
>Release: FreeBSD 3.4-STABLE i386
>Organization:
>Environment:
FreeBSD 3.4-STABLE i386
FreeBSD 4.0-STABLE i386
>Description:
Except for the changes committed in ports/17749 from Martti
Kuparinen the Postfix port does not use INSTALL_* macros as per section
4.4.16.2 of the Handbook. This PR cleans up the Makefile to always use
INSTALL_* macros and honor the NOPORTDOCS flag.
A somewhat gratuitous change on my part is to hardcode the UID and
GIDs in postfix/pkg/INSTALL. The rational for this change is to make postfix
UID:GID 25 and maildrop GID 24 numerically match the following in
/etc/services:
# 24/tcp any private mail system
# 24/udp any private mail system
smtp 25/tcp mail #Simple Mail Transfer
smtp 25/udp mail #Simple Mail Transfer
I'm aware that this strays from the directions given in section 4.4.16.15 of
the Handbook. However since user bind's UID of 53 follows the same
convention of matching the UID and services number and is not mentioned in
the above section of the Handbook, I think this bending of the rules might
be worthwhile. If there's serious objection I can reroll this patch with out
messing with the UID/GID numbers.
Lastly I converted all the files in the PATCHDIR to unified format.
>How-To-Repeat:
See the do-install rule of the postfix/Makefile.
>Fix:
diff -ruN postfix.old/Makefile postfix/Makefile
--- postfix.old/Makefile Mon Apr 3 02:38:28 2000
+++ postfix/Makefile Mon Apr 3 18:37:40 2000
@@ -51,58 +51,52 @@
PDOC= ${PREFIX}/share/doc/postfix
do-install:
- @${MKDIR} -m 755 ${PREFIX}/etc/postfix
- @${CHOWN} root:wheel ${PREFIX}/etc/postfix
- @${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
- ${PREFIX}/etc/postfix/LICENSE
- @for f in access main.cf master.cf ; do \
- ${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
- ${PREFIX}/etc/postfix/sample-$$f ; \
- done
- @for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \
+ @${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 0755 \
+ ${PREFIX}/etc/postfix \
+ ${PREFIX}/libexec/postfix \
+ /var/spool/postfix
+ @${INSTALL_DATA} ${WRKSRC}/conf/LICENSE ${PREFIX}/etc/postfix
+.for file in access main.cf master.cf
+ @${INSTALL_DATA} ${WRKSRC}/conf/${file} \
+ ${PREFIX}/etc/postfix/sample-${file}
+.endfor
+.for file in sample-aliases.cf sample-canonical.cf sample-debug.cf \
sample-ldap.cf sample-local.cf sample-misc.cf sample-pcre.cf \
sample-rate.cf sample-relocated.cf sample-resource.cf \
sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
- sample-transport.cf sample-virtual.cf ; do \
- ${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
- ${PREFIX}/etc/postfix/$$f ;\
- done
- @${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
+ sample-transport.cf sample-virtual.cf
+ @${INSTALL_DATA} ${WRKSRC}/conf/${file} ${PREFIX}/etc/postfix
+.endfor
+ @${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script-sgid \
${PREFIX}/etc/postfix/postfix-script
- @${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
- @for f in bounce cleanup error local master pickup pipe qmgr \
- showq smtp smtpd trivial-rewrite ; do \
- ${INSTALL} -C -o root -g wheel -m 0755 -s \
- ${WRKSRC}/libexec/$$f ${PREFIX}/libexec/postfix/$$f ;\
- done
- @for f in postalias postcat postconf postfix postkick postlock postlog\
- postmap postsuper sendmail smtp-sink smtp-source ; do \
- ${INSTALL} -C -o root -g wheel -m 0755 -s ${WRKSRC}/bin/$$f \
- ${PREFIX}/sbin/$$f ;\
- done
- @${INSTALL} -C -o root -g maildrop -m 2755 -s ${WRKSRC}/bin/postdrop \
- ${PREFIX}/sbin/postdrop
- @for f in ${MAN1} ; do \
- ${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
- ${PREFIX}/man/man1/$$f ;\
- done
- @for f in ${MAN5} ; do \
- ${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
- ${PREFIX}/man/man5/$$f ;\
- done
- @for f in ${MAN8} ; do \
- ${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
- ${PREFIX}/man/man8/$$f ;\
- done
- @${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
- @cd ${WRKSRC} && ${INSTALL_DATA} \
- html/*.html html/*.gif ${PDOC} && \
- ${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
- @${MKDIR} -m 0755 /var/spool/postfix
- @${ECHO_MSG} "--------------------------------------------------"
- @${ECHO_MSG} "- To replace your existing sendmail with postfix -"
- @${ECHO_MSG} "- type \"make replace\" -"
- @${ECHO_MSG} "--------------------------------------------------"
+.for file in bounce cleanup error local master pickup pipe qmgr \
+ showq smtp smtpd trivial-rewrite
+ @${INSTALL_PROGRAM} ${WRKSRC}/libexec/${file} ${PREFIX}/libexec/postfix
+.endfor
+.for file in postalias postcat postconf postdrop postfix postkick \
+ postlock postlog postmap postsuper sendmail smtp-sink \
+ smtp-source
+ @${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin
+.endfor
+.for file in ${MAN1}
+ @${INSTALL_MAN} ${WRKSRC}/man/man1/${file} ${PREFIX}/man/man1
+.endfor
+.for file in ${MAN5}
+ @${INSTALL_MAN} ${WRKSRC}/man/man5/${file} ${PREFIX}/man/man5
+.endfor
+.for file in ${MAN8}
+ @${INSTALL_MAN} ${WRKSRC}/man/man8/${file} ${PREFIX}/man/man8
+.endfor
+.if !defined(NOPORTDOCS)
+ @${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 ${PDOC}
+ @cd ${WRKSRC}/html && \
+ ${ECHO_MSG} "===> Installing HTML documentation in ${PDOC}" && \
+ ${INSTALL_DATA} *.html *.gif ${PDOC}
+.endif
+ @${ECHO_MSG} '--------------------------------------------------'
+ @${ECHO_MSG} '- To replace your existing sendmail with postfix -'
+ @${ECHO_MSG} '- type "make replace" -'
+ @${ECHO_MSG} '--------------------------------------------------'
pre-install:
@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
@@ -114,14 +108,18 @@
replace:
.if ${OSVERSION} >= 400014
- @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf"
- ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
- ${ECHO} 'sendmail ${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
+ @${ECHO_MSG} '===> Activating postfix in /etc/mail/mailer.conf'
+ ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.real
+ ${ECHO} '#' > /etc/mail/mailer.conf
+ ${ECHO} -n '# Execute the Postfix sendmail program' >> /etc/mail/mailer.conf
+ ${ECHO} ', named /usr/local/sbin/sendmail' >> /etc/mail/mailer.conf
+ ${ECHO} '#' >> /etc/mail/mailer.conf
+ ${ECHO} 'sendmail ${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
${ECHO} 'send-mail ${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
${ECHO} 'mailq ${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
${ECHO} 'newaliases ${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
.else
- @${ECHO_MSG} "===> Replacing sendmail"
+ @${ECHO_MSG} '===> Replacing sendmail'
@if [ -e /usr/sbin/sendmail ]; then \
${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
${CHMOD} 0 /usr/sbin/sendmail.OFF; \
@@ -129,7 +127,7 @@
@if [ -e ${PREFIX}/sbin/sendmail ]; then \
${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
fi
- @${ECHO_MSG} "===> Replacing mailq"
+ @${ECHO_MSG} '===> Replacing mailq'
@if [ -e /usr/bin/mailq ]; then \
${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
${CHMOD} 0 /usr/bin/mailq.OFF; \
@@ -137,7 +135,7 @@
@if [ -e ${PREFIX}/sbin/sendmail ]; then \
${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
fi
- @${ECHO_MSG} "===> Replacing newaliases"
+ @${ECHO_MSG} '===> Replacing newaliases'
@if [ -e /usr/bin/newaliases ]; then \
${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
${CHMOD} 0 /usr/bin/newaliases.OFF; \
diff -ruN postfix.old/patches/patch-aa postfix/patches/patch-aa
--- postfix.old/patches/patch-aa Mon Mar 29 15:15:08 1999
+++ postfix/patches/patch-aa Mon Apr 3 18:46:07 2000
@@ -1,36 +1,20 @@
-*** global/mail_params.h.orig Sat Mar 20 15:09:46 1999
---- global/mail_params.h Sat Mar 20 15:10:46 1999
-***************
-*** 127,133 ****
- */
- #define VAR_PROGRAM_DIR "program_directory"
- #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR "/usr/libexec/postfix"
- #endif
-
- #define VAR_DAEMON_DIR "daemon_directory"
---- 127,133 ----
- */
- #define VAR_PROGRAM_DIR "program_directory"
- #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR "!!PREFIX!!/libexec/postfix"
- #endif
-
- #define VAR_DAEMON_DIR "daemon_directory"
-***************
-*** 161,167 ****
- */
- #define VAR_CONFIG_DIR "config_directory"
- #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR "/etc/postfix"
- #endif
- extern char *var_config_dir;
-
---- 161,167 ----
- */
- #define VAR_CONFIG_DIR "config_directory"
- #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
-
+--- global/mail_params.h.orig Sun Mar 26 17:45:16 2000
++++ global/mail_params.h Mon Apr 3 18:45:22 2000
+@@ -153,7 +153,7 @@
+ */
+ #define VAR_PROGRAM_DIR "program_directory"
+ #ifndef DEF_PROGRAM_DIR
+-#define DEF_PROGRAM_DIR "/usr/libexec/postfix"
++#define DEF_PROGRAM_DIR "!!PREFIX!!/libexec/postfix"
+ #endif
+
+ #define VAR_DAEMON_DIR "daemon_directory"
+@@ -187,7 +187,7 @@
+ */
+ #define VAR_CONFIG_DIR "config_directory"
+ #ifndef DEF_CONFIG_DIR
+-#define DEF_CONFIG_DIR "/etc/postfix"
++#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix"
+ #endif
+ extern char *var_config_dir;
+
diff -ruN postfix.old/patches/patch-ba postfix/patches/patch-ba
--- postfix.old/patches/patch-ba Mon Mar 29 15:15:09 1999
+++ postfix/patches/patch-ba Mon Apr 3 18:47:07 2000
@@ -1,19 +1,11 @@
-*** man/man1/postdrop.1.orig Mon Mar 29 22:35:14 1999
---- man/man1/postdrop.1 Mon Mar 29 22:35:25 1999
-***************
-*** 51,57 ****
- .na
- .nf
- /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
---- 51,57 ----
- .na
- .nf
- /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+--- man/man1/postdrop.1.orig Mon May 3 15:03:29 1999
++++ man/man1/postdrop.1 Mon Apr 3 18:45:22 2000
+@@ -51,7 +51,7 @@
+ .na
+ .nf
+ /var/spool/postfix, mail queue
+-/etc/postfix, configuration files
++!!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+ .na
+ .nf
diff -ruN postfix.old/patches/patch-bb postfix/patches/patch-bb
--- postfix.old/patches/patch-bb Mon Mar 29 15:15:09 1999
+++ postfix/patches/patch-bb Mon Apr 3 18:47:52 2000
@@ -1,36 +1,20 @@
-*** man/man1/sendmail.1.orig Mon Mar 29 22:35:30 1999
---- man/man1/sendmail.1 Mon Mar 29 22:35:44 1999
-***************
-*** 60,66 ****
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
---- 60,66 ----
- \fBjust-send-eight\fR.
- .IP "\fB-C \fIconfig_file\fR (ignored :-)"
- The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
- .IP "\fB-F \fIfull_name\fR
- Set the sender full name. This is used only with messages that
- have no \fBFrom:\fR message header.
-***************
-*** 164,170 ****
- .na
- .nf
- /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
---- 164,170 ----
- .na
- .nf
- /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
- .SH CONFIGURATION PARAMETERS
- .na
- .nf
+--- man/man1/sendmail.1.orig Thu Mar 30 10:46:10 2000
++++ man/man1/sendmail.1 Mon Apr 3 18:45:22 2000
+@@ -61,7 +61,7 @@
+ \fBjust-send-eight\fR.
+ .IP "\fB-C \fIconfig_file\fR (ignored :-)"
+ The path name of the \fBsendmail.cf\fR file. Postfix configuration
+-files are kept in \fB/etc/postfix\fR.
++files are kept in \fB!!PREFIX!!/etc/postfix\fR.
+ .IP "\fB-F \fIfull_name\fR
+ Set the sender full name. This is used only with messages that
+ have no \fBFrom:\fR message header.
+@@ -171,7 +171,7 @@
+ .na
+ .nf
+ /var/spool/postfix, mail queue
+-/etc/postfix, configuration files
++!!PREFIX!!/etc/postfix, configuration files
+ .SH CONFIGURATION PARAMETERS
+ .na
+ .nf
diff -ruN postfix.old/patches/patch-bc postfix/patches/patch-bc
--- postfix.old/patches/patch-bc Mon Mar 29 15:15:09 1999
+++ postfix/patches/patch-bc Mon Apr 3 18:48:43 2000
@@ -1,19 +1,11 @@
-*** man/man5/access.5.orig Mon Mar 29 22:35:58 1999
---- man/man5/access.5 Mon Mar 29 22:36:13 1999
-***************
-*** 8,14 ****
- .SH SYNOPSIS
- .na
- .nf
-! \fBpostmap /etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
---- 8,14 ----
- .SH SYNOPSIS
- .na
- .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
- .SH DESCRIPTION
- .ad
- .fi
+--- man/man5/access.5.orig Fri Dec 11 13:55:52 1998
++++ man/man5/access.5 Mon Apr 3 18:45:22 2000
+@@ -8,7 +8,7 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBpostmap /etc/postfix/access\fR
++\fBpostmap !!PREFIX!!/etc/postfix/access\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
diff -ruN postfix.old/patches/patch-bd postfix/patches/patch-bd
--- postfix.old/patches/patch-bd Mon Mar 29 15:15:09 1999
+++ postfix/patches/patch-bd Mon Apr 3 18:49:24 2000
@@ -1,19 +1,11 @@
-*** man/man5/canonical.5.orig Mon Mar 29 22:36:25 1999
---- man/man5/canonical.5 Mon Mar 29 22:36:32 1999
-***************
-*** 8,14 ****
- .SH SYNOPSIS
- .na
- .nf
-! \fBpostmap /etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
---- 8,14 ----
- .SH SYNOPSIS
- .na
- .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
- .SH DESCRIPTION
- .ad
- .fi
+--- man/man5/canonical.5.orig Sun Sep 5 23:13:32 1999
++++ man/man5/canonical.5 Mon Apr 3 18:45:22 2000
+@@ -8,7 +8,7 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBpostmap /etc/postfix/canonical\fR
++\fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
diff -ruN postfix.old/patches/patch-be postfix/patches/patch-be
--- postfix.old/patches/patch-be Mon Mar 29 15:15:09 1999
+++ postfix/patches/patch-be Mon Apr 3 18:49:41 2000
@@ -1,19 +1,11 @@
-*** man/man5/relocated.5.orig Mon Mar 29 22:36:36 1999
---- man/man5/relocated.5 Mon Mar 29 22:36:47 1999
-***************
-*** 8,14 ****
- .SH SYNOPSIS
- .na
- .nf
-! \fBpostmap /etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
---- 8,14 ----
- .SH SYNOPSIS
- .na
- .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
- .SH DESCRIPTION
- .ad
- .fi
+--- man/man5/relocated.5.orig Sun Sep 5 23:13:33 1999
++++ man/man5/relocated.5 Mon Apr 3 18:45:22 2000
+@@ -8,7 +8,7 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBpostmap /etc/postfix/relocated\fR
++\fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
diff -ruN postfix.old/patches/patch-bf postfix/patches/patch-bf
--- postfix.old/patches/patch-bf Mon Mar 29 15:15:09 1999
+++ postfix/patches/patch-bf Mon Apr 3 18:50:20 2000
@@ -1,19 +1,11 @@
-*** man/man5/virtual.5.orig Mon Mar 29 22:36:55 1999
---- man/man5/virtual.5 Mon Mar 29 22:37:02 1999
-***************
-*** 8,14 ****
- .SH SYNOPSIS
- .na
- .nf
-! \fBpostmap /etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
---- 8,14 ----
- .SH SYNOPSIS
- .na
- .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
- .SH DESCRIPTION
- .ad
- .fi
+--- man/man5/virtual.5.orig Mon Dec 20 21:00:51 1999
++++ man/man5/virtual.5 Mon Apr 3 18:45:22 2000
+@@ -8,7 +8,7 @@
+ .SH SYNOPSIS
+ .na
+ .nf
+-\fBpostmap /etc/postfix/virtual\fR
++\fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
+ .SH DESCRIPTION
+ .ad
+ .fi
diff -ruN postfix.old/patches/patch-bg postfix/patches/patch-bg
--- postfix.old/patches/patch-bg Mon Mar 29 15:15:09 1999
+++ postfix/patches/patch-bg Mon Apr 3 18:50:44 2000
@@ -1,19 +1,11 @@
-*** man/man8/local.8.orig Mon Mar 29 22:37:14 1999
---- man/man8/local.8 Mon Mar 29 22:37:44 1999
-***************
-*** 75,81 ****
- .ad
- .fi
- The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
- the location can be specified with the \fBmail_spool_directory\fR
- configuration parameter.
-
---- 75,81 ----
- .ad
- .fi
- The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
- the location can be specified with the \fBmail_spool_directory\fR
- configuration parameter.
-
+--- man/man8/local.8.orig Sun Sep 5 23:13:31 1999
++++ man/man8/local.8 Mon Apr 3 18:45:22 2000
+@@ -94,7 +94,7 @@
+ .ad
+ .fi
+ The default per-user mailbox is a file in the UNIX mail spool
+-directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
++directory (\fB/var/mail/\fIuser\fR);
+ the location can be specified with the \fBmail_spool_directory\fR
+ configuration parameter.
+
diff -ruN postfix.old/patches/patch-bh postfix/patches/patch-bh
--- postfix.old/patches/patch-bh Mon Mar 29 15:15:09 1999
+++ postfix/patches/patch-bh Mon Apr 3 18:51:13 2000
@@ -1,21 +1,13 @@
-*** man/man8/cleanup.8.orig Mon Mar 29 22:37:59 1999
---- man/man8/cleanup.8 Mon Mar 29 22:38:13 1999
-***************
-*** 118,125 ****
- .SH FILES
- .na
- .nf
-! /etc/postfix/canonical*, canonical mapping table
-! /etc/postfix/virtual*, virtual mapping table
- .SH LICENSE
- .na
- .nf
---- 118,125 ----
- .SH FILES
- .na
- .nf
-! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
- .SH LICENSE
- .na
- .nf
+--- man/man8/cleanup.8.orig Thu Mar 30 10:46:10 2000
++++ man/man8/cleanup.8 Mon Apr 3 18:45:22 2000
+@@ -120,8 +120,8 @@
+ .SH FILES
+ .na
+ .nf
+-/etc/postfix/canonical*, canonical mapping table
+-/etc/postfix/virtual*, virtual mapping table
++!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
++!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
+ .SH LICENSE
+ .na
+ .nf
diff -ruN postfix.old/patches/patch-bi postfix/patches/patch-bi
--- postfix.old/patches/patch-bi Mon Mar 29 15:15:09 1999
+++ postfix/patches/patch-bi Mon Apr 3 18:51:57 2000
@@ -1,21 +1,13 @@
-*** man/man8/master.8.orig Mon Mar 29 22:38:17 1999
---- man/man8/master.8 Mon Mar 29 22:38:46 1999
-***************
-*** 116,123 ****
- .SH FILES
- .na
- .nf
-! /etc/postfix/main.cf: global configuration file.
-! /etc/postfix/master.cf: master process configuration file.
- /var/spool/postfix/pid/master.pid: master lock file.
- .SH SEE ALSO
- .na
---- 116,123 ----
- .SH FILES
- .na
- .nf
-! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
-! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
- /var/spool/postfix/pid/master.pid: master lock file.
- .SH SEE ALSO
- .na
+--- man/man8/master.8.orig Thu Nov 4 20:58:51 1999
++++ man/man8/master.8 Mon Apr 3 18:45:22 2000
+@@ -118,8 +118,8 @@
+ .SH FILES
+ .na
+ .nf
+-/etc/postfix/main.cf: global configuration file.
+-/etc/postfix/master.cf: master process configuration file.
++!!PREFIX!!/etc/postfix/main.cf: global configuration file.
++!!PREFIX!!/etc/postfix/master.cf: master process configuration file.
+ /var/spool/postfix/pid/master.pid: master lock file.
+ .SH SEE ALSO
+ .na
diff -ruN postfix.old/pkg/INSTALL postfix/pkg/INSTALL
--- postfix.old/pkg/INSTALL Mon Feb 14 02:33:53 2000
+++ postfix/pkg/INSTALL Mon Apr 3 16:33:58 2000
@@ -1,8 +1,8 @@
#!/bin/sh
-user=postfix
-group=postfix
-group2=maildrop
+user=postfix; uid=25
+group=postfix; gid=25
+group2=maildrop;gid2=24
ask() {
local question default answer
@@ -39,7 +39,7 @@
else
echo "You need a group \"${group}\"."
if yesno "Would you like me to create it" y; then
- pw groupadd ${group} -h - || exit
+ pw groupadd ${group} -g ${gid} -h - || exit
echo "Done."
else
echo "Please create it, and try again."
@@ -52,7 +52,7 @@
else
echo "You need a group \"${group2}\"."
if yesno "Would you like me to create it" y; then
- pw groupadd ${group2} -h - || exit
+ pw groupadd ${group2} -g ${gid2} -h - || exit
echo "Done."
else
echo "Please create it, and try again."
@@ -65,8 +65,8 @@
else
echo "You need a user \"${user}\"."
if yesno "Would you like me to create it" y; then
- pw useradd ${user} -g ${group} -h - -d /nonexistent \
- -s /nonexistent -c "Postfix Mail System" || exit
+ pw useradd ${user} -u ${uid} -g ${group} -h - -d / \
+ -s /sbin/nologin -c "Postfix Secure Mailer" || exit
echo "Done."
else
echo "Please create it, and try again."
@@ -86,5 +86,5 @@
${PKG_PREFIX}/etc/postfix/master.cf
fi
chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
- chmod 2755 ${PKG_PREFIX}/sbin/postdrop
+ chmod 2555 ${PKG_PREFIX}/sbin/postdrop
fi
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000404000147.3041696D9>