From 9e83e22976ac5d61ae03000e52de4545fcee4eb2 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 7 Aug 2004 08:11:25 +0000 Subject: Mirror changes to mail/postfix: Reduce the number of patches needed by Postfix by using the subst framework and also by explicitly specifying more default values for Postfix parameters. Also pass -I/usr/pkg/include/sasl to the compiler when building using Cyrus SASLv2, which allows me to remove the patches that added an unnecessary USE_SASL2_AUTH check. --- mail/postfix-current/patches/patch-ab | 23 -------------- mail/postfix-current/patches/patch-ac | 23 -------------- mail/postfix-current/patches/patch-ae | 29 ----------------- mail/postfix-current/patches/patch-af | 60 ----------------------------------- mail/postfix-current/patches/patch-ah | 23 -------------- 5 files changed, 158 deletions(-) delete mode 100644 mail/postfix-current/patches/patch-ab delete mode 100644 mail/postfix-current/patches/patch-ac delete mode 100644 mail/postfix-current/patches/patch-ae delete mode 100644 mail/postfix-current/patches/patch-af delete mode 100644 mail/postfix-current/patches/patch-ah (limited to 'mail/postfix-current/patches') diff --git a/mail/postfix-current/patches/patch-ab b/mail/postfix-current/patches/patch-ab deleted file mode 100644 index 6c535a114ab..00000000000 --- a/mail/postfix-current/patches/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2004/07/02 08:03:04 martti Exp $ - ---- src/lmtp/lmtp.h.orig 2003-09-10 02:48:03.000000000 +0200 -+++ src/lmtp/lmtp.h 2004-01-20 20:30:12.000000000 +0100 -@@ -11,10 +11,18 @@ - /* - * SASL library. - */ -+#ifdef USE_SASL2_AUTH -+#ifndef USE_SASL_AUTH -+#define USE_SASL_AUTH -+#endif -+#include -+#include -+#else - #ifdef USE_SASL_AUTH - #include - #include - #endif -+#endif - - /* - * Utility library. diff --git a/mail/postfix-current/patches/patch-ac b/mail/postfix-current/patches/patch-ac deleted file mode 100644 index 26261cb6ccc..00000000000 --- a/mail/postfix-current/patches/patch-ac +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2004/07/02 08:03:04 martti Exp $ - ---- src/smtp/smtp.h.orig 2002-05-23 21:18:02.000000000 +0200 -+++ src/smtp/smtp.h 2004-01-20 20:29:21.000000000 +0100 -@@ -11,10 +11,18 @@ - /* - * SASL library. - */ -+#ifdef USE_SASL2_AUTH -+#ifndef USE_SASL_AUTH -+#define USE_SASL_AUTH -+#endif -+#include -+#include -+#else - #ifdef USE_SASL_AUTH - #include - #include - #endif -+#endif - - /* - * Utility library. diff --git a/mail/postfix-current/patches/patch-ae b/mail/postfix-current/patches/patch-ae deleted file mode 100644 index 62818d309bd..00000000000 --- a/mail/postfix-current/patches/patch-ae +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2004/07/31 05:53:44 jlam Exp $ - ---- src/global/mail_params.h.orig 2004-04-21 14:56:04.000000000 -0400 -+++ src/global/mail_params.h 2004-05-23 22:44:13.000000000 -0400 -@@ -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; - -@@ -202,13 +202,13 @@ - */ - #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; - - #define VAR_COMMAND_DIR "command_directory" - #ifndef DEF_COMMAND_DIR --#define DEF_COMMAND_DIR "/usr/sbin" -+#define DEF_COMMAND_DIR "@PREFIX@/sbin" - #endif - extern char *var_command_dir; - diff --git a/mail/postfix-current/patches/patch-af b/mail/postfix-current/patches/patch-af deleted file mode 100644 index 06bbcd5ed40..00000000000 --- a/mail/postfix-current/patches/patch-af +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-af,v 1.11 2004/07/31 05:53:44 jlam Exp $ - ---- conf/main.cf.orig 2004-04-15 09:27:21.000000000 -0400 -+++ conf/main.cf 2004-05-23 22:51:16.000000000 -0400 -@@ -32,13 +32,18 @@ - # 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 -+ -+# Shared files and etc directory -+etc_directory = @PKG_SYSCONFDIR@ -+share_directory = @PREFIX@/share/examples/postfix -+man_directory = @PREFIX@/man - - # QUEUE AND PROCESS OWNERSHIP - # -@@ -56,7 +61,7 @@ - # These rights are used in the absence of a recipient user context. - # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. - # --#default_privs = nobody -+default_privs = nobody - - # INTERNET HOST AND DOMAIN NAMES - # -@@ -611,7 +616,7 @@ - # 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. - # -@@ -619,13 +624,13 @@ - - # 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@/share/examples/postfix - - # readme_directory: The location of the Postfix README files. - # --readme_directory = -+readme_directory = @PREFIX@/share/doc/postfix diff --git a/mail/postfix-current/patches/patch-ah b/mail/postfix-current/patches/patch-ah deleted file mode 100644 index d83dbe02eb5..00000000000 --- a/mail/postfix-current/patches/patch-ah +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2004/07/02 08:03:04 martti Exp $ - ---- src/smtpd/smtpd.h.orig 2003-10-02 06:48:30.000000000 -0400 -+++ src/smtpd/smtpd.h 2003-10-02 06:48:31.000000000 -0400 -@@ -16,10 +16,18 @@ - /* - * SASL library. - */ -+#ifdef USE_SASL2_AUTH -+#ifndef USE_SASL_AUTH -+#define USE_SASL_AUTH -+#endif -+#include -+#include -+#else - #ifdef USE_SASL_AUTH - #include - #include - #endif -+#endif - - /* - * Utility library. -- cgit v1.2.3