ping with a newer version this time.
On 14 March 2017 at 22:13, David CARLIER <devnexen@gmail.com> wrote:
> ping
>
> On 18 February 2017 at 14:33, David CARLIER <devnexen@gmail.com> wrote:
>
>> ping :-)
>>
>> On 9 February 2017 at 20:31, David CARLIER <devnexen@gmail.com> wrote:
>>
>>> Thanks for your inputs. Here a new version. Regards.
>>>
>>> On 9 February 2017 at 17:35, Stuart Henderson <stu@spacehopper.org>
>>> wrote:
>>>
>>>> On 2017/02/09 16:04, David CARLIER wrote:
>>>> > ping :-)
>>>> >
>>>> > On 27 January 2017 at 22:57, David CARLIER <devnexen@gmail.com>
>>>> wrote:
>>>> >
>>>> > > Hi all,
>>>> > >
>>>> > > This is an early draft of a possible import of h2o into the tree.
>>>> > >
>>>> > > Let me know what you think.
>>>> > >
>>>> > > Thanks.
>>>> > >
>>>>
>>>> On 2017/01/27 22:57, David CARLIER wrote:
>>>> > diff --git a/www/h2o/Makefile b/www/h2o/Makefile
>>>>
>>>> tar.gz for ports submissions please.
>>>>
>>>> > new file mode 100644
>>>> > index 0000000..df7a730
>>>> > --- /dev/null
>>>> > +++ b/www/h2o/Makefile
>>>> > @@ -0,0 +1,35 @@
>>>> > +# $OpenBSD $
>>>> > +
>>>> > +COMMENT = Web server library
>>>>
>>>> lowercase first char. could do with being more descriptive. it's not
>>>> just a library.
>>>>
>>>> > +DISTNAME = v${V}
>>>> > +PKGNAME = h2o-${V}
>>>> > +V = 2.1.0
>>>> ..
>>>> > +MASTER_SITES = https://github.com/h2o/h2o/archive/
>>>> ..
>>>> > +WRKDIST = ${WRKDIR}/${PKGNAME}
>>>>
>>>> replace all the above with
>>>>
>>>> GH_ACCOUNT= h2o
>>>> GH_PROJECT= h2o
>>>> GH_TAGNAME= v2.1.0
>>>>
>>>> and regenerate distinfo
>>>>
>>>> > +
>>>> > +SHARED_LIBS = h2o-evloop 0.0
>>>> > +
>>>> > +CATEGORIES = www
>>>> > +
>>>> > +HOMEPAGE = http://h2o.examp1e.net
>>>>
>>>> immediately redirects to https://h2o.examp1e.net/, so better to use
>>>> that.
>>>>
>>>> > +
>>>> > +PERMIT_PACKAGE_CDROM = Yes
>>>> > +
>>>> > +MODULES = devel/cmake gcc4
>>>> > +MODGCC4_LANGS = c c++
>>>> > +MODGCC4_ARCHS = *
>>>> > +
>>>> > +CONFIGURE_ARGS = -DWITH_BUNDLED_SSL=OFF \
>>>> > + -DBUILD_SHARED_LIBS=ON \
>>>> > + -DWITH_MRUBY=OFF \
>>>> > + -DCMAKE_INSTALL_SYSCONFDIR=/etc/h2o
>>>> > +
>>>> > +NO_TEST = No
>>>> > +
>>>> > +post-install:
>>>> > + @mkdir /etc/h2o
>>>> > + ${INSTALL_DATA} ${FILESDIR}/h2o.conf /etc/h2o
>>>>
>>>> during packaging, install the files to ${PREFIX}/share/examples/h2o.
>>>>
>>>> in plist, do this
>>>>
>>>> share/examples/h2o/
>>>> @sample ${SYSCONFDIR}/h2o/
>>>> share/examples/h2o/h2o.conf
>>>> @sample ${SYSCONFDIR}/h2o/h2o.conf
>>>>
>>>> > diff --git a/www/h2o/files/h2o.conf b/www/h2o/files/h2o.conf
>>>> > new file mode 100644
>>>> > index 0000000..f57cd33
>>>> > --- /dev/null
>>>> > +++ b/www/h2o/files/h2o.conf
>>>> > @@ -0,0 +1,7 @@
>>>> > +listen: 8080
>>>> > +hosts:
>>>> > + "127.0.0.1:8080":
>>>> > + paths:
>>>> > + /:
>>>> > + file.dir: /var/www/htdocs
>>>> > + access-log: /var/log/h2o-access.log
>>>>
>>>> probably better to use something in /var/www/logs/ -
>>>> maybe just use the existing /var/www/logs/access.log?
>>>>
>>>> > diff --git a/www/h2o/pkg/DESCR b/www/h2o/pkg/DESCR
>>>> > new file mode 100644
>>>> > index 0000000..2b22290
>>>> > --- /dev/null
>>>> > +++ b/www/h2o/pkg/DESCR
>>>> > @@ -0,0 +1 @@
>>>> > +H2o is an optimized HTTP server with support for HTTP/1.x and HTTP/2
>>>>
>>>> could do with a bit more description here.
>>>> could use "optimized HTTP server with support for HTTP/1.x and HTTP/2"
>>>> as COMMENT..
>>>>
>>>> > diff --git a/www/h2o/pkg/PLIST b/www/h2o/pkg/PLIST
>>>> > new file mode 100644
>>>> > index 0000000..984f0d5
>>>> > --- /dev/null
>>>> > +++ b/www/h2o/pkg/PLIST
>>>> > @@ -0,0 +1,115 @@
>>>> > +@comment $OpenBSD$
>>>> > +@bin bin/h2o
>>>> > +@mode 700
>>>> > +@owner www
>>>> > +@group www
>>>> > +include/h2o/
>>>> > +include/h2o.h
>>>> > +include/h2o/cache.h
>>>> <..>
>>>>
>>>> these @mode/@owner/@group are wrong. www should never be able to write
>>>> to
>>>> these sorts of file.
>>>>
>>>> > +include/h2o/cache_digests.h
>>>> > +include/h2o/configurator.h
>>>> > +include/h2o/file.h
>>>> > +include/h2o/filecache.h
>>>> > +include/h2o/hostinfo.h
>>>> > +include/h2o/http1.h
>>>> > +include/h2o/http1client.h
>>>> > +include/h2o/http2.h
>>>> > +include/h2o/http2_casper.h
>>>> > +include/h2o/http2_internal.h
>>>> > +include/h2o/http2_scheduler.h
>>>> > +include/h2o/linklist.h
>>>> > +include/h2o/memcached.h
>>>> > +include/h2o/memory.h
>>>> > +include/h2o/mruby_.h
>>>> > +include/h2o/multithread.h
>>>> > +include/h2o/openssl_backport.h
>>>> > +include/h2o/rand.h
>>>> > +include/h2o/serverutil.h
>>>> > +include/h2o/socket/
>>>> > +include/h2o/socket.h
>>>> > +include/h2o/socket/evloop.h
>>>> > +include/h2o/socket/uv-binding.h
>>>> > +include/h2o/socketpool.h
>>>> > +include/h2o/string_.h
>>>> > +include/h2o/time_.h
>>>> > +include/h2o/timeout.h
>>>> > +include/h2o/token.h
>>>> > +include/h2o/tunnel.h
>>>> > +include/h2o/url.h
>>>> > +include/h2o/version.h
>>>> > +include/h2o/websocket.h
>>>> > +@lib lib/libh2o-evloop.so.${LIBh2o-evloop_VERSION}
>>>> > +lib/pkgconfig/libh2o-evloop.pc
>>>> > +share/doc/h2o/
>>>> > +share/doc/h2o/assets/
>>>> > +share/doc/h2o/assets/8mbps100msec-nginx195-h2o150.png
>>>> > +share/doc/h2o/assets/firstpaintbench.png
>>>> > +share/doc/h2o/assets/remotebench.png
>>>> > +share/doc/h2o/assets/searchstyle.css
>>>> > +share/doc/h2o/assets/staticfile612-nginx1910-h2o170.png
>>>> > +share/doc/h2o/assets/style.css
>>>> > +share/doc/h2o/benchmarks.html
>>>> > +share/doc/h2o/configure/
>>>> > +share/doc/h2o/configure.html
>>>> > +share/doc/h2o/configure/access_control.html
>>>> > +share/doc/h2o/configure/access_log_directives.html
>>>> > +share/doc/h2o/configure/base_directives.html
>>>> > +share/doc/h2o/configure/basic_auth.html
>>>> > +share/doc/h2o/configure/cgi.html
>>>> > +share/doc/h2o/configure/command_options.html
>>>> > +share/doc/h2o/configure/compress_directives.html
>>>> > +share/doc/h2o/configure/dos_detection.html
>>>> > +share/doc/h2o/configure/errordoc_directives.html
>>>> > +share/doc/h2o/configure/expires_directives.html
>>>> > +share/doc/h2o/configure/fastcgi_directives.html
>>>> > +share/doc/h2o/configure/file_directives.html
>>>> > +share/doc/h2o/configure/headers_directives.html
>>>> > +share/doc/h2o/configure/http1_directives.html
>>>> > +share/doc/h2o/configure/http2_directives.html
>>>> > +share/doc/h2o/configure/mruby.html
>>>> > +share/doc/h2o/configure/mruby_directives.html
>>>> > +share/doc/h2o/configure/proxy_directives.html
>>>> > +share/doc/h2o/configure/quick_start.html
>>>> > +share/doc/h2o/configure/redirect_directives.html
>>>> > +share/doc/h2o/configure/reproxy_directives.html
>>>> > +share/doc/h2o/configure/status_directives.html
>>>> > +share/doc/h2o/configure/syntax_and_structure.html
>>>> > +share/doc/h2o/configure/throttle_response_directives.html
>>>> > +share/doc/h2o/examples/
>>>> > +share/doc/h2o/examples/doc_root/
>>>> > +share/doc/h2o/examples/doc_root.alternate/
>>>> > +share/doc/h2o/examples/doc_root.alternate/index.txt
>>>> > +share/doc/h2o/examples/doc_root/index.html
>>>> > +share/doc/h2o/examples/h2o/
>>>> > +share/doc/h2o/examples/h2o/alternate.crt
>>>> > +share/doc/h2o/examples/h2o/alternate.key
>>>> > +share/doc/h2o/examples/h2o/h2o.conf
>>>> > +share/doc/h2o/examples/h2o/server.crt
>>>> > +share/doc/h2o/examples/h2o/server.key
>>>> > +share/doc/h2o/examples/h2o_mruby/
>>>> > +share/doc/h2o/examples/h2o_mruby/h2o.conf
>>>> > +share/doc/h2o/examples/h2o_mruby/hello.rb
>>>> > +share/doc/h2o/examples/libh2o/
>>>> > +share/doc/h2o/examples/libh2o/http1client.c
>>>> > +share/doc/h2o/examples/libh2o/latency-optimization.c
>>>> > +share/doc/h2o/examples/libh2o/simple.c
>>>> > +share/doc/h2o/examples/libh2o/socket-client.c
>>>> > +share/doc/h2o/examples/libh2o/websocket.c
>>>> > +share/doc/h2o/faq.html
>>>> > +share/doc/h2o/index.html
>>>> > +share/doc/h2o/install.html
>>>> > +share/doc/h2o/search/
>>>> > +share/doc/h2o/search/jquery-1.9.1.min.js
>>>> > +share/doc/h2o/search/oktavia-english-search.js
>>>> > +share/doc/h2o/search/oktavia-jquery-ui.js
>>>> > +share/doc/h2o/search/searchindex.js
>>>> > +share/h2o/
>>>> > +share/h2o/annotate-backtrace-symbols
>>>> > +share/h2o/ca-bundle.crt
>>>> > +share/h2o/fastcgi-cgi
>>>> > +share/h2o/fetch-ocsp-response
>>>> > +share/h2o/kill-on-close
>>>> > +share/h2o/setuidgid
>>>> > +share/h2o/start_server
>>>> > +share/h2o/status/
>>>> > +share/h2o/status/index.html
>>>>
>>>>
>>>>
>>>
>>
>
Tuesday, May 30, 2017
Re: UPDATE: devel/pcre
*ping*
On Sat May 13, 2017 at 09:59:20AM +0200, Rafael Sadowski wrote:
> On Sat May 13, 2017 at 12:40:18AM +0200, Rafael Sadowski wrote:
> > Hi ports@,
> >
> > simple update to the last stable version. No symbol changes in shared
> > libs.
> >
> > Comments? Ok?
> >
> > Best regards,
> >
> > Rafael
> >
>
> New morning , new diff.
> This time without hardcoded "-02" flags in configure. Also tested with
> clang(1).
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/pcre/Makefile,v
> retrieving revision 1.63
> diff -u -p -u -p -r1.63 Makefile
> --- Makefile 10 Apr 2017 11:45:26 -0000 1.63
> +++ Makefile 13 May 2017 07:56:01 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT= perl-compatible regular expression library
>
> -DISTNAME= pcre-8.38
> -REVISION= 0
> +DISTNAME= pcre-8.40
>
> SHARED_LIBS += pcre 3.0 # 0.1
> SHARED_LIBS += pcre16 0.0 # 0.0
> @@ -13,7 +12,7 @@ SHARED_LIBS += pcrecpp 3.3
> CATEGORIES= devel
> DPB_PROPERTIES= parallel
>
> -MASTER_SITES= http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \
> +MASTER_SITES= https://ftp.pcre.org/pub/pcre/ \
> ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
>
> HOMEPAGE= http://www.pcre.org/
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/pcre/distinfo,v
> retrieving revision 1.26
> diff -u -p -u -p -r1.26 distinfo
> --- distinfo 25 Nov 2015 09:37:00 -0000 1.26
> +++ distinfo 13 May 2017 07:56:01 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (pcre-8.38.tar.gz) = mIPkGcM2xjsMtSArCVN8FAlm1YXk0NpmFH3FE9oT5ik=
> -SIZE (pcre-8.38.tar.gz) = 2053336
> +SHA256 (pcre-8.40.tar.gz) = HXXOkOo/ge4IDNwE5oycJan7mEhhoGGL57v2drGO2j4=
> +SIZE (pcre-8.40.tar.gz) = 2065161
> Index: patches/patch-configure
> ===================================================================
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-configure 13 May 2017 07:56:01 -0000
> @@ -0,0 +1,77 @@
> +$OpenBSD$
> +
> +Index: configure
> +--- configure.orig
> ++++ configure
> +@@ -4163,17 +4163,9 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
> + if test "$ac_test_CFLAGS" = set; then
> + CFLAGS=$ac_save_CFLAGS
> + elif test $ac_cv_prog_cc_g = yes; then
> +- if test "$GCC" = yes; then
> +- CFLAGS="-g -O2"
> +- else
> + CFLAGS="-g"
> +- fi
> + else
> +- if test "$GCC" = yes; then
> +- CFLAGS="-O2"
> +- else
> + CFLAGS=
> +- fi
> + fi
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
> + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
> +@@ -5078,17 +5070,9 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
> + if test "$ac_test_CFLAGS" = set; then
> + CFLAGS=$ac_save_CFLAGS
> + elif test $ac_cv_prog_cc_g = yes; then
> +- if test "$GCC" = yes; then
> +- CFLAGS="-g -O2"
> +- else
> + CFLAGS="-g"
> +- fi
> + else
> +- if test "$GCC" = yes; then
> +- CFLAGS="-O2"
> +- else
> + CFLAGS=
> +- fi
> + fi
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
> + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
> +@@ -5612,17 +5596,9 @@ $as_echo "$ac_cv_prog_cxx_g" >&6; }
> + if test "$ac_test_CXXFLAGS" = set; then
> + CXXFLAGS=$ac_save_CXXFLAGS
> + elif test $ac_cv_prog_cxx_g = yes; then
> +- if test "$GXX" = yes; then
> +- CXXFLAGS="-g -O2"
> +- else
> + CXXFLAGS="-g"
> +- fi
> + else
> +- if test "$GXX" = yes; then
> +- CXXFLAGS="-O2"
> +- else
> + CXXFLAGS=
> +- fi
> + fi
> + ac_ext=c
> + ac_cpp='$CPP $CPPFLAGS'
> +@@ -5764,7 +5740,7 @@ if test "x$remember_set_CFLAGS" = "x"
> + then
> + if test "$CFLAGS" = "-g -O2"
> + then
> +- CFLAGS="-O2"
> ++ CFLAGS=""
> + elif test "$CFLAGS" = "-g"
> + then
> + CFLAGS=""
> +@@ -5775,7 +5751,7 @@ if test "x$remember_set_CXXFLAGS" = "x"
> + then
> + if test "$CXXFLAGS" = "-g -O2"
> + then
> +- CXXFLAGS="-O2"
> ++ CXXFLAGS=""
> + elif test "$CXXFLAGS" = "-g"
> + then
> + CXXFLAGS=""
> Index: patches/patch-pcre_compile_c
> ===================================================================
> RCS file: patches/patch-pcre_compile_c
> diff -N patches/patch-pcre_compile_c
> --- patches/patch-pcre_compile_c 1 Apr 2016 18:15:11 -0000 1.8
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,59 +0,0 @@
> -$OpenBSD: patch-pcre_compile_c,v 1.8 2016/04/01 18:15:11 robert Exp $
> -
> -CVE-2016-3191
> -
> - Upstream commit: http://vcs.pcre.org/pcre?view=revision&revision=1631
> -
> ---- pcre_compile.c.orig Tue Mar 22 20:27:48 2016
> -+++ pcre_compile.c Tue Mar 22 20:39:59 2016
> -@@ -6,7 +6,7 @@
> - and semantics are as close as possible to those of the Perl 5 language.
> -
> - Written by Philip Hazel
> -- Copyright (c) 1997-2014 University of Cambridge
> -+ Copyright (c) 1997-2016 University of Cambridge
> -
> - -----------------------------------------------------------------------------
> - Redistribution and use in source and binary forms, with or without
> -@@ -560,6 +560,7 @@ static const char error_texts[] =
> - /* 85 */
> - "parentheses are too deeply nested (stack check)\0"
> - "digits missing in \\x{} or \\o{}\0"
> -+ "regular expression is too complicated\0"
> - ;
> -
> - /* Table to identify digits and hex digits. This is used when compiling
> -@@ -4591,7 +4592,8 @@ for (;; ptr++)
> - if (code > cd->start_workspace + cd->workspace_size -
> - WORK_SIZE_SAFETY_MARGIN) /* Check for overrun */
> - {
> -- *errorcodeptr = ERR52;
> -+ *errorcodeptr = (code >= cd->start_workspace + cd->workspace_size)?
> -+ ERR52 : ERR87;
> - goto FAILED;
> - }
> -
> -@@ -6604,8 +6606,21 @@ for (;; ptr++)
> - cd->had_accept = TRUE;
> - for (oc = cd->open_caps; oc != NULL; oc = oc->next)
> - {
> -- *code++ = OP_CLOSE;
> -- PUT2INC(code, 0, oc->number);
> -+ if (lengthptr != NULL)
> -+ {
> -+#ifdef COMPILE_PCRE8
> -+ *lengthptr += 1 + IMM2_SIZE;
> -+#elif defined COMPILE_PCRE16
> -+ *lengthptr += 2 + IMM2_SIZE;
> -+#elif defined COMPILE_PCRE32
> -+ *lengthptr += 4 + IMM2_SIZE;
> -+
On Sat May 13, 2017 at 09:59:20AM +0200, Rafael Sadowski wrote:
> On Sat May 13, 2017 at 12:40:18AM +0200, Rafael Sadowski wrote:
> > Hi ports@,
> >
> > simple update to the last stable version. No symbol changes in shared
> > libs.
> >
> > Comments? Ok?
> >
> > Best regards,
> >
> > Rafael
> >
>
> New morning , new diff.
> This time without hardcoded "-02" flags in configure. Also tested with
> clang(1).
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/pcre/Makefile,v
> retrieving revision 1.63
> diff -u -p -u -p -r1.63 Makefile
> --- Makefile 10 Apr 2017 11:45:26 -0000 1.63
> +++ Makefile 13 May 2017 07:56:01 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT= perl-compatible regular expression library
>
> -DISTNAME= pcre-8.38
> -REVISION= 0
> +DISTNAME= pcre-8.40
>
> SHARED_LIBS += pcre 3.0 # 0.1
> SHARED_LIBS += pcre16 0.0 # 0.0
> @@ -13,7 +12,7 @@ SHARED_LIBS += pcrecpp 3.3
> CATEGORIES= devel
> DPB_PROPERTIES= parallel
>
> -MASTER_SITES= http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \
> +MASTER_SITES= https://ftp.pcre.org/pub/pcre/ \
> ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
>
> HOMEPAGE= http://www.pcre.org/
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/pcre/distinfo,v
> retrieving revision 1.26
> diff -u -p -u -p -r1.26 distinfo
> --- distinfo 25 Nov 2015 09:37:00 -0000 1.26
> +++ distinfo 13 May 2017 07:56:01 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (pcre-8.38.tar.gz) = mIPkGcM2xjsMtSArCVN8FAlm1YXk0NpmFH3FE9oT5ik=
> -SIZE (pcre-8.38.tar.gz) = 2053336
> +SHA256 (pcre-8.40.tar.gz) = HXXOkOo/ge4IDNwE5oycJan7mEhhoGGL57v2drGO2j4=
> +SIZE (pcre-8.40.tar.gz) = 2065161
> Index: patches/patch-configure
> ===================================================================
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-configure 13 May 2017 07:56:01 -0000
> @@ -0,0 +1,77 @@
> +$OpenBSD$
> +
> +Index: configure
> +--- configure.orig
> ++++ configure
> +@@ -4163,17 +4163,9 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
> + if test "$ac_test_CFLAGS" = set; then
> + CFLAGS=$ac_save_CFLAGS
> + elif test $ac_cv_prog_cc_g = yes; then
> +- if test "$GCC" = yes; then
> +- CFLAGS="-g -O2"
> +- else
> + CFLAGS="-g"
> +- fi
> + else
> +- if test "$GCC" = yes; then
> +- CFLAGS="-O2"
> +- else
> + CFLAGS=
> +- fi
> + fi
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
> + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
> +@@ -5078,17 +5070,9 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
> + if test "$ac_test_CFLAGS" = set; then
> + CFLAGS=$ac_save_CFLAGS
> + elif test $ac_cv_prog_cc_g = yes; then
> +- if test "$GCC" = yes; then
> +- CFLAGS="-g -O2"
> +- else
> + CFLAGS="-g"
> +- fi
> + else
> +- if test "$GCC" = yes; then
> +- CFLAGS="-O2"
> +- else
> + CFLAGS=
> +- fi
> + fi
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
> + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
> +@@ -5612,17 +5596,9 @@ $as_echo "$ac_cv_prog_cxx_g" >&6; }
> + if test "$ac_test_CXXFLAGS" = set; then
> + CXXFLAGS=$ac_save_CXXFLAGS
> + elif test $ac_cv_prog_cxx_g = yes; then
> +- if test "$GXX" = yes; then
> +- CXXFLAGS="-g -O2"
> +- else
> + CXXFLAGS="-g"
> +- fi
> + else
> +- if test "$GXX" = yes; then
> +- CXXFLAGS="-O2"
> +- else
> + CXXFLAGS=
> +- fi
> + fi
> + ac_ext=c
> + ac_cpp='$CPP $CPPFLAGS'
> +@@ -5764,7 +5740,7 @@ if test "x$remember_set_CFLAGS" = "x"
> + then
> + if test "$CFLAGS" = "-g -O2"
> + then
> +- CFLAGS="-O2"
> ++ CFLAGS=""
> + elif test "$CFLAGS" = "-g"
> + then
> + CFLAGS=""
> +@@ -5775,7 +5751,7 @@ if test "x$remember_set_CXXFLAGS" = "x"
> + then
> + if test "$CXXFLAGS" = "-g -O2"
> + then
> +- CXXFLAGS="-O2"
> ++ CXXFLAGS=""
> + elif test "$CXXFLAGS" = "-g"
> + then
> + CXXFLAGS=""
> Index: patches/patch-pcre_compile_c
> ===================================================================
> RCS file: patches/patch-pcre_compile_c
> diff -N patches/patch-pcre_compile_c
> --- patches/patch-pcre_compile_c 1 Apr 2016 18:15:11 -0000 1.8
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,59 +0,0 @@
> -$OpenBSD: patch-pcre_compile_c,v 1.8 2016/04/01 18:15:11 robert Exp $
> -
> -CVE-2016-3191
> -
> - Upstream commit: http://vcs.pcre.org/pcre?view=revision&revision=1631
> -
> ---- pcre_compile.c.orig Tue Mar 22 20:27:48 2016
> -+++ pcre_compile.c Tue Mar 22 20:39:59 2016
> -@@ -6,7 +6,7 @@
> - and semantics are as close as possible to those of the Perl 5 language.
> -
> - Written by Philip Hazel
> -- Copyright (c) 1997-2014 University of Cambridge
> -+ Copyright (c) 1997-2016 University of Cambridge
> -
> - -----------------------------------------------------------------------------
> - Redistribution and use in source and binary forms, with or without
> -@@ -560,6 +560,7 @@ static const char error_texts[] =
> - /* 85 */
> - "parentheses are too deeply nested (stack check)\0"
> - "digits missing in \\x{} or \\o{}\0"
> -+ "regular expression is too complicated\0"
> - ;
> -
> - /* Table to identify digits and hex digits. This is used when compiling
> -@@ -4591,7 +4592,8 @@ for (;; ptr++)
> - if (code > cd->start_workspace + cd->workspace_size -
> - WORK_SIZE_SAFETY_MARGIN) /* Check for overrun */
> - {
> -- *errorcodeptr = ERR52;
> -+ *errorcodeptr = (code >= cd->start_workspace + cd->workspace_size)?
> -+ ERR52 : ERR87;
> - goto FAILED;
> - }
> -
> -@@ -6604,8 +6606,21 @@ for (;; ptr++)
> - cd->had_accept = TRUE;
> - for (oc = cd->open_caps; oc != NULL; oc = oc->next)
> - {
> -- *code++ = OP_CLOSE;
> -- PUT2INC(code, 0, oc->number);
> -+ if (lengthptr != NULL)
> -+ {
> -+#ifdef COMPILE_PCRE8
> -+ *lengthptr += 1 + IMM2_SIZE;
> -+#elif defined COMPILE_PCRE16
> -+ *lengthptr += 2 + IMM2_SIZE;
> -+#elif defined COMPILE_PCRE32
> -+ *lengthptr += 4 + IMM2_SIZE;
> -+
Subscribe to:
Posts (Atom)