[gentoo-commits] repo/gentoo:master commit in: dev-libs/oniguruma/, dev-libs/oniguruma/files/
commit: 8a8ed80f11dead7902737ecc602920771c8ed752 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Sep 26 13:19:49 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Sep 26 13:19:49 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a8ed80f dev-libs/oniguruma: fix heap buffer overflow Link: https://bugs.php.net/bug.php?id=78559 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> ...a-6.9.3-fix-heap-buffer-overflow-php78559.patch | 13 + dev-libs/oniguruma/oniguruma-6.9.3-r1.ebuild | 34 ++ 2 files changed, 47 insertions(+) diff --git a/dev-libs/oniguruma/files/oniguruma-6.9.3-fix-heap-buffer-overflow-php78559.patch b/dev-libs/oniguruma/files/oniguruma-6.9.3-fix-heap-buffer-overflow-php78559.patch new file mode 100644 index 000..7d538874665 --- /dev/null +++ b/dev-libs/oniguruma/files/oniguruma-6.9.3-fix-heap-buffer-overflow-php78559.patch @@ -0,0 +1,13 @@ +https://bugs.php.net/bug.php?id=78559 +https://github.com/kkos/oniguruma/commit/d3e402928b6eb3327f8f7d59a9edfa622fec557b + +--- a/src/regexec.c b/src/regexec.c +@@ -4196,6 +4196,7 @@ str_lower_case_match(OnigEncoding enc, int case_fold_flag, + lowlen = ONIGENC_MBC_CASE_FOLD(enc, case_fold_flag, , end, lowbuf); + q = lowbuf; + while (lowlen > 0) { ++ if (t >= tend)return 0; + if (*t++ != *q++) return 0; + lowlen--; + } diff --git a/dev-libs/oniguruma/oniguruma-6.9.3-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.3-r1.ebuild new file mode 100644 index 000..2b0d346fc44 --- /dev/null +++ b/dev-libs/oniguruma/oniguruma-6.9.3-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 2003-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit multilib-minimal + +MY_P="onig-${PV}" + +DESCRIPTION="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/5" +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="crnl-as-line-terminator static-libs" + +PATCHES=( "${FILESDIR}"/${PN}-6.9.3-fix-heap-buffer-overflow-php78559.patch ) + +S="${WORKDIR}/${MY_P}" + +DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES}) + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable crnl-as-line-terminator) \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name "*.la" -type f -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/oniguruma/, dev-libs/oniguruma/files/
commit: e9f9127443bd950b9ea3c3140f3dd0808eaf0691 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Wed Jun 13 08:25:05 2018 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Jun 13 14:36:21 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9f91274 dev-libs/oniguruma: Delete old versions (<6.7.1). dev-libs/oniguruma/Manifest| 2 -- .../oniguruma/files/oniguruma-6.6.1-build.patch| 25 - dev-libs/oniguruma/oniguruma-6.6.1.ebuild | 42 -- dev-libs/oniguruma/oniguruma-6.7.0.ebuild | 33 - 4 files changed, 102 deletions(-) diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest index f1f35cc3702..b3814ed7f84 100644 --- a/dev-libs/oniguruma/Manifest +++ b/dev-libs/oniguruma/Manifest @@ -1,5 +1,3 @@ -DIST onig-6.6.1.tar.gz 943490 BLAKE2B 75771b5da78ac31e382ba964b9e881cb153b0ded89a5bc58b60783ca7fb7925e4bcbd8c8a1c02cf654accdfb4a079af6427d8731a6ca241d8aa86217835e892c SHA512 ce9ac1336e2782fcfdac8cb4a257162f57dd8c2be20f74771a1ab9671b5926ea9c9fc07e2f4b04d80a2138a6e4c0e3295ac3f257e4424acf888e343870a377cc -DIST onig-6.7.0.tar.gz 952950 BLAKE2B 7ff45b04abe28caabf8c54e3dea4fb801c50fec9795bb39089a5be282d703c794c1eaa14433fe96b09ecd653275e8450e16ce410f0f53de63acd79cef36d3844 SHA512 21b10ff7cca8bdf057110927755cecf15e308a8580427a4f661d58e678ef808a9e238066c54e664878739449fcf3de9e8348568e9dad2bfdda8d39b46a30 DIST onig-6.7.1.tar.gz 951650 BLAKE2B 475f6de4dca5579071777de9805a7676f8bf0ba0fff360a8231895882ce5535c80ee8f12bede3d1db17497efcc904c4653f4d15d559cf5ac180039563f0c14cd SHA512 36ce29b639e8a15bacc3fcce835eea3ae5516fbefc250d0152493b86166f8f3b74ae4c807c609f6374cd8c401b434dd1682747be14b70da64386150d4e82badc DIST onig-6.8.1.tar.gz 973837 BLAKE2B 5ccbd8b428dcb0775e745857cb1ee678cb2e42c1b9044ac80703ea0ca602aeaa7ab86f70b9835c2042a2b48a65531c355d1f32ba22294403dc5a3f3ce895 SHA512 50005d7bccdfd5090181781c942e7814eb82ef1652453ce4bdf7f4e763344c87af84fb06c5240494d3774568913cbfc3b158e0a69edfbc1283eaeb7842dc0631 DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596 diff --git a/dev-libs/oniguruma/files/oniguruma-6.6.1-build.patch b/dev-libs/oniguruma/files/oniguruma-6.6.1-build.patch deleted file mode 100644 index 452347c90ba..000 --- a/dev-libs/oniguruma/files/oniguruma-6.6.1-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/kkos/oniguruma/issues/68 -https://github.com/kkos/oniguruma/commit/1337755c2758a62057ef95f1cff1b9466f533301 - /sample/Makefile.am -+++ /sample/Makefile.am -@@ -4,7 +4,7 @@ - LDADD = $(lib_onig) - - AM_LDFLAGS = -L$(prefix)/lib --AM_CPPFLAGS = -I../src -I$(includedir) -+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir) - - TESTS = encode listcap names posix simple sql syntax user_property bug_fix - /test/Makefile.am -+++ /test/Makefile.am -@@ -3,7 +3,7 @@ - - AM_LDFLAGS = -L$(prefix)/lib - AM_CFLAGS = --AM_CPPFLAGS = -I../src -I$(includedir) -+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir) - - TESTS = test_utf8 testc testp testcu - diff --git a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild b/dev-libs/oniguruma/oniguruma-6.6.1.ebuild deleted file mode 100644 index 40d5fd7170d..000 --- a/dev-libs/oniguruma/oniguruma-6.6.1.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 multilib-minimal - -MY_P="onig-${PV}" - -DESCRIPTION="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" -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}/${P}-build.patch" -) - -DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES) - -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 - find "${D}" -name "*.la" -delete || die -} diff --git a/dev-libs/oniguruma/oniguruma-6.7.0.ebuild b/dev-libs/oniguruma/oniguruma-6.7.0.ebuild deleted file mode 100644 index d040e1b6cb1..000 ---
[gentoo-commits] repo/gentoo:master commit in: dev-libs/oniguruma/, dev-libs/oniguruma/files/
commit: 28d415d0c3fc62cce6c5395c2c3a99199361a53a Author: Akinori Hattori gentoo org> AuthorDate: Thu Jul 20 15:35:09 2017 + Commit: Akinori Hattori gentoo org> CommitDate: Thu Jul 20 15:35:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28d415d0 dev-libs/oniguruma: fix CVE-2017-9224, CVE-2017-9226, CVE-2017-9227, CVE-2017-9228, and CVE-2017-9229 Gentoo-Bug: 624060 Package-Manager: Portage-2.3.6, Repoman-2.3.1 .../files/oniguruma-5.9.6-CVE-2017-9224.patch | 22 ++ .../files/oniguruma-5.9.6-CVE-2017-9226.patch | 20 + .../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 dev-libs/oniguruma/metadata.xml| 12 +++--- dev-libs/oniguruma/oniguruma-5.9.6_p1-r1.ebuild| 47 ++ 7 files changed, 172 insertions(+), 6 deletions(-) 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 new file mode 100644 index 000..b256e0df581 --- /dev/null +++ b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9224.patch @@ -0,0 +1,22 @@ +https://github.com/kkos/oniguruma/issues/57 +https://github.com/kkos/oniguruma/commit/690313a061f7a4fa614ec5cc8368b4f2284e059b + +Author: K.Kosako+ +--- 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 new file mode 100644 index 000..f28d5552e3a --- /dev/null +++ b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9226.patch @@ -0,0 +1,20 @@ +https://github.com/kkos/oniguruma/issues/55 +https://github.com/kkos/oniguruma/commit/b4bf968ad52afe14e60a2dc8a95d3555c543353a + +Author: K.Kosako + +--- a/regparse.c b/regparse.c +@@ -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 new file mode 100644 index 000..580cc144679 --- /dev/null +++ b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9227.patch @@ -0,0 +1,16 @@ +https://github.com/kkos/oniguruma/issues/58 +https://github.com/kkos/oniguruma/commit/9690d3ab1f9bcd2db8cbe1fe3ee4a5da606b8814 + +Author: K.Kosako + +--- 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 new file mode 100644 index 000..523455c97f3 --- /dev/null +++ b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9228.patch @@ -0,0 +1,18 @@ +https://github.com/kkos/oniguruma/issues/60 +https://github.com/kkos/oniguruma/commit/3b63d12038c8d8fc278e81c942fa9bec7c704c8b + +Author: K.Kosako + +--- 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 new file mode 100644 index 000..f2dbc55d59a --- /dev/null +++ b/dev-libs/oniguruma/files/oniguruma-5.9.6-CVE-2017-9229.patch @@ -0,0 +1,43 @@ +https://github.com/kkos/oniguruma/issues/59 +https://github.com/kkos/oniguruma/commit/b690371bbf97794b4a1d3f295d4fb9a8b05d402d + +Author: K.Kosako + +--- 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); ++
[gentoo-commits] repo/gentoo:master commit in: dev-libs/oniguruma/, dev-libs/oniguruma/files/
commit: fe107052fb2aea50a0406a9fa39bbc0900e6926a Author: Patrice Clement gentoo org> AuthorDate: Thu Sep 8 08:24:18 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Sep 8 08:27:31 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe107052 dev-libs/oniguruma: Clean up old versions. Package-Manager: portage-2.2.28 dev-libs/oniguruma/Manifest| 3 -- .../oniguruma/files/oniguruma-5.9.2-makefile.patch | 42 -- dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild | 38 dev-libs/oniguruma/oniguruma-5.9.2.ebuild | 30 dev-libs/oniguruma/oniguruma-5.9.3.ebuild | 38 dev-libs/oniguruma/oniguruma-5.9.4.ebuild | 38 6 files changed, 189 deletions(-) diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest index 7692eeb..fa4dc56 100644 --- a/dev-libs/oniguruma/Manifest +++ b/dev-libs/oniguruma/Manifest @@ -1,4 +1 @@ -DIST onig-5.9.2.tar.gz 539739 SHA256 10e7b04ca0baaef2c26f32b37bb70d898b3642d38aefd5ad5062a20f86b751f6 SHA512 fedc9ed663e9970c1f44647431085093f792af1273d5fd25713545e6770652f959a78fb059e44ec348f201f40b2aaa9ef8d081721842f4fa7c486def2a73a8e7 WHIRLPOOL 4fcdd5fcde4ab670b2e7e672b2187a488d698fd6172f9b0c1b237d680dc5cfecac4e9262d7b78e32eb782596cdf92a13f554b45ee5566eabf39349c1c7d8884b -DIST onig-5.9.3.tar.gz 566875 SHA256 c3bba66b2a84760e6582c40881db97c839d94f327870009724bb8b4d0c051f2a SHA512 d673fbd12af78bbe36984eff2aab5e0c043a663f2fca248f7accc0e9d2c86144b5e9635c542ea6311574d680d628893128615dedc32adcbe62ac427f1ead2870 WHIRLPOOL 5b6bd7c5ff0e2b586af776d94351abe8c5203d40a37138386df19eb3877e3940708c0b272f0c3d88361ce26579bd1e25ee7c30f0af92f69a185503f2f06a -DIST onig-5.9.4.tar.gz 567985 SHA256 988221911ff865941a859096c39a532df77418cb6df513857428a41605130697 SHA512 d1a8492925c5f873a8bd8cd5b1a3da2c78392ca7160eeadb9c53cf08e0e6dcedf75f95c748595888d727395cd9226a784cdf38ef5d64665a3c4b27e45da84cb6 WHIRLPOOL 9dd36b4bc4408360baeac39ad9c7ee3f4e231dd9ca57ffc5d07598a7ad5d2f9b03ca37d63399aa78ef55c0264453f83cb82155c2d2e09d3c8804f4e6954f763f DIST onig-5.9.5.tar.gz 587874 SHA256 9f49ae7819a5f47e25449d0e4b010d479f7868a24a7b9884b47041b49a76438a SHA512 3ba3c94c5e52c80c680ebf1d19be53fa5a94a11d622e0282184c7a9c8cc6676f1926b97d12aafc66514071e65cd7de2bd4632afb053c69b01ddb8b581e878252 WHIRLPOOL 4f8a52fc682c15a96660049159e98ddd9f68170e2cba3948f73f3105a266bce8b4c42329b4dc0d6f94472fd9139bbd9a8ebbf3f7351a95c868e78999ce276ece diff --git a/dev-libs/oniguruma/files/oniguruma-5.9.2-makefile.patch b/dev-libs/oniguruma/files/oniguruma-5.9.2-makefile.patch deleted file mode 100644 index bd594e3.. --- a/dev-libs/oniguruma/files/oniguruma-5.9.2-makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ Makefile.am.orig 2012-08-08 10:29:20.313862377 +0100 -+++ Makefile.am2012-08-08 10:29:30.793762591 +0100 -@@ -5,7 +5,7 @@ - - #AM_CFLAGS = -DNOT_RUBY - AM_CFLAGS = --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - SUBDIRS = . sample - sample/Makefile.am.orig2012-08-08 11:37:49.813512228 +0100 -+++ sample/Makefile.am 2012-08-08 11:38:00.289410756 +0100 -@@ -2,7 +2,7 @@ - - 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 configure.in.orig -+++ configure.in -@@ -23,7 +23,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 - -@@ -31,7 +31,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 - diff --git a/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild b/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild deleted file mode 100644 index 2cfa75a.. --- a/dev-libs/oniguruma/oniguruma-5.9.2-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -# Needed for a sane .so versionning on fbsd, please dont drop -AUTOTOOLS_AUTORECONF=1 - -inherit eutils autotools-utils - -MY_P=onig-${PV} - -DESCRIPTION="a regular expression library for different character encodings" -HOMEPAGE="http://www.geocities.jp/kosako3/oniguruma; -SRC_URI="http://www.geocities.jp/kosako3/oniguruma/archive/${MY_P}.tar.gz; - -LICENSE="BSD-2"