From 0408cd24a52c48deb9ecd155039c342299b15315 Mon Sep 17 00:00:00 2001 From: cuixucui <350255958@qq.com> Date: Fri, 16 Jun 2023 19:45:37 +0800 Subject: [PATCH] Fix import secure_filename failure (cherry picked from commit 10762955016291ab3ce682e4637c1997b572dc6c) --- oec-hardware-1.1.4-fix-secure_filename.patch | 35 ++++++++++++++++++++ oec-hardware.spec | 10 ++++-- 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 oec-hardware-1.1.4-fix-secure_filename.patch diff --git a/oec-hardware-1.1.4-fix-secure_filename.patch b/oec-hardware-1.1.4-fix-secure_filename.patch new file mode 100644 index 0000000..ec5f0dc --- /dev/null +++ b/oec-hardware-1.1.4-fix-secure_filename.patch @@ -0,0 +1,35 @@ +diff -Naur rpm/oec-hardware.spec oech/oec-hardware.spec +--- rpm/oec-hardware.spec 2023-06-16 19:27:04.289127200 +0800 ++++ oech/oec-hardware.spec 2023-06-16 19:21:24.761127200 +0800 +@@ -24,7 +24,7 @@ + %package server + Summary: openEuler Hardware Compatibility Test Server + Group: Development/Tools +-Requires: python3, python3-devel, python3-flask, python3-uWSGI ++Requires: python3, python3-devel, python3-flask, python3-uWSGI, python3-werkzeug + Requires: nginx, tar, qperf, psmisc, dpdk, dpdk-tools, dpdk-devel + + %description +diff -Naur rpm/scripts/kernelrelease.json oech/scripts/kernelrelease.json +--- rpm/scripts/kernelrelease.json 2023-02-28 17:56:07.000000000 +0800 ++++ oech/scripts/kernelrelease.json 2023-06-16 19:21:24.761127200 +0800 +@@ -5,5 +5,6 @@ + "openEuler 20.03 (LTS-SP2)": "4.19.90", + "openEuler 20.03 (LTS-SP3)": "4.19.90", + "openEuler 22.03 LTS": "5.10.0", +- "openEuler 22.03 (LTS-SP1)": "5.10.0" ++ "openEuler 22.03 (LTS-SP1)": "5.10.0", ++ "openEuler 22.03 (LTS-SP2)": "5.10.0" + } +diff -Naur rpm/server/server.py oech/server/server.py +--- rpm/server/server.py 2023-06-16 19:27:04.289127200 +0800 ++++ oech/server/server.py 2023-06-16 19:21:24.761127200 +0800 +@@ -25,7 +25,7 @@ + from urllib.request import urlopen, Request + from urllib.error import HTTPError + from flask import Flask, render_template, redirect, url_for, abort, request, send_from_directory, flash +-from werkzeug import secure_filename ++from werkzeug.utils import secure_filename + + app = Flask(__name__) + app.secret_key = os.urandom(24) diff --git a/oec-hardware.spec b/oec-hardware.spec index 6f57143..699aeba 100644 --- a/oec-hardware.spec +++ b/oec-hardware.spec @@ -4,7 +4,7 @@ Name: oec-hardware Summary: openEuler Hardware Compatibility Test Suite Version: 1.1.4 -Release: 1 +Release: 2 Group: Development/Tools License: Mulan PSL v2 URL: https://gitee.com/openeuler/oec-hardware @@ -12,6 +12,7 @@ Source0: https://gitee.com/openeuler/oec-hardware/repository/archive/v%{v # patch fix issue Patch0001: oec-hardware-1.1.4-fix-configip-dpdk.patch +Patch0002: oec-hardware-1.1.4-fix-secure_filename.patch Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gcc @@ -24,7 +25,7 @@ Provides: libswsds.so()(64bit) %package server Summary: openEuler Hardware Compatibility Test Server Group: Development/Tools -Requires: python3, python3-devel, python3-flask, python3-uWSGI +Requires: python3, python3-devel, python3-flask, python3-uWSGI, python3-werkzeug Requires: nginx, tar, qperf, psmisc %description @@ -36,6 +37,7 @@ openEuler Hardware Compatibility Test Server %prep %setup -q -c %patch1 -p1 +%patch2 -p1 %build strip tests/keycard/libswsds_%{_arch}.so @@ -78,6 +80,9 @@ DESTDIR=$RPM_BUILD_ROOT make install rm -rf /var/lock/oech.lock %changelog +* Fri Jun 16 2023 cuixucui - 1.1.4-2 +- Fix import Secure_Filename failure + * Tue Jun 13 2023 cuixucui - 1.1.4-1 - Add igc dpdk - Secure_filename to improve input robustness and security @@ -85,7 +90,6 @@ rm -rf /var/lock/oech.lock - Increase the number of network card up detection times - Resolve the issue of IP configuration failure - * Tue Feb 28 2023 cuixucui - 1.1.4-0 - Add board information in the test report - Add spdk test case -- Gitee