commit: d04c162225769b728863dde985b2d7ce1e2aafc9
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Apr 16 16:22:27 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 18:27:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d04c1622
dev-libs/oniguruma: Delete old versions (<6.6.1).
dev-libs/oniguruma/Manifest | 3 --
.../oniguruma/files/oniguruma-5.9.3-makefile.patch | 48 ---------------------
.../files/oniguruma-5.9.6-CVE-2017-9224.patch | 22 ----------
.../files/oniguruma-5.9.6-CVE-2017-9226.patch | 39 -----------------
.../files/oniguruma-5.9.6-CVE-2017-9227.patch | 16 -------
.../files/oniguruma-5.9.6-CVE-2017-9228.patch | 18 --------
.../files/oniguruma-5.9.6-CVE-2017-9229.patch | 43 -------------------
.../oniguruma-combination-explosion-check.patch | 13 ------
dev-libs/oniguruma/files/oniguruma-gentoo.patch | 49 ----------------------
dev-libs/oniguruma/oniguruma-5.9.5.ebuild | 37 ----------------
dev-libs/oniguruma/oniguruma-5.9.6_p1-r1.ebuild | 47 ---------------------
dev-libs/oniguruma/oniguruma-6.4.0.ebuild | 42 -------------------
12 files changed, 377 deletions(-)
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 78bfc3e38f4..4d8619f4e9b 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,6 +1,3 @@
-DIST onig-5.9.5.tar.gz 587874 BLAKE2B
c3d691757d920c3690f6f8b4f0b3c7fac1fea0127d72a0c953ae212df711cb5d4e3ac6b36a40b7087d228381b405fcefc26fdb8203672eb01f12fa5c9562c337
SHA512
3ba3c94c5e52c80c680ebf1d19be53fa5a94a11d622e0282184c7a9c8cc6676f1926b97d12aafc66514071e65cd7de2bd4632afb053c69b01ddb8b581e878252
-DIST onig-5.9.6_p1.tar.gz 605920 BLAKE2B
9f5ecd29d0dc583d424866e5a37fe92ae4c987408d764f840f1f765e11e469f9f9db0169e670221d91ffeecd8ad4337f10d7f9c8559d3dd61f5edf82c244ce24
SHA512
5c874a92acab19e7b228e855cee2d8c55648d3c0c25213127e67bba7f510ec68cb5d64999cf629ffa509745e1b0bd13dd80afbdcef3ba1d4bb8f3d0ee3616f48
-DIST onig-6.4.0.tar.gz 900425 BLAKE2B
c2c76ea0bd1e47354169e386a495b8754da604be0dbcbbe43e7889e1c37f84ddf032b0874bdf3711221b60e717c1f1bd36edb35903102f0be55c323f81d42ec9
SHA512
476f2110f09eae9b27e0da4b995fa9db46fe6f98f5ef8700b9f1966f9b4bf6db680c6e9e67e1d8d81e759fd8d1787af39c4b38d6681ee4b6405a970c18d583fa
DIST onig-6.6.1.tar.gz 943490 BLAKE2B
75771b5da78ac31e382ba964b9e881cb153b0ded89a5bc58b60783ca7fb7925e4bcbd8c8a1c02cf654accdfb4a079af6427d8731a6ca241d8aa86217835e892c
SHA512
ce9ac1336e2782fcfdac8cb4a257162f57dd8c2be20f74771a1ab9671b5926ea9c9fc07e2f4b04d80a2138a6e4c0e3295ac3f257e4424acf888e343870a377cc
DIST onig-6.7.0.tar.gz 952950 BLAKE2B
7ff45b04abe28caabf8c54e3dea4fb801c50fec9795bb39089a5be282d703c794c1eaa14433fe96b09ecd653275e8450e16ce410f0f53de63acd79cef36d3844
SHA512
21b10ff7cca8bdf057110927755cecf444415e308a8580427a4f661d58e678ef808a9e238066c54e664878739449fcf3de9e8348568e9dad2bfdda8d39b46a30
DIST onig-6.7.1.tar.gz 951650 BLAKE2B
475f6de4dca5579071777de9805a7676f8bf0ba0fff360a8231895882ce5535c80ee8f12bede3d1db17497efcc904c4653f4d15d559cf5ac180039563f0c14cd
SHA512
36ce29b639e8a15bacc3fcce835eea3ae5516fbefc250d0152493b86166f8f3b74ae4c807c609f6374cd8c401b434dd1682747be14b70da64386150d4e82badc
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 7003907f785..00000000000
--- 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 b256e0df581..00000000000
--- 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 <kos...@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 f5e0490ecfb..00000000000
--- 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 <kos...@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 580cc144679..00000000000
--- 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 <kos...@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 523455c97f3..00000000000
--- 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 <kos...@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 f2dbc55d59a..00000000000
--- 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 <kos...@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 cfc758d2a08..00000000000
--- 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 5661cea03b5..00000000000
--- 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
-
diff --git a/dev-libs/oniguruma/oniguruma-5.9.5.ebuild
b/dev-libs/oniguruma/oniguruma-5.9.5.ebuild
deleted file mode 100644
index 8b0019e6e59..00000000000
--- a/dev-libs/oniguruma/oniguruma-5.9.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-# Needed for a sane .so versionning on fbsd, please dont drop
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils autotools-multilib
-
-MY_P=onig-${PV}
-
-DESCRIPTION="a regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma";
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~x86-solaris"
-IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.9.3-makefile.patch )
-DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} )
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable combination-explosion-check)
- $(use_enable crnl-as-line-terminator)
- )
- autotools-multilib_src_configure
-}
-
-src_install() {
- autotools-multilib_src_install
- use static-libs || prune_libtool_files
-}
diff --git a/dev-libs/oniguruma/oniguruma-5.9.6_p1-r1.ebuild
b/dev-libs/oniguruma/oniguruma-5.9.6_p1-r1.ebuild
deleted file mode 100644
index 07a88e15b52..00000000000
--- a/dev-libs/oniguruma/oniguruma-5.9.6_p1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools ltprune multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="a regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma";
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz";
-
-LICENSE="BSD-2"
-SLOT="0/2" # sub-slot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~x86-solaris"
-IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P/_p1/}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.9.3-makefile.patch
- "${FILESDIR}"/${P/_p1/}-CVE-2017-9224.patch
- "${FILESDIR}"/${P/_p1/}-CVE-2017-9226.patch
- "${FILESDIR}"/${P/_p1/}-CVE-2017-9227.patch
- "${FILESDIR}"/${P/_p1/}-CVE-2017-9228.patch
- "${FILESDIR}"/${P/_p1/}-CVE-2017-9229.patch
-)
-DOCS=( AUTHORS HISTORY README{,.ja} doc/. )
-
-src_prepare() {
- default
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable combination-explosion-check) \
- $(use_enable crnl-as-line-terminator) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/dev-libs/oniguruma/oniguruma-6.4.0.ebuild
b/dev-libs/oniguruma/oniguruma-6.4.0.ebuild
deleted file mode 100644
index dec199e97dd..00000000000
--- a/dev-libs/oniguruma/oniguruma-6.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools ltprune multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="a regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma";
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz";
-
-LICENSE="BSD-2"
-SLOT="0/4" # sub-slot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~x86-solaris"
-IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-gentoo.patch
- "${FILESDIR}"/${PN}-combination-explosion-check.patch
-)
-DOCS=( AUTHORS HISTORY README{,.ja} doc/. )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable combination-explosion-check) \
- $(use_enable crnl-as-line-terminator) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
