Accepting request 184129 from server:http

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/184129
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/uwsgi?expand=0&rev=5
This commit is contained in:
Stephan Kulow 2013-07-24 13:31:44 +00:00 committed by Git OBS Bridge
commit eb45720163
9 changed files with 100 additions and 20 deletions

View File

@ -12,7 +12,7 @@ in favor of a systemd service and a default configuration file
Emperor Mode
------------
The included uwsgi service runs uWSGI in Emperor mode by defgault. It will
The included uwsgi service runs uWSGI in Emperor mode by default. It will
monitor the /etc/uwsgi/vassals directory for configurations and will
automatically load and restart uWSGI processes when configuration files are
placed there or modified. Some example configurations are provided in the

View File

@ -1,4 +1,5 @@
[uwsgi]
plugin = python
socket = 127.0.0.1:3034
threads = 40
master = 1

View File

@ -1,12 +0,0 @@
--- a/plugins/emperor_amqp/amqp.c
+++ b/plugins/emperor_amqp/amqp.c
@@ -453,7 +453,8 @@ static int amqp_wait_connection_tune(int
static char *amqp_simple_get_frame(int fd, struct amqp_frame_header *fh) {
char *ptr = (char *) fh;
- ssize_t len = 0, rlen;
+ size_t len = 0;
+ ssize_t rlen;
while(len < 7) {
rlen = recv(fd, ptr, 7-len, 0);

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e566163a7ffd18f341a0de8462d22410ee58b1f5f54c468e3019f47b7e5c4aa4
size 634255

View File

@ -0,0 +1,12 @@
--- a/plugins/emperor_pg/uwsgiplugin.py
+++ b/plugins/emperor_pg/uwsgiplugin.py
@@ -3,6 +3,9 @@ import os
NAME='emperor_pg'
CFLAGS = os.popen('pg_config --cflags').read().rstrip().split()
CFLAGS.append('-I' + os.popen('pg_config --includedir').read().rstrip())
+# Add -Wformat since gcc complains about it's exclusion when -Wformat-security
+# comes from pg_config
+CFLAGS.append('-Wformat')
LDFLAGS = os.popen('pg_config --ldflags').read().rstrip().split()
LIBS = ['-L' + os.popen('pg_config --libdir').read().rstrip(), '-lpq']

View File

@ -0,0 +1,9 @@
--- a/plugins/objc_gc/uwsgiplugin.py
+++ b/plugins/objc_gc/uwsgiplugin.py
@@ -1,5 +1,5 @@
NAME="objc_gc"
-CFLAGS=["-fobjc-gc"]
+CFLAGS=[]
LDFLAGS=[]
LIBS=[]
GCC_LIST=['objc_gc.m']

3
uwsgi-1.9.13.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ac1532698493b117d1b95b0d0bab2113088fc3f0f23a765ddb59504bece3c26e
size 646437

View File

@ -1,3 +1,64 @@
-------------------------------------------------------------------
Tue Jul 16 20:41:08 UTC 2013 - jfunk@funktronics.ca
- Add -Wformat to emperor_pg CFLAGS since pg-config --cflags returns
-Wformat-security and gcc complains about it's exclusion
-------------------------------------------------------------------
Tue Jul 16 17:15:59 UTC 2013 - jfunk@funktronics.ca
- Update to 1.9.13
* Bugfixes
* Fixed a corner case bug when response offloading is enabled, but no
request plugin is loaded
* Fixed harakiri routing when multiple rules are in place (return NEXT
instead of CONTINUE)
* Fixed curl crashing master on slow dns responses (Łukasz Mierzwa)
* Removed PTRACE check in uwsgi.h (it is no more needed since uWSGI 1.0)
* Fixed -print-sym
* Added a newline in -cflags
* Improved python3 detection and compilation
* Fixed Coro::AnyEvent loop engine (John Berthels)
* Rack api functions are now static
* Better fastcgi handling of big uploads
* Improved GCC usage on Darwin for Python non-apple builds
* Fixed XCLIENT usage in rawrouter
* Use the clang preprocessor instead of hardcoded 'cpp' when CC=clang is
used
* Set 16bit options to 65535 when higher values are requested
* Fixed virtualhosting (it is now compatible with 1.4 configurations)
* New features
* https://uwsgi-docs.readthedocs.org/en/latest/Changelog-1.9.13.html
* PyPy performance and features improvents
* Chunked input api
* Toward better third-party plugins management: the -dot-h option
* setmethod, seturi and setpathinfo routing action
* UWSGI_INCLUDES
* Improved set_user_harakiri api function
* -add-cache-item [cache ]KEY=VALUE
* the router_xmldir plugin
* Implement __call__ for @spool* decorators
* the uwsgi[lq] routing var
* -use-abort
- Changes from 1.9.12
* Bugfixes
* offloading cache writes will return the correct status code and not 202
* you can now control the path of temporary files setting the TMPDIR
environment variable (this fixes an old issue for users without control
over /tmp)
* fixed a compilation error on amqp imperial monitor
* cron commands are correctly escaped when reported in the stats server
* fixed fastcgi parser corner-case bug with big uploads
* fixed support for newest cygwin
* New Features
* https://uwsgi-docs.readthedocs.org/en/latest/Changelog-1.9.12.html
* Offloading responses
* JWSGI and JVM improvements
* -touch-signal
* The "pipe" offload engine
* The new redis router
* The "hash" router
-------------------------------------------------------------------
Fri May 31 18:52:08 UTC 2013 - jfunk@funktronics.ca

View File

@ -17,7 +17,7 @@
Name: uwsgi
Version: 1.9.11
Version: 1.9.13
Release: 0
Summary: Application Container Server for Networked/Clustered Web Applications
License: GPL-2.0+
@ -36,14 +36,17 @@ Source8: uwsgi.ini
Patch0: uwsgi-1.9.11-plugin_build_path.patch
# PATCH-FIX-OPENSUSE uwsgi-1.9.11-no-LD_RUN_PATH.patch - Disable invalid rpath in plugins
Patch1: uwsgi-1.9.11-no-LD_RUN_PATH.patch
# PATCH-FIX-UPSTREAM uwsgi-1.9.11-emperor_amqp-fix-comparison.patch - Fix signed/unsigned comparison
Patch2: uwsgi-1.9.11-emperor_amqp-fix-comparison.patch
# PATCH-FIX-OPENSUSE uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch - No -fobjc-gc in CFLAGS, which is incorrect in GNU
Patch2: uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch
# PATCH-FIX-OPENSUSE uwsgi-1.9.11-systemd_logger-old_systemd.patch - Older systemd in 12.2 does not implicity include syslog.h
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
%if 0%{?suse_version} > 1210
BuildRequires: erlang
%endif
BuildRequires: gcc-c++
BuildRequires: gcc-objc
#BuildRequires: go
BuildRequires: java-devel
#BuildRequires: krb5-devel
@ -386,6 +389,7 @@ This package contains support for rendering XML content using XSLT.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -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=""
@ -474,7 +478,7 @@ install -D plugins/jvm/uwsgi.jar %{buildroot}%{_javadir}/uwsgi.jar
%files
%defattr(-,root,root,-)
%doc CONTRIBUTORS LICENSE README uwsgi_API.txt contrib examples README.openSUSE
%doc CONTRIBUTORS LICENSE README contrib examples README.openSUSE
%{_sbindir}/uwsgi
%dir %{_sysconfdir}/uwsgi/
%config(noreplace) %{_sysconfdir}/uwsgi/uwsgi.ini
@ -506,6 +510,7 @@ install -D plugins/jvm/uwsgi.jar %{buildroot}%{_javadir}/uwsgi.jar
%{_libdir}/uwsgi/logfile_plugin.so
%{_libdir}/uwsgi/logsocket_plugin.so
%{_libdir}/uwsgi/nagios_plugin.so
%{_libdir}/uwsgi/objc_gc_plugin.so
%{_libdir}/uwsgi/notfound_plugin.so
%{_libdir}/uwsgi/ping_plugin.so
%{_libdir}/uwsgi/rawrouter_plugin.so
@ -513,13 +518,16 @@ install -D plugins/jvm/uwsgi.jar %{buildroot}%{_javadir}/uwsgi.jar
%{_libdir}/uwsgi/router_access_plugin.so
%{_libdir}/uwsgi/router_basicauth_plugin.so
%{_libdir}/uwsgi/router_cache_plugin.so
%{_libdir}/uwsgi/router_hash_plugin.so
%{_libdir}/uwsgi/router_http_plugin.so
%{_libdir}/uwsgi/router_memcached_plugin.so
%{_libdir}/uwsgi/router_radius_plugin.so
%{_libdir}/uwsgi/router_redirect_plugin.so
%{_libdir}/uwsgi/router_redis_plugin.so
%{_libdir}/uwsgi/router_rewrite_plugin.so
%{_libdir}/uwsgi/router_static_plugin.so
%{_libdir}/uwsgi/router_uwsgi_plugin.so
%{_libdir}/uwsgi/router_xmldir_plugin.so
%{_libdir}/uwsgi/rpc_plugin.so
%{_libdir}/uwsgi/rrdtool_plugin.so
%{_libdir}/uwsgi/rsyslog_plugin.so
@ -535,6 +543,7 @@ install -D plugins/jvm/uwsgi.jar %{buildroot}%{_javadir}/uwsgi.jar
%endif
%{_libdir}/uwsgi/transformation_chunked_plugin.so
%{_libdir}/uwsgi/transformation_gzip_plugin.so
%{_libdir}/uwsgi/transformation_offload_plugin.so
%{_libdir}/uwsgi/transformation_tofile_plugin.so
%{_libdir}/uwsgi/transformation_toupper_plugin.so
%{_libdir}/uwsgi/ugreen_plugin.so