 @@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.123 2013/02/08 15:45:42 drochner Exp $
+# $NetBSD: Makefile,v 1.124 2013/02/11 12:20:43 wiz Exp $
-DISTNAME=	curl-7.28.1
+DISTNAME=	curl-7.29.0
 PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://curl.haxx.se/
 COMMENT=	Client that groks URLs
 # not completely, but near enough
 LICENSE=	mit
 PKG_INSTALLATION_TYPES=	overwrite pkgviews

 @@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.81 2013/02/08 15:45:42 drochner Exp $
+$NetBSD: distinfo,v 1.82 2013/02/11 12:20:43 wiz Exp $
-SHA1 (curl-7.28.1.tar.bz2) = b5aff1afc4e40fcb78db7a5e27214e0035756f3d
+SHA1 (curl-7.29.0.tar.bz2) = 03eddd295d3d50d60a9dd1c130c8e110ff1aa95a
-RMD160 (curl-7.28.1.tar.bz2) = d4a0cb79756607c3b573970648d639744f15fc65
+RMD160 (curl-7.29.0.tar.bz2) = 50c2ee716736dc0f1de26e032f525e7511912b95
-Size (curl-7.28.1.tar.bz2) = 2516671 bytes
+Size (curl-7.29.0.tar.bz2) = 2556495 bytes
-SHA1 (patch-CVE-2013-0249) = a00098804b17c59905fcd87dc69defc43f2aaf19
+SHA1 (patch-aa) = 07e12cd0576b87cfed74a6a2bf8dd42cb2f5a570
 SHA1 (patch-aa) = 66dc62384fa8dcd5a68f0f9af8b3c449a46fd250

 @@ -1,46 +1,54 @@
-$NetBSD: patch-aa,v 1.20 2012/08/01 12:27:12 drochner Exp $
+$NetBSD: patch-aa,v 1.21 2013/02/11 12:20:44 wiz Exp $
---- configure.orig	2012-07-27 18:25:28.000000000 +0000
+--- configure.orig	2013-02-06 09:47:26.000000000 +0000
 +++ configure
-@@ -15707,7 +15707,7 @@ squeeze() {
+@@ -3635,6 +3635,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
          ;;
      esac
    done
 +  xc_bad_var_cflags=no
    if test $xc_bad_var_cflags = yes; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
  $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;}
@@ -16373,7 +16374,7 @@ squeeze() {
+       #
 -  if test "$compiler_id" != "unknown"; then
 +  if false; then
+     #
      if test "$compiler_id" = "GNU_C" ||
        test "$compiler_id" = "CLANG"; then
-@@ -20390,15 +20390,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+@@ -21261,15 +21262,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
-            LIBS="$LIBS $gss_libs"
+            LIBS="$gss_libs $LIBS"
          elif test "$GSSAPI_ROOT" != "yes"; then
             LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
--           LIBS="$LIBS -lgssapi"
+-           LIBS="-lgssapi $LIBS"
-+           LIBS="$LIBS -lgssapi -lkrb5"
++           LIBS="-lgssapi -lkrb5 $LIBS"
          else
--           LIBS="$LIBS -lgssapi"
+-           LIBS="-lgssapi $LIBS"
-+           LIBS="$LIBS -lgssapi -lkrb5"
++           LIBS="-lgssapi -lkrb5 $LIBS"
          fi
          ;;
       esac
    else
       LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
--     LIBS="$LIBS -lgssapi"
+-     LIBS="-lgssapi $LIBS"
-+     LIBS="$LIBS -lgssapi -lkrb5"
++     LIBS="-lgssapi -lkrb5 $LIBS"
    fi
  else
    CPPFLAGS="$save_CPPFLAGS"
-@@ -24033,19 +24033,19 @@ $as_echo "$as_me: WARNING: You need an l
+@@ -24833,19 +24834,19 @@ $as_echo "$as_me: WARNING: You need an l
  $as_echo "yes" >&6; }
          if test "x$OPENSSL_ENABLED" = "x1"; then
            versioned_symbols_flavour="OPENSSL_"
 -        elif test "x$GNUTLS_ENABLED" == "x1"; then
 +        elif test "x$GNUTLS_ENABLED" = "x1"; then
            versioned_symbols_flavour="GNUTLS_"
 -        elif test "x$NSS_ENABLED" == "x1"; then
 +        elif test "x$NSS_ENABLED" = "x1"; then
            versioned_symbols_flavour="NSS_"
 -        elif test "x$POLARSSL_ENABLED" == "x1"; then
 +        elif test "x$POLARSSL_ENABLED" = "x1"; then
            versioned_symbols_flavour="POLARSSL_"
 -        elif test "x$CYASSL_ENABLED" == "x1"; then