Received: by mail.netbsd.org (Postfix, from userid 605) id 226B784EDF; Tue, 13 Feb 2018 08:34:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 931F284EC5 for ; Tue, 13 Feb 2018 08:34:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id GzIXK_jQD4V7 for ; Tue, 13 Feb 2018 08:34:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id BDAF384EC1 for ; Tue, 13 Feb 2018 08:34:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B6BBCFB40; Tue, 13 Feb 2018 08:34:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1518510843161650" MIME-Version: 1.0 Date: Tue, 13 Feb 2018 08:34:03 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/www/py-uwsgi To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20180213083403.B6BBCFB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1518510843161650 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: adam Date: Tue Feb 13 08:34:03 UTC 2018 Modified Files: pkgsrc/www/py-uwsgi: Makefile distinfo options.mk Log Message: py-uwsgi: updated to 2.0.16 uWSGI 2.0.16 Security [CVE-2018-6758] Stack-based buffer overflow in core/utils.c:uwsgi_expand_path() Changes Backported early_post_jail plugin hook (Bjørnar Ness) Fixed ipv6 suupport for http-socket (James Brown) Enable execinfo on DragonFly BSD (Aaron LI) Fix inet_ntop buffer size (Orivej Desh) Add worker running time metrics (Serge/yasek) Backported safe-pidfile, safe-pidfile2 (Nate Coraor) Stop using libxml2 by default on osx Fixed uwsgi_kvlist_parse signature Backport http range fixes from master (Curtis Maloney, Sokolov Yura) relicensed mod_proxy_uwsgi to Apache 2.0 logging: Add ${millis} support to json encode plugins/router_xmldir: fixup invalid locale check (Riccardo Magliocchetti) Add ssl-verify-depth flag to set the max Client CA chain length (Paul Tagliamonte) Allow to override build date (Bernhard M. Wiedemann) Python 3 plugin: improved thread names handling (Jyrki Muukkonen, Mark Meyer) Added uwsgi_resolve_ip for redis host (ahmbas) plugins/gevent: Fix signal handlers (Maslov Alexander) Write x509 DER to the uwsgi buffer (Paul Tagliamonte) plugin/http: Fix compilation (Melvyn Sopacua) Fixed emperor throttling system (Jeremy Hiatt) Fix application loading without Plack after excluding “.” from @INC in new Perl versions (Anton Petrusevich) Fix MULE MSG QUEUE IS FULL message hint (Eugene Tataurov) Build System: support k_minor has a _xxx suffix (TOGO Li) Fixed drop-after-* options (Robert DeRose) Add mule_send_msg success indicator (Josh Tiras) Properly check item size in uwsgi_queue_push (Josh Tiras) FastRouter / HTTP Router can now have a ‘fallback’ key configured HTTP Router now supports post-buffer, just like FastRouter Fix handling of env in embedded dict in Python plugin (could cause segfaults in single thread mode) Add support for Brotli (.br) with –static-gzip Back-ported HTTP/1.1 support (–http11-socket) from 2.1 To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 pkgsrc/www/py-uwsgi/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/www/py-uwsgi/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-uwsgi/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1518510843161650 Content-Disposition: inline Content-Length: 5657 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/py-uwsgi/Makefile diff -u pkgsrc/www/py-uwsgi/Makefile:1.37 pkgsrc/www/py-uwsgi/Makefile:1.38 --- pkgsrc/www/py-uwsgi/Makefile:1.37 Sun Jul 9 10:44:19 2017 +++ pkgsrc/www/py-uwsgi/Makefile Tue Feb 13 08:34:03 2018 @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.37 2017/07/09 10:44:19 adam Exp $ +# $NetBSD: Makefile,v 1.38 2018/02/13 08:34:03 adam Exp $ -DISTNAME= uwsgi-2.0.15 +DISTNAME= uwsgi-2.0.16 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= www python -MASTER_SITES= http://projects.unbit.it/downloads/ +MASTER_SITES= ${MASTER_SITE_PYPI:=u/uwsgi/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://projects.unbit.it/uwsgi +HOMEPAGE= https://uwsgi-docs.readthedocs.io/ COMMENT= Feature-rich WSGI server LICENSE= gnu-gpl-v2 # with linking exception -USE_LANGUAGES= c USE_TOOLS+= pkg-config PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} @@ -18,8 +17,9 @@ EGG_NAME= ${DISTNAME:S/uwsgi/uWSGI/} .include "options.mk" -INSTALL_ENV+= UWSGI_INCLUDES=${PREFIX}/include -INSTALL_ENV+= UWSGI_PROFILE_OVERRIDE="${UWSGI_DEBUG}${UWSGI_JSON}${UWSGI_PCRE}${UWSGI_SSL}${UWSGI_UUID}${UWSGI_XML}${UWSGI_YAML}" +INSTALL_ENV+= UWSGI_INCLUDES=${PREFIX}/include +INSTALL_ENV+= UWSGI_PROFILE_OVERRIDE="pcre=True;ssl=True;${UWSGI_DEBUG};${UWSGI_JSON};${UWSGI_UUID};${UWSGI_XML};${UWSGI_YAML}" + INSTALLATION_DIRS+= share/examples/${PYPKGPREFIX}-uwsgi post-install: @@ -27,7 +27,10 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/examples/* \ ${DESTDIR}${PREFIX}/share/examples/${PYPKGPREFIX}-uwsgi +.include "../../devel/pcre/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../lang/python/egg.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/py-uwsgi/distinfo diff -u pkgsrc/www/py-uwsgi/distinfo:1.30 pkgsrc/www/py-uwsgi/distinfo:1.31 --- pkgsrc/www/py-uwsgi/distinfo:1.30 Fri Jun 23 15:56:45 2017 +++ pkgsrc/www/py-uwsgi/distinfo Tue Feb 13 08:34:03 2018 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.30 2017/06/23 15:56:45 joerg Exp $ +$NetBSD: distinfo,v 1.31 2018/02/13 08:34:03 adam Exp $ -SHA1 (uwsgi-2.0.15.tar.gz) = 7e2606a6c61a2d6a48f0bb970408336529b7b158 -RMD160 (uwsgi-2.0.15.tar.gz) = 5a6a3e9547aff9e2e4070e90aca3148540ba78b0 -SHA512 (uwsgi-2.0.15.tar.gz) = cb3ce7dc9eb9806151b04b04dc80ac7204cb4ddadf295eea98d5ebbf3a8c02f4b0bfb9a0490997c5edf427e39d3073a2d5b4fe7bd8ec458b30c0aab8e1da9bef -Size (uwsgi-2.0.15.tar.gz) = 795070 bytes +SHA1 (uwsgi-2.0.16.tar.gz) = 9abfb6838b97c294ca69ea970be81cef490acc33 +RMD160 (uwsgi-2.0.16.tar.gz) = a865465f40991067f22b5da1fa5d49ef9ce716ea +SHA512 (uwsgi-2.0.16.tar.gz) = 2f80da366e463971400648fc8dcc9d7a5b51f03cba0b1ce08ff9e8ed75f0955e2014c84892d9991bd7a6f6a4a6b4ac819477f8e4afeded258d3147b5becb2e77 +Size (uwsgi-2.0.16.tar.gz) = 798509 bytes SHA1 (patch-base.ini) = 1c5d7693e6c8011e6cc34f5f5d203584c985eb30 SHA1 (patch-core_logging.c) = caa986238142d24725df119cbecda1b9e3223d7e SHA1 (patch-uwsgi.h) = 64b5f6ea310bf6c65c1f546e160fcd0bd94a3808 Index: pkgsrc/www/py-uwsgi/options.mk diff -u pkgsrc/www/py-uwsgi/options.mk:1.1 pkgsrc/www/py-uwsgi/options.mk:1.2 --- pkgsrc/www/py-uwsgi/options.mk:1.1 Thu Jan 23 14:47:05 2014 +++ pkgsrc/www/py-uwsgi/options.mk Tue Feb 13 08:34:03 2018 @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2014/01/23 14:47:05 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2018/02/13 08:34:03 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.py-uwsgi -PKG_SUPPORTED_OPTIONS= debug openssl pcre uuid yaml zlib -PKG_SUGGESTED_OPTIONS+= libxml2 openssl zlib +PKG_SUPPORTED_OPTIONS= debug uuid yaml +PKG_SUGGESTED_OPTIONS+= libxml2 PKG_OPTIONS_OPTIONAL_GROUPS+= json xml PKG_OPTIONS_GROUP.json= jansson yajl @@ -10,56 +10,40 @@ PKG_OPTIONS_GROUP.xml= expat libxml2 .include "../../mk/bsd.options.mk" -UWSGI_DEBUG= debug=false; +UWSGI_DEBUG= debug=false .if !empty(PKG_OPTIONS:Mdebug) -UWSGI_DEBUG= debug=true; +UWSGI_DEBUG= debug=true .endif -UWSGI_XML= xml=auto; +UWSGI_XML= xml=auto .if !empty(PKG_OPTIONS:Mexpat) .include "../../textproc/expat/buildlink3.mk" -UWSGI_XML= xml=expat; +UWSGI_XML= xml=expat .elif !empty(PKG_OPTIONS:Mlibxml2) .include "../../textproc/libxml2/buildlink3.mk" -UWSGI_XML= xml=libxml2; +UWSGI_XML= xml=libxml2 .else -UWSGI_XML= xml=false; +UWSGI_XML= xml=false .endif -UWSGI_JSON= json=auto; +UWSGI_JSON= json=auto .if !empty(PKG_OPTIONS:Mjansson) .include "../../textproc/jansson/buildlink3.mk" -UWSGI_JSON= json=jansson; +UWSGI_JSON= json=jansson .elif !empty(PKG_OPTIONS:Myajl) .include "../../devel/yajl/buildlink3.mk" -UWSGI_JSON= json=yajl; +UWSGI_JSON= json=yajl BROKEN= The yajl option requires a yajl.pc file which that package doesn't have. .else -UWSGI_JSON= json=false; +UWSGI_JSON= json=false .endif -UWSGI_SSL= ssl=auto; -.if !empty(PKG_OPTIONS:Mopenssl) -.include "../../security/openssl/buildlink3.mk" -UWSGI_SSL= ssl=true; -.else -UWSGI_SSL= ssl=false; -.endif - -UWSGI_PCRE= pcre=auto; -.if !empty(PKG_OPTIONS:Mpcre) -.include "../../devel/pcre/buildlink3.mk" -UWSGI_PCRE= pcre=true; -.else -UWSGI_PCRE= pcre=false; -.endif - -UWSGI_UUID= uuid=auto; +UWSGI_UUID= uuid=auto .if !empty(PKG_OPTIONS:Muuid) .include "../../devel/libuuid/buildlink3.mk" -UWSGI_UUID= uuid=true; +UWSGI_UUID= uuid=true .else -UWSGI_UUID= uuid=false; +UWSGI_UUID= uuid=false .endif UWSGI_YAML= yaml=auto @@ -69,7 +53,3 @@ UWSGI_YAML= yaml=true .else UWSGI_YAML= yaml=false .endif - -.if !empty(PKG_OPTIONS:Mzlib) -.include "../../devel/zlib/buildlink3.mk" -.endif --_----------=_1518510843161650--