Date: Tue, 15 Mar 2005 18:50:06 GMT From: Marcus Grando <marcus@corp.grupos.com.br> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/78852: Update port: mail/postfix to 2.2.0 Message-ID: <200503151850.j2FIo6VP074463@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/78852; it has been noted by GNATS. From: Marcus Grando <marcus@corp.grupos.com.br> To: freebsd-gnats-submit@FreeBSD.org, vivek@khera.org Cc: Subject: Re: ports/78852: Update port: mail/postfix to 2.2.0 Date: Tue, 15 Mar 2005 15:42:26 -0300 This is a multi-part message in MIME format. --------------030702040101010509070607 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Update port: mail/postfix to 2.2.1 - Update to 2.2.1 - Remake all patches - Backport many changes from postfix-current - Update SPF and VDA patches * Patch attached. Removed files: files/patch-ec files/patch-main.cf files/patch-post-install files/patch-src::util::sys_defs.h Add files: files/patch-conf::main.cf files/patch-conf::post-install files/patch-makedefs files/patch-src::global::mail_params.h -- Marcus Grando Grupos Internet S/A marcus(at)corp.grupos.com.br --------------030702040101010509070607 Content-Type: text/plain; name="postfix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="postfix.patch" diff -ruN postfix.orig/Makefile postfix/Makefile --- postfix.orig/Makefile Sat Nov 27 00:15:57 2004 +++ postfix/Makefile Tue Mar 15 15:28:00 2005 @@ -14,60 +14,44 @@ # NOTE: PCRE is enabled by default unless you specifically disable it. -PORTNAME= postfix -PORTVERSION= 2.1.5 -PORTREVISION= 1 -PORTEPOCH= 1 -CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ - ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ - ftp://ftp.tux.org/pub/net/postfix/official/ \ - ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ - ftp://ftp.samurai.com/pub/postfix/official/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} +PORTNAME= postfix +PORTVERSION= 2.2.1 +PORTREVISION= 0 +PORTEPOCH= 1 +CATEGORIES= mail ipv6 +MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ + ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ + ftp://ftp.tux.org/pub/net/postfix/official/ \ + ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ + ftp://ftp.samurai.com/pub/postfix/official/ \ + ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix -DISTNAME= postfix-${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} +DISTNAME= postfix-${PORTVERSION} +DIST_SUBDIR= ${PORTNAME} -MAINTAINER= vivek@khera.org -COMMENT= A secure alternative to widely-used Sendmail +MAINTAINER= vivek@khera.org +COMMENT= A secure alternative to widely-used Sendmail -CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* -USE_SUBMAKE= yes -USE_REINPLACE= yes - -MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ - postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ - postsuper.1 sendmail.1 - -MAN5= access.5 aliases.5 canonical.5 cidr_table.5 ldap_table.5 \ - mysql_table.5 pgsql_table.5 postconf.5 pcre_table.5 \ - regexp_table.5 relocated.5 transport.5 virtual.5 \ - header_checks.5 body_checks.5 - -MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ - master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \ - smtp.8 smtpd.8 spawn.8 trace.8 trivial-rewrite.8 verify.8 virtual.8 - -# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to -# patch it. -MAN8base=$(MAN8:S/tlsmgr.8//) - -CONF1= main.cf master.cf access aliases canonical header_checks relocated \ - transport virtual - -README= ADDRESS_CLASS_README ADDRESS_REWRITING_README \ - ADDRESS_VERIFICATION_README BACKSCATTER_README \ - BASIC_CONFIGURATION_README BUILTIN_FILTER_README \ - CONTENT_INSPECTION_README CYRUS_README DATABASE_README DB_README \ - DEBUG_README ETRN_README FILTER_README INSTALL LDAP_README \ - LINUX_README LMTP_README LOCAL_RECIPIENT_README MAILDROP_README \ - MYSQL_README NFS_README OVERVIEW PACKAGE_README PCRE_README \ - PGSQL_README QMQP_README QSHAPE_README RESTRICTION_CLASS_README \ - SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \ - SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \ - ULTRIX_README UUCP_README VERP_README VIRTUAL_README \ - XCLIENT_README XFORWARD_README +CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ + sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* +USE_SUBMAKE= yes +USE_REINPLACE= yes + +MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 \ + postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 + +MAN5= access.5 aliases.5 body_checks.5 canonical.5 cidr_table.5 generic.5 \ + header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \ + pcre_table.5 pgsql_table.5 postconf.5 regexp_table.5 relocated.5 \ + transport.5 virtual.5 + +MAN8= anvil.8 bounce.8 cleanup.8 defer.8 discard.8 error.8 flush.8 lmtp.8 \ + local.8 master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 \ + scache.8 showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trace.8 trivial-rewrite.8 \ + verify.8 virtual.8 + +CONF1= access aliases canonical generic header_checks main.cf master.cf \ + relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= @@ -101,28 +85,16 @@ ${ECHO} "all: default" >> Makefile) pre-patch: - ${ECHO} "<body>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY>" > ${WRKSRC}/html/body_checks.5.html -.for file in ${MAN1} - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html -.endfor -.for file in ${MAN5} - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html -.endfor -.for file in ${MAN8base} - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html -.endfor -.for file in ${README} - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/html/${file}.html - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ - ${WRKSRC}/README_FILES/${file} -.endfor -.for file in ${CONF1} - @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} -.endfor + @${ECHO} "<body>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY>" > ${WRKSRC}/html/body_checks.5.html + @for f in `${FIND} -P ${WRKSRC}/man -type f`; do \ + ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ + done + @for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \ + ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ + done + @for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \ + ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ + done pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -135,22 +107,22 @@ do-install: cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ - config_directory=${PREFIX}/etc/postfix \ - daemon_directory=${PREFIX}/libexec/postfix \ - command_directory=${PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PREFIX}/sbin/sendmail \ - newaliases_path=${PREFIX}/bin/newaliases \ - mailq_path=${PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PREFIX}/man \ - sample_directory=${PREFIX}/etc/postfix \ - readme_directory=${READMEDIR} - -.for file in ${CONF1} - ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ - ${PREFIX}/etc/postfix/dist-${file} + config_directory=${PREFIX}/etc/postfix \ + daemon_directory=${PREFIX}/libexec/postfix \ + command_directory=${PREFIX}/sbin \ + queue_directory=/var/spool/postfix \ + sendmail_path=${PREFIX}/sbin/sendmail \ + newaliases_path=${PREFIX}/bin/newaliases \ + mailq_path=${PREFIX}/bin/mailq \ + mail_owner=postfix \ + setgid_group=maildrop \ + manpage_directory=${PREFIX}/man \ + sample_directory=${PREFIX}/etc/postfix \ + readme_directory=${READMEDIR} + + @${MKDIR} ${PREFIX}/etc/postfix/dist +.for f in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist .endfor @${INSTALL_SCRIPT} \ diff -ruN postfix.orig/distinfo postfix/distinfo --- postfix.orig/distinfo Fri Feb 18 06:51:18 2005 +++ postfix/distinfo Tue Mar 15 15:34:18 2005 @@ -1,12 +1,6 @@ -MD5 (postfix/postfix-2.1.5.tar.gz) = bcaa4aac80595d04c60c72844203a04d -SIZE (postfix/postfix-2.1.5.tar.gz) = 1971931 -MD5 (postfix/postfix-libspf2-2.1.5-5.patch) = c6ac24b91af6c575ec787110a2df8a24 -SIZE (postfix/postfix-libspf2-2.1.5-5.patch) = 25889 -MD5 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = c1c5a84b6c04bde0df7100cf05abb54c -SIZE (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 48228 -MD5 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 5b02ebf2ec104c43f805d2bcb7bb16ef -SIZE (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 251571 -MD5 (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = d3211ebd4d2fbbc9c78235666ed355ac -SIZE (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 239141 -MD5 (postfix/postfix-2.1.5-trash.patch.gz) = 868209c12cf214566130b9c8b968cfed -SIZE (postfix/postfix-2.1.5-trash.patch.gz) = 7049 +MD5 (postfix/postfix-2.2.1.tar.gz) = 36b982392b2a490f3c861e5e609124cc +SIZE (postfix/postfix-2.2.1.tar.gz) = 2407157 +MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115 +SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077 +MD5 (postfix/postfix-2.2.0-vda.patch.gz) = 894915546a4e2bc378d69798dabd58d1 +SIZE (postfix/postfix-2.2.0-vda.patch.gz) = 7785 diff -ruN postfix.orig/files/patch-conf::main.cf postfix/files/patch-conf::main.cf --- postfix.orig/files/patch-conf::main.cf Wed Dec 31 21:00:00 1969 +++ postfix/files/patch-conf::main.cf Tue Mar 15 15:27:30 2005 @@ -0,0 +1,64 @@ +--- conf/main.cf.orig Sat Mar 5 11:53:42 2005 ++++ conf/main.cf Sat Mar 5 11:53:42 2005 +@@ -32,13 +32,13 @@ + # 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 + + # QUEUE AND PROCESS OWNERSHIP + # +@@ -608,37 +608,37 @@ + # sendmail_path: The full pathname of the Postfix sendmail command. + # This is the Sendmail-compatible mail posting interface. + # +-sendmail_path = ++sendmail_path = !!PREFIX!!/sbin/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 = maildrop + + # html_directory: The location of the Postfix HTML documentation. + # +-html_directory = ++html_directory = no + + # 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. + # +-sample_directory = ++sample_directory = !!PREFIX!!/etc/postfix + + # readme_directory: The location of the Postfix README files. + # +-readme_directory = ++readme_directory = no diff -ruN postfix.orig/files/patch-conf::post-install postfix/files/patch-conf::post-install --- postfix.orig/files/patch-conf::post-install Wed Dec 31 21:00:00 1969 +++ postfix/files/patch-conf::post-install Tue Mar 15 15:27:30 2005 @@ -0,0 +1,11 @@ +--- conf/post-install.orig Thu Feb 24 08:06:08 2005 ++++ conf/post-install Sat Mar 5 11:53:42 2005 +@@ -185,7 +185,7 @@ + + umask 022 + +-PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd ++PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin + SHELL=/bin/sh + IFS=" + " diff -ruN postfix.orig/files/patch-ec postfix/files/patch-ec --- postfix.orig/files/patch-ec Wed May 12 06:08:16 2004 +++ postfix/files/patch-ec Wed Dec 31 21:00:00 1969 @@ -1,53 +0,0 @@ -*** ./src/global/mail_params.h.orig Sat Jan 17 10:04:00 2004 ---- ./src/global/mail_params.h Fri Jan 30 14:48:23 2004 -*************** -*** 64,70 **** - extern gid_t var_owner_gid; - - #define VAR_SGID_GROUP "setgid_group" -! #define DEF_SGID_GROUP "postdrop" - extern char *var_sgid_group; - extern gid_t var_sgid_gid; - ---- 64,70 ---- - extern gid_t var_owner_gid; - - #define VAR_SGID_GROUP "setgid_group" -! #define DEF_SGID_GROUP "maildrop" - extern char *var_sgid_group; - extern gid_t var_sgid_gid; - -*************** -*** 202,208 **** - */ - #define VAR_DAEMON_DIR "daemon_directory" - #ifndef DEF_DAEMON_DIR -! #define DEF_DAEMON_DIR "/usr/libexec/postfix" - #endif - extern char *var_daemon_dir; - ---- 202,208 ---- - */ - #define VAR_DAEMON_DIR "daemon_directory" - #ifndef DEF_DAEMON_DIR -! #define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix" - #endif - extern char *var_daemon_dir; - -*************** -*** 231,237 **** - */ - #define VAR_CONFIG_DIR "config_directory" - #ifndef DEF_CONFIG_DIR -! #define DEF_CONFIG_DIR "/etc/postfix" - #endif - extern char *var_config_dir; - ---- 231,237 ---- - */ - #define VAR_CONFIG_DIR "config_directory" - #ifndef DEF_CONFIG_DIR -! #define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix" - #endif - extern char *var_config_dir; - diff -ruN postfix.orig/files/patch-main.cf postfix/files/patch-main.cf --- postfix.orig/files/patch-main.cf Wed May 12 06:08:16 2004 +++ postfix/files/patch-main.cf Wed Dec 31 21:00:00 1969 @@ -1,108 +0,0 @@ -*** ./conf/main.cf~ Mon Apr 26 16:54:42 2004 ---- ./conf/main.cf Mon Apr 26 16:54:42 2004 -*************** -*** 32,44 **** - # The command_directory parameter specifies the location of all - # postXXX commands. - # -! command_directory = /usr/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 - - # QUEUE AND PROCESS OWNERSHIP - # ---- 32,44 ---- - # The command_directory parameter specifies the location of all - # postXXX commands. - # -! 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 = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -*************** -*** 595,631 **** - # sendmail_path: The full pathname of the Postfix sendmail command. - # This is the Sendmail-compatible mail posting interface. - # -! sendmail_path = - - # newaliases_path: The full pathname of the Postfix newaliases command. - # This is the Sendmail-compatible command to build alias databases. - # -! newaliases_path = - - # mailq_path: The full pathname of the Postfix mailq command. This - # is the Sendmail-compatible mail queue listing command. - # -! mailq_path = - - # 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 = - - # html_directory: The location of the Postfix HTML documentation. - # -! html_directory = - - # manpage_directory: The location of the Postfix on-line manual pages. - # -! manpage_directory = - - # sample_directory: The location of the Postfix sample configuration files. - # This parameter is obsolete as of Postfix 2.1. - # -! sample_directory = - - # readme_directory: The location of the Postfix README files. - # -! readme_directory = ---- 595,631 ---- - # sendmail_path: The full pathname of the Postfix sendmail command. - # This is the Sendmail-compatible mail posting interface. - # -! sendmail_path = !!PREFIX!!/sbin/sendmail - - # newaliases_path: The full pathname of the Postfix newaliases command. - # This is the Sendmail-compatible command to build alias databases. - # -! 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 = !!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 = maildrop - - # html_directory: The location of the Postfix HTML documentation. - # -! html_directory = no - - # manpage_directory: The location of the Postfix on-line manual pages. - # -! manpage_directory = !!PREFIX!!/man - - # sample_directory: The location of the Postfix sample configuration files. - # This parameter is obsolete as of Postfix 2.1. - # -! sample_directory = !!PREFIX!!/etc/postfix - - # readme_directory: The location of the Postfix README files. - # -! readme_directory = no diff -ruN postfix.orig/files/patch-makedefs postfix/files/patch-makedefs --- postfix.orig/files/patch-makedefs Tue Aug 31 10:48:12 2004 +++ postfix/files/patch-makedefs Tue Mar 15 15:27:30 2005 @@ -1,10 +1,10 @@ ---- makedefs.orig Wed Aug 25 06:13:57 2004 -+++ makedefs Wed Aug 25 06:14:46 2004 -@@ -93,6 +93,8 @@ +--- makedefs.orig Tue Feb 8 20:27:50 2005 ++++ makedefs Sat Mar 5 11:53:42 2005 +@@ -116,6 +116,8 @@ ;; FreeBSD.5*) SYSTYPE=FREEBSD5 ;; -+ FreeBSD.6*) SYSTYPE=FREEBSD6 ++ FreeBSD.6*) SYSTYPE=FREEBSD5 + ;; OpenBSD.2*) SYSTYPE=OPENBSD2 ;; diff -ruN postfix.orig/files/patch-post-install postfix/files/patch-post-install --- postfix.orig/files/patch-post-install Wed Jan 30 17:59:39 2002 +++ postfix/files/patch-post-install Wed Dec 31 21:00:00 1969 @@ -1,11 +0,0 @@ ---- ./conf/#post-install~ Fri Jan 18 12:32:54 2002 -+++ ./conf/post-install Fri Jan 18 12:32:54 2002 -@@ -183,7 +183,7 @@ - - umask 022 - --PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd -+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin - SHELL=/bin/sh - IFS=" - " diff -ruN postfix.orig/files/patch-src::global::mail_params.h postfix/files/patch-src::global::mail_params.h --- postfix.orig/files/patch-src::global::mail_params.h Wed Dec 31 21:00:00 1969 +++ postfix/files/patch-src::global::mail_params.h Tue Mar 15 15:27:30 2005 @@ -0,0 +1,29 @@ +--- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005 ++++ src/global/mail_params.h Sat Mar 5 11:53:42 2005 +@@ -64,7 +64,7 @@ + extern gid_t var_owner_gid; + + #define VAR_SGID_GROUP "setgid_group" +-#define DEF_SGID_GROUP "postdrop" ++#define DEF_SGID_GROUP "maildrop" + extern char *var_sgid_group; + extern gid_t var_sgid_gid; + +@@ -221,7 +221,7 @@ + */ + #define VAR_DAEMON_DIR "daemon_directory" + #ifndef DEF_DAEMON_DIR +-#define DEF_DAEMON_DIR "/usr/libexec/postfix" ++#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix" + #endif + extern char *var_daemon_dir; + +@@ -250,7 +250,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.orig/files/patch-src::util::sys_defs.h postfix/files/patch-src::util::sys_defs.h --- postfix.orig/files/patch-src::util::sys_defs.h Sat Sep 4 08:41:28 2004 +++ postfix/files/patch-src::util::sys_defs.h Wed Dec 31 21:00:00 1969 @@ -1,11 +0,0 @@ ---- ./src/util/sys_defs.h.orig Wed Aug 25 06:15:02 2004 -+++ ./src/util/sys_defs.h Wed Aug 25 06:15:18 2004 -@@ -24,7 +24,7 @@ - * 4.4BSD and close derivatives. - */ - #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ -- || defined(FREEBSD5) \ -+ || defined(FREEBSD5) || defined(FREEBSD6) \ - || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ - || defined(OPENBSD2) || defined(OPENBSD3) \ - || defined(NETBSD1) || defined(NETBSD2) \ diff -ruN postfix.orig/pkg-install postfix/pkg-install --- postfix.orig/pkg-install Fri Jun 11 11:41:47 2004 +++ postfix/pkg-install Tue Mar 15 15:27:30 2005 @@ -12,180 +12,170 @@ POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then - DEFAULT_REPLACE_MAILERCONF=n + DEFAULT_REPLACE_MAILERCONF=n else - DEFAULT_REPLACE_MAILERCONF=y + DEFAULT_REPLACE_MAILERCONF=y fi if [ -x /usr/sbin/nologin ]; then - NOLOGIN=/usr/sbin/nologin + NOLOGIN=/usr/sbin/nologin else - NOLOGIN=/sbin/nologin + NOLOGIN=/sbin/nologin fi ask() { - local question default answer + local question default answer - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} + question=$1 + default=$2 + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then + /usr/bin/read -p "${question} [${default}]? " answer + fi + if [ x${answer} = x ]; then + answer=${default} + fi + /bin/echo ${answer} } yesno() { - local question default answer + local question default answer - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done + question=$1 + default=$2 + while :; do + answer=$(ask "${question}" "${default}") + case "${answer}" in + [Yy]*) return 0;; + [Nn]*) return 1;; + esac + /bin/echo "Please answer yes or no." + done } if [ x"$2" = xPRE-INSTALL ]; then - USER=postfix - UID=125 - GROUP=postfix - GID=125 - GROUP2=maildrop - GID2=126 - - if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP} -g ${GID} - then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then - echo "You already have a group \"${GROUP2}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2} - then - echo "Added group \"${GROUP2}\"." - else - echo "Adding group \"${GROUP2}\" failed..." - echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d /var/spool/postfix \ - -s ${NOLOGIN} \ - -c "Postfix Mail System" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then - echo "You already have user \"${USER}\" in group \"mail\", so I will use it." - else - echo "You need user \"${USER}\" added to group \"mail\"." - if yesno "Would you like me to add it" y; then - /usr/sbin/pw groupmod mail -m ${USER} || exit - echo "Done." - else - echo "Please create it, and try again." - exit 1 - fi - fi + USER=postfix + UID=125 + GROUP=postfix + GID=125 + GROUP2=maildrop + GID2=126 + + if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then + /bin/echo "You already have a group \"${GROUP}\", so I will use it." + else + if /usr/sbin/pw groupadd ${GROUP} -g ${GID} + then + /bin/echo "Added group \"${GROUP}\"." + else + /bin/echo "Adding group \"${GROUP}\" failed..." + /bin/echo "Please create it, and try again." + exit 1 + fi + fi + + if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then + /bin/echo "You already have a group \"${GROUP2}\", so I will use it." + else + if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then + /bin/echo "Added group \"${GROUP2}\"." + else + /bin/echo "Adding group \"${GROUP2}\" failed..." + /bin/echo "Please create it, and try again." + exit 1 + fi + fi + + if /usr/sbin/pw user show "${USER}" 2>/dev/null; then + /bin/echo "You already have a user \"${USER}\", so I will use it." + else + if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then + /bin/echo "Added user \"${USER}\"." + else + /bin/echo "Adding user \"${USER}\" failed..." + /bin/echo "Please create it, and try again." + exit 1 + fi + fi + if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then + /bin/echo "You already have user \"${USER}\" in group \"mail\", so I will use it." + else + /bin/echo "You need user \"${USER}\" added to group \"mail\"." + if yesno "Would you like me to add it" y; then + /usr/sbin/pw groupmod mail -m ${USER} || exit + /bin/echo "Done." + else + /bin/echo "Please create it, and try again." + exit 1 + fi + fi fi if [ x"$2" = xPOST-INSTALL ]; then - # CONF1 copied from Makefile. Keep consistent! - CONF1="main.cf master.cf access aliases canonical \ - header_checks relocated transport virtual" - - for file in $CONF1 - do - if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then - cp ${PKG_PREFIX}/etc/postfix/dist-$file ${PKG_PREFIX}/etc/postfix/$file - fi - done - - sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ - config_directory=${PKG_PREFIX}/etc/postfix \ - daemon_directory=${PKG_PREFIX}/libexec/postfix \ - command_directory=${PKG_PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PKG_PREFIX}/sbin/sendmail \ - newaliases_path=${PKG_PREFIX}/bin/newaliases \ - mailq_path=${PKG_PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PKG_PREFIX}/man \ - sample_directory=${PKG_PREFIX}/etc/postfix \ - readme_directory=no \ - upgrade-package + if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then + for file in ${PKG_PREFIX}/etc/postfix/dist/*; do + if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then + cp $file ${PKG_PREFIX}/etc/postfix/ + fi + done + fi + + /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ + config_directory=${PKG_PREFIX}/etc/postfix \ + daemon_directory=${PKG_PREFIX}/libexec/postfix \ + command_directory=${PKG_PREFIX}/sbin \ + queue_directory=/var/spool/postfix \ + sendmail_path=${PKG_PREFIX}/sbin/sendmail \ + newaliases_path=${PKG_PREFIX}/bin/newaliases \ + mailq_path=${PKG_PREFIX}/bin/mailq \ + mail_owner=postfix \ + setgid_group=maildrop \ + manpage_directory=${PKG_PREFIX}/man \ + sample_directory=${PKG_PREFIX}/etc/postfix \ + readme_directory=no \ + upgrade-package +fi # readme_directory is "no" above since the package will have correct perms # already, and we don't know if they had PORTDOCS. -fi replace() { - local orig repl - - orig=$1 - repl=$2 - if [ -e ${orig} ]; then - mv -f ${orig} ${orig}.OFF - chmod 0 ${orig}.OFF - fi - if [ -e ${repl} ]; then - ln -s ${repl} ${orig} - fi + local orig repl + + orig=$1 + repl=$2 + if [ -e ${orig} ]; then + /bin/mv -f ${orig} ${orig}.OFF + /bin/chmod 0 ${orig}.OFF + fi + if [ -e ${repl} ]; then + /bin/ln -s ${repl} ${orig} + fi } if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" \ - ${DEFAULT_REPLACE_MAILERCONF}; then - mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - echo "#" > /etc/mail/mailer.conf - echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "#" >> /etc/mail/mailer.conf - echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - echo "Done." - fi - fi + if [ -x /sbin/sysctl ]; then + OSVERSION=`/sbin/sysctl -n kern.osreldate` + else + OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` + fi + if [ ${OSVERSION} -ge 400014 ]; then + if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then + mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old + /bin/echo "#" > /etc/mail/mailer.conf + /bin/echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + /bin/echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + /bin/echo "#" >> /etc/mail/mailer.conf + /bin/echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + /bin/echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + /bin/echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + /bin/echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + fi + else + if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then + replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail + replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail + replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail + /bin/echo "Done." + fi + fi fi diff -ruN postfix.orig/pkg-plist postfix/pkg-plist --- postfix.orig/pkg-plist Wed Aug 18 12:33:07 2004 +++ postfix/pkg-plist Tue Mar 15 15:39:00 2005 @@ -1,29 +1,34 @@ -@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist-main.cf; then rm -f %D/etc/postfix/main.cf; fi -@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist-master.cf; then rm -f %D/etc/postfix/master.cf; fi -@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist-access; then rm -f %D/etc/postfix/access; fi -@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist-aliases; then rm -f %D/etc/postfix/aliases; fi -@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist-canonical; then rm -f %D/etc/postfix/canonical; fi -@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist-header_checks; then rm -f %D/etc/postfix/header_checks; fi -@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist-relocated; then rm -f %D/etc/postfix/relocated; fi -@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi -@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi +@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi +@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi +@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi etc/postfix/LICENSE +etc/postfix/TLS_LICENSE etc/postfix/main.cf.default etc/postfix/makedefs.out etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/dist-main.cf -etc/postfix/dist-master.cf -etc/postfix/dist-access -etc/postfix/dist-aliases -etc/postfix/dist-canonical -etc/postfix/dist-header_checks -etc/postfix/dist-relocated -etc/postfix/dist-transport -etc/postfix/dist-virtual +etc/postfix/dist/main.cf +etc/postfix/dist/master.cf +etc/postfix/dist/access +etc/postfix/dist/aliases +etc/postfix/dist/canonical +etc/postfix/dist/header_checks +etc/postfix/dist/relocated +etc/postfix/dist/transport +etc/postfix/dist/virtual +etc/postfix/dist/generic +libexec/postfix/anvil libexec/postfix/bounce libexec/postfix/cleanup +libexec/postfix/discard libexec/postfix/error libexec/postfix/flush libexec/postfix/lmtp @@ -36,6 +41,7 @@ libexec/postfix/proxymap libexec/postfix/qmgr libexec/postfix/qmqpd +libexec/postfix/scache libexec/postfix/showq libexec/postfix/smtp libexec/postfix/smtpd @@ -43,7 +49,7 @@ libexec/postfix/trivial-rewrite libexec/postfix/verify libexec/postfix/virtual -%%SUB_TLS%%libexec/postfix/tlsmgr +libexec/postfix/tlsmgr sbin/postalias sbin/postcat sbin/postconf @@ -75,6 +81,9 @@ %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html +%%PORTDOCS%%%%DOCSDIR%%/CDB_README +%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README +%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html %%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html @@ -90,7 +99,11 @@ %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html -%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README +%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html +%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html +%%PORTDOCS%%%%DOCSDIR%%/TLS_README +%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html %%PORTDOCS%%%%DOCSDIR%%/LDAP_README %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html %%PORTDOCS%%%%DOCSDIR%%/LINUX_README @@ -149,12 +162,14 @@ %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html %%PORTDOCS%%%%DOCSDIR%%/access.5.html %%PORTDOCS%%%%DOCSDIR%%/aliases.5.html +%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html %%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html %%PORTDOCS%%%%DOCSDIR%%/bounce.8.html %%PORTDOCS%%%%DOCSDIR%%/canonical.5.html %%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html %%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html %%PORTDOCS%%%%DOCSDIR%%/defer.8.html +%%PORTDOCS%%%%DOCSDIR%%/discard.8.html %%PORTDOCS%%%%DOCSDIR%%/error.8.html %%PORTDOCS%%%%DOCSDIR%%/flush.8.html %%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html @@ -163,8 +178,10 @@ %%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html %%PORTDOCS%%%%DOCSDIR%%/local.8.html %%PORTDOCS%%%%DOCSDIR%%/mailq.1.html +%%PORTDOCS%%%%DOCSDIR%%/master.5.html %%PORTDOCS%%%%DOCSDIR%%/master.8.html %%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html +%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html %%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html %%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html %%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html @@ -177,6 +194,7 @@ %%PORTDOCS%%%%DOCSDIR%%/postconf.5.html %%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html %%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg +%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html %%PORTDOCS%%%%DOCSDIR%%/postfix-power.png %%PORTDOCS%%%%DOCSDIR%%/postfix.1.html %%PORTDOCS%%%%DOCSDIR%%/postkick.1.html @@ -194,6 +212,7 @@ %%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html %%PORTDOCS%%%%DOCSDIR%%/relocated.5.html %%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html +%%PORTDOCS%%%%DOCSDIR%%/scache.8.html %%PORTDOCS%%%%DOCSDIR%%/showq.8.html %%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html %%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html @@ -206,6 +225,9 @@ %%PORTDOCS%%%%DOCSDIR%%/verify.8.html %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html +%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html +%%PORTDOCS%%%%DOCSDIR%%/generic.5.html %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm libexec/postfix +@dirrm etc/postfix/dist @unexec rmdir %D/etc/postfix 2>/dev/null || true diff -ruN postfix.orig/scripts/configure.postfix postfix/scripts/configure.postfix --- postfix.orig/scripts/configure.postfix Fri Feb 18 06:51:18 2005 +++ postfix/scripts/configure.postfix Tue Mar 15 15:27:30 2005 @@ -5,7 +5,7 @@ exit fi -tempfile=`mktemp -t checklist` +tempfile=`/usr/bin/mktemp -t checklist` if [ "${POSTFIX_OPTIONS}" ]; then set ${POSTFIX_OPTIONS} @@ -26,15 +26,15 @@ SASLKRB5 "If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \ SPF "SPF support" "$status_SPF" \ TLS "SSL and TLS" "$status_TLS" \ -IPv6 "IPv6 support" "$status_IPv6" \ -IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \ +DB43 "Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \ MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \ PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \ OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \ +NIS "NIS map lookups" "$status_NIS" \ VDA "VDA (Virtual Delivery Agent)" "$status_VDA" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile @@ -48,10 +48,10 @@ case $retval in 0) if [ -z "$*" ]; then - echo "Nothing selected" + /bin/echo "Nothing selected" fi ;; - 1) echo "Cancel pressed." + 1) /bin/echo "Cancel pressed." exit 1 ;; esac @@ -60,187 +60,167 @@ ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc -echo "PREFIX= ${PREFIX}" +/bin/echo "PREFIX= ${PREFIX}" -SUB_TLS="@comment " SUB_TEST="@comment " -SUB_IPV6="@comment " SUB_SPF="@comment " while [ "$1" ]; do case $1 in NOPCRE) - echo "WITHOUT_PCRE= yes" - echo "NOPCRE_SUFFIX= +nopcre" + /bin/echo "WITHOUT_PCRE= yes" + /bin/echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; - SASL) - echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" - echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" - echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" - echo "SASL_SUFFIX= +sasl" - if [ -f ${PREFIX}/lib/libsasl.a ]; then - if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then - echo "USE_MYSQL=YES" - echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" - fi - fi - SUB_SASL="" - ;; + SASL) + /bin/echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" + /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" + /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" + /bin/echo "SASL_SUFFIX= +sasl" + if [ -f ${LOCALBASE}/lib/libsasl.a ]; then + if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then + SASL_USE_MYSQL="YES" + fi + fi + ;; SASL2) - echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" - echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" - echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" - echo "SASL_SUFFIX= +sasl2" - if [ -f ${PREFIX}/lib/libsasl2.a ]; then - if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then - echo "USE_MYSQL=YES" - echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + /bin/echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" + /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" + /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" + /bin/echo "SASL_SUFFIX= +sasl2" + if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then + if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then + SASL_USE_MYSQL="YES" fi fi - SUB_SASL="" ;; SASLKRB) - echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" + /bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; SASLKRB5) - echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcom_err -lasn1 -lroken" + /bin/echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken" + ;; + SPF) + # see http://www.ipnet6.org/postfix/spf/ + /bin/echo "LIB_DEPENDS+= spf2.1:\${PORTSDIR}/mail/libspf2" + /bin/echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" + /bin/echo "PATCHFILES+= postfix-libspf2-2.2.0-5.patch" + /bin/echo "PATCH_DIST_STRIP= -p1" + /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include" + /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lspf2" + /bin/echo "SPF_SUFFIX= +spf" +# /bin/echo "README+= SPF_README" + /bin/echo "" + SUB_SPF="" ;; TLS) - echo "MAN8+= tlsmgr.8" - echo "USE_OPENSSL= yes" - echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" - echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.18-2.1.3-0.9.7d/pfixtls.diff" - echo "PATCH_STRIP= -p1" - echo "TLS_SUFFIX= +tls" - SUB_TLS="" + /bin/echo "USE_OPENSSL= yes" + /bin/echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}" + /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" + /bin/echo "TLS_SUFFIX= +tls" ;; DB3) if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" - echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" - echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" - echo "DB_SUFFIX= +db3" + /bin/echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" + /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" + /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + /bin/echo "DB_SUFFIX= +db3" BDB_SELECTED="3" ;; DB40) if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" - echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" - echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" - echo "DB_SUFFIX= +db40" + /bin/echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" + /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" + /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" + /bin/echo "DB_SUFFIX= +db40" BDB_SELECTED="40" ;; DB41) if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" - echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" - echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" - echo "DB_SUFFIX= +db41" + /bin/echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" + /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" + /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" + /bin/echo "DB_SUFFIX= +db41" BDB_SELECTED="41" ;; DB42) if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" - echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" - echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" - echo "DB_SUFFIX= +db42" + /bin/echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" + /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" + /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" + /bin/echo "DB_SUFFIX= +db42" BDB_SELECTED="42" ;; + DB43) + if [ "X$BDB_SELECTED" != "X" ]; then + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr + rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc + exit 1 + fi + /bin/echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43" + /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43" + /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb" + /bin/echo "DB_SUFFIX= +db43" + BDB_SELECTED="43" + ;; MySQL) - echo "USE_MYSQL=YES" - echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" - echo "MYSQL_SUFFIX= +mysql" + /bin/echo "USE_MYSQL=YES" + /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" + /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" + if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then + if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then + /bin/echo "USE_OPENSSL= yes" + /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" + /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" + fi + fi + /bin/echo "MYSQL_SUFFIX= +mysql" + MYSQL_SELECTED="YES" ;; PgSQL) - echo "USE_PGSQL=YES" - echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" - echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" - echo "PGSQL_SUFFIX= +pgsql" + /bin/echo "USE_PGSQL=YES" + /bin/echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" + /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" + /bin/echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP) - echo "USE_OPENLDAP=YES" - echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" - echo "OPENLDAP_SUFFIX= +openldap" + /bin/echo "USE_OPENLDAP=YES" + /bin/echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" + /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" + /bin/echo "OPENLDAP_SUFFIX= +openldap" + ;; + NIS) + /bin/echo "POSTFIX_CCARGS+= -DHAS_NIS" + /bin/echo "NIS_SUFFIX= +nis" + ;; + VDA) + /bin/echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" + /bin/echo "PATCHFILES+= postfix-2.2.0-vda.patch.gz" + /bin/echo "PATCH_DIST_STRIP= -p1" ;; Test) - echo "BIN1= smtp-sink smtp-source qmqp-source" -# echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1" + /bin/echo "BIN1= smtp-sink smtp-source qmqp-source" +# /bin/echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1" SUB_TEST="" ;; - SPF) - # see http://www.ipnet6.org/postfix/spf/ - echo "LIB_DEPENDS+= spf2.1:\${PORTSDIR}/mail/libspf2" - echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= postfix-libspf2-2.1.5-5.patch" - echo "PATCH_DIST_STRIP= -p1" - echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include" - echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lspf2" - echo "SPF_SUFFIX= +spf" -## echo "README+= SPF_README" - echo "" - SUB_SPF="" - ;; - IPv6) - if [ X$SUB_TLS = "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - echo "PATCH_SITES+= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/" - echo "PATCHFILES+= ipv6-1.25-pf-2.1.5.patch.gz" - echo "PATCH_DIST_STRIP= -p1" - echo "IPv6_SUFFIX= +ipv6" - echo "" - IPv6SELECTED=YES - SUB_IPV6="" - ;; - IPv6TLS) - if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then - /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - echo "MAN8+= tlsmgr.8" - echo "USE_OPENSSL= yes" - echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" - echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "PATCH_SITES+= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/" - echo "PATCHFILES+= tls+ipv6-1.25-pf-2.1.5.patch.gz" - echo "PATCH_DIST_STRIP= -p1" - echo "TLS_SUFFIX= +tls+ipv6" - SUB_TLS="" - SUB_IPV6="" - ;; - VDA) - echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" - echo "PATCHFILES+= postfix-2.1.5-trash.patch.gz" - echo "PATCH_DIST_STRIP= -p1" - ;; *) - echo "Unknown option(s): $*" > /dev/stderr + /bin/echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; @@ -248,13 +228,29 @@ shift done -echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" -echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" -echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" -echo "PLIST_SUB+= SUB_SPF=\"${SUB_SPF}\"" +if [ -z "${BATCH}" ]; then + if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then + /usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr + if [ $? = 0 ]; then + /bin/echo "USE_MYSQL=YES" + /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" + /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" + if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then + if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then + /bin/echo "USE_OPENSSL= yes" + /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" + /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" + fi + fi + fi + fi +fi + +/bin/echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" +/bin/echo "PLIST_SUB+= SUB_SPF=\"${SUB_SPF}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but -# any subsequent build will. so "make; make install" will build twice. +# any subsequent build will. so "make; make install" will build twice. # don't do this for now. -#echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${SPF_SUFFIX}" +#/bin/echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}" --------------030702040101010509070607--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503151850.j2FIo6VP074463>