13141e0740
closes a security issue in multipart form handling (buffer overflow) temporarily disable the freetds flavour, since the m4 patch cannot seem to be regenerated
121 lines
2.5 KiB
Plaintext
121 lines
2.5 KiB
Plaintext
$OpenBSD: patch-configure,v 1.10 2002/03/03 12:13:29 avsm Exp $
|
|
--- configure.orig Wed Feb 27 09:18:32 2002
|
|
+++ configure Sun Mar 3 11:22:25 2002
|
|
@@ -4644,7 +4644,7 @@ if test "${with_thttpd+set}" = set; then
|
|
|
|
if test -n "$GCC"; then
|
|
|
|
- gcc_arg_name=ac_cv_gcc_arg_rdynamc
|
|
+ gcc_arg_name=ac_cv_gcc_arg_rdynamic
|
|
echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
|
|
echo "configure:4650: checking whether $CC supports -rdynamic" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
|
|
@@ -24916,22 +24916,22 @@ EOF
|
|
fi
|
|
|
|
|
|
- case gssapi_krb5 in
|
|
+ case gssapi in
|
|
c|c_r|pthread*) ;;
|
|
*)
|
|
|
|
if test "$ext_shared" = "yes"; then
|
|
|
|
- IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lgssapi_krb5"
|
|
+ IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lgssapi"
|
|
|
|
else
|
|
|
|
- case gssapi_krb5 in
|
|
+ case gssapi in
|
|
c|c_r|pthread*) ;;
|
|
*)
|
|
|
|
|
|
- LIBS="$LIBS -lgssapi_krb5"
|
|
+ LIBS="$LIBS -lgssapi"
|
|
|
|
|
|
;;
|
|
@@ -24970,22 +24970,22 @@ EOF
|
|
esac
|
|
|
|
|
|
- case k5crypto in
|
|
+ case asn1 in
|
|
c|c_r|pthread*) ;;
|
|
*)
|
|
|
|
if test "$ext_shared" = "yes"; then
|
|
|
|
- IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lk5crypto"
|
|
+ IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lasn1"
|
|
|
|
else
|
|
|
|
- case k5crypto in
|
|
+ case asn1 in
|
|
c|c_r|pthread*) ;;
|
|
*)
|
|
|
|
|
|
- LIBS="$LIBS -lk5crypto"
|
|
+ LIBS="$LIBS -lasn1"
|
|
|
|
|
|
;;
|
|
@@ -24997,22 +24997,22 @@ EOF
|
|
esac
|
|
|
|
|
|
- case com_err in
|
|
+ case com_err_pic in
|
|
c|c_r|pthread*) ;;
|
|
*)
|
|
|
|
if test "$ext_shared" = "yes"; then
|
|
|
|
- IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lcom_err"
|
|
+ IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lcom_err_pic"
|
|
|
|
else
|
|
|
|
- case com_err in
|
|
+ case com_err_pic in
|
|
c|c_r|pthread*) ;;
|
|
*)
|
|
|
|
|
|
- LIBS="$LIBS -lcom_err"
|
|
+ LIBS="$LIBS -lcom_err_pic"
|
|
|
|
|
|
;;
|
|
@@ -25157,7 +25157,7 @@ EOF
|
|
old_LIBS=$LIBS
|
|
LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB"
|
|
if test $PHP_KERBEROS != "no"; then
|
|
- LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
|
|
+ LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi -lkrb5 -lasn1 -lcom_err_pic"
|
|
fi
|
|
|
|
if test "$cross_compiling" = yes; then
|
|
@@ -57561,7 +57561,7 @@ unset with_pic
|
|
|
|
case $php_build_target in
|
|
program|static)
|
|
- standard_libtool_flag='-prefer-non-pic -static'
|
|
+ standard_libtool_flag='-static'
|
|
if test "$lib_build_shared" != "yes"; then
|
|
enable_shared=no
|
|
fi
|
|
@@ -57570,7 +57570,7 @@ program|static)
|
|
;;
|
|
shared)
|
|
enable_static=no
|
|
- standard_libtool_flag=-prefer-pic
|
|
+ standard_libtool_flag=
|
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version"
|
|
;;
|
|
esac
|