[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-291-g2ca3019
Steffen Moeller
moeller at debian.org
Sun Jun 12 20:01:03 UTC 2011
The following commit has been merged in the SZTAKI branch:
commit 3660f8b1785afa03cdc7df72df7d71ffbe851cf1
Author: Steffen Moeller <moeller at debian.org>
Date: Sun Jun 12 20:25:53 2011 +0200
Update to m4/libcurl.m4
Sadly also some bonc-specific lines where removed.
Review needed prior to sending it to upstream.
diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 90be56a..cf19c04 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -737,204 +737,6 @@ def builddir(*dirs):
done
LIBS=${ax_save_LIBS}
CPPFLAGS=${ax_save_CPPFLAGS}])
---- boinc-server-6.11.0+r18946.orig/m4/libcurl.m4
-+++ boinc-server-6.11.0+r18946/m4/libcurl.m4
-@@ -1,7 +1,7 @@
- # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
- # [ACTION-IF-YES], [ACTION-IF-NO])
- # ----------------------------------------------------------
--# David Shaw <dshaw at jabberwocky.com> Jun-21-2005
-+# David Shaw <dshaw at jabberwocky.com> May-09-2006
- #
- # Checks for libcurl. DEFAULT-ACTION is the string yes or no to
- # specify whether to default to --with-libcurl or --without-libcurl.
-@@ -13,10 +13,10 @@
- # ACTION-IF-NO is a list of shell commands that are run otherwise.
- # Note that using --without-libcurl does run ACTION-IF-NO.
- #
--# This macro defines HAVE_LIBCURL if a working libcurl setup is found,
--# and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary values.
--# Other useful defines are LIBCURL_FEATURE_xxx where xxx are the
--# various features supported by libcurl, and LIBCURL_PROTOCOL_yyy
-+# This macro #defines HAVE_LIBCURL if a working libcurl setup is
-+# found, and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary
-+# values. Other useful defines are LIBCURL_FEATURE_xxx where xxx are
-+# the various features supported by libcurl, and LIBCURL_PROTOCOL_yyy
- # where yyy are the various protocols supported by libcurl. Both xxx
- # and yyy are capitalized. See the list of AH_TEMPLATEs at the top of
- # the macro for the complete list of possible defines. Shell
-@@ -32,7 +32,8 @@
- # found is after version 7.7.2, the first version that included the
- # curl-config script. Note that it is very important for people
- # packaging binary versions of libcurl to include this script!
--# Without curl-config, we can only guess what protocols are available.
-+# Without curl-config, we can only guess what protocols are available,
-+# or use curl_version_info to figure it out at runtime.
-
- AC_DEFUN([LIBCURL_CHECK_CONFIG],
- [
-@@ -41,16 +42,19 @@
- AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6])
- AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz])
- AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS])
-+ AH_TEMPLATE([LIBCURL_FEATURE_IDN],[Defined if libcurl supports IDN])
-+ AH_TEMPLATE([LIBCURL_FEATURE_SSPI],[Defined if libcurl supports SSPI])
-+ AH_TEMPLATE([LIBCURL_FEATURE_NTLM],[Defined if libcurl supports NTLM])
-
- AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP])
- AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS])
- AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP])
- AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS])
-- AH_TEMPLATE([LIBCURL_PROTOCOL_GOPHER],[Defined if libcurl supports GOPHER])
- AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE])
- AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET])
- AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP])
- AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT])
-+ AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP])
-
- AC_ARG_WITH(libcurl,
- AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
-@@ -65,12 +69,14 @@
- _libcurl_try_link=yes
-
- if test -d "$_libcurl_with" ; then
-- CPPFLAGS="${CPPFLAGS} -I$withval/include"
-- LDFLAGS="${LDFLAGS} -L$withval/lib"
-+ LIBCURL_CPPFLAGS="-I$withval/include"
-+ _libcurl_ldflags="-L$withval/lib"
-+ AC_PATH_PROG([_libcurl_config],[curl-config],["$withval/bin"],
-+ ["$withval/bin"])
-+ else
-+ AC_PATH_PROG([_libcurl_config],[curl-config])
- fi
-
-- AC_PATH_PROG([_libcurl_config],[curl-config])
--
- if test x$_libcurl_config != "x" ; then
- AC_CACHE_CHECK([for the version of libcurl],
- [libcurl_cv_lib_curl_version],
-@@ -95,17 +101,8 @@
- if test x"$LIBCURL_CPPFLAGS" = "x" ; then
- LIBCURL_CPPFLAGS=`$_libcurl_config --cflags`
- fi
--
-- if test x"$LIBCURL" = "x" ; then
-- if test "x${disable_static_linkage}" = "xno" ; then
-- if $_libcurl_config --static-libs 2>&1 > /dev/null ; then
-- LIBCURL="`$_libcurl_config --static-libs`"
-- fi
-- fi
-- fi
--
- if test x"$LIBCURL" = "x" ; then
-- LIBCURL="`$_libcurl_config --libs`"
-+ LIBCURL=`$_libcurl_config --libs`
-
- # This is so silly, but Apple actually has a bug in their
- # curl-config script. Fixed in Tiger, but there are still
-@@ -113,7 +110,7 @@
- case "${host}" in
- powerpc-apple-darwin7*)
- LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'`
-- ;;
-+ ;;
- esac
- fi
-
-@@ -131,53 +128,19 @@
- unset _libcurl_wanted
- fi
-
-- # do we need the ldap libraries?
-- if test "x${_libldap_with}" = "x" -a \
-- "x`echo $_libcurl_protocols | grep LDAP`" != x; then
-- _libldap_with=yes
-- BOINC_CHECK_LIB_WITH([ldap],[ldap_initialize],[LIBCURL])
-- else
-- _libldap_with=no
-- fi
--
-- # some curl configs have the ber and ldap libraries in the wrong order,
-- # so lets add -lber after -lldap.
-- if test "x`echo $LIBCURL | grep ldap`" != "x" -a \
-- "x`echo $LIBCURL | grep lber`" != "x" ; then
-- AC_CHECK_LIB([lber],[ber_scanf],
-- LIBCURL="`echo $LIBCURL | sed -e 's/ldap /ldap -llber /'`"
-- )
-- fi
--
-- BOINC_CHECK_LIB_WITH([gnutls],[gnutls_cipher_get],[LIBCURL])
--
-- BOINC_CHECK_LIB_WITH([sasl2],[sasl_dispose],[LIBCURL])
--
-- BOINC_CHECK_LIB_WITH([gssglue],[gss_wrap],[LIBCURL])
-- if test "${_lib_with}" = yes ; then
-- LIBCURL="`echo $LIBCURL | sed -e 's/-lgssapi_krb5 / /g'`"
-- fi
--
-- BOINC_CHECK_LIB_WITH([gssapi_krb5],[gss_wrap],[LIBCURL])
-- if test "${_lib_with}" = yes ; then
-- LIBCURL="`echo $LIBCURL | sed -e 's/-lgssglue / /g'`"
-- fi
--
-- BOINC_CHECK_LIB_WITH([gss],[gss_wrap],[LIBCURL])
--
- if test $_libcurl_try_link = yes ; then
-
- # we didn't find curl-config, so let's see if the user-supplied
- # link line (or failing that, "-lcurl") is enough.
-- LIBCURL=${LIBCURL-"-lcurl"}
-+ LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"}
-
- AC_CACHE_CHECK([whether libcurl is usable],
- [libcurl_cv_lib_curl_usable],
- [
- _libcurl_save_cppflags=$CPPFLAGS
-- CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
-+ CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS"
- _libcurl_save_libs=$LIBS
-- LIBS="$LIBS $LIBCURL"
-+ LIBS="$LIBCURL $LIBS"
-
- AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[
- /* Try and use a few common options to force a failure if we are
-@@ -227,17 +190,11 @@
- eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes
- done
-
-- if test x$libcurl_feature_SSL = xyes ; then
-- LIBCURL_CABUNDLE=`$_libcurl_config --ca 2>/dev/null`
-- AC_DEFINE_UNQUOTED(LIBCURL_CABUNDLE,"${LIBCURL_CABUNDLE}",[Define to the name of libcurl's certification file])
-- fi
--
--
- if test "x$_libcurl_protocols" = "x" ; then
-
- # We don't have --protocols, so just assume that all
- # protocols are available
-- _libcurl_protocols="HTTP FTP GOPHER FILE TELNET LDAP DICT"
-+ _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT"
-
- if test x$libcurl_feature_SSL = xyes ; then
- _libcurl_protocols="$_libcurl_protocols HTTPS"
-@@ -254,6 +211,9 @@
- AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1])
- eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes
- done
-+ else
-+ unset LIBCURL
-+ unset LIBCURL_CPPFLAGS
- fi
- fi
-
-@@ -265,6 +225,7 @@
- unset _libcurl_protocol
- unset _libcurl_protocols
- unset _libcurl_version
-+ unset _libcurl_ldflags
- fi
-
- if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
--- boinc-server-6.11.0+r18946.orig/debian/boinc-dev.install
+++ boinc-server-6.11.0+r18946/debian/boinc-dev.install
@@ -0,0 +1,8 @@
diff --git a/debian/patches/local_sztaki_m4_libcurl_update.patch b/debian/patches/local_sztaki_m4_libcurl_update.patch
new file mode 100644
index 0000000..ae1bfb1
--- /dev/null
+++ b/debian/patches/local_sztaki_m4_libcurl_update.patch
@@ -0,0 +1,200 @@
+Index: boinc/m4/libcurl.m4
+===================================================================
+--- boinc.orig/m4/libcurl.m4 2011-06-12 20:24:24.000000000 +0200
++++ boinc/m4/libcurl.m4 2011-06-12 20:24:55.000000000 +0200
+@@ -1,7 +1,7 @@
+ # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
+ # [ACTION-IF-YES], [ACTION-IF-NO])
+ # ----------------------------------------------------------
+-# David Shaw <dshaw at jabberwocky.com> Jun-21-2005
++# David Shaw <dshaw at jabberwocky.com> May-09-2006
+ #
+ # Checks for libcurl. DEFAULT-ACTION is the string yes or no to
+ # specify whether to default to --with-libcurl or --without-libcurl.
+@@ -13,10 +13,10 @@
+ # ACTION-IF-NO is a list of shell commands that are run otherwise.
+ # Note that using --without-libcurl does run ACTION-IF-NO.
+ #
+-# This macro defines HAVE_LIBCURL if a working libcurl setup is found,
+-# and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary values.
+-# Other useful defines are LIBCURL_FEATURE_xxx where xxx are the
+-# various features supported by libcurl, and LIBCURL_PROTOCOL_yyy
++# This macro #defines HAVE_LIBCURL if a working libcurl setup is
++# found, and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary
++# values. Other useful defines are LIBCURL_FEATURE_xxx where xxx are
++# the various features supported by libcurl, and LIBCURL_PROTOCOL_yyy
+ # where yyy are the various protocols supported by libcurl. Both xxx
+ # and yyy are capitalized. See the list of AH_TEMPLATEs at the top of
+ # the macro for the complete list of possible defines. Shell
+@@ -32,7 +32,8 @@
+ # found is after version 7.7.2, the first version that included the
+ # curl-config script. Note that it is very important for people
+ # packaging binary versions of libcurl to include this script!
+-# Without curl-config, we can only guess what protocols are available.
++# Without curl-config, we can only guess what protocols are available,
++# or use curl_version_info to figure it out at runtime.
+
+ AC_DEFUN([LIBCURL_CHECK_CONFIG],
+ [
+@@ -41,16 +42,19 @@
+ AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6])
+ AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz])
+ AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS])
++ AH_TEMPLATE([LIBCURL_FEATURE_IDN],[Defined if libcurl supports IDN])
++ AH_TEMPLATE([LIBCURL_FEATURE_SSPI],[Defined if libcurl supports SSPI])
++ AH_TEMPLATE([LIBCURL_FEATURE_NTLM],[Defined if libcurl supports NTLM])
+
+ AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS])
+- AH_TEMPLATE([LIBCURL_PROTOCOL_GOPHER],[Defined if libcurl supports GOPHER])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT])
++ AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP])
+
+ AC_ARG_WITH(libcurl,
+ AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
+@@ -65,12 +69,14 @@
+ _libcurl_try_link=yes
+
+ if test -d "$_libcurl_with" ; then
+- CPPFLAGS="${CPPFLAGS} -I$withval/include"
+- LDFLAGS="${LDFLAGS} -L$withval/lib"
++ LIBCURL_CPPFLAGS="-I$withval/include"
++ _libcurl_ldflags="-L$withval/lib"
++ AC_PATH_PROG([_libcurl_config],[curl-config],["$withval/bin"],
++ ["$withval/bin"])
++ else
++ AC_PATH_PROG([_libcurl_config],[curl-config])
+ fi
+
+- AC_PATH_PROG([_libcurl_config],[curl-config])
+-
+ if test x$_libcurl_config != "x" ; then
+ AC_CACHE_CHECK([for the version of libcurl],
+ [libcurl_cv_lib_curl_version],
+@@ -95,17 +101,8 @@
+ if test x"$LIBCURL_CPPFLAGS" = "x" ; then
+ LIBCURL_CPPFLAGS=`$_libcurl_config --cflags`
+ fi
+-
+- if test x"$LIBCURL" = "x" ; then
+- if test "x${disable_static_linkage}" = "xno" ; then
+- if $_libcurl_config --static-libs 2>&1 > /dev/null ; then
+- LIBCURL="`$_libcurl_config --static-libs`"
+- fi
+- fi
+- fi
+-
+ if test x"$LIBCURL" = "x" ; then
+- LIBCURL="`$_libcurl_config --libs`"
++ LIBCURL=`$_libcurl_config --libs`
+
+ # This is so silly, but Apple actually has a bug in their
+ # curl-config script. Fixed in Tiger, but there are still
+@@ -113,7 +110,7 @@
+ case "${host}" in
+ powerpc-apple-darwin7*)
+ LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'`
+- ;;
++ ;;
+ esac
+ fi
+
+@@ -131,53 +128,19 @@
+ unset _libcurl_wanted
+ fi
+
+- # do we need the ldap libraries?
+- if test "x${_libldap_with}" = "x" -a \
+- "x`echo $_libcurl_protocols | grep LDAP`" != x; then
+- _libldap_with=yes
+- BOINC_CHECK_LIB_WITH([ldap],[ldap_initialize],[LIBCURL])
+- else
+- _libldap_with=no
+- fi
+-
+- # some curl configs have the ber and ldap libraries in the wrong order,
+- # so lets add -lber after -lldap.
+- if test "x`echo $LIBCURL | grep ldap`" != "x" -a \
+- "x`echo $LIBCURL | grep lber`" != "x" ; then
+- AC_CHECK_LIB([lber],[ber_scanf],
+- LIBCURL="`echo $LIBCURL | sed -e 's/ldap /ldap -llber /'`"
+- )
+- fi
+-
+- BOINC_CHECK_LIB_WITH([gnutls],[gnutls_cipher_get],[LIBCURL])
+-
+- BOINC_CHECK_LIB_WITH([sasl2],[sasl_dispose],[LIBCURL])
+-
+- BOINC_CHECK_LIB_WITH([gssglue],[gss_wrap],[LIBCURL])
+- if test "${_lib_with}" = yes ; then
+- LIBCURL="`echo $LIBCURL | sed -e 's/-lgssapi_krb5 / /g'`"
+- fi
+-
+- BOINC_CHECK_LIB_WITH([gssapi_krb5],[gss_wrap],[LIBCURL])
+- if test "${_lib_with}" = yes ; then
+- LIBCURL="`echo $LIBCURL | sed -e 's/-lgssglue / /g'`"
+- fi
+-
+- BOINC_CHECK_LIB_WITH([gss],[gss_wrap],[LIBCURL])
+-
+ if test $_libcurl_try_link = yes ; then
+
+ # we didn't find curl-config, so let's see if the user-supplied
+ # link line (or failing that, "-lcurl") is enough.
+- LIBCURL=${LIBCURL-"-lcurl"}
++ LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"}
+
+ AC_CACHE_CHECK([whether libcurl is usable],
+ [libcurl_cv_lib_curl_usable],
+ [
+ _libcurl_save_cppflags=$CPPFLAGS
+- CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
++ CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS"
+ _libcurl_save_libs=$LIBS
+- LIBS="$LIBS $LIBCURL"
++ LIBS="$LIBCURL $LIBS"
+
+ AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[
+ /* Try and use a few common options to force a failure if we are
+@@ -227,17 +190,11 @@
+ eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes
+ done
+
+- if test x$libcurl_feature_SSL = xyes ; then
+- LIBCURL_CABUNDLE=`$_libcurl_config --ca 2>/dev/null`
+- AC_DEFINE_UNQUOTED(LIBCURL_CABUNDLE,"${LIBCURL_CABUNDLE}",[Define to the name of libcurl's certification file])
+- fi
+-
+-
+ if test "x$_libcurl_protocols" = "x" ; then
+
+ # We don't have --protocols, so just assume that all
+ # protocols are available
+- _libcurl_protocols="HTTP FTP GOPHER FILE TELNET LDAP DICT"
++ _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT"
+
+ if test x$libcurl_feature_SSL = xyes ; then
+ _libcurl_protocols="$_libcurl_protocols HTTPS"
+@@ -254,6 +211,9 @@
+ AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1])
+ eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes
+ done
++ else
++ unset LIBCURL
++ unset LIBCURL_CPPFLAGS
+ fi
+ fi
+
+@@ -265,6 +225,7 @@
+ unset _libcurl_protocol
+ unset _libcurl_protocols
+ unset _libcurl_version
++ unset _libcurl_ldflags
+ fi
+
+ if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
diff --git a/debian/patches/series b/debian/patches/series
index 6090ee6..8063c77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
upstream_sztaki_Help_Function_Declaration_with_void.patch
local_sztaki_NoWriteFcgiWithHostinfo.patch
+local_sztaki_m4_libcurl_update.patch
upstream_sztaki_LIBEXEC_DIR.patch
local_sztaki_allow_world_read_and_execute_directory.patch
AvoidingBlanksInMakefiles.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list