OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Mar-2005 17:10:33
Branch: HEAD Handle: 2005032116103300
Modified files:
openpkg-src/sasl sasl.patch sasl.spec
Log:
reduce unnecessary libdb scanning and try linking both db_open(3) and
dbm_open(3) to avoid leaving older Berkeley DBs behind, also install
dbconverter-2 in sbin
Summary:
Revision Changes Path
1.14 +131 -0 openpkg-src/sasl/sasl.patch
1.127 +3 -3 openpkg-src/sasl/sasl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 sasl.patch
--- openpkg-src/sasl/sasl.patch 14 Jul 2004 17:41:33 -0000 1.13
+++ openpkg-src/sasl/sasl.patch 21 Mar 2005 16:10:33 -0000 1.14
@@ -40,3 +40,134 @@
#include "lak.h"
typedef struct lak_auth_method {
+Index: configure
+--- configure.orig 2005-03-21 15:33:01 +0100
++++ configure 2005-03-21 15:36:05 +0100
+@@ -5129,7 +5129,7 @@
+ fi
+
+ saved_LIBS=$LIBS
+- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4
db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in db
+ do
+ LIBS="$saved_LIBS -l$dbname"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -5208,6 +5208,54 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
++ if test "$dblib" = "no"; then
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <db.h>
++int
++main ()
++{
++dbm_open(NULL, 0, 0, 0, NULL, NULL, NULL);
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++dblib="no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ fi
+ LIBS=$saved_LIBS
+
+ LDFLAGS=$BDB_SAVE_LDFLAGS
+@@ -5885,7 +5933,7 @@
+ fi
+
+ saved_LIBS=$LIBS
+- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4
db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in db
+ do
+ LIBS="$saved_LIBS -l$dbname"
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -5964,6 +6012,54 @@
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
++ if test "$dblib" = "no"; then
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <db.h>
++int
++main ()
++{
++dbm_open(NULL, 0, 0, 0, NULL, NULL, NULL);
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++dblib="no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ fi
+ LIBS=$saved_LIBS
+
+ LDFLAGS=$BDB_SAVE_LDFLAGS
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.126 -r1.127 sasl.spec
--- openpkg-src/sasl/sasl.spec 17 Mar 2005 21:03:39 -0000 1.126
+++ openpkg-src/sasl/sasl.spec 21 Mar 2005 16:10:33 -0000 1.127
@@ -34,7 +34,7 @@
Group: Cryptography
License: BSD
Version: 2.1.20
-Release: 20050317
+Release: 20050321
# package options
%option with_fsl yes
@@ -111,8 +111,7 @@
%build
# disable some unwanted configure checks
%{l_shtool} subst \
- -e 's;^ *for dbname in ;for dbname in db ;' \
- -e 's;db_open;dbm_open;' \
+ -e 's;\(SASL_DB_UTILS="saslpasswd2 sasldblistusers2\);\1
dbconverter-2;' \
-e "s;javac;javac-xxx;g" \
-e "s;javah;javah-xxx;g" \
-e "s;javadoc;javadoc-xxx;g" \
@@ -232,6 +231,7 @@
# post adjustment: build utils against static library
%{l_shtool} subst \
-e 's;\(\$(CCLD)\);\1 -static;' \
+ -e 's;\(noinst.*=\) *dbconverter.*;\1;' \
utils/Makefile
# post adjustment: fix OpenLDAP support
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
