Fix import secure_filename failure
(cherry picked from commit 10762955016291ab3ce682e4637c1997b572dc6c)
This commit is contained in:
parent
5aefee561c
commit
9d0bcc6390
35
oec-hardware-1.1.4-fix-secure_filename.patch
Normal file
35
oec-hardware-1.1.4-fix-secure_filename.patch
Normal file
@ -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)
|
||||||
@ -4,7 +4,7 @@
|
|||||||
Name: oec-hardware
|
Name: oec-hardware
|
||||||
Summary: openEuler Hardware Compatibility Test Suite
|
Summary: openEuler Hardware Compatibility Test Suite
|
||||||
Version: 1.1.4
|
Version: 1.1.4
|
||||||
Release: 1
|
Release: 2
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
License: Mulan PSL v2
|
License: Mulan PSL v2
|
||||||
URL: https://gitee.com/openeuler/oec-hardware
|
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
|
# patch fix issue
|
||||||
Patch0001: oec-hardware-1.1.4-fix-configip-dpdk.patch
|
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
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -24,7 +25,7 @@ Provides: libswsds.so()(64bit)
|
|||||||
%package server
|
%package server
|
||||||
Summary: openEuler Hardware Compatibility Test Server
|
Summary: openEuler Hardware Compatibility Test Server
|
||||||
Group: Development/Tools
|
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
|
Requires: nginx, tar, qperf, psmisc
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -36,6 +37,7 @@ openEuler Hardware Compatibility Test Server
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -c
|
%setup -q -c
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
strip tests/keycard/libswsds_%{_arch}.so
|
strip tests/keycard/libswsds_%{_arch}.so
|
||||||
@ -78,6 +80,9 @@ DESTDIR=$RPM_BUILD_ROOT make install
|
|||||||
rm -rf /var/lock/oech.lock
|
rm -rf /var/lock/oech.lock
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 16 2023 cuixucui <cuixucui1@h-partner.com> - 1.1.4-2
|
||||||
|
- Fix import Secure_Filename failure
|
||||||
|
|
||||||
* Tue Jun 13 2023 cuixucui <cuixucui1@h-partner.com> - 1.1.4-1
|
* Tue Jun 13 2023 cuixucui <cuixucui1@h-partner.com> - 1.1.4-1
|
||||||
- Add igc dpdk
|
- Add igc dpdk
|
||||||
- Secure_filename to improve input robustness and security
|
- 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
|
- Increase the number of network card up detection times
|
||||||
- Resolve the issue of IP configuration failure
|
- Resolve the issue of IP configuration failure
|
||||||
|
|
||||||
|
|
||||||
* Tue Feb 28 2023 cuixucui <cuixucui1@h-partner.com> - 1.1.4-0
|
* Tue Feb 28 2023 cuixucui <cuixucui1@h-partner.com> - 1.1.4-0
|
||||||
- Add board information in the test report
|
- Add board information in the test report
|
||||||
- Add spdk test case
|
- Add spdk test case
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user