Attachment 1486848 Details for Bug 1628147 – Git patch for Provides issues and startup issues

[patch] Git patch for Provides issues and startup issues

rhbz1628147.patch (text/plain), 6.95 KB, created by Benjamin Allot on 2018-09-25 17:46:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Allot

Created: 2018-09-25 17:46:57 UTC

Size: 6.95 KB

patch

obsolete

>From f9dbeb37950ea76c5d9524561e70f7631982bc29 Mon Sep 17 00:00:00 2001
>From: Benjamin Allot <benjamin.allot@scality.com>
>Date: Tue, 25 Sep 2018 18:20:48 +0200
>Subject: [PATCH 1/2] Add Provides with old names when renamed due to change to
> python2
>
>The project "Mass Python 2 Package Removal" implies a rename of python
>to python2 and some uwsgi plugin has been renamed that way.
>However, the new package were not providing the old name, breaking
>backward compatibility.
>
>(rhbz#1628147)
>
>Signed-off-by: Benjamin Allot <benjamin.allot@scality.com>
>---
> uwsgi.spec | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
>diff --git a/uwsgi.spec b/uwsgi.spec
>index 596e139..45c3c2e 100644
>--- a/uwsgi.spec
>+++ b/uwsgi.spec
>@@ -262,6 +262,7 @@ Group:          Development/Libraries
> Requires:       uwsgi = %{version}-%{release}
> Requires:       uwsgi-plugin-python2 = %{version}-%{release}
> Obsoletes:      python-uwsgidecorators < 2.0.16-4
>+Provides:       python-uwsgidecorators = %{version}-%{release}
> 
> %description -n python2-uwsgidecorators
> The uwsgidecorators Python 2 module provides higher-level access to the uWSGI API.
>@@ -274,6 +275,7 @@ Requires:       uwsgi = %{version}-%{release}
> Requires:       uwsgi-plugin-python%{python3_pkgversion} = %{version}-%{release}
> %if 0%{?rhel} == 7
> Obsoletes:      python3-uwsgidecorators < 2.0.16-4
>+Provides:       python3-uwsgidecorators = ${version}-%{release}
> %endif
> 
> %description -n python%{python3_pkgversion}-uwsgidecorators
>@@ -644,6 +646,7 @@ Summary:  uWSGI - Plugin for Python 2 GEvent support
> Group:    System Environment/Daemons
> Requires: uwsgi-plugin-python2 = %{version}-%{release}, libevent
> Obsoletes: uwsgi-plugin-gevent < 2.0.16-4
>+Provides: uwsgi-plugin-gevent = ${version}-%{release}
> 
> %description -n uwsgi-plugin-python2-gevent
> This package contains the Python 2 gevent plugin for uWSGI
>@@ -684,6 +687,7 @@ Summary:  uWSGI - Plugin for Python 2 Greenlet support
> Group:    System Environment/Daemons
> Requires: python-greenlet, uwsgi-plugin-python2 = %{version}-%{release}
> Obsoletes: uwsgi-plugin-greenlet < 2.0.16-4
>+Provides: uwsgi-plugin-greenlet = ${version}-%{release}
> 
> %description -n uwsgi-plugin-python2-greenlet
> This package contains the Python 2 greenlet plugin for uWSGI
>@@ -808,6 +812,7 @@ Summary:  uWSGI - Plugin for Python 2 support
> Group:    System Environment/Daemons
> Requires: python2, uwsgi-plugin-common = %{version}-%{release}
> Obsoletes: uwsgi-plugin-python < 2.0.16-4
>+Provides: uwsgi-plugin-python = ${version}-%{release}
> 
> %description -n uwsgi-plugin-python2
> This package contains the Python 2 plugin for uWSGI
>@@ -819,6 +824,7 @@ Group:    System Environment/Daemons
> Requires: python%{python3_pkgversion}, uwsgi-plugin-common = %{version}-%{release}
> %if 0%{?rhel} == 7
> Obsoletes: uwsgi-plugin-python3 < 2.0.16-4
>+Provides: uwsgi-plugin-python3 = ${version}-%{release}
> %endif
> 
> %description -n uwsgi-plugin-python%{python3_pkgversion}
>@@ -914,6 +920,7 @@ Summary:  uWSGI - Plugin for Tornado (Python 2) support
> Group:    System Environment/Daemons
> Requires: uwsgi-plugin-common = %{version}-%{release}, python-tornado
> Obsoletes: uwsgi-plugin-tornado < 2.0.16-4
>+Provides: uwsgi-plugin-tornado = ${version}-%{release}
> 
> %description -n uwsgi-plugin-python2-tornado
> This package contains the tornado (Python 2) plugin for uWSGI
>@@ -925,6 +932,7 @@ Group:    System Environment/Daemons
> Requires: uwsgi-plugin-common = %{version}-%{release}, python%{python3_pkgversion}-tornado
> %if 0%{?fedora} && 0%{?fedora} < 29
> Obsoletes: uwsgi-plugin-tornado3 < 2.0.16-4
>+Provides: uwsgi-plugin-tornado3 = ${version}-%{release}
> %endif
> 
> %description -n uwsgi-plugin-python%{python3_pkgversion}-tornado
>-- 
>2.18.0
>
>
>From 86992063a5e9922acac6532181c0fa702fb7f649 Mon Sep 17 00:00:00 2001
>From: Benjamin Allot <benjamin.allot@scality.com>
>Date: Tue, 25 Sep 2018 18:35:00 +0200
>Subject: [PATCH 2/2] Change the uwsgi.ini for non-systemd system to use
> /var/run/uwsgi
>
>Systemd based system use /run/uwsgi while the others use /var/run/uwsgi.
>However, the emperor.ini file was always pointing toward /run/uwsgi,
>resulting in a "Permission denied" issue on startup.
>Also, the /run/uwsgi directory was not created at package installation
>on systemd based systems, which also lead to a Permission denied issue.
>
>Signed-off-by: Benjamin Allot <benjamin.allot@scality.com>
>---
> emperor.ini         | 4 ++--
> emperor_systemd.ini | 9 +++++++++
> uwsgi.spec          | 9 ++++++++-
> 3 files changed, 19 insertions(+), 3 deletions(-)
> create mode 100644 emperor_systemd.ini
>
>diff --git a/emperor.ini b/emperor.ini
>index 6b974b9..a7a7189 100644
>--- a/emperor.ini
>+++ b/emperor.ini
>@@ -1,9 +1,9 @@
> [uwsgi]
> uid = uwsgi
> gid = uwsgi
>-pidfile = /run/uwsgi/uwsgi.pid
>+pidfile = /var/run/uwsgi/uwsgi.pid
> emperor = /etc/uwsgi.d
>-stats = /run/uwsgi/stats.sock
>+stats = /var/run/uwsgi/stats.sock
> chmod-socket = 660
> emperor-tyrant = true
> cap = setgid,setuid
>diff --git a/emperor_systemd.ini b/emperor_systemd.ini
>new file mode 100644
>index 0000000..6b974b9
>--- /dev/null
>+++ b/emperor_systemd.ini
>@@ -0,0 +1,9 @@
>+[uwsgi]
>+uid = uwsgi
>+gid = uwsgi
>+pidfile = /run/uwsgi/uwsgi.pid
>+emperor = /etc/uwsgi.d
>+stats = /run/uwsgi/stats.sock
>+chmod-socket = 660
>+emperor-tyrant = true
>+cap = setgid,setuid
>diff --git a/uwsgi.spec b/uwsgi.spec
>index 45c3c2e..47a2423 100644
>--- a/uwsgi.spec
>+++ b/uwsgi.spec
>@@ -132,6 +132,7 @@ Source4:        https://github.com/unbit/%{docrepo}/archive/%{commit}/%{docrepo}
> Source5:        README.Fedora
> Source6:        uwsgi.init
> Source7:        uwsgi.tmpfiles
>+Source8:        emperor_systemd.ini
> Patch0:         uwsgi_trick_chroot_rpmbuild.patch
> Patch1:         uwsgi_fix_rpath.patch
> Patch2:         uwsgi_ruby20_compatibility.patch
>@@ -1301,6 +1302,8 @@ mkdir -p %{buildroot}%{_includedir}/uwsgi
> mkdir -p %{buildroot}%{_libdir}/uwsgi
> %if %{without systemd}
> install -d -m 0775 %{buildroot}%{_localstatedir}/run/uwsgi
>+%else
>+install -d -m 0775 %{buildroot}%%{_rundir}/uwsgi
> %endif
> %if %{with mono}
> mkdir -p %{buildroot}%{_monogacdir}
>@@ -1338,11 +1341,13 @@ install -D -p -m 0644 plugins/jvm/uwsgi.jar %{buildroot}%{_javadir}/uwsgi.jar
> %if %{with mono}
> gacutil -i plugins/mono/uwsgi.dll -f -package uwsgi -root %{buildroot}/usr/lib
> %endif
>-install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/uwsgi.ini
>+
> %if %{with systemd}
>+install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/uwsgi.ini
> install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/uwsgi.service
> install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/uwsgi.conf
> %else
>+install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/uwsgi.ini
> install -D -p -m 0755 %{SOURCE6} %{buildroot}%{_initddir}/uwsgi
> %endif
> install -D -p -m 0755 apache2/.libs/mod_proxy_uwsgi.so %{buildroot}%{_httpd_moddir}/mod_proxy_uwsgi.so
>@@ -1423,6 +1428,8 @@ fi
> %dir %{_sysconfdir}/uwsgi.d
> %if %{without systemd}
> %attr(0775,uwsgi,uwsgi) %dir %{_localstatedir}/run/uwsgi
>+%else
>+%attr(0775,uwsgi,uwsgi) %dir %{_rundir}/uwsgi
> %endif
> %doc README README.Fedora CHANGELOG
> %{!?_licensedir:%global license %%doc}
>-- 
>2.18.0
>

Actions: View | Diff

Attachments on bug 1628147: 1482649 | 1486848