package/python-markdown2: drop patches
PATCH 1/1 package/python-markdown2: drop patches
Commit a6569f2b3dd8b774683fdc0f7df3fcfde0b31f64 forgot to drop patches when merging next branch
Fixes:
- http://autobuild.buildroot.org/results/bf305c78dddd035b97e88943a1d19a8ceb6b41f7
Signed-off-by Fabrice Fontaine <[email protected]>
--- ...gs-with-punctuation-after-as-part-of.patch | 53 ------------------- .../0002-Better-fix-for-issue-348.patch | 32 ----------- package/python-markdown2/python-markdown2.mk | 4 -- 3 files changed, 89 deletions(-) delete mode 100644 package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch delete mode 100644 package/python-markdown2/0002-Better-fix-for-issue-348.patch
package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch deleted +0 -53
@@ -1,53 +0,0 @@ -From 9144d0fc5d5249cc4d81287ee79091806e6dde52 Mon Sep 17 00:00:00 2001 -From: Gareth Simpson <[email protected]> -Date: Fri, 1 May 2020 19:31:21 +0100 -Subject: [PATCH] Fix for issue 348 - incomplete tags with punctuation after as - part of the tag name are a source of XSS - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Retrieved from: -https://github.com/trentm/python-markdown2/commit/9144d0fc5d5249cc4d81287ee79091806e6dde52] ---- - lib/markdown2.py | 2 +- - test/tm-cases/issue348_incomplete_tag.html | 1 + - test/tm-cases/issue348_incomplete_tag.opts | 1 + - test/tm-cases/issue348_incomplete_tag.text | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - create mode 100644 test/tm-cases/issue348_incomplete_tag.html - create mode 100644 test/tm-cases/issue348_incomplete_tag.opts - create mode 100644 test/tm-cases/issue348_incomplete_tag.text - -diff --git a/lib/markdown2.py b/lib/markdown2.py -index 3a5d5d9..636bf07 100755 ---- a/lib/markdown2.py -+++ b/lib/markdown2.py -@@ -2164,7 +2164,7 @@ def _encode_amps_and_angles(self, text): - text = self._naked_gt_re.sub('>', text) - return text - -- _incomplete_tags_re = re.compile("<(/?\w+[\s/]+?)") -+ _incomplete_tags_re = re.compile("<(/?\w+?(?!://).?[\s/]+?)") - - def _encode_incomplete_tags(self, text): - if self.safe_mode not in ("replace", "escape"): -diff --git a/test/tm-cases/issue348_incomplete_tag.html b/test/tm-cases/issue348_incomplete_tag.html -new file mode 100644 -index 0000000..46059cc ---- /dev/null -+++ b/test/tm-cases/issue348_incomplete_tag.html -@@ -0,0 +1 @@ -+<p><lol@/ //id="pwn"//onclick="alert(1)"//<strong>abc</strong></p> -diff --git a/test/tm-cases/issue348_incomplete_tag.opts b/test/tm-cases/issue348_incomplete_tag.opts -new file mode 100644 -index 0000000..ad487c0 ---- /dev/null -+++ b/test/tm-cases/issue348_incomplete_tag.opts -@@ -0,0 +1 @@ -+{"safe_mode": "escape"} -diff --git a/test/tm-cases/issue348_incomplete_tag.text b/test/tm-cases/issue348_incomplete_tag.text -new file mode 100644 -index 0000000..bb4a0de ---- /dev/null -+++ b/test/tm-cases/issue348_incomplete_tag.text -@@ -0,0 +1 @@ -+<lol@/ //id="pwn"//onclick="alert(1)"//**abc**
package/python-markdown2/0002-Better-fix-for-issue-348.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 0c0543846fa54281e2269b0bff841a0b9ffe23fe Mon Sep 17 00:00:00 2001 -From: Gareth Simpson <[email protected]> -Date: Sat, 2 May 2020 21:22:36 +0100 -Subject: [PATCH] Better fix for issue 348 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Retrieved from: -https://github.com/trentm/python-markdown2/commit/0c0543846fa54281e2269b0bff841a0b9ffe23fe] ---- - lib/markdown2.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/markdown2.py b/lib/markdown2.py -index 636bf07..be86502 100755 ---- a/lib/markdown2.py -+++ b/lib/markdown2.py -@@ -2164,11 +2164,14 @@ def _encode_amps_and_angles(self, text): - text = self._naked_gt_re.sub('>', text) - return text - -- _incomplete_tags_re = re.compile("<(/?\w+?(?!://).?[\s/]+?)") -+ _incomplete_tags_re = re.compile("<(/?\w+?(?!\w).+?[\s/]+?)") - - def _encode_incomplete_tags(self, text): - if self.safe_mode not in ("replace", "escape"): - return text -+ -+ if text.endswith(">"): -+ return text # this is not an incomplete tag, this is a link in the form <http://x.y.z> - - return self._incomplete_tags_re.sub("<\\1", text) -
package/python-markdown2/python-markdown2.mk +0 -4
@@ -11,8 +11,4 @@ PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt -# 0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch -# 0002-Better-fix-for-issue-348.patch -PYTHON_MARKDOWN2_IGNORE_CVES += CVE-2020-11888 - $(eval $(python-package))
Signature · 1 line
2.26.2
Yann E. MORIN
AppliedPATCH 1/1 package/python-markdown2: drop patches
Fabrice, All,
On 2020-06-05 23:03 +0200, Fabrice Fontaine spake thusly:
Quoted 7 lines
Commit
a6569f2b3dd8b774683fdc0f7df3fcfde0b31f64forgot to drop patches when merging next branchFixes:
- http://autobuild.buildroot.org/results/bf305c78dddd035b97e88943a1d19a8ceb6b41f7Signed-off-by Fabrice Fontaine <[email protected]>
Applied to master with an expanded commit log, thanks.
Regards,
Yann E. MORIN.
Quoted 125 lines
--- ...gs-with-punctuation-after-as-part-of.patch | 53 ------------------- .../0002-Better-fix-for-issue-348.patch | 32 ----------- package/python-markdown2/python-markdown2.mk | 4 -- 3 files changed, 89 deletions(-) delete mode 100644 package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch delete mode 100644 package/python-markdown2/0002-Better-fix-for-issue-348.patchpackage/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch deleted +0
-53@@ -1,53 +0,0 @@ -From 9144d0fc5d5249cc4d81287ee79091806e6dde52 Mon Sep 17 00:00:00 2001 -From: Gareth Simpson <[email protected]> -Date: Fri, 1 May 2020 19:31:21 +0100 -Subject: [PATCH] Fix for issue 348 - incomplete tags with punctuation after as - part of the tag name are a source of XSS - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Retrieved from: -https://github.com/trentm/python-markdown2/commit/9144d0fc5d5249cc4d81287ee79091806e6dde52] ---- - lib/markdown2.py | 2 +- - test/tm-cases/issue348_incomplete_tag.html | 1 + - test/tm-cases/issue348_incomplete_tag.opts | 1 + - test/tm-cases/issue348_incomplete_tag.text | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - create mode 100644 test/tm-cases/issue348_incomplete_tag.html - create mode 100644 test/tm-cases/issue348_incomplete_tag.opts - create mode 100644 test/tm-cases/issue348_incomplete_tag.text - -diff --git a/lib/markdown2.py b/lib/markdown2.py -index 3a5d5d9..636bf07 100755 ---- a/lib/markdown2.py -+++ b/lib/markdown2.py -@@ -2164,7 +2164,7 @@ def _encode_amps_and_angles(self, text): - text = self._naked_gt_re.sub('>', text) - return text - -- _incomplete_tags_re = re.compile("<(/?\w+[\s/]+?)") -+ _incomplete_tags_re = re.compile("<(/?\w+?(?!://).?[\s/]+?)") - - def _encode_incomplete_tags(self, text): - if self.safe_mode not in ("replace", "escape"): -diff --git a/test/tm-cases/issue348_incomplete_tag.html b/test/tm-cases/issue348_incomplete_tag.html -new file mode 100644 -index 0000000..46059cc ---- /dev/null -+++ b/test/tm-cases/issue348_incomplete_tag.html -@@ -0,0 +1 @@ -+<p><lol@/ //id="pwn"//onclick="alert(1)"//<strong>abc</strong></p> -diff --git a/test/tm-cases/issue348_incomplete_tag.opts b/test/tm-cases/issue348_incomplete_tag.opts -new file mode 100644 -index 0000000..ad487c0 ---- /dev/null -+++ b/test/tm-cases/issue348_incomplete_tag.opts -@@ -0,0 +1 @@ -+{"safe_mode": "escape"} -diff --git a/test/tm-cases/issue348_incomplete_tag.text b/test/tm-cases/issue348_incomplete_tag.text -new file mode 100644 -index 0000000..bb4a0de ---- /dev/null -+++ b/test/tm-cases/issue348_incomplete_tag.text -@@ -0,0 +1 @@ -+<lol@/ //id="pwn"//onclick="alert(1)"//**abc**package/python-markdown2/0002-Better-fix-for-issue-348.patch deleted +0
-32@@ -1,32 +0,0 @@ -From 0c0543846fa54281e2269b0bff841a0b9ffe23fe Mon Sep 17 00:00:00 2001 -From: Gareth Simpson <[email protected]> -Date: Sat, 2 May 2020 21:22:36 +0100 -Subject: [PATCH] Better fix for issue 348 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Retrieved from: -https://github.com/trentm/python-markdown2/commit/0c0543846fa54281e2269b0bff841a0b9ffe23fe] ---- - lib/markdown2.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/markdown2.py b/lib/markdown2.py -index 636bf07..be86502 100755 ---- a/lib/markdown2.py -+++ b/lib/markdown2.py -@@ -2164,11 +2164,14 @@ def _encode_amps_and_angles(self, text): - text = self._naked_gt_re.sub('>', text) - return text - -- _incomplete_tags_re = re.compile("<(/?\w+?(?!://).?[\s/]+?)") -+ _incomplete_tags_re = re.compile("<(/?\w+?(?!\w).+?[\s/]+?)") - - def _encode_incomplete_tags(self, text): - if self.safe_mode not in ("replace", "escape"): - return text -+ -+ if text.endswith(">"): -+ return text # this is not an incomplete tag, this is a link in the form <http://x.y.z> - - return self._incomplete_tags_re.sub("<\\1", text) -package/python-markdown2/python-markdown2.mk +0
-4@@ -11,8 +11,4 @@ PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt -# 0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch -# 0002-Better-fix-for-issue-348.patch -PYTHON_MARKDOWN2_IGNORE_CVES += CVE-2020-11888 - $(eval $(python-package))Signature · 6 lines
2.26.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'