summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-06-25 09:54:19 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-06-25 09:54:19 +0200
commit49ce5df5ac9c855bef26106c3e870f391a44dce2 (patch)
tree57ec61c31f78449949c85891024ebecc19aa1242 /debian/patches
parent0e4c1c1dd3dd4271e54a7305699c303b629fa915 (diff)
parent3ef49f8de6794777791fdc48ee4b73926ea51e1a (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0100-source_typos.patch2
-rw-r--r--debian/patches/series2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/0100-source_typos.patch b/debian/patches/0100-source_typos.patch
index fe1bca0..ec96ad2 100644
--- a/debian/patches/0100-source_typos.patch
+++ b/debian/patches/0100-source_typos.patch
@@ -7,7 +7,7 @@ Index: trunk/src/regerror.c
===================================================================
--- trunk.orig/src/regerror.c
+++ trunk/src/regerror.c
-@@ -65,7 +65,7 @@ onig_error_code_to_format(int code)
+@@ -67,7 +67,7 @@ onig_error_code_to_format(int code)
case ONIGERR_UNEXPECTED_BYTECODE:
p = "unexpected bytecode (bug)"; break;
case ONIGERR_DEFAULT_ENCODING_IS_NOT_SETTED:
diff --git a/debian/patches/series b/debian/patches/series
index 06ee93d..2f55f57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
#001-changes_build_sys.diff
0100-source_typos.patch
-0500-CVE-2017-922[4-9].patch
+#0500-CVE-2017-922[4-9].patch