# HG changeset patch # User Franz Glasner # Date 1705445450 -3600 # Node ID b760788bf78d1d0269169b3c07ba968f48dac61d # Parent 0b893d459837f2f05bebd4b9fd5b02f186445ede Upgrade the core of uwsginl to 2.1.pl7.g20231226 diff -r 0b893d459837 -r b760788bf78d uwsginl/Makefile --- a/uwsginl/Makefile Tue Jan 16 22:29:33 2024 +0100 +++ b/uwsginl/Makefile Tue Jan 16 23:50:50 2024 +0100 @@ -3,7 +3,7 @@ PORTNAME= uwsginl #DISTVERSION= 2.0.20 # "pl" sorts before .a .b .dev ... -PORTVERSION= 2.1.pl6.g${MYGH_TAG_DATE} +PORTVERSION= 2.1.pl7.g${MYGH_TAG_DATE} CATEGORIES= www # Use GitHub id for now (before official 2.1); see below #MASTER_SITES= https://projects.unbit.it/downloads/ @@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= cpe pkgconfig python:3.6-3.10,build +USES= cpe pkgconfig python:3.8-3.11,build USE_RC_SUBR= uwsginl CPE_VENDOR= unbit diff -r 0b893d459837 -r b760788bf78d uwsginl/Makefile.gh --- a/uwsginl/Makefile.gh Tue Jan 16 22:29:33 2024 +0100 +++ b/uwsginl/Makefile.gh Tue Jan 16 23:50:50 2024 +0100 @@ -3,6 +3,6 @@ USE_GITHUB= yes GH_ACCOUNT= unbit GH_PROJECT= uwsgi -GH_TAGNAME= ae489f0881fb358347aabc168a28a96672b0ce3c +GH_TAGNAME= d95638bf70f382d44c23c13324e589696d9e49bd -MYGH_TAG_DATE= 20221024 +MYGH_TAG_DATE= 20231226 diff -r 0b893d459837 -r b760788bf78d uwsginl/distinfo --- a/uwsginl/distinfo Tue Jan 16 22:29:33 2024 +0100 +++ b/uwsginl/distinfo Tue Jan 16 23:50:50 2024 +0100 @@ -1,3 +1,3 @@ -TIMESTAMP = 1666737729 -SHA256 (unbit-uwsgi-2.1.pl6.g20221024-ae489f0881fb358347aabc168a28a96672b0ce3c_GH0.tar.gz) = a42e27803b71bd5cdc8b69f7068a03390bcb3992c2baab448fb5925a1c61df20 -SIZE (unbit-uwsgi-2.1.pl6.g20221024-ae489f0881fb358347aabc168a28a96672b0ce3c_GH0.tar.gz) = 859592 +TIMESTAMP = 1705442922 +SHA256 (unbit-uwsgi-2.1.pl7.g20231226-d95638bf70f382d44c23c13324e589696d9e49bd_GH0.tar.gz) = 0f8348d9d04546f95305a0cba569c9f69bcc6f6081810670c4154a4695be7236 +SIZE (unbit-uwsgi-2.1.pl7.g20231226-d95638bf70f382d44c23c13324e589696d9e49bd_GH0.tar.gz) = 861925 diff -r 0b893d459837 -r b760788bf78d uwsginl/files/patch-uwsgiconfig.py --- a/uwsginl/files/patch-uwsgiconfig.py Tue Jan 16 22:29:33 2024 +0100 +++ b/uwsginl/files/patch-uwsgiconfig.py Tue Jan 16 23:50:50 2024 +0100 @@ -1,6 +1,6 @@ ---- uwsgiconfig.py.orig 2022-09-21 14:46:45 UTC +--- uwsgiconfig.py.orig 2023-12-26 11:13:58 UTC +++ uwsgiconfig.py -@@ -1495,7 +1495,8 @@ def build_plugin(path, uc, cflags, ldflags, libs, name +@@ -1494,7 +1494,8 @@ def build_plugin(path, uc, cflags, ldflags, libs, name gcc_list.append(path + '/' + cfile) for bfile in up.get('BINARY_LIST', []): try: @@ -10,7 +10,7 @@ print(binary_link_cmd) if subprocess.call(binary_link_cmd, shell=True) != 0: raise Exception('unable to link binary file') -@@ -1593,6 +1594,18 @@ def build_plugin(path, uc, cflags, ldflags, libs, name +@@ -1592,6 +1593,18 @@ def build_plugin(path, uc, cflags, ldflags, libs, name print("*** %s plugin built and available in %s ***" % (name, plugin_dest + '.so')) @@ -29,7 +29,7 @@ def vararg_callback(option, opt_str, value, parser): assert value is None value = [] -@@ -1682,7 +1695,7 @@ if __name__ == "__main__": +@@ -1681,7 +1694,7 @@ if __name__ == "__main__": print("*** uWSGI building and linking plugin %s ***" % options.plugin[0]) build_plugin(options.plugin[0], uc, cflags, ldflags, libs, name) elif options.extra_plugin: diff -r 0b893d459837 -r b760788bf78d uwsginl/pkg-descr --- a/uwsginl/pkg-descr Tue Jan 16 22:29:33 2024 +0100 +++ b/uwsginl/pkg-descr Tue Jan 16 23:50:50 2024 +0100 @@ -40,6 +40,7 @@ router_metrics transformation_template stats_pusher_socket +router_fcgi clock_realtime clock_monotonic logpipe @@ -85,6 +86,7 @@ *** uWSGI loaded cheaper algorithms *** busyness spare +spare2 backlog manual --- end of cheaper algorithms list --- @@ -94,4 +96,122 @@ async --- end of loop engines list --- -!!! no internal routing support, rebuild with pcre support !!! +*** uWSGI loaded routers (when built with PCRE) *** +continue +last +break +return +break-with-status +log +donotlog +donotoffload +logvar +goto +addvar +addheader +delheader +remheader +clearheaders +resetheaders +disableheaders +signal +send +send-crnl +chdir +setapp +setuser +sethome +setfile +setscriptname +setmethod +seturi +setremoteaddr +setpathinfo +fixpathinfo +setdocroot +setscheme +setprocname +alarm +setmodifier1 +setmodifier2 ++ +- +* +/ +flush +fixcl +forcecl +harakiri +call +rpc +rpcret +rpcblob +rpcnext +rpcraw +rpcvar +uwsgi +proxyuwsgi +redirect +redirect-302 +redirect-permanent +redirect-301 +basicauth +basicauth-next +rewrite +rewrite-last +http +httpdumb +proxyhttp +httpconnect +proxyhttpconnect +cache +cache-continue +cachevar +cacheset +cachestore +cache-store +cacheinc +cachedec +cachemul +cachediv +static +static-next +file +file-next +sendfile +sendfile-next +fastfile +fastfile-next +symcall +symcall-next +tofile +to-file +gzip +chunked +offload +memcached +memcached-continue +memcachedstore +memcached-store +redis +redis-continue +redisstore +redis-store +hash +expires +metricinc +metricdec +metricmul +metricdiv +metricset +template +fcgiauth +fcgi +cgi +cgihelper +--- end of routers list --- + +*** uWSGI loaded imperial monitors *** +dir +glob +--- end of imperial monitors list ---