Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30323
Modified Files:
postfix.info postfix.patch
Log Message:
Moved from unstable.
Index: postfix.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/net/postfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postfix.patch 10 Oct 2004 21:37:47 -0000 1.1
+++ postfix.patch 29 May 2005 23:49:04 -0000 1.2
@@ -1,7 +1,7 @@
-diff -ruN postfix-2.1.4.orig/conf/main.cf postfix-2.1.4/conf/main.cf
---- postfix-2.1.4.orig/conf/main.cf Sun Jun 6 17:53:58 2004
-+++ postfix-2.1.4/conf/main.cf Sat Sep 11 21:45:44 2004
-@@ -629,3 +629,18 @@
+diff -Nur postfix-2.2.1.orig/conf/main.cf postfix-2.2.1/conf/main.cf
+--- postfix-2.2.1.orig/conf/main.cf 2005-03-04 12:48:25.000000000 -0500
++++ postfix-2.2.1/conf/main.cf 2005-03-22 14:03:23.000000000 -0500
+@@ -642,3 +642,18 @@
# readme_directory: The location of the Postfix README files.
#
readme_directory =
@@ -20,9 +20,9 @@
+# myhostname is not fully qualified. It is ignored if neither are true.
+#
+mydomain_fallback = localhost
-diff -ruN postfix-2.1.4.orig/conf/post-install postfix-2.1.4/conf/post-install
---- postfix-2.1.4.orig/conf/post-install Wed Apr 21 21:05:34 2004
-+++ postfix-2.1.4/conf/post-install Sat Sep 11 21:45:44 2004
+diff -Nur postfix-2.2.1.orig/conf/post-install postfix-2.2.1/conf/post-install
+--- postfix-2.2.1.orig/conf/post-install 2005-03-04 20:16:29.000000000
-0500
++++ postfix-2.2.1/conf/post-install 2005-03-22 14:03:23.000000000 -0500
@@ -185,7 +185,7 @@
umask 022
@@ -32,10 +32,10 @@
SHELL=/bin/sh
IFS="
"
-diff -ruN postfix-2.1.4.orig/makedefs postfix-2.1.4/makedefs
---- postfix-2.1.4.orig/makedefs Wed Apr 14 14:59:43 2004
-+++ postfix-2.1.4/makedefs Sat Sep 11 21:45:44 2004
-@@ -268,7 +268,7 @@
+diff -Nur postfix-2.2.1.orig/makedefs postfix-2.2.1/makedefs
+--- postfix-2.2.1.orig/makedefs 2005-02-22 07:35:52.000000000 -0500
++++ postfix-2.2.1/makedefs 2005-03-22 14:03:23.000000000 -0500
+@@ -307,7 +307,7 @@
SYSLIBS=-flat_namespace
;;
*) AWK=awk
@@ -44,10 +44,10 @@
CCARGS="$CCARGS -DBIND_8_COMPAT -DNO_NETINFO"
;;
esac
-diff -ruN postfix-2.1.4.orig/mta-switch postfix-2.1.4/mta-switch
---- postfix-2.1.4.orig/mta-switch Wed Dec 31 19:00:00 1969
-+++ postfix-2.1.4/mta-switch Sat Sep 11 21:45:45 2004
-@@ -0,0 +1,128 @@
+diff -Nur postfix-2.2.1.orig/mta-switch postfix-2.2.1/mta-switch
+--- postfix-2.2.1.orig/mta-switch 1969-12-31 19:00:00.000000000 -0500
++++ postfix-2.2.1/mta-switch 2005-03-22 17:37:08.000000000 -0500
+@@ -0,0 +1,140 @@
+#!/bin/sh
+
+# Moves /usr/sbin/sendmail out of the way for Fink Postfix install
@@ -91,18 +91,24 @@
+ echo
+
+ if [ "x$2" == "x-n" ] ; then
-+ echo 'Leaving /etc/hostconfig intact.'
++ echo "Won't try to disable Apple's postfix."
+ exit;
+ fi
+
-+ echo 'Now we will take a crack at /etc/hostconfig.'
-+ if grep '^[[:space:]]*MAILSERVER=-\(YES\|AUTOMATIC\)-'
/etc/hostconfig > /dev/null ; then
-+ echo "Backing up /etc/hostconfig to
/etc/hostconfig.old."
-+ echo 'Turning off the mail server in
/etc/hosconfig.'
-+ perl -pi.old
-e's,MAILSERVER=-(YES|AUTOMATIC)-,MAILSERVER=-NO-,' /etc/hostconfig || exit 1
++ if [ -x /bin/launchctl ] ; then # For 10.4 and later
++ echo 'Disabling postfix LaunchDaemon.'
++ /bin/launchctl unload -w
/System/Library/LaunchDaemons/org.postfix.master.plist
+ echo 'Succeeded.'
-+ else
-+ echo '/etc/hostconfig already has the mail
server disabled.'
++ else # For 10.3 and earlier
++ echo 'Now we will take a crack at
/etc/hostconfig.'
++ if grep
'^[[:space:]]*MAILSERVER=-\(YES\|AUTOMATIC\)-' /etc/hostconfig > /dev/null ;
then
++ echo "Backing up /etc/hostconfig to
/etc/hostconfig.old."
++ echo 'Turning off the mail server in
/etc/hosconfig.'
++ perl -pi.old
-e's,MAILSERVER=-(YES|AUTOMATIC)-,MAILSERVER=-NO-,' /etc/hostconfig || exit 1
++ echo 'Succeeded.'
++ else
++ echo '/etc/hostconfig already has the
mail server disabled.'
++ fi
+ fi
+ fi
+ ;;
@@ -125,43 +131,49 @@
+ echo
+
+ if [ "x$2" == "x-n" ] ; then
-+ echo 'Leaving /etc/hostconfig intact.'
++ echo "Won't try to disable Apple's postfix."
+ exit;
+ fi
+
-+ echo 'Now we will take a crack at /etc/hostconfig.'
-+ if grep '^[[:space:]]*MAILSERVER=-\(YES\|AUTOMATIC\)-'
/etc/hostconfig > /dev/null ; then
-+ echo 'Mail server is already enabled in
/etc/hostconfig.'
-+ else
-+ echo "Backing up /etc/hostconfig to
/etc/hostconfig.old."
-+ cp -p /etc/hostconfig /etc/hostconfig.old ||
exit 1
-+
-+ if ! grep '^[[:space:]]*MAILSERVER='
/etc/hostconfig > /dev/null ; then
-+ echo '/etc/hostconfig does not include
a MAILSERVER= line.'
-+ echo -n 'Would you like to add one[Yn]?
'
-+
-+ ANS='?';
-+ while [ $ANS == '?' ] ; do
-+ read ANS
-+ case "$ANS" in
-+ y*|Y*)
-+ echo
'MAILSERVER=-YES-' >> /etc/hostconfig || exit 1
-+ ;;
-+
-+ n*|N*)
-+ echo 'Leaving
/etc/hostconfig as it is, removing backup.'
-+ rm
/etc/hostconfig.old || exit 1
-+ ;;
-+
-+ *)
-+ ANS='?'
-+ ;;
-+ esac
-+ done
++ if [ -x /bin/launchctl ] ; then # For 10.4 and later
++ echo 'Enabling postfix LaunchDaemon.'
++ /bin/launchctl load -w
/System/Library/LaunchDaemons/org.postfix.master.plist
++ echo 'Succeeded.'
++ else # For 10.3 and earlier
++ echo 'Now we will take a crack at
/etc/hostconfig.'
++ if grep
'^[[:space:]]*MAILSERVER=-\(YES\|AUTOMATIC\)-' /etc/hostconfig > /dev/null ;
then
++ echo 'Mail server is already enabled in
/etc/hostconfig.'
+ else
-+ echo 'Turning on the mail server in
/etc/hosconfig.'
-+ perl -pi.old
-e's,MAILSERVER=-NO-,MAILSERVER=-YES-,' /etc/hostconfig || exit 1
-+ echo 'Succeeded.'
++ echo "Backing up /etc/hostconfig to
/etc/hostconfig.old."
++ cp -p /etc/hostconfig
/etc/hostconfig.old || exit 1
++
++ if ! grep '^[[:space:]]*MAILSERVER='
/etc/hostconfig > /dev/null ; then
++ echo '/etc/hostconfig does not
include a MAILSERVER= line.'
++ echo -n 'Would you like to add
one[Yn]? '
++
++ ANS='?';
++ while [ $ANS == '?' ] ; do
++ read ANS
++ case "$ANS" in
++ y*|Y*)
++ echo
'MAILSERVER=-YES-' >> /etc/hostconfig || exit 1
++ ;;
++
++ n*|N*)
++ echo
'Leaving /etc/hostconfig as it is, removing backup.'
++ rm
/etc/hostconfig.old || exit 1
++ ;;
++
++ *)
++ ANS='?'
++ ;;
++ esac
++ done
++ else
++ echo 'Turning on the mail
server in /etc/hosconfig.'
++ perl -pi.old
-e's,MAILSERVER=-NO-,MAILSERVER=-YES-,' /etc/hostconfig || exit 1
++ echo 'Succeeded.'
++ fi
+ fi
+ fi
+ else
@@ -172,15 +184,14 @@
+
+ *) echo "mta-switch -- Switches between Fink's and Apple's
Postfix."
+ echo 'usage: mta-switch {fink|apple} [-n]'
-+ echo ' -n turns off modifcation of /etc/hostconfig'
++ echo " -n don't try to disable Apple's postfix"
+ exit 1
+ ;;
+esac
-+
-diff -ruN postfix-2.1.4.orig/src/util/sys_defs.h
postfix-2.1.4/src/util/sys_defs.h
---- postfix-2.1.4.orig/src/util/sys_defs.h Mon Jun 14 14:13:40 2004
-+++ postfix-2.1.4/src/util/sys_defs.h Sat Sep 11 21:45:45 2004
-@@ -124,9 +124,9 @@
+diff -Nur postfix-2.2.1.orig/src/util/sys_defs.h
postfix-2.2.1/src/util/sys_defs.h
+--- postfix-2.2.1.orig/src/util/sys_defs.h 2005-02-03 19:07:44.000000000
-0500
++++ postfix-2.2.1/src/util/sys_defs.h 2005-03-22 14:03:23.000000000 -0500
+@@ -153,9 +153,9 @@
#define HAS_DB
#define HAS_SA_LEN
#define DEF_DB_TYPE "hash"
Index: postfix.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/net/postfix.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postfix.info 10 Oct 2004 21:37:47 -0000 1.1
+++ postfix.info 29 May 2005 23:49:04 -0000 1.2
@@ -1,6 +1,8 @@
-Package: postfix
-Version: 2.1.5
+Info2: <<
+Package: postfix%type_pkg[-mysql]
+Version: 2.2.3
Revision: 1
+Type: -mysql (boolean)
Homepage: http://www.postfix.org/
Description: Mail transfer agent that's fast and secure
@@ -17,11 +19,11 @@
DescUsage: <<
You need to do a few things to set Postfix up before you can use it:
- 1) Edit /sw/etc/postfix/main.cf. In particular, edit myorigin,
+ 1) Edit %p/etc/postfix/main.cf. In particular, edit myorigin,
mydestination and mynetworks in that file. The file is well commented.
More configuration options are documented in postconf(5).
- 2) Edit the aliases in /sw/etc/postfix/aliases so that mail to root,
+ 2) Edit the aliases in %p/etc/postfix/aliases so that mail to root,
and your user, go to your real email address. Run 'sudo newaliases'
to update the alias database file.
@@ -35,8 +37,13 @@
item, but it won't actually start Postfix. To do that, you can run
'sudo postfix start'.
+If you're upgrading from postfix 2.1.x, please read RELEASE_NOTES about
+configuration changes and adjust main.cf accordingly. The installation
+process will try to upgrade conf files automatically, but they should
+still be checked by hand.
+
Removing postfix via Fink will automatically disable it and re-enable
-sendmail.
+Apple's postfix.
<<
DescPackaging: <<
Adds startup item via daemonic, and an mta-switch shell script.
@@ -48,23 +55,38 @@
License: OSI-Approved
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
-Depends: daemonic, db42-shlibs | db42-ssl-shlibs, pcre-shlibs
-BuildDepends: db42 | db42-ssl, pcre
-Conflicts: postfix-release, postfix-tls
-Replaces: postfix-release, postfix-tls
+Depends: daemonic, db42-shlibs | db42-ssl-shlibs, pcre-shlibs,
(%type_raw[-mysql] = -mysql) mysql14-shlibs
+BuildDepends: db42 | db42-ssl, pcre, (%type_raw[-mysql] = -mysql) mysql14-dev
+Conflicts: postfix-release, postfix, postfix-mysql, postfix-tls,
postfix-mysql-tls
+Replaces: postfix-release, postfix, postfix-mysql, postfix-tls,
postfix-mysql-tls
Source:
ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%v.tar.gz
-Source-MD5: bcaa4aac80595d04c60c72844203a04d
+Source-MD5: f164b701c3e97b950d4cc64aff4de3c0
PatchScript: <<
-sed 's|@FINKPREFIX@|%p|g ' <%a/%n.patch | patch -p1
-perl -pi.bak -e's,/(etc|var/spool)/postfix,%p/\1/postfix,g' man/man1/*
man/man5/* man/man8/* conf/* html/*.html README_FILES/*
+sed 's|@FINKPREFIX@|%p|g ' <%a/%{ni}.patch | patch -p1
+perl -pi.bak -e's,/(etc|var/spool)/postfix,%p/\1/postfix,g;
s,/etc/aliases,%p/etc/postfix/aliases,g' man/man1/* man/man5/* man/man8/*
conf/* html/*.html README_FILES/*
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
CompileScript: <<
-make makefiles CCARGS='-DDEF_COMMAND_DIR=\"%p/sbin\" \
+#!/bin/sh -ev
+if [ "%type_raw[-mysql]" == "-mysql" ]; then
+ make makefiles CCARGS='-DDEF_COMMAND_DIR=\"%p/sbin\" \
+ -DDEF_CONFIG_DIR=\"%p/etc/postfix\" \
+ -DDEF_DAEMON_DIR=\"%p/lib/postfix\" \
+ -DDEF_MAILQ_PATH=\"%p/bin/mailq\" \
+ -DDEF_MANPAGE_DIR=\"%p/share/man\" \
+ -DDEF_NEWALIAS_PATH=\"%p/bin/newaliases\" \
+ -DDEF_README_DIR=\"%p/share/doc/%n/README_FILES\" \
+ -DDEF_HTML_DIR=\"%p/share/doc/%n/html\" \
+ -DDEF_QUEUE_DIR=\"%p/var/spool/postfix\" \
+ -DDEF_SENDMAIL_PATH=\"%p/sbin/sendmail\" \
+ -I. -I../../include -I%p/include/mysql -I%p/include/db4 -I%p/include' \
+ AUXLIBS="-L%p/lib -ldb -lmysqlclient"
+else
+ make makefiles CCARGS='-DDEF_COMMAND_DIR=\"%p/sbin\" \
-DDEF_CONFIG_DIR=\"%p/etc/postfix\" \
-DDEF_DAEMON_DIR=\"%p/lib/postfix\" \
-DDEF_MAILQ_PATH=\"%p/bin/mailq\" \
@@ -74,23 +96,24 @@
-DDEF_HTML_DIR=\"%p/share/doc/%n/html\" \
-DDEF_QUEUE_DIR=\"%p/var/spool/postfix\" \
-DDEF_SENDMAIL_PATH=\"%p/sbin/sendmail\" \
- -DHAS_DB \
-I. -I../../include -I%p/include/db4 -I%p/include' \
AUXLIBS="-L%p/lib -ldb"
+fi
make
<<
InstallScript: <<
- /bin/sh postfix-install -non-interactive install_root="%d"
+ make non-interactive-package install_root="%d"
install -m0755 mta-switch %i/sbin
<<
-DocFiles: AAAREADME COMPATIBILITY COPYRIGHT HISTORY LICENSE RELEASE_NOTES
RELEASE_NOTES-1.1 RELEASE_NOTES-2.0 US_PATENT_6321267
+DocFiles: AAAREADME COMPATIBILITY COPYRIGHT HISTORY IPv6-ChangeLog LICENSE
RELEASE_NOTES* TLS_* US_PATENT_6321267
ConfFiles: <<
%p/etc/postfix/main.cf
%p/etc/postfix/master.cf
%p/etc/postfix/access
%p/etc/postfix/aliases
%p/etc/postfix/canonical
+ %p/etc/postfix/generic
%p/etc/postfix/header_checks
%p/etc/postfix/relocated
%p/etc/postfix/transport
@@ -103,9 +126,9 @@
<message>Postfix</message>
<daemon name="postfix">
- <executable
checkexit="true">%p/sbin/postfix</executable>
- <parameters>start</parameters>
+ <executable
background="true">%p/lib/postfix/master</executable>
<configfile>%p/etc/postfix/main.cf</configfile>
+ <pidfile>%p/var/spool/postfix/pid/master.pid</pidfile>
</daemon>
</service>
<<
@@ -115,13 +138,16 @@
{ [ -x %p/sbin/postfix ] && %p/sbin/postfix stop ; } || true
<<
PostInstScript: <<
- %p/etc/postfix/post-install upgrade-package
+ %p/sbin/postconf -e "html_directory=%p/share/doc/%n/html"
+ %p/sbin/postconf -e "readme_directory=%p/share/doc/%n/README_FILES"
+ %p/sbin/postfix set-permissions upgrade-configuration
<<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
- daemonic remove %n
+ daemonic remove %{ni}
echo "Stopping postfix..."
%p/sbin/postfix stop >& /dev/null || true
yes 'n' | mta-switch apple
fi
<<
+<<
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
