[bug#73692] [PATCH] gnu: timescaledb: Update to 2.16.1. [security fixes]

[bug#73692] [PATCH] gnu: timescaledb: Update to 2.16.1. [security fixes]

[Nicolas Graves via Guix-patches via]

This fixes CVE-2023-25149.

* gnu/packages/databases.scm (timescaledb): Update to 2.16.1.
---
 gnu/packages/databases.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 784e633626..7854a98431 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1412,7 +1412,7 @@ (define-public postgresql postgresql-14)
 (define-public timescaledb
   (package
     (name "timescaledb")
-    (version "2.8.1")
+    (version "2.16.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1421,7 +1421,7 @@ (define-public timescaledb
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1gbadna0ilmqad7sbrixm12wd71h43njhsbp1kh5lispb6drdb6r"))
+                "1v17x00a15il4r3rbr0waqjv1nwzy6rcqxgfi2hdk1x235s5dg5h"))
               (modules '((guix build utils)))
               (snippet
                ;; Remove files carrying the proprietary TIMESCALE license.
-- 
2.46.0

[bug#73692] [PATCH v2] gnu: timescaledb: Ignore failing tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/databases.scm (timescaledb):
[arguments]<#:phases>: Add phase 'patch-failing-tests.
---
 gnu/packages/databases.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 43ec0641a0..80163cfdc0 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1502,6 +1502,21 @@ (define-public timescaledb
                              "-o" (string-append "-k " pg-data)
                              "-l" (string-append pg-data "/db.log")
                              "start"))))
+               #$@(if (not (target-x86-64?))
+                      #~((add-after 'unpack 'patch-failing-tests
+                           (lambda _
+                             (substitute* "test/CMakeLists.txt"
+                               (((format
+                                  #f "(~{~a|~})"
+                                  (cons*
+                                   "histogram_test\\.sql\\.in"
+                                   #$@(if (target-aarch64?)
+                                          #~((list "append\\.sql\\.in"
+                                                   "chunk_adaptative\\.sql"))
+                                          #~((list)))))
+                                 all)
+                                (string-append "#" all))))))
+                      #~())
                (add-after 'prepare-tests 'check
                  (assoc-ref %standard-phases 'check)))))
     (inputs (list openssl postgresql))
-- 
2.46.0

[bug#73692] [PATCH v2] gnu: timescaledb: Ignore failing tests.

[Z572]

[-- Attachment #1: Type: text/plain, Size: 1749 bytes --]

Nicolas Graves via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/databases.scm (timescaledb):
> [arguments]<#:phases>: Add phase 'patch-failing-tests.
> ---
>  gnu/packages/databases.scm | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
>
> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> index 43ec0641a0..80163cfdc0 100644
> --- a/gnu/packages/databases.scm
> +++ b/gnu/packages/databases.scm
> @@ -1502,6 +1502,21 @@ (define-public timescaledb
>                               "-o" (string-append "-k " pg-data)
>                               "-l" (string-append pg-data "/db.log")
>                               "start"))))
> +               #$@(if (not (target-x86-64?))
> +                      #~((add-after 'unpack 'patch-failing-tests
> +                           (lambda _
> +                             (substitute* "test/CMakeLists.txt"
> +                               (((format
> +                                  #f "(~{~a|~})"

I think it's best to keep it simple and not use overly complex
features.

> +                                  (cons*
> +                                   "histogram_test\\.sql\\.in"
> +                                   #$@(if (target-aarch64?)
> +                                          #~((list "append\\.sql\\.in"
> +                                                   "chunk_adaptative\\.sql"))
> +                                          #~((list)))))
> +                                 all)
> +                                (string-append "#" all))))))
> +                      #~())
>                 (add-after 'prepare-tests 'check
>                   (assoc-ref %standard-phases 'check)))))
>      (inputs (list openssl postgresql))

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#73692] [PATCH v2] gnu: timescaledb: Ignore failing tests.

[Nicolas Graves via Guix-patches via]

On 2024-10-16 20:28, Z572 wrote:

> Nicolas Graves via Guix-patches via <guix-patches@gnu.org> writes:
>
>> * gnu/packages/databases.scm (timescaledb):
>> [arguments]<#:phases>: Add phase 'patch-failing-tests.
>> ---
>>  gnu/packages/databases.scm | 15 +++++++++++++++
>>  1 file changed, 15 insertions(+)
>>
>> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
>> index 43ec0641a0..80163cfdc0 100644
>> --- a/gnu/packages/databases.scm
>> +++ b/gnu/packages/databases.scm
>> @@ -1502,6 +1502,21 @@ (define-public timescaledb
>>                               "-o" (string-append "-k " pg-data)
>>                               "-l" (string-append pg-data "/db.log")
>>                               "start"))))
>> +               #$@(if (not (target-x86-64?))
>> +                      #~((add-after 'unpack 'patch-failing-tests
>> +                           (lambda _
>> +                             (substitute* "test/CMakeLists.txt"
>> +                               (((format
>> +                                  #f "(~{~a|~})"
>
> I think it's best to keep it simple and not use overly complex
> features.

I agree but this bit is indeed particularly tricky. I can move from
complex format to string-append + string-join, from cons* to append
list, and drop the not, but ultimately I feel selectively ignoring tests
by system is complex in itself. Let's see what QA says, then simplify
that, but if you have a better solution, don't hesitate to put it
forward ;)

>
>> +                                  (cons*
>> +                                   "histogram_test\\.sql\\.in"
>> +                                   #$@(if (target-aarch64?)
>> +                                          #~((list "append\\.sql\\.in"
>> +                                                   "chunk_adaptative\\.sql"))
>> +                                          #~((list)))))
>> +                                 all)
>> +                                (string-append "#" all))))))
>> +                      #~())
>>                 (add-after 'prepare-tests 'check
>>                   (assoc-ref %standard-phases 'check)))))
>>      (inputs (list openssl postgresql))

-- 
Best regards,
Nicolas Graves