Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
648b1c4763 | ||
|
|
31ddb4bfb4 |
13 changed files with 392 additions and 281 deletions
10
.gitignore
vendored
10
.gitignore
vendored
|
|
@ -1 +1,9 @@
|
|||
/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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
From b4bf968ad52afe14e60a2dc8a95d3555c543353a Mon Sep 17 00:00:00 2001
|
||||
From: "K.Kosako" <kosako@sofnec.co.jp>
|
||||
Date: Thu, 18 May 2017 17:05:27 +0900
|
||||
Subject: [PATCH 04/25] fix #55 : check too big code point value for single
|
||||
byte value in next_state_val()
|
||||
|
||||
---
|
||||
src/regparse.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/regparse.c b/src/regparse.c
|
||||
index 11f9e34..665998e 100644
|
||||
--- a/src/regparse.c
|
||||
+++ b/src/regparse.c
|
||||
@@ -4044,6 +4044,9 @@ next_state_val(CClassNode* cc, OnigCodePoint *vs, OnigCodePoint v,
|
||||
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) {
|
||||
--
|
||||
2.13.0
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
From f015fbdd95f76438cd86366467bb2b39870dd7c6 Mon Sep 17 00:00:00 2001
|
||||
From: "K.Kosako" <kosako@sofnec.co.jp>
|
||||
Date: Fri, 19 May 2017 15:44:47 +0900
|
||||
Subject: [PATCH 05/25] fix #55 : Byte value expressed in octal must be smaller
|
||||
than 256
|
||||
|
||||
---
|
||||
src/regparse.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/regparse.c b/src/regparse.c
|
||||
index 665998e..f7acc5f 100644
|
||||
--- a/src/regparse.c
|
||||
+++ b/src/regparse.c
|
||||
@@ -3020,7 +3020,7 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
|
||||
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 */
|
||||
}
|
||||
@@ -3392,7 +3392,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
|
||||
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 */
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
From 166a6c3999bf06b4de0ab4ce6b088a468cc4029f Mon Sep 17 00:00:00 2001
|
||||
From: "K.Kosako" <kosako@sofnec.co.jp>
|
||||
Date: Mon, 22 May 2017 18:09:39 +0900
|
||||
Subject: [PATCH 13/25] fix #56 : return invalid result for codepoint
|
||||
0xFFFFFFFF
|
||||
|
||||
---
|
||||
src/gperf_unfold_key_conv.py | 2 +-
|
||||
src/unicode_unfold_key.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/gperf_unfold_key_conv.py b/src/gperf_unfold_key_conv.py
|
||||
index dcd8587..34f9c2f 100755
|
||||
--- a/src/gperf_unfold_key_conv.py
|
||||
+++ b/src/gperf_unfold_key_conv.py
|
||||
@@ -36,7 +36,7 @@ def parse_line(s):
|
||||
if r != s: return r
|
||||
r = re.sub(REG_GET_CODE, 'OnigCodePoint gcode = wordlist[key].code;', s)
|
||||
if r != s: return r
|
||||
- r = re.sub(REG_CODE_CHECK, 'if (code == gcode)', s)
|
||||
+ r = re.sub(REG_CODE_CHECK, 'if (code == gcode && wordlist[key].index >= 0)', s)
|
||||
if r != s: return r
|
||||
|
||||
return s
|
||||
diff --git a/src/unicode_unfold_key.c b/src/unicode_unfold_key.c
|
||||
index a5aff90..15302ca 100644
|
||||
--- a/src/unicode_unfold_key.c
|
||||
+++ b/src/unicode_unfold_key.c
|
||||
@@ -2850,7 +2850,7 @@ unicode_unfold_key(OnigCodePoint code)
|
||||
{
|
||||
OnigCodePoint gcode = wordlist[key].code;
|
||||
|
||||
- if (code == gcode)
|
||||
+ if (code == gcode && wordlist[key].index >= 0)
|
||||
return &wordlist[key];
|
||||
}
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
From 690313a061f7a4fa614ec5cc8368b4f2284e059b Mon Sep 17 00:00:00 2001
|
||||
From: "K.Kosako" <kosako@sofnec.co.jp>
|
||||
Date: Tue, 23 May 2017 10:28:58 +0900
|
||||
Subject: [PATCH 14/25] fix #57 : DATA_ENSURE() check must be before data
|
||||
access
|
||||
|
||||
---
|
||||
src/regexec.c | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/src/regexec.c b/src/regexec.c
|
||||
index 35fef11..d4e577d 100644
|
||||
--- a/src/regexec.c
|
||||
+++ b/src/regexec.c
|
||||
@@ -1473,14 +1473,9 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
|
||||
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;
|
||||
|
||||
--
|
||||
2.13.0
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From 9690d3ab1f9bcd2db8cbe1fe3ee4a5da606b8814 Mon Sep 17 00:00:00 2001
|
||||
From: "K.Kosako" <kosako@sofnec.co.jp>
|
||||
Date: Tue, 23 May 2017 16:15:35 +0900
|
||||
Subject: [PATCH 15/25] fix #58 : access to invalid address by reg->dmin value
|
||||
|
||||
---
|
||||
src/regexec.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/regexec.c b/src/regexec.c
|
||||
index d4e577d..2fa0f3d 100644
|
||||
--- a/src/regexec.c
|
||||
+++ b/src/regexec.c
|
||||
@@ -3154,6 +3154,8 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
|
||||
}
|
||||
else {
|
||||
UChar *q = p + reg->dmin;
|
||||
+
|
||||
+ if (q >= end) return 0; /* fail */
|
||||
while (p < q) p += enclen(reg->enc, p);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
From b690371bbf97794b4a1d3f295d4fb9a8b05d402d Mon Sep 17 00:00:00 2001
|
||||
From: "K.Kosako" <kosako@sofnec.co.jp>
|
||||
Date: Wed, 24 May 2017 10:27:04 +0900
|
||||
Subject: [PATCH 19/25] fix #59 : access to invalid address by reg->dmax value
|
||||
|
||||
---
|
||||
src/regexec.c | 27 +++++++++++++++++----------
|
||||
1 file changed, 17 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/regexec.c b/src/regexec.c
|
||||
index 49bcc50..c0626ef 100644
|
||||
--- a/src/regexec.c
|
||||
+++ b/src/regexec.c
|
||||
@@ -3235,18 +3235,25 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
|
||||
}
|
||||
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);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
From 3b63d12038c8d8fc278e81c942fa9bec7c704c8b Mon Sep 17 00:00:00 2001
|
||||
From: "K.Kosako" <kosako@sofnec.co.jp>
|
||||
Date: Wed, 24 May 2017 13:43:25 +0900
|
||||
Subject: [PATCH 20/25] fix #60 : invalid state(CCS_VALUE) in
|
||||
parse_char_class()
|
||||
|
||||
---
|
||||
src/regparse.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/regparse.c b/src/regparse.c
|
||||
index 69875fa..1988747 100644
|
||||
--- a/src/regparse.c
|
||||
+++ b/src/regparse.c
|
||||
@@ -4081,7 +4081,9 @@ next_state_class(CClassNode* cc, OnigCodePoint* vs, enum CCVALTYPE* type,
|
||||
}
|
||||
}
|
||||
|
||||
- *state = CCS_VALUE;
|
||||
+ if (*state != CCS_START)
|
||||
+ *state = CCS_VALUE;
|
||||
+
|
||||
*type = CCV_CLASS;
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
|
||||
40
0104-re-fix-60-by-check-val_type.patch
Normal file
40
0104-re-fix-60-by-check-val_type.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
From ddbf55698b5f7ffdfa737b0b8e0079af1fdd7cb1 Mon Sep 17 00:00:00 2001
|
||||
From: "K.Kosako" <kosako@sofnec.co.jp>
|
||||
Date: Thu, 15 Jun 2017 15:48:46 +0900
|
||||
Subject: [PATCH 104/515] re-fix #60 by check val_type
|
||||
|
||||
---
|
||||
src/regparse.c | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/regparse.c b/src/regparse.c
|
||||
index a4e3d4a..4f4802d 100644
|
||||
--- a/src/regparse.c
|
||||
+++ b/src/regparse.c
|
||||
@@ -4061,9 +4061,7 @@ next_state_class(CClassNode* cc, OnigCodePoint* vs, enum CCVALTYPE* type,
|
||||
}
|
||||
}
|
||||
|
||||
- if (*state != CCS_START)
|
||||
- *state = CCS_VALUE;
|
||||
-
|
||||
+ *state = CCS_VALUE;
|
||||
*type = CCV_CLASS;
|
||||
return 0;
|
||||
}
|
||||
@@ -4348,6 +4346,12 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end,
|
||||
CC_ESC_WARN(env, (UChar* )"-");
|
||||
goto range_end_val;
|
||||
}
|
||||
+
|
||||
+ if (val_type == CCV_CLASS) {
|
||||
+ r = ONIGERR_UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS;
|
||||
+ goto err;
|
||||
+ }
|
||||
+
|
||||
state = CCS_RANGE;
|
||||
}
|
||||
else if (state == CCS_START) {
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
31
oniguruma-5.9.2-onig_new-returns-NULL-reg.patch
Normal file
31
oniguruma-5.9.2-onig_new-returns-NULL-reg.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
--- onig-5.9.2/regcomp.c.debug 2010-01-05 23:13:38.000000000 +0900
|
||||
+++ onig-5.9.2/regcomp.c 2010-01-15 03:58:15.000000000 +0900
|
||||
@@ -5536,19 +5536,22 @@
|
||||
OnigErrorInfo* einfo)
|
||||
{
|
||||
int r;
|
||||
+ regex_t *regg;
|
||||
|
||||
- *reg = (regex_t* )xmalloc(sizeof(regex_t));
|
||||
- if (IS_NULL(*reg)) return ONIGERR_MEMORY;
|
||||
+ regg = (regex_t* )xmalloc(sizeof(regex_t));
|
||||
+ if (IS_NULL(regg)) return ONIGERR_MEMORY;
|
||||
|
||||
- r = onig_reg_init(*reg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax);
|
||||
+ r = onig_reg_init(regg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax);
|
||||
if (r) goto err;
|
||||
|
||||
- r = onig_compile(*reg, pattern, pattern_end, einfo);
|
||||
+ r = onig_compile(regg, pattern, pattern_end, einfo);
|
||||
if (r) {
|
||||
err:
|
||||
- onig_free(*reg);
|
||||
- *reg = NULL;
|
||||
+ onig_free(regg);
|
||||
+ regg = NULL;
|
||||
}
|
||||
+
|
||||
+ *reg = regg;
|
||||
return r;
|
||||
}
|
||||
|
||||
310
oniguruma.spec
310
oniguruma.spec
|
|
@ -1,45 +1,35 @@
|
|||
%undefine _changelog_trimtime
|
||||
|
||||
%global git_snapshot 0
|
||||
|
||||
%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
|
||||
|
||||
Name: oniguruma
|
||||
Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}}
|
||||
Release: %{?prerelease:0.}%{baserelease}%{?dist}
|
||||
Version: 6.1.3
|
||||
Release: 3%{?dist}
|
||||
Summary: Regular expressions library
|
||||
|
||||
# SPDX confirmed
|
||||
License: BSD-2-Clause
|
||||
Group: System Environment/Libraries
|
||||
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%{version}/onig-%{version}.tar.gz
|
||||
# FIXME
|
||||
# Don't know exactly why, however without Patch0 onig_new returns
|
||||
# NULL reg variable
|
||||
Patch0: oniguruma-5.9.2-onig_new-returns-NULL-reg.patch
|
||||
# Patch from the upstream git
|
||||
# https://github.com/kkos/oniguruma/issues/55 (CVE-2017-9226)
|
||||
Patch104: 0004-fix-55-check-too-big-code-point-value-for-single-byt.patch
|
||||
Patch105: 0005-fix-55-Byte-value-expressed-in-octal-must-be-smaller.patch
|
||||
# https://github.com/kkos/oniguruma/issues/56 (CVE-2017-9225)
|
||||
Patch113: 0013-fix-56-return-invalid-result-for-codepoint-0xFFFFFFF.patch
|
||||
# https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
|
||||
Patch114: 0014-fix-57-DATA_ENSURE-check-must-be-before-data-access.patch
|
||||
# https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
|
||||
Patch115: 0015-fix-58-access-to-invalid-address-by-reg-dmin-value.patch
|
||||
# https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229)
|
||||
Patch119: 0019-fix-59-access-to-invalid-address-by-reg-dmax-value.patch
|
||||
# https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
|
||||
Patch120: 0020-fix-60-invalid-state-CCS_VALUE-in-parse_char_class.patch
|
||||
# https://github.com/kkos/oniguruma/commit/ddbf55698b5f7ffdfa737b0b8e0079af1fdd7cb1
|
||||
Patch121: 0104-re-fix-60-by-check-val_type.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
%if 0%{?git_snapshot}
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
%endif
|
||||
BuildRequires: ruby >= 1.8
|
||||
#Requires:
|
||||
|
||||
%description
|
||||
Oniguruma is a regular expressions library.
|
||||
|
|
@ -50,6 +40,7 @@ for every regular expression object can be specified.
|
|||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{?isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
|
|
@ -58,35 +49,53 @@ developing applications that use %{name}.
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q -n onig-%{mainver}%{?gitversion:-%{?gitversion}}
|
||||
%setup -q -n onig-%{version}
|
||||
( cd src
|
||||
%patch0 -p1 -b .nullreg
|
||||
)
|
||||
%patch104 -p1
|
||||
%patch105 -p1
|
||||
%patch113 -p1
|
||||
%patch114 -p1
|
||||
%patch115 -p1
|
||||
%patch119 -p1
|
||||
%patch120 -p1
|
||||
%patch121 -p1
|
||||
|
||||
%{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in
|
||||
|
||||
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
|
||||
|
||||
%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
|
||||
%endif
|
||||
|
||||
%configure \
|
||||
--enable-posix-api \
|
||||
--enable-binary-compatible-posix-api \
|
||||
--disable-silent-rules \
|
||||
--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
|
||||
|
||||
%ldconfig_scriptlets
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
|
|
@ -94,25 +103,19 @@ autoreconf -fi
|
|||
%doc AUTHORS
|
||||
%license COPYING
|
||||
%doc HISTORY
|
||||
%doc README.md
|
||||
%doc README
|
||||
%doc index.html
|
||||
%lang(ja) %doc README_japanese
|
||||
%lang(ja) %doc README.ja
|
||||
%lang(ja) %doc index_ja.html
|
||||
|
||||
%{_libdir}/libonig.so.5*
|
||||
%{_libdir}/libonig.so.4*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc doc/API
|
||||
%doc doc/CALLOUTS.API
|
||||
%doc doc/CALLOUTS.BUILTIN
|
||||
%doc doc/FAQ
|
||||
%doc doc/RE
|
||||
%doc doc/SYNTAX.md
|
||||
%doc doc/UNICODE_PROPERTIES
|
||||
%lang(ja) %doc doc/API.ja
|
||||
%lang(ja) %doc doc/CALLOUTS.API.ja
|
||||
%lang(ja) %doc doc/CALLOUTS.BUILTIN.ja
|
||||
%lang(ja) %doc doc/FAQ.ja
|
||||
%lang(ja) %doc doc/RE.ja
|
||||
|
||||
|
|
@ -120,185 +123,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 Sep 15 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.1.3-3
|
||||
- Additional fix for github#60 (CVE-2017-9228)
|
||||
|
||||
* 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
|
||||
|
||||
* Fri Jul 12 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.2-2
|
||||
- Upstream patch for CVE-2019-13225 (#1728966)
|
||||
- NON-upstream patch for CVE-2019-13224 (#1728971)
|
||||
|
||||
* Tue May 7 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.2-1
|
||||
- rc3 released as 6.9.2 final release
|
||||
|
||||
* Wed Apr 24 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.2-0.1.rc3
|
||||
- 6.9.2-rc3
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Dec 12 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.1-1
|
||||
- 6.9.1
|
||||
|
||||
* Wed Sep 12 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.0-2
|
||||
- 6.9.0
|
||||
|
||||
* Sat Sep 8 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.8.2-3
|
||||
- Bump release
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Apr 23 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.8.2-1
|
||||
- 6.8.2
|
||||
|
||||
* Sun Apr 1 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.8.1-1
|
||||
- 6.8.1
|
||||
|
||||
* Fri Feb 9 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.7.1-1
|
||||
- 6.7.1
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.7.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sun Dec 31 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.7.0-1
|
||||
- 6.7.0
|
||||
|
||||
* Tue Sep 5 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.6.1-1
|
||||
- 6.6.1
|
||||
|
||||
* Sun Aug 13 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.5.0-1
|
||||
- 6.5.0
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Jul 5 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.4.0-1
|
||||
- 6.4.0
|
||||
|
||||
* Tue May 30 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.3.0-1
|
||||
- 6.3.0
|
||||
* Tue May 30 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.1.3-2
|
||||
- Backport patches from git trunk
|
||||
- CVEs 2017-9226 CVE-2017-9225 CVE-2017-9224 CVE-2017-9227 CVE-2017-9229 CVE-2017-9228
|
||||
|
||||
* Wed Apr 26 2017 Nils Philippsen <nils@redhat.com> - 6.2.0-2
|
||||
- remove unnecessary BR: ruby
|
||||
|
||||
* Fri Apr 21 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.2.0-1
|
||||
- 6.2.0
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Dec 28 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.1.3-1
|
||||
- 6.1.3
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (onig-6.9.10.tar.gz) = f7cf33008ca0181322fb8efc8e6bb67a1f81677095a33d88134781b804e6a9fbf675f05789d762fdd3d9f0171f8dc4c2e960c2b6a09ddd03bfd35a5ab0920317
|
||||
SHA512 (onig-6.1.3.tar.gz) = 42b3757c4c95443fbbeca0b6d43b1ed71b29bb717e6b33d20c183dd9f2b2ef8cd8cf6272846e332fe0a8326a3e299bcf99d9745c0f17c5e496efa0aa60ca9c55
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue