Cleanup for security bug #474354

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

11 files changed, 0 insertions, 620 deletions

diff --git a/net-misc/curl/files/curl-7.18.2-prefix.patch b/net-misc/curl/files/curl-7.18.2-prefix.patch
deleted file mode 100644
index 9f7761f4edc8..000000000000
--- a/net-misc/curl/files/curl-7.18.2-prefix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- curl-config.in.orig	2008-10-10 13:43:19.000000000 +0200
-+++ curl-config.in	2008-10-10 13:43:56.000000000 +0200
-@@ -181,7 +181,7 @@
- 	;;
- 
-     --cflags)
--       	if test "X@includedir@" = "X/usr/include"; then
-+       	if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
-           echo ""
-         else
-           echo "-I@includedir@"
-@@ -189,7 +189,7 @@
-        	;;
- 
-     --libs)
--	if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
-+	if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
- 	   CURLLIBDIR="-L@libdir@ "
- 	else
- 	   CURLLIBDIR=""
diff --git a/net-misc/curl/files/curl-7.19.7-test241.patch b/net-misc/curl/files/curl-7.19.7-test241.patch
deleted file mode 100644
index 7297c1b5b13e..000000000000
--- a/net-misc/curl/files/curl-7.19.7-test241.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tests/data/test241.orig	2008-11-20 08:12:35.000000000 +1100
-+++ tests/data/test241	2009-11-05 14:22:07.000000000 +1100
-@@ -33,7 +33,7 @@
- HTTP-IPv6 GET (using ip6-localhost)
-  </name>
-  <command>
---g "http://ip6-localhost:%HTTP6PORT/241"
-+-g "http://::1:%HTTP6PORT/241"
- </command>
- <precheck>
- ./server/resolve --ipv6 ip6-localhost
-@@ -48,7 +48,7 @@
- </strip>
- <protocol>
- GET /241 HTTP/1.1

--Host: ip6-localhost:%HTTP6PORT

-+Host: ::1:%HTTP6PORT

- Accept: */*

- 

- </protocol>
diff --git a/net-misc/curl/files/curl-7.20.0-strip-ldflags.patch b/net-misc/curl/files/curl-7.20.0-strip-ldflags.patch
deleted file mode 100644
index 8c074fbd4edd..000000000000
--- a/net-misc/curl/files/curl-7.20.0-strip-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- curl-config.in.orig	2007-09-14 07:36:18.000000000 +1000
-+++ curl-config.in	2007-09-14 07:37:14.000000000 +1000
-@@ -187,9 +187,9 @@
- 	   CURLLIBDIR=""
- 	fi
- 	if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
--	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
-+	  echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ @LIBS@
- 	else
--	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
-+	  echo ${CURLLIBDIR}-lcurl @LIBS@
- 	fi
- 	;;
- 
diff --git a/net-misc/curl/files/curl-7.27.0-curl-config.patch b/net-misc/curl/files/curl-7.27.0-curl-config.patch
deleted file mode 100644
index 06f0eb263fdc..000000000000
--- a/net-misc/curl/files/curl-7.27.0-curl-config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur curl-7.27.0.orig/curl-config.in curl-7.27.0/curl-config.in
---- curl-7.27.0.orig/curl-config.in	2012-05-25 23:56:17.000000000 +0200
-+++ curl-7.27.0/curl-config.in	2012-07-31 22:07:36.539655495 +0200
-@@ -135,9 +135,9 @@
-           CPPFLAG_CURL_STATICLIB=""
-         fi
-        	if test "X@includedir@" = "X/usr/include"; then
--          echo "$(CPPFLAG_CURL_STATICLIB)"
-+          echo "${CPPFLAG_CURL_STATICLIB}"
-         else
--          echo "$(CPPFLAG_CURL_STATICLIB)-I@includedir@"
-+          echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
-         fi
-        	;;
- 
diff --git a/net-misc/curl/files/curl-7.27.0-fix-metalink-gnutls.patch b/net-misc/curl/files/curl-7.27.0-fix-metalink-gnutls.patch
deleted file mode 100644
index 7cbd98b1a704..000000000000
--- a/net-misc/curl/files/curl-7.27.0-fix-metalink-gnutls.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 9f304291bd72aae66944cd7523707e1b88c6ad7b Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 6 Aug 2012 19:20:35 +0200
-Subject: [PATCH] metalink: change code order to build with gnutls-nettle
-
-Bug: http://curl.haxx.se/bug/view.cgi?id=3554668
-Reported by: Anthony G. Basile
----
- src/tool_metalink.c |  116 +++++++++++++++++++++++++--------------------------
- 1 file changed, 58 insertions(+), 58 deletions(-)
-
-diff --git a/src/tool_metalink.c b/src/tool_metalink.c
-index 5491815..3a24a15 100644
---- a/src/tool_metalink.c
-+++ b/src/tool_metalink.c
-@@ -82,64 +82,6 @@
-     return PARAM_NO_MEM; \
- } WHILE_FALSE
- 
--const digest_params MD5_DIGEST_PARAMS[] = {
--  {
--    (Curl_digest_init_func) MD5_Init,
--    (Curl_digest_update_func) MD5_Update,
--    (Curl_digest_final_func) MD5_Final,
--    sizeof(MD5_CTX),
--    16
--  }
--};
--
--const digest_params SHA1_DIGEST_PARAMS[] = {
--  {
--    (Curl_digest_init_func) SHA1_Init,
--    (Curl_digest_update_func) SHA1_Update,
--    (Curl_digest_final_func) SHA1_Final,
--    sizeof(SHA_CTX),
--    20
--  }
--};
--
--const digest_params SHA256_DIGEST_PARAMS[] = {
--  {
--    (Curl_digest_init_func) SHA256_Init,
--    (Curl_digest_update_func) SHA256_Update,
--    (Curl_digest_final_func) SHA256_Final,
--    sizeof(SHA256_CTX),
--    32
--  }
--};
--
--static const metalink_digest_def SHA256_DIGEST_DEF[] = {
--  {"sha-256", SHA256_DIGEST_PARAMS}
--};
--
--static const metalink_digest_def SHA1_DIGEST_DEF[] = {
--  {"sha-1", SHA1_DIGEST_PARAMS}
--};
--
--static const metalink_digest_def MD5_DIGEST_DEF[] = {
--  {"md5", MD5_DIGEST_PARAMS}
--};
--
--/*
-- * The alias of supported hash functions in the order by preference
-- * (basically stronger hash comes first). We included "sha-256" and
-- * "sha256". The former is the name defined in the IANA registry named
-- * "Hash Function Textual Names". The latter is widely (and
-- * historically) used in Metalink version 3.
-- */
--static const metalink_digest_alias digest_aliases[] = {
--  {"sha-256", SHA256_DIGEST_DEF},
--  {"sha256", SHA256_DIGEST_DEF},
--  {"sha-1", SHA1_DIGEST_DEF},
--  {"sha1", SHA1_DIGEST_DEF},
--  {"md5", MD5_DIGEST_DEF},
--  {NULL, NULL}
--};
--
- #ifdef USE_GNUTLS_NETTLE
- 
- static void MD5_Init(MD5_CTX *ctx)
-@@ -251,6 +193,64 @@ static void SHA256_Final(unsigned char digest[32], SHA256_CTX *ctx)
- 
- #endif /* CRYPTO LIBS */
- 
-+const digest_params MD5_DIGEST_PARAMS[] = {
-+  {
-+    (Curl_digest_init_func) MD5_Init,
-+    (Curl_digest_update_func) MD5_Update,
-+    (Curl_digest_final_func) MD5_Final,
-+    sizeof(MD5_CTX),
-+    16
-+  }
-+};
-+
-+const digest_params SHA1_DIGEST_PARAMS[] = {
-+  {
-+    (Curl_digest_init_func) SHA1_Init,
-+    (Curl_digest_update_func) SHA1_Update,
-+    (Curl_digest_final_func) SHA1_Final,
-+    sizeof(SHA_CTX),
-+    20
-+  }
-+};
-+
-+const digest_params SHA256_DIGEST_PARAMS[] = {
-+  {
-+    (Curl_digest_init_func) SHA256_Init,
-+    (Curl_digest_update_func) SHA256_Update,
-+    (Curl_digest_final_func) SHA256_Final,
-+    sizeof(SHA256_CTX),
-+    32
-+  }
-+};
-+
-+static const metalink_digest_def SHA256_DIGEST_DEF[] = {
-+  {"sha-256", SHA256_DIGEST_PARAMS}
-+};
-+
-+static const metalink_digest_def SHA1_DIGEST_DEF[] = {
-+  {"sha-1", SHA1_DIGEST_PARAMS}
-+};
-+
-+static const metalink_digest_def MD5_DIGEST_DEF[] = {
-+  {"md5", MD5_DIGEST_PARAMS}
-+};
-+
-+/*
-+ * The alias of supported hash functions in the order by preference
-+ * (basically stronger hash comes first). We included "sha-256" and
-+ * "sha256". The former is the name defined in the IANA registry named
-+ * "Hash Function Textual Names". The latter is widely (and
-+ * historically) used in Metalink version 3.
-+ */
-+static const metalink_digest_alias digest_aliases[] = {
-+  {"sha-256", SHA256_DIGEST_DEF},
-+  {"sha256", SHA256_DIGEST_DEF},
-+  {"sha-1", SHA1_DIGEST_DEF},
-+  {"sha1", SHA1_DIGEST_DEF},
-+  {"md5", MD5_DIGEST_DEF},
-+  {NULL, NULL}
-+};
-+
- digest_context *Curl_digest_init(const digest_params *dparams)
- {
-   digest_context *ctxt;
--- 
-1.7.10.4
-
diff --git a/net-misc/curl/files/curl-7.27.0-fix-nettle-include.patch b/net-misc/curl/files/curl-7.27.0-fix-nettle-include.patch
deleted file mode 100644
index b0a81657fd89..000000000000
--- a/net-misc/curl/files/curl-7.27.0-fix-nettle-include.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 986c7949c0638bebb99bd08d63216433254c2185 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 6 Aug 2012 15:04:25 +0200
-Subject: [PATCH] gtls: fix build failure by including nettle-specific headers
-
-Bug: http://curl.haxx.se/bug/view.cgi?id=3554668
-Reported by: Anthony G. Basile
----
- lib/gtls.c |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/gtls.c b/lib/gtls.c
-index d981ef1..c750a6f 100644
---- a/lib/gtls.c
-+++ b/lib/gtls.c
-@@ -34,7 +34,10 @@
- 
- #include <gnutls/gnutls.h>
- #include <gnutls/x509.h>
--#ifndef USE_GNUTLS_NETTLE
-+#ifdef USE_GNUTLS_NETTLE
-+#include <gnutls/crypto.h>
-+#include <nettle/md5.h>
-+#else
- #include <gcrypt.h>
- #endif
- 
--- 
-1.7.10.4
-
diff --git a/net-misc/curl/files/curl-7.27.0-prefix.patch b/net-misc/curl/files/curl-7.27.0-prefix.patch
deleted file mode 100644
index 4f37d8b473f6..000000000000
--- a/net-misc/curl/files/curl-7.27.0-prefix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur curl-7.27.0.orig//curl-config.in curl-7.27.0/curl-config.in
---- curl-7.27.0.orig//curl-config.in	2012-05-25 17:56:17.000000000 -0400
-+++ curl-7.27.0/curl-config.in	2012-07-29 06:47:37.000000000 -0400
-@@ -134,7 +134,7 @@
-         else
-           CPPFLAG_CURL_STATICLIB=""
-         fi
--       	if test "X@includedir@" = "X/usr/include"; then
-+	if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
-           echo "${CPPFLAG_CURL_STATICLIB}"
-         else
-           echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
-@@ -142,7 +142,7 @@
-        	;;
- 
-     --libs)
--	if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
-+	if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
- 	   CURLLIBDIR="-L@libdir@ "
- 	else
- 	   CURLLIBDIR=""
diff --git a/net-misc/curl/files/curl-7.28.0-fix-http-auth.patch b/net-misc/curl/files/curl-7.28.0-fix-http-auth.patch
deleted file mode 100644
index 441fd3f47e33..000000000000
--- a/net-misc/curl/files/curl-7.28.0-fix-http-auth.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Revert "zero out auth structs before transfer" which breaks http/https auth.
-
-See:
-https://bugs.gentoo.org/show_bug.cgi?id=438718
-https://sourceforge.net/tracker/?func=detail&aid=3577557&group_id=976&atid=100976
-
---
-diff --git a/lib/transfer.c b/lib/transfer.c
-index 2ad5fad..a00469e 100644
---- a/lib/transfer.c
-+++ b/lib/transfer.c
-@@ -1433,10 +1433,6 @@ CURLcode Curl_pretransfer(struct SessionHandle *data)
- 
-   data->state.ssl_connect_retry = FALSE;
- 
--  /* zero out auth state */
--  memset(&data->state.authhost, 0, sizeof(struct auth));
--  memset(&data->state.authproxy, 0, sizeof(struct auth));
--
-   data->state.authproblem = FALSE;
-   data->state.authhost.want = data->set.httpauth;
-   data->state.authproxy.want = data->set.proxyauth;
diff --git a/net-misc/curl/files/curl-7.28.0-prefix.patch b/net-misc/curl/files/curl-7.28.0-prefix.patch
deleted file mode 100644
index 377d03b06121..000000000000
--- a/net-misc/curl/files/curl-7.28.0-prefix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nuar curl-7.28.0.orig/curl-config.in curl-7.28.0/curl-config.in
---- curl-7.28.0.orig/curl-config.in	2012-08-08 17:38:25.000000000 -0400
-+++ curl-7.28.0/curl-config.in	2012-10-13 17:11:30.000000000 -0400
-@@ -134,7 +134,7 @@
-         else
-           CPPFLAG_CURL_STATICLIB=""
-         fi
--       	if test "X@includedir@" = "X/usr/include"; then
-+       	if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then
-           echo "$CPPFLAG_CURL_STATICLIB"
-         else
-           echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
-@@ -142,7 +142,7 @@
-        	;;
- 
-     --libs)
--	if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
-+	if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
- 	   CURLLIBDIR="-L@libdir@ "
- 	else
- 	   CURLLIBDIR=""
diff --git a/net-misc/curl/files/curl-7.29.0-fix-null-pointer.patch b/net-misc/curl/files/curl-7.29.0-fix-null-pointer.patch
deleted file mode 100644
index 3a20c8ab19b2..000000000000
--- a/net-misc/curl/files/curl-7.29.0-fix-null-pointer.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix NULL pointer reference when closing an unused multi handle.
-
-This is commit da3fc1e from upstream, modulo test 1508.
-
-X-Gentoo-Bug: 456842
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/456842
-Reported-by: Thomas McShane <firewrks@yahoo.com>
-
-diff --git a/lib/multi.c b/lib/multi.c
-index fa0afb9..706df23 100644
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
-     /* Close all the connections in the connection cache */
-     close_all_connections(multi);
- 
--    multi->closure_handle->dns.hostcache = multi->hostcache;
--    Curl_hostcache_clean(multi->closure_handle);
-+    if(multi->closure_handle) {
-+      multi->closure_handle->dns.hostcache = multi->hostcache;
-+      Curl_hostcache_clean(multi->closure_handle);
- 
--    Curl_close(multi->closure_handle);
-+      Curl_close(multi->closure_handle);
-+    }
-     multi->closure_handle = NULL;
- 
-     Curl_hash_destroy(multi->sockhash);
diff --git a/net-misc/curl/files/curl-respect-cflags.patch b/net-misc/curl/files/curl-respect-cflags.patch
deleted file mode 100644
index c0ea64e15207..000000000000
--- a/net-misc/curl/files/curl-respect-cflags.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-diff -urN curl-7.21.4.old/m4/curl-compilers.m4 curl-7.21.4/m4/curl-compilers.m4
---- curl-7.21.4.old/m4/curl-compilers.m4	2011-02-19 18:05:43.000000000 +0100
-+++ curl-7.21.4/m4/curl-compilers.m4	2011-02-19 18:11:04.000000000 +0100
-@@ -86,19 +86,19 @@
-     clangvhi=`echo $clangver | cut -d . -f1`
-     clangvlo=`echo $clangver | cut -d . -f2`
-     compiler_num=`(expr $clangvhi "*" 100 + $clangvlo) 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_yes="-g"
--    flags_dbg_off="-g0"
--    flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4"
--    flags_opt_yes="-Os"
--    flags_opt_off="-O0"
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -117,12 +117,12 @@
-     test "$curl_cv_have_def___DECC_VER" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="DEC_C"
--    flags_dbg_all="-g -g0 -g1 -g2 -g3"
--    flags_dbg_yes="-g2"
--    flags_dbg_off="-g0"
--    flags_opt_all="-O -O0 -O1 -O2 -O3 -O4"
--    flags_opt_yes="-O1"
--    flags_opt_off="-O0"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -146,19 +146,19 @@
-     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_yes="-g"
--    flags_dbg_off="-g0"
--    flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
--    flags_opt_yes="-O2"
--    flags_opt_off="-O0"
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -175,12 +175,12 @@
-   if test "$curl_cv_have_def___HP_cc" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="HP_UX_C"
--    flags_dbg_all="-g -s"
--    flags_dbg_yes="-g"
--    flags_dbg_off="-s"
--    flags_opt_all="-O +O0 +O1 +O2 +O3 +O4"
--    flags_opt_yes="+O2"
--    flags_opt_off="+O0"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -197,19 +197,19 @@
-   if test "$curl_cv_have_def___IBMC__" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="IBM_C"
--    flags_dbg_all="-g -g0 -g1 -g2 -g3"
--    flags_dbg_yes="-g"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-     flags_dbg_off=""
--    flags_opt_all="-O -O0 -O1 -O2 -O3 -O4 -O5"
--    flags_opt_all="$flags_opt_all -qnooptimize"
--    flags_opt_all="$flags_opt_all -qoptimize=0"
--    flags_opt_all="$flags_opt_all -qoptimize=1"
--    flags_opt_all="$flags_opt_all -qoptimize=2"
--    flags_opt_all="$flags_opt_all -qoptimize=3"
--    flags_opt_all="$flags_opt_all -qoptimize=4"
--    flags_opt_all="$flags_opt_all -qoptimize=5"
--    flags_opt_yes="-O2"
--    flags_opt_off="-qnooptimize"
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -230,27 +230,27 @@
-     CURL_CHECK_DEF([__unix__], [], [silent])
-     if test "$curl_cv_have_def___unix__" = "yes"; then
-       compiler_id="INTEL_UNIX_C"
--      flags_dbg_all="-g -g0"
--      flags_dbg_yes="-g"
--      flags_dbg_off="-g0"
--      flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
--      flags_opt_yes="-O2"
--      flags_opt_off="-O0"
-+      flags_dbg_all=""
-+      flags_dbg_yes=""
-+      flags_dbg_off=""
-+      flags_opt_all=""
-+      flags_opt_yes=""
-+      flags_opt_off=""
-     else
-       compiler_id="INTEL_WINDOWS_C"
--      flags_dbg_all="/ZI /Zi /zI /zi /ZD /Zd /zD /zd /Z7 /z7 /Oy /Oy-"
--      flags_dbg_all="$flags_dbg_all /debug"
--      flags_dbg_all="$flags_dbg_all /debug:none"
--      flags_dbg_all="$flags_dbg_all /debug:minimal"
--      flags_dbg_all="$flags_dbg_all /debug:partial"
--      flags_dbg_all="$flags_dbg_all /debug:full"
--      flags_dbg_all="$flags_dbg_all /debug:semantic_stepping"
--      flags_dbg_all="$flags_dbg_all /debug:extended"
--      flags_dbg_yes="/Zi /Oy-"
--      flags_dbg_off="/debug:none /Oy-"
--      flags_opt_all="/O /O0 /O1 /O2 /O3 /Od /Og /Og- /Oi /Oi-"
--      flags_opt_yes="/O2"
--      flags_opt_off="/Od"
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_all=""
-+      flags_dbg_yes=""
-+      flags_dbg_off=""
-+      flags_opt_all=""
-+      flags_opt_yes=""
-+      flags_opt_off=""
-     fi
-   else
-     AC_MSG_RESULT([no])
-@@ -268,8 +268,8 @@
-   if test "$curl_cv_have_def___LCC__" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="LCC"
--    flags_dbg_all="-g"
--    flags_dbg_yes="-g"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-     flags_dbg_off=""
-     flags_opt_all=""
-     flags_opt_yes=""
-@@ -294,12 +294,12 @@
-     test "$compiler_id" = "unknown"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="SGI_MIPS_C"
--    flags_dbg_all="-g -g0 -g1 -g2 -g3"
--    flags_dbg_yes="-g"
--    flags_dbg_off="-g0"
--    flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
--    flags_opt_yes="-O2"
--    flags_opt_off="-O0"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -321,12 +321,12 @@
-      test "$curl_cv_have_def__COMPILER_VERSION" = "yes"); then
-     AC_MSG_RESULT([yes])
-     compiler_id="SGI_MIPSPRO_C"
--    flags_dbg_all="-g -g0 -g1 -g2 -g3"
--    flags_dbg_yes="-g"
--    flags_dbg_off="-g0"
--    flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
--    flags_opt_yes="-O2"
--    flags_opt_off="-O0"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-   fi
-@@ -343,11 +343,11 @@
-   if test "$curl_cv_have_def___SUNPRO_C" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="SUNPRO_C"
--    flags_dbg_all="-g -s"
--    flags_dbg_yes="-g"
--    flags_dbg_off="-s"
--    flags_opt_all="-O -xO -xO1 -xO2 -xO3 -xO4 -xO5"
--    flags_opt_yes="-xO2"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-+    flags_dbg_off=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-     flags_opt_off=""
-   else
-     AC_MSG_RESULT([no])
-@@ -365,8 +365,8 @@
-   if test "$curl_cv_have_def___TINYC__" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="TINY_C"
--    flags_dbg_all="-g -b"
--    flags_dbg_yes="-g"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-     flags_dbg_off=""
-     flags_opt_all=""
-     flags_opt_yes=""
-@@ -389,12 +389,12 @@
-     CURL_CHECK_DEF([__UNIX__], [], [silent])
-     if test "$curl_cv_have_def___UNIX__" = "yes"; then
-       compiler_id="WATCOM_UNIX_C"
--      flags_dbg_all="-g1 -g1+ -g2 -g3"
--      flags_dbg_yes="-g2"
-+      flags_dbg_all=""
-+      flags_dbg_yes=""
-       flags_dbg_off=""
--      flags_opt_all="-O0 -O1 -O2 -O3"
--      flags_opt_yes="-O2"
--      flags_opt_off="-O0"
-+      flags_opt_all=""
-+      flags_opt_yes=""
-+      flags_opt_off=""
-     else
-       compiler_id="WATCOM_WINDOWS_C"
-       flags_dbg_all=""