Hello community, here is the log from the commit of package trytond for openSUSE:Factory checked in at 2020-03-05 23:22:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trytond (Old) and /work/SRC/openSUSE:Factory/.trytond.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trytond" Thu Mar 5 23:22:06 2020 rev:42 rq:781668 version:5.0.18 Changes: -------- --- /work/SRC/openSUSE:Factory/trytond/trytond.changes 2020-02-10 21:53:18.930187412 +0100 +++ /work/SRC/openSUSE:Factory/.trytond.new.26092/trytond.changes 2020-03-05 23:22:11.125307722 +0100 @@ -1,0 +2,7 @@ +Wed Mar 4 12:48:39 UTC 2020 - Ondřej Súkup <[email protected]> + +- add fix_werkzeug.patch to fix boo#1164970 +- remove implicit _service (not needed anymore for download) +- spec-clean to meet openSUSE packaging standards + +------------------------------------------------------------------- Old: ---- _service New: ---- fix_werkzeug.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trytond.spec ++++++ --- /var/tmp/diff_new_pack.djsPPA/_old 2020-03-05 23:22:13.001308754 +0100 +++ /var/tmp/diff_new_pack.djsPPA/_new 2020-03-05 23:22:13.001308754 +0100 @@ -22,21 +22,17 @@ Name: trytond Version: %{majorver}.18 Release: 0 - Summary: An Enterprise Resource Planning (ERP) system License: GPL-3.0-or-later Group: Productivity/Office/Management -URL: http://www.tryton.org/ +URL: https://www.tryton.org/ Source0: http://downloads.tryton.org/%{majorver}/%{name}-%{version}.tar.gz -#Patch0: trytond_get_login.patch Source1: tryton-server.README.SUSE Source2: trytond.conf.example Source3: %{name}.conf Source4: %{name}_log.conf -#Source11: %{name}.sysconfig Source20: %{name}.service -#Patch0: %{name}_server.diff -# List of additional build dependencies +Patch0: fix_werkzeug.patch BuildRequires: fdupes BuildRequires: python3-Werkzeug BuildRequires: python3-bcrypt @@ -65,9 +61,8 @@ Requires: python3-simpleeval Requires: python3-wrapt Requires: unoconv -Requires(pre): /usr/sbin/groupadd -Requires(pre): /usr/sbin/useradd -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(pre): %{_sbindir}/groupadd +Requires(pre): %{_sbindir}/useradd BuildArch: noarch %{?systemd_requires} @@ -80,24 +75,24 @@ %prep %setup -q -cp %{S:1} . -cp %{S:2} . -#%patch0 -p1 +cp %{SOURCE1} . +cp %{SOURCE2} . +%patch0 -p1 %build python3 setup.py build %install -python3 setup.py install --prefix=%_prefix --root=%buildroot +python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} # only for systemd -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{base_name} -install -p -m 640 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{base_name}/%{name}.conf -install -p -m 640 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{base_name}/%{name}_log.conf +mkdir -p %{buildroot}%{_sysconfdir}/%{base_name} +install -p -m 640 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{base_name}/%{name}.conf +install -p -m 640 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{base_name}/%{name}_log.conf -mkdir -p $RPM_BUILD_ROOT%{_unitdir} -install -p -m 644 %{SOURCE20} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service +mkdir -p %{buildroot}%{_unitdir} +install -p -m 644 %{SOURCE20} %{buildroot}%{_unitdir}/%{name}.service -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{lib,log}/%{base_name} +mkdir -p %{buildroot}%{_localstatedir}/{lib,log}/%{base_name} %fdupes -s %{buildroot} %pre @@ -117,9 +112,8 @@ %service_del_postun trytond.service %files -#%files -f filelist -%defattr(-,root,root) -%doc README tryton-server.README.SUSE trytond.conf.example LICENSE doc/* +%license LICENSE +%doc README tryton-server.README.SUSE trytond.conf.example doc/* %{python3_sitelib}/* %dir %{_sysconfdir}/%{base_name} %{_bindir}/%{name} ++++++ fix_werkzeug.patch ++++++ Index: trytond-5.0.18/trytond/wsgi.py =================================================================== --- trytond-5.0.18.orig/trytond/wsgi.py +++ trytond-5.0.18/trytond/wsgi.py @@ -9,8 +9,19 @@ import traceback from werkzeug.wrappers import Response from werkzeug.routing import Map, Rule from werkzeug.exceptions import abort, HTTPException, InternalServerError -from werkzeug.contrib.fixers import ProxyFix -from werkzeug.wsgi import SharedDataMiddleware +try: + from werkzeug.middleware.proxy_fix import ProxyFix + + def NumProxyFix(app, num_proxies): + return ProxyFix(app, + x_for=num_proxies, x_proto=num_proxies, x_host=num_proxies, + x_port=num_proxies, x_prefix=num_proxies) +except ImportError: + from werkzeug.contrib.fixers import ProxyFix as NumProxyFix +try: + from werkzeug.middleware.shared_data import SharedDataMiddleware +except ImportError: + from werkzeug.wsgi import SharedDataMiddleware import wrapt @@ -150,6 +161,6 @@ if config.get('web', 'root'): app.wsgi_app = SharedDataMiddlewareIndex(app.wsgi_app, static_files) num_proxies = config.getint('web', 'num_proxies') if num_proxies: - app.wsgi_app = ProxyFix(app.wsgi_app, num_proxies=num_proxies) + app.wsgi_app = NumProxyFix(app.wsgi_app, num_proxies) import trytond.protocols.dispatcher import trytond.bus
