Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
cd12de53ec | ||
|
|
09734ea47b | ||
|
|
4745242a41 | ||
|
|
a5e60efd08 |
16 changed files with 721 additions and 197 deletions
23
.gitignore
vendored
23
.gitignore
vendored
|
|
@ -1 +1,22 @@
|
|||
/onig-*.tar.gz
|
||||
onig-5.9.2.tar.gz
|
||||
/onig-5.9.3.tar.gz
|
||||
/onig-5.9.4.tar.gz
|
||||
/onig-5.9.5.tar.gz
|
||||
/onig-5.9.6.tar.gz
|
||||
/onig-6.0.0.tar.gz
|
||||
/onig-6.1.1.tar.gz
|
||||
/onig-6.1.2.tar.gz
|
||||
/onig-6.1.3.tar.gz
|
||||
/onig-6.2.0.tar.gz
|
||||
/onig-6.3.0.tar.gz
|
||||
/onig-6.4.0.tar.gz
|
||||
/onig-6.5.0.tar.gz
|
||||
/onig-6.6.1.tar.gz
|
||||
/onig-6.7.0.tar.gz
|
||||
/onig-6.7.1.tar.gz
|
||||
/onig-6.8.1.tar.gz
|
||||
/onig-6.8.2.tar.gz
|
||||
/onig-6.9.0.tar.gz
|
||||
/onig-6.9.1.tar.gz
|
||||
/onig-6.9.2-rc3.tar.gz
|
||||
/onig-6.9.2.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
From c509265c5f6ae7264f7b8a8aae1cfa5fc59d108c Mon Sep 17 00:00:00 2001
|
||||
From: "K.Kosako" <kosako@sofnec.co.jp>
|
||||
Date: Thu, 27 Jun 2019 14:11:55 +0900
|
||||
Subject: [PATCH 10/32] Fix CVE-2019-13225: problem in converting if-then-else
|
||||
pattern to bytecode.
|
||||
|
||||
---
|
||||
src/regcomp.c | 25 +++++++++++++++++--------
|
||||
1 file changed, 17 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/regcomp.c b/src/regcomp.c
|
||||
index c2c04a4..ff3431f 100644
|
||||
--- a/src/regcomp.c
|
||||
+++ b/src/regcomp.c
|
||||
@@ -1307,8 +1307,9 @@ compile_length_bag_node(BagNode* node, regex_t* reg)
|
||||
len += tlen;
|
||||
}
|
||||
|
||||
+ len += SIZE_OP_JUMP + SIZE_OP_ATOMIC_END;
|
||||
+
|
||||
if (IS_NOT_NULL(Else)) {
|
||||
- len += SIZE_OP_JUMP;
|
||||
tlen = compile_length_tree(Else, reg);
|
||||
if (tlen < 0) return tlen;
|
||||
len += tlen;
|
||||
@@ -1455,7 +1456,7 @@ compile_bag_node(BagNode* node, regex_t* reg, ScanEnv* env)
|
||||
|
||||
case BAG_IF_ELSE:
|
||||
{
|
||||
- int cond_len, then_len, jump_len;
|
||||
+ int cond_len, then_len, else_len, jump_len;
|
||||
Node* cond = NODE_BAG_BODY(node);
|
||||
Node* Then = node->te.Then;
|
||||
Node* Else = node->te.Else;
|
||||
@@ -1472,8 +1473,7 @@ compile_bag_node(BagNode* node, regex_t* reg, ScanEnv* env)
|
||||
else
|
||||
then_len = 0;
|
||||
|
||||
- jump_len = cond_len + then_len + SIZE_OP_ATOMIC_END;
|
||||
- if (IS_NOT_NULL(Else)) jump_len += SIZE_OP_JUMP;
|
||||
+ jump_len = cond_len + then_len + SIZE_OP_ATOMIC_END + SIZE_OP_JUMP;
|
||||
|
||||
r = add_op(reg, OP_PUSH);
|
||||
if (r != 0) return r;
|
||||
@@ -1490,11 +1490,20 @@ compile_bag_node(BagNode* node, regex_t* reg, ScanEnv* env)
|
||||
}
|
||||
|
||||
if (IS_NOT_NULL(Else)) {
|
||||
- int else_len = compile_length_tree(Else, reg);
|
||||
- r = add_op(reg, OP_JUMP);
|
||||
- if (r != 0) return r;
|
||||
- COP(reg)->jump.addr = else_len + SIZE_INC_OP;
|
||||
+ else_len = compile_length_tree(Else, reg);
|
||||
+ if (else_len < 0) return else_len;
|
||||
+ }
|
||||
+ else
|
||||
+ else_len = 0;
|
||||
|
||||
+ r = add_op(reg, OP_JUMP);
|
||||
+ if (r != 0) return r;
|
||||
+ COP(reg)->jump.addr = SIZE_OP_ATOMIC_END + else_len + SIZE_INC_OP;
|
||||
+
|
||||
+ r = add_op(reg, OP_ATOMIC_END);
|
||||
+ if (r != 0) return r;
|
||||
+
|
||||
+ if (IS_NOT_NULL(Else)) {
|
||||
r = compile_tree(Else, reg, env);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
From 0f7f61ed1b7b697e283e37bd2d731d0bd57adb55 Mon Sep 17 00:00:00 2001
|
||||
From: "K.Kosako" <kosako@sofnec.co.jp>
|
||||
Date: Thu, 27 Jun 2019 17:25:26 +0900
|
||||
Subject: [PATCH 11/32] Fix CVE-2019-13224: don't allow different encodings for
|
||||
onig_new_deluxe()
|
||||
|
||||
---
|
||||
src/regext.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/regext.c b/src/regext.c
|
||||
index fa4b360..965c793 100644
|
||||
--- a/src/regext.c
|
||||
+++ b/src/regext.c
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
#include "regint.h"
|
||||
|
||||
+#if 0
|
||||
static void
|
||||
conv_ext0be32(const UChar* s, const UChar* end, UChar* conv)
|
||||
{
|
||||
@@ -158,6 +159,7 @@ conv_encoding(OnigEncoding from, OnigEncoding to, const UChar* s, const UChar* e
|
||||
|
||||
return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION;
|
||||
}
|
||||
+#endif
|
||||
|
||||
extern int
|
||||
onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end,
|
||||
@@ -169,9 +171,7 @@ onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end,
|
||||
if (IS_NOT_NULL(einfo)) einfo->par = (UChar* )NULL;
|
||||
|
||||
if (ci->pattern_enc != ci->target_enc) {
|
||||
- r = conv_encoding(ci->pattern_enc, ci->target_enc, pattern, pattern_end,
|
||||
- &cpat, &cpat_end);
|
||||
- if (r != 0) return r;
|
||||
+ return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION;
|
||||
}
|
||||
else {
|
||||
cpat = (UChar* )pattern;
|
||||
--
|
||||
2.21.0
|
||||
|
||||
27
0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch
Normal file
27
0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
From 4a8db9d50f8281930678ed6f06692545293f3c9d Mon Sep 17 00:00:00 2001
|
||||
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
|
||||
Date: Fri, 12 Jul 2019 15:38:43 +0900
|
||||
Subject: [PATCH] onig_new_deluxe: don't free new pattern if success
|
||||
|
||||
On onig_new_deluxe() success (r == 0), new pattern (cpat) is used in
|
||||
einfo->pattern, so don't free this.
|
||||
---
|
||||
src/regext.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/regext.c b/src/regext.c
|
||||
index fa4b360..920d183 100644
|
||||
--- a/src/regext.c
|
||||
+++ b/src/regext.c
|
||||
@@ -196,7 +196,7 @@ onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end,
|
||||
}
|
||||
|
||||
err2:
|
||||
- if (cpat != pattern) xfree(cpat);
|
||||
+ if (r && (cpat != pattern)) xfree(cpat);
|
||||
|
||||
return r;
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
set -x
|
||||
|
||||
CURRENTDIR=$(pwd)
|
||||
PKGNAME=oniguruma
|
||||
TARNAME=onig
|
||||
|
||||
TMPDIR=$(mktemp -d /var/tmp/$PKGNAME-XXXXXX)
|
||||
pushd $TMPDIR
|
||||
|
||||
GITSCM=https://github.com/kkos/$PKGNAME.git
|
||||
|
||||
git clone $GITSCM
|
||||
pushd $PKGNAME
|
||||
|
||||
COMMIT=$(git log | head -n 1 | sed -e 's|^.*[ \t]||')
|
||||
SHORTCOMMIT=$(echo $COMMIT | cut -c-7)
|
||||
DATE=$(git show --format=%ci $COMMIT | head -n 1 | sed -e 's|[ \t].*$||')
|
||||
SHORTDATE=$(echo $DATE | sed -e 's|-||g')
|
||||
VERSION=$(cat configure.ac | grep AC_INIT | sed -n -e 's|^.*,[ \t]*\([0-9\.][0-9\.]*\).*$|\1|p')
|
||||
|
||||
git log --format=fuller | head -n 12
|
||||
|
||||
echo "VERSION=$VERSION"
|
||||
echo "COMMIT=$COMMIT"
|
||||
echo "DATE=$DATE"
|
||||
|
||||
echo
|
||||
popd
|
||||
|
||||
TARDIR=${TARNAME}-${VERSION}-${SHORTDATE}git${SHORTCOMMIT}
|
||||
ln -sf $PKGNAME $TARDIR
|
||||
tar czf ${TARDIR}.tar.gz ${TARDIR}/./
|
||||
|
||||
mv ${TARDIR}.tar.gz ${CURRENTDIR}/
|
||||
popd
|
||||
|
||||
rm -rf $TMPDIR
|
||||
|
||||
32
oniguruma-15c4228-bz1755880_2.patch
Normal file
32
oniguruma-15c4228-bz1755880_2.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
commit 15c4228aa2ffa02140a99912dd3177df0b1841c6
|
||||
Author: K.Kosako <kkosako0@gmail.com>
|
||||
Date: Fri Oct 4 19:54:40 2019 +0900
|
||||
|
||||
fix #156: Heap buffer overflow in match_at() with case-insensitive match
|
||||
|
||||
diff --git a/src/regcomp.c b/src/regcomp.c
|
||||
index cd379a2..52f6f01 100644
|
||||
--- a/src/regcomp.c
|
||||
+++ b/src/regcomp.c
|
||||
@@ -734,8 +734,8 @@ add_compile_string(UChar* s, int mb_len, int str_len,
|
||||
COP(reg)->exact_n.s = p;
|
||||
}
|
||||
else {
|
||||
+ xmemset(COP(reg)->exact.s, 0, sizeof(COP(reg)->exact.s));
|
||||
xmemcpy(COP(reg)->exact.s, s, (size_t )byte_len);
|
||||
- COP(reg)->exact.s[byte_len] = '\0';
|
||||
}
|
||||
|
||||
return 0;
|
||||
diff --git a/src/regexec.c b/src/regexec.c
|
||||
index e471491..4bcd8a9 100644
|
||||
--- a/src/regexec.c
|
||||
+++ b/src/regexec.c
|
||||
@@ -2889,6 +2889,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
|
||||
DATA_ENSURE(0);
|
||||
q = lowbuf;
|
||||
while (len-- > 0) {
|
||||
+ if (ps >= endp) goto fail;
|
||||
if (*ps != *q) goto fail;
|
||||
ps++; q++;
|
||||
}
|
||||
49
oniguruma-CVE-2019-16163.patch
Normal file
49
oniguruma-CVE-2019-16163.patch
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
commit 4097828d7cc87589864fecf452f2cd46c5f37180
|
||||
Author: K.Kosako <kosako@sofnec.co.jp>
|
||||
Date: Mon Jul 29 12:52:56 2019 +0900
|
||||
|
||||
fix #147: Stack Exhaustion Problem caused by some parsing functions in regcomp.c making recursive calls to themselves.
|
||||
|
||||
diff --git a/src/regparse.c b/src/regparse.c
|
||||
index 123d6cb..1a1ef6b 100644
|
||||
--- a/src/regparse.c
|
||||
+++ b/src/regparse.c
|
||||
@@ -6239,6 +6239,7 @@ parse_char_class(Node** np, PToken* tok, UChar** src, UChar* end, ScanEnv* env)
|
||||
env->parse_depth++;
|
||||
if (env->parse_depth > ParseDepthLimit)
|
||||
return ONIGERR_PARSE_DEPTH_LIMIT_OVER;
|
||||
+
|
||||
prev_cc = (CClassNode* )NULL;
|
||||
r = fetch_token_in_cc(tok, src, end, env);
|
||||
if (r == TK_CHAR && tok->u.c == '^' && tok->escaped == 0) {
|
||||
@@ -7820,14 +7821,18 @@ static int
|
||||
parse_exp(Node** np, PToken* tok, int term, UChar** src, UChar* end,
|
||||
ScanEnv* env, int group_head)
|
||||
{
|
||||
- int r, len, group = 0;
|
||||
+ int r, len, group;
|
||||
Node* qn;
|
||||
Node** tp;
|
||||
+ unsigned int parse_depth;
|
||||
|
||||
+ group = 0;
|
||||
*np = NULL;
|
||||
if (tok->type == (enum TokenSyms )term)
|
||||
goto end_of_token;
|
||||
|
||||
+ parse_depth = env->parse_depth;
|
||||
+
|
||||
switch (tok->type) {
|
||||
case TK_ALT:
|
||||
case TK_EOT:
|
||||
@@ -8145,6 +8150,10 @@ parse_exp(Node** np, PToken* tok, int term, UChar** src, UChar* end,
|
||||
if (is_invalid_quantifier_target(*tp))
|
||||
return ONIGERR_TARGET_OF_REPEAT_OPERATOR_INVALID;
|
||||
|
||||
+ parse_depth++;
|
||||
+ if (parse_depth > ParseDepthLimit)
|
||||
+ return ONIGERR_PARSE_DEPTH_LIMIT_OVER;
|
||||
+
|
||||
qn = node_new_quantifier(tok->u.repeat.lower, tok->u.repeat.upper,
|
||||
r == TK_INTERVAL);
|
||||
CHECK_NULL_RETURN_MEMERR(qn);
|
||||
52
oniguruma-CVE-2019-19012-2-backport.patch
Normal file
52
oniguruma-CVE-2019-19012-2-backport.patch
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
--- onig-6.9.2/src/regexec.c.CVE-2019-19012-2 2019-11-29 01:43:09.491168972 +0900
|
||||
+++ onig-6.9.2/src/regexec.c 2019-11-29 11:21:30.886372465 +0900
|
||||
@@ -4471,14 +4471,14 @@
|
||||
#endif
|
||||
|
||||
p = s;
|
||||
- if (reg->dmin > 0) {
|
||||
+ if (reg->dmin != 0) {
|
||||
+ if (end - p <= reg->dmin)
|
||||
+ return 0; /* fail */
|
||||
if (ONIGENC_IS_SINGLEBYTE(reg->enc)) {
|
||||
p += reg->dmin;
|
||||
}
|
||||
else {
|
||||
UChar *q = p + reg->dmin;
|
||||
-
|
||||
- if (q >= end) return 0; /* fail */
|
||||
while (p < q) p += enclen(reg->enc, p);
|
||||
}
|
||||
}
|
||||
@@ -4513,7 +4513,7 @@
|
||||
}
|
||||
|
||||
if (p && p < range) {
|
||||
- if (p - reg->dmin < s) {
|
||||
+ if (p - s < reg->dmin) {
|
||||
retry_gate:
|
||||
pprev = p;
|
||||
p += enclen(reg->enc, p);
|
||||
@@ -4561,6 +4561,7 @@
|
||||
*low_prev = onigenc_get_prev_char_head(reg->enc,
|
||||
(pprev ? pprev : str), p);
|
||||
}
|
||||
+ *high = p;
|
||||
}
|
||||
else {
|
||||
if (reg->dmax != INFINITE_LEN) {
|
||||
@@ -4585,9 +4586,12 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
+ /* no needs to adjust *high, *high is used as range check only */
|
||||
+ if (p - str < reg->dmin)
|
||||
+ *high = (UChar* )str;
|
||||
+ else
|
||||
+ *high = p - reg->dmin;
|
||||
}
|
||||
- /* no needs to adjust *high, *high is used as range check only */
|
||||
- *high = p - reg->dmin;
|
||||
|
||||
#ifdef ONIG_DEBUG_SEARCH
|
||||
fprintf(stderr,
|
||||
71
oniguruma-CVE-2019-19012-3-backport.patch
Normal file
71
oniguruma-CVE-2019-19012-3-backport.patch
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
--- onig-6.9.2/src/regexec.c.CVE-2019-19012-3 2019-11-29 11:26:09.207220372 +0900
|
||||
+++ onig-6.9.2/src/regexec.c 2019-11-29 11:43:32.583653353 +0900
|
||||
@@ -4612,9 +4612,6 @@ backward_search_range(regex_t* reg, cons
|
||||
{
|
||||
UChar *p;
|
||||
|
||||
- if (range == 0) goto fail;
|
||||
-
|
||||
- range += reg->dmin;
|
||||
p = s;
|
||||
|
||||
retry:
|
||||
@@ -4683,8 +4680,21 @@ backward_search_range(regex_t* reg, cons
|
||||
|
||||
/* no needs to adjust *high, *high is used as range check only */
|
||||
if (reg->dmax != INFINITE_LEN) {
|
||||
- *low = p - reg->dmax;
|
||||
- *high = p - reg->dmin;
|
||||
+ if (p - str < reg->dmax)
|
||||
+ *low = (UChar* )str;
|
||||
+ else
|
||||
+ *low = p - reg->dmax;
|
||||
+
|
||||
+ if (reg->dmin != 0) {
|
||||
+ if (p - str < reg->dmin)
|
||||
+ *high = (UChar* )str;
|
||||
+ else
|
||||
+ *high = p - reg->dmin;
|
||||
+ }
|
||||
+ else {
|
||||
+ *high = p;
|
||||
+ }
|
||||
+
|
||||
*high = onigenc_get_right_adjust_char_head(reg->enc, adjrange, *high);
|
||||
}
|
||||
|
||||
@@ -4972,18 +4982,24 @@ onig_search_with_param(regex_t* reg, con
|
||||
|
||||
if (reg->optimize != OPTIMIZE_NONE) {
|
||||
UChar *low, *high, *adjrange, *sch_start;
|
||||
+ const UChar *min_range;
|
||||
|
||||
if (range < end)
|
||||
adjrange = ONIGENC_LEFT_ADJUST_CHAR_HEAD(reg->enc, str, range);
|
||||
else
|
||||
adjrange = (UChar* )end;
|
||||
|
||||
+ if (end - range > reg->dmin)
|
||||
+ min_range = range + reg->dmin;
|
||||
+ else
|
||||
+ min_range = end;
|
||||
+
|
||||
if (reg->dmax != INFINITE_LEN &&
|
||||
(end - range) >= reg->threshold_len) {
|
||||
do {
|
||||
sch_start = s + reg->dmax;
|
||||
if (sch_start > end) sch_start = (UChar* )end;
|
||||
- if (backward_search_range(reg, str, end, sch_start, range, adjrange,
|
||||
+ if (backward_search_range(reg, str, end, sch_start, min_range, adjrange,
|
||||
&low, &high) <= 0)
|
||||
goto mismatch;
|
||||
|
||||
@@ -5013,7 +5029,7 @@ onig_search_with_param(regex_t* reg, con
|
||||
start, sch_start);
|
||||
}
|
||||
}
|
||||
- if (backward_search_range(reg, str, end, sch_start, range, adjrange,
|
||||
+ if (backward_search_range(reg, str, end, sch_start, min_range, adjrange,
|
||||
&low, &high) <= 0) goto mismatch;
|
||||
}
|
||||
}
|
||||
57
oniguruma-CVE-2019-19012-4-backport.patch
Normal file
57
oniguruma-CVE-2019-19012-4-backport.patch
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
--- onig-6.9.2/src/regexec.c.CVE-2019-19012-4 2019-11-29 12:00:47.015072189 +0900
|
||||
+++ onig-6.9.2/src/regexec.c 2019-11-29 12:32:23.232860721 +0900
|
||||
@@ -4911,15 +4911,19 @@ onig_search_with_param(regex_t* reg, con
|
||||
if (reg->optimize != OPTIMIZE_NONE) {
|
||||
UChar *sch_range, *low, *high, *low_prev;
|
||||
|
||||
- sch_range = (UChar* )range;
|
||||
if (reg->dmax != 0) {
|
||||
if (reg->dmax == INFINITE_LEN)
|
||||
sch_range = (UChar* )end;
|
||||
else {
|
||||
- sch_range += reg->dmax;
|
||||
- if (sch_range > end) sch_range = (UChar* )end;
|
||||
+ if (end - range < reg->dmax)
|
||||
+ sch_range = (UChar* )end;
|
||||
+ else {
|
||||
+ sch_range = (UChar* )range + reg->dmax;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
+ else
|
||||
+ sch_range = (UChar* )range;
|
||||
|
||||
if ((end - start) < reg->threshold_len)
|
||||
goto mismatch;
|
||||
@@ -4995,8 +4999,12 @@ onig_search_with_param(regex_t* reg, con
|
||||
if (reg->dmax != INFINITE_LEN &&
|
||||
(end - range) >= reg->threshold_len) {
|
||||
do {
|
||||
- sch_start = s + reg->dmax;
|
||||
- if (sch_start > end) sch_start = (UChar* )end;
|
||||
+ if (end - s > reg->dmax)
|
||||
+ sch_start = s + reg->dmax;
|
||||
+ else {
|
||||
+ sch_start = (UChar* )end;
|
||||
+ }
|
||||
+
|
||||
if (backward_search_range(reg, str, end, sch_start, min_range, adjrange,
|
||||
&low, &high) <= 0)
|
||||
goto mismatch;
|
||||
@@ -5020,11 +5028,13 @@ onig_search_with_param(regex_t* reg, con
|
||||
if (reg->dmax == INFINITE_LEN)
|
||||
sch_start = (UChar* )end;
|
||||
else {
|
||||
- sch_start += reg->dmax;
|
||||
- if (sch_start > end) sch_start = (UChar* )end;
|
||||
- else
|
||||
+ if (end - s < reg->dmax)
|
||||
+ sch_start = (UChar* )end;
|
||||
+ else {
|
||||
+ sch_start += reg->dmax;
|
||||
sch_start = ONIGENC_LEFT_ADJUST_CHAR_HEAD(reg->enc,
|
||||
start, sch_start);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
if (backward_search_range(reg, str, end, sch_start, min_range, adjrange,
|
||||
43
oniguruma-CVE-2019-19012-5-backport.patch
Normal file
43
oniguruma-CVE-2019-19012-5-backport.patch
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
--- onig-6.9.2/src/regexec.c.CVE-2019-19012-5 2019-11-29 12:32:23.232860721 +0900
|
||||
+++ onig-6.9.2/src/regexec.c 2019-11-29 13:32:24.401699168 +0900
|
||||
@@ -4824,13 +4824,16 @@ onig_search_with_param(regex_t* reg, con
|
||||
goto mismatch_no_msa;
|
||||
|
||||
if (range > start) {
|
||||
- if ((OnigLen )(min_semi_end - start) > reg->anchor_dmax) {
|
||||
+ if (min_semi_end - start > reg->anchor_dmax) {
|
||||
start = min_semi_end - reg->anchor_dmax;
|
||||
if (start < end)
|
||||
start = onigenc_get_right_adjust_char_head(reg->enc, str, start);
|
||||
}
|
||||
- if ((OnigLen )(max_semi_end - (range - 1)) < reg->anchor_dmin) {
|
||||
- range = max_semi_end - reg->anchor_dmin + 1;
|
||||
+ if (max_semi_end - (range - 1) < reg->anchor_dmin) {
|
||||
+ if (max_semi_end - str + 1 < reg->anchor_dmin)
|
||||
+ goto mismatch_no_msa;
|
||||
+ else
|
||||
+ range = max_semi_end - reg->anchor_dmin + 1;
|
||||
}
|
||||
|
||||
if (start > range) goto mismatch_no_msa;
|
||||
@@ -4838,12 +4841,16 @@ onig_search_with_param(regex_t* reg, con
|
||||
Backward search is used. */
|
||||
}
|
||||
else {
|
||||
- if ((OnigLen )(min_semi_end - range) > reg->anchor_dmax) {
|
||||
+ if (min_semi_end - range > reg->anchor_dmax) {
|
||||
range = min_semi_end - reg->anchor_dmax;
|
||||
}
|
||||
- if ((OnigLen )(max_semi_end - start) < reg->anchor_dmin) {
|
||||
- start = max_semi_end - reg->anchor_dmin;
|
||||
- start = ONIGENC_LEFT_ADJUST_CHAR_HEAD(reg->enc, str, start);
|
||||
+ if (max_semi_end - start < reg->anchor_dmin) {
|
||||
+ if (max_semi_end - str < reg->anchor_dmin)
|
||||
+ goto mismatch_no_msa;
|
||||
+ else {
|
||||
+ start = max_semi_end - reg->anchor_dmin;
|
||||
+ start = ONIGENC_LEFT_ADJUST_CHAR_HEAD(reg->enc, str, start);
|
||||
+ }
|
||||
}
|
||||
if (range > start) goto mismatch_no_msa;
|
||||
}
|
||||
126
oniguruma-CVE-2019-19203.patch
Normal file
126
oniguruma-CVE-2019-19203.patch
Normal file
|
|
@ -0,0 +1,126 @@
|
|||
From aa0188eaedc056dca8374ac03d0177429b495515 Mon Sep 17 00:00:00 2001
|
||||
From: "K.Kosako" <kosako@sofnec.co.jp>
|
||||
Date: Thu, 7 Nov 2019 14:13:55 +0900
|
||||
Subject: [PATCH] fix #163: heap-buffer-overflow in gb18030_mbc_enc_len
|
||||
|
||||
---
|
||||
src/gb18030.c | 16 +++++++++++++++-
|
||||
src/regparse.c | 32 ++++++++++++++++++++++----------
|
||||
2 files changed, 37 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/gb18030.c b/src/gb18030.c
|
||||
index ad5bf96..da6cfab 100644
|
||||
--- a/src/gb18030.c
|
||||
+++ b/src/gb18030.c
|
||||
@@ -75,6 +75,20 @@ gb18030_mbc_enc_len(const UChar* p)
|
||||
return 2;
|
||||
}
|
||||
|
||||
+static int
|
||||
+gb18030_code_to_mbclen(OnigCodePoint code)
|
||||
+{
|
||||
+ if ((code & 0xff000000) != 0) return 4;
|
||||
+ else if ((code & 0xff0000) != 0) return ONIGERR_INVALID_CODE_POINT_VALUE;
|
||||
+ else if ((code & 0xff00) != 0) return 2;
|
||||
+ else {
|
||||
+ if (GB18030_MAP[(int )(code & 0xff)] == CM)
|
||||
+ return ONIGERR_INVALID_CODE_POINT_VALUE;
|
||||
+
|
||||
+ return 1;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
static int
|
||||
is_valid_mbc_string(const UChar* p, const UChar* end)
|
||||
{
|
||||
@@ -513,7 +527,7 @@ OnigEncodingType OnigEncodingGB18030 = {
|
||||
1, /* min enc length */
|
||||
onigenc_is_mbc_newline_0x0a,
|
||||
gb18030_mbc_to_code,
|
||||
- onigenc_mb4_code_to_mbclen,
|
||||
+ gb18030_code_to_mbclen,
|
||||
gb18030_code_to_mbc,
|
||||
gb18030_mbc_case_fold,
|
||||
onigenc_ascii_apply_all_case_fold,
|
||||
diff --git a/src/regparse.c b/src/regparse.c
|
||||
index 70c36d5..5bf25e8 100644
|
||||
--- a/src/regparse.c
|
||||
+++ b/src/regparse.c
|
||||
@@ -5885,6 +5885,7 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, ScanEnv* env)
|
||||
|
||||
int c, r;
|
||||
int ascii_mode;
|
||||
+ int is_single;
|
||||
const OnigCodePoint *ranges;
|
||||
OnigCodePoint limit;
|
||||
OnigCodePoint sb_out;
|
||||
@@ -5906,6 +5907,7 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, ScanEnv* env)
|
||||
}
|
||||
|
||||
r = 0;
|
||||
+ is_single = ONIGENC_IS_SINGLEBYTE(enc);
|
||||
limit = ascii_mode ? ASCII_LIMIT : SINGLE_BYTE_SIZE;
|
||||
|
||||
switch (ctype) {
|
||||
@@ -5922,19 +5924,25 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, ScanEnv* env)
|
||||
case ONIGENC_CTYPE_ALNUM:
|
||||
if (not != 0) {
|
||||
for (c = 0; c < (int )limit; c++) {
|
||||
- if (! ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
|
||||
- BITSET_SET_BIT(cc->bs, c);
|
||||
+ if (is_single != 0 || ONIGENC_CODE_TO_MBCLEN(enc, c) == 1) {
|
||||
+ if (! ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
|
||||
+ BITSET_SET_BIT(cc->bs, c);
|
||||
+ }
|
||||
}
|
||||
for (c = limit; c < SINGLE_BYTE_SIZE; c++) {
|
||||
- BITSET_SET_BIT(cc->bs, c);
|
||||
+ if (is_single != 0 || ONIGENC_CODE_TO_MBCLEN(enc, c) == 1)
|
||||
+ BITSET_SET_BIT(cc->bs, c);
|
||||
}
|
||||
|
||||
- ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
|
||||
+ if (is_single == 0)
|
||||
+ ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
|
||||
}
|
||||
else {
|
||||
for (c = 0; c < (int )limit; c++) {
|
||||
- if (ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
|
||||
- BITSET_SET_BIT(cc->bs, c);
|
||||
+ if (is_single != 0 || ONIGENC_CODE_TO_MBCLEN(enc, c) == 1) {
|
||||
+ if (ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
|
||||
+ BITSET_SET_BIT(cc->bs, c);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -5944,21 +5952,25 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, ScanEnv* env)
|
||||
case ONIGENC_CTYPE_WORD:
|
||||
if (not != 0) {
|
||||
for (c = 0; c < (int )limit; c++) {
|
||||
- if (ONIGENC_CODE_TO_MBCLEN(enc, c) > 0 /* check invalid code point */
|
||||
+ /* check invalid code point */
|
||||
+ if ((is_single != 0 || ONIGENC_CODE_TO_MBCLEN(enc, c) == 1)
|
||||
&& ! ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
|
||||
BITSET_SET_BIT(cc->bs, c);
|
||||
}
|
||||
for (c = limit; c < SINGLE_BYTE_SIZE; c++) {
|
||||
- if (ONIGENC_CODE_TO_MBCLEN(enc, c) > 0)
|
||||
+ if (is_single != 0 || ONIGENC_CODE_TO_MBCLEN(enc, c) == 1)
|
||||
BITSET_SET_BIT(cc->bs, c);
|
||||
}
|
||||
+ if (ascii_mode != 0 && is_single == 0)
|
||||
+ ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
|
||||
}
|
||||
else {
|
||||
for (c = 0; c < (int )limit; c++) {
|
||||
- if (ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
|
||||
+ if ((is_single != 0 || ONIGENC_CODE_TO_MBCLEN(enc, c) == 1)
|
||||
+ && ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
|
||||
BITSET_SET_BIT(cc->bs, c);
|
||||
}
|
||||
- if (ascii_mode == 0)
|
||||
+ if (ascii_mode == 0 && is_single == 0)
|
||||
ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
|
||||
}
|
||||
break;
|
||||
23
oniguruma-CVE-2019-19204.patch
Normal file
23
oniguruma-CVE-2019-19204.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
From 6eb4aca6a7f2f60f473580576d86686ed6a6ebec Mon Sep 17 00:00:00 2001
|
||||
From: "K.Kosako" <kosako@sofnec.co.jp>
|
||||
Date: Wed, 6 Nov 2019 17:32:29 +0900
|
||||
Subject: [PATCH] fix #162: heap-buffer-overflow in fetch_interval_quantifier
|
||||
due to double PFETCH
|
||||
|
||||
---
|
||||
src/regparse.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/regparse.c b/src/regparse.c
|
||||
index 324c414..70c36d5 100644
|
||||
--- a/src/regparse.c
|
||||
+++ b/src/regparse.c
|
||||
@@ -4178,7 +4178,7 @@ fetch_interval_quantifier(UChar** src, UChar* end, PToken* tok, ScanEnv* env)
|
||||
if (PEND) goto invalid;
|
||||
PFETCH(c);
|
||||
if (IS_SYNTAX_OP(env->syntax, ONIG_SYN_OP_ESC_BRACE_INTERVAL)) {
|
||||
- if (c != MC_ESC(env->syntax)) goto invalid;
|
||||
+ if (c != MC_ESC(env->syntax) || PEND) goto invalid;
|
||||
PFETCH(c);
|
||||
}
|
||||
if (c != '}') goto invalid;
|
||||
18
oniguruma-d3e4029-bz1755880.patch
Normal file
18
oniguruma-d3e4029-bz1755880.patch
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
commit d3e402928b6eb3327f8f7d59a9edfa622fec557b
|
||||
Author: K.Kosako <kosako@sofnec.co.jp>
|
||||
Date: Tue Aug 13 13:37:30 2019 +0900
|
||||
|
||||
fix heap-buffer-overflow
|
||||
|
||||
diff --git a/src/regexec.c b/src/regexec.c
|
||||
index 0753b07..634ee42 100644
|
||||
--- 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, &p, end, lowbuf);
|
||||
q = lowbuf;
|
||||
while (lowlen > 0) {
|
||||
+ if (t >= tend) return 0;
|
||||
if (*t++ != *q++) return 0;
|
||||
lowlen--;
|
||||
}
|
||||
238
oniguruma.spec
238
oniguruma.spec
|
|
@ -1,45 +1,55 @@
|
|||
%undefine _changelog_trimtime
|
||||
|
||||
%global git_snapshot 0
|
||||
%global mainver 6.9.2
|
||||
#%%global betaver rc3
|
||||
|
||||
%if 0%{?git_snapshot}
|
||||
%define apply_git_patch git am
|
||||
%else
|
||||
%define apply_git_patch patch -p1
|
||||
%endif
|
||||
|
||||
%if 0%{?git_snapshot}
|
||||
%global gitdate 20230501
|
||||
%global gitcommit 41a3b802af2155eef6d648aa3608e39605110642
|
||||
%global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
|
||||
|
||||
%global gitversion %{gitdate}git%{shortcommit}
|
||||
%endif
|
||||
|
||||
%global mainver 6.9.10
|
||||
#%%global postver 1
|
||||
#%%global betaver rc4
|
||||
#%%define prerelease 1
|
||||
|
||||
%global baserelease 3
|
||||
%global fedorarel 4
|
||||
|
||||
Name: oniguruma
|
||||
Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}}
|
||||
Release: %{?prerelease:0.}%{baserelease}%{?dist}
|
||||
Version: %{mainver}
|
||||
Release: %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}
|
||||
Summary: Regular expressions library
|
||||
|
||||
# SPDX confirmed
|
||||
License: BSD-2-Clause
|
||||
License: BSD
|
||||
URL: https://github.com/kkos/oniguruma/
|
||||
Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?postver:.%postver}%{?betaver:-%betaver}%{?gitversion:-%{?gitversion}}.tar.gz
|
||||
Source1: create-tarball-from-git.sh
|
||||
Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?betaver:-%betaver}.tar.gz
|
||||
# upstream patches
|
||||
# #1728966 CVE-2019-13225
|
||||
Patch10: 0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch
|
||||
# #1768997 CVE-2019-16163
|
||||
Patch12: oniguruma-CVE-2019-16163.patch
|
||||
# #1755880 d3e402928b6eb3327f8f7d59a9edfa622fec557b
|
||||
# #1777537 This one is assigned as CVE-2019-19246
|
||||
Patch13: oniguruma-d3e4029-bz1755880.patch
|
||||
# #1755880 15c4228aa2ffa02140a99912dd3177df0b1841c6
|
||||
Patch14: oniguruma-15c4228-bz1755880_2.patch
|
||||
# https://github.com/kkos/oniguruma/issues/162
|
||||
Patch15: oniguruma-CVE-2019-19204.patch
|
||||
# https://github.com/kkos/oniguruma/issues/163
|
||||
Patch16: oniguruma-CVE-2019-19203.patch
|
||||
# https://github.com/kkos/oniguruma/issues/164
|
||||
# Modified, the upstream commit does not apply cleanly
|
||||
# because variable name, etc changed.
|
||||
# Patch21: oniguruma-CVE-2019-19012-1.patch
|
||||
# Patch21: not needed, no correspoinding code in 6.9.2,
|
||||
# note that the similar lines appears in Patch24
|
||||
Patch22: oniguruma-CVE-2019-19012-2-backport.patch
|
||||
Patch23: oniguruma-CVE-2019-19012-3-backport.patch
|
||||
Patch24: oniguruma-CVE-2019-19012-4-backport.patch
|
||||
Patch25: oniguruma-CVE-2019-19012-5-backport.patch
|
||||
# #1728971 CVE-2019-13224
|
||||
#Patch11: 0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch
|
||||
# Not use Patch11 for F-30 and below, this is almost API change (deprecation of API) in
|
||||
# onig_new_deluxe() and this change should be avoided (if possible) in stable
|
||||
# branch
|
||||
# Instead use another fix
|
||||
Patch101: 0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch
|
||||
|
||||
# Just note
|
||||
# #1769042 CVE-2019-16161 - This is for onigumo, and oniguruma is not affected
|
||||
# (I guess - mtasaka)
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
%if 0%{?git_snapshot}
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
%endif
|
||||
|
||||
%description
|
||||
Oniguruma is a regular expressions library.
|
||||
|
|
@ -58,30 +68,50 @@ developing applications that use %{name}.
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q -n onig-%{mainver}%{?gitversion:-%{?gitversion}}
|
||||
%setup -q -n onig-%{mainver}
|
||||
%{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in
|
||||
|
||||
%build
|
||||
# This package fails its testsuite when compiled with LTO, but the real problem
|
||||
# is that it ends up mixing and matching regexp bits between itself and glibc.
|
||||
# Disable LTO
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
%if 0%{?git_snapshot}
|
||||
autoreconf -fi
|
||||
%if 0
|
||||
for f in \
|
||||
README.ja \
|
||||
doc/API.ja \
|
||||
doc/FAQ.ja \
|
||||
doc/RE.ja
|
||||
do
|
||||
iconv -f EUC-JP -t UTF-8 $f > $f.tmp && \
|
||||
( touch -r $f $f.tmp ; %{__mv} -f $f.tmp $f ) || \
|
||||
%{__rm} -f $f.tmp
|
||||
done
|
||||
%endif
|
||||
|
||||
%patch10 -p1 -b .CVE-2019-13225
|
||||
#%%patch11 -p1 -b .CVE-2019-13224
|
||||
%patch101 -p1 -b .CVE-2019-13224
|
||||
%patch12 -p1 -b .CVE-2019-16163
|
||||
%patch13 -p1 -b .bz1755880_1.CVE-2019-19246
|
||||
%patch14 -p1 -b .bz1755880_2
|
||||
%patch15 -p1 -b .CVE-2019-19204
|
||||
%patch16 -p1 -b .CVE-2019-19203
|
||||
#%patch21 -p1 -b .CVE-2019-19012-1 # Not needed
|
||||
%patch22 -p1 -b .CVE-2019-19012-2
|
||||
%patch23 -p1 -b .CVE-2019-19012-3
|
||||
%patch24 -p1 -b .CVE-2019-19012-4
|
||||
%patch25 -p1 -b .CVE-2019-19012-5
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--enable-posix-api \
|
||||
--enable-binary-compatible-posix-api \
|
||||
--disable-silent-rules \
|
||||
--disable-static \
|
||||
--with-rubydir=%{_bindir} \
|
||||
%{nil}
|
||||
%make_build
|
||||
--with-rubydir=%{_bindir}
|
||||
%{__make} %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%{__make} install \
|
||||
DESTDIR=$RPM_BUILD_ROOT \
|
||||
INSTALL="%{__install} -c -p"
|
||||
find $RPM_BUILD_ROOT -name '*.la' \
|
||||
-exec %{__rm} -f {} ';'
|
||||
|
||||
%check
|
||||
%{__make} check
|
||||
|
|
@ -120,116 +150,16 @@ autoreconf -fi
|
|||
|
||||
%{_libdir}/libonig.so
|
||||
%{_includedir}/onig*.h
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
|
||||
%changelog
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.10-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
* Fri Nov 29 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.2-4
|
||||
- Address CVE-2019-19204 CVE-2019-19203 CVE-2019-19012
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.10-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Jan 01 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.10-1
|
||||
- 6.9.10
|
||||
|
||||
* Mon Nov 18 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.9-5
|
||||
- Apply upstream patch for C23 compliance
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.9-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.9-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Tue Oct 17 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.9-1
|
||||
- 6.9.9
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.8^20230501git41a3b80-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat May 6 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.8^20230501git41a3b80-1
|
||||
- Update to the latest git
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.8-2.D20220919gitb041f6d.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Fri Sep 23 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.8-2.D20220919gitb041f6d
|
||||
- Update to the latest git, expecially:
|
||||
- Update to Unicode 15.0 (upstream #272)
|
||||
- [[:punct:]] behavoir change (upsteam #268)
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.8-1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Apr 30 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.8-1
|
||||
- 6.9.8
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.7.1-1.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.7.1-1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Sat May 1 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.7.1-1
|
||||
- 6.9.7.1
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.6-1.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Nov 5 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.6-1
|
||||
- 6.9.6
|
||||
|
||||
* Wed Oct 21 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.6-0.4.rc4
|
||||
- 6.9.6 rc4
|
||||
|
||||
* Tue Oct 20 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.6-0.3.rc3
|
||||
- Apply upstream patch for upstream bug 221
|
||||
- Revert change for false CVE-2020-26159 issue
|
||||
https://github.com/kkos/oniguruma/issues/221
|
||||
|
||||
* Sat Oct 17 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.6-0.2.rc3
|
||||
- 6.9.6 rc3
|
||||
|
||||
* Mon Oct 12 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.6-0.1.rc2
|
||||
- 6.9.6 rc2
|
||||
- Apply upstream patch to keep binary compatibility with 6.9.5
|
||||
|
||||
* Thu Oct 1 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.5-3.rev1
|
||||
- Apply upstream fix for CVE-2020-26159
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.5-2.rev1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 6.9.5-2.rev1.1
|
||||
- Use make macros
|
||||
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||
|
||||
* Wed Jul 1 2020 Jeff Law <law@redhat.com> - 6.9.5-2.rev1
|
||||
- Disable LTO
|
||||
|
||||
* Thu May 7 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.5-1.rev1
|
||||
- 6.9.5 revised 1
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.4-1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Nov 29 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.4-1
|
||||
- 6.9.4 final
|
||||
|
||||
* Fri Nov 29 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.4-0.2.rc3
|
||||
- 6.9.4 rc3 (CVE-2019-19204 CVE-2019-19203 CVE-2019-19012)
|
||||
|
||||
* Sat Nov 9 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.4-0.1.rc1
|
||||
- 6.9.4 rc1 (CVE-2019-19246)
|
||||
|
||||
* Sun Aug 11 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.3-1
|
||||
- 6.9.3 (CVE-2019-13224 CVE-2019-13225 CVE-2019-16163)
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.2-2.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
* Mon Nov 11 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.2-3
|
||||
- Upstream patch for CVE-2019-16163 (#1768997)
|
||||
- Another fix backports out of request from PHP maintainer (#1728971)
|
||||
(One of them is now assigned as CVE-2019-19246)
|
||||
|
||||
* Fri Jul 12 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.2-2
|
||||
- Upstream patch for CVE-2019-13225 (#1728966)
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (onig-6.9.10.tar.gz) = f7cf33008ca0181322fb8efc8e6bb67a1f81677095a33d88134781b804e6a9fbf675f05789d762fdd3d9f0171f8dc4c2e960c2b6a09ddd03bfd35a5ab0920317
|
||||
SHA512 (onig-6.9.2.tar.gz) = c10134e42a3c0b0eeae2027ffb7a3e1bcc9228dee286f6b6e997f8a73d717217fa74de0e19c40975d2e78044c8c4f029eb622f90c8eb4fdc4667eb4804e97001
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue