* [bug#73692] [PATCH] gnu: timescaledb: Update to 2.16.1. [security fixes]
@ 2024-10-08 6:26 Nicolas Graves via Guix-patches via
2024-10-16 5:12 ` [bug#73692] [PATCH v2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
` (5 more replies)
0 siblings, 6 replies; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-08 6:26 UTC (permalink / raw)
To: 73692; +Cc: Nicolas Graves
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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v2] gnu: timescaledb: Ignore failing tests.
2024-10-08 6:26 [bug#73692] [PATCH] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-16 5:12 ` Nicolas Graves via Guix-patches via
2024-10-16 12:28 ` Z572
2024-10-16 23:24 ` [bug#73692] [PATCH v3 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
` (4 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-16 5:12 UTC (permalink / raw)
To: 73692; +Cc: Nicolas Graves
* 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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v2] gnu: timescaledb: Ignore failing tests.
2024-10-16 5:12 ` [bug#73692] [PATCH v2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
@ 2024-10-16 12:28 ` Z572
2024-10-16 17:19 ` Nicolas Graves via Guix-patches via
0 siblings, 1 reply; 15+ messages in thread
From: Z572 @ 2024-10-16 12:28 UTC (permalink / raw)
To: 73692; +Cc: ngraves
[-- 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 --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v2] gnu: timescaledb: Ignore failing tests.
2024-10-16 12:28 ` Z572
@ 2024-10-16 17:19 ` Nicolas Graves via Guix-patches via
0 siblings, 0 replies; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-16 17:19 UTC (permalink / raw)
To: Z572, 73692
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v3 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes]
2024-10-08 6:26 [bug#73692] [PATCH] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
2024-10-16 5:12 ` [bug#73692] [PATCH v2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
@ 2024-10-16 23:24 ` Nicolas Graves via Guix-patches via
2024-10-16 23:24 ` [bug#73692] [PATCH v3 2/2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
2024-10-17 4:37 ` [bug#73692] [PATCH v4 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
` (3 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-16 23:24 UTC (permalink / raw)
To: 73692; +Cc: Nicolas Graves
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 f05566becd..43ec0641a0 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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v3 2/2] gnu: timescaledb: Ignore failing tests.
2024-10-16 23:24 ` [bug#73692] [PATCH v3 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-16 23:24 ` Nicolas Graves via Guix-patches via
0 siblings, 0 replies; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-16 23:24 UTC (permalink / raw)
To: 73692; +Cc: Nicolas Graves
* gnu/packages/databases.scm (timescaledb):
[arguments]<#:phases>: Add phase 'patch-failing-tests.
---
gnu/packages/databases.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 43ec0641a0..f5849242be 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1502,6 +1502,23 @@ (define-public timescaledb
"-o" (string-append "-k " pg-data)
"-l" (string-append pg-data "/db.log")
"start"))))
+ #$@(if (target-x86-64?)
+ #~()
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ (((string-append
+ "("
+ (string-join
+ #$@(if (target-aarch64?)
+ #~('("append\\.sql\\.in"
+ "chunk_adaptative\\.sql"
+ "histogram_test\\.sql\\.in"))
+ #~('("histogram_test\\.sql\\.in")))
+ "|")
+ ")")
+ all)
+ (string-append "#" all)))))))
(add-after 'prepare-tests 'check
(assoc-ref %standard-phases 'check)))))
(inputs (list openssl postgresql))
--
2.46.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v4 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes]
2024-10-08 6:26 [bug#73692] [PATCH] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
2024-10-16 5:12 ` [bug#73692] [PATCH v2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
2024-10-16 23:24 ` [bug#73692] [PATCH v3 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-17 4:37 ` Nicolas Graves via Guix-patches via
2024-10-17 4:37 ` [bug#73692] [PATCH v4 2/2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
2024-10-17 5:51 ` [bug#73692] [PATCH v5 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
` (2 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-17 4:37 UTC (permalink / raw)
To: 73692; +Cc: Nicolas Graves
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 f05566becd..43ec0641a0 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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v4 2/2] gnu: timescaledb: Ignore failing tests.
2024-10-17 4:37 ` [bug#73692] [PATCH v4 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-17 4:37 ` Nicolas Graves via Guix-patches via
0 siblings, 0 replies; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-17 4:37 UTC (permalink / raw)
To: 73692; +Cc: Nicolas Graves
* gnu/packages/databases.scm (timescaledb):
[arguments]<#:phases>: Add phase 'patch-failing-tests.
---
gnu/packages/databases.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 43ec0641a0..3331d9849a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1502,6 +1502,25 @@ (define-public timescaledb
"-o" (string-append "-k " pg-data)
"-l" (string-append pg-data "/db.log")
"start"))))
+ #$@(if (target-x86-64?)
+ #~()
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ #$@(if (target-aarch64?)
+ #~((substitute* "test/sql/CMakeLists.txt"
+ (((string-append
+ "("
+ (string-join
+ '("append\\.sql\\.in"
+ "chunk_adaptative\\.sql"
+ "histogram_test\\.sql\\.in")
+ "|")
+ ")")
+ all)
+ (string-append "#" all))))
+ #~((substitute* "test/sql/CMakeLists.txt"
+ (("histogram_test\\.sql\\.in" all)
+ (string-append "#" all)))))))))
(add-after 'prepare-tests 'check
(assoc-ref %standard-phases 'check)))))
(inputs (list openssl postgresql))
--
2.46.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v5 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes]
2024-10-08 6:26 [bug#73692] [PATCH] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
` (2 preceding siblings ...)
2024-10-17 4:37 ` [bug#73692] [PATCH v4 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-17 5:51 ` Nicolas Graves via Guix-patches via
2024-10-17 5:51 ` [bug#73692] [PATCH v5 2/2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
2024-10-19 10:00 ` [bug#73692] [PATCH v6 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
2024-10-20 14:05 ` [bug#73692] [PATCH v7 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
5 siblings, 1 reply; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-17 5:51 UTC (permalink / raw)
To: 73692; +Cc: Nicolas Graves
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 f05566becd..43ec0641a0 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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v5 2/2] gnu: timescaledb: Ignore failing tests.
2024-10-17 5:51 ` [bug#73692] [PATCH v5 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-17 5:51 ` Nicolas Graves via Guix-patches via
0 siblings, 0 replies; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-17 5:51 UTC (permalink / raw)
To: 73692; +Cc: Nicolas Graves
* gnu/packages/databases.scm (timescaledb):
[arguments]<#:phases>: Add phase 'patch-failing-tests.
---
gnu/packages/databases.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 43ec0641a0..9725fe37f9 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1502,6 +1502,29 @@ (define-public timescaledb
"-o" (string-append "-k " pg-data)
"-l" (string-append pg-data "/db.log")
"start"))))
+ #$@(cond
+ ((string=? "x86-64-linux" (%current-system))
+ #~())
+ ((string=? "aarch64-linux" (%current-system))
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ (((string-append
+ "("
+ (string-join
+ '("append\\.sql\\.in"
+ "chunk_adaptative\\.sql"
+ "histogram_test\\.sql\\.in")
+ "|")
+ ")")
+ all)
+ (string-append "#" all)))))))
+ (else
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ (("histogram_test\\.sql\\.in")
+ "#histogram_test.sql.in")))))))
(add-after 'prepare-tests 'check
(assoc-ref %standard-phases 'check)))))
(inputs (list openssl postgresql))
--
2.46.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v6 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes]
2024-10-08 6:26 [bug#73692] [PATCH] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
` (3 preceding siblings ...)
2024-10-17 5:51 ` [bug#73692] [PATCH v5 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-19 10:00 ` Nicolas Graves via Guix-patches via
2024-10-19 10:00 ` [bug#73692] [PATCH v6 2/2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
2024-10-20 14:05 ` [bug#73692] [PATCH v7 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
5 siblings, 1 reply; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-19 10:00 UTC (permalink / raw)
To: 73692; +Cc: Nicolas Graves
This fixes CVE-2023-25149.
* gnu/packages/databases.scm (timescaledb): Update to 2.16.1.
[arguments]<#:phases>: Remove comment and symlink trick in
'prepare-tests phase.
---
gnu/packages/databases.scm | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f05566becd..df346893b8 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.
@@ -1476,22 +1476,7 @@ (define-public timescaledb
(pg-union (string-append (getcwd) "/../pg-union")))
(match inputs
(((names . directories) ...)
- ;; PG will only load extensions from its own $libdir,
- ;; which it calculates based on argv[0]. As of
- ;; PostgreSQL 13.6, it calls 'canonicalize_path' on
- ;; argv[0] so a merge symlink is not enough to trick
- ;; it; thus, the code below makes a full copy of PG
- ;; and friends such that 'pg_config --libdir', for
- ;; instance, points to PG-UNION, allowing it to load
- ;; the timescaledb extension.
- ;; TODO: The above comment and the #:symlink trick can
- ;; be removed in the next rebuild cycle.
- (union-build pg-union (cons #$output directories)
- #:symlink
- (lambda (old new)
- (if (file-is-directory? old)
- (copy-recursively old new)
- (copy-file old new))))))
+ (union-build pg-union (cons #$output directories))))
(setenv "PATH" (string-append pg-union "/bin:"
(getenv "PATH")))
(invoke "initdb" "-D" pg-data)
--
2.46.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v6 2/2] gnu: timescaledb: Ignore failing tests.
2024-10-19 10:00 ` [bug#73692] [PATCH v6 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-19 10:00 ` Nicolas Graves via Guix-patches via
0 siblings, 0 replies; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-19 10:00 UTC (permalink / raw)
To: 73692; +Cc: Nicolas Graves
* gnu/packages/databases.scm (timescaledb):
[arguments]<#:phases>: Add phase 'patch-failing-tests.
---
gnu/packages/databases.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index df346893b8..13d20de41c 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1487,6 +1487,30 @@ (define-public timescaledb
"-o" (string-append "-k " pg-data)
"-l" (string-append pg-data "/db.log")
"start"))))
+ #$@(cond
+ ((string=? "x86-64-linux" (%current-system))
+ #~())
+ ((member (%current-system)
+ (list "aarch64-linux" "i686-linux"))
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ (((string-append
+ "("
+ (string-join
+ '(" append\\.sql\\.in"
+ " chunk_adaptative\\.sql"
+ " histogram_test\\.sql\\.in")
+ "|")
+ ")")
+ all)
+ (string-append "#" all)))))))
+ (else
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ (("histogram_test\\.sql\\.in")
+ "#histogram_test.sql.in")))))))
(add-after 'prepare-tests 'check
(assoc-ref %standard-phases 'check)))))
(inputs (list openssl postgresql))
--
2.46.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v7 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes]
2024-10-08 6:26 [bug#73692] [PATCH] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
` (4 preceding siblings ...)
2024-10-19 10:00 ` [bug#73692] [PATCH v6 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-20 14:05 ` Nicolas Graves via Guix-patches via
2024-10-20 14:05 ` [bug#73692] [PATCH v7 2/2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
5 siblings, 1 reply; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-20 14:05 UTC (permalink / raw)
To: 73692; +Cc: Nicolas Graves
This fixes CVE-2023-25149.
* gnu/packages/databases.scm (timescaledb): Update to 2.16.1.
[arguments]<#:phases>: Remove comment and symlink trick in
'prepare-tests phase.
---
gnu/packages/databases.scm | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f05566becd..df346893b8 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.
@@ -1476,22 +1476,7 @@ (define-public timescaledb
(pg-union (string-append (getcwd) "/../pg-union")))
(match inputs
(((names . directories) ...)
- ;; PG will only load extensions from its own $libdir,
- ;; which it calculates based on argv[0]. As of
- ;; PostgreSQL 13.6, it calls 'canonicalize_path' on
- ;; argv[0] so a merge symlink is not enough to trick
- ;; it; thus, the code below makes a full copy of PG
- ;; and friends such that 'pg_config --libdir', for
- ;; instance, points to PG-UNION, allowing it to load
- ;; the timescaledb extension.
- ;; TODO: The above comment and the #:symlink trick can
- ;; be removed in the next rebuild cycle.
- (union-build pg-union (cons #$output directories)
- #:symlink
- (lambda (old new)
- (if (file-is-directory? old)
- (copy-recursively old new)
- (copy-file old new))))))
+ (union-build pg-union (cons #$output directories))))
(setenv "PATH" (string-append pg-union "/bin:"
(getenv "PATH")))
(invoke "initdb" "-D" pg-data)
--
2.46.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v7 2/2] gnu: timescaledb: Ignore failing tests.
2024-10-20 14:05 ` [bug#73692] [PATCH v7 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
@ 2024-10-20 14:05 ` Nicolas Graves via Guix-patches via
2024-10-20 14:33 ` Zheng Junjie
0 siblings, 1 reply; 15+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-10-20 14:05 UTC (permalink / raw)
To: 73692; +Cc: Nicolas Graves
* gnu/packages/databases.scm (timescaledb):
[arguments]<#:phases>: Add phase 'patch-failing-tests.
---
gnu/packages/databases.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index df346893b8..6f30e22624 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1487,6 +1487,29 @@ (define-public timescaledb
"-o" (string-append "-k " pg-data)
"-l" (string-append pg-data "/db.log")
"start"))))
+ #$@(cond
+ ((string=? "x86-64-linux" (%current-system))
+ #~())
+ ((string=? "i686-linux" (%current-system))
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ (((string-append
+ "("
+ (string-join
+ '(" append\\.sql\\.in"
+ " chunk_adaptive\\.sql"
+ " histogram_test\\.sql\\.in")
+ "|")
+ ")")
+ all)
+ (string-append "#" all)))))))
+ (else
+ #~((add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (substitute* "test/sql/CMakeLists.txt"
+ ((" histogram_test\\.sql\\.in")
+ "# histogram_test.sql.in")))))))
(add-after 'prepare-tests 'check
(assoc-ref %standard-phases 'check)))))
(inputs (list openssl postgresql))
--
2.46.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#73692] [PATCH v7 2/2] gnu: timescaledb: Ignore failing tests.
2024-10-20 14:05 ` [bug#73692] [PATCH v7 2/2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
@ 2024-10-20 14:33 ` Zheng Junjie
0 siblings, 0 replies; 15+ messages in thread
From: Zheng Junjie @ 2024-10-20 14:33 UTC (permalink / raw)
To: 73692; +Cc: 73692-done, Nicolas Graves
[-- Attachment #1: Type: text/plain, Size: 2051 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 | 23 +++++++++++++++++++++++
> 1 file changed, 23 insertions(+)
>
> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> index df346893b8..6f30e22624 100644
> --- a/gnu/packages/databases.scm
> +++ b/gnu/packages/databases.scm
> @@ -1487,6 +1487,29 @@ (define-public timescaledb
> "-o" (string-append "-k " pg-data)
> "-l" (string-append pg-data "/db.log")
> "start"))))
> + #$@(cond
> + ((string=? "x86-64-linux" (%current-system))
> + #~())
> + ((string=? "i686-linux" (%current-system))
> + #~((add-after 'unpack 'skip-failing-tests
> + (lambda _
> + (substitute* "test/sql/CMakeLists.txt"
> + (((string-append
> + "("
> + (string-join
> + '(" append\\.sql\\.in"
> + " chunk_adaptive\\.sql"
> + " histogram_test\\.sql\\.in")
> + "|")
> + ")")
> + all)
> + (string-append "#" all)))))))
> + (else
> + #~((add-after 'unpack 'skip-failing-tests
> + (lambda _
> + (substitute* "test/sql/CMakeLists.txt"
> + ((" histogram_test\\.sql\\.in")
> + "# histogram_test.sql.in")))))))
> (add-after 'prepare-tests 'check
> (assoc-ref %standard-phases 'check)))))
> (inputs (list openssl postgresql))
push, close.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2024-10-20 14:34 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-08 6:26 [bug#73692] [PATCH] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
2024-10-16 5:12 ` [bug#73692] [PATCH v2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
2024-10-16 12:28 ` Z572
2024-10-16 17:19 ` Nicolas Graves via Guix-patches via
2024-10-16 23:24 ` [bug#73692] [PATCH v3 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
2024-10-16 23:24 ` [bug#73692] [PATCH v3 2/2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
2024-10-17 4:37 ` [bug#73692] [PATCH v4 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
2024-10-17 4:37 ` [bug#73692] [PATCH v4 2/2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
2024-10-17 5:51 ` [bug#73692] [PATCH v5 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
2024-10-17 5:51 ` [bug#73692] [PATCH v5 2/2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
2024-10-19 10:00 ` [bug#73692] [PATCH v6 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
2024-10-19 10:00 ` [bug#73692] [PATCH v6 2/2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
2024-10-20 14:05 ` [bug#73692] [PATCH v7 1/2] gnu: timescaledb: Update to 2.16.1. [security fixes] Nicolas Graves via Guix-patches via
2024-10-20 14:05 ` [bug#73692] [PATCH v7 2/2] gnu: timescaledb: Ignore failing tests Nicolas Graves via Guix-patches via
2024-10-20 14:33 ` Zheng Junjie
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.