update to 7.21.1 changes: bugfixesdiff -r1.98 -r1.99 pkgsrc/www/curl/Makefile
(drochner)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.98 2010/07/21 17:29:48 drochner Exp $ | 1 | # $NetBSD: Makefile,v 1.99 2010/08/15 11:14:36 drochner Exp $ | |
2 | 2 | |||
3 | DISTNAME= curl-7.21.0 | 3 | DISTNAME= curl-7.21.1 | |
4 | CATEGORIES= www | 4 | CATEGORIES= www | |
5 | MASTER_SITES= http://curl.haxx.se/download/ \ | 5 | MASTER_SITES= http://curl.haxx.se/download/ \ | |
6 | ftp://ftp.sunet.se/pub/www/utilities/curl/ | 6 | ftp://ftp.sunet.se/pub/www/utilities/curl/ | |
7 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
8 | 8 | |||
9 | MAINTAINER= recht@NetBSD.org | 9 | MAINTAINER= recht@NetBSD.org | |
10 | HOMEPAGE= http://curl.haxx.se/ | 10 | HOMEPAGE= http://curl.haxx.se/ | |
11 | COMMENT= Client that groks URLs | 11 | COMMENT= Client that groks URLs | |
12 | # not completely, but near enough | 12 | # not completely, but near enough | |
13 | LICENSE= mit | 13 | LICENSE= mit | |
14 | 14 | |||
15 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 15 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
16 | PKG_DESTDIR_SUPPORT= user-destdir | 16 | PKG_DESTDIR_SUPPORT= user-destdir |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.29 2009/11/15 20:09:48 drochner Exp $ | 1 | @comment $NetBSD: PLIST,v 1.30 2010/08/15 11:14:36 drochner Exp $ | |
2 | bin/curl | 2 | bin/curl | |
3 | bin/curl-config | 3 | bin/curl-config | |
4 | include/curl/curl.h | 4 | include/curl/curl.h | |
5 | include/curl/curlbuild.h | 5 | include/curl/curlbuild.h | |
6 | include/curl/curlrules.h | 6 | include/curl/curlrules.h | |
7 | include/curl/curlver.h | 7 | include/curl/curlver.h | |
8 | include/curl/easy.h | 8 | include/curl/easy.h | |
9 | include/curl/mprintf.h | 9 | include/curl/mprintf.h | |
10 | include/curl/multi.h | 10 | include/curl/multi.h | |
11 | include/curl/stdcheaders.h | 11 | include/curl/stdcheaders.h | |
12 | include/curl/typecheck-gcc.h | 12 | include/curl/typecheck-gcc.h | |
13 | include/curl/types.h | 13 | include/curl/types.h | |
14 | lib/libcurl.la | 14 | lib/libcurl.la | |
@@ -76,26 +76,27 @@ share/doc/curl/curl.pdf | @@ -76,26 +76,27 @@ share/doc/curl/curl.pdf | |||
76 | share/examples/curl/10-at-a-time.c | 76 | share/examples/curl/10-at-a-time.c | |
77 | share/examples/curl/README | 77 | share/examples/curl/README | |
78 | share/examples/curl/anyauthput.c | 78 | share/examples/curl/anyauthput.c | |
79 | share/examples/curl/cacertinmem.c | 79 | share/examples/curl/cacertinmem.c | |
80 | share/examples/curl/certinfo.c | 80 | share/examples/curl/certinfo.c | |
81 | share/examples/curl/chkspeed.c | 81 | share/examples/curl/chkspeed.c | |
82 | share/examples/curl/cookie_interface.c | 82 | share/examples/curl/cookie_interface.c | |
83 | share/examples/curl/curlgtk.c | 83 | share/examples/curl/curlgtk.c | |
84 | share/examples/curl/curlx.c | 84 | share/examples/curl/curlx.c | |
85 | share/examples/curl/debug.c | 85 | share/examples/curl/debug.c | |
86 | share/examples/curl/evhiperfifo.c | 86 | share/examples/curl/evhiperfifo.c | |
87 | share/examples/curl/fileupload.c | 87 | share/examples/curl/fileupload.c | |
88 | share/examples/curl/fopen.c | 88 | share/examples/curl/fopen.c | |
89 | share/examples/curl/ftp-wildcard.c | |||
89 | share/examples/curl/ftpget.c | 90 | share/examples/curl/ftpget.c | |
90 | share/examples/curl/ftpgetinfo.c | 91 | share/examples/curl/ftpgetinfo.c | |
91 | share/examples/curl/ftpgetresp.c | 92 | share/examples/curl/ftpgetresp.c | |
92 | share/examples/curl/ftpupload.c | 93 | share/examples/curl/ftpupload.c | |
93 | share/examples/curl/ftpuploadresume.c | 94 | share/examples/curl/ftpuploadresume.c | |
94 | share/examples/curl/getinfo.c | 95 | share/examples/curl/getinfo.c | |
95 | share/examples/curl/getinmemory.c | 96 | share/examples/curl/getinmemory.c | |
96 | share/examples/curl/ghiper.c | 97 | share/examples/curl/ghiper.c | |
97 | share/examples/curl/hiperfifo.c | 98 | share/examples/curl/hiperfifo.c | |
98 | share/examples/curl/htmltidy.c | 99 | share/examples/curl/htmltidy.c | |
99 | share/examples/curl/http-post.c | 100 | share/examples/curl/http-post.c | |
100 | share/examples/curl/httpcustomheader.c | 101 | share/examples/curl/httpcustomheader.c | |
101 | share/examples/curl/httpput.c | 102 | share/examples/curl/httpput.c |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.65 2010/07/21 17:29:48 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.66 2010/08/15 11:14:36 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (curl-7.21.0.tar.bz2) = 5cb1213187fb25d1b4392ddaca3a7945c749d083 | 3 | SHA1 (curl-7.21.1.tar.bz2) = d6ad8d7caf6e15f318e7b9f69dee8f67c807b1a0 | |
4 | RMD160 (curl-7.21.0.tar.bz2) = 121eb3645c1286d583462244c1d7e7356129c440 | 4 | RMD160 (curl-7.21.1.tar.bz2) = 3acc531f70adf68ce64bf8ccd198cbc33b6d5246 | |
5 | Size (curl-7.21.0.tar.bz2) = 2130889 bytes | 5 | Size (curl-7.21.1.tar.bz2) = 2150291 bytes | |
6 | SHA1 (patch-aa) = cc08018f15dbebe894b93ade8d8cce4a65db2d1e | 6 | SHA1 (patch-aa) = 02dbbc3d4c84cc1d112c5df424f3f2cc71448cbe |
@@ -1,27 +1,36 @@ | @@ -1,27 +1,36 @@ | |||
1 | $NetBSD: patch-aa,v 1.15 2010/07/21 17:29:48 drochner Exp $ | 1 | $NetBSD: patch-aa,v 1.16 2010/08/15 11:14:37 drochner Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2010-06-04 22:32:04.000000000 +0000 | 3 | --- configure.orig 2010-08-11 17:03:30.000000000 +0000 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -14715,7 +14715,7 @@ squeeze() { | 5 | @@ -2992,7 +2992,7 @@ CONFIGURE_OPTIONS="\"$ac_configure_args\ | |
6 | ||||
7 | ||||
8 | CURL_CFLAG_EXTRAS="" | |||
9 | -if test X"$want_werror" == Xyes; then | |||
10 | +if test X"$want_werror" = Xyes; then | |||
11 | CURL_CFLAG_EXTRAS="-Werror" | |||
12 | fi | |||
13 | ||||
14 | @@ -14762,7 +14762,7 @@ squeeze() { | |||
6 | 15 | |||
7 | 16 | |||
8 | # | 17 | # | |
9 | - if test "$compiler_id" != "unknown"; then | 18 | - if test "$compiler_id" != "unknown"; then | |
10 | + if false; then | 19 | + if false; then | |
11 | # | 20 | # | |
12 | if test "$compiler_id" = "GNU_C" || | 21 | if test "$compiler_id" = "GNU_C" || | |
13 | test "$compiler_id" = "CLANG"; then | 22 | test "$compiler_id" = "CLANG"; then | |
14 | @@ -19100,15 +19100,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd | 23 | @@ -19144,15 +19144,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd | |
15 | LIBS="$LIBS $gss_libs" | 24 | LIBS="$LIBS $gss_libs" | |
16 | elif test "$GSSAPI_ROOT" != "yes"; then | 25 | elif test "$GSSAPI_ROOT" != "yes"; then | |
17 | LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff" | 26 | LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff" | |
18 | - LIBS="$LIBS -lgssapi" | 27 | - LIBS="$LIBS -lgssapi" | |
19 | + LIBS="$LIBS -lgssapi -lkrb5" | 28 | + LIBS="$LIBS -lgssapi -lkrb5" | |
20 | else | 29 | else | |
21 | - LIBS="$LIBS -lgssapi" | 30 | - LIBS="$LIBS -lgssapi" | |
22 | + LIBS="$LIBS -lgssapi -lkrb5" | 31 | + LIBS="$LIBS -lgssapi -lkrb5" | |
23 | fi | 32 | fi | |
24 | ;; | 33 | ;; | |
25 | esac | 34 | esac | |
26 | else | 35 | else | |
27 | LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR" | 36 | LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR" |