From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 10 23:10:21 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 20E8016A41F for ; Wed, 10 Aug 2005 23:10:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E10C43D49 for ; Wed, 10 Aug 2005 23:10:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j7ANAJ8T092216 for ; Wed, 10 Aug 2005 23:10:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j7ANAJOa092215; Wed, 10 Aug 2005 23:10:19 GMT (envelope-from gnats) Resent-Date: Wed, 10 Aug 2005 23:10:19 GMT Resent-Message-Id: <200508102310.j7ANAJOa092215@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Marcus Grando Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B2D716A41F for ; Wed, 10 Aug 2005 23:10:12 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C94B43D48 for ; Wed, 10 Aug 2005 23:10:12 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j7ANABY4098214 for ; Wed, 10 Aug 2005 23:10:11 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id j7ANABkJ098213; Wed, 10 Aug 2005 23:10:11 GMT (envelope-from nobody) Message-Id: <200508102310.j7ANABkJ098213@www.freebsd.org> Date: Wed, 10 Aug 2005 23:10:11 GMT From: Marcus Grando To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/84781: Update port: mail/postfix1 fix build on 6.0 pointed by pointyhat X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Aug 2005 23:10:21 -0000 >Number: 84781 >Category: ports >Synopsis: Update port: mail/postfix1 fix build on 6.0 pointed by pointyhat >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Aug 10 23:10:18 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Marcus Grando >Release: 6.0-BETA2 >Organization: Grupos Internet S/A >Environment: FreeBSD marcus.grupos.com.br 6.0-BETA2 FreeBSD 6.0-BETA2 #3: Wed Aug 10 15:52:23 BRT 2005 root@marcus.grupos.com.br:/usr/obj/usr/src/sys/MARCUS i386 >Description: - Update to 1.1.13 - Remove BROKEN to 6.0 - Update patch files to use PATCH_STRIP=-p1 - Backport pkg-message from mail/postfix Add files: files/patch-conf::main.cf files/patch-makedefs Removed files: files/patch-src::trivial-rewrite::resolve.c >How-To-Repeat: >Fix: diff -ruN postfix1.orig/Makefile postfix1/Makefile --- postfix1.orig/Makefile Fri Aug 20 16:55:47 2004 +++ postfix1/Makefile Wed Aug 10 19:59:05 2005 @@ -12,8 +12,7 @@ # the options are the same names as in the scripts/configure.postfix file PORTNAME= postfix -PORTVERSION= 1.1.12 -PORTREVISION= 1 +PORTVERSION= 1.1.13 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -32,6 +31,7 @@ CONFLICTS= courier-0.* postfix-2.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* USE_SUBMAKE= yes USE_REINPLACE= yes +PATCH_STRIP= -p1 LATEST_LINK= postfix1 MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ @@ -64,10 +64,6 @@ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" .include - -.if ${OSVERSION} >= 600000 -BROKEN= "Does not build on FreeBSD 6.x" -.endif pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix diff -ruN postfix1.orig/distinfo postfix1/distinfo --- postfix1.orig/distinfo Wed Mar 17 15:29:28 2004 +++ postfix1/distinfo Wed Aug 10 19:39:38 2005 @@ -1,8 +1,8 @@ -MD5 (postfix/postfix-1.1.12.tar.gz) = d1d0f9792ec6ea063ccca59184e54212 -SIZE (postfix/postfix-1.1.12.tar.gz) = 1190811 +MD5 (postfix/postfix-1.1.13.tar.gz) = 772f193d768a5e37b60aef37f865589c +SIZE (postfix/postfix-1.1.13.tar.gz) = 1190791 +MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba +SIZE (postfix/postfix-pg.postfix-1.1.8.patch) = 27331 +MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e +SIZE (postfix/postfix-1.1.11+ipv6.patch.gz) = 22964 MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566 SIZE (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 196093 -MD5 (postfix/postfix-1.1.12+ipv6.patch.gz) = add4396ce50ca61b5d9b67454fb51258 -SIZE (postfix/postfix-1.1.11+ipv6.patch.gz) = 22964 -MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba -SIZE (postfix/postfix-pg.postfix-1.1.8.patch) = 27327 diff -ruN postfix1.orig/files/patch-bd postfix1/files/patch-bd --- postfix1.orig/files/patch-bd Thu Jul 31 09:19:52 2003 +++ postfix1/files/patch-bd Wed Aug 10 19:59:54 2005 @@ -1,5 +1,5 @@ -*** ./html/local.8.html.orig Thu Feb 3 21:15:02 2000 ---- ./html/local.8.html Thu Jun 1 22:22:30 2000 +*** postfix-1.1.13/html/local.8.html.orig Thu Feb 3 21:15:02 2000 +--- postfix-1.1.13/html/local.8.html Thu Jun 1 22:22:30 2000 *************** *** 99,101 **** The default per-user mailbox is a file in the UNIX mail diff -ruN postfix1.orig/files/patch-ck postfix1/files/patch-ck --- postfix1.orig/files/patch-ck Thu Jul 31 09:19:52 2003 +++ postfix1/files/patch-ck Wed Aug 10 19:59:59 2005 @@ -1,5 +1,5 @@ -*** ./man/man8/local.8.orig Thu Feb 3 21:14:53 2000 ---- ./man/man8/local.8 Thu Jun 1 22:42:43 2000 +*** postfix-1.1.13/man/man8/local.8.orig Thu Feb 3 21:14:53 2000 +--- postfix-1.1.13/man/man8/local.8 Thu Jun 1 22:42:43 2000 *************** *** 96,98 **** The default per-user mailbox is a file in the UNIX mail spool diff -ruN postfix1.orig/files/patch-conf::main.cf postfix1/files/patch-conf::main.cf --- postfix1.orig/files/patch-conf::main.cf Wed Dec 31 21:00:00 1969 +++ postfix1/files/patch-conf::main.cf Wed Aug 10 20:00:06 2005 @@ -0,0 +1,59 @@ +--- postfix-1.1.13/conf/main.cf.orig Tue May 28 14:35:57 2002 ++++ postfix-1.1.13/conf/main.cf Wed Aug 10 19:28:08 2005 +@@ -31,14 +31,14 @@ + # The command_directory parameter specifies the location of all + # postXXX commands. The default value is $program_directory. + # +-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). The + # default value is $program_directory. This directory must be owned + # by root. + # +-daemon_directory = /usr/libexec/postfix ++daemon_directory = !!PREFIX!!/libexec/postfix + + # QUEUE AND PROCESS OWNERSHIP + # +@@ -508,32 +508,32 @@ + # 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 + + # 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. + # +-sample_directory = ++sample_directory = !!PREFIX!!/etc/postfix + + # readme_directory: The location of the Postfix README files. + # +-readme_directory = ++readme_directory = no diff -ruN postfix1.orig/files/patch-ec postfix1/files/patch-ec --- postfix1.orig/files/patch-ec Wed Jan 30 17:59:39 2002 +++ postfix1/files/patch-ec Wed Aug 10 20:00:12 2005 @@ -1,5 +1,5 @@ -*** ./src/global/mail_params.h.orig Thu Jan 3 13:13:37 2002 ---- ./src/global/mail_params.h Tue Jan 8 22:18:22 2002 +*** postfix-1.1.13/src/global/mail_params.h.orig Thu Jan 3 13:13:37 2002 +--- postfix-1.1.13/src/global/mail_params.h Tue Jan 8 22:18:22 2002 *************** *** 51,55 **** diff -ruN postfix1.orig/files/patch-ed postfix1/files/patch-ed --- postfix1.orig/files/patch-ed Sun Mar 4 16:34:58 2001 +++ postfix1/files/patch-ed Wed Aug 10 20:00:18 2005 @@ -1,5 +1,5 @@ -*** ./src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000 ---- ./src/local/mailbox.c Thu Jun 1 22:37:48 2000 +*** postfix-1.1.13/src/local/mailbox.c.orig Fri Apr 28 16:55:53 2000 +--- postfix-1.1.13/src/local/mailbox.c Thu Jun 1 22:37:48 2000 *************** *** 15,17 **** /* suppression. The default is direct mailbox delivery to diff -ruN postfix1.orig/files/patch-ei postfix1/files/patch-ei --- postfix1.orig/files/patch-ei Thu Jul 31 09:19:52 2003 +++ postfix1/files/patch-ei Wed Aug 10 20:00:22 2005 @@ -1,5 +1,5 @@ -*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000 ---- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000 +*** postfix-1.1.13/src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000 +--- postfix-1.1.13/src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000 *************** *** 12,19 **** * SASL library. diff -ruN postfix1.orig/files/patch-ej postfix1/files/patch-ej --- postfix1.orig/files/patch-ej Thu Jul 31 09:19:52 2003 +++ postfix1/files/patch-ej Wed Aug 10 20:00:27 2005 @@ -1,5 +1,5 @@ -*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000 ---- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000 +*** postfix-1.1.13/src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000 +--- postfix-1.1.13/src/smtp/smtp.h Thu Sep 14 13:04:53 2000 *************** *** 12,19 **** * SASL library. diff -ruN postfix1.orig/files/patch-lmtp.h postfix1/files/patch-lmtp.h --- postfix1.orig/files/patch-lmtp.h Thu Jul 31 09:19:52 2003 +++ postfix1/files/patch-lmtp.h Wed Aug 10 20:00:32 2005 @@ -1,5 +1,5 @@ ---- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001 -+++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001 +--- postfix-1.1.13/src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001 ++++ postfix-1.1.13/src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001 @@ -12,8 +12,8 @@ * SASL library. */ diff -ruN postfix1.orig/files/patch-makedefs postfix1/files/patch-makedefs --- postfix1.orig/files/patch-makedefs Wed Dec 31 21:00:00 1969 +++ postfix1/files/patch-makedefs Wed Aug 10 20:00:40 2005 @@ -0,0 +1,13 @@ +--- postfix-1.1.13/makedefs.orig Sat May 4 10:36:23 2002 ++++ postfix-1.1.13/makedefs Wed Aug 10 18:32:53 2005 +@@ -90,6 +90,10 @@ + ;; + FreeBSD.5*) SYSTYPE=FREEBSD5 + ;; ++ FreeBSD.6*) SYSTYPE=FREEBSD5 ++ ;; ++ FreeBSD.7*) SYSTYPE=FREEBSD5 ++ ;; + OpenBSD.2*) SYSTYPE=OPENBSD2 + ;; + OpenBSD.3*) SYSTYPE=OPENBSD3 diff -ruN postfix1.orig/files/patch-post-install postfix1/files/patch-post-install --- postfix1.orig/files/patch-post-install Wed Jan 30 17:59:39 2002 +++ postfix1/files/patch-post-install Wed Aug 10 20:00:45 2005 @@ -1,5 +1,5 @@ ---- ./conf/#post-install~ Fri Jan 18 12:32:54 2002 -+++ ./conf/post-install Fri Jan 18 12:32:54 2002 +--- postfix-1.1.13/conf/#post-install~ Fri Jan 18 12:32:54 2002 ++++ postfix-1.1.13/conf/post-install Fri Jan 18 12:32:54 2002 @@ -183,7 +183,7 @@ umask 022 diff -ruN postfix1.orig/files/patch-src::trivial-rewrite::resolve.c postfix1/files/patch-src::trivial-rewrite::resolve.c --- postfix1.orig/files/patch-src::trivial-rewrite::resolve.c Tue Feb 24 07:06:21 2004 +++ postfix1/files/patch-src::trivial-rewrite::resolve.c Wed Dec 31 21:00:00 1969 @@ -1,12 +0,0 @@ -*** ./src/trivial-rewrite/resolve.c Mon Jul 28 16:34:38 2003 ---- ./src/trivial-rewrite/resolve.c Mon Jul 28 16:35:04 2003 -*************** -*** 148,153 **** ---- 148,154 ---- - if (saved_domain) - tok822_free_tree(saved_domain); - saved_domain = domain; -+ domain = 0; - } - - /* diff -ruN postfix1.orig/pkg-message postfix1/pkg-message --- postfix1.orig/pkg-message Thu Jul 31 09:19:52 2003 +++ postfix1/pkg-message Wed Aug 10 19:36:20 2005 @@ -4,28 +4,36 @@ sendmail_enable="YES" sendmail_flags="-bd" +sendmail_pidfile="/var/spool/postfix/pid/master.pid" +sendmail_procname="/usr/local/libexec/postfix/master" sendmail_outbound_enable="NO" sendmail_submit_enable="NO" sendmail_msp_queue_enable="NO" - **OR** +This will disable Sendmail completely, and allow you to use /etc/rc.d/sendmail +to start and stop postfix (FreeBSD 5.x and up). For FreeBSD 4.x, it will just +cause the system boot scripts to start sendmail for you. + +Alternatively to the above settings, you can enable postfix to start with +the other local services, for example, after your database server starts if +you need it to be running for postfix. To do this, set in your rc.conf file: -sendmail_enable="NONE" - -then type this command as root: +sendmail_enable="NO" +sendmail_submit_enable="NO" +sendmail_outbound_enable="NO" +sendmail_msp_queue_enable="NO" -ln -s /usr/local/sbin/postfix /usr/local/etc/rc.d/postfix.sh +Then make the following symbolic link: -Either of these will disable Sendmail completely. The latter form is useful -if you need to wait until other local package initialization (such as ldconfig -for Postgres or MySQL) is done. The former method will start postfix very -early on in the boot process. +cd /usr/local/etc/rc.d +ln -s /usr/local/sbin/postfix postfix.sh -Also, you will want to disable some Sendmail-specific daily maintenance -routines in your /etc/periodic.conf file: +With either startup configuration, you will want to disable some +Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: -daily_status_mail_rejects_enable="NO" +daily_clean_hoststat_enable="NO" +daily_status_mail_rejects_enable="NO" daily_status_include_submit_mailq="NO" daily_submit_queuerun="NO" @@ -34,3 +42,6 @@ the sasldb file. This is accomplished by adding postfix to group mail and making the /usr/local/etc/sasldb* file(s) readable by group mail (this should be the default for new installs). + +If you are upgrading from postfix version prior to 2.0, please see the README +files for recommended changes to your configuration. diff -ruN postfix1.orig/scripts/configure.postfix postfix1/scripts/configure.postfix --- postfix1.orig/scripts/configure.postfix Tue May 31 05:11:30 2005 +++ postfix1/scripts/configure.postfix Wed Aug 10 19:58:58 2005 @@ -92,7 +92,6 @@ echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz" echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff" - echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; >Release-Note: >Audit-Trail: >Unformatted: