diff options
Diffstat (limited to 'dns/bind911/files/patch-configure')
| -rw-r--r-- | dns/bind911/files/patch-configure | 135 |
1 files changed, 0 insertions, 135 deletions
diff --git a/dns/bind911/files/patch-configure b/dns/bind911/files/patch-configure deleted file mode 100644 index 4c0a1ea036fd..000000000000 --- a/dns/bind911/files/patch-configure +++ /dev/null @@ -1,135 +0,0 @@ -- Axe the kerberos/gssapi discovery code to make sure it uses the correct - libraries. -- Make sure only json-c is detected. -- Cleanup the BDB discovery code to find more recent versions. - ---- configure.orig 2021-10-11 19:35:49 UTC -+++ configure -@@ -15691,27 +15691,9 @@ done - # problems start to show up. - saved_libs="$LIBS" - for TRY_LIBS in \ -- "-lgssapi_krb5" \ -- "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \ -- "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \ -- "-lgssapi" \ -- "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \ -- "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ -- "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ -- "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ -- "-lgss -lkrb5" -+ "$($KRB5CONFIG gssapi --libs)"; \ - do -- # Note that this does not include $saved_libs, because -- # on FreeBSD machines this configure script has added -- # -L/usr/local/lib to LIBS, which can make the -- # -lgssapi_krb5 test succeed with shared libraries even -- # when you are trying to build with KTH in /usr/lib. -- if test "/usr" = "$use_gssapi" -- then -- LIBS="$TRY_LIBS" -- else -- LIBS="-L$use_gssapi/lib $TRY_LIBS" -- fi -+ LIBS="$TRY_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 - $as_echo_n "checking linking as $TRY_LIBS... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -15754,47 +15736,7 @@ $as_echo "no" >&6; } ;; - no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; - esac - -- # -- # XXXDCL Major kludge. Tries to cope with KTH in /usr/lib -- # but MIT in /usr/local/lib and trying to build with KTH. -- # /usr/local/lib can end up earlier on the link lines. -- # Like most kludges, this one is not only inelegant it -- # is also likely to be the wrong thing to do at least as -- # many times as it is the right thing. Something better -- # needs to be done. -- # -- if test "/usr" = "$use_gssapi" -a \ -- -f /usr/local/lib/libkrb5.a; then -- FIX_KTH_VS_MIT=yes -- fi -- -- case "$FIX_KTH_VS_MIT" in -- yes) -- case "$enable_static_linking" in -- yes) gssapi_lib_suffix=".a" ;; -- *) gssapi_lib_suffix=".so" ;; -- esac -- -- for lib in $LIBS; do -- case $lib in -- -L*) -- ;; -- -l*) -- new_lib=`echo $lib | -- sed -e s%^-l%$use_gssapi/lib/lib% \ -- -e s%$%$gssapi_lib_suffix%` -- NEW_LIBS="$NEW_LIBS $new_lib" -- ;; -- *) -- as_fn_error $? "KTH vs MIT Kerberos confusion!" "$LINENO" 5 -- ;; -- esac -- done -- LIBS="$NEW_LIBS" -- ;; -- esac -- -- DST_GSSAPI_INC="-I$use_gssapi/include" -+ DST_GSSAPI_INC="$($KRB5CONFIG gssapi --cflags)" - DNS_GSSAPI_LIBS="$LIBS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -18669,7 +18611,7 @@ case "$use_libjson" in - auto|yes) - for d in /usr /usr/local /opt/local - do -- if test -f "${d}/include/json/json.h" -+ if test -f "${d}/include/json-c/json.h" - then - if test ${d} != /usr - then -@@ -18677,29 +18619,16 @@ case "$use_libjson" in - LIBS="$LIBS -L${d}/lib" - fi - have_libjson="yes" -- elif test -f "${d}/include/json-c/json.h" -- then -- if test ${d} != /usr -- then -- libjson_cflags="-I ${d}/include" -- LIBS="$LIBS -L${d}/lib" -- fi -- have_libjson="yes" - have_libjson_c="yes" - fi - done - ;; - *) -- if test -f "${use_libjson}/include/json/json.h" -+ if test -f "${use_libjson}/include/json-c/json.h" - then - libjson_cflags="-I${use_libjson}/include" - LIBS="$LIBS -L${use_libjson}/lib" - have_libjson="yes" -- elif test -f "${use_libjson}/include/json-c/json.h" -- then -- libjson_cflags="-I${use_libjson}/include" -- LIBS="$LIBS -L${use_libjson}/lib" -- have_libjson="yes" - have_libjson_c="yes" - else - as_fn_error $? "$use_libjson/include/json{,-c}/json.h not found." "$LINENO" 5 -@@ -24966,7 +24895,7 @@ $as_echo "" >&6; } - # Check other locations for includes. - # Order is important (sigh). - -- bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /db" -+ bdb_incdirs="/db6 /db5 /db48" - # include a blank element first - for d in "" $bdb_incdirs - do |