dev-libs/oniguruma: Delete old versions (<6.6.1).

8 files changed, 0 insertions, 248 deletions

diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.3-makefile.patch b/dev-libs/oniguruma/files/oniguruma-5.9.3-makefile.patch
deleted file mode 100644
index 7003907f7850..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-5.9.3-makefile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 2865fb7..75cbd45 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,7 +6,7 @@ libname = libonig.la
- ACLOCAL_AMFLAGS = -I m4
- #AM_CFLAGS = -DNOT_RUBY
- AM_CFLAGS =
--INCLUDES  = -I$(top_srcdir) -I$(includedir)
-+INCLUDES  = -I$(top_srcdir)
- 
- SUBDIRS = . sample
- 
-diff --git a/configure.in b/configure.in
-index 1e21f96..51b56d8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -25,7 +25,7 @@ dnl check for COMBINATION_EXPLOSION
- AC_ARG_ENABLE(combination-explosion-check,
- 	[  --enable-combination-explosion-check   enable combination explosion check],
- 	[comb_expl_check=$enableval])
--if test "${comb_expl_check}" = yes; then
-+if test "x${comb_expl_check}" = xyes; then
-   AC_DEFINE(USE_COMBINATION_EXPLOSION_CHECK,1,[Define if combination explosion check])
- fi
- 
-@@ -33,7 +33,7 @@ dnl check for CRNL_AS_LINE_TERMINATOR
- AC_ARG_ENABLE(crnl-as-line-terminator,
- 	[  --enable-crnl-as-line-terminator   enable CR+NL as line terminator],
- 	[crnl_as_line_terminator=$enableval])
--if test "${crnl_as_line_terminator}" = yes; then
-+if test "x${crnl_as_line_terminator}" = xyes; then
-   AC_DEFINE(USE_CRNL_AS_LINE_TERMINATOR,1,[Define if enable CR+NL as line terminator])
- fi
- 
-diff --git a/sample/Makefile.am b/sample/Makefile.am
-index af33057..347af94 100644
---- a/sample/Makefile.am
-+++ b/sample/Makefile.am
-@@ -2,7 +2,7 @@ noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl
- 
- libname = $(top_builddir)/libonig.la
- LDADD   = $(libname)
--INCLUDES  = -I$(top_srcdir) -I$(includedir)
-+INCLUDES  = -I$(top_srcdir)
- 
- encode_SOURCES  = encode.c
- listcap_SOURCES = listcap.c
diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9224.patch b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9224.patch
deleted file mode 100644
index b256e0df581c..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9224.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/kkos/oniguruma/issues/57
-https://github.com/kkos/oniguruma/commit/690313a061f7a4fa614ec5cc8368b4f2284e059b
-
-Author: K.Kosako <kosako@sofnec.co.jp>
-
---- a/regexec.c
-+++ b/regexec.c
-@@ -1473,14 +1473,9 @@
-       break;
- 
-     case OP_EXACT1:  MOP_IN(OP_EXACT1);
--#if 0
-       DATA_ENSURE(1);
-       if (*p != *s) goto fail;
-       p++; s++;
--#endif
--      if (*p != *s++) goto fail;
--      DATA_ENSURE(0);
--      p++;
-       MOP_OUT;
-       break;
- 
diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9226.patch b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9226.patch
deleted file mode 100644
index f5e0490ecfb8..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9226.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/kkos/oniguruma/issues/55
-https://github.com/kkos/oniguruma/commit/f015fbdd95f76438cd86366467bb2b39870dd7c6
-https://github.com/kkos/oniguruma/commit/b4bf968ad52afe14e60a2dc8a95d3555c543353a
-
-Author: K.Kosako <kosako@sofnec.co.jp>
-
---- a/regparse.c
-+++ b/regparse.c
-@@ -3064,7 +3064,7 @@
- 	PUNFETCH;
- 	prev = p;
- 	num = scan_unsigned_octal_number(&p, end, 3, enc);
--	if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
-+	if (num < 0 || num >= 256) return ONIGERR_TOO_BIG_NUMBER;
- 	if (p == prev) {  /* can't read nothing. */
- 	  num = 0; /* but, it's not error */
- 	}
-@@ -3436,7 +3436,7 @@
-       if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_OCTAL3)) {
- 	prev = p;
- 	num = scan_unsigned_octal_number(&p, end, (c == '0' ? 2:3), enc);
--	if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
-+	if (num < 0 || num >= 256) return ONIGERR_TOO_BIG_NUMBER;
- 	if (p == prev) {  /* can't read nothing. */
- 	  num = 0; /* but, it's not error */
- 	}
-@@ -4084,7 +4084,12 @@
-   switch (*state) {
-   case CCS_VALUE:
-     if (*type == CCV_SB)
-+    {
-+      if (*vs > 0xff)
-+          return ONIGERR_INVALID_CODE_POINT_VALUE;
-+
-       BITSET_SET_BIT(cc->bs, (int )(*vs));
-+    }
-     else if (*type == CCV_CODE_POINT) {
-       r = add_code_range(&(cc->mbuf), env, *vs, *vs);
-       if (r < 0) return r;
diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9227.patch b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9227.patch
deleted file mode 100644
index 580cc1446791..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9227.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://github.com/kkos/oniguruma/issues/58
-https://github.com/kkos/oniguruma/commit/9690d3ab1f9bcd2db8cbe1fe3ee4a5da606b8814
-
-Author: K.Kosako <kosako@sofnec.co.jp>
-
---- a/regexec.c
-+++ b/regexec.c
-@@ -3154,6 +3154,8 @@
-     }
-     else {
-       UChar *q = p + reg->dmin;
-+
-+      if (q >= end) return 0; /* fail */
-       while (p < q) p += enclen(reg->enc, p);
-     }
-   }
diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9228.patch b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9228.patch
deleted file mode 100644
index 523455c97f38..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9228.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/kkos/oniguruma/issues/60
-https://github.com/kkos/oniguruma/commit/3b63d12038c8d8fc278e81c942fa9bec7c704c8b
-
-Author: K.Kosako <kosako@sofnec.co.jp>
-
---- a/regparse.c
-+++ b/regparse.c
-@@ -4081,7 +4081,9 @@
-     }
-   }
- 
--  *state = CCS_VALUE;
-+  if (*state != CCS_START)
-+    *state = CCS_VALUE;
-+
-   *type  = CCV_CLASS;
-   return 0;
- }
diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9229.patch b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9229.patch
deleted file mode 100644
index f2dbc55d59ac..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9229.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/kkos/oniguruma/issues/59
-https://github.com/kkos/oniguruma/commit/b690371bbf97794b4a1d3f295d4fb9a8b05d402d
-
-Author: K.Kosako <kosako@sofnec.co.jp>
-
---- a/regexec.c
-+++ b/regexec.c
-@@ -3207,18 +3207,25 @@
-     }
-     else {
-       if (reg->dmax != ONIG_INFINITE_DISTANCE) {
--	*low = p - reg->dmax;
--	if (*low > s) {
--	  *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s,
--							      *low, (const UChar** )low_prev);
--	  if (low_prev && IS_NULL(*low_prev))
--	    *low_prev = onigenc_get_prev_char_head(reg->enc,
--						   (pprev ? pprev : s), *low);
-+	if (p - str < reg->dmax) {
-+	  *low = (UChar* )str;
-+	  if (low_prev)
-+	    *low_prev = onigenc_get_prev_char_head(reg->enc, str, *low);
- 	}
- 	else {
--	  if (low_prev)
--	    *low_prev = onigenc_get_prev_char_head(reg->enc,
--					       (pprev ? pprev : str), *low);
-+	  *low = p - reg->dmax;
-+	  if (*low > s) {
-+	    *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s,
-+								*low, (const UChar** )low_prev);
-+	    if (low_prev && IS_NULL(*low_prev))
-+	      *low_prev = onigenc_get_prev_char_head(reg->enc,
-+						     (pprev ? pprev : s), *low);
-+	  }
-+	  else {
-+	    if (low_prev)
-+	      *low_prev = onigenc_get_prev_char_head(reg->enc,
-+						     (pprev ? pprev : str), *low);
-+	  }
- 	}
-       }
-     }
diff --git a/dev-libs/oniguruma/files/oniguruma-combination-explosion-check.patch b/dev-libs/oniguruma/files/oniguruma-combination-explosion-check.patch
deleted file mode 100644
index cfc758d2a083..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-combination-explosion-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/regcomp.c
-+++ b/src/regcomp.c
-@@ -3619,8 +3619,8 @@
-       switch (en->type) {
-       case ENCLOSURE_MEMORY:
-         {
--          if (env->curr_max_regnum < en->regnum)
--            env->curr_max_regnum = en->regnum;
-+          if (env->curr_max_regnum < en->m.regnum)
-+            env->curr_max_regnum = en->m.regnum;
- 
-           r = setup_comb_exp_check(NODE_ENCLOSURE_BODY(en), state, env);
-         }
diff --git a/dev-libs/oniguruma/files/oniguruma-gentoo.patch b/dev-libs/oniguruma/files/oniguruma-gentoo.patch
deleted file mode 100644
index 5661cea03b54..000000000000
--- a/dev-libs/oniguruma/files/oniguruma-gentoo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,7 +18,7 @@
- AC_ARG_ENABLE(combination-explosion-check,
- 	[  --enable-combination-explosion-check   enable combination explosion check],
- 	[comb_expl_check=$enableval])
--if test "${comb_expl_check}" = yes; then
-+if test "x${comb_expl_check}" = xyes; then
-   AC_DEFINE(USE_COMBINATION_EXPLOSION_CHECK,1,[Define if combination explosion check])
- fi
- 
-@@ -26,7 +26,7 @@
- AC_ARG_ENABLE(crnl-as-line-terminator,
- 	[  --enable-crnl-as-line-terminator   enable CR+NL as line terminator],
- 	[crnl_as_line_terminator=$enableval])
--if test "${crnl_as_line_terminator}" = yes; then
-+if test "x${crnl_as_line_terminator}" = xyes; then
-   AC_DEFINE(USE_CRNL_AS_LINE_TERMINATOR,1,[Define if enable CR+NL as line terminator])
- fi
- 
---- a/sample/Makefile.am
-+++ b/sample/Makefile.am
-@@ -1,10 +1,10 @@
- #noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl
- 
--lib_onig = ../src/libonig.la
-+lib_onig = $(top_builddir)/src/libonig.la
- LDADD  = $(lib_onig)
- 
- AM_LDFLAGS  = -L$(prefix)/lib
--AM_CPPFLAGS = -I../src -I$(includedir)
-+AM_CPPFLAGS = -I$(top_srcdir)/src
- 
- TESTS = encode listcap names posix simple sql syntax user_property bug_fix
- 
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -1,9 +1,9 @@
- ## Makefile.am for Oniguruma
--lib_onig = ../src/libonig.la
-+lib_onig = $(top_builddir)/src/libonig.la
- 
- AM_LDFLAGS  = -L$(prefix)/lib
- AM_CFLAGS =
--AM_CPPFLAGS = -I../src -I$(includedir)
-+AM_CPPFLAGS = -I$(top_srcdir)/src
- 
- TESTS = testc testp testcu
-