From 77f1bd9dea3def1992603cbf24c4b0003fa3e0f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Le=20Bouter?= <lle-bout@zaclys.net>
Date: Sat, 13 Mar 2021 01:57:12 +0100
Subject: [PATCH] gnu: rust-diesel: Update to 1.4.6 [fixes CVE-2021-28305].

* gnu/packages/crates-io.scm (rust-diesel): Update to 1.4.6.
[native-inputs]: Add sqlite for tests.
[arguments]<#:cargo-inputs>: Remove rust-bigdecimal-0.2 (incompatible),
rust-libsqlite3-sys-0.15, rust-num-bigint-0.3 and rust-uuid-0.7. Add
rust-bigdecimal-0.1, rust-libsqlite3-sys-0.20, rust-num-bigint-0.2,
rust-uuid-0.5 and rust-uuid-0.8.
[arguments]<#:phases>: Replace 'check phase to provide required feature
arguments and  exclude failing 'expression::count::count' test.
[synopsis]: Solve lint error by removing article at the beginning.
---
 gnu/packages/crates-io.scm | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c523389f47..6b242e735c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11325,28 +11325,31 @@ (define-public rust-dialoguer-0.3
 (define-public rust-diesel-1
   (package
     (name "rust-diesel")
-    (version "1.4.5")
+    (version "1.4.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "diesel" version))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "134dy6gdbv30q388gsp5777w2qh63hdqsim1j8s1aylpmggfjb9y"))))
+         "0hpmwrc0zx3zvpgwp9zrm6wj8d8i8q8990grlrnfzlivbi6zqyq4"))))
     (build-system cargo-build-system)
+    (native-inputs
+     `(("sqlite" ,sqlite)))
     (arguments
      `(#:cargo-inputs
-       (("rust-bigdecimal" ,rust-bigdecimal-0.2)
+       (("rust-bigdecimal" ,rust-bigdecimal-0.1)
         ("rust-bitflags" ,rust-bitflags-1)
         ("rust-byteorder" ,rust-byteorder-1)
         ("rust-chrono" ,rust-chrono-0.4)
         ("rust-diesel-derives" ,rust-diesel-derives-1)
         ("rust-ipnetwork" ,rust-ipnetwork-0.17)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.15)
+        ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.20)
         ("rust-mysqlclient-sys" ,rust-mysqlclient-sys-0.2)
-        ("rust-num-bigint" ,rust-num-bigint-0.3)
+        ("rust-num-bigint" ,rust-num-bigint-0.2)
         ("rust-num-integer" ,rust-num-integer-0.1)
         ("rust-num-traits" ,rust-num-traits-0.2)
         ("rust-pq-sys" ,rust-pq-sys-0.4)
@@ -11355,14 +11358,21 @@ (define-public rust-diesel-1
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-time" ,rust-time-0.1)
         ("rust-url" ,rust-url-1)
-        ("rust-uuid" ,rust-uuid-0.7))
+        ("rust-uuid" ,rust-uuid-0.5)
+        ("rust-uuid" ,rust-uuid-0.8))
        #:cargo-development-inputs
        (("rust-cfg-if" ,rust-cfg-if-0.1)
         ("rust-dotenv" ,rust-dotenv-0.10)
         ("rust-quickcheck" ,rust-quickcheck-0.4)
-        ("rust-tempdir" ,rust-tempdir-0.3))))
+        ("rust-tempdir" ,rust-tempdir-0.3))
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (invoke "cargo" "test" "--features" "sqlite" "--"
+                     "--skip=expression::count::count"))))))
     (home-page "https://diesel.rs")
-    (synopsis "A safe, extensible ORM and Query Builder")
+    (synopsis "Safe, extensible ORM and Query Builder")
     (description "This package provides a safe, extensible ORM and Query
 Builder for PostgreSQL, SQLite, and MySQL.")
     (license (list license:expat license:asl2.0))))