diff --git a/.gitignore b/.gitignore index d923397..60bc67f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -curl-7.21.1.tar.lzma +curl-7.21.2.tar.lzma diff --git a/0001-curl-7.21.1-a6e088e.patch b/0001-curl-7.21.1-a6e088e.patch deleted file mode 100644 index d099898..0000000 --- a/0001-curl-7.21.1-a6e088e.patch +++ /dev/null @@ -1,183 +0,0 @@ - CHANGES | 5 ++ - include/curl/typecheck-gcc.h | 135 ++++++++++++++++++++++++----------------- - 2 files changed, 84 insertions(+), 56 deletions(-) - -diff --git a/CHANGES b/CHANGES -index 7d50c18..35868ff 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -6,6 +6,11 @@ - - Changelog - -+Kamil Dudka (12 Aug 2010) -+- typecheck-gcc: work around gcc upstream bug #32061 -+ -+ original bug report at https://bugzilla.redhat.com/617757 -+ - Version 7.21.1 (11 Aug 2010) - - Daniel Stenberg (11 Aug 2010) -diff --git a/include/curl/typecheck-gcc.h b/include/curl/typecheck-gcc.h -index 62883f5..e6f74a9 100644 ---- a/include/curl/typecheck-gcc.h -+++ b/include/curl/typecheck-gcc.h -@@ -25,11 +25,16 @@ - /* wraps curl_easy_setopt() with typechecking */ - - /* To add a new kind of warning, add an -- * if(_curl_is_sometype_option(_curl_opt) && ! _curl_is_sometype(value)) -- * _curl_easy_setopt_err_sometype(); -+ * if(_curl_is_sometype_option(_curl_opt)) -+ * if(!_curl_is_sometype(value)) -+ * _curl_easy_setopt_err_sometype(); - * block and define _curl_is_sometype_option, _curl_is_sometype and - * _curl_easy_setopt_err_sometype below - * -+ * NOTE: We use two nested 'if' statements here instead of the && operator, in -+ * order to work around gcc bug #32061. It affects only gcc 4.3.x/4.4.x -+ * when compiling with -Wlogical-op. -+ * - * To add an option that uses the same type as an existing option, you'll just - * need to extend the appropriate _curl_*_option macro - */ -@@ -37,51 +42,66 @@ - __extension__ ({ \ - __typeof__ (option) _curl_opt = option; \ - if (__builtin_constant_p(_curl_opt)) { \ -- if (_curl_is_long_option(_curl_opt) && !_curl_is_long(value)) \ -- _curl_easy_setopt_err_long(); \ -- if (_curl_is_off_t_option(_curl_opt) && !_curl_is_off_t(value)) \ -- _curl_easy_setopt_err_curl_off_t(); \ -- if (_curl_is_string_option(_curl_opt) && !_curl_is_string(value)) \ -- _curl_easy_setopt_err_string(); \ -- if (_curl_is_write_cb_option(_curl_opt) && !_curl_is_write_cb(value)) \ -- _curl_easy_setopt_err_write_callback(); \ -- if ((_curl_opt) == CURLOPT_READFUNCTION && !_curl_is_read_cb(value)) \ -- _curl_easy_setopt_err_read_cb(); \ -- if ((_curl_opt) == CURLOPT_IOCTLFUNCTION && !_curl_is_ioctl_cb(value)) \ -- _curl_easy_setopt_err_ioctl_cb(); \ -- if ((_curl_opt) == CURLOPT_SOCKOPTFUNCTION && !_curl_is_sockopt_cb(value))\ -- _curl_easy_setopt_err_sockopt_cb(); \ -- if ((_curl_opt) == CURLOPT_OPENSOCKETFUNCTION && \ -- !_curl_is_opensocket_cb(value)) \ -- _curl_easy_setopt_err_opensocket_cb(); \ -- if ((_curl_opt) == CURLOPT_PROGRESSFUNCTION && \ -- !_curl_is_progress_cb(value)) \ -- _curl_easy_setopt_err_progress_cb(); \ -- if ((_curl_opt) == CURLOPT_DEBUGFUNCTION && !_curl_is_debug_cb(value)) \ -- _curl_easy_setopt_err_debug_cb(); \ -- if ((_curl_opt) == CURLOPT_SSL_CTX_FUNCTION && \ -- !_curl_is_ssl_ctx_cb(value)) \ -- _curl_easy_setopt_err_ssl_ctx_cb(); \ -- if (_curl_is_conv_cb_option(_curl_opt) && !_curl_is_conv_cb(value)) \ -- _curl_easy_setopt_err_conv_cb(); \ -- if ((_curl_opt) == CURLOPT_SEEKFUNCTION && !_curl_is_seek_cb(value)) \ -- _curl_easy_setopt_err_seek_cb(); \ -- if (_curl_is_cb_data_option(_curl_opt) && !_curl_is_cb_data(value)) \ -- _curl_easy_setopt_err_cb_data(); \ -- if ((_curl_opt) == CURLOPT_ERRORBUFFER && !_curl_is_error_buffer(value)) \ -- _curl_easy_setopt_err_error_buffer(); \ -- if ((_curl_opt) == CURLOPT_STDERR && !_curl_is_FILE(value)) \ -- _curl_easy_setopt_err_FILE(); \ -- if (_curl_is_postfields_option(_curl_opt) && !_curl_is_postfields(value)) \ -- _curl_easy_setopt_err_postfields(); \ -- if ((_curl_opt) == CURLOPT_HTTPPOST && \ -- !_curl_is_arr((value), struct curl_httppost)) \ -- _curl_easy_setopt_err_curl_httpost(); \ -- if (_curl_is_slist_option(_curl_opt) && \ -- !_curl_is_arr((value), struct curl_slist)) \ -- _curl_easy_setopt_err_curl_slist(); \ -- if ((_curl_opt) == CURLOPT_SHARE && !_curl_is_ptr((value), CURLSH)) \ -- _curl_easy_setopt_err_CURLSH(); \ -+ if (_curl_is_long_option(_curl_opt)) \ -+ if (!_curl_is_long(value)) \ -+ _curl_easy_setopt_err_long(); \ -+ if (_curl_is_off_t_option(_curl_opt)) \ -+ if (!_curl_is_off_t(value)) \ -+ _curl_easy_setopt_err_curl_off_t(); \ -+ if (_curl_is_string_option(_curl_opt)) \ -+ if (!_curl_is_string(value)) \ -+ _curl_easy_setopt_err_string(); \ -+ if (_curl_is_write_cb_option(_curl_opt)) \ -+ if (!_curl_is_write_cb(value)) \ -+ _curl_easy_setopt_err_write_callback(); \ -+ if ((_curl_opt) == CURLOPT_READFUNCTION) \ -+ if (!_curl_is_read_cb(value)) \ -+ _curl_easy_setopt_err_read_cb(); \ -+ if ((_curl_opt) == CURLOPT_IOCTLFUNCTION) \ -+ if (!_curl_is_ioctl_cb(value)) \ -+ _curl_easy_setopt_err_ioctl_cb(); \ -+ if ((_curl_opt) == CURLOPT_SOCKOPTFUNCTION) \ -+ if (!_curl_is_sockopt_cb(value)) \ -+ _curl_easy_setopt_err_sockopt_cb(); \ -+ if ((_curl_opt) == CURLOPT_OPENSOCKETFUNCTION) \ -+ if (!_curl_is_opensocket_cb(value)) \ -+ _curl_easy_setopt_err_opensocket_cb(); \ -+ if ((_curl_opt) == CURLOPT_PROGRESSFUNCTION) \ -+ if (!_curl_is_progress_cb(value)) \ -+ _curl_easy_setopt_err_progress_cb(); \ -+ if ((_curl_opt) == CURLOPT_DEBUGFUNCTION) \ -+ if (!_curl_is_debug_cb(value)) \ -+ _curl_easy_setopt_err_debug_cb(); \ -+ if ((_curl_opt) == CURLOPT_SSL_CTX_FUNCTION) \ -+ if (!_curl_is_ssl_ctx_cb(value)) \ -+ _curl_easy_setopt_err_ssl_ctx_cb(); \ -+ if (_curl_is_conv_cb_option(_curl_opt)) \ -+ if (!_curl_is_conv_cb(value)) \ -+ _curl_easy_setopt_err_conv_cb(); \ -+ if ((_curl_opt) == CURLOPT_SEEKFUNCTION) \ -+ if (!_curl_is_seek_cb(value)) \ -+ _curl_easy_setopt_err_seek_cb(); \ -+ if (_curl_is_cb_data_option(_curl_opt)) \ -+ if (!_curl_is_cb_data(value)) \ -+ _curl_easy_setopt_err_cb_data(); \ -+ if ((_curl_opt) == CURLOPT_ERRORBUFFER) \ -+ if (!_curl_is_error_buffer(value)) \ -+ _curl_easy_setopt_err_error_buffer(); \ -+ if ((_curl_opt) == CURLOPT_STDERR) \ -+ if (!_curl_is_FILE(value)) \ -+ _curl_easy_setopt_err_FILE(); \ -+ if (_curl_is_postfields_option(_curl_opt)) \ -+ if (!_curl_is_postfields(value)) \ -+ _curl_easy_setopt_err_postfields(); \ -+ if ((_curl_opt) == CURLOPT_HTTPPOST) \ -+ if (!_curl_is_arr((value), struct curl_httppost)) \ -+ _curl_easy_setopt_err_curl_httpost(); \ -+ if (_curl_is_slist_option(_curl_opt)) \ -+ if (!_curl_is_arr((value), struct curl_slist)) \ -+ _curl_easy_setopt_err_curl_slist(); \ -+ if ((_curl_opt) == CURLOPT_SHARE) \ -+ if (!_curl_is_ptr((value), CURLSH)) \ -+ _curl_easy_setopt_err_CURLSH(); \ - } \ - curl_easy_setopt(handle, _curl_opt, value); \ - }) -@@ -92,15 +112,18 @@ __extension__ ({ \ - __extension__ ({ \ - __typeof__ (info) _curl_info = info; \ - if (__builtin_constant_p(_curl_info)) { \ -- if (_curl_is_string_info(_curl_info) && !_curl_is_arr((arg), char *)) \ -- _curl_easy_getinfo_err_string(); \ -- if (_curl_is_long_info(_curl_info) && !_curl_is_arr((arg), long)) \ -- _curl_easy_getinfo_err_long(); \ -- if (_curl_is_double_info(_curl_info) && !_curl_is_arr((arg), double)) \ -- _curl_easy_getinfo_err_double(); \ -- if (_curl_is_slist_info(_curl_info) && \ -- !_curl_is_arr((arg), struct curl_slist *)) \ -- _curl_easy_getinfo_err_curl_slist(); \ -+ if (_curl_is_string_info(_curl_info)) \ -+ if (!_curl_is_arr((arg), char *)) \ -+ _curl_easy_getinfo_err_string(); \ -+ if (_curl_is_long_info(_curl_info)) \ -+ if (!_curl_is_arr((arg), long)) \ -+ _curl_easy_getinfo_err_long(); \ -+ if (_curl_is_double_info(_curl_info)) \ -+ if (!_curl_is_arr((arg), double)) \ -+ _curl_easy_getinfo_err_double(); \ -+ if (_curl_is_slist_info(_curl_info)) \ -+ if (!_curl_is_arr((arg), struct curl_slist *)) \ -+ _curl_easy_getinfo_err_curl_slist(); \ - } \ - curl_easy_getinfo(handle, _curl_info, arg); \ - }) diff --git a/0002-curl-7.21.1-5907777.patch b/0002-curl-7.21.1-5907777.patch deleted file mode 100644 index 3708c46..0000000 --- a/0002-curl-7.21.1-5907777.patch +++ /dev/null @@ -1,36 +0,0 @@ - CHANGES | 5 +++++ - src/main.c | 5 ++++- - 2 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/CHANGES b/CHANGES -index 35868ff..1e3a501 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -6,6 +6,11 @@ - - Changelog - -+Kamil Dudka (15 Aug 2010) -+- curl -T: ignore file size of special files -+ -+ original bug report at https://bugzilla.redhat.com/622520 -+ - Kamil Dudka (12 Aug 2010) - - typecheck-gcc: work around gcc upstream bug #32061 - -diff --git a/src/main.c b/src/main.c -index 5585c17..3b78d60 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -4925,7 +4925,10 @@ operate(struct Configurable *config, int argc, argv_item_t argv[]) - goto quit_urls; - } - infdopen=TRUE; -- uploadfilesize=fileinfo.st_size; -+ -+ /* we ignore file size for char/block devices, sockets, etc. */ -+ if(S_IFREG == (fileinfo.st_mode & S_IFMT)) -+ uploadfilesize=fileinfo.st_size; - - } - else if(uploadfile && stdin_upload(uploadfile)) { diff --git a/0003-curl-7.21.1-13b8fc4.patch b/0003-curl-7.21.1-13b8fc4.patch deleted file mode 100644 index ec5a14c..0000000 --- a/0003-curl-7.21.1-13b8fc4.patch +++ /dev/null @@ -1,67 +0,0 @@ - CHANGES | 10 ++++++++++ - lib/http_negotiate.c | 15 ++++++++++----- - 2 files changed, 20 insertions(+), 5 deletions(-) - -diff --git a/CHANGES b/CHANGES -index 1e3a501..c28b005 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -6,6 +6,16 @@ - - Changelog - -+Daniel Stenberg (16 Aug 2010) -+- negotiation: Wrong proxy authorization -+ -+ There's an error in http_negotiation.c where a mistake is using only -+ userpwd even for proxy requests. Ludek provided a patch, but I decided -+ to write the fix slightly different using his patch as inspiration. -+ -+ Reported by: Ludek Finstrle -+ Bug: http://curl.haxx.se/bug/view.cgi?id=3046066 -+ - Kamil Dudka (15 Aug 2010) - - curl -T: ignore file size of special files - -diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c -index ab1296e..80b0b50 100644 ---- a/lib/http_negotiate.c -+++ b/lib/http_negotiate.c -@@ -5,7 +5,7 @@ - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * -- * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. -+ * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms -@@ -277,6 +277,7 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy) - &conn->data->state.negotiate; - char *encoded = NULL; - size_t len; -+ char *userp; - - #ifdef HAVE_SPNEGO /* Handle SPNEGO */ - if(checkprefix("Negotiate", neg_ctx->protocol)) { -@@ -330,12 +331,16 @@ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy) - if(len == 0) - return CURLE_OUT_OF_MEMORY; - -- conn->allocptr.userpwd = -- aprintf("%sAuthorization: %s %s\r\n", proxy ? "Proxy-" : "", -- neg_ctx->protocol, encoded); -+ userp = aprintf("%sAuthorization: %s %s\r\n", proxy ? "Proxy-" : "", -+ neg_ctx->protocol, encoded); -+ -+ if(proxy) -+ conn->allocptr.proxyuserpwd = userp; -+ else -+ conn->allocptr.userpwd = userp; - free(encoded); - Curl_cleanup_negotiate (conn->data); -- return (conn->allocptr.userpwd == NULL) ? CURLE_OUT_OF_MEMORY : CURLE_OK; -+ return (userp == NULL) ? CURLE_OUT_OF_MEMORY : CURLE_OK; - } - - static void cleanup(struct negotiatedata *neg_ctx) diff --git a/0004-curl-7.21.1-d0dea8f.patch b/0004-curl-7.21.1-d0dea8f.patch deleted file mode 100644 index ff6fb34..0000000 --- a/0004-curl-7.21.1-d0dea8f.patch +++ /dev/null @@ -1,73 +0,0 @@ -From d0dea8f8699224ac1b6888bf6da7cfc71de213ca Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Thu, 19 Aug 2010 16:38:22 +0200 -Subject: [PATCH] AC_INIT: avoid a warning with autoconf 2.66 - -It was complaining about the '=>' operator, introduced in e3fc0d5. ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index db04447..a389cfd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -24,7 +24,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_PREREQ(2.57) - - dnl We don't know the version number "statically" so we use a dash here --AC_INIT([curl], [-], [a suitable curl mailing list => http://curl.haxx.se/mail/]) -+AC_INIT([curl], [-], [a suitable curl mailing list: http://curl.haxx.se/mail/]) - - CURL_OVERRIDE_AUTOCONF - --- -1.7.2.1 - ---- a/configure -+++ b/configure -@@ -2,7 +2,7 @@ - # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.67 for curl -. - # --# Report bugs to http://curl.haxx.se/mail/>. -+# Report bugs to . - # - # - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -@@ -737,7 +737,7 @@ - PACKAGE_TARNAME='curl' - PACKAGE_VERSION='-' - PACKAGE_STRING='curl -' --PACKAGE_BUGREPORT='a suitable curl mailing list => http://curl.haxx.se/mail/' -+PACKAGE_BUGREPORT='a suitable curl mailing list: http://curl.haxx.se/mail/' - PACKAGE_URL='' - - ac_unique_file="lib/urldata.h" -@@ -1792,7 +1792,7 @@ - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - --Report bugs to http://curl.haxx.se/mail/>. -+Report bugs to . - _ACEOF - ac_status=$? - fi -@@ -2361,7 +2361,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 - $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ( $as_echo "## ------------------------------------------------------------------------ ## --## Report this to a suitable curl mailing list => http://curl.haxx.se/mail/ ## -+## Report this to a suitable curl mailing list: http://curl.haxx.se/mail/ ## - ## ------------------------------------------------------------------------ ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -@@ -35093,7 +35093,7 @@ - Configuration commands: - $config_commands - --Report bugs to http://curl.haxx.se/mail/>." -+Report bugs to ." - - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 diff --git a/0102-curl-7.21.1-lrt.patch b/0102-curl-7.21.1-lrt.patch deleted file mode 100644 index 94bca96..0000000 --- a/0102-curl-7.21.1-lrt.patch +++ /dev/null @@ -1,52 +0,0 @@ - src/Makefile.am | 2 +- - tests/libtest/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 3672458..890893d 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -49,7 +49,7 @@ include Makefile.inc - # This might hold -Werror - CFLAGS += @CURL_CFLAG_EXTRAS@ - --curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@ -+curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@ -lrt - curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la - BUILT_SOURCES = hugehelp.c - CLEANFILES = hugehelp.c -diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am -index 70b0f12..6512ce4 100644 ---- a/tests/libtest/Makefile.am -+++ b/tests/libtest/Makefile.am -@@ -54,7 +54,7 @@ EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \ - test1022.pl Makefile.inc - - # Dependencies (may need to be overriden) --LDADD = $(top_builddir)/lib/libcurl.la -+LDADD = $(top_builddir)/lib/libcurl.la -lrt - DEPENDENCIES = $(top_builddir)/lib/libcurl.la - - # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES, ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -337,7 +337,7 @@ - writeout.h writeenv.h getpass.h homedir.h curlutil.h - - curl_SOURCES = $(CURL_CFILES) $(CURLX_ONES) $(CURL_HFILES) --curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@ -+curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@ -lrt - curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la - BUILT_SOURCES = hugehelp.c - CLEANFILES = hugehelp.c ---- a/tests/libtest/Makefile.in -+++ b/tests/libtest/Makefile.in -@@ -670,7 +670,7 @@ - - - # Dependencies (may need to be overriden) --LDADD = $(top_builddir)/lib/libcurl.la -+LDADD = $(top_builddir)/lib/libcurl.la -lrt - DEPENDENCIES = $(top_builddir)/lib/libcurl.la - - # files used only in some libcurl test programs diff --git a/0102-curl-7.21.2-debug.patch b/0102-curl-7.21.2-debug.patch new file mode 100644 index 0000000..5a6669d --- /dev/null +++ b/0102-curl-7.21.2-debug.patch @@ -0,0 +1,58 @@ + configure | 15 ++++----------- + m4/curl-compilers.m4 | 15 ++++----------- + 2 files changed, 8 insertions(+), 22 deletions(-) + +diff --git a/configure b/configure +index d3ecf69..6d8f085 100755 +--- a/configure ++++ b/configure +@@ -14192,18 +14192,11 @@ $as_echo "yes" >&6; } + gccvhi=`echo $gccver | cut -d . -f1` + gccvlo=`echo $gccver | cut -d . -f2` + compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_all="$flags_dbg_all -ggdb" +- flags_dbg_all="$flags_dbg_all -gstabs" +- flags_dbg_all="$flags_dbg_all -gstabs+" +- flags_dbg_all="$flags_dbg_all -gcoff" +- flags_dbg_all="$flags_dbg_all -gxcoff" +- flags_dbg_all="$flags_dbg_all -gdwarf-2" +- flags_dbg_all="$flags_dbg_all -gvms" ++ flags_dbg_all="" + flags_dbg_yes="-g" +- flags_dbg_off="-g0" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" +- flags_opt_yes="-O2" ++ flags_dbg_off="" ++ flags_opt_all="" ++ flags_opt_yes="" + flags_opt_off="-O0" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 +index 1ea4d17..868d65a 100644 +--- a/m4/curl-compilers.m4 ++++ b/m4/curl-compilers.m4 +@@ -146,18 +146,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [ + gccvhi=`echo $gccver | cut -d . -f1` + gccvlo=`echo $gccver | cut -d . -f2` + compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_all="$flags_dbg_all -ggdb" +- flags_dbg_all="$flags_dbg_all -gstabs" +- flags_dbg_all="$flags_dbg_all -gstabs+" +- flags_dbg_all="$flags_dbg_all -gcoff" +- flags_dbg_all="$flags_dbg_all -gxcoff" +- flags_dbg_all="$flags_dbg_all -gdwarf-2" +- flags_dbg_all="$flags_dbg_all -gvms" ++ flags_dbg_all="" + flags_dbg_yes="-g" +- flags_dbg_off="-g0" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" +- flags_opt_yes="-O2" ++ flags_dbg_off="" ++ flags_opt_all="" ++ flags_opt_yes="" + flags_opt_off="-O0" + else + AC_MSG_RESULT([no]) diff --git a/0103-curl-7.21.1-debug.patch b/0103-curl-7.21.1-debug.patch deleted file mode 100644 index a1fdb5b..0000000 --- a/0103-curl-7.21.1-debug.patch +++ /dev/null @@ -1,212 +0,0 @@ - configure.ac | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index af30b8a..ca6c7cc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -275,7 +275,10 @@ dnl ********************************************************************** - - CURL_CHECK_COMPILER - CURL_SET_COMPILER_BASIC_OPTS --CURL_SET_COMPILER_DEBUG_OPTS -+ -+dnl do not perturb CFLAGS given by the build system -+dnl CURL_SET_COMPILER_DEBUG_OPTS -+ - CURL_SET_COMPILER_OPTIMIZE_OPTS - CURL_SET_COMPILER_WARNING_OPTS - ---- a/configure -+++ b/configure -@@ -15027,190 +15026,6 @@ - fi - - -- # -- if test "$compiler_id" != "unknown"; then -- # -- tmp_save_CFLAGS="$CFLAGS" -- tmp_save_CPPFLAGS="$CPPFLAGS" -- # -- tmp_options="" -- tmp_CFLAGS="$CFLAGS" -- tmp_CPPFLAGS="$CPPFLAGS" -- -- ac_var_stripped="" -- for word1 in $tmp_CFLAGS; do -- ac_var_strip_word="no" -- for word2 in $flags_dbg_all; do -- if test "$word1" = "$word2"; then -- ac_var_strip_word="yes" -- fi -- done -- if test "$ac_var_strip_word" = "no"; then -- ac_var_stripped="$ac_var_stripped $word1" -- fi -- done -- tmp_CFLAGS="$ac_var_stripped" -- squeeze tmp_CFLAGS -- -- -- ac_var_stripped="" -- for word1 in $tmp_CPPFLAGS; do -- ac_var_strip_word="no" -- for word2 in $flags_dbg_all; do -- if test "$word1" = "$word2"; then -- ac_var_strip_word="yes" -- fi -- done -- if test "$ac_var_strip_word" = "no"; then -- ac_var_stripped="$ac_var_stripped $word1" -- fi -- done -- tmp_CPPFLAGS="$ac_var_stripped" -- squeeze tmp_CPPFLAGS -- -- # -- if test "$want_debug" = "yes"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts debug enabling options" >&5 --$as_echo_n "checking if compiler accepts debug enabling options... " >&6; } -- tmp_options="$flags_dbg_yes" -- fi -- if test "$want_debug" = "no"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts debug disabling options" >&5 --$as_echo_n "checking if compiler accepts debug disabling options... " >&6; } -- tmp_options="$flags_dbg_off" -- fi -- # -- CPPFLAGS="$tmp_CPPFLAGS" -- CFLAGS="$tmp_CFLAGS $tmp_options" -- squeeze CPPFLAGS -- squeeze CFLAGS -- -- tmp_compiler_works="unknown" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- -- --int main (void) --{ -- -- int i = 1; -- return i; -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- -- tmp_compiler_works="yes" -- --else -- -- tmp_compiler_works="no" -- echo " " >&6 -- sed 's/^/cc-fail: /' conftest.err >&6 -- echo " " >&6 -- --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- if test "$tmp_compiler_works" = "yes"; then -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- -- --int main (void) --{ -- -- int i = 1; -- return i; -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- -- tmp_compiler_works="yes" -- --else -- -- tmp_compiler_works="no" -- echo " " >&6 -- sed 's/^/link-fail: /' conftest.err >&6 -- echo " " >&6 -- --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- fi -- if test "x$cross_compiling" != "xyes" && -- test "$tmp_compiler_works" = "yes"; then -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5 ; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- --# ifdef __STDC__ --# include --# endif -- --int main (void) --{ -- -- int i = 0; -- exit(i); -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- -- tmp_compiler_works="yes" -- --else -- -- tmp_compiler_works="no" -- echo " " >&6 -- echo "run-fail: test program exited with status $ac_status" >&6 -- echo " " >&6 -- --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- fi -- if test "$tmp_compiler_works" = "yes"; then -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: compiler options added: $tmp_options" >&5 --$as_echo "$as_me: compiler options added: $tmp_options" >&6;} -- -- else -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler options rejected: $tmp_options" >&5 --$as_echo "$as_me: WARNING: compiler options rejected: $tmp_options" >&2;} -- CPPFLAGS="$tmp_save_CPPFLAGS" -- CFLAGS="$tmp_save_CFLAGS" -- -- fi -- -- # -- fi - - - # diff --git a/0105-curl-7.20.0-disable-test1112.patch b/0105-curl-7.20.0-disable-test1112.patch index ab41db7..e7d51db 100644 --- a/0105-curl-7.20.0-disable-test1112.patch +++ b/0105-curl-7.20.0-disable-test1112.patch @@ -1,27 +1,30 @@ tests/data/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + tests/data/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am -index 61b1b48..90d5084 100644 +index 9370974..b553f54 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -65,7 +65,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ - test1097 test560 test561 test1098 test1099 test562 test563 test1100 \ - test564 test1101 test1102 test1103 test1104 test299 test310 test311 \ - test312 test1105 test565 test800 test1106 test801 test566 test802 test803 \ -- test1107 test1108 test1109 test1110 test1111 test1112 test129 test567 \ -+ test1107 test1108 test1109 test1110 test1111 test129 test567 \ - test568 test569 test570 test571 test572 test804 test805 test806 test807 \ - test573 test313 test1115 - ---- a/tests/data/Makefile.in 2010-08-11 18:03:31.000000000 +0100 -+++ b/tests/data/Makefile.in 2010-08-24 22:20:45.719393097 +0100 -@@ -301,7 +301,7 @@ - test1097 test560 test561 test1098 test1099 test562 test563 test1100 \ - test564 test1101 test1102 test1103 test1104 test299 test310 test311 \ - test312 test1105 test565 test800 test1106 test801 test566 test802 test803 \ -- test1107 test1108 test1109 test1110 test1111 test1112 test129 test567 \ -+ test1107 test1108 test1109 test1110 test1111 test129 test567 \ - test568 test569 test570 test571 test572 test804 test805 test806 test807 \ - test573 test313 test1115 - + test561 test1098 test1099 test562 test563 test1100 test564 test1101 \ + test1102 test1103 test1104 test299 test310 test311 test312 test1105 \ + test565 test800 test1106 test801 test566 test802 test803 test1107 \ +- test1108 test1109 test1110 test1111 test1112 test129 test567 test568 \ ++ test1108 test1109 test1110 test1111 test129 test567 test568 \ + test569 test570 test571 test572 test804 test805 test806 test807 test573 \ + test313 test1115 test578 test579 test1116 test1200 test1201 test1202 \ + test1203 test1117 +diff --git a/tests/data/Makefile.in b/tests/data/Makefile.in +index 435b126..1d71c4e 100644 +--- a/tests/data/Makefile.in ++++ b/tests/data/Makefile.in +@@ -302,7 +302,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ + test561 test1098 test1099 test562 test563 test1100 test564 test1101 \ + test1102 test1103 test1104 test299 test310 test311 test312 test1105 \ + test565 test800 test1106 test801 test566 test802 test803 test1107 \ +- test1108 test1109 test1110 test1111 test1112 test129 test567 test568 \ ++ test1108 test1109 test1110 test1111 test129 test567 test568 \ + test569 test570 test571 test572 test804 test805 test806 test807 test573 \ + test313 test1115 test578 test579 test1116 test1200 test1201 test1202 \ + test1203 test1117 diff --git a/curl-7.21.1.tar.lzma.asc b/curl-7.21.1.tar.lzma.asc deleted file mode 100644 index 170b907..0000000 --- a/curl-7.21.1.tar.lzma.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.10 (GNU/Linux) - -iEYEABECAAYFAkxjGEgACgkQeOEcayedXJERTgCgrHuFAx04iNHwQ6oYM7BhMqMp -Y7UAoIlc2bmaf+/rpAvhJVU9T1I4AYIN -=afmI ------END PGP SIGNATURE----- diff --git a/curl-7.21.2.tar.lzma.asc b/curl-7.21.2.tar.lzma.asc new file mode 100644 index 0000000..d3518e4 --- /dev/null +++ b/curl-7.21.2.tar.lzma.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) + +iEYEABECAAYFAky025IACgkQeOEcayedXJHIEwCgqKMXD6Kd9MHuwDGaGME6ooNK +1mYAn0bGy1L/qmAzyCAy5TAZnj0Lkmhk +=CUrv +-----END PGP SIGNATURE----- diff --git a/curl.spec b/curl.spec index 68bce3b..6f80caf 100644 --- a/curl.spec +++ b/curl.spec @@ -1,33 +1,18 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl -Version: 7.21.1 -Release: 6%{?dist} +Version: 7.21.2 +Release: 1%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma Source2: curlbuild.h Source3: hide_selinux.c -# modify system headers to work around gcc bug (#617757) -Patch1: 0001-curl-7.21.1-a6e088e.patch - -# curl -T now ignores file size of special files (#622520) -Patch2: 0002-curl-7.21.1-5907777.patch - -# fix kerberos proxy authentication for https (#625676) -Patch3: 0003-curl-7.21.1-13b8fc4.patch - -# avoid a warning with autoconf 2.66 -Patch4: 0004-curl-7.21.1-d0dea8f.patch - # patch making libcurl multilib ready Patch101: 0101-curl-7.21.1-multilib.patch -# force -lrt when linking the curl tool and test-cases -Patch102: 0102-curl-7.21.1-lrt.patch - # prevent configure script from discarding -g in CFLAGS (#496778) -Patch103: 0103-curl-7.21.1-debug.patch +Patch102: 0102-curl-7.21.2-debug.patch # use localhost6 instead of ip6-localhost in the curl test-suite Patch104: 0104-curl-7.19.7-localhost6.patch @@ -53,9 +38,6 @@ BuildRequires: pkgconfig BuildRequires: stunnel BuildRequires: zlib-devel -# ssh(1) dies on SIGSEGV when SELinux policy is not installed (#632914) -BuildRequires: selinux-policy-targeted - # valgrind is not available on s390(x) %ifnarch s390 s390x BuildRequires: valgrind @@ -116,16 +98,9 @@ for f in CHANGES README; do mv -f ${f}.utf8 ${f} done -# upstream patches (already applied) -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 - # Fedora patches %patch101 -p1 %patch102 -p1 -%patch103 -p1 %patch104 -p1 %patch106 -p1 @@ -148,9 +123,8 @@ sed -i s/899\\\([0-9]\\\)/%{?__isa_bits}9\\1/ tests/data/test* --with-libidn \ --with-libssh2 \ --without-ssl --with-nss - -# uncomment to turn off optimizations -# find -name Makefile | xargs sed -i 's/-O2/-O0/' +# --enable-debug +# use ^^^ to turn off optimizations, etc. # either glibc's implementation of strcasecmp() or its interpretation # by valgrind seems to be broken on x86_64 (#626470), the same problem @@ -244,6 +218,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/libcurl.m4 %changelog +* Wed Oct 13 2010 Kamil Dudka 7.21.2-1 +- new upstream release, drop applied patches +- make 0102-curl-7.21.2-debug.patch less intrusive + * Wed Sep 29 2010 jkeating - 7.21.1-6 - Rebuilt for gcc bug 634757 diff --git a/sources b/sources index 886ace3..dbadf84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ba24de2381c9b183aaac48f029fcb0b curl-7.21.1.tar.lzma +4a7675737e0d3e19b193b3e765f5cf41 curl-7.21.2.tar.lzma