mirror of
https://git.freebsd.org/ports.git
synced 2025-06-16 18:20:33 -04:00
718daad6eb
* Fixes to cram plugin to avoid attempting to canonify uninitialized data.
* NTLM portability fixes.
* Avoid potential attack using SASL_PATH when sasl is used in a setuid
environment.
* A trivial number of small bugfixes.
98 lines
3.6 KiB
Text
98 lines
3.6 KiB
Text
Index: configure
|
|
diff -u configure.orig configure
|
|
--- configure.orig Mon Oct 25 05:21:08 2004
|
|
+++ configure Mon Oct 25 21:24:23 2004
|
|
@@ -1578,6 +1578,7 @@
|
|
fi
|
|
echo "$as_me:$LINENO: result: yes" >&5
|
|
echo "${ECHO_T}yes" >&6
|
|
+program_prefix=NONE
|
|
test "$program_prefix" != NONE &&
|
|
program_transform_name="s,^,$program_prefix,;$program_transform_name"
|
|
# Use a double $ so make ignores it.
|
|
@@ -5129,7 +5130,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 ${with_bdb} 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
|
|
do
|
|
LIBS="$saved_LIBS -l$dbname"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
@@ -5139,6 +5140,7 @@
|
|
cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
+#include <stdio.h>
|
|
#include <db.h>
|
|
int
|
|
main ()
|
|
@@ -5161,6 +5163,7 @@
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); }; }; then
|
|
BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
|
|
+ break
|
|
else
|
|
echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
@@ -5885,7 +5888,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 ${with_bdb} 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
|
|
do
|
|
LIBS="$saved_LIBS -l$dbname"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
@@ -5895,6 +5898,7 @@
|
|
cat confdefs.h >>conftest.$ac_ext
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
/* end confdefs.h. */
|
|
+#include <stdio.h>
|
|
#include <db.h>
|
|
int
|
|
main ()
|
|
@@ -5917,6 +5921,7 @@
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); }; }; then
|
|
BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
|
|
+ break
|
|
else
|
|
echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
@@ -7089,6 +7094,8 @@
|
|
SASLAUTHD_TRUE='#'
|
|
SASLAUTHD_FALSE=
|
|
fi
|
|
+SASLAUTHD_TRUE='#'
|
|
+SASLAUTHD_FALSE=
|
|
|
|
echo "$as_me:$LINENO: checking if I should include saslauthd" >&5
|
|
echo $ECHO_N "checking if I should include saslauthd... $ECHO_C" >&6
|
|
@@ -10084,7 +10091,7 @@
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
|
|
+LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi` $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
/* confdefs.h. */
|
|
@@ -10434,7 +10441,7 @@
|
|
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
|
|
elif test "$gss_impl" = "heimdal"; then
|
|
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
|
|
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
|
|
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
|
|
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
|
|
elif test "$gss_impl" = "cybersafe03"; then
|
|
# Version of CyberSafe with two libraries
|
|
@@ -11229,7 +11236,7 @@
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lpq $LIBS"
|
|
+LIBS="-lpq $GSSAPIBASE_LIBS $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
/* confdefs.h. */
|