f9c172ba3a
it up for multilib systems - install config files and init scripts using -p - pull in patch to build with current automake (#229010, Jacek Konieczny and Robert Scheck) - remove prereq on ldconfig: RPM should pick it up based on the -libs scriptlets - pull in patch to correctly detect gsskrb5_register_acceptor_identity (#200892, Mirko Streckenbach) - pull CVS fix for not tripping over extra commas in digest-md5 challenges (#229640) - drop patches which were needed to keep static builds going - remove static build, which is no longer a useful option because not all of our dependencies are available as static libraries - drop gssapi-generic patch due to lack of interest - update the bundled copy of db to 4.5.20 (#229012) - drop dbconverter-2, as we haven't bundled v1 libraries since FC4
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
diff -u -r cyrus-sasl-2.1.21-orig/cmulocal/sasl2.m4 cyrus-sasl-2.1.21/cmulocal/sasl2.m4
|
|
--- cyrus-sasl-2.1.21-orig/cmulocal/sasl2.m4 2006-08-01 08:29:59.000000000 +0200
|
|
+++ cyrus-sasl-2.1.21/cmulocal/sasl2.m4 2006-08-01 08:31:32.000000000 +0200
|
|
@@ -257,7 +257,21 @@
|
|
|
|
cmu_save_LIBS="$LIBS"
|
|
LIBS="$LIBS $GSSAPIBASE_LIBS"
|
|
- AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
|
|
+ dnl AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
|
|
+ AC_CHECK_HEADER(gssapi/gssapi_krb5.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_KRB5_H,,[Define if you have the gssapi/gssapi_krb5.h header file]))
|
|
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
|
|
+#ifdef HAVE_GSSAPI_H
|
|
+#include <gssapi.h>
|
|
+#else
|
|
+#include <gssapi/gssapi.h>
|
|
+#endif
|
|
+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
|
|
+#include <gssapi/gssapi_krb5.h>
|
|
+#endif
|
|
+]],[[gsskrb5_register_acceptor_identity("");]])
|
|
+],[AC_DEFINE(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY,,
|
|
+ [Define if your GSSAPI implimentation defines GSSKRB5_REGISTER_ACCEPTOR_IDENTITY])
|
|
+])
|
|
LIBS="$cmu_save_LIBS"
|
|
else
|
|
AC_MSG_RESULT([disabled])
|
|
diff -u -r cyrus-sasl-2.1.21-orig/plugins/gssapi.c cyrus-sasl-2.1.21/plugins/gssapi.c
|
|
--- cyrus-sasl-2.1.21-orig/plugins/gssapi.c 2004-07-21 16:39:06.000000000 +0200
|
|
+++ cyrus-sasl-2.1.21/plugins/gssapi.c 2006-08-01 08:30:26.000000000 +0200
|
|
@@ -50,6 +50,9 @@
|
|
#else
|
|
#include <gssapi/gssapi.h>
|
|
#endif
|
|
+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
|
|
+#include <gssapi/gssapi_krb5.h>
|
|
+#endif
|
|
|
|
#ifdef WIN32
|
|
# include <winsock2.h>
|