From ef2e5915a46c99a7f4166c599fbd7941009c22aeefc7a27ff128240cbef6228d Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Tue, 3 Nov 2015 22:37:01 +0000 Subject: [PATCH] Accepting request 333952 from home:jimfunk:branches:server:http OBS-URL: https://build.opensuse.org/request/show/333952 OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=44 --- debian.tar.gz | 3 -- uwsgi-2.0.10-gcc5.patch | 20 -------------- uwsgi-2.0.10.tar.gz | 3 -- uwsgi-2.0.11.1.tar.gz | 3 ++ uwsgi.changes | 46 +++++++++++++++++++++++++++++++ uwsgi.dsc | 61 ----------------------------------------- uwsgi.spec | 5 +--- 7 files changed, 50 insertions(+), 91 deletions(-) delete mode 100644 debian.tar.gz delete mode 100644 uwsgi-2.0.10-gcc5.patch delete mode 100644 uwsgi-2.0.10.tar.gz create mode 100644 uwsgi-2.0.11.1.tar.gz delete mode 100644 uwsgi.dsc diff --git a/debian.tar.gz b/debian.tar.gz deleted file mode 100644 index c52b3b1..0000000 --- a/debian.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d9747aa11e4c44861195dcd167a88ab7292f36890dc343848bd581853e11976 -size 55737 diff --git a/uwsgi-2.0.10-gcc5.patch b/uwsgi-2.0.10-gcc5.patch deleted file mode 100644 index fc60231..0000000 --- a/uwsgi-2.0.10-gcc5.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/uwsgiconfig.py b/uwsgiconfig.py -index 1e7a1b6..30f7013 100644 ---- a/uwsgiconfig.py -+++ b/uwsgiconfig.py -@@ -535,8 +535,13 @@ class uConf(object): - print("detected include path: %s" % self.include_path) - - try: -- gcc_major = int(gcc_version.split('.')[0]) -- gcc_minor = int(gcc_version.split('.')[1]) -+ gcc_version_components = gcc_version.split('.') -+ gcc_major = int(gcc_version_components[0]) -+ if len(gcc_version_components) > 1: -+ gcc_minor = int(gcc_version_components[1]) -+ else: -+ # gcc 5.0 is represented as simply "5" -+ gcc_minor = 0 - except: - raise Exception("you need a C compiler to build uWSGI") - if (sys.version_info[0] == 2) or (gcc_major < 4) or (gcc_major == 4 and gcc_minor < 3): diff --git a/uwsgi-2.0.10.tar.gz b/uwsgi-2.0.10.tar.gz deleted file mode 100644 index cd25021..0000000 --- a/uwsgi-2.0.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0b381d6c22da931e85e3efe612629fe33a01ac25b0f028aa631b85d86d5028b -size 779820 diff --git a/uwsgi-2.0.11.1.tar.gz b/uwsgi-2.0.11.1.tar.gz new file mode 100644 index 0000000..6bc35e6 --- /dev/null +++ b/uwsgi-2.0.11.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75a7d3138cfa9cd81a760c2f8a43f3d80961edc8e4f27043dc1412206c926287 +size 782091 diff --git a/uwsgi.changes b/uwsgi.changes index ed1feee..5ac9c40 100644 --- a/uwsgi.changes +++ b/uwsgi.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Sat Sep 26 17:39:41 UTC 2015 - jfunk@funktronics.ca + +- Remove uwsgi-2.0.10-gcc5.patch as it was integrated upstream +- Update to 2.0.11.1: + * Bugfixes + * fixed HTTPS router resource deallocation and fiel descriptors leak + * do not spit out ssl errors when errno is 0 + * New Features + * The unix_signal hook - You can now remap UNIX signals to specific + functions symbols +- Changes from 2.0.11: + * Bugfixes + * [pypy] fixed misuse of ffi.string + * fixed detection for gcc 5 (jimfunk) + * fixed shared sockets for gateways + * [psgi] Changed abs to labs because offset is declared as a long (Peter H. + Ezetta) + * add null terminator to uwsgi_get_dot_h() and uwsgi_config_py() (Jay + Oster) + * fixed thread waiting during stop/restart (Kaiwen Xu) + * fixed chain reloading verbosity + * [python] fixed spooler job reference counting (Curtis Maloney) + * various static analysis improvements (Riccardo Magliocchetti) + * fixed sharedarea support for very big ranges + * fixed gzip transformation for zero-sized responses (Curtis Maloney) + * fixed management of https client certificate authentication (Vladimir + Didenko) + * fixed OpenBSD build + * fixed TMPFILE permissions + * New Features + * The mem_collector thread - Evil memory monitors (like --evil-reload-on-rss) + are now asynchronously managed by a dedicated thread. This solves the issue + of runaway processes not catched by the master. + * fixpathinfo routing action - This is another step in removing the need of + the infamous uwsgi_modifier1 30 relic. + * uwsgi[sor] and time[micros] routing vars - This two new vars exposes the + start of the current request (in micros) and the current time (again in + micros) + * wait-for-socket - This works like wait-for-fs/iface/file/dir. The spawn + of the instance is suspended until the specified tcp/unix socket is + ready. You can use it to synchronize vassals spawn (like stopping a + vassal until a postgresql server has been spawned) + * wait_for hooks - All of the wait-for-* functions can now be used as a + hook + ------------------------------------------------------------------- Wed Aug 12 11:10:35 UTC 2015 - dvaleev@suse.com diff --git a/uwsgi.dsc b/uwsgi.dsc deleted file mode 100644 index 9450c26..0000000 --- a/uwsgi.dsc +++ /dev/null @@ -1,61 +0,0 @@ -Format: 1.0 -Source: uwsgi -Binary: uwsgi, uwsgi-dbg, uwsgi-core, uwsgi-emperor, uwsgi-plugins-all, uwsgi-infrastructure-plugins, uwsgi-app-integration-plugins, uwsgi-plugin-alarm-curl, uwsgi-plugin-alarm-xmpp, uwsgi-plugin-curl-cron, uwsgi-plugin-emperor-pg, uwsgi-plugin-erlang, uwsgi-plugin-rbthreads, uwsgi-plugin-fiber, uwsgi-plugin-geoip, uwsgi-plugin-graylog2, uwsgi-plugin-greenlet-python, uwsgi-plugin-jvm-openjdk-6, uwsgi-plugin-jvm-openjdk-7, uwsgi-plugin-jwsgi-openjdk-6, uwsgi-plugin-jwsgi-openjdk-7, uwsgi-plugin-ldap, uwsgi-plugin-lua5.1, uwsgi-plugin-lua5.2, uwsgi-plugin-psgi, uwsgi-plugin-pyerl-python, uwsgi-plugin-pyerl-python3, uwsgi-plugin-python, uwsgi-plugin-python3, uwsgi-plugin-rack-ruby1.9.1, uwsgi-plugin-router-access, uwsgi-plugin-sqlite3, uwsgi-plugin-v8, uwsgi-plugin-php, uwsgi-plugin-xslt, libapache2-mod-proxy-uwsgi, libapache2-mod-proxy-uwsgi-dbg, libapache2-mod-uwsgi, libapache2-mod-uwsgi-dbg, libapache2-mod-ruwsgi, libapache2-mod-ruwsgi-dbg, python-uwsgidecorators, - python3-uwsgidecorators, - uwsgi-extra -Architecture: any all -Version: 2.0.6-1 -Maintainer: Janos Guljas -Uploaders: Jonas Smedegaard -Homepage: http://projects.unbit.it/uwsgi/ -Standards-Version: 3.9.4 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/uwsgi.git -Vcs-Git: git://anonscm.debian.org/collab-maint/uwsgi.git -Build-Depends: cdbs, debhelper (>= 8), apache2-dev | apache2-threaded-dev, erlang-dev, help2man, javahelper, libapr1-dev, libaprutil1-dev, libjansson-dev, libldap2-dev, liblua5.1-0-dev, liblua5.2-dev, libperl-dev, libpq-dev, libcurl4-openssl-dev, libgloox-dev, libpam0g-dev, libsqlite3-dev, libxml2-dev, libyaml-dev, libzmq3-dev [!hurd-any] | libzmq-dev [!kfreebsd-any !hurd-any], libphp5-embed, php5-dev, libonig-dev, libdb-dev, libqdbm-dev, libbz2-dev, libwrap0-dev, libgnustep-gui-dev, libgnustep-base-dev, libcoro-perl, libgeoip-dev, libv8-dev [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mipsel], libxslt1-dev, libcap-dev [linux-any], libmatheval-dev, libjail-dev [kfreebsd-any], libkvm-dev [kfreebsd-any], pkg-config, python, python-all-dev, python-greenlet-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc], python3-all-dev, quilt, openjdk-6-jdk [amd64 armel armhf i386 ia64 mips mipsel powerpc s390 s390x sparc], openjdk-7-jdk [amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc], ruby1.9.1, ruby1.9.1-dev, uuid-dev -Package-List: - libapache2-mod-proxy-uwsgi deb web extra - libapache2-mod-proxy-uwsgi-dbg deb debug extra - libapache2-mod-ruwsgi deb httpd extra - libapache2-mod-ruwsgi-dbg deb debug extra - libapache2-mod-uwsgi deb httpd extra - libapache2-mod-uwsgi-dbg deb debug extra - python-uwsgidecorators deb python extra - python3-uwsgidecorators deb python extra - uwsgi deb web optional - uwsgi-app-integration-plugins deb web extra - uwsgi-core deb web optional - uwsgi-dbg deb debug extra - uwsgi-emperor deb web optional - uwsgi-extra deb web extra - uwsgi-infrastructure-plugins deb web extra - uwsgi-plugin-alarm-curl deb web extra - uwsgi-plugin-alarm-xmpp deb web extra - uwsgi-plugin-curl-cron deb web extra - uwsgi-plugin-emperor-pg deb web extra - uwsgi-plugin-erlang deb web extra - uwsgi-plugin-fiber deb web extra - uwsgi-plugin-geoip deb web extra - uwsgi-plugin-graylog2 deb web extra - uwsgi-plugin-greenlet-python deb web extra - uwsgi-plugin-jvm-openjdk-6 deb web extra - uwsgi-plugin-jvm-openjdk-7 deb web extra - uwsgi-plugin-jwsgi-openjdk-6 deb web extra - uwsgi-plugin-jwsgi-openjdk-7 deb web extra - uwsgi-plugin-ldap deb web extra - uwsgi-plugin-lua5.1 deb web extra - uwsgi-plugin-lua5.2 deb web extra - uwsgi-plugin-php deb web extra - uwsgi-plugin-psgi deb web extra - uwsgi-plugin-pyerl-python deb web extra - uwsgi-plugin-pyerl-python3 deb web extra - uwsgi-plugin-python deb web extra - uwsgi-plugin-python3 deb web extra - uwsgi-plugin-rack-ruby1.9.1 deb web extra - uwsgi-plugin-rbthreads deb web extra - uwsgi-plugin-router-access deb web extra - uwsgi-plugin-sqlite3 deb web extra - uwsgi-plugin-v8 deb web extra - uwsgi-plugin-xslt deb web extra - uwsgi-plugins-all deb web extra -Debtransform-Tar: uwsgi-2.0.6.tar.gz -Debtransform-Files-Tar: debian.tar.gz diff --git a/uwsgi.spec b/uwsgi.spec index 3b22789..616e55a 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -17,7 +17,7 @@ Name: uwsgi -Version: 2.0.10 +Version: 2.0.11.1 Release: 0 Summary: Application Container Server for Networked/Clustered Web Applications License: GPL-2.0-with-GCC-exception @@ -42,8 +42,6 @@ Patch2: uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch Patch3: uwsgi-1.9.11-systemd_logger-old_systemd.patch # PATCH-FIX-OPENSUSE uwsgi-1.9.13-emperor_pg-Wformat.patch - gcc complains about lack of -Wformat with -Wformat-security from pg_config Patch4: uwsgi-1.9.13-emperor_pg-Wformat.patch -# PATCH-FIX-UPSTREAM uwsgi-2.0.10-gcc5.patch - Fix version detection for GCC 5 -Patch5: uwsgi-2.0.10-gcc5.patch %define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o "2\\.[0-9]+") %if "%{apache_branch}" == "2.4" %define apxs %{_bindir}/apxs2 @@ -450,7 +448,6 @@ This package contains support for rendering XML content using XSLT. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 # Generate a config that builds all plugins except for examples and stuff we # can't satisfy the requirements for or are just broken excluded_plugins=""