From 5ceac3f42b41067c8de994b0bd16560129279a18 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 4 Sep 2019 20:21:53 +0200
Subject: gnu: oniguruma: Update to 6.9.3 [fixes CVE-2019-13224,
 CVE-2019-13225].

* gnu/packages/textutils.scm (oniguruma): Update to 6.9.3.
---
 gnu/packages/textutils.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/textutils.scm')

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 330e10610d..60215523b6 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -475,7 +475,7 @@ as existing hashing techniques, with provably negligible risk of collisions.")
 (define-public oniguruma
   (package
     (name "oniguruma")
-    (version "6.9.2")
+    (version "6.9.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/kkos/"
@@ -483,7 +483,7 @@ as existing hashing techniques, with provably negligible risk of collisions.")
                                   "/onig-" version ".tar.gz"))
               (sha256
                (base32
-                "0slp4hpw9qxk4xhn7abyw7065sd355xwkyfq72glxczcjsqxsynv"))))
+                "0pvj37r1rd5h5vw99mdk8z4k44gq1ldwrapkamdiicksdfkr4ndb"))))
     (build-system gnu-build-system)
     (home-page "https://github.com/kkos/oniguruma")
     (synopsis "Regular expression library")
-- 
cgit v1.2.3


From 5ec7c4a153f2d620d1d58923afefe80ca48d8ede Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 4 Sep 2019 20:23:02 +0200
Subject: gnu: php: Build against Oniguruma 6.

* gnu/packages/php.scm (php)[inputs]: Change ONIGURUMA-5 to ONIGURUMA.
* gnu/packages/textutils.scm (oniguruma-5): Remove variable.
---
 gnu/packages/php.scm       |  2 +-
 gnu/packages/textutils.scm | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'gnu/packages/textutils.scm')

diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index 497989b781..ca7f0ee892 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -364,7 +364,7 @@
        ("libxpm" ,libxpm)
        ("libxslt" ,libxslt)
        ("libx11" ,libx11)
-       ("oniguruma" ,oniguruma-5)
+       ("oniguruma" ,oniguruma)
        ("openldap" ,openldap)
        ("openssl" ,openssl)
        ("pcre" ,pcre2)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 60215523b6..388f164428 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -492,20 +492,6 @@ characteristic of this library is that different character encoding for every
 regular expression object can be specified.")
     (license license:bsd-2)))
 
-;; PHP < 7.3.0 requires this old version.  Remove once no longer needed.
-(define-public oniguruma-5
-  (package
-    (inherit oniguruma)
-    (version "5.9.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/kkos/"
-                                  "oniguruma/releases/download/v" version
-                                  "/onig-" version ".tar.gz"))
-              (sha256
-               (base32
-                "19s79vsclqn170mw0ajwv7j37qsbn4f1yjz3yavnhvva6c820r6m"))))))
-
 (define-public antiword
   (package
     (name "antiword")
-- 
cgit v1.2.3