Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18850
Added Files:
postfix-unified.info postfix-unified.patch
Removed Files:
postfix.info postfix.patch
Log Message:
Now uses system's OpenSSL (via system-openssl-dev) and removed from crypto
tree. Yay!
--- postfix.patch DELETED ---
--- NEW FILE: postfix-unified.patch ---
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 =
+
+# THE FOLLOWING DEFAULTS ARE SET BY APPLE
+#
+# bind to localhost only
+#
+inet_interfaces = localhost
+
+# turn off relaying for local subnet
+#
+mynetworks_style = host
+
+# mydomain_fallback: optional domain to use if mydomain is not set and
+# myhostname is not fully qualified. It is ignored if neither are true.
+#
+mydomain_fallback = localhost
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
-PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
[EMAIL
PROTECTED]@/bin:@FINKPREFIX@/sbin:/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
SHELL=/bin/sh
IFS="
"
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
- SYSLIBS=-flat_namespace
+ #SYSLIBS=-flat_namespace
CCARGS="$CCARGS -DBIND_8_COMPAT -DNO_NETINFO"
;;
esac
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
+
+PREFIX="@FINKPREFIX@"
+
+function sendmailPointsToPostfix () {
+ if [ -L /usr/sbin/sendmail -a "`/bin/ls -l /usr/sbin/sendmail | sed -e
's|.* -> \(.*\)$|\1|'`x" == "${PREFIX}/sbin/sendmailx" ] ; then
+ return 0
+ else
+ return 1
+ fi
+}
+
+case "$1" in
+ install|setup|enable|activate|start|postfix|fink)
+ echo -n 'Checking if we need to move /usr/sbin/sendmail out of
the way... '
+
+ if sendmailPointsToPostfix ; then
+ echo 'no.'
+ echo 'Fink Postfix is already in place.'
+ else
+ echo 'yes.'
+
+ if [ -f /usr/sbin/sendmail.old ] ; then
+ echo -n '/usr/sbin/sendmail.old already exists.
Would you like to overwrite it [yN]? '
+
+ read ANS
+ case "$ANS" in
+ y*|Y*) rm -f /usr/sbin/sendmail.old ||
exit 1 ;;
+ *) echo
'/usr/sbin/sendmail.old in the way. Failed.' ; exit 1 ;;
+ esac
+ fi
+
+ echo
+ echo 'Backing up the old sendmail to
/usr/sbin/sendmail.old.'
+ mv /usr/sbin/sendmail /usr/sbin/sendmail.old || exit 1
+ echo "Putting a link to Fink Postfix's sendmail in its
place."
+ ln -s "${PREFIX}/sbin/sendmail" /usr/sbin/sendmail ||
exit 1
+ echo 'Succeeded.'
+ echo
+
+ if [ "x$2" == "x-n" ] ; then
+ echo "Won't try to disable Apple's postfix."
+ exit;
+ fi
+
+ 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 # 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
+ ;;
+
+ stop|remove|uninstall|delete|rm|disable|sendmail|apple)
+ echo -n 'Checking if /usr/sbin/sendmail points to Fink
Postfix... '
+
+ if sendmailPointsToPostfix ; then
+ echo 'yes.'
+
+ if [ ! -f /usr/sbin/sendmail.old ] ; then
+ echo '/usr/sbin/sendmail.old does not exist;
cannot restore sendmail.'
+ exit 1;
+ fi
+
+ echo
+ echo 'Replacing /usr/sbin/sendmail with sendmail.old'
+ mv /usr/sbin/sendmail.old /usr/sbin/sendmail || exit 1
+ echo 'Succeeded.'
+ echo
+
+ if [ "x$2" == "x-n" ] ; then
+ echo "Won't try to disable Apple's postfix."
+ exit;
+ fi
+
+ 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 "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
+ echo 'no.'
+ echo 'Not making any changes.'
+ fi
+ ;;
+
+ *) echo "mta-switch -- Switches between Fink's and Apple's
Postfix."
+ echo 'usage: mta-switch {fink|apple} [-n]'
+ echo " -n don't try to disable Apple's postfix"
+ exit 1
+ ;;
+esac
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"
-#define ALIAS_DB_MAP "hash:/etc/aliases"
+#define ALIAS_DB_MAP "hash:@FINKPREFIX@/etc/postfix/aliases"
#define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
-#define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin"
+#define ROOT_PATH
"@FINKPREFIX@/bin:@FINKPREFIX@/sbin:/bin:/usr/bin:/sbin:/usr/sbin"
#define USE_STATFS
#define STATFS_IN_SYS_MOUNT_H
#define HAS_POSIX_REGEXP
--- NEW FILE: postfix-unified.info ---
Info2: <<
Package: postfix%type_pkg[-mysql]-unified
Version: 2.2.5
Revision: 1
Type: -mysql (boolean)
Homepage: http://www.postfix.org/
Description: Mail transfer agent that's fast and secure
DescDetail: <<
Postfix is Wietse Venema's mailer that started life as an alternative to
the widely-used Sendmail program. Postfix attempts to be fast, easy to
administer, and secure, while at the same time being sendmail compatible
enough to not upset existing users. Thus, the outside has a sendmail-ish
flavor, but the inside is completely different.
This package provides TLS encryption and SASL authentication.
<<
DescUsage: <<
You need to do a few things to set Postfix up before you can use it:
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). Information
on setting up TLS encryption can be found in
%p/share/doc/postfix-unified/tls.
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.
3) Run 'sudo mta-switch fink' to move the old sendmail from Apple's Postfix
out of the way and place symlinks to Fink's Postfix in its place. You may
need to do this after upgrades of Mac OS X from Apple. If you are running
the system's Postfix, you must stop it before starting the Fink installed
one or things could get very confused: 'sudo /usr/sbin/postfix stop'.
4) Run 'sudo daemonic enable postfix'. This will create a Postfix startup
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
Apple's postfix.
<<
DescPackaging: <<
Adds startup item via daemonic, and an mta-switch shell script.
NetInfo support disabled since Apple has depreciated it and no longer supplies
the necessary header files.
Now uses system's OpenSSL (via system-openssl-dev) and removed from crypto
tree. Yay!
Original maintainer: Daniel Parks <[EMAIL PROTECTED]>
<<
License: OSI-Approved
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Depends: daemonic, db43-ssl-shlibs | db43-shlibs, pcre-shlibs,
cyrus-sasl2-shlibs, (%type_raw[-mysql] = -mysql) mysql14-shlibs
BuildDepends: db43-ssl | db43, pcre, cyrus-sasl2-dev, system-openssl-dev,
(%type_raw[-mysql] = -mysql) mysql14-dev
Conflicts: postfix-release
Replaces: postfix-release, postfix (<< %v-%r), postfix-mysql (<< %v-%r),
postfix-tls (<< %v-%r), postfix-mysql-tls (<< %v-%r)
Recommends: cyrus-sasl2
Source:
ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%v.tar.gz
Source-MD5: 9c13d58494c64012bfd8ab0d6967305c
PatchScript: <<
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: <<
#!/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\" \
-DUSE_TLS -DUSE_SASL_AUTH -DHAS_MYSQL \
-I. -I../../include -I%p/include/mysql -I%p/lib/system-openssl/include
-I%p/include/db4 -I%p/include/sasl -I%p/include' \
AUXLIBS="-L%p/lib/system-openssl/lib -L%p/lib -lssl -lcrypto -ldb
-lsasl2 -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\" \
-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\" \
-DUSE_TLS -DUSE_SASL_AUTH \
-I. -I../../include -I%p/lib/system-openssl/include -I%p/include/db4
-I%p/include/sasl -I%p/include' \
AUXLIBS="-L%p/lib/system-openssl/lib -L%p/lib -lssl -lcrypto -ldb
-lsasl2"
fi
make
<<
InstallScript: <<
make non-interactive-package install_root="%d"
install -m0755 mta-switch %i/sbin
<<
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
%p/etc/postfix/virtual
<<
DaemonicName: postfix
DaemonicFile: <<
<service>
<description>Postfix Mail Transfer Agent</description>
<message>Postfix</message>
<daemon name="postfix">
<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>
<<
PreInstScript: <<
echo 'Stopping postfix in case you are upgrading from an old version.'
{ [ -x %p/sbin/postfix ] && %p/sbin/postfix stop ; } || true
<<
PostInstScript: <<
%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 postfix
echo "Stopping postfix..."
%p/sbin/postfix stop >& /dev/null || true
yes 'n' | mta-switch apple
fi
<<
SplitOff: <<
Package: postfix%type_pkg[-mysql]-tls
Description: Upgrade package for postfix%type_pkg[-mysql]-tls
Depends: %N (= %v-%r)
DocFiles: LICENSE
<<
SplitOff2: <<
Package: postfix%type_pkg[-mysql]
Description: Upgrade package for postfix%type_pkg[-mysql]
Depends: %N (= %v-%r)
DocFiles: LICENSE
<<
<<
--- postfix.info DELETED ---
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
