[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.2_rc1-1-2-g6a3e815
The following commit has been merged in the debian-experimental-4.0 branch:
commit 075a6e9aafbf9798333feeeb4a8dbeb3e7732e0f
Author: Rene Engelhard <rene@debian.org>
Date: Mon Mar 18 11:52:05 2013 +0100
don't check for libkrb5 etc. if we build with system-postgresql...
diff --git a/patches/series b/patches/series
index ebe4ebf..93d643a 100644
--- a/patches/series
+++ b/patches/series
@@ -26,4 +26,5 @@ ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
dont-touch-urd.diff
+system-psql-no-krb5-gssapi-check.diff
wheezy-backports-python.diff
diff --git a/patches/system-psql-no-krb5-gssapi-check.diff b/patches/system-psql-no-krb5-gssapi-check.diff
new file mode 100644
index 0000000..910aaf3
--- /dev/null
+++ b/patches/system-psql-no-krb5-gssapi-check.diff
@@ -0,0 +1,156 @@
+diff --git a/configure.ac b/configure.ac
+index 18490cf..0474d67 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7662,75 +7670,6 @@ dnl ===================================================================
+ if test "x$enable_postgresql_sdbc" != "xno"; then
+ SCPDEFS="$SCPDEFS -DWITH_POSTGRESQL_SDBC"
+
+- # if/when anything else than PostgreSQL uses Kerberos,
+- # move this out of `test "x$enable_postgresql_sdbc" != "xno"'
+- WITH_KRB5=NO
+- WITH_GSSAPI=no
+- case "$_os" in
+- Darwin)
+- # MacOS X has system MIT Kerberos 5 since 10.4
+- if test "$with_krb5" != "no"; then
+- WITH_KRB5=YES
+- save_LIBS=$LIBS
+- AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
+- [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5, try installing libcom_err devel package])])
+- LIBS=$save_LIBS
+- AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
+- [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5, try installing krb5 devel package])])
+- LIBS=$save_LIBS
+- fi
+- if test "$with_gssapi" != "no"; then
+- WITH_GSSAPI=YES
+- save_LIBS=$LIBS
+- AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
+- [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
+- LIBS=$save_LIBS
+- fi
+- ;;
+- WINNT)
+- if test "$with_krb5" = "yes" -o "$with_gssapi" = "yes"; then
+- AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Windows.])
+- fi
+- ;;
+- Linux|GNU|*BSD|DragonFly)
+- if test "$with_krb5" != "no"; then
+- WITH_KRB5=YES
+- save_LIBS=$LIBS
+- AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
+- [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
+- LIBS=$save_LIBS
+- AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
+- [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
+- LIBS=$save_LIBS
+- fi
+- if test "$with_gssapi" != "no"; then
+- WITH_GSSAPI=YES
+- save_LIBS=$LIBS
+- AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
+- [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
+- LIBS=$save_LIBS
+- fi
+- ;;
+- *)
+- if test "$with_krb5" = "yes"; then
+- WITH_KRB5=YES
+- save_LIBS=$LIBS
+- AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
+- [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
+- LIBS=$save_LIBS
+- AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
+- [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
+- LIBS=$save_LIBS
+- fi
+- if test "$with_gssapi" = "yes"; then
+- WITH_GSSAPI=YES
+- save_LIBS=$LIBS
+- AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
+- [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
+- LIBS=$save_LIBS
+- fi
+- esac
+-
+ AC_MSG_CHECKING([PostgreSQL C interface])
+ if test "$with_system_postgresql" = "yes"; then
+ AC_MSG_RESULT([external PostgreSQL])
+@@ -7748,6 +7687,75 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
+ POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
+ POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)"
+ else
++ # if/when anything else than PostgreSQL uses Kerberos,
++ # move this out of `test "x$enable_postgresql_sdbc" != "xno"'
++ WITH_KRB5=NO
++ WITH_GSSAPI=no
++ case "$_os" in
++ Darwin)
++ # MacOS X has system MIT Kerberos 5 since 10.4
++ if test "$with_krb5" != "no"; then
++ WITH_KRB5=YES
++ save_LIBS=$LIBS
++ AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
++ [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5, try installing libcom_err devel package])])
++ LIBS=$save_LIBS
++ AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
++ [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5, try installing krb5 devel package])])
++ LIBS=$save_LIBS
++ fi
++ if test "$with_gssapi" != "no"; then
++ WITH_GSSAPI=YES
++ save_LIBS=$LIBS
++ AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
++ [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
++ LIBS=$save_LIBS
++ fi
++ ;;
++ WINNT)
++ if test "$with_krb5" = "yes" -o "$with_gssapi" = "yes"; then
++ AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Windows.])
++ fi
++ ;;
++ Linux|GNU|*BSD|DragonFly)
++ if test "$with_krb5" != "no"; then
++ WITH_KRB5=YES
++ save_LIBS=$LIBS
++ AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
++ [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
++ LIBS=$save_LIBS
++ AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
++ [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
++ LIBS=$save_LIBS
++ fi
++ if test "$with_gssapi" != "no"; then
++ WITH_GSSAPI=YES
++ save_LIBS=$LIBS
++ AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
++ [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
++ LIBS=$save_LIBS
++ fi
++ ;;
++ *)
++ if test "$with_krb5" = "yes"; then
++ WITH_KRB5=YES
++ save_LIBS=$LIBS
++ AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
++ [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
++ LIBS=$save_LIBS
++ AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
++ [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
++ LIBS=$save_LIBS
++ fi
++ if test "$with_gssapi" = "yes"; then
++ WITH_GSSAPI=YES
++ save_LIBS=$LIBS
++ AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
++ [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
++ LIBS=$save_LIBS
++ fi
++ esac
++
+ if test -n "$with_libpq_path"; then
+ SYSTEM_POSTGRESQL=YES
+ AC_MSG_RESULT([external libpq])
diff --git a/rules b/rules
index fe75316..733c227 100755
--- a/rules
+++ b/rules
@@ -1068,7 +1068,11 @@ else
endif
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
+ ifneq (,$(filter postgresql, $(SYSTEM_STUFF)))
BUILD_DEPS += , libpq-dev (>= 9.0~)
+ else
+ BUILD_DEPS += , libkrb5-dev
+ endif
else
CONFIGURE_FLAGS += --disable-postgresql-sdbc
endif
--
LibreOffice packaging repository
Reply to: