aboutsummaryrefslogtreecommitdiff
path: root/development/cgit/patches/0004-syntax-highlighting-replace-invalid-unicode-with.patch
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2017-08-24 19:22:28 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-08-26 07:20:38 +0700
commit4174da45a36fdf2f65914f22865dcc48433554c2 (patch)
tree14e161231bc5a8675857dbd5e124af8cc5864659 /development/cgit/patches/0004-syntax-highlighting-replace-invalid-unicode-with.patch
parentdf75f0401ee693208abfaf397f480ae1f61862d1 (diff)
development/cgit: Include some upstream git patches
Some general bugfixes, but more importantly, patch 0005 fixes a segfault in git's pathspec.c that we were seeing on the SBo git server. Thanks to John Keeping (cgit contributor) for helping with debug suggestions and identifying the specific commit we needed to fix it. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'development/cgit/patches/0004-syntax-highlighting-replace-invalid-unicode-with.patch')
-rw-r--r--development/cgit/patches/0004-syntax-highlighting-replace-invalid-unicode-with.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/development/cgit/patches/0004-syntax-highlighting-replace-invalid-unicode-with.patch b/development/cgit/patches/0004-syntax-highlighting-replace-invalid-unicode-with.patch
new file mode 100644
index 0000000000000..47483837f484a
--- /dev/null
+++ b/development/cgit/patches/0004-syntax-highlighting-replace-invalid-unicode-with.patch
@@ -0,0 +1,27 @@
+From 5564a5d06678b3f9b0725bc4b2383ea1b7eb5515 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Sun, 22 Jan 2017 12:44:44 +0100
+Subject: [PATCH 04/15] syntax-highlighting: replace invalid unicode with ?
+
+---
+ filters/syntax-highlighting.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/filters/syntax-highlighting.py b/filters/syntax-highlighting.py
+index 1ca4108..5888b50 100755
+--- a/filters/syntax-highlighting.py
++++ b/filters/syntax-highlighting.py
+@@ -30,8 +30,8 @@ from pygments.lexers import guess_lexer_for_filename
+ from pygments.formatters import HtmlFormatter
+
+
+-sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='utf-8')
+-sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
++sys.stdin = io.TextIOWrapper(sys.stdin.buffer, encoding='utf-8', errors='replace')
++sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', errors='replace')
+ data = sys.stdin.read()
+ filename = sys.argv[1]
+ formatter = HtmlFormatter(style='pastie')
+--
+2.14.1
+