mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
Update to latest snapshot
Add SASL2 support PR: 42751 Submitted by: maintainer, Marc G. Fournier
This commit is contained in:
David W. Chapman Jr.
parent
47be6d4a10
commit
c334966143
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=66515
8 changed files with 57 additions and 90 deletions
|
|
@ -6,7 +6,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= postfix
|
||||
PORTVERSION= 1.1.11-20020719
|
||||
PORTVERSION= 1.1.11-20020822
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= mail ipv6
|
||||
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
MD5 (postfix/postfix-1.1.11-20020719.tar.gz) = 6e229a63db7233bbd5dc6c86c9dc662d
|
||||
MD5 (postfix/pfixtls-0.8.11a-1.1.11-20020613-0.9.6d.tar.gz) = 6ed63e3941e8de1a9ca4c884dbc84125
|
||||
MD5 (postfix/postfix-1.1.11-20020822.tar.gz) = 1a82f18a9ce23dc7c6d29d7023281067
|
||||
MD5 (postfix/pfixtls-0.8.11a-1.1.11-20020822-0.9.6g.tar.gz) = 45661443f25719094ebb537d4865c07e
|
||||
MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
|
||||
MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +1,40 @@
|
|||
*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002
|
||||
--- ./conf/main.cf Tue Jan 8 22:41:50 2002
|
||||
*** ./conf/main.cf.orig Thu Aug 22 03:17:14 2002
|
||||
--- ./conf/main.cf Thu Aug 29 19:56:21 2002
|
||||
***************
|
||||
*** 31,44 ****
|
||||
*** 29,43 ****
|
||||
queue_directory = /var/spool/postfix
|
||||
|
||||
# The command_directory parameter specifies the location of all
|
||||
# postXXX commands. The default value is $program_directory.
|
||||
# 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). The
|
||||
# default value is $program_directory. This directory must be owned
|
||||
# by root.
|
||||
# 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
|
||||
#
|
||||
--- 31,44 ----
|
||||
--- 29,43 ----
|
||||
queue_directory = /var/spool/postfix
|
||||
|
||||
# The command_directory parameter specifies the location of all
|
||||
# postXXX commands. The default value is $program_directory.
|
||||
# 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). The
|
||||
# default value is $program_directory. This directory must be owned
|
||||
# by root.
|
||||
# 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
|
||||
#
|
||||
***************
|
||||
*** 325,332 ****
|
||||
*** 326,333 ****
|
||||
#
|
||||
# The home_mailbox parameter specifies the optional pathname of a
|
||||
# mailbox file relative to a user's home directory. The default
|
||||
|
|
@ -41,7 +43,7 @@
|
|||
#
|
||||
#home_mailbox = Mailbox
|
||||
#home_mailbox = Maildir/
|
||||
--- 325,332 ----
|
||||
--- 326,333 ----
|
||||
#
|
||||
# The home_mailbox parameter specifies the optional pathname of a
|
||||
# mailbox file relative to a user's home directory. The default
|
||||
|
|
@ -51,7 +53,7 @@
|
|||
#home_mailbox = Mailbox
|
||||
#home_mailbox = Maildir/
|
||||
***************
|
||||
*** 424,430 ****
|
||||
*** 444,450 ****
|
||||
#
|
||||
# See also the body_checks example in the sample-filter.cf file.
|
||||
#
|
||||
|
|
@ -59,7 +61,7 @@
|
|||
|
||||
# FAST ETRN SERVICE
|
||||
#
|
||||
--- 424,430 ----
|
||||
--- 444,450 ----
|
||||
#
|
||||
# See also the body_checks example in the sample-filter.cf file.
|
||||
#
|
||||
|
|
@ -68,19 +70,19 @@
|
|||
# FAST ETRN SERVICE
|
||||
#
|
||||
***************
|
||||
*** 525,531 ****
|
||||
*** 551,557 ****
|
||||
# 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 =
|
||||
|
||||
# manpage_path: The location of the Postfix on-line manual pages.
|
||||
# manpage_directory: The location of the Postfix on-line manual pages.
|
||||
#
|
||||
--- 525,531 ----
|
||||
--- 551,557 ----
|
||||
# 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
|
||||
|
||||
# manpage_path: The location of the Postfix on-line manual pages.
|
||||
# manpage_directory: The location of the Postfix on-line manual pages.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
***************
|
||||
*** 220,222 ****
|
||||
#
|
||||
! program_directory = /usr/libexec/postfix
|
||||
! daemon_directory = /usr/libexec/postfix
|
||||
|
||||
--- 220,222 ----
|
||||
#
|
||||
! program_directory = !!PREFIX!!/libexec/postfix
|
||||
! daemon_directory = !!PREFIX!!/libexec/postfix
|
||||
|
||||
***************
|
||||
*** 263,267 ****
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000
|
||||
--- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000
|
||||
***************
|
||||
*** 12,19 ****
|
||||
* SASL library.
|
||||
*/
|
||||
#ifdef USE_SASL_AUTH
|
||||
! #include <sasl.h>
|
||||
! #include <saslutil.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
--- 12,19 ----
|
||||
* SASL library.
|
||||
*/
|
||||
#ifdef USE_SASL_AUTH
|
||||
! #include <sasl1/sasl.h>
|
||||
! #include <sasl1/saslutil.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000
|
||||
--- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000
|
||||
***************
|
||||
*** 12,19 ****
|
||||
* SASL library.
|
||||
*/
|
||||
#ifdef USE_SASL_AUTH
|
||||
! #include <sasl.h>
|
||||
! #include <saslutil.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
--- 12,19 ----
|
||||
* SASL library.
|
||||
*/
|
||||
#ifdef USE_SASL_AUTH
|
||||
! #include <sasl1/sasl.h>
|
||||
! #include <sasl1/saslutil.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001
|
||||
+++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001
|
||||
@@ -12,8 +12,8 @@
|
||||
* SASL library.
|
||||
*/
|
||||
#ifdef USE_SASL_AUTH
|
||||
-#include <sasl.h>
|
||||
-#include <saslutil.h>
|
||||
+#include <sasl1/sasl.h>
|
||||
+#include <sasl1/saslutil.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -15,12 +15,13 @@ else
|
|||
Please select desired options:" -1 -1 16 \
|
||||
PCRE "Perl Compatible Regular Expressions" OFF \
|
||||
SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" OFF \
|
||||
SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" OFF \
|
||||
DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \
|
||||
MySQL "MySQL map lookups" OFF \
|
||||
PgSQL "PostgreSQL map lookups" OFF \
|
||||
OpenLDAP "OpenLDAP map lookups" OFF \
|
||||
Test "SMTP/LMTP test server and generator" OFF \
|
||||
TLS "SSL and TLS (currently broken)" OFF \
|
||||
TLS "SSL and TLS" OFF \
|
||||
IPv6 "IPv6 support (currently broken)" OFF \
|
||||
2> $tempfile
|
||||
|
||||
|
|
@ -59,13 +60,32 @@ while [ "$1" ]; do
|
|||
echo "PCRE_SUFFIX= +pcre"
|
||||
SUB_PCRE=""
|
||||
;;
|
||||
\"SASL\")
|
||||
echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl"
|
||||
echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include"
|
||||
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
|
||||
\"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 "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
|
||||
echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
|
||||
fi
|
||||
else
|
||||
echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
|
||||
echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
|
||||
fi
|
||||
echo ".if exists(/usr/lib/libkrb.a)"
|
||||
echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err"
|
||||
echo ".endif"
|
||||
SUB_SASL=""
|
||||
;;
|
||||
\"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 "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
|
||||
echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
|
||||
fi
|
||||
|
|
@ -82,8 +102,8 @@ while [ "$1" ]; do
|
|||
echo "MAN8+= tlsmgr.8"
|
||||
echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
|
||||
echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
|
||||
echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-20020613-0.9.6d.tar.gz"
|
||||
echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.11a-1.1.11-20020613-0.9.6d/pfixtls.diff"
|
||||
echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-20020822-0.9.6g.tar.gz"
|
||||
echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.11a-1.1.11-20020822-0.9.6g/pfixtls.diff"
|
||||
echo "PATCH_STRIP= -p1"
|
||||
echo "TLS_SUFFIX= +tls"
|
||||
SUB_TLS=""
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue