Date: Wed, 9 Mar 2005 18:45:25 -0300 (BRT) From: Marcus Grando <marcus@corp.grupos.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/78647: Update port: mail/postfix-current to 2.3-20050308 Message-ID: <20050309214525.E4BB520A25@corp.grupos.com.br> Resent-Message-ID: <200503092150.j29Lo2v2095124@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 78647
>Category: ports
>Synopsis: Update port: mail/postfix-current to 2.3-20050308
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 09 21:50:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Marcus Grando
>Release: FreeBSD 4.11-STABLE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD corp.grupos.com.br 4.11-STABLE FreeBSD 4.11-STABLE #42: Sun Feb 27 20:04:47 BRT 2005 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386
>Description:
Update port: mail/postfix-current to 2.3-20050308
* Update to 2.3-20050308
* Changes in scripts/configure.postfix
Removed files:
* files/patch-src::global::mail_version.h
>How-To-Repeat:
>Fix:
--- postfix-current.patch begins here ---
diff -ruN postfix-current.old/Makefile postfix-current/Makefile
--- postfix-current.old/Makefile Sun Mar 6 01:03:55 2005
+++ postfix-current/Makefile Wed Mar 9 17:01:48 2005
@@ -32,7 +32,7 @@
MAINTAINER= marcus@corp.grupos.com.br
COMMENT= A secure alternative to widely-used Sendmail
-PORTVERSIONRAW= 2.3-20050304
+PORTVERSIONRAW= 2.3-20050308
CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
NO_LATEST_LINK= yes
diff -ruN postfix-current.old/distinfo postfix-current/distinfo
--- postfix-current.old/distinfo Sun Mar 6 01:03:55 2005
+++ postfix-current/distinfo Wed Mar 9 17:07:49 2005
@@ -1,2 +1,2 @@
-MD5 (postfix/postfix-2.3-20050304.tar.gz) = 0f76384ea2b344d51d1d77a61853f308
-SIZE (postfix/postfix-2.3-20050304.tar.gz) = 2397445
+MD5 (postfix/postfix-2.3-20050308.tar.gz) = fffd69218f6e34a6c706882ed2255bff
+SIZE (postfix/postfix-2.3-20050308.tar.gz) = 2407890
diff -ruN postfix-current.old/files/patch-src::global::mail_version.h postfix-current/files/patch-src::global::mail_version.h
--- postfix-current.old/files/patch-src::global::mail_version.h Sat Mar 5 11:51:14 2005
+++ postfix-current/files/patch-src::global::mail_version.h Wed Dec 31 21:00:00 1969
@@ -1,11 +0,0 @@
---- src/global/mail_version.h.orig Sat Mar 5 11:50:13 2005
-+++ src/global/mail_version.h Sat Mar 5 11:50:23 2005
-@@ -21,7 +21,7 @@
- * release date only.
- */
- #define MAIL_RELEASE_DATE "20050304"
--#define MAIL_VERSION_NUMBER "2.2"
-+#define MAIL_VERSION_NUMBER "2.3"
-
- #define VAR_MAIL_VERSION "mail_version"
- #ifdef SNAPSHOT
diff -ruN postfix-current.old/scripts/configure.postfix postfix-current/scripts/configure.postfix
--- postfix-current.old/scripts/configure.postfix Sat Mar 5 11:39:13 2005
+++ postfix-current/scripts/configure.postfix Wed Mar 9 18:41:25 2005
@@ -5,7 +5,7 @@
exit
fi
-tempfile=`mktemp -t checklist`
+tempfile=`/usr/bin/mktemp -t checklist`
if [ "${POSTFIX_OPTIONS}" ]; then
set ${POSTFIX_OPTIONS}
@@ -46,10 +46,10 @@
case $retval in
0) if [ -z "$*" ]; then
- echo "Nothing selected"
+ /bin/echo "Nothing selected"
fi
;;
- 1) echo "Cancel pressed."
+ 1) /bin/echo "Cancel pressed."
exit 1
;;
esac
@@ -58,56 +58,52 @@
${MKDIR} ${WRKDIRPREFIX}${CURDIR}
exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-echo "PREFIX= ${PREFIX}"
+/bin/echo "PREFIX= ${PREFIX}"
SUB_TEST="@comment "
while [ "$1" ]; do
case $1 in
NOPCRE)
- echo "WITHOUT_PCRE= yes"
- echo "NOPCRE_SUFFIX= +nopcre"
+ /bin/echo "WITHOUT_PCRE= yes"
+ /bin/echo "NOPCRE_SUFFIX= +nopcre"
SUB_NOPCRE=""
;;
- 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 "USE_MYSQL=YES"
- echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
- echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
- fi
- fi
- SUB_SASL=""
- ;;
+ SASL)
+ /bin/echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl"
+ /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
+ /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
+ /bin/echo "SASL_SUFFIX= +sasl"
+ if [ -f ${LOCALBASE}/lib/libsasl.a ]; then
+ if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then
+ SASL_USE_MYSQL="YES"
+ fi
+ fi
+ 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 "USE_MYSQL=YES"
- echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
- echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
+ /bin/echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
+ /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
+ /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
+ /bin/echo "SASL_SUFFIX= +sasl2"
+ if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then
+ if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then
+ SASL_USE_MYSQL="YES"
fi
fi
SUB_SASL=""
;;
SASLKRB)
- echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+ /bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
;;
SASLKRB5)
- echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
+ /bin/echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
;;
TLS)
- echo "USE_OPENSSL= yes"
- echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}"
- echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"
- echo "TLS_SUFFIX= +tls"
+ /bin/echo "USE_OPENSSL= yes"
+ /bin/echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}"
+ /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"
+ /bin/echo "TLS_SUFFIX= +tls"
;;
DB3)
if [ "X$BDB_SELECTED" != "X" ]; then
@@ -115,10 +111,10 @@
rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
exit 1
fi
- echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3"
- echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
- echo "DB_SUFFIX= +db3"
+ /bin/echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3"
+ /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
+ /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
+ /bin/echo "DB_SUFFIX= +db3"
BDB_SELECTED="3"
;;
DB40)
@@ -127,10 +123,10 @@
rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
exit 1
fi
- echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4"
- echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4"
- echo "DB_SUFFIX= +db40"
+ /bin/echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4"
+ /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4"
+ /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4"
+ /bin/echo "DB_SUFFIX= +db40"
BDB_SELECTED="40"
;;
DB41)
@@ -139,10 +135,10 @@
rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
exit 1
fi
- echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41"
- echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41"
- echo "DB_SUFFIX= +db41"
+ /bin/echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41"
+ /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41"
+ /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41"
+ /bin/echo "DB_SUFFIX= +db41"
BDB_SELECTED="41"
;;
DB42)
@@ -151,10 +147,10 @@
rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
exit 1
fi
- echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42"
- echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb"
- echo "DB_SUFFIX= +db42"
+ /bin/echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42"
+ /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42"
+ /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb"
+ /bin/echo "DB_SUFFIX= +db42"
BDB_SELECTED="42"
;;
DB43)
@@ -163,41 +159,49 @@
rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
exit 1
fi
- echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43"
- echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb"
- echo "DB_SUFFIX= +db43"
+ /bin/echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43"
+ /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43"
+ /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb"
+ /bin/echo "DB_SUFFIX= +db43"
BDB_SELECTED="43"
;;
MySQL)
- echo "USE_MYSQL=YES"
- echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
- echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
- echo "MYSQL_SUFFIX= +mysql"
+ /bin/echo "USE_MYSQL=YES"
+ /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
+ if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
+ if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
+ /bin/echo "USE_OPENSSL= yes"
+ /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}"
+ /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"
+ fi
+ fi
+ /bin/echo "MYSQL_SUFFIX= +mysql"
+ MYSQL_SELECTED="YES"
;;
PgSQL)
- echo "USE_PGSQL=YES"
- echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
- echo "PGSQL_SUFFIX= +pgsql"
+ /bin/echo "USE_PGSQL=YES"
+ /bin/echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include"
+ /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
+ /bin/echo "PGSQL_SUFFIX= +pgsql"
;;
OpenLDAP)
- echo "USE_OPENLDAP=YES"
- echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber"
- echo "OPENLDAP_SUFFIX= +openldap"
+ /bin/echo "USE_OPENLDAP=YES"
+ /bin/echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
+ /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber"
+ /bin/echo "OPENLDAP_SUFFIX= +openldap"
;;
NIS)
- echo "POSTFIX_CCARGS+= -DHAS_NIS"
- echo "NIS_SUFFIX= +nis"
+ /bin/echo "POSTFIX_CCARGS+= -DHAS_NIS"
+ /bin/echo "NIS_SUFFIX= +nis"
;;
Test)
- echo "BIN1= smtp-sink smtp-source qmqp-source"
-# echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
+ /bin/echo "BIN1= smtp-sink smtp-source qmqp-source"
+# /bin/echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
SUB_TEST=""
;;
*)
- echo "Unknown option(s): $*" > /dev/stderr
+ /bin/echo "Unknown option(s): $*" > /dev/stderr
rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
exit 1
;;
@@ -205,10 +209,28 @@
shift
done
-echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
+if [ -z "${BATCH}" ]; then
+ if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then
+ /usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr
+ if [ $? = 0 ]; then
+ /bin/echo "USE_MYSQL=YES"
+ /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
+ /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
+ if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
+ if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
+ /bin/echo "USE_OPENSSL= yes"
+ /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}"
+ /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"
+ fi
+ fi
+ fi
+ fi
+fi
+
+/bin/echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
# for some reason, if we alter the pkg name this way, the first build (where
# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will. so "make; make install" will build twice.
+# any subsequent build will. so "make; make install" will build twice.
# don't do this for now.
-#echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"
+#/bin/echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"
--- postfix-current.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050309214525.E4BB520A25>