[37338] trunk/dports/mail/postfix

markd at macports.org markd at macports.org
Tue Jun 3 12:53:50 PDT 2008


Revision: 37338
          http://trac.macosforge.org/projects/macports/changeset/37338
Author:   markd at macports.org
Date:     2008-06-03 12:53:48 -0700 (Tue, 03 Jun 2008)

Log Message:
-----------
Update to 2.5.2 with maintainer permission.

Modified Paths:
--------------
    trunk/dports/mail/postfix/Portfile

Removed Paths:
-------------
    trunk/dports/mail/postfix/files/patch-main.cf

Modified: trunk/dports/mail/postfix/Portfile
===================================================================
--- trunk/dports/mail/postfix/Portfile	2008-06-03 19:52:04 UTC (rev 37337)
+++ trunk/dports/mail/postfix/Portfile	2008-06-03 19:53:48 UTC (rev 37338)
@@ -3,9 +3,9 @@
 PortSystem  1.0
 
 name            postfix
-version         2.4.6
+version         2.5.2
 categories      mail
-maintainers     wms
+maintainers     wms openmaintainer
 description     Fast and robust mail transfer agent
 long_description    Postfix attempts to be fast, easy to administer, and \
             secure, while at the same time being \
@@ -14,13 +14,13 @@
             Postfix act as delivery daemon for ezmlm-idx.
 homepage        http://www.postfix.org/
 platforms       darwin
-checksums       md5 303327f66c13ff9631734651ee184a88 \
-                sha1 226222707fd8d963d3173070cac96370c453ffa7
+checksums       md5 b0965aea4d548d9bd231af7143aa6942 \
+                sha1 6589c590b2e2a955bce5615bde1a86c37c572ce0
 master_sites    http://www.swissrave.ch/mirror/postfix-source/official/ \
     ftp://ftp.its.cz/MIRRORS/ftp.porcupine.org/mirrors/postfix-release/official/ \
     ftp://ftp.club-internet.fr/pub/mirrors/ftp.porcupine.org/postfix-release/official/
 
-patchfiles     patch-sys_defs.h patch-main.cf patch-mail_params.h patch-postfix-install
+patchfiles     patch-sys_defs.h patch-mail_params.h patch-postfix-install
 
 post-patch {
      eval reinplace "s|/etc/|${prefix}/etc/|g" \
@@ -29,13 +29,34 @@
           [glob ${worksrcpath}/man/man8/*]
 
      reinplace "s|__PREFIX|${prefix}|g" ${worksrcpath}/src/util/sys_defs.h
-     reinplace "s|__PREFIX|${prefix}|g" ${worksrcpath}/conf/main.cf
      reinplace "s|__PREFIX|${prefix}|g" ${worksrcpath}/src/global/mail_params.h
+
+# Set main.cf default values
+     reinplace "s|#default_privs|default_privs|g" \
+          ${worksrcpath}/conf/main.cf
+     reinplace "s|/etc/postfix/network_table|${prefix}/etc/postfix/network_table|g" \
+          ${worksrcpath}/conf/main.cf
+     reinplace "s|/etc/postfix/relay_recipients|${prefix}/etc/postfix_relay_recipients|g" \
+          ${worksrcpath}/conf/main.cf
+     reinplace "s|/etc/postfix/header_checks|${prefix}/etc/postfix/header_checks|g" \
+          ${worksrcpath}/conf/main.cf
+     reinplace "s|PATH=/bin:/usr/bin|PATH=${prefix}/bin:/bin:/usr/bin|g" \
+          ${worksrcpath}/conf/main.cf
 }
 
 set CCARGS  -DNO_PCRE
 set AUXLIBS "-L${prefix}/lib -R${prefix}/lib -L${prefix}/lib"
+set pf_mail_owner "postfix"
+set pf_setgid_group "postdrop"
 
+# Beginning with Mac OS X 10.5, the user 'postfix' changed to '_postfix'
+platform darwin 9 {
+    global pf_mail_owner
+    global pf_setgid_group
+    set pf_mail_owner "_postfix"
+    set pf_setgid_group "_postdrop"
+}
+
 configure {
     system "make makefiles CCARGS=\"${CCARGS}\" AUXLIBS=\"${AUXLIBS}\""
 }
@@ -47,40 +68,46 @@
 startupitem.stop        "${prefix}/sbin/${name} stop"
 
 destroot {
-    adduser postfix realname=Postfix\ Server
-    addgroup postdrop
-    file mkdir ${destroot}${prefix}/etc/postfix
-    file mkdir ${destroot}${prefix}/share/postfix
-    xinstall -d -o postfix -g postdrop -m \
-        710 ${destroot}${prefix}/var/spool/postfix/public
-    xinstall -d -o postfix -g postdrop -m 730 \
-        ${destroot}${prefix}/var/spool/postfix/maildrop
+#    adduser postfix realname=Postfix\ Server
+#    addgroup postdrop
+#    file mkdir ${destroot}${prefix}/etc/postfix
+#    file mkdir ${destroot}${prefix}/share/postfix
+#    xinstall -d -o postfix -g postdrop -m \
+#        710 ${destroot}${prefix}/var/spool/postfix/public
+#    xinstall -d -o postfix -g postdrop -m 730 \
+#        ${destroot}${prefix}/var/spool/postfix/maildrop
     destroot.keepdirs ${destroot}${prefix}/var/spool/postfix/public \
-        ${destroot}${prefix}/var/spool/postfix/maildrop
+        ${destroot}${prefix}/var/spool/postfix/maildrop \
+        ${destroot}${prefix}/var/lib/postfix
     system "cd ${worksrcpath} && /bin/sh postfix-install -non-interactive \
         install_root=${destroot} \
         config_directory=${prefix}/etc/postfix \
+        queue_directory=${prefix}/var/spool/postfix \
+        command_directory=${prefix}/sbin \
         daemon_directory=${prefix}/libexec/postfix \
-        command_directory=${prefix}/sbin \
-        manpage_directory=${prefix}/share/man \
-        queue_directory=${prefix}/var/spool/postfix \
+        data_directory=${prefix}/var/lib/postfix \
         sendmail_path=${prefix}/sbin/sendmail \
         newaliases_path=${prefix}/bin/newaliases \
         mailq_path=${prefix}/bin/mailq \
+        etc_directory=${prefix}/etc/postfix \
+        share_directory=${prefix}/share/postfix \
+        manpage_directory=${prefix}/share/man \
         sample_directory=${prefix}/share/postfix/sample \
-        readme_directory=${prefix}/share/postfix/readme"
-}
+        readme_directory=${prefix}/share/postfix/readme \
+        mail_owner=${pf_mail_owner} \
+        setgid_group=${pf_setgid_group}"
+
 # This makes sure we don't overwrite user /etc files. This now breaks postfix
 # "just working" on fresh installs.
 # YOU MUST MOVE THE SAMPLE FILES TO THE CORRECT NAMESPACE.
-# XXX unsure if this stilll an issue 07/07/05 yeled@
-post-destroot {
-    file rename ${destroot}${prefix}/etc/postfix/main.cf \
-        ${destroot}${prefix}/etc/postfix/main.cf.sample
-    file rename ${destroot}${prefix}/etc/postfix/master.cf \
-        ${destroot}${prefix}/etc/postfix/master.cf.sample
-    file rename ${destroot}${prefix}/etc/postfix/aliases \
-        ${destroot}${prefix}/etc/postfix/aliases.sample
+# XXX unsure if this still an issue 07/07/05 yeled@
+
+        file rename ${destroot}${prefix}/etc/postfix/main.cf \
+            ${destroot}${prefix}/etc/postfix/main.cf.sample
+        file rename ${destroot}${prefix}/etc/postfix/master.cf \
+            ${destroot}${prefix}/etc/postfix/master.cf.sample
+        file rename ${destroot}${prefix}/etc/postfix/aliases \
+            ${destroot}${prefix}/etc/postfix/aliases.sample
 }
 
 post-install {

Deleted: trunk/dports/mail/postfix/files/patch-main.cf
===================================================================
--- trunk/dports/mail/postfix/files/patch-main.cf	2008-06-03 19:52:04 UTC (rev 37337)
+++ trunk/dports/mail/postfix/files/patch-main.cf	2008-06-03 19:53:48 UTC (rev 37338)
@@ -1,112 +0,0 @@
---- conf/main.cf	Sat Mar  5 04:48:25 2005
-+++ conf/main.cf.new	Thu Jul  7 11:46:21 2005
-@@ -27,18 +27,24 @@
- # See the files in examples/chroot-setup for setting up Postfix chroot
- # environments on different UNIX systems.
- #
--queue_directory = /var/spool/postfix
-+queue_directory = __PREFIX/var/spool/postfix
- 
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = __PREFIX/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = __PREFIX/libexec/postfix
-+
-+# Shared files and etc directory (for dports)
-+etc_directory = __PREFIX/etc/postfix
-+share_directory = __PREFIX/share/postfix
-+man_directory = __PREFIX/man
-+
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -56,7 +62,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
-@@ -252,7 +258,7 @@
- #
- #mynetworks = 168.100.189.0/28, 127.0.0.0/8
- #mynetworks = $config_directory/mynetworks
--#mynetworks = hash:/etc/postfix/network_table
-+#mynetworks = hash:__PREFIX/etc/postfix/network_table
- 
- # The relay_domains parameter restricts what destinations this system will
- # relay mail to.  See the smtpd_recipient_restrictions description in
-@@ -317,7 +323,7 @@
- # In the left-hand side, specify an @domain.tld wild-card, or specify
- # a user at domain.tld address.
- # 
--#relay_recipient_maps = hash:/etc/postfix/relay_recipients
-+#relay_recipient_maps = hash:__PREFIX/etc/postfix/relay_recipients
- 
- # INPUT RATE CONTROL
- #
-@@ -510,7 +516,7 @@
- #
- # For details, see "man header_checks".
- #
--#header_checks = regexp:/etc/postfix/header_checks
-+#header_checks = regexp:__PREFIX/etc/postfix/header_checks
- 
- # FAST ETRN SERVICE
- #
-@@ -579,7 +585,7 @@
- # set up your XAUTHORITY environment variable before starting Postfix.
- #
- debugger_command =
--	 PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-+	 PATH=__PREFIX/bin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
- 	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
- 
- # If you can't use X, use this to capture the call stack when a
-@@ -608,23 +614,23 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = __PREFIX/bin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = __PREFIX/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = __PREFIX/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = postdrop
- 
- # html_directory: The location of the Postfix HTML documentation.
- #
-@@ -632,7 +638,7 @@
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = __PREFIX/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080603/0fa35fa9/attachment-0001.htm 


More information about the macports-changes mailing list