Ticket #1446: postfix.4.diff

File postfix.4.diff, 6.8 KB (added by pguyot (Paul Guyot), 21 years ago)

Fixed the BIND8 compat issue

  • Portfile

    RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/mail/postfix/Portfile,v
    retrieving revision 1.16
    diff -u -r1.16 Portfile
     
    22
    33PortSystem      1.0
    44name            postfix
    5 version         2.0.14
     5version         2.0.17
    66categories      mail
    77maintainers     charlie@rubberduck.com 
    88description     Fast and robust mail transfer agent
     
    1313                        Postfix act as delivery daemon for ezmlm-idx.
    1414homepage        http://www.postfix.org/
    1515platforms       darwin
    16 checksums       md5 d0f1d1382958f3ce918d4d690be22229
     16checksums       md5 482e3912e4e910bd62f1a2d74bfa3b77
    1717master_sites    ftp://ftp.tau.ac.il/pub/unix/mail/postfix/official/ \
    1818                http://postfix.problemlos.ch/release/official/ \
    1919                ftp://ftp.matrix.com.br/pub/postfix/official/ \
     
    2121                ftp://ftp.club-internet.fr/pub/mirrors/ftp.porcupine.org/postfix-release/official/ \
    2222                ftp://ftp.doc.cs.univ-paris8.fr/mirrors/ftp.porcupine.org/postfix-release/official/
    2323patchfiles      patch-access.5 patch-flush.8 patch-master.8 \
    24                 patch-regexp_table.5 patch-sys_defs.h patch-canonical.5 \
     24                                patch-regexp_table.5 patch-sys_defs.h patch-canonical.5 \
    2525                patch-mail_params.h patch-pcre_table.5 patch-postdrop.1 \
    2626                patch-postqueue.1 patch-relocated.5 patch-transport.5 \
    2727                patch-cleanup.8 patch-main.cf patch-postfix-install \
     
    7272        file mkdir ${destroot}${prefix}/sbin
    7373        file mkdir ${destroot}${prefix}/man
    7474        file mkdir ${destroot}${prefix}/share/postfix
    75         system "install -d -g postdrop ${destroot}${prefix}/var/spool/postfix/public"
    76         system "install -d -g postdrop ${destroot}${prefix}/var/spool/postfix/maildrop"
     75        xinstall -d -o postfix -g postdrop ${destroot}${prefix}/var/spool/postfix/public
     76        xinstall -d -o postfix -g postdrop ${destroot}${prefix}/var/spool/postfix/maildrop
     77        # Add turd files to avoid these directories to be deleted.
     78        system "touch ${destroot}${prefix}/var/spool/postfix/public/.turd"
     79        system "chown postfix:postdrop ${destroot}${prefix}/var/spool/postfix/public/.turd"
     80        system "touch ${destroot}${prefix}/var/spool/postfix/maildrop/.turd"
     81        system "chown postfix:postdrop ${destroot}${prefix}/var/spool/postfix/maildrop/.turd"
    7782        system "/bin/sh postfix-install -non-interactive \
    7883                install_root=${destroot} \
    7984                config_directory=${prefix}/etc/postfix \
     
    8691                mailq_path=${prefix}/bin/mailq \
    8792                sample_directory=${prefix}/share/postfix/sample \
    8893                readme_directory=${prefix}/share/postfix/readme"
    89         system "install -o root -m 755 -d ${destroot}${prefix}/etc/rc.d"
    90         system "install -o root -m 755 -c \
    91                 ${portpath}/files/postfix.sh ${destroot}${prefix}/etc/rc.d"
     94        xinstall -m 755 -d ${destroot}${prefix}/etc/rc.d
     95        xinstall -m 755 -c ${portpath}/files/postfix.sh ${destroot}${prefix}/etc/rc.d
    9296        reinplace "s|__PREFIX|${prefix}|g" \
    9397                ${destroot}${prefix}/etc/rc.d/postfix.sh
    9498}
     
    102106                ${destroot}${prefix}/etc/postfix/master.cf.sample
    103107        file rename ${destroot}${prefix}/etc/postfix/aliases \
    104108                ${destroot}${prefix}/etc/postfix/aliases.sample
     109}
     110
     111post-install {
     112        # Tell the user about the renaming of the configuration files.
     113        ui_msg "To get postfix working, you need to copy sample configuration "
     114        ui_msg "files and to edit them (${prefix}/etc/postfix/*.sample)."
     115        ui_msg "You may also want to turn your system's MTA off."
    105116}
  • files/patch-main.cf

    RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/mail/postfix/files/patch-main.cf,v
    retrieving revision 1.2
    diff -u -r1.2 patch-main.cf
     
    1 --- conf/main.cf        Sat Jun 21 13:20:30 2003
    2 +++ conf/main.cf.new    Sat Jun 21 13:22:23 2003
     1--- conf/main.cf.old    Sat Jan 31 22:49:08 2004
     2+++ conf/main.cf        Sat Jan 31 22:50:21 2004
    33@@ -26,18 +26,23 @@
    44 # See the files in examples/chroot-setup for setting up Postfix chroot
    55 # environments on different UNIX systems.
     
    3636 
    3737 # INTERNET HOST AND DOMAIN NAMES
    3838 #
    39 @@ -252,7 +257,7 @@
     39@@ -255,7 +260,7 @@
    4040 #
    4141 #mynetworks = 168.100.189.0/28, 127.0.0.0/8
    4242 #mynetworks = $config_directory/mynetworks
     
    4545 
    4646 # The relay_domains parameter restricts what destinations this system will
    4747 # relay mail to.  See the smtpd_recipient_restrictions restriction in the
    48 @@ -316,7 +321,7 @@
     48@@ -319,7 +324,7 @@
    4949 # In the left-hand side, specify an @domain.tld wild-card, or specify
    5050 # a user@domain.tld address.
    5151 #
     
    5454 
    5555 # INPUT RATE CONTROL
    5656 #
    57 @@ -511,7 +516,7 @@
     57@@ -376,6 +381,8 @@
     58 # It will take a minute or so before changes become visible.  Use
     59 # "postfix reload" to eliminate the delay.
     60 #
     61+# netinfo only works on Darwin < 7 and MacOS X < Panther.
     62+#
     63 #alias_maps = dbm:/etc/aliases
     64 #alias_maps = hash:/etc/aliases
     65 #alias_maps = hash:/etc/aliases, nis:mail.aliases
     66@@ -514,7 +521,7 @@
    5867 #
    5968 # For details, see the sample-filter.cf file.
    6069 #
     
    6372 
    6473 # FAST ETRN SERVICE
    6574 #
    66 @@ -602,27 +607,27 @@
     75@@ -605,27 +612,27 @@
    6776 # sendmail_path: The full pathname of the Postfix sendmail command.
    6877 # This is the Sendmail-compatible mail posting interface.
    6978 #
  • files/patch-sys_defs.h

    RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/mail/postfix/files/patch-sys_defs.h,v
    retrieving revision 1.2
    diff -u -r1.2 patch-sys_defs.h
     
    1 --- src/util/sys_defs.h Tue Jun 10 02:11:56 2003
    2 +++ src/util/sys_defs.h.new     Sat Jun 21 13:16:27 2003
    3 @@ -88,10 +88,10 @@
     1--- src/util/sys_defs.h.old     Sat Jan 31 22:45:53 2004
     2+++ src/util/sys_defs.h Sat Jan 31 22:46:56 2004
     3@@ -88,10 +88,8 @@
    44 #define HAS_FSYNC
    55 #define HAS_DB
    66 #define HAS_SA_LEN
    77-#define DEF_DB_TYPE    "hash"
    88-#define ALIAS_DB_MAP   "hash:/etc/aliases"
    9 +#define DEF_DB_TYPE    "netinfo"
    10 +#define ALIAS_DB_MAP   "netinfo:/aliases"
    119 #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
    1210-#define ROOT_PATH      "/bin:/usr/bin:/sbin:/usr/sbin"
    1311+#define ROOT_PATH      "/bin:/usr/bin:/sbin:/usr/sbin:__PREFIX/bin:__PREFIX/sbin"
    1412 #define USE_STATFS
    1513 #define STATFS_IN_SYS_MOUNT_H
    1614 #define HAS_POSIX_REGEXP
    17 @@ -99,11 +99,11 @@
    18  #define PRINTFLIKE(x,y)
     15@@ -100,12 +98,17 @@
    1916 #define SCANFLIKE(x,y)
     17 #ifndef NO_NETINFO
    2018 #define HAS_NETINFO
     19+#define DEF_DB_TYPE    "netinfo"
     20+#define ALIAS_DB_MAP   "netinfo:/aliases"
     21+#else
     22+#define DEF_DB_TYPE    "hash"
     23+#define ALIAS_DB_MAP   "hash:/etc/aliases"
     24 #endif
    2125-#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
    2226-#define NATIVE_MAILQ_PATH "/usr/bin/mailq"
    2327-#define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"