Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08547249f2ad1610ba0b6ec25e469e650072d2cd
commit 08547249f2ad1610ba0b6ec25e469e650072d2cd Author: DeX77 <[email protected]> Date: Thu May 19 23:29:11 2016 +0200 uwsgi-2.0.13.1-1-x86_64 * version bump diff --git a/source/network-extra/uwsgi/FrugalBuild b/source/network-extra/uwsgi/FrugalBuild index 5378b80..e67fb0b 100644 --- a/source/network-extra/uwsgi/FrugalBuild +++ b/source/network-extra/uwsgi/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: DeX77 <[email protected]> pkgname=uwsgi -pkgver=2.0.12 +pkgver=2.0.13.1 pkgdesc="A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C" pkgrel=1 archs=(i686 x86_64) @@ -11,9 +11,8 @@ url="http://projects.unbit.it/$pkname"; license=(GPL2) conflicts=(python-$pkgbase) depends=('glibc') -makedepends=(libyaml boost pcre libedit openssl gmp jansson openssl) +makedepends=(libyaml boost pcre libedit openssl gmp jansson openssl postgresql) source=(http://projects.unbit.it/downloads/$pkgname-$pkgver.tar.gz \ - frugalware.ini \ uwsgi_trick_chroot.patch \ [email protected] \ [email protected] \ @@ -21,25 +20,40 @@ source=(http://projects.unbit.it/downloads/$pkgname-$pkgver.tar.gz \ up2date="Flasttar http://projects.unbit.it/downloads"; _F_mono_nodepends="true" Finclude mono -sha1sums=('e6b5bb01893c7373fbac0dbbe77eccd66e30b90e' \ - 'e8687ab290013ca98f19400e383e65f88feca5ec' \ - '851cbade79aac03c9cd0132dbb20c5db46cd0956' \ +sha1sums=('b450fa8947084261a9a39bfb39b45631ce84479d' \ + '5a9b549a42e2ad2b45edd3eab9fd359919df6ce9' \ '5b28030d6a28b7a733ea42200360c1880d6bb9c1' \ 'f7acfa534c5222dfaf407f30bda39c11389b7683' \ '485d13c02cf371105217b79316802955316df68a') +replaces=('uwsgi-plugin-gccgo' 'uwsgi-plugin-jvm' 'uwsgi-plugin-objc') +conflicts=("${replaces[@]}") + +plugins="airbrake, alarm_curl, alarm_xmpp, cache, carbon, cgi, cheaper_backlog2, cheaper_busyness, \ + clock_monotonic, clock_realtime, corerouter, cplusplus, curl_cron, dumbloop, dummy, echo, \ + emperor_amqp, emperor_mongodb, emperor_pg, emperor_zeromq, example, exception_log, fastrouter, \ + fiber, forkptyrouter, geoip, gevent, graylog2, greenlet, gridfs, http, ldap, \ + legion_cache_fetch, libffi, logcrypto, logfile, logpipe, logsocket, logzmq, lua, mongodb, \ + mongodblog, mongrel2, mono, msgpack, nagios, notfound, pam, ping, psgi, pty, \ + pypy, python, rack, rawrouter, rbthreads, redislog, \ + router_basicauth, router_cache, router_expires, router_hash, \ + router_http, router_memcached, router_metrics, router_radius, router_redirect, \ + router_redis, router_rewrite, router_static, router_uwsgi, rpc, rrdtool, rsyslog, \ + ruby19, signal, spooler, sqlite3, ssi, sslrouter, stats_pusher_file, \ + stats_pusher_mongodb, stats_pusher_socket, stats_pusher_statsd, symcall, \ + syslog, systemd_logger, tornado, transformation_chunked, transformation_gzip, \ + transformation_offload, transformation_template, transformation_tofile, transformation_toupper, tuntap, ugreen, webdav, xattr, xslt, zabbix, zergpool" subpkgs=("uwsgi-plugin-rack" "uwsgi-plugin-psgi" "uwsgi-plugin-python" - "uwsgi-plugin-nagios" + "uwsgi-plugin-nagios" "uwsgi-plugin-router" "uwsgi-plugin-lua" "uwsgi-plugin-carbon" "uwsgi-plugin-pam" "uwsgi-plugin-gevent" "uwsgi-plugin-zergpool" - "uwsgi-plugin-jvm" "uwsgi-plugin-webdav" "uwsgi-plugin-graylog" "uwsgi-plugin-ldap" @@ -58,9 +72,7 @@ subpkgs=("uwsgi-plugin-rack" "uwsgi-plugin-systemd" "uwsgi-plugin-curl" "uwsgi-plugin-xmpp" - "uwsgi-plugin-gccgo" "uwsgi-plugin-ffi" - "uwsgi-plugin-objc" "uwsgi-plugin-cplusplus") subdescs=("UWSGI Ruby Rack Plugin" "UWSGI Perl psgi Plugin" @@ -72,7 +84,6 @@ subdescs=("UWSGI Ruby Rack Plugin" "UWSGI PAM Plugin" "UWSGI Gevent Plugin" "UWSGI Zergpool Plugin" - "UWSGI Java Plugin" "UWSGI WebDAV Plugin" "UWSGI Graylog Plugin" "UWSGI LDAP Plugin" @@ -91,9 +102,7 @@ subdescs=("UWSGI Ruby Rack Plugin" "UWSGI Sysemd Logging Plugin" "UWSGI Curl Plugin" "UWSGI Alarm XMPP Plugin" - "UWSGI GCC Go Plugin" "UWSGI FFI Plugin" - "UWSGI ObjectiveC Plugin" "UWSGI C++ Plugin") subdepends=('ruby>=2.1.2' 'perl' @@ -105,7 +114,6 @@ subdepends=('ruby>=2.1.2' '' '' '' - 'openjdk' 'libxslt' 'zlib' 'libldap' @@ -124,44 +132,9 @@ subdepends=('ruby>=2.1.2' 'systemd' 'curl' 'gloox>=1.0.13' - 'gcc-go>=4.9.2' 'libffi' - 'gcc-objc' 'libstdc++') -submakedepends=('' - '' - '' - '' - '' - '' - '' - '' - '' - '' - '' - '' - '' - '' - '' - '' - 'postgresql' - '' - '' - '' - '' - '' - '' - '' - '' - '' - '' - '' - '' - '' - '' - '') - subrodepends=('uwsgi' 'uwsgi' 'uwsgi' @@ -172,7 +145,6 @@ subrodepends=('uwsgi' 'uwsgi' 'uwsgi' 'uwsgi' - 'uwsgi' 'uwsgi' 'uwsgi' 'uwsgi' @@ -190,8 +162,6 @@ subrodepends=('uwsgi' 'uwsgi' 'uwsgi' 'uwsgi' - 'uwsgi' - 'uwsgi' 'uwsgi' 'uwsgi' 'uwsgi') @@ -211,7 +181,6 @@ subgroups=('network-extra' 'network-extra' 'network-extra' 'network-extra' - 'network-extra' 'network-extra' 'network-extra' 'network-extra' @@ -226,8 +195,6 @@ subgroups=('network-extra' 'network-extra' 'network-extra' 'network-extra' - 'network-extra' - 'network-extra' 'network-extra') subarchs=('i686 x86_64' @@ -244,7 +211,6 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' - 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' @@ -260,20 +226,22 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' - 'i686 x86_64' - 'i686 x86_64' 'i686 x86_64') build(){ Fcd Fpatchall - mv ../frugalware.ini buildconf || Fdie + Fsed "verbose_build = False" "verbose_build = True" uwsgiconfig.py - #Build core - export CFLAGS="-Wno-error" + #First build core + Fexec python uwsgiconfig.py --build base || Fdie - python uwsgiconfig.py --build frugalware || Fdie + #Now plugins + for plugin in $plugins + do + Fexec python uwsgiconfig.py --plugin plugins/${plugin/,/} base ${plugin/,/} || Fdie + done Fmkdir usr/bin Finstall 755 ${_F_cd_path}/uwsgi usr/bin/ @@ -282,7 +250,7 @@ build(){ for lib in *.so do - Finstall 755 ${_F_cd_path}/$lib usr/lib/uwsgi/ + Finstallrel 755 usr/lib/uwsgi/$lib done for plugin in "${subpkgs[@]}" diff --git a/source/network-extra/uwsgi/frugalware.ini b/source/network-extra/uwsgi/frugalware.ini deleted file mode 100644 index fa8b656..0000000 --- a/source/network-extra/uwsgi/frugalware.ini +++ /dev/null @@ -1,17 +0,0 @@ -[uwsgi] -inherit = core -bin_name = uwsgi -xml = true -yaml = true -json = true -pcre = true -routing = true -debug = false -sqlite3 = true -ssl = true -xml_implementation = libxml2 -yaml_implementation = auto -malloc_implementation = libc -embedded_plugins = echo, ping, http, corerouter -plugin_dir = /usr/lib/uwsgi -plugins = airbrake, alarm_curl, alarm_xmpp, cache, carbon, cgi, cheaper_backlog2, cheaper_busyness, clock_monotonic, clock_realtime, corerouter, cplusplus, curl_cron, dumbloop, dummy, echo, emperor_amqp, emperor_mongodb, emperor_pg, emperor_zeromq, example, exception_log, fastrouter, fiber, forkptyrouter, gccgo, geoip, gevent, graylog2, greenlet, gridfs, http, jvm, jwsgi, ldap, legion_cache_fetch, libffi, logcrypto, logfile, logpipe, logsocket, logzmq, lua, mongodb, mongodblog, mongrel2, mono, msgpack, nagios, notfound, objc_gc, pam, ping, psgi, pty, pypy, python, pyuwsgi, rack, rawrouter, rbthreads, redislog, ring, router_basicauth, router_cache, router_expires, router_hash, router_http, router_memcached, router_metrics, router_radius, router_redirect, router_redis, router_rewrite, router_static, router_uwsgi, rpc, rrdtool, rsyslog, ruby19, servlet, signal, spooler, sqlite3, ssi, sslrouter, stats_pusher_file, stats_pusher_mongodb, stats_pusher_socket, stats_pusher_statsd, symcall, syslog, systemd_logger, tornado, transformation_chunked, transformation_gzip, transformation_offload, transformation_template, transformation_tofile, transformation_toupper, tuntap, ugreen, webdav, xattr, xslt, zabbix, zergpool diff --git a/source/network-extra/uwsgi/uwsgi_trick_chroot.patch b/source/network-extra/uwsgi/uwsgi_trick_chroot.patch index 3bfb1ac..663bba7 100644 --- a/source/network-extra/uwsgi/uwsgi_trick_chroot.patch +++ b/source/network-extra/uwsgi/uwsgi_trick_chroot.patch @@ -7,7 +7,7 @@ index e447123..4d55f2c 100644 pass - if uc: -- plugin_dest = uc.get('plugin_dir') + '/' + name + '_plugin' +- plugin_dest = uc.get('plugin_build_dir', uc.get('plugin_dir')) + '/' + name + '_plugin' - else: - plugin_dest = name + '_plugin' + plugin_dest = name + '_plugin' _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
