diff options
Diffstat (limited to 'security/cyrus-saslauthd/patches/patch-af')
| -rw-r--r-- | security/cyrus-saslauthd/patches/patch-af | 323 |
1 files changed, 0 insertions, 323 deletions
diff --git a/security/cyrus-saslauthd/patches/patch-af b/security/cyrus-saslauthd/patches/patch-af deleted file mode 100644 index 26bafcb687f..00000000000 --- a/security/cyrus-saslauthd/patches/patch-af +++ /dev/null @@ -1,323 +0,0 @@ -$NetBSD: patch-af,v 1.3 2009/05/14 23:00:46 obache Exp $ - ---- configure.orig 2009-05-07 14:25:24.000000000 +0000 -+++ configure -@@ -9480,75 +9480,23 @@ if test "$with_pam" != no; then - CPPFLAGS="$CPPFLAGS -I${with_pam}/include" - LDFLAGS="$LDFLAGS -L${with_pam}/lib" - fi -- cmu_save_LIBS="$LIBS" -- echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 --echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6 --if test "${ac_cv_lib_pam_pam_start+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lpam $SASL_DL_LIB $LIBS" --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char pam_start (); --int --main () --{ --pam_start (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 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 -- ac_cv_lib_pam_pam_start=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_pam_pam_start=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5 --echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6 --if test $ac_cv_lib_pam_pam_start = yes; then -- -- if test "${ac_cv_header_security_pam_appl_h+set}" = set; then -- echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 --echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6 --if test "${ac_cv_header_security_pam_appl_h+set}" = set; then -+for ac_header in security/pam_appl.h pam/pam_appl.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 --echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6 -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - else - # Is the header compilable? --echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5 --echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -9557,7 +9505,7 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --#include <security/pam_appl.h> -+#include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -9583,8 +9531,8 @@ echo "$as_me:$LINENO: result: $ac_header - echo "${ECHO_T}$ac_header_compiler" >&6 - - # Is the header present? --echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5 --echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -9592,7 +9540,7 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <security/pam_appl.h> -+#include <$ac_header> - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -@@ -9625,10 +9573,10 @@ echo "${ECHO_T}$ac_header_preproc" >&6 - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc in - yes:no ) -- { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX - ## ------------------------------------ ## -@@ -9639,12 +9587,12 @@ _ASBOX - sed "s/^/$as_me: WARNING: /" >&2 - ;; - no:yes ) -- { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX - ## ------------------------------------ ## -@@ -9655,29 +9603,157 @@ _ASBOX - sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 --echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6 --if test "${ac_cv_header_security_pam_appl_h+set}" = set; then -+echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_header_security_pam_appl_h=$ac_header_preproc -+ eval "$as_ac_Header=$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 --echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6 -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - - fi --if test $ac_cv_header_security_pam_appl_h = yes; then -- : -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ cmu_save_LIBS="$LIBS" -+ echo "$as_me:$LINENO: checking for pam_start" >&5 -+echo $ECHO_N "checking for pam_start... $ECHO_C" >&6 -+if test "${ac_cv_func_pam_start+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char pam_start (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char pam_start (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_pam_start) || defined (__stub___pam_start) -+choke me -+#else -+char (*f) () = pam_start; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ -+int -+main () -+{ -+return f != pam_start; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 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 -+ ac_cv_func_pam_start=yes - else -- with_pam=no -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_func_pam_start=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi -+echo "$as_me:$LINENO: result: $ac_cv_func_pam_start" >&5 -+echo "${ECHO_T}$ac_cv_func_pam_start" >&6 -+if test $ac_cv_func_pam_start = yes; then -+ : -+else -+ LIBS="-lpam $LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+#line $LINENO "configure" -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include <sys/types.h> -+#ifdef HAVE_PAM_PAM_APPL_H -+#include <pam/pam_appl.h> -+#endif -+#ifdef HAVE_SECURITY_PAM_H -+#include <security/pam_appl.h> -+#endif -+int -+main () -+{ - -+const char *service="foo"; -+const char *user="bar"; -+pam_handle_t *pamh; -+struct pam_conv *conv; -+int baz; -+baz = pam_start(service, user, conv, &pamh); -+return 0; - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 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 -+ LIBPAM="-lpam" - else -- with_pam=no -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+ - fi - -- LIBS="$cmu_save_LIBS" -+ LIBS="$cmu_save_LIBS $LIBPAM" - fi - - |