From 5c5acc947ec7851f4ad51fd5ee35c67fc5451431 Mon Sep 17 00:00:00 2001 From: xuyongliang_01 Date: Mon, 28 Aug 2023 07:40:04 +0000 Subject: [PATCH 1/4] =?UTF-8?q?update=20cve-agency-manager/cve=5Ftracking/?= =?UTF-8?q?core/platform/cve=5Fplatform.py.=20=E5=BD=93redirect=5Fresponse?= =?UTF-8?q?.text=E4=B8=BA=E2=80=9C=20=E2=80=9D=EF=BC=8C=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=B8=8E=5Fresponse=5Ftext=E5=AE=9E=E8=A1=8C?= =?UTF-8?q?=E5=8A=A0=E5=87=8F=E8=BF=90=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xuyongliang_01 --- cve-agency-manager/cve_tracking/core/platform/cve_platform.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cve-agency-manager/cve_tracking/core/platform/cve_platform.py b/cve-agency-manager/cve_tracking/core/platform/cve_platform.py index 37512e4..2a3b9d3 100644 --- a/cve-agency-manager/cve_tracking/core/platform/cve_platform.py +++ b/cve-agency-manager/cve_tracking/core/platform/cve_platform.py @@ -132,6 +132,7 @@ class CvePlatform: redirect_response = await self._rule_redirect(_response_text=_response_text) if not redirect_response.text: redirect_response.text = "" + if redirect_response.text !="": _response_text += redirect_response.text except RequestError: return None -- Gitee From 3131b0243c4286646ec30cfb28590feaf01d2505 Mon Sep 17 00:00:00 2001 From: xuyongliang_01 Date: Mon, 28 Aug 2023 07:54:05 +0000 Subject: [PATCH 2/4] =?UTF-8?q?update=20cve-agency-manager/cve=5Ftracking/?= =?UTF-8?q?core/platform/cve=5Fplatform.py.=20=E5=BD=93redirect=5Fresponse?= =?UTF-8?q?.text=E4=B8=BA=E2=80=9C=20=E2=80=9D=EF=BC=8C=5Fresponse=5Ftext?= =?UTF-8?q?=E4=B8=BANone=EF=BC=8C=E7=B1=BB=E5=9E=8B=E5=86=B2=E7=AA=81?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E8=BF=9B=E8=A1=8C=E5=8A=A0=E5=87=8F?= =?UTF-8?q?=E8=BF=90=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xuyongliang_01 --- cve-agency-manager/cve_tracking/core/platform/cve_platform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cve-agency-manager/cve_tracking/core/platform/cve_platform.py b/cve-agency-manager/cve_tracking/core/platform/cve_platform.py index 2a3b9d3..ce088eb 100644 --- a/cve-agency-manager/cve_tracking/core/platform/cve_platform.py +++ b/cve-agency-manager/cve_tracking/core/platform/cve_platform.py @@ -133,7 +133,7 @@ class CvePlatform: if not redirect_response.text: redirect_response.text = "" if redirect_response.text !="": - _response_text += redirect_response.text + _response_text += redirect_response.text except RequestError: return None if _response.error or not _response_text: -- Gitee From 8ada405a7ed9a4a33ea96f7a419e1693d5e8a2f7 Mon Sep 17 00:00:00 2001 From: xuyongliang_01 Date: Mon, 28 Aug 2023 08:06:29 +0000 Subject: [PATCH 3/4] =?UTF-8?q?update=20cve-agency-manager/cve=5Ftracking/?= =?UTF-8?q?core/verification/packing.sh.=20=E5=BE=88=E5=A4=9Aspec=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E4=BC=9A=E5=90=AB=E6=9C=89%autosetup?= =?UTF-8?q?=EF=BC=8C=E5=85=B6=E5=8F=AF=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?%patch=EF=BC=8C=E6=AD=A4=E6=97=B6=E5=86=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B1=9E=E4=BA=8E=E9=87=8D=E5=A4=8D=E6=93=8D=E4=BD=9C=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E4=BC=9A=E6=8A=A5=E9=94=99=E3=80=82=E6=89=80=E4=BB=A5?= =?UTF-8?q?=E9=9C=80=E5=85=88=E8=BF=9B=E8=A1=8C=E4=B8=80=E6=AC=A1=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=90=AB=E6=9C=89%autosetup=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xuyongliang_01 --- .../cve_tracking/core/verification/packing.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/cve-agency-manager/cve_tracking/core/verification/packing.sh b/cve-agency-manager/cve_tracking/core/verification/packing.sh index 9c0ad16..445b51c 100755 --- a/cve-agency-manager/cve_tracking/core/verification/packing.sh +++ b/cve-agency-manager/cve_tracking/core/verification/packing.sh @@ -113,13 +113,18 @@ function update_spec() { sed -i "${last_patch_row}a Patch${new_patch_num}: ${path_file_name}" ${spec_file} fi # add %patch - last_patch_apply=$(grep "%patch.* " ${spec_file} | sed -n '$p') - if [[ -n ${last_patch_apply} ]]; then - last_patch_apply_row=$(grep -n "${last_patch_apply}" ${spec_file} | awk -F ':' '{print $1}') - last_patch_apply_num=$(echo ${last_patch_apply} | awk -F ' ' '{print $1}' | awk -F 'patch' '{print $2}') - ignore_level_num=$(echo ${last_patch_apply} | awk -F ' ' '{print $2}') - new_patch_apply_num=$(expr ${last_patch_apply_num} + 1) - sed -i "${last_patch_apply_row}a %patch${new_patch_apply_num} ${ignore_level_num} " ${spec_file} + is_autosetup_exist=$(grep "%autosetup" ${spec_file} | sed -n '$p') + if [[ -n ${is_autosetup_exist} ]]; then + break; + else + last_patch_apply=$(grep "%patch.* " ${spec_file} | sed -n '$p') + if [[ -n ${last_patch_apply} ]]; then + last_patch_apply_row=$(grep -n "${last_patch_apply}" ${spec_file} | awk -F ':' '{print $1}') + last_patch_apply_num=$(echo ${last_patch_apply} | awk -F ' ' '{print $1}' | awk -F 'patch' '{print $2}') + ignore_level_num=$(echo ${last_patch_apply} | awk -F ' ' '{print $2}') + new_patch_apply_num=$(expr ${last_patch_apply_num} + 1) + sed -i "${last_patch_apply_row}a %patch${new_patch_apply_num} ${ignore_level_num} " ${spec_file} + fi fi # add changelog change_log_row=$(grep -n '%changelog' ${spec_file} | sed -n '$p' | awk -F ':' '{print $1}') -- Gitee From a3105283a5c3d26a50ea73a58cd24688a487ed52 Mon Sep 17 00:00:00 2001 From: xuyongliang_01 Date: Mon, 28 Aug 2023 08:21:42 +0000 Subject: [PATCH 4/4] =?UTF-8?q?update=20cve-agency-manager/cve=5Ftracking/?= =?UTF-8?q?core/platform/cve=5Fplatform.py.=20=E5=BE=88=E5=A4=9Aspec?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E5=90=AB=E6=9C=89%autosetup?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0%patch=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E5=85=88=E6=9F=A5=E6=89=BEspec=E6=96=87=E4=BB=B6=E4=B8=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=90=AB=E6=9C=89%autosetup=EF=BC=8C?= =?UTF-8?q?=E5=90=A6=E5=88=99=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0=E4=BC=9A?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xuyongliang_01 --- cve-agency-manager/cve_tracking/core/platform/cve_platform.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cve-agency-manager/cve_tracking/core/platform/cve_platform.py b/cve-agency-manager/cve_tracking/core/platform/cve_platform.py index ce088eb..37512e4 100644 --- a/cve-agency-manager/cve_tracking/core/platform/cve_platform.py +++ b/cve-agency-manager/cve_tracking/core/platform/cve_platform.py @@ -132,8 +132,7 @@ class CvePlatform: redirect_response = await self._rule_redirect(_response_text=_response_text) if not redirect_response.text: redirect_response.text = "" - if redirect_response.text !="": - _response_text += redirect_response.text + _response_text += redirect_response.text except RequestError: return None if _response.error or not _response_text: -- Gitee