From 1a458f96ccfef6135681804c260290f4bef4d95e Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 8 Jul 2020 18:27:48 +0000
Subject: user/oniguruma: Update to 6.9.5.1

---
 user/oniguruma/192.patch | 25 +++++++++++++++++++++++++
 user/oniguruma/APKBUILD  |  9 ++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 user/oniguruma/192.patch

(limited to 'user/oniguruma')

diff --git a/user/oniguruma/192.patch b/user/oniguruma/192.patch
new file mode 100644
index 000000000..d027757d7
--- /dev/null
+++ b/user/oniguruma/192.patch
@@ -0,0 +1,25 @@
+From 47af49af70a717ac31c54ae55ad242a27f213def Mon Sep 17 00:00:00 2001
+From: "K.Kosako" <kkosako0@gmail.com>
+Date: Wed, 22 Apr 2020 14:47:09 +0900
+Subject: [PATCH] fix #192: Unexpected regex match
+
+---
+ src/regcomp.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/regcomp.c b/src/regcomp.c
+index 4d5b78f..b3193c5 100644
+--- a/src/regcomp.c
++++ b/src/regcomp.c
+@@ -3567,6 +3567,11 @@ check_node_in_look_behind(Node* node, int not, int* used)
+ 
+     if (IS_NOT_NULL(NODE_BODY(node)))
+       r = check_node_in_look_behind(NODE_BODY(node), not, used);
++
++    /* Issue 192
++       escape removing node in tune_look_behind()
++     */
++    *used = TRUE;
+     break;
+ 
+   case NODE_GIMMICK:
diff --git a/user/oniguruma/APKBUILD b/user/oniguruma/APKBUILD
index c4399f782..e95c5229e 100644
--- a/user/oniguruma/APKBUILD
+++ b/user/oniguruma/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Samuel Holland <samuel@sholland.org>
 pkgname=oniguruma
-pkgver=6.9.4
+pkgver=6.9.5
 pkgrel=0
 pkgdesc="A regular expression library"
 url="https://github.com/kkos/oniguruma"
@@ -11,7 +11,9 @@ license="BSD-2-Clause"
 depends=""
 makedepends=""
 subpackages="$pkgname-dev"
-source="https://github.com/kkos/$pkgname/releases/download/v$pkgver/onig-$pkgver.tar.gz"
+source="https://github.com/kkos/$pkgname/releases/download/v$pkgver/onig-$pkgver.tar.gz
+	192.patch
+	"
 builddir="$srcdir/onig-$pkgver"
 
 # secfixes:
@@ -39,4 +41,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b  onig-6.9.4.tar.gz"
+sha512sums="2bdb24914e7069c6df9ab8a3d0190ddb58440d94b13860cdc36d259062ae0bc2aa85d564a4209ec596fc7ee47b0823d1b817d4f7ffcc3ea60e9870da84491dc1  onig-6.9.5.tar.gz
+b2e9926e0b9a22b2036bb43297e24726439938b8cf349f55ab09bf47d16a4862bb3bbdec8b425c7d174524121e49c4d6e567e26168894d7c564b7645d5a1bff5  192.patch"
-- 
cgit v1.2.3-60-g2f50