Merge branch 'feature/upstream' into develop

1 files changed, 32 insertions, 41 deletions

diff --git a/README.md b/README.md
index 63d835a..c546942 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 [![Build Status](https://travis-ci.org/kkos/oniguruma.svg?branch=master)](https://travis-ci.org/kkos/oniguruma)
 [![Code Quality: Cpp](https://img.shields.io/lgtm/grade/cpp/g/kkos/oniguruma.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/kkos/oniguruma/context:cpp)
 [![Total Alerts](https://img.shields.io/lgtm/alerts/g/kkos/oniguruma.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/kkos/oniguruma/alerts)
+[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/oniguruma.svg)](https://oss-fuzz-build-logs.storage.googleapis.com/index.html#oniguruma)
+[![TrustInSoft CI](https://ci.trust-in-soft.com/projects/kkos/oniguruma.svg?branch=master)](https://ci.trust-in-soft.com/projects/kkos/oniguruma)
 
 Oniguruma
 =========
@@ -27,6 +29,26 @@ Supported character encodings:
 * doc/SYNTAX.md: contributed by seanofw
 
 
+Version 6.9.6
+-------------
+* When using configure script, if you have the POSIX API enabled in an earlier version (disabled by default in 6.9.5) and you need application binary compatibility with the POSIX API, specify "--enable-binary-compatible-posix-api=yes" instead of "--enable-posix-api=yes". Starting in 6.9.6, "--enable-posix-api=yes" only supports source-level compatibility for 6.9.5 and earlier about POSIX API. (Issue #210)
+
+* NEW: configure option --enable-binary-compatible-posix-api=[yes/no]
+* NEW API: Limiting the maximum number of calls of subexp-call
+* NEW API: ONIG_OPTION_NOT_BEGIN_STRING / NOT_END_STRING / NOT_BEGIN_POSITION
+* Fixed behavior of ONIG_OPTION_NOTBOL / NOTEOL
+* Fixed many problems found by OSS-Fuzz
+* Fixed many problems found by Coverity
+* Fixed CVE-2020-26159 (This turned out not to be a problem later. #221)
+* Under cygwin and mingw, generate and install the libonig.def file (Issue #220)
+
+
+Version 6.9.5 revised 1
+-----------------------
+
+* Fixed Issue #192
+
+
 Version 6.9.5
 -------------
 
@@ -143,45 +165,6 @@ Version 6.5.0
 * NEW: Absent stopper (?~|absent)     (*original)
 
 
-Version 6.4.0
--------------
-
-* Fix fatal problem of endless repeat on Windows
-* NEW: call zero (call the total regexp) \g<0>
-* NEW: relative backref/call by positive number \k<+n>, \g<+n>
-
-
-Version 6.3.0
--------------
-
-* NEW: octal codepoint \o{.....}
-* Fixed CVE-2017-9224
-* Fixed CVE-2017-9225
-* Fixed CVE-2017-9226
-* Fixed CVE-2017-9227
-* Fixed CVE-2017-9228
-* Fixed CVE-2017-9229
-
-
-Version 6.1.2
--------------
-
-* allow word bound, word begin and word end in look-behind.
-* NEW option: ONIG_OPTION_CHECK_VALIDITY_OF_STRING
-
-Version 6.1
------------
-
-* improved doc/RE
-* NEW API: onig_scan()
-
-Version 6.0
------------
-
-* Update Unicode 8.0 Property/Case-folding
-* NEW API: onig_unicode_define_user_property()
-
-
 License
 -------
 
@@ -191,7 +174,15 @@ License
 Install
 -------
 
-### Case 1: Unix and Cygwin platform
+### Case 1: Linux distribution packages
+
+   * Fedora:         `dnf install oniguruma`
+   * RHEL/CentOS:    `yum install oniguruma`
+   * Debian/Ubuntu:  `apt install libonig5`
+   * Arch:           `pacman -S oniguruma`
+   * openSUSE:       `zypper install oniguruma`
+
+### Case 2: Manual compilation on Linux, Unix, and Cygwin platform
 
    1. autoreconf -vfi   (* case: configure script is not found.)
 
@@ -212,7 +203,7 @@ Install
 
 
 
-### Case 2: Windows 64/32bit platform (Visual Studio)
+### Case 3: Windows 64/32bit platform (Visual Studio)
 
    Execute make_win.bat