From f1182f5ed164303d8d04b3a83d249d41e1fe397b Mon Sep 17 00:00:00 2001 From: hanjinpeng Date: Wed, 17 Apr 2024 09:08:35 +0800 Subject: [PATCH] Fix uwsgi path issue to ensure patch-tracking service start up success --- 0001-fix-uwsgi-path-issue.patch | 22 ++++++++++++++++++++++ patch-tracking.spec | 8 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 0001-fix-uwsgi-path-issue.patch diff --git a/0001-fix-uwsgi-path-issue.patch b/0001-fix-uwsgi-path-issue.patch new file mode 100644 index 0000000..1548971 --- /dev/null +++ b/0001-fix-uwsgi-path-issue.patch @@ -0,0 +1,22 @@ +From a35af1f174d5582bc70fc50ccf8a6cfc899286aa Mon Sep 17 00:00:00 2001 +From: hanjinpeng +Date: Wed, 17 Apr 2024 08:49:34 +0800 +Subject: [PATCH] fix uwsgi path issue + +--- + patch_tracking/patch-tracking | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/patch_tracking/patch-tracking b/patch_tracking/patch-tracking +index 587f873..d5794be 100755 +--- a/patch_tracking/patch-tracking ++++ b/patch_tracking/patch-tracking +@@ -8,4 +8,4 @@ settings_file='/etc/patch-tracking/settings.conf' + + server=`grep 'LISTEN' $settings_file | awk -F'=' '{print $2}' | sed -e 's/^[ ]"//g' | sed -e 's/"$//g'` + +-/usr/bin/uwsgi --master --https "${server},/etc/patch-tracking/self-signed.crt,/etc/patch-tracking/self-signed.key" --wsgi-file "${app_file}" --callable app --chdir "${chdir_path}" --threads 100 --lazy ++/usr/sbin/uwsgi --master --https "${server},/etc/patch-tracking/self-signed.crt,/etc/patch-tracking/self-signed.key" --wsgi-file "${app_file}" --callable app --chdir "${chdir_path}" --threads 100 --lazy +-- +2.23.0 + diff --git a/patch-tracking.spec b/patch-tracking.spec index 49ed769..77d2fc9 100644 --- a/patch-tracking.spec +++ b/patch-tracking.spec @@ -1,11 +1,13 @@ Summary: This is a tool for automatically tracking upstream repository code patches Name: patch-tracking Version: 1.0.1 -Release: 4 +Release: 5 License: Mulan PSL v2 URL: https://gitee.com/openeuler/openEuler-Advisor Source0: patch-tracking-%{version}.tar Patch0000: fix-uwsgi-not-found.patch +Patch0001: 0001-fix-uwsgi-path-issue.patch + BuildArch: noarch @@ -19,6 +21,7 @@ This is a tool for automatically tracking upstream repository code patches %prep %setup -n patch-tracking-%{version} %patch0 -p1 +%patch0001 -p1 %build %py3_build @@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 17 2024 Han Jinpeng - 1.0.1-5 +- Fix uwsgi path issue to ensure patch-tracking service start up success + * Tue Feb 28 2023 liheavy - 1.0.1-4 - Add ReadMe and add install Requires