update apache24 to httpd-2.4.29 (fixes CVE-2017-9798 too)

www/apache24/Makefile

@@ -5,7 +5,7 @@
 # to reference their own PRs this way, but this ends up
 # in NetBSD GNATS.
 
-DISTNAME=	httpd-2.4.27
+DISTNAME=	httpd-2.4.29
 PKGNAME=	${DISTNAME:S/httpd/apache/}
 PKGREVISION=	2
 CATEGORIES=	www

www/apache24/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2017/06/19 20:01:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2017/12/05 20:58:15 adam Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -1280,6 +1280,8 @@ share/httpd/manual/mod/mpm_winnt.html.ja.utf8
 share/httpd/manual/mod/mpmt_os2.html
 share/httpd/manual/mod/mpmt_os2.html.en
 share/httpd/manual/mod/mpmt_os2.html.fr
+share/httpd/manual/mod/overrides.html
+share/httpd/manual/mod/overrides.html.en
 share/httpd/manual/mod/prefork.html
 share/httpd/manual/mod/prefork.html.de
 share/httpd/manual/mod/prefork.html.en
@@ -1609,4 +1611,4 @@ share/httpd/manual/vhosts/name-based.html.ja.utf8
 share/httpd/manual/vhosts/name-based.html.ko.euc-kr
 share/httpd/manual/vhosts/name-based.html.tr.utf8
 @pkgdir share/httpd/manual/style/xsl/util
-@pkgdir share/httpd/manual/style/lang
+@pkgdir share/httpd/manual/style/lang

www/apache24/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.32 2017/09/18 13:34:51 wiz Exp $
+$NetBSD: distinfo,v 1.33 2017/12/05 20:45:51 wiz Exp $
 
-SHA1 (httpd-2.4.27.tar.bz2) = 699e4e917e8fb5fd7d0ce7e009f8256ed02ec6fc
-RMD160 (httpd-2.4.27.tar.bz2) = 46f601f58de77eb11fa4c7ea35fa0858d2f4d289
-SHA512 (httpd-2.4.27.tar.bz2) = 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
-Size (httpd-2.4.27.tar.bz2) = 6527394 bytes
+SHA1 (httpd-2.4.29.tar.bz2) = 699e4e917e8fb5fd7d0ce7e009f8256ed02ec6fc
+RMD160 (httpd-2.4.29.tar.bz2) = 46f601f58de77eb11fa4c7ea35fa0858d2f4d289
+SHA512 (httpd-2.4.29.tar.bz2) = 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
+Size (httpd-2.4.29.tar.bz2) = 6527394 bytes
 SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839
 SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324
 SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d
@@ -15,4 +15,3 @@ SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911
 SHA1 (patch-am) = acdf7198ae8b4353cfc70c8015a0f09de036b777
 SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df
 SHA1 (patch-include_ap__config.h) = 1d056e2d4db80ec97aaf755b6dd6aff69ed2cd96
-SHA1 (patch-server_core.c) = 52dbf840b22c4ad48ede200c3fe5ae889d2fe509

www/curl/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.187 2017/08/29 07:08:32 wiz Exp $
+# $NetBSD: Makefile,v 1.187 2017/12/05 21:24:38 wiz Exp $
 
-DISTNAME=	curl-7.55.1
+DISTNAME=	curl-7.57.0
 PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://curl.haxx.se/download/

www/curl/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.65 2017/08/15 05:35:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.66 2017/10/04 06:32:58 wiz Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
@@ -187,6 +187,7 @@ man/man3/CURLOPT_MAXFILESIZE_LARGE.3
 man/man3/CURLOPT_MAXREDIRS.3
 man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3
 man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3
+man/man3/CURLOPT_MIMEPOST.3
 man/man3/CURLOPT_NETRC.3
 man/man3/CURLOPT_NETRC_FILE.3
 man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3
@@ -270,6 +271,7 @@ man/man3/CURLOPT_SOCKS5_AUTH.3
 man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3
 man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3
 man/man3/CURLOPT_SSH_AUTH_TYPES.3
+man/man3/CURLOPT_SSH_COMPRESSION.3
 man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3
 man/man3/CURLOPT_SSH_KEYDATA.3
 man/man3/CURLOPT_SSH_KEYFUNCTION.3
@@ -354,6 +356,19 @@ man/man3/curl_getenv.3
 man/man3/curl_global_cleanup.3
 man/man3/curl_global_init.3
 man/man3/curl_global_init_mem.3
+man/man3/curl_global_sslset.3
+man/man3/curl_mime_addpart.3
+man/man3/curl_mime_data.3
+man/man3/curl_mime_data_cb.3
+man/man3/curl_mime_encoder.3
+man/man3/curl_mime_filedata.3
+man/man3/curl_mime_filename.3
+man/man3/curl_mime_free.3
+man/man3/curl_mime_headers.3
+man/man3/curl_mime_init.3
+man/man3/curl_mime_name.3
+man/man3/curl_mime_subparts.3
+man/man3/curl_mime_type.3
 man/man3/curl_mprintf.3
 man/man3/curl_multi_add_handle.3
 man/man3/curl_multi_assign.3
@@ -392,4 +407,4 @@ man/man3/libcurl.3
 share/aclocal/libcurl.m4
 share/doc/curl/FAQ
 share/doc/curl/MANUAL
-share/doc/curl/TheArtOfHttpScripting
+share/doc/curl/TheArtOfHttpScripting

www/curl/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.136 2017/08/15 05:35:57 adam Exp $
+$NetBSD: distinfo,v 1.140 2017/11/29 13:56:27 wiz Exp $
 
-SHA1 (curl-7.55.1.tar.bz2) = 76aabb69ec34e101f906132d12e983fb11547040
-RMD160 (curl-7.55.1.tar.bz2) = ad4317fcc67357f72d29424f7b621f104a98dd15
-SHA512 (curl-7.55.1.tar.bz2) = bfeb39e94b8378519b2efba0a476636b80dbee3434104b98464ee81ce3871eb134e065f52abe8bedb69681b43576cb30655c8be0be6115386859d0cb426d745b
-Size (curl-7.55.1.tar.bz2) = 2786830 bytes
-SHA1 (patch-configure) = fac0071bbb22cb379f36477e0e806a8f9f4d43eb
+SHA1 (curl-7.57.0.tar.bz2) = 7f47469324bf22cc9ffd1d3a201aa3c76ab626b8
+RMD160 (curl-7.57.0.tar.bz2) = e50c4ff25b6208187c5a3a10a5c8675faf75f64f
+SHA512 (curl-7.57.0.tar.bz2) = f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377
+Size (curl-7.57.0.tar.bz2) = 2849283 bytes
+SHA1 (patch-configure) = ba8abac55f11a53d07235e57d21ce5b32a421902
 SHA1 (patch-curl-config.in) = d0cc7bb6a5bf0b9257f40dcffce7093cc0098eb7
-SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308
+SHA1 (patch-lib_hostcheck.c) = 8e772d3f91cdafae17281cc19004269ece0cf308

www/curl/patches/patch-configure

@@ -1,21 +1,23 @@
-$NetBSD: patch-configure,v 1.2 2017/07/05 10:34:12 adam Exp $
+$NetBSD: patch-configure,v 1.3 2017/11/03 09:40:37 jperkin Exp $
 
 builtin krb5-config in platforms such as solaris do not support
 the gssapi option, and need an explicit -lgss
 
 On Darwin, do not append custom CFLAGS.
 
---- configure.orig	2017-06-14 06:10:57.000000000 +0000
+Do not strip debug flags.
+
+--- configure.orig	2017-10-17 14:31:48.000000000 +0000
 +++ configure
-@@ -4241,6 +4241,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
+@@ -4272,6 +4272,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;}
-@@ -17702,7 +17703,7 @@ squeeze() {
+@@ -17159,7 +17160,7 @@ squeeze() {
 
 
        #
@@ -24,7 +26,21 @@ On Darwin, do not append custom CFLAGS.
      #
      if test "$compiler_id" = "GNU_C" ||
        test "$compiler_id" = "CLANG"; then
-@@ -19639,7 +19640,7 @@ $as_echo "no" >&6; }
+@@ -17482,13 +17483,6 @@ $as_echo_n "checking if compiler accepts
+       tmp_options="$flags_dbg_off"
+     fi
+     #
+-    if test "$flags_prefer_cppflags" = "yes"; then
+-      CPPFLAGS="$tmp_CPPFLAGS $tmp_options"
+-      CFLAGS="$tmp_CFLAGS"
+-    else
+-      CPPFLAGS="$tmp_CPPFLAGS"
+-      CFLAGS="$tmp_CFLAGS $tmp_options"
+-    fi
+     squeeze CPPFLAGS
+     squeeze CFLAGS
+
+@@ -19122,7 +19116,7 @@ $as_echo "no" >&6; }
    tst_cflags="no"
    case $host_os in
      darwin*)
@@ -33,7 +49,7 @@ On Darwin, do not append custom CFLAGS.
        ;;
    esac
 
-@@ -22272,7 +22273,11 @@ $as_echo "yes" >&6; }
+@@ -21788,7 +21782,11 @@ $as_echo "yes" >&6; }
       if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
          GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
       elif test -f "$KRB5CONFIG"; then
@@ -46,12 +62,12 @@ On Darwin, do not append custom CFLAGS.
       elif test "$GSSAPI_ROOT" != "yes"; then
          GSSAPI_INCS="-I$GSSAPI_ROOT/include"
       fi
-@@ -22445,7 +22450,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+@@ -21961,7 +21959,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
          LIBS="-lgss $LIBS"
          ;;
       *)
 -        LIBS="-lgssapi $LIBS"
 +        LIBS="-lgssapi -lkrb5 $LIBS"
          ;;
       esac
-   fi
+   fi