Control: tag -1 + patch Hello,
I have built uwsgi locally with the attached patch and tested the rack plugin with a minimal application (following the instructions on http://uwsgi-docs.readthedocs.org/en/latest/Ruby.html) and it seems to just work. Given that code that works with 1.9 generally works with 2.0+ (and with 2.1 which is the current version in jessie), I think these changes should be good enough to get uwsgi back in jessie. However, pleae note that I didn't test uwsgi-plugin-rbthreads and uwsgi-plugin-fiber as I couldn't figure out how to do it within the time I had. Regarding the attached patch: note that I am dropping the '1.9.1' prefix from rack plugin package name, but you could as well drop the '-ruby' suffix: just uwsgi-plugin-rack should be meaningfull enough and consistent with the other Ruby-related plugins that don't have an explicit mention to ruby in their names. -- Antonio Terceiro <terce...@debian.org>
diff -Nru uwsgi-2.0.3/debian/changelog uwsgi-2.0.3/debian/changelog --- uwsgi-2.0.3/debian/changelog 2014-04-07 10:09:34.000000000 -0300 +++ uwsgi-2.0.3/debian/changelog 2014-07-07 14:39:21.000000000 -0300 @@ -1,3 +1,10 @@ +uwsgi (2.0.3-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * + + -- Antonio Terceiro <terce...@debian.org> Mon, 07 Jul 2014 14:39:19 -0300 + uwsgi (2.0.3-1) unstable; urgency=medium [ upstream ] diff -Nru uwsgi-2.0.3/debian/control uwsgi-2.0.3/debian/control --- uwsgi-2.0.3/debian/control 2014-04-07 10:07:14.000000000 -0300 +++ uwsgi-2.0.3/debian/control 2014-07-07 14:43:53.000000000 -0300 @@ -47,8 +47,8 @@ python-greenlet-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x sparc], python3-all-dev, openjdk-7-jdk [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x sparc], - ruby1.9.1, - ruby1.9.1-dev, + ruby, + ruby-dev, uuid-dev Standards-Version: 3.9.5 Homepage: http://projects.unbit.it/uwsgi/ @@ -253,7 +253,7 @@ - PSGI, Rack, WSGI, etc. * coroutines - Coro::AnyEvent - - Fiber (Ruby 1.9.1) + - Fiber (Ruby) - greenlet (Python 2) Package: uwsgi-infrastructure-plugins @@ -299,7 +299,7 @@ uwsgi-plugin-psgi (= ${binary:Version}), uwsgi-plugin-python (= ${binary:Version}), uwsgi-plugin-python3 (= ${binary:Version}), - uwsgi-plugin-rack-ruby1.9.1 (= ${binary:Version}), + uwsgi-plugin-rack-ruby (= ${binary:Version}), uwsgi-plugin-v8 (= ${binary:Version}) [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mipsel] Description: plugins for integration of uWSGI and application uWSGI presents a complete stack for networked/clustered web applications, @@ -316,7 +316,7 @@ * PHP * Perl PSGI * Python WSGI (Python 2 and 3) - * Rack (Ruby 1.9.1) + * Rack (Ruby) * V8 Package: uwsgi-plugin-alarm-curl @@ -370,7 +370,7 @@ Package: uwsgi-plugin-rbthreads Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, uwsgi-core (= ${binary:Version}), - uwsgi-plugin-rack-ruby1.9.1 (= ${binary:Version}) + uwsgi-plugin-rack-ruby (= ${binary:Version}) Description: Ruby native threads plugin for uWSGI uWSGI presents a complete stack for networked/clustered web applications, implementing message/object passing, caching, RPC and process management. @@ -378,12 +378,12 @@ used in order to add compatibility with tons of different technology on top of the same core. . - This package provides Ruby 1.9 native threads plugin for uWSGI. + This package provides Ruby native threads plugin for uWSGI. Package: uwsgi-plugin-fiber Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, uwsgi-core (= ${binary:Version}), - uwsgi-plugin-rack-ruby1.9.1 (= ${binary:Version}) + uwsgi-plugin-rack-ruby (= ${binary:Version}) Description: Fiber plugin for uWSGI uWSGI presents a complete stack for networked/clustered web applications, implementing message/object passing, caching, RPC and process management. @@ -391,8 +391,7 @@ used in order to add compatibility with tons of different technology on top of the same core. . - This package provides Fiber plugin for uWSGI - with Ruby 1.9.1. + This package provides Fiber plugin for uWSGI with Ruby. . Fibers are a form of coroutine, useful for implementing cooperative multitasking. @@ -544,18 +543,17 @@ This package provides Python 3 WSGI plugin for uWSGI (linked with Python 3 runtime). -Package: uwsgi-plugin-rack-ruby1.9.1 +Package: uwsgi-plugin-rack-ruby Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, uwsgi-core (= ${binary:Version}) -Description: Rack plugin for uWSGI (Ruby 1.9.1) +Description: Rack plugin for uWSGI (Ruby) uWSGI presents a complete stack for networked/clustered web applications, implementing message/object passing, caching, RPC and process management. It is designed to be fully modular. This means that different plugins can be used in order to add compatibility with tons of different technology on top of the same core. . - This package provides Rack plugin for uWSGI - (linked with Ruby 1.9.1 runtime). + This package provides Rack plugin for uWSGI (linked with Ruby runtime). Package: uwsgi-plugin-router-access Architecture: any diff -Nru uwsgi-2.0.3/debian/control.in uwsgi-2.0.3/debian/control.in --- uwsgi-2.0.3/debian/control.in 2014-04-07 10:07:14.000000000 -0300 +++ uwsgi-2.0.3/debian/control.in 2014-07-07 14:03:02.000000000 -0300 @@ -47,8 +47,8 @@ python-greenlet-dev [@greenlet_archs@], python3-all-dev, openjdk-7-jdk [@openjdk7_archs@], - ruby1.9.1, - ruby1.9.1-dev, + ruby, + ruby-dev, uuid-dev Standards-Version: 3.9.5 Homepage: http://projects.unbit.it/uwsgi/ @@ -253,7 +253,7 @@ - PSGI, Rack, WSGI, etc. * coroutines - Coro::AnyEvent - - Fiber (Ruby 1.9.1) + - Fiber (Ruby) - greenlet (Python 2) Package: uwsgi-infrastructure-plugins @@ -299,7 +299,7 @@ uwsgi-plugin-psgi (= ${binary:Version}), uwsgi-plugin-python (= ${binary:Version}), uwsgi-plugin-python3 (= ${binary:Version}), - uwsgi-plugin-rack-ruby1.9.1 (= ${binary:Version}), + uwsgi-plugin-rack-ruby (= ${binary:Version}), uwsgi-plugin-v8 (= ${binary:Version}) [@v8_archs@] Description: plugins for integration of uWSGI and application uWSGI presents a complete stack for networked/clustered web applications, @@ -316,7 +316,7 @@ * PHP * Perl PSGI * Python WSGI (Python 2 and 3) - * Rack (Ruby 1.9.1) + * Rack (Ruby) * V8 Package: uwsgi-plugin-alarm-curl @@ -370,7 +370,7 @@ Package: uwsgi-plugin-rbthreads Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, uwsgi-core (= ${binary:Version}), - uwsgi-plugin-rack-ruby1.9.1 (= ${binary:Version}) + uwsgi-plugin-rack-ruby (= ${binary:Version}) Description: Ruby native threads plugin for uWSGI uWSGI presents a complete stack for networked/clustered web applications, implementing message/object passing, caching, RPC and process management. @@ -378,12 +378,12 @@ used in order to add compatibility with tons of different technology on top of the same core. . - This package provides Ruby 1.9 native threads plugin for uWSGI. + This package provides Ruby native threads plugin for uWSGI. Package: uwsgi-plugin-fiber Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, uwsgi-core (= ${binary:Version}), - uwsgi-plugin-rack-ruby1.9.1 (= ${binary:Version}) + uwsgi-plugin-rack-ruby (= ${binary:Version}) Description: Fiber plugin for uWSGI uWSGI presents a complete stack for networked/clustered web applications, implementing message/object passing, caching, RPC and process management. @@ -391,8 +391,7 @@ used in order to add compatibility with tons of different technology on top of the same core. . - This package provides Fiber plugin for uWSGI - with Ruby 1.9.1. + This package provides Fiber plugin for uWSGI with Ruby. . Fibers are a form of coroutine, useful for implementing cooperative multitasking. @@ -544,18 +543,17 @@ This package provides Python 3 WSGI plugin for uWSGI (linked with Python 3 runtime). -Package: uwsgi-plugin-rack-ruby1.9.1 +Package: uwsgi-plugin-rack-ruby Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, uwsgi-core (= ${binary:Version}) -Description: Rack plugin for uWSGI (Ruby 1.9.1) +Description: Rack plugin for uWSGI (Ruby) uWSGI presents a complete stack for networked/clustered web applications, implementing message/object passing, caching, RPC and process management. It is designed to be fully modular. This means that different plugins can be used in order to add compatibility with tons of different technology on top of the same core. . - This package provides Rack plugin for uWSGI - (linked with Ruby 1.9.1 runtime). + This package provides Rack plugin for uWSGI (linked with Ruby runtime). Package: uwsgi-plugin-router-access Architecture: any diff -Nru uwsgi-2.0.3/debian/rules uwsgi-2.0.3/debian/rules --- uwsgi-2.0.3/debian/rules 2014-03-03 10:03:19.000000000 -0300 +++ uwsgi-2.0.3/debian/rules 2014-07-07 14:02:56.000000000 -0300 @@ -83,7 +83,7 @@ greenlet-python \ $(JAVA_PLUGIN_PKGS) \ lua5.1 lua5.2 \ - rack-ruby1.9.1 rbthreads fiber + rack-ruby rbthreads fiber ORDINARILY_BUILT_UWSGI_PLUGIN_PKGS := $(filter-out \ $(PARTICULARLY_BUILT_UWSGI_PLUGIN_PKGS), $(UWSGI_PLUGIN_PKGS_NAMES)) @@ -185,7 +185,7 @@ for INSTANTIATED_TEMPLATE in $(call files_instantiated_in_debian_dir, \ uwsgi-plugin-, \ $(ORDINARILY_BUILT_UWSGI_PLUGIN_PKGS) \ - lua5.1 lua5.2 rack-ruby1.9.1, \ + lua5.1 lua5.2 rack-ruby, \ .$${TEMPLATE_TYPE} \ ); do \ if [ -f $(CURDIR)/debian/uwsgi-plugin.$${TEMPLATE_TYPE}.in ]; then \ @@ -393,7 +393,7 @@ $(eval PLUGIN_NAME = $(call pkg_name_to_plugin_name, \ $(subst stamp-plugin-,,$(notdir $@)) \ )) - UWSGICONFIG_RUBYPATH=/usr/bin/ruby1.9.1 \ + UWSGICONFIG_RUBYPATH=/usr/bin/ruby \ $(cdbs_curpythonindepbinary) $(UWSGI_BUILDER) \ --plugin $(CURDIR)/$(UWSGI_PLUGINS_SRC_DIR)/$(PLUGIN_NAME) \ $(CURDIR)/debian/buildconf/uwsgi-plugin.ini \ @@ -405,7 +405,7 @@ $(eval PLUGIN_NAME = $(call pkg_name_to_plugin_name, \ $(subst stamp-plugin-,,$(notdir $@)) \ )) - UWSGICONFIG_RUBYPATH=/usr/bin/ruby1.9.1 \ + UWSGICONFIG_RUBYPATH=/usr/bin/ruby \ $(cdbs_curpythonindepbinary) $(UWSGI_BUILDER) \ --plugin $(CURDIR)/$(UWSGI_PLUGINS_SRC_DIR)/$(PLUGIN_NAME) \ $(CURDIR)/debian/buildconf/uwsgi-plugin.ini \ @@ -424,8 +424,8 @@ $(PLUGIN_NAME) touch $@ -# Build rack_ruby191_plugin.so -debian/stamp-plugin-rack-ruby1.9.1: +# Build rack_ruby_plugin.so +debian/stamp-plugin-rack-ruby: $(eval PLUGIN_NAME = $(call pkg_name_to_plugin_name, \ $(subst stamp-plugin-,,$(notdir $@)) \ )) @@ -562,12 +562,12 @@ $(CURDIR)/uwsgi_$(PLUGIN_NAME) \ > $(CURDIR)/debian/uwsgi_$(PLUGIN_NAME).1 -install/uwsgi-plugin-rack-ruby1.9.1:: +install/uwsgi-plugin-rack-ruby:: $(eval PLUGIN_NAME = $(call pkg_name_to_plugin_name, \ $(subst uwsgi-plugin-,,$(notdir $@)) \ )) $(eval PLUGIN_PRIORITY = $(if \ - $(findstring uwsgi-plugin-rack-ruby1.9.1, $@),75,35) \ + $(findstring uwsgi-plugin-rack-ruby, $@),75,35) \ ) for TEMPLATE_TYPE in postinst prerm; do \ sed \
signature.asc
Description: Digital signature
