Hello community, here is the log from the commit of package uwsgi for openSUSE:Factory checked in at 2016-06-11 00:01:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uwsgi (Old) and /work/SRC/openSUSE:Factory/.uwsgi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "uwsgi" Changes: -------- --- /work/SRC/openSUSE:Factory/uwsgi/uwsgi.changes 2016-05-23 16:39:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.uwsgi.new/uwsgi.changes 2016-06-11 00:01:16.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jun 8 18:53:26 UTC 2016 - [email protected] + +- Update to 2.0.13.1: + * Fixed support for python 2.5 and python 2.6 + * Fixed support for older glibc + * Reverted EPOLLEXCLUSIVE patch, requires more investigation + +------------------------------------------------------------------- Old: ---- uwsgi-2.0.13.tar.gz New: ---- uwsgi-2.0.13.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uwsgi.spec ++++++ --- /var/tmp/diff_new_pack.3bkA73/_old 2016-06-11 00:01:17.000000000 +0200 +++ /var/tmp/diff_new_pack.3bkA73/_new 2016-06-11 00:01:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: uwsgi -Version: 2.0.13 +Version: 2.0.13.1 Release: 0 Summary: Application Container Server for Networked/Clustered Web Applications License: GPL-2.0-with-GCC-exception ++++++ uwsgi-2.0.13.tar.gz -> uwsgi-2.0.13.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/uwsgi-2.0.13/core/event.c new/uwsgi-2.0.13.1/core/event.c --- old/uwsgi-2.0.13/core/event.c 2016-05-10 11:17:48.000000000 +0200 +++ new/uwsgi-2.0.13.1/core/event.c 2016-05-12 19:37:49.000000000 +0200 @@ -169,7 +169,7 @@ uwsgi_poll_queue_rebuild(upe); int ret = poll(upe->poll, upe->nevents, timeout * 1000); int cnt = 0; - if (ret > 0) { + if (ret > 0) { int i; for(i=0;i<upe->nevents;i++) { if (upe->poll[i].revents) { @@ -493,17 +493,11 @@ #define UWSGI_EVENT_IN EPOLLIN #define UWSGI_EVENT_OUT EPOLLOUT -// EPOLLEXCLUSIVE is introduced in linux 4.5. -// When using backported kernel, <sys/epoll.h> doesn't have this flag. So we decrare it here. -// Linux older than 4.5, this flag is just ignored. -#ifndef EPOLLEXCLUSIVE -#define EPOLLEXCLUSIVE (1 << 28) -#endif - int event_queue_init() { int epfd; + epfd = epoll_create(256); if (epfd < 0) { @@ -520,7 +514,7 @@ struct epoll_event ee; memset(&ee, 0, sizeof(struct epoll_event)); - ee.events = EPOLLIN | EPOLLEXCLUSIVE; + ee.events = EPOLLIN; ee.data.fd = fd; if (epoll_ctl(eq, EPOLL_CTL_ADD, fd, &ee)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/uwsgi-2.0.13/core/lock.c new/uwsgi-2.0.13.1/core/lock.c --- old/uwsgi-2.0.13/core/lock.c 2016-05-10 11:17:48.000000000 +0200 +++ new/uwsgi-2.0.13.1/core/lock.c 2016-05-12 19:37:49.000000000 +0200 @@ -93,6 +93,8 @@ #ifdef EOWNERDEAD #ifndef PTHREAD_MUTEX_ROBUST #define PTHREAD_MUTEX_ROBUST PTHREAD_MUTEX_ROBUST_NP +#define pthread_mutexattr_setrobust pthread_mutexattr_setrobust_np +#define pthread_mutex_consistent pthread_mutex_consistent_np #endif if (uwsgi_pthread_robust_mutexes_enabled) { int ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/uwsgi-2.0.13/uwsgi.gemspec new/uwsgi-2.0.13.1/uwsgi.gemspec --- old/uwsgi-2.0.13/uwsgi.gemspec 2016-05-10 11:17:48.000000000 +0200 +++ new/uwsgi-2.0.13.1/uwsgi.gemspec 2016-05-12 19:37:49.000000000 +0200 @@ -2,7 +2,7 @@ s.name = 'uwsgi' s.license = 'GPL-2' s.version = `python -c "import uwsgiconfig as uc; print uc.uwsgi_version"`.sub(/-dev-.*/,'') - s.date = '2016-05-10' + s.date = '2016-05-13' s.summary = "uWSGI" s.description = "The uWSGI server for Ruby/Rack" s.authors = ["Unbit"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/uwsgi-2.0.13/uwsgiconfig.py new/uwsgi-2.0.13.1/uwsgiconfig.py --- old/uwsgi-2.0.13/uwsgiconfig.py 2016-05-10 11:17:48.000000000 +0200 +++ new/uwsgi-2.0.13.1/uwsgiconfig.py 2016-05-12 19:37:49.000000000 +0200 @@ -1,6 +1,6 @@ # uWSGI build system -uwsgi_version = '2.0.13' +uwsgi_version = '2.0.13.1' import os import re @@ -168,12 +168,15 @@ def test_snippet(snippet): """Compile a C snippet to see if features are available at build / link time.""" - if not isinstance(snippet, bytes): - if PY3: - snippet = bytes(snippet, sys.getdefaultencoding()) - else: - snippet = bytes(snippet) - cmd = "{} -xc - -o /dev/null".format(GCC) + if sys.version_info[0] >= 3 or (sys.version_info[0] == 2 and sys.version_info[1] > 5): + if not isinstance(snippet, bytes): + if PY3: + snippet = bytes(snippet, sys.getdefaultencoding()) + else: + snippet = bytes(snippet) + cmd = "{0} -xc - -o /dev/null".format(GCC) + else: + cmd = GCC + " -xc - -o /dev/null" p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE, stderr=subprocess.PIPE, stdout=subprocess.PIPE) p.communicate(snippet) return p.returncode == 0 @@ -339,7 +342,6 @@ ulc.write(uwsgi_cflags) ulc.close() - # embed uwsgi.h in the server binary. It increases the binary size, but will be very useful # for various tricks (like cffi integration) # if possibile, the blob is compressed @@ -644,7 +646,7 @@ if last_profile != filename: os.environ['UWSGI_FORCE_REBUILD'] = '1' - ulp = open('uwsgibuild.lastprofile','w') + ulp = open('uwsgibuild.lastprofile', 'w') ulp.write(filename) ulp.close()
