Date: Thu, 13 Jan 2005 00:51:48 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/76154: Allow cyrus-sasl2 & postfix users to use Berkeley DB 4.3 Message-ID: <20050112165148.AFC1D17081@sunpoet.net> Resent-Message-ID: <200501121701.j0CH10Me069449@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 76154 >Category: ports >Synopsis: Allow cyrus-sasl2 & postfix users to use Berkeley DB 4.3 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Jan 12 17:01:00 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 6.0-CURRENT i386 >Organization: SUNPOET.net >Environment: System: FreeBSD IRIS.sunpoet.net 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Thu Dec 16 03:44:24 CST 2004 sunpoet@IRIS.sunpoet.net:/usr/src/sys/i386/compile/sunpoet i386 >Description: Allow cyrus-sasl2 & postfix users to use Berkeley DB 4.3 >How-To-Repeat: >Fix: Apply these patches. % diff -u /usr/ports/security/cyrus-sasl2/Makefile.orig /usr/ports/security/cyrus-sasl2/Makefile --- /usr/ports/security/cyrus-sasl2/Makefile.orig Sat Dec 25 20:08:53 2004 +++ /usr/ports/security/cyrus-sasl2/Makefile Wed Jan 12 22:46:10 2005 @@ -66,8 +66,11 @@ .elif ${WITH_BDB_VER} == 42 LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db42 --with-bdb=db-4.2 +.elif ${WITH_BDB_VER} == 43 +LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43 +CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db43 --with-bdb=db-4.3 .else -BROKEN= "WITH_BDB_VER must be 3, 4, 41 or 42" +BROKEN= "WITH_BDB_VER must be 3, 4, 41, 42 or 43" .endif CONFIGURE_ARGS+=--with-dblib=berkeley --with-bdb-libdir=${LOCALBASE}/lib SASLDB_NAME= sasldb2 % diff -u /usr/ports/security/cyrus-sasl2-saslauthd/Makefile.orig /usr/ports/security/cyrus-sasl2-saslauthd/Makefile --- /usr/ports/security/cyrus-sasl2-saslauthd/.orig Fri Dec 3 22:35:42 2004 +++ /usr/ports/security/cyrus-sasl2-saslauthd/ Wed Jan 12 22:40:33 2005 @@ -56,8 +56,11 @@ .elif ${WITH_BDB_VER} == 42 LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42 CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db42 --with-bdb=db-4.2 +.elif ${WITH_BDB_VER} == 43 +LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43 +CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db43 --with-bdb=db-4.3 .else -BROKEN= "WITH_BDB_VER must be 3, 4, 41 or 42" +BROKEN= "WITH_BDB_VER must be 3, 4, 41, 42 or 43" .endif CONFIGURE_ARGS+=--with-dblib=berkeley --with-bdb-libdir=${LOCALBASE}/lib .else % diff -u /usr/ports/mail/postfix/scripts/configure.postfix.orig /usr/ports/mail/postfix/scripts/configure.postfix --- /usr/ports/mail/postfix/scripts/configure.postfix.orig Sat Nov 27 16:59:06 2004 +++ /usr/ports/mail/postfix/scripts/configure.postfix Wed Jan 12 22:52:49 2005 @@ -32,6 +32,7 @@ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \ +DB43 "Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43g" \ MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \ PgSQL "PostgreSQL v7.4 map lookups" "$status_PgSQL" \ PgSQL73 "PostgreSQL v7.3 map lookups" "$status_PgSQL73" \ @@ -123,7 +124,7 @@ ;; DB3) if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi @@ -135,7 +136,7 @@ ;; DB40) if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi @@ -147,7 +148,7 @@ ;; DB41) if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi @@ -159,7 +160,7 @@ ;; DB42) if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi @@ -168,6 +169,18 @@ echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" echo "DB_SUFFIX= +db42" BDB_SELECTED="42" + ;; + DB43) + if [ "X$BDB_SELECTED" != "X" ]; then + /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr + 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" + BDB_SELECTED="43" ;; MySQL) echo "USE_MYSQL=YES" >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050112165148.AFC1D17081>